exifreader 4.35.0 → 4.36.1
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/README.md +88 -0
- package/dist/exif-reader.js +1 -1
- package/dist/exif-reader.js.map +1 -1
- package/exif-reader.d.ts +56 -3
- package/package.json +7 -5
- package/src/canon-tags.js +20 -2
- package/src/exif-reader.js +617 -220
- package/src/iptc-tags.js +56 -6
- package/src/loadview-pipeline.js +417 -0
- package/src/mpf-tags.js +10 -2
- package/src/pentax-tags.js +11 -2
- package/src/photoshop-tags.js +24 -1
- package/src/png-text-tags.js +28 -4
- package/src/tag-decoder.js +3 -0
- package/src/tag-filter-config.js +124 -0
- package/src/tag-filter.js +409 -0
- package/src/tags-helpers.js +63 -16
- package/src/tags.js +29 -13
- package/src/utils.js +10 -0
- package/webpack.config.js +3 -0
package/src/tags.js
CHANGED
|
@@ -15,21 +15,31 @@ export default {
|
|
|
15
15
|
read,
|
|
16
16
|
};
|
|
17
17
|
|
|
18
|
-
function read(dataView, tiffHeaderOffset, includeUnknown, computed = false) {
|
|
18
|
+
function read(dataView, tiffHeaderOffset, includeUnknown, computed = false, tagFilter = undefined) {
|
|
19
19
|
const byteOrder = ByteOrder.getByteOrder(dataView, tiffHeaderOffset);
|
|
20
|
-
let tags = read0thIfd(dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed);
|
|
21
|
-
tags = readExifIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed);
|
|
22
|
-
tags = readGpsIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed);
|
|
23
|
-
tags = readInteroperabilityIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed);
|
|
20
|
+
let tags = read0thIfd(dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed, tagFilter);
|
|
21
|
+
tags = readExifIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed, tagFilter);
|
|
22
|
+
tags = readGpsIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed, tagFilter);
|
|
23
|
+
tags = readInteroperabilityIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed, tagFilter);
|
|
24
24
|
|
|
25
25
|
return {tags, byteOrder};
|
|
26
26
|
}
|
|
27
27
|
|
|
28
|
-
function read0thIfd(dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed) {
|
|
29
|
-
return readIfd(
|
|
28
|
+
function read0thIfd(dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed, tagFilter) {
|
|
29
|
+
return readIfd(
|
|
30
|
+
dataView,
|
|
31
|
+
IFD_TYPE_0TH,
|
|
32
|
+
tiffHeaderOffset,
|
|
33
|
+
get0thIfdOffset(dataView, tiffHeaderOffset, byteOrder),
|
|
34
|
+
byteOrder,
|
|
35
|
+
includeUnknown,
|
|
36
|
+
computed,
|
|
37
|
+
tagFilter,
|
|
38
|
+
'exif'
|
|
39
|
+
);
|
|
30
40
|
}
|
|
31
41
|
|
|
32
|
-
function readExifIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed) {
|
|
42
|
+
function readExifIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed, tagFilter) {
|
|
33
43
|
if (tags[EXIF_IFD_POINTER_KEY] !== undefined) {
|
|
34
44
|
return objectAssign(
|
|
35
45
|
tags,
|
|
@@ -40,7 +50,9 @@ function readExifIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown
|
|
|
40
50
|
tiffHeaderOffset + tags[EXIF_IFD_POINTER_KEY].value,
|
|
41
51
|
byteOrder,
|
|
42
52
|
includeUnknown,
|
|
43
|
-
computed
|
|
53
|
+
computed,
|
|
54
|
+
tagFilter,
|
|
55
|
+
'exif'
|
|
44
56
|
)
|
|
45
57
|
);
|
|
46
58
|
}
|
|
@@ -48,7 +60,7 @@ function readExifIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown
|
|
|
48
60
|
return tags;
|
|
49
61
|
}
|
|
50
62
|
|
|
51
|
-
function readGpsIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed) {
|
|
63
|
+
function readGpsIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed, tagFilter) {
|
|
52
64
|
if (tags[GPS_INFO_IFD_POINTER_KEY] !== undefined) {
|
|
53
65
|
return objectAssign(
|
|
54
66
|
tags,
|
|
@@ -59,7 +71,9 @@ function readGpsIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown,
|
|
|
59
71
|
tiffHeaderOffset + tags[GPS_INFO_IFD_POINTER_KEY].value,
|
|
60
72
|
byteOrder,
|
|
61
73
|
includeUnknown,
|
|
62
|
-
computed
|
|
74
|
+
computed,
|
|
75
|
+
tagFilter,
|
|
76
|
+
'exif'
|
|
63
77
|
)
|
|
64
78
|
);
|
|
65
79
|
}
|
|
@@ -67,7 +81,7 @@ function readGpsIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown,
|
|
|
67
81
|
return tags;
|
|
68
82
|
}
|
|
69
83
|
|
|
70
|
-
function readInteroperabilityIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed) {
|
|
84
|
+
function readInteroperabilityIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed, tagFilter) {
|
|
71
85
|
if (tags[INTEROPERABILITY_IFD_POINTER_KEY] !== undefined) {
|
|
72
86
|
return objectAssign(
|
|
73
87
|
tags,
|
|
@@ -78,7 +92,9 @@ function readInteroperabilityIfd(tags, dataView, tiffHeaderOffset, byteOrder, in
|
|
|
78
92
|
tiffHeaderOffset + tags[INTEROPERABILITY_IFD_POINTER_KEY].value,
|
|
79
93
|
byteOrder,
|
|
80
94
|
includeUnknown,
|
|
81
|
-
computed
|
|
95
|
+
computed,
|
|
96
|
+
tagFilter,
|
|
97
|
+
'exif'
|
|
82
98
|
)
|
|
83
99
|
);
|
|
84
100
|
}
|
package/src/utils.js
CHANGED
|
@@ -165,5 +165,15 @@ export function decompress(dataView, compressionMethod, encoding, returnType = '
|
|
|
165
165
|
if (compressionMethod !== undefined) {
|
|
166
166
|
return Promise.reject(`Unknown compression method ${compressionMethod}.`);
|
|
167
167
|
}
|
|
168
|
+
|
|
169
|
+
// handle uncompressed iTXT with proper encoding awareness
|
|
170
|
+
if (returnType === 'string') {
|
|
171
|
+
try {
|
|
172
|
+
return new TextDecoder(encoding).decode(dataView);
|
|
173
|
+
} catch (error) {
|
|
174
|
+
const bytes = new Uint8Array(dataView.buffer, dataView.byteOffset, dataView.byteLength);
|
|
175
|
+
return Array.from(bytes, (byte) => String.fromCharCode(byte)).join('');
|
|
176
|
+
}
|
|
177
|
+
}
|
|
168
178
|
return dataView;
|
|
169
179
|
}
|
package/webpack.config.js
CHANGED
|
@@ -165,6 +165,9 @@ function getConfig() {
|
|
|
165
165
|
if (packageJson.include.icc) {
|
|
166
166
|
packageJson.include.exif.push('ICC_Profile');
|
|
167
167
|
}
|
|
168
|
+
if (packageJson.include.photoshop) {
|
|
169
|
+
packageJson.include.exif.push('ImageSourceData', 'PhotoshopSettings');
|
|
170
|
+
}
|
|
168
171
|
if (packageJson.include.thumbnail) {
|
|
169
172
|
packageJson.include.exif.push('JPEGInterchangeFormat', 'JPEGInterchangeFormatLength');
|
|
170
173
|
}
|