exifreader 4.41.0 → 4.41.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/babel.config.json +1 -8
- package/bin/build.js +2 -3
- package/bin/profile.js +4 -4
- package/dist/exif-reader.js +1 -1
- package/dist/exif-reader.js.map +1 -1
- package/package.json +27 -28
- package/src/exif-reader.js +32 -123
- package/src/file-loaders.js +5 -17
- package/src/gif-file-tags.js +20 -92
- package/src/icc-tag-names.js +1 -1
- package/src/icc-tags.js +1 -5
- package/src/image-header-avif.js +4 -11
- package/src/image-header-gif.js +2 -4
- package/src/image-header-heic.js +4 -13
- package/src/image-header-iso-bmff-iloc.js +32 -2
- package/src/image-header-iso-bmff.js +31 -34
- package/src/image-header-jpeg.js +25 -39
- package/src/image-header-jxl.js +5 -12
- package/src/image-header-png.js +2 -8
- package/src/image-header-webp.js +2 -8
- package/src/load-auto.js +3 -5
- package/src/loadview-pipeline.js +15 -19
- package/src/package.json +1 -0
- package/src/png-file-tags.js +29 -114
- package/src/tag-names-utils.js +3 -3
- package/src/tags.js +26 -65
- package/src/utils.js +12 -0
- package/src/xml.js +2 -2
- package/webpack.config.js +0 -2
- package/bin/.eslintrc.json +0 -7
package/src/png-file-tags.js
CHANGED
|
@@ -8,130 +8,45 @@ export default {
|
|
|
8
8
|
read
|
|
9
9
|
};
|
|
10
10
|
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
'Filter': getFilter(dataView, fileDataOffset),
|
|
19
|
-
'Interlace': getInterlace(dataView, fileDataOffset)
|
|
20
|
-
};
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
function getImageWidth(dataView, fileDataOffset) {
|
|
24
|
-
const OFFSET = 0;
|
|
25
|
-
const SIZE = 4;
|
|
26
|
-
|
|
27
|
-
if (fileDataOffset + OFFSET + SIZE > dataView.byteLength) {
|
|
28
|
-
return undefined;
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
const value = Types.getLongAt(dataView, fileDataOffset);
|
|
32
|
-
return {
|
|
33
|
-
value,
|
|
34
|
-
description: `${value}px`
|
|
35
|
-
};
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
function getImageHeight(dataView, fileDataOffset) {
|
|
39
|
-
const OFFSET = 4;
|
|
40
|
-
const SIZE = 4;
|
|
41
|
-
|
|
42
|
-
if (fileDataOffset + OFFSET + SIZE > dataView.byteLength) {
|
|
43
|
-
return undefined;
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
const value = Types.getLongAt(dataView, fileDataOffset + OFFSET);
|
|
47
|
-
return {
|
|
48
|
-
value,
|
|
49
|
-
description: `${value}px`
|
|
50
|
-
};
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
function getBitDepth(dataView, fileDataOffset) {
|
|
54
|
-
const OFFSET = 8;
|
|
55
|
-
const SIZE = 1;
|
|
56
|
-
|
|
57
|
-
if (fileDataOffset + OFFSET + SIZE > dataView.byteLength) {
|
|
58
|
-
return undefined;
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
const value = Types.getByteAt(dataView, fileDataOffset + OFFSET);
|
|
62
|
-
return {
|
|
63
|
-
value,
|
|
64
|
-
description: `${value}`
|
|
65
|
-
};
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
function getColorType(dataView, fileDataOffset) {
|
|
69
|
-
const OFFSET = 9;
|
|
70
|
-
const SIZE = 1;
|
|
71
|
-
const COLOR_TYPES = {
|
|
72
|
-
0: 'Grayscale',
|
|
73
|
-
2: 'RGB',
|
|
74
|
-
3: 'Palette',
|
|
75
|
-
4: 'Grayscale with Alpha',
|
|
76
|
-
6: 'RGB with Alpha'
|
|
77
|
-
};
|
|
78
|
-
|
|
79
|
-
if (fileDataOffset + OFFSET + SIZE > dataView.byteLength) {
|
|
80
|
-
return undefined;
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
const value = Types.getByteAt(dataView, fileDataOffset + OFFSET);
|
|
84
|
-
return {
|
|
85
|
-
value,
|
|
86
|
-
description: COLOR_TYPES[value] || 'Unknown'
|
|
87
|
-
};
|
|
88
|
-
}
|
|
89
|
-
|
|
90
|
-
function getCompression(dataView, fileDataOffset) {
|
|
91
|
-
const OFFSET = 10;
|
|
92
|
-
const SIZE = 1;
|
|
93
|
-
|
|
94
|
-
if (fileDataOffset + OFFSET + SIZE > dataView.byteLength) {
|
|
95
|
-
return undefined;
|
|
96
|
-
}
|
|
11
|
+
const COLOR_TYPES = {
|
|
12
|
+
0: 'Grayscale',
|
|
13
|
+
2: 'RGB',
|
|
14
|
+
3: 'Palette',
|
|
15
|
+
4: 'Grayscale with Alpha',
|
|
16
|
+
6: 'RGB with Alpha'
|
|
17
|
+
};
|
|
97
18
|
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
};
|
|
103
|
-
}
|
|
19
|
+
const INTERLACE_TYPES = {
|
|
20
|
+
0: 'Noninterlaced',
|
|
21
|
+
1: 'Adam7 Interlace'
|
|
22
|
+
};
|
|
104
23
|
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
24
|
+
const FIELDS = [
|
|
25
|
+
{name: 'Image Width', offset: 0, size: 4, read: Types.getLongAt, description: (value) => `${value}px`},
|
|
26
|
+
{name: 'Image Height', offset: 4, size: 4, read: Types.getLongAt, description: (value) => `${value}px`},
|
|
27
|
+
{name: 'Bit Depth', offset: 8, size: 1, read: Types.getByteAt, description: (value) => `${value}`},
|
|
28
|
+
{name: 'Color Type', offset: 9, size: 1, read: Types.getByteAt, description: (value) => COLOR_TYPES[value] || 'Unknown'},
|
|
29
|
+
{name: 'Compression', offset: 10, size: 1, read: Types.getByteAt, description: (value) => value === 0 ? 'Deflate/Inflate' : 'Unknown'},
|
|
30
|
+
{name: 'Filter', offset: 11, size: 1, read: Types.getByteAt, description: (value) => value === 0 ? 'Adaptive' : 'Unknown'},
|
|
31
|
+
{name: 'Interlace', offset: 12, size: 1, read: Types.getByteAt, description: (value) => INTERLACE_TYPES[value] || 'Unknown'}
|
|
32
|
+
];
|
|
108
33
|
|
|
109
|
-
|
|
110
|
-
|
|
34
|
+
function read(dataView, fileDataOffset) {
|
|
35
|
+
const tags = {};
|
|
36
|
+
for (let i = 0; i < FIELDS.length; i++) {
|
|
37
|
+
tags[FIELDS[i].name] = getFieldTag(dataView, fileDataOffset, FIELDS[i]);
|
|
111
38
|
}
|
|
112
|
-
|
|
113
|
-
const value = Types.getByteAt(dataView, fileDataOffset + OFFSET);
|
|
114
|
-
return {
|
|
115
|
-
value,
|
|
116
|
-
description: value === 0 ? 'Adaptive' : 'Unknown'
|
|
117
|
-
};
|
|
39
|
+
return tags;
|
|
118
40
|
}
|
|
119
41
|
|
|
120
|
-
function
|
|
121
|
-
|
|
122
|
-
const SIZE = 1;
|
|
123
|
-
const INTERLACE_TYPES = {
|
|
124
|
-
0: 'Noninterlaced',
|
|
125
|
-
1: 'Adam7 Interlace'
|
|
126
|
-
};
|
|
127
|
-
|
|
128
|
-
if (fileDataOffset + OFFSET + SIZE > dataView.byteLength) {
|
|
42
|
+
function getFieldTag(dataView, fileDataOffset, field) {
|
|
43
|
+
if (fileDataOffset + field.offset + field.size > dataView.byteLength) {
|
|
129
44
|
return undefined;
|
|
130
45
|
}
|
|
131
46
|
|
|
132
|
-
const value =
|
|
47
|
+
const value = field.read(dataView, fileDataOffset + field.offset);
|
|
133
48
|
return {
|
|
134
49
|
value,
|
|
135
|
-
description:
|
|
50
|
+
description: field.description(value)
|
|
136
51
|
};
|
|
137
52
|
}
|
package/src/tag-names-utils.js
CHANGED
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
3
3
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
4
4
|
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
}
|
|
5
|
+
import {getStringValueFromArray as getStringValue} from './utils.js';
|
|
6
|
+
|
|
7
|
+
export {getStringValue};
|
|
8
8
|
|
|
9
9
|
export function getEncodedString(value) {
|
|
10
10
|
if (value.length >= 8) {
|
package/src/tags.js
CHANGED
|
@@ -7,9 +7,11 @@ import ByteOrder from './byte-order.js';
|
|
|
7
7
|
import {IFD_TYPE_0TH, IFD_TYPE_EXIF, IFD_TYPE_GPS, IFD_TYPE_INTEROPERABILITY} from './tag-names.js';
|
|
8
8
|
import {readIfd, get0thIfdOffset} from './tags-helpers.js';
|
|
9
9
|
|
|
10
|
-
const
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
const SUB_IFDS = [
|
|
11
|
+
{pointerKey: 'Exif IFD Pointer', ifdType: IFD_TYPE_EXIF},
|
|
12
|
+
{pointerKey: 'GPS Info IFD Pointer', ifdType: IFD_TYPE_GPS},
|
|
13
|
+
{pointerKey: 'Interoperability IFD Pointer', ifdType: IFD_TYPE_INTEROPERABILITY}
|
|
14
|
+
];
|
|
13
15
|
|
|
14
16
|
export default {
|
|
15
17
|
read,
|
|
@@ -18,9 +20,9 @@ export default {
|
|
|
18
20
|
function read(dataView, tiffHeaderOffset, includeUnknown, computed = false, tagFilter = undefined) {
|
|
19
21
|
const byteOrder = ByteOrder.getByteOrder(dataView, tiffHeaderOffset);
|
|
20
22
|
let tags = read0thIfd(dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed, tagFilter);
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
23
|
+
for (let i = 0; i < SUB_IFDS.length; i++) {
|
|
24
|
+
tags = readSubIfd(SUB_IFDS[i], tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed, tagFilter);
|
|
25
|
+
}
|
|
24
26
|
|
|
25
27
|
return {tags, byteOrder};
|
|
26
28
|
}
|
|
@@ -43,65 +45,24 @@ function read0thIfd(dataView, tiffHeaderOffset, byteOrder, includeUnknown, compu
|
|
|
43
45
|
);
|
|
44
46
|
}
|
|
45
47
|
|
|
46
|
-
function
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
readIfd(
|
|
51
|
-
dataView,
|
|
52
|
-
IFD_TYPE_EXIF,
|
|
53
|
-
tiffHeaderOffset,
|
|
54
|
-
tiffHeaderOffset + tags[EXIF_IFD_POINTER_KEY].value,
|
|
55
|
-
byteOrder,
|
|
56
|
-
includeUnknown,
|
|
57
|
-
computed,
|
|
58
|
-
tagFilter,
|
|
59
|
-
'exif'
|
|
60
|
-
)
|
|
61
|
-
);
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
return tags;
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
function readGpsIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed, tagFilter) {
|
|
68
|
-
if (tags[GPS_INFO_IFD_POINTER_KEY] !== undefined) {
|
|
69
|
-
return objectAssign(
|
|
70
|
-
tags,
|
|
71
|
-
readIfd(
|
|
72
|
-
dataView,
|
|
73
|
-
IFD_TYPE_GPS,
|
|
74
|
-
tiffHeaderOffset,
|
|
75
|
-
tiffHeaderOffset + tags[GPS_INFO_IFD_POINTER_KEY].value,
|
|
76
|
-
byteOrder,
|
|
77
|
-
includeUnknown,
|
|
78
|
-
computed,
|
|
79
|
-
tagFilter,
|
|
80
|
-
'exif'
|
|
81
|
-
)
|
|
82
|
-
);
|
|
48
|
+
function readSubIfd(subIfd, tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed, tagFilter) {
|
|
49
|
+
const pointerTag = tags[subIfd.pointerKey];
|
|
50
|
+
if (pointerTag === undefined) {
|
|
51
|
+
return tags;
|
|
83
52
|
}
|
|
84
53
|
|
|
85
|
-
return
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
computed,
|
|
100
|
-
tagFilter,
|
|
101
|
-
'exif'
|
|
102
|
-
)
|
|
103
|
-
);
|
|
104
|
-
}
|
|
105
|
-
|
|
106
|
-
return tags;
|
|
54
|
+
return objectAssign(
|
|
55
|
+
tags,
|
|
56
|
+
readIfd(
|
|
57
|
+
dataView,
|
|
58
|
+
subIfd.ifdType,
|
|
59
|
+
tiffHeaderOffset,
|
|
60
|
+
tiffHeaderOffset + pointerTag.value,
|
|
61
|
+
byteOrder,
|
|
62
|
+
includeUnknown,
|
|
63
|
+
computed,
|
|
64
|
+
tagFilter,
|
|
65
|
+
'exif'
|
|
66
|
+
)
|
|
67
|
+
);
|
|
107
68
|
}
|
package/src/utils.js
CHANGED
|
@@ -61,6 +61,18 @@ export function getCharacterArray(string) {
|
|
|
61
61
|
return string.split('').map((character) => character.charCodeAt(0));
|
|
62
62
|
}
|
|
63
63
|
|
|
64
|
+
export function pushMetadataBlock(metadataBlocks, type, start, end) {
|
|
65
|
+
if (metadataBlocks && type) {
|
|
66
|
+
metadataBlocks.push({type, start, end});
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
export function assertPromiseSupport() {
|
|
71
|
+
if (typeof Promise === 'undefined') {
|
|
72
|
+
throw new Error('Promise is required when async mode is enabled.');
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
|
|
64
76
|
export function objectAssign() {
|
|
65
77
|
for (let i = 1; i < arguments.length; i++) {
|
|
66
78
|
for (const property in arguments[i]) {
|
package/src/xml.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
3
3
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
4
4
|
|
|
5
|
-
import {getStringFromDataView} from './utils.js';
|
|
5
|
+
import {getStringFromDataView, pushMetadataBlock} from './utils.js';
|
|
6
6
|
|
|
7
7
|
export default {
|
|
8
8
|
isXMLFile,
|
|
@@ -41,8 +41,8 @@ function isXMLFile(dataView) {
|
|
|
41
41
|
function findOffsets(dataView, metadataBlocks) {
|
|
42
42
|
const xmpChunks = [];
|
|
43
43
|
xmpChunks.push({dataOffset: XML_MARKER_OFFSET, length: dataView.byteLength});
|
|
44
|
+
pushMetadataBlock(metadataBlocks, 'xmp', 0, dataView.byteLength);
|
|
44
45
|
if (metadataBlocks) {
|
|
45
|
-
metadataBlocks.push({type: 'xmp', start: 0, end: dataView.byteLength});
|
|
46
46
|
metadataBlocks.truncated = !hasXmpClosingMarker(dataView);
|
|
47
47
|
}
|
|
48
48
|
return {
|
package/webpack.config.js
CHANGED
|
@@ -2,8 +2,6 @@
|
|
|
2
2
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
3
3
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
4
4
|
|
|
5
|
-
/* eslint-env node */
|
|
6
|
-
|
|
7
5
|
const path = require('path');
|
|
8
6
|
const TerserPlugin = require('terser-webpack-plugin');
|
|
9
7
|
const findConfigFromClosestPackageJson = require('./bin/findDependentConfig');
|