exifreader 4.23.7 → 4.25.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.
package/exif-reader.d.ts CHANGED
@@ -207,6 +207,7 @@ export interface ExpandedTags {
207
207
  Thumbnail?: ThumbnailTags,
208
208
  gps?: GpsTags
209
209
  photoshop?: PhotoshopTags;
210
+ makerNotes?: CanonTags;
210
211
  }
211
212
 
212
213
  interface GpsTags {
@@ -256,6 +257,13 @@ interface PhotoshopTags {
256
257
  ClippingPathName: StringTag;
257
258
  }
258
259
 
260
+ interface CanonTags {
261
+ AutoRotate: {
262
+ value: number,
263
+ description: 'None' | 'Rotate 90 CW' | 'Rotate 180' | 'Rotate 270 CW' | 'Unknown'
264
+ };
265
+ }
266
+
259
267
  export function load(data: ArrayBuffer | SharedArrayBuffer | Buffer): Tags;
260
268
  export function load(data: ArrayBuffer | SharedArrayBuffer | Buffer, options: {expanded: true, includeUnknown?: boolean, length?: number, async?: false}): ExpandedTags;
261
269
  export function load(data: ArrayBuffer | SharedArrayBuffer | Buffer, options: {expanded?: false, includeUnknown?: boolean, length?: number, async?: false}): Tags;
@@ -517,7 +525,7 @@ interface IccTags {
517
525
  [name: string]: ValueTag;
518
526
  }
519
527
 
520
- export type Tags = XmpTags & IccTags & PngTags & RiffTags & GifTags & PhotoshopTags & {
528
+ export type Tags = XmpTags & IccTags & PngTags & RiffTags & GifTags & PhotoshopTags & CanonTags & {
521
529
  'Thumbnail'?: ThumbnailTags;
522
530
  'Images'?: MPFImageTags[],
523
531
  } & {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "exifreader",
3
- "version": "4.23.7",
3
+ "version": "4.25.0",
4
4
  "description": "Library that parses Exif metadata in images.",
5
5
  "author": "Mattias Wallander <mattias@wallander.eu>",
6
6
  "repository": {
@@ -22,7 +22,7 @@
22
22
  ],
23
23
  "types": "./exif-reader.d.ts",
24
24
  "optionalDependencies": {
25
- "@xmldom/xmldom": "^0.8.10"
25
+ "@xmldom/xmldom": "^0.9.4"
26
26
  },
27
27
  "devDependencies": {
28
28
  "@babel/core": "^7.25.2",
@@ -0,0 +1,59 @@
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
+ // Reverse-engineered docs:
6
+ // https://exiv2.org/tags-canon.html
7
+ // https://gist.github.com/redaktor/bae0ef2377ab70bc5276
8
+ // https://www.ozhiker.com/electronics/pjmt/jpeg_info/canon_mn.html
9
+
10
+ import {objectAssign} from './utils.js';
11
+ import {readIfd} from './tags-helpers.js';
12
+ import {IFD_TYPE_CANON} from './tag-names.js';
13
+
14
+ const SHOT_INFO_AUTO_ROTATE = 27; // First position is size.
15
+
16
+ export default {
17
+ read,
18
+ SHOT_INFO_AUTO_ROTATE
19
+ };
20
+
21
+ function read(dataView, tiffHeaderOffset, offset, byteOrder, includeUnknown) {
22
+ let tags = readIfd(dataView, IFD_TYPE_CANON, tiffHeaderOffset, tiffHeaderOffset + offset, byteOrder, includeUnknown);
23
+
24
+ if (tags['ShotInfo']) {
25
+ tags = objectAssign({}, tags, parseShotInfo(tags['ShotInfo'].value));
26
+ delete tags['ShotInfo'];
27
+ }
28
+
29
+ return tags;
30
+ }
31
+
32
+ function parseShotInfo(shotInfoData) {
33
+ const tags = {};
34
+
35
+ if (shotInfoData[SHOT_INFO_AUTO_ROTATE] !== undefined) {
36
+ tags['AutoRotate'] = {
37
+ value: shotInfoData[SHOT_INFO_AUTO_ROTATE],
38
+ description: getAutoRotateDescription(shotInfoData[SHOT_INFO_AUTO_ROTATE])
39
+ };
40
+ }
41
+
42
+ return tags;
43
+ }
44
+
45
+ function getAutoRotateDescription(autoRotate) {
46
+ if (autoRotate === 0) {
47
+ return 'None';
48
+ }
49
+ if (autoRotate === 1) {
50
+ return 'Rotate 90 CW';
51
+ }
52
+ if (autoRotate === 2) {
53
+ return 'Rotate 180';
54
+ }
55
+ if (autoRotate === 3) {
56
+ return 'Rotate 270 CW';
57
+ }
58
+ return 'Unknown';
59
+ }
package/src/constants.js CHANGED
@@ -19,5 +19,6 @@ export default {
19
19
  USE_HEIC: true,
20
20
  USE_AVIF: true,
21
21
  USE_WEBP: true,
22
- USE_GIF: true
22
+ USE_GIF: true,
23
+ USE_MAKER_NOTES: true
23
24
  };
package/src/dom-parser.js CHANGED
@@ -12,13 +12,8 @@ function get() {
12
12
  }
13
13
  try {
14
14
  // eslint-disable-next-line no-undef
15
- return new (__non_webpack_require__('@xmldom/xmldom').DOMParser)({
16
- errorHandler: {
17
- error: () => {
18
- throw new Error('Faulty XML');
19
- }
20
- }
21
- });
15
+ const {DOMParser, onErrorStopParsing} = __non_webpack_require__('@xmldom/xmldom');
16
+ return new DOMParser({onError: onErrorStopParsing});
22
17
  } catch (error) {
23
18
  return undefined;
24
19
  }
@@ -22,6 +22,7 @@ import IptcTags from './iptc-tags.js';
22
22
  import XmpTags from './xmp-tags.js';
23
23
  import PhotoshopTags from './photoshop-tags.js';
24
24
  import IccTags from './icc-tags.js';
25
+ import CanonTags from './canon-tags.js';
25
26
  import PngFileTags from './png-file-tags.js';
26
27
  import PngTextTags from './png-text-tags.js';
27
28
  import PngTags from './png-tags.js';
@@ -243,7 +244,7 @@ export function loadView(
243
244
 
244
245
  if (Constants.USE_EXIF && hasExifData(tiffHeaderOffset)) {
245
246
  foundMetaData = true;
246
- const readTags = Tags.read(dataView, tiffHeaderOffset, includeUnknown);
247
+ const {tags: readTags, byteOrder} = Tags.read(dataView, tiffHeaderOffset, includeUnknown);
247
248
  if (readTags.Thumbnail) {
248
249
  tags.Thumbnail = readTags.Thumbnail;
249
250
  delete readTags.Thumbnail;
@@ -300,6 +301,21 @@ export function loadView(
300
301
  tags = objectAssign({}, tags, readIccTags);
301
302
  }
302
303
  }
304
+
305
+ if (Constants.USE_MAKER_NOTES) {
306
+ if (hasCanonData(readTags)) {
307
+ const readCanonTags = CanonTags.read(dataView, tiffHeaderOffset, readTags['MakerNote'].__offset, byteOrder, includeUnknown);
308
+ if (expanded) {
309
+ tags.makerNotes = readCanonTags;
310
+ } else {
311
+ tags = objectAssign({}, tags, readCanonTags);
312
+ }
313
+ }
314
+ }
315
+
316
+ if (readTags['MakerNote']) {
317
+ delete readTags['MakerNote'].__offset;
318
+ }
303
319
  }
304
320
 
305
321
  if (Constants.USE_JPEG && Constants.USE_IPTC && hasIptcData(iptcDataOffset)) {
@@ -522,6 +538,11 @@ function hasIccData(iccDataOffsets) {
522
538
  return Array.isArray(iccDataOffsets) && iccDataOffsets.length > 0;
523
539
  }
524
540
 
541
+ function hasCanonData(tags) {
542
+ return tags['Make'] && tags['Make'].value && Array.isArray(tags['Make'].value) && tags['Make'].value[0] === 'Canon'
543
+ && tags['MakerNote'] && tags['MakerNote'].__offset;
544
+ }
545
+
525
546
  function hasMpfData(mpfDataOffset) {
526
547
  return mpfDataOffset !== undefined;
527
548
  }
@@ -35,13 +35,13 @@ function read(dataView, pngTextChunks, async, includeUnknown) {
35
35
  try {
36
36
  if (Constants.USE_EXIF && isExifGroupTag(name, value)) {
37
37
  return {
38
- __exif: Tags.read(decodeRawData(value), EXIF_OFFSET, includeUnknown)
38
+ __exif: Tags.read(decodeRawData(value), EXIF_OFFSET, includeUnknown).tags
39
39
  };
40
40
  } else if (Constants.USE_IPTC && isIptcGroupTag(name, value)) {
41
41
  return {
42
42
  __iptc: IptcTags.read(decodeRawData(value), 0, includeUnknown)
43
43
  };
44
- } else if (name) {
44
+ } else if (name && !isExifGroupTag(name, value) && !isIptcGroupTag(name, value)) {
45
45
  return {
46
46
  [name]: {
47
47
  value,
@@ -0,0 +1,10 @@
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 default {
6
+ 0x0004: {
7
+ 'name': 'ShotInfo',
8
+ 'description': (value) => value
9
+ },
10
+ };
package/src/tag-names.js CHANGED
@@ -9,6 +9,7 @@ import TagNamesExifIfd from './tag-names-exif-ifd.js';
9
9
  import TagNamesGpsIfd from './tag-names-gps-ifd.js';
10
10
  import TagNamesInteroperabilityIfd from './tag-names-interoperability-ifd.js';
11
11
  import TagNamesMpfIfd from './tag-names-mpf-ifd.js';
12
+ import TagNamesCanonIfd from './tag-names-canon-ifd.js';
12
13
 
13
14
  const tagNames0thExifIfds = objectAssign({}, TagNames0thIfd, TagNamesExifIfd);
14
15
 
@@ -18,6 +19,7 @@ export const IFD_TYPE_EXIF = 'exif';
18
19
  export const IFD_TYPE_GPS = 'gps';
19
20
  export const IFD_TYPE_INTEROPERABILITY = 'interoperability';
20
21
  export const IFD_TYPE_MPF = 'mpf';
22
+ export const IFD_TYPE_CANON = 'canon';
21
23
 
22
24
  export default {
23
25
  [IFD_TYPE_0TH]: tagNames0thExifIfds,
@@ -26,4 +28,5 @@ export default {
26
28
  [IFD_TYPE_GPS]: TagNamesGpsIfd,
27
29
  [IFD_TYPE_INTEROPERABILITY]: TagNamesInteroperabilityIfd,
28
30
  [IFD_TYPE_MPF]: Constants.USE_MPF ? TagNamesMpfIfd : {},
31
+ [IFD_TYPE_CANON]: Constants.USE_MAKER_NOTES ? TagNamesCanonIfd : {},
29
32
  };
@@ -42,6 +42,9 @@ export function readIfd(dataView, ifdType, tiffHeaderOffset, offset, byteOrder,
42
42
  'value': tag.value,
43
43
  'description': tag.description
44
44
  };
45
+ if (tag.name === 'MakerNote') {
46
+ tags[tag.name].__offset = tag.__offset;
47
+ }
45
48
  }
46
49
 
47
50
  offset += FIELD_SIZE;
@@ -50,7 +53,7 @@ export function readIfd(dataView, ifdType, tiffHeaderOffset, offset, byteOrder,
50
53
  if (Constants.USE_THUMBNAIL && (offset < dataView.byteLength - Types.getTypeSize('LONG'))) {
51
54
  const nextIfdOffset = Types.getLongAt(dataView, offset, byteOrder);
52
55
  if (nextIfdOffset !== 0 && ifdType === IFD_TYPE_0TH) {
53
- tags['Thumbnail'] = readIfd(dataView, IFD_TYPE_1ST, tiffHeaderOffset, tiffHeaderOffset + nextIfdOffset, byteOrder, true);
56
+ tags['Thumbnail'] = readIfd(dataView, IFD_TYPE_1ST, tiffHeaderOffset, tiffHeaderOffset + nextIfdOffset, byteOrder, includeUnknown);
54
57
  }
55
58
  }
56
59
 
@@ -74,15 +77,17 @@ function readTag(dataView, ifdType, tiffHeaderOffset, offset, byteOrder, include
74
77
  const tagType = Types.getShortAt(dataView, offset + TAG_TYPE_OFFSET, byteOrder);
75
78
  const tagCount = Types.getLongAt(dataView, offset + TAG_COUNT_OFFSET, byteOrder);
76
79
  let tagValue;
80
+ let tagValueOffset;
77
81
 
78
82
  if (Types.typeSizes[tagType] === undefined || (!includeUnknown && TagNames[ifdType][tagCode] === undefined)) {
79
83
  return undefined;
80
84
  }
81
85
 
82
86
  if (tagValueFitsInOffsetSlot(tagType, tagCount)) {
83
- tagValue = getTagValue(dataView, offset + TAG_VALUE_OFFSET, tagType, tagCount, byteOrder);
87
+ tagValueOffset = offset + TAG_VALUE_OFFSET;
88
+ tagValue = getTagValue(dataView, tagValueOffset, tagType, tagCount, byteOrder);
84
89
  } else {
85
- const tagValueOffset = Types.getLongAt(dataView, offset + TAG_VALUE_OFFSET, byteOrder);
90
+ tagValueOffset = Types.getLongAt(dataView, offset + TAG_VALUE_OFFSET, byteOrder);
86
91
  if (tagValueFitsInDataView(dataView, tiffHeaderOffset, tagValueOffset, tagType, tagCount)) {
87
92
  const forceByteType = tagCode === TAG_CODE_IPTC_NAA;
88
93
  tagValue = getTagValue(dataView, tiffHeaderOffset + tagValueOffset, tagType, tagCount, byteOrder, forceByteType);
@@ -120,7 +125,8 @@ function readTag(dataView, ifdType, tiffHeaderOffset, offset, byteOrder, include
120
125
  id: tagCode,
121
126
  name: tagName,
122
127
  value: tagValue,
123
- description: tagDescription
128
+ description: tagDescription,
129
+ __offset: tagValueOffset
124
130
  };
125
131
  }
126
132
 
package/src/tags.js CHANGED
@@ -22,7 +22,7 @@ function read(dataView, tiffHeaderOffset, includeUnknown) {
22
22
  tags = readGpsIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown);
23
23
  tags = readInteroperabilityIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown);
24
24
 
25
- return tags;
25
+ return {tags, byteOrder};
26
26
  }
27
27
 
28
28
  function read0thIfd(dataView, tiffHeaderOffset, byteOrder, includeUnknown) {
package/webpack.config.js CHANGED
@@ -81,7 +81,7 @@ module.exports = {
81
81
  }
82
82
  },
83
83
  {
84
- test: /[/\\](exif-reader|image-header-?(tiff|jpeg|png|heic|avif|iso-bmff|webp|gif)?|tags|tag-names)\.js$/,
84
+ test: /[/\\](exif-reader|image-header-?(tiff|jpeg|png|heic|avif|iso-bmff|webp|gif)?|tags|tag-names|tags-helpers|png-text-tags)\.js$/,
85
85
  loader: 'string-replace-loader',
86
86
  options: {
87
87
  multiple: getConstantReplacements(includedModules)
@@ -100,6 +100,8 @@ function parseConfig({include: includesConfig, exclude: excludesConfig}) {
100
100
  'iptc',
101
101
  'xmp',
102
102
  'icc',
103
+ 'photoshop',
104
+ 'maker_notes',
103
105
  'mpf',
104
106
  'thumbnail',
105
107
  'tiff',
@@ -163,6 +165,12 @@ function getConfig() {
163
165
  if (packageJson.include.icc) {
164
166
  packageJson.include.exif.push('ICC_Profile');
165
167
  }
168
+ if (packageJson.include.thumbnail) {
169
+ packageJson.include.exif.push('JPEGInterchangeFormat', 'JPEGInterchangeFormatLength');
170
+ }
171
+ if (packageJson.include.maker_notes) {
172
+ packageJson.include.exif.push('MakerNote', 'Make');
173
+ }
166
174
  }
167
175
  return {include: packageJson.include};
168
176
  }