exifreader 4.34.0 → 4.36.0

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.
@@ -5,6 +5,8 @@
5
5
  import Constants from './constants.js';
6
6
  import Types from './types.js';
7
7
  import TagNames, {IFD_TYPE_0TH, IFD_TYPE_1ST, IFD_TYPE_PENTAX} from './tag-names.js';
8
+ import {IFD_ENTRY_LENGTH, TIFF_IFD_OFFSET_OFFSET} from './tiff-constants.js';
9
+ import {NOOP_TAG_FILTER} from './tag-filter.js';
8
10
 
9
11
  const getTagValueAt = {
10
12
  1: Types.getByteAt,
@@ -19,12 +21,27 @@ const getTagValueAt = {
19
21
  };
20
22
 
21
23
  export function get0thIfdOffset(dataView, tiffHeaderOffset, byteOrder) {
22
- return tiffHeaderOffset + Types.getLongAt(dataView, tiffHeaderOffset + 4, byteOrder);
24
+ return tiffHeaderOffset
25
+ + Types.getLongAt(
26
+ dataView,
27
+ tiffHeaderOffset + TIFF_IFD_OFFSET_OFFSET,
28
+ byteOrder
29
+ );
23
30
  }
24
31
 
25
- export function readIfd(dataView, ifdType, offsetOrigin, offset, byteOrder, includeUnknown, computed = false) {
32
+ export function readIfd(
33
+ dataView,
34
+ ifdType,
35
+ offsetOrigin,
36
+ offset,
37
+ byteOrder,
38
+ includeUnknown,
39
+ computed = false,
40
+ tagFilter = NOOP_TAG_FILTER,
41
+ groupKey = 'exif'
42
+ ) {
26
43
  const FIELD_COUNT_SIZE = Types.getTypeSize('SHORT');
27
- const FIELD_SIZE = 12;
44
+ const FIELD_SIZE = IFD_ENTRY_LENGTH;
28
45
 
29
46
  const tags = {};
30
47
  const numberOfFields = getNumberOfFields(dataView, offset, byteOrder);
@@ -35,7 +52,16 @@ export function readIfd(dataView, ifdType, offsetOrigin, offset, byteOrder, incl
35
52
  break;
36
53
  }
37
54
 
38
- const tag = readTag(dataView, ifdType, offsetOrigin, offset, byteOrder, includeUnknown);
55
+ const tag = readTag(
56
+ dataView,
57
+ ifdType,
58
+ offsetOrigin,
59
+ offset,
60
+ byteOrder,
61
+ includeUnknown,
62
+ tagFilter,
63
+ groupKey
64
+ );
39
65
  if (tag !== undefined) {
40
66
  tags[tag.name] = {
41
67
  'id': tag.id,
@@ -56,15 +82,19 @@ export function readIfd(dataView, ifdType, offsetOrigin, offset, byteOrder, incl
56
82
  if (Constants.USE_THUMBNAIL && (offset < dataView.byteLength - Types.getTypeSize('LONG'))) {
57
83
  const nextIfdOffset = Types.getLongAt(dataView, offset, byteOrder);
58
84
  if (nextIfdOffset !== 0 && ifdType === IFD_TYPE_0TH) {
59
- tags['Thumbnail'] = readIfd(
60
- dataView,
61
- IFD_TYPE_1ST,
62
- offsetOrigin,
63
- offsetOrigin + nextIfdOffset,
64
- byteOrder,
65
- includeUnknown,
66
- computed
67
- );
85
+ if (tagFilter.shouldParseGroup('thumbnail')) {
86
+ tags['Thumbnail'] = readIfd(
87
+ dataView,
88
+ IFD_TYPE_1ST,
89
+ offsetOrigin,
90
+ offsetOrigin + nextIfdOffset,
91
+ byteOrder,
92
+ includeUnknown,
93
+ computed,
94
+ tagFilter,
95
+ 'thumbnail'
96
+ );
97
+ }
68
98
  }
69
99
  }
70
100
 
@@ -78,7 +108,16 @@ function getNumberOfFields(dataView, offset, byteOrder) {
78
108
  return 0;
79
109
  }
80
110
 
81
- function readTag(dataView, ifdType, offsetOrigin, offset, byteOrder, includeUnknown) {
111
+ function readTag(
112
+ dataView,
113
+ ifdType,
114
+ offsetOrigin,
115
+ offset,
116
+ byteOrder,
117
+ includeUnknown = false,
118
+ tagFilter = NOOP_TAG_FILTER,
119
+ groupKey = 'exif'
120
+ ) {
82
121
  const TAG_CODE_IPTC_NAA = 0x83bb;
83
122
  const TAG_TYPE_OFFSET = Types.getTypeSize('SHORT');
84
123
  const TAG_COUNT_OFFSET = TAG_TYPE_OFFSET + Types.getTypeSize('SHORT');
@@ -94,6 +133,11 @@ function readTag(dataView, ifdType, offsetOrigin, offset, byteOrder, includeUnkn
94
133
  return undefined;
95
134
  }
96
135
 
136
+ const tagName = getTagName(ifdType, tagCode);
137
+ if (!tagFilter.shouldParseTag(groupKey, tagName, tagCode)) {
138
+ return undefined;
139
+ }
140
+
97
141
  if (tagValueFitsInOffsetSlot(tagType, tagCount)) {
98
142
  tagValueOffset = offset + TAG_VALUE_OFFSET;
99
143
  tagValue = getTagValue(dataView, tagValueOffset, tagType, tagCount, byteOrder);
@@ -112,22 +156,18 @@ function readTag(dataView, ifdType, offsetOrigin, offset, byteOrder, includeUnkn
112
156
  tagValue = decodeAsciiValue(tagValue);
113
157
  }
114
158
 
115
- let tagName = `undefined-${tagCode}`;
116
159
  let tagDescription = tagValue;
117
160
 
118
161
  if (TagNames[ifdType][tagCode] !== undefined) {
119
162
  if ((TagNames[ifdType][tagCode]['name'] !== undefined) && (TagNames[ifdType][tagCode]['description'] !== undefined)) {
120
- tagName = TagNames[ifdType][tagCode]['name'];
121
163
  try {
122
164
  tagDescription = TagNames[ifdType][tagCode]['description'](tagValue);
123
165
  } catch (error) {
124
166
  tagDescription = getDescriptionFromTagValue(tagValue);
125
167
  }
126
168
  } else if ((tagType === Types.tagTypes['RATIONAL']) || (tagType === Types.tagTypes['SRATIONAL'])) {
127
- tagName = TagNames[ifdType][tagCode];
128
169
  tagDescription = '' + (tagValue[0] / tagValue[1]);
129
170
  } else {
130
- tagName = TagNames[ifdType][tagCode];
131
171
  tagDescription = getDescriptionFromTagValue(tagValue);
132
172
  }
133
173
  }
@@ -142,6 +182,19 @@ function readTag(dataView, ifdType, offsetOrigin, offset, byteOrder, includeUnkn
142
182
  };
143
183
  }
144
184
 
185
+ function getTagName(ifdType, tagCode) {
186
+ if (TagNames[ifdType][tagCode] !== undefined) {
187
+ if (typeof TagNames[ifdType][tagCode] === 'string') {
188
+ return TagNames[ifdType][tagCode];
189
+ }
190
+ if (TagNames[ifdType][tagCode].name) {
191
+ return TagNames[ifdType][tagCode].name;
192
+ }
193
+ }
194
+
195
+ return `undefined-${tagCode}`;
196
+ }
197
+
145
198
  function tagValueFitsInOffsetSlot(tagType, tagCount) {
146
199
  return Types.typeSizes[tagType] * tagCount <= Types.getTypeSize('LONG');
147
200
  }
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(dataView, IFD_TYPE_0TH, tiffHeaderOffset, get0thIfdOffset(dataView, tiffHeaderOffset, byteOrder), byteOrder, includeUnknown, computed);
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
  }
@@ -0,0 +1,25 @@
1
+ /* This Source Code Form is subject to the terms of the Mozilla Public
2
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
3
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
4
+
5
+ export const TIFF_BYTE_ORDER_OFFSET = 0;
6
+ export const TIFF_ID_OFFSET = 2;
7
+ export const TIFF_IFD_OFFSET_OFFSET = 4;
8
+ export const TIFF_HEADER_LENGTH = 8;
9
+
10
+ export const TIFF_ID = 0x2a;
11
+
12
+ export const IFD_ENTRY_COUNT_LENGTH = 2;
13
+ export const IFD_ENTRY_LENGTH = 12;
14
+ export const NEXT_IFD_POINTER_LENGTH = 4;
15
+
16
+ export default {
17
+ TIFF_BYTE_ORDER_OFFSET,
18
+ TIFF_ID_OFFSET,
19
+ TIFF_IFD_OFFSET_OFFSET,
20
+ TIFF_HEADER_LENGTH,
21
+ TIFF_ID,
22
+ IFD_ENTRY_COUNT_LENGTH,
23
+ IFD_ENTRY_LENGTH,
24
+ NEXT_IFD_POINTER_LENGTH,
25
+ };
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
  }