exifreader 4.13.1 → 4.14.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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "exifreader",
3
- "version": "4.13.1",
3
+ "version": "4.14.0",
4
4
  "description": "Library that parses Exif metadata in images.",
5
5
  "author": "Mattias Wallander <mattias@wallander.eu>",
6
6
  "repository": {
@@ -23,6 +23,7 @@ import IccTags from './icc-tags.js';
23
23
  import PngFileTags from './png-file-tags.js';
24
24
  import PngTextTags from './png-text-tags.js';
25
25
  import PngTags from './png-tags.js';
26
+ import Vp8xTags from './vp8x-tags.js';
26
27
  import Thumbnail from './thumbnail.js';
27
28
  import exifErrors from './errors.js';
28
29
 
@@ -196,6 +197,7 @@ export function loadView(dataView, {expanded = false, includeUnknown = false} =
196
197
  let tags = {};
197
198
 
198
199
  const {
200
+ fileType,
199
201
  fileDataOffset,
200
202
  jfifDataOffset,
201
203
  tiffHeaderOffset,
@@ -205,7 +207,8 @@ export function loadView(dataView, {expanded = false, includeUnknown = false} =
205
207
  mpfDataOffset,
206
208
  pngHeaderOffset,
207
209
  pngTextChunks,
208
- pngChunkOffsets
210
+ pngChunkOffsets,
211
+ vp8xChunkOffset,
209
212
  } = ImageHeader.parseAppMarkers(dataView);
210
213
 
211
214
  if (Constants.USE_JPEG && Constants.USE_FILE && hasFileData(fileDataOffset)) {
@@ -353,6 +356,16 @@ export function loadView(dataView, {expanded = false, includeUnknown = false} =
353
356
  }
354
357
  }
355
358
 
359
+ if (Constants.USE_WEBP && hasVp8xData(vp8xChunkOffset)) {
360
+ foundMetaData = true;
361
+ const readTags = Vp8xTags.read(dataView, vp8xChunkOffset);
362
+ if (expanded) {
363
+ tags.riff = !tags.riff ? readTags : objectAssign({}, tags.riff, readTags);
364
+ } else {
365
+ tags = objectAssign({}, tags, readTags);
366
+ }
367
+ }
368
+
356
369
  const thumbnail = (Constants.USE_JPEG || Constants.USE_WEBP)
357
370
  && Constants.USE_EXIF
358
371
  && Constants.USE_THUMBNAIL
@@ -364,6 +377,17 @@ export function loadView(dataView, {expanded = false, includeUnknown = false} =
364
377
  delete tags.Thumbnail;
365
378
  }
366
379
 
380
+ if (fileType) {
381
+ if (expanded) {
382
+ if (!tags.file) {
383
+ tags.file = {};
384
+ }
385
+ tags.file.FileType = fileType;
386
+ } else {
387
+ tags.FileType = fileType;
388
+ }
389
+ }
390
+
367
391
  if (!foundMetaData) {
368
392
  throw new exifErrors.MetadataMissingError();
369
393
  }
@@ -450,3 +474,7 @@ function hasPngTextData(pngTextChunks) {
450
474
  function hasPngData(pngChunkOffsets) {
451
475
  return pngChunkOffsets !== undefined;
452
476
  }
477
+
478
+ function hasVp8xData(vp8xChunkOffset) {
479
+ return vp8xChunkOffset !== undefined;
480
+ }
@@ -31,6 +31,7 @@ function findOffsets(dataView) {
31
31
  let tiffHeaderOffset;
32
32
  let xmpChunks;
33
33
  let iccChunks;
34
+ let vp8xChunkOffset;
34
35
 
35
36
  while (offset + CHUNK_HEADER_SIZE < dataView.byteLength) {
36
37
  const chunkId = getStringFromDataView(dataView, offset, 4);
@@ -57,6 +58,9 @@ function findOffsets(dataView) {
57
58
  chunkNumber: 1,
58
59
  chunksTotal: 1
59
60
  }];
61
+ } else if (chunkId === 'VP8X') {
62
+ hasAppMarkers = true;
63
+ vp8xChunkOffset = offset + CHUNK_HEADER_SIZE;
60
64
  }
61
65
 
62
66
  offset += CHUNK_HEADER_SIZE + (chunkSize % 2 === 0 ? chunkSize : chunkSize + 1);
@@ -66,6 +70,7 @@ function findOffsets(dataView) {
66
70
  hasAppMarkers,
67
71
  tiffHeaderOffset,
68
72
  xmpChunks,
69
- iccChunks
73
+ iccChunks,
74
+ vp8xChunkOffset
70
75
  };
71
76
  }
@@ -8,6 +8,7 @@ import Jpeg from './image-header-jpeg.js';
8
8
  import Png from './image-header-png.js';
9
9
  import Heic from './image-header-heic.js';
10
10
  import Webp from './image-header-webp.js';
11
+ import {objectAssign} from './utils.js';
11
12
 
12
13
  export default {
13
14
  parseAppMarkers
@@ -15,24 +16,28 @@ export default {
15
16
 
16
17
  function parseAppMarkers(dataView) {
17
18
  if (Constants.USE_TIFF && Tiff.isTiffFile(dataView)) {
18
- return Tiff.findTiffOffsets();
19
+ return addFileType(Tiff.findTiffOffsets(), 'tiff', 'TIFF');
19
20
  }
20
21
 
21
22
  if (Constants.USE_JPEG && Jpeg.isJpegFile(dataView)) {
22
- return Jpeg.findJpegOffsets(dataView);
23
+ return addFileType(Jpeg.findJpegOffsets(dataView), 'jpeg', 'JPEG');
23
24
  }
24
25
 
25
26
  if (Constants.USE_PNG && Png.isPngFile(dataView)) {
26
- return Png.findPngOffsets(dataView);
27
+ return addFileType(Png.findPngOffsets(dataView), 'png', 'PNG');
27
28
  }
28
29
 
29
30
  if (Constants.USE_HEIC && Heic.isHeicFile(dataView)) {
30
- return Heic.findHeicOffsets(dataView);
31
+ return addFileType(Heic.findHeicOffsets(dataView), 'heic', 'HEIC');
31
32
  }
32
33
 
33
34
  if (Constants.USE_WEBP && Webp.isWebpFile(dataView)) {
34
- return Webp.findOffsets(dataView);
35
+ return addFileType(Webp.findOffsets(dataView), 'webp', 'WebP');
35
36
  }
36
37
 
37
38
  throw new Error('Invalid image format');
38
39
  }
40
+
41
+ function addFileType(offsets, fileType, fileTypeDescription) {
42
+ return objectAssign({}, offsets, {fileType: {value: fileType, description: fileTypeDescription}});
43
+ }
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
 
@@ -0,0 +1,55 @@
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
+ import Types from './types.js';
6
+
7
+ export default {
8
+ read
9
+ };
10
+
11
+ const IMAGE_WIDTH_OFFSET = 4;
12
+ const IMAGE_HEIGHT_OFFSET = 7;
13
+
14
+ // https://developers.google.com/speed/webp/docs/riff_container#extended_file_format
15
+ function read(dataView, chunkOffset) {
16
+ const tags = {};
17
+
18
+ const flags = Types.getByteAt(dataView, chunkOffset);
19
+
20
+ tags['Alpha'] = getAlpha(flags);
21
+ tags['Animation'] = getAnimation(flags);
22
+ tags['ImageWidth'] = getThreeByteValue(dataView, chunkOffset + IMAGE_WIDTH_OFFSET);
23
+ tags['ImageHeight'] = getThreeByteValue(dataView, chunkOffset + IMAGE_HEIGHT_OFFSET);
24
+
25
+ return tags;
26
+ }
27
+
28
+ function getAlpha(flags) {
29
+ const value = flags & 0x10;
30
+ return {
31
+ value: value ? 1 : 0,
32
+ description: value ? 'Yes' : 'No'
33
+ };
34
+ }
35
+
36
+ function getAnimation(flags) {
37
+ const value = flags & 0x02;
38
+ return {
39
+ value: value ? 1 : 0,
40
+ description: value ? 'Yes' : 'No'
41
+ };
42
+ }
43
+
44
+ function getThreeByteValue(dataView, offset) {
45
+ // Values are stored little-endian.
46
+ const value = Types.getByteAt(dataView, offset)
47
+ + 256 * Types.getByteAt(dataView, offset + 1)
48
+ + 256 * 256 * Types.getByteAt(dataView, offset + 2)
49
+ + 1; // Value is 1-based, i.e. a value of 7 means 8px.
50
+
51
+ return {
52
+ value,
53
+ description: value + 'px'
54
+ };
55
+ }