exifreader 4.13.1 → 4.13.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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "exifreader",
3
- "version": "4.13.1",
3
+ "version": "4.13.2",
4
4
  "description": "Library that parses Exif metadata in images.",
5
5
  "author": "Mattias Wallander <mattias@wallander.eu>",
6
6
  "repository": {
package/src/tag-names.js CHANGED
@@ -12,10 +12,18 @@ import TagNamesMpfIfd from './tag-names-mpf-ifd.js';
12
12
 
13
13
  const tagNames0thExifIfds = objectAssign({}, TagNames0thIfd, TagNamesExifIfd);
14
14
 
15
+ export const IFD_TYPE_0TH = '0th';
16
+ export const IFD_TYPE_1ST = '1st';
17
+ export const IFD_TYPE_EXIF = 'exif';
18
+ export const IFD_TYPE_GPS = 'gps';
19
+ export const IFD_TYPE_INTEROPERABILITY = 'interoperability';
20
+ export const IFD_TYPE_MPF = 'mpf';
21
+
15
22
  export default {
16
- '0th': tagNames0thExifIfds,
17
- 'exif': tagNames0thExifIfds,
18
- 'gps': TagNamesGpsIfd,
19
- 'interoperability': TagNamesInteroperabilityIfd,
20
- 'mpf': Constants.USE_MPF ? TagNamesMpfIfd : {},
23
+ [IFD_TYPE_0TH]: tagNames0thExifIfds,
24
+ [IFD_TYPE_1ST]: TagNames0thIfd,
25
+ [IFD_TYPE_EXIF]: tagNames0thExifIfds,
26
+ [IFD_TYPE_GPS]: TagNamesGpsIfd,
27
+ [IFD_TYPE_INTEROPERABILITY]: TagNamesInteroperabilityIfd,
28
+ [IFD_TYPE_MPF]: Constants.USE_MPF ? TagNamesMpfIfd : {},
21
29
  };
package/src/tags.js CHANGED
@@ -6,7 +6,7 @@ import Constants from './constants.js';
6
6
  import {objectAssign} from './utils.js';
7
7
  import ByteOrder from './byte-order.js';
8
8
  import Types from './types.js';
9
- import TagNames from './tag-names.js';
9
+ import TagNames, {IFD_TYPE_0TH, IFD_TYPE_1ST, IFD_TYPE_EXIF, IFD_TYPE_GPS, IFD_TYPE_INTEROPERABILITY, IFD_TYPE_MPF} from './tag-names.js';
10
10
  import {deferInit, getBase64Image} from './utils.js';
11
11
 
12
12
  const EXIF_IFD_POINTER_KEY = 'Exif IFD Pointer';
@@ -41,7 +41,7 @@ function read(dataView, tiffHeaderOffset, includeUnknown) {
41
41
  }
42
42
 
43
43
  function read0thIfd(dataView, tiffHeaderOffset, byteOrder, includeUnknown) {
44
- return readIfd(dataView, '0th', tiffHeaderOffset, get0thIfdOffset(dataView, tiffHeaderOffset, byteOrder), byteOrder, includeUnknown);
44
+ return readIfd(dataView, IFD_TYPE_0TH, tiffHeaderOffset, get0thIfdOffset(dataView, tiffHeaderOffset, byteOrder), byteOrder, includeUnknown);
45
45
  }
46
46
 
47
47
  function get0thIfdOffset(dataView, tiffHeaderOffset, byteOrder) {
@@ -50,7 +50,7 @@ function get0thIfdOffset(dataView, tiffHeaderOffset, byteOrder) {
50
50
 
51
51
  function readExifIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown) {
52
52
  if (tags[EXIF_IFD_POINTER_KEY] !== undefined) {
53
- return objectAssign(tags, readIfd(dataView, 'exif', tiffHeaderOffset, tiffHeaderOffset + tags[EXIF_IFD_POINTER_KEY].value, byteOrder, includeUnknown));
53
+ return objectAssign(tags, readIfd(dataView, IFD_TYPE_EXIF, tiffHeaderOffset, tiffHeaderOffset + tags[EXIF_IFD_POINTER_KEY].value, byteOrder, includeUnknown));
54
54
  }
55
55
 
56
56
  return tags;
@@ -58,7 +58,7 @@ function readExifIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown
58
58
 
59
59
  function readGpsIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown) {
60
60
  if (tags[GPS_INFO_IFD_POINTER_KEY] !== undefined) {
61
- return objectAssign(tags, readIfd(dataView, 'gps', tiffHeaderOffset, tiffHeaderOffset + tags[GPS_INFO_IFD_POINTER_KEY].value, byteOrder, includeUnknown));
61
+ return objectAssign(tags, readIfd(dataView, IFD_TYPE_GPS, tiffHeaderOffset, tiffHeaderOffset + tags[GPS_INFO_IFD_POINTER_KEY].value, byteOrder, includeUnknown));
62
62
  }
63
63
 
64
64
  return tags;
@@ -66,7 +66,7 @@ function readGpsIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown)
66
66
 
67
67
  function readInteroperabilityIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown) {
68
68
  if (tags[INTEROPERABILITY_IFD_POINTER_KEY] !== undefined) {
69
- return objectAssign(tags, readIfd(dataView, 'interoperability', tiffHeaderOffset, tiffHeaderOffset + tags[INTEROPERABILITY_IFD_POINTER_KEY].value, byteOrder, includeUnknown));
69
+ return objectAssign(tags, readIfd(dataView, IFD_TYPE_INTEROPERABILITY, tiffHeaderOffset, tiffHeaderOffset + tags[INTEROPERABILITY_IFD_POINTER_KEY].value, byteOrder, includeUnknown));
70
70
  }
71
71
 
72
72
  return tags;
@@ -74,7 +74,7 @@ function readInteroperabilityIfd(tags, dataView, tiffHeaderOffset, byteOrder, in
74
74
 
75
75
  function readMpf(dataView, dataOffset, includeUnknown) {
76
76
  const byteOrder = ByteOrder.getByteOrder(dataView, dataOffset);
77
- const tags = readIfd(dataView, 'mpf', dataOffset, get0thIfdOffset(dataView, dataOffset, byteOrder), byteOrder, includeUnknown);
77
+ const tags = readIfd(dataView, IFD_TYPE_MPF, dataOffset, get0thIfdOffset(dataView, dataOffset, byteOrder), byteOrder, includeUnknown);
78
78
  return addMpfImages(dataView, dataOffset, tags, byteOrder);
79
79
  }
80
80
 
@@ -229,8 +229,8 @@ function readIfd(dataView, ifdType, tiffHeaderOffset, offset, byteOrder, include
229
229
 
230
230
  if (Constants.USE_THUMBNAIL && (offset < dataView.byteLength - Types.getTypeSize('LONG'))) {
231
231
  const nextIfdOffset = Types.getLongAt(dataView, offset, byteOrder);
232
- if (nextIfdOffset !== 0) {
233
- tags['Thumbnail'] = readIfd(dataView, ifdType, tiffHeaderOffset, tiffHeaderOffset + nextIfdOffset, byteOrder, true);
232
+ if (nextIfdOffset !== 0 && ifdType === IFD_TYPE_0TH) {
233
+ tags['Thumbnail'] = readIfd(dataView, IFD_TYPE_1ST, tiffHeaderOffset, tiffHeaderOffset + nextIfdOffset, byteOrder, true);
234
234
  }
235
235
  }
236
236