Update GH pages using commit f97f8f1

mattiasw · Apr 8, 2024 · b0dc7f8 · b0dc7f8
1 parent 3974d01
commit b0dc7f8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/exif-reader.js b/exif-reader.js
diff --git a/exif-reader.js.map b/exif-reader.js.map
diff --git a/src/image-header-iso-bmff-iloc.js b/src/image-header-iso-bmff-iloc.js
@@ -136,6 +136,8 @@ function getVariableSizedValue(dataView, offset, size) {
         return dataView.getUint32(offset);
     }
     if (size === 8) {
+        // eslint-disable-next-line no-console
+        console.warn('This file uses an 8-bit offset which is currently not supported by ExifReader. Contact the maintainer to get it fixed.');
         return get64BitValue(dataView, offset);
     }
     return 0;

diff --git a/src/image-header-iso-bmff.js b/src/image-header-iso-bmff.js
@@ -207,7 +207,8 @@ function findMetaBox(dataView) {
 function findExifOffset(dataView, metaBox) {
     try {
         const exifItemId = findIinfExifItemId(metaBox).itemId;
-        const exifOffset = findIlocItem(metaBox, exifItemId).extents[0].extentOffset;
+        const ilocItem = findIlocItem(metaBox, exifItemId);
+        const exifOffset = ilocItem.baseOffset + ilocItem.extents[0].extentOffset;
         return getTiffHeaderOffset(dataView, exifOffset);
     } catch (error) {
         return undefined;
@@ -232,11 +233,12 @@ function getTiffHeaderOffset(dataView, exifOffset) {
 function findXmpChunks(metaBox) {
     try {
         const xmpItemId = findIinfXmpItemId(metaBox).itemId;
-        const ilocItem = findIlocItem(metaBox, xmpItemId).extents[0];
+        const ilocItem = findIlocItem(metaBox, xmpItemId);
+        const ilocItemExtent = findIlocItem(metaBox, xmpItemId).extents[0];
         return [
             {
-                dataOffset: ilocItem.extentOffset,
-                length: ilocItem.extentLength,
+                dataOffset: ilocItem.baseOffset + ilocItemExtent.extentOffset,
+                length: ilocItemExtent.extentLength,
             }
         ];
     } catch (error) {