exifreader 4.29.0 → 4.30.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/exif-reader.d.ts CHANGED
@@ -207,7 +207,7 @@ export interface ExpandedTags {
207
207
  Thumbnail?: ThumbnailTags,
208
208
  gps?: GpsTags
209
209
  photoshop?: PhotoshopTags;
210
- makerNotes?: CanonTags;
210
+ makerNotes?: CanonTags & PentaxTags;
211
211
  composite?: CompositeTags;
212
212
  }
213
213
 
@@ -260,8 +260,31 @@ interface PhotoshopTags {
260
260
 
261
261
  interface CanonTags {
262
262
  AutoRotate: {
263
- value: number,
264
- description: 'None' | 'Rotate 90 CW' | 'Rotate 180' | 'Rotate 270 CW' | 'Unknown'
263
+ value: number;
264
+ description: 'None' | 'Rotate 90 CW' | 'Rotate 180' | 'Rotate 270 CW' | 'Unknown';
265
+ };
266
+ }
267
+
268
+ interface PentaxTags {
269
+ PentaxVersion: {
270
+ value: number[];
271
+ description: string;
272
+ };
273
+ PentaxModelID: {
274
+ value: number;
275
+ description: string;
276
+ };
277
+ Orientation: {
278
+ value: number;
279
+ description: 'Horizontal (normal)' | 'Rotate 270 CW' | 'Rotate 180' | 'Rotate 90 CW' | 'Upwards' | 'Downwards' | 'Unknown';
280
+ };
281
+ RollAngle: {
282
+ value: number;
283
+ description: string;
284
+ };
285
+ PitchAngle: {
286
+ value: number;
287
+ description: string;
265
288
  };
266
289
  }
267
290
 
@@ -537,7 +560,7 @@ interface IccTags {
537
560
  [name: string]: ValueTag;
538
561
  }
539
562
 
540
- export type Tags = XmpTags & IccTags & PngTags & RiffTags & GifTags & PhotoshopTags & CanonTags & CompositeTags & {
563
+ export type Tags = XmpTags & IccTags & PngTags & RiffTags & GifTags & PhotoshopTags & CanonTags & PentaxTags & CompositeTags & {
541
564
  'Thumbnail'?: ThumbnailTags;
542
565
  'Images'?: MPFImageTags[],
543
566
  } & {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "exifreader",
3
- "version": "4.29.0",
3
+ "version": "4.30.1",
4
4
  "description": "Library that parses Exif metadata in images.",
5
5
  "author": "Mattias Wallander <mattias@wallander.eu>",
6
6
  "repository": {
@@ -45,7 +45,7 @@
45
45
  "string-replace-loader": "^3.1.0",
46
46
  "terser-webpack-plugin": "^5.3.10",
47
47
  "typescript": "^5.6.2",
48
- "webpack": "5.99.6",
48
+ "webpack": "5.99.7",
49
49
  "webpack-cli": "^5.1.4",
50
50
  "webpack-dev-server": "^5.0.4"
51
51
  },
@@ -23,6 +23,7 @@ import XmpTags from './xmp-tags.js';
23
23
  import PhotoshopTags from './photoshop-tags.js';
24
24
  import IccTags from './icc-tags.js';
25
25
  import CanonTags from './canon-tags.js';
26
+ import PentaxTags from './pentax-tags.js';
26
27
  import PngFileTags from './png-file-tags.js';
27
28
  import PngTextTags from './png-text-tags.js';
28
29
  import PngTags from './png-tags.js';
@@ -287,7 +288,7 @@ export function loadView(
287
288
  }
288
289
  }
289
290
 
290
- if (Constants.USE_PHOTOSHOP && readTags['ImageSourceData']) {
291
+ if (Constants.USE_PHOTOSHOP && readTags['ImageSourceData'] && readTags['PhotoshopSettings']) {
291
292
  const readPhotoshopTags = PhotoshopTags.read(readTags['PhotoshopSettings'].value, includeUnknown);
292
293
  if (expanded) {
293
294
  tags.photoshop = readPhotoshopTags;
@@ -313,7 +314,7 @@ export function loadView(
313
314
  }
314
315
  }
315
316
 
316
- if (Constants.USE_MAKER_NOTES) {
317
+ if (Constants.USE_MAKER_NOTES && readTags['MakerNote']) {
317
318
  if (hasCanonData(readTags)) {
318
319
  const readCanonTags = CanonTags.read(dataView, tiffHeaderOffset, readTags['MakerNote'].__offset, byteOrder, includeUnknown);
319
320
  if (expanded) {
@@ -321,6 +322,13 @@ export function loadView(
321
322
  } else {
322
323
  tags = objectAssign({}, tags, readCanonTags);
323
324
  }
325
+ } else if (hasPentaxType1Data(readTags)) {
326
+ const readPentaxTags = PentaxTags.read(dataView, tiffHeaderOffset, readTags['MakerNote'].__offset, includeUnknown);
327
+ if (expanded) {
328
+ tags.makerNotes = readPentaxTags;
329
+ } else {
330
+ tags = objectAssign({}, tags, readPentaxTags);
331
+ }
324
332
  }
325
333
  }
326
334
 
@@ -563,6 +571,13 @@ function hasCanonData(tags) {
563
571
  && tags['MakerNote'] && tags['MakerNote'].__offset;
564
572
  }
565
573
 
574
+ function hasPentaxType1Data(tags) {
575
+ const PENTAX_ID_STRING = 'PENTAX ';
576
+ return tags['MakerNote'].value.length > PENTAX_ID_STRING.length
577
+ && getStringValueFromArray(tags['MakerNote'].value.slice(0, PENTAX_ID_STRING.length)) === PENTAX_ID_STRING
578
+ && tags['MakerNote'].__offset;
579
+ }
580
+
566
581
  function hasMpfData(mpfDataOffset) {
567
582
  return mpfDataOffset !== undefined;
568
583
  }
@@ -0,0 +1,110 @@
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://exiftool.org/makernote_types.html
7
+ // https://exiv2.org/makernote.html
8
+ // https://exiftool.org/TagNames/Pentax.html
9
+
10
+ import ByteOrder from './byte-order.js';
11
+ import {objectAssign} from './utils.js';
12
+ import {readIfd} from './tags-helpers.js';
13
+ import {IFD_TYPE_PENTAX} from './tag-names.js';
14
+
15
+ const BYTE_ORDER_OFFSET = 8; // Pextax5: https://exiftool.org/makernote_types.html
16
+ const PENTAX_IFD_OFFSET = BYTE_ORDER_OFFSET + 2; // https://exiftool.org/makernote_types.html
17
+
18
+ const MODEL_ID = {
19
+ K3_III: 0x13254,
20
+ };
21
+ const LIK3III = {
22
+ CAMERA_ORIENTATION: 1,
23
+ ROLL_ANGLE: 3,
24
+ PITCH_ANGLE: 5
25
+ };
26
+
27
+ export default {
28
+ read,
29
+ PENTAX_IFD_OFFSET,
30
+ MODEL_ID,
31
+ LIK3III
32
+ };
33
+
34
+ function read(dataView, tiffHeaderOffset, offset, includeUnknown) {
35
+ // Pentax does not use the standard TIFF header offset as base for tag
36
+ // offsets but instead uses the start of the IFD, i.e. directly after the
37
+ // two byte order bytes. originOffset below is this offset.
38
+ const byteOrder = ByteOrder.getByteOrder(dataView, tiffHeaderOffset + offset + BYTE_ORDER_OFFSET);
39
+ const originOffset = tiffHeaderOffset + offset;
40
+ let tags = readIfd(dataView, IFD_TYPE_PENTAX, originOffset, originOffset + PENTAX_IFD_OFFSET, byteOrder, includeUnknown, true);
41
+
42
+ if (hasLevelInfoK3III(tags)) {
43
+ tags = objectAssign({}, tags, parseLevelInfoK3III(dataView, originOffset + tags['LevelInfo'].__offset, byteOrder));
44
+ delete tags['LevelInfo'];
45
+ }
46
+
47
+ return tags;
48
+ }
49
+
50
+ function hasLevelInfoK3III(tags) {
51
+ return tags['PentaxModelID'] && tags['PentaxModelID'].value === MODEL_ID.K3_III && tags['LevelInfo'];
52
+ }
53
+
54
+ function parseLevelInfoK3III(dataView, levelInfoOffset, byteOrder) {
55
+ const tags = {};
56
+
57
+ if (levelInfoOffset + 7 > dataView.byteLength) {
58
+ return tags;
59
+ }
60
+
61
+ const cameraOrientation = dataView.getInt8(levelInfoOffset + LIK3III.CAMERA_ORIENTATION);
62
+ tags['CameraOrientation'] = {
63
+ value: cameraOrientation,
64
+ description: getOrientationDescription(cameraOrientation)
65
+ };
66
+
67
+ const rollAngle = dataView.getInt16(levelInfoOffset + LIK3III.ROLL_ANGLE, byteOrder === ByteOrder.LITTLE_ENDIAN);
68
+ tags['RollAngle'] = {
69
+ value: rollAngle,
70
+ description: getRollAngleDescription(rollAngle)
71
+ };
72
+
73
+ const pitchAngle = dataView.getInt16(levelInfoOffset + LIK3III.PITCH_ANGLE, byteOrder === ByteOrder.LITTLE_ENDIAN);
74
+ tags['PitchAngle'] = {
75
+ value: pitchAngle,
76
+ description: getPitchAngleDescription(pitchAngle)
77
+ };
78
+
79
+ return tags;
80
+ }
81
+
82
+ function getOrientationDescription(orientation) {
83
+ if (orientation === 0) {
84
+ return 'Horizontal (normal)';
85
+ }
86
+ if (orientation === 1) {
87
+ return 'Rotate 270 CW';
88
+ }
89
+ if (orientation === 2) {
90
+ return 'Rotate 180';
91
+ }
92
+ if (orientation === 3) {
93
+ return 'Rotate 90 CW';
94
+ }
95
+ if (orientation === 4) {
96
+ return 'Upwards';
97
+ }
98
+ if (orientation === 5) {
99
+ return 'Downwards';
100
+ }
101
+ return 'Unknown';
102
+ }
103
+
104
+ function getRollAngleDescription(rollAngle) {
105
+ return '' + (rollAngle * -0.5);
106
+ }
107
+
108
+ function getPitchAngleDescription(pitchAngle) {
109
+ return '' + (pitchAngle * -0.5);
110
+ }
@@ -0,0 +1,12 @@
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
+ 0x0000: {
7
+ 'name': 'PentaxVersion',
8
+ 'description': (value) => value.join('.')
9
+ },
10
+ 0x0005: 'PentaxModelID',
11
+ 0x022b: 'LevelInfo'
12
+ };
package/src/tag-names.js CHANGED
@@ -10,6 +10,7 @@ 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
12
  import TagNamesCanonIfd from './tag-names-canon-ifd.js';
13
+ import TagNamesPentaxIfd from './tag-names-pentax-ifd.js';
13
14
 
14
15
  const tagNames0thExifIfds = objectAssign({}, TagNames0thIfd, TagNamesExifIfd);
15
16
 
@@ -20,6 +21,7 @@ export const IFD_TYPE_GPS = 'gps';
20
21
  export const IFD_TYPE_INTEROPERABILITY = 'interoperability';
21
22
  export const IFD_TYPE_MPF = 'mpf';
22
23
  export const IFD_TYPE_CANON = 'canon';
24
+ export const IFD_TYPE_PENTAX = 'pentax';
23
25
 
24
26
  export default {
25
27
  [IFD_TYPE_0TH]: tagNames0thExifIfds,
@@ -29,4 +31,5 @@ export default {
29
31
  [IFD_TYPE_INTEROPERABILITY]: TagNamesInteroperabilityIfd,
30
32
  [IFD_TYPE_MPF]: Constants.USE_MPF ? TagNamesMpfIfd : {},
31
33
  [IFD_TYPE_CANON]: Constants.USE_MAKER_NOTES ? TagNamesCanonIfd : {},
34
+ [IFD_TYPE_PENTAX]: Constants.USE_MAKER_NOTES ? TagNamesPentaxIfd : {},
32
35
  };
@@ -4,7 +4,7 @@
4
4
 
5
5
  import Constants from './constants.js';
6
6
  import Types from './types.js';
7
- import TagNames, {IFD_TYPE_0TH, IFD_TYPE_1ST} from './tag-names.js';
7
+ import TagNames, {IFD_TYPE_0TH, IFD_TYPE_1ST, IFD_TYPE_PENTAX} from './tag-names.js';
8
8
 
9
9
  const getTagValueAt = {
10
10
  1: Types.getByteAt,
@@ -22,7 +22,7 @@ export function get0thIfdOffset(dataView, tiffHeaderOffset, byteOrder) {
22
22
  return tiffHeaderOffset + Types.getLongAt(dataView, tiffHeaderOffset + 4, byteOrder);
23
23
  }
24
24
 
25
- export function readIfd(dataView, ifdType, tiffHeaderOffset, offset, byteOrder, includeUnknown) {
25
+ export function readIfd(dataView, ifdType, offsetOrigin, offset, byteOrder, includeUnknown) {
26
26
  const FIELD_COUNT_SIZE = Types.getTypeSize('SHORT');
27
27
  const FIELD_SIZE = 12;
28
28
 
@@ -35,14 +35,14 @@ export function readIfd(dataView, ifdType, tiffHeaderOffset, offset, byteOrder,
35
35
  break;
36
36
  }
37
37
 
38
- const tag = readTag(dataView, ifdType, tiffHeaderOffset, offset, byteOrder, includeUnknown);
38
+ const tag = readTag(dataView, ifdType, offsetOrigin, offset, byteOrder, includeUnknown);
39
39
  if (tag !== undefined) {
40
40
  tags[tag.name] = {
41
41
  'id': tag.id,
42
42
  'value': tag.value,
43
43
  'description': tag.description
44
44
  };
45
- if (tag.name === 'MakerNote') {
45
+ if (tag.name === 'MakerNote' || (ifdType === IFD_TYPE_PENTAX && tag.name === 'LevelInfo')) {
46
46
  tags[tag.name].__offset = tag.__offset;
47
47
  }
48
48
  }
@@ -53,7 +53,7 @@ export function readIfd(dataView, ifdType, tiffHeaderOffset, offset, byteOrder,
53
53
  if (Constants.USE_THUMBNAIL && (offset < dataView.byteLength - Types.getTypeSize('LONG'))) {
54
54
  const nextIfdOffset = Types.getLongAt(dataView, offset, byteOrder);
55
55
  if (nextIfdOffset !== 0 && ifdType === IFD_TYPE_0TH) {
56
- tags['Thumbnail'] = readIfd(dataView, IFD_TYPE_1ST, tiffHeaderOffset, tiffHeaderOffset + nextIfdOffset, byteOrder, includeUnknown);
56
+ tags['Thumbnail'] = readIfd(dataView, IFD_TYPE_1ST, offsetOrigin, offsetOrigin + nextIfdOffset, byteOrder, includeUnknown);
57
57
  }
58
58
  }
59
59
 
@@ -67,7 +67,7 @@ function getNumberOfFields(dataView, offset, byteOrder) {
67
67
  return 0;
68
68
  }
69
69
 
70
- function readTag(dataView, ifdType, tiffHeaderOffset, offset, byteOrder, includeUnknown) {
70
+ function readTag(dataView, ifdType, offsetOrigin, offset, byteOrder, includeUnknown) {
71
71
  const TAG_CODE_IPTC_NAA = 0x83bb;
72
72
  const TAG_TYPE_OFFSET = Types.getTypeSize('SHORT');
73
73
  const TAG_COUNT_OFFSET = TAG_TYPE_OFFSET + Types.getTypeSize('SHORT');
@@ -88,9 +88,9 @@ function readTag(dataView, ifdType, tiffHeaderOffset, offset, byteOrder, include
88
88
  tagValue = getTagValue(dataView, tagValueOffset, tagType, tagCount, byteOrder);
89
89
  } else {
90
90
  tagValueOffset = Types.getLongAt(dataView, offset + TAG_VALUE_OFFSET, byteOrder);
91
- if (tagValueFitsInDataView(dataView, tiffHeaderOffset, tagValueOffset, tagType, tagCount)) {
91
+ if (tagValueFitsInDataView(dataView, offsetOrigin, tagValueOffset, tagType, tagCount)) {
92
92
  const forceByteType = tagCode === TAG_CODE_IPTC_NAA;
93
- tagValue = getTagValue(dataView, tiffHeaderOffset + tagValueOffset, tagType, tagCount, byteOrder, forceByteType);
93
+ tagValue = getTagValue(dataView, offsetOrigin + tagValueOffset, tagType, tagCount, byteOrder, forceByteType);
94
94
  } else {
95
95
  tagValue = '<faulty value>';
96
96
  }
@@ -155,8 +155,8 @@ function getTagValue(dataView, offset, type, count, byteOrder, forceByteType = f
155
155
  return value;
156
156
  }
157
157
 
158
- function tagValueFitsInDataView(dataView, tiffHeaderOffset, tagValueOffset, tagType, tagCount) {
159
- return tiffHeaderOffset + tagValueOffset + Types.typeSizes[tagType] * tagCount <= dataView.byteLength;
158
+ function tagValueFitsInDataView(dataView, offsetOrigin, tagValueOffset, tagType, tagCount) {
159
+ return offsetOrigin + tagValueOffset + Types.typeSizes[tagType] * tagCount <= dataView.byteLength;
160
160
  }
161
161
 
162
162
  function splitNullSeparatedAsciiString(string) {