Store Exif Thumbnail as Blob instead of ObjectURL.

blueimp · blueimp · commit 6d35b9792b18 · 2020-04-10T20:02:59.000+09:00
diff --git a/js/load-image-exif.js b/js/load-image-exif.js
@@ -32,7 +32,8 @@
   }
 
   loadImage.ExifMap.prototype.map = {
-    Orientation: 0x0112
+    Orientation: 0x0112,
+    Thumbnail: 0x0201
   }
 
   loadImage.ExifMap.prototype.get = function (id) {
@@ -44,9 +45,7 @@
       console.log('Invalid Exif data: Invalid thumbnail data.')
       return
     }
-    return loadImage.createObjectURL(
-      new Blob([dataView.buffer.slice(offset, offset + length)])
-    )
+    return new Blob([dataView.buffer.slice(offset, offset + length)])
   }
 
   loadImage.exifTagTypes = {
@@ -229,7 +228,6 @@
     var tiffOffset = offset + 10
     var littleEndian
     var dirOffset
-    var thumbnailData
     // Check for the ASCII code for "Exif" (0x45786966):
     if (dataView.getUint32(offset + 4) !== 0x45786966) {
       // No Exif data, might be XMP data instead
@@ -280,20 +278,19 @@
       data
     )
     if (dirOffset && !options.disableExifThumbnail) {
-      thumbnailData = { exif: {} }
       dirOffset = loadImage.parseExifTags(
         dataView,
         tiffOffset,
         tiffOffset + dirOffset,
         littleEndian,
-        thumbnailData
+        data
       )
       // Check for JPEG Thumbnail offset:
-      if (thumbnailData.exif[0x0201]) {
-        data.exif.Thumbnail = loadImage.getExifThumbnail(
+      if (data.exif[0x0201]) {
+        data.exif[0x0201] = loadImage.getExifThumbnail(
           dataView,
-          tiffOffset + thumbnailData.exif[0x0201],
-          thumbnailData.exif[0x0202] // Thumbnail data length
+          tiffOffset + data.exif[0x0201],
+          data.exif[0x0202] // Thumbnail data length
         )
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`loadImage.ExifMap.prototype.map = {`
`35`		`- Orientation: 0x0112`
	`35`	`+ Orientation: 0x0112,`
	`36`	`+ Thumbnail: 0x0201`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`loadImage.ExifMap.prototype.get = function (id) {`
`@@ -44,9 +45,7 @@`
`44`	`45`	`console.log('Invalid Exif data: Invalid thumbnail data.')`
`45`	`46`	`return`
`46`	`47`	`}`
`47`		`- return loadImage.createObjectURL(`
`48`		`- new Blob([dataView.buffer.slice(offset, offset + length)])`
`49`		`- )`
	`48`	`+ return new Blob([dataView.buffer.slice(offset, offset + length)])`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`loadImage.exifTagTypes = {`
`@@ -229,7 +228,6 @@`
`229`	`228`	`var tiffOffset = offset + 10`
`230`	`229`	`var littleEndian`
`231`	`230`	`var dirOffset`
`232`		`- var thumbnailData`
`233`	`231`	`// Check for the ASCII code for "Exif" (0x45786966):`
`234`	`232`	`if (dataView.getUint32(offset + 4) !== 0x45786966) {`
`235`	`233`	`// No Exif data, might be XMP data instead`
`@@ -280,20 +278,19 @@`
`280`	`278`	`data`
`281`	`279`	`)`
`282`	`280`	`if (dirOffset && !options.disableExifThumbnail) {`
`283`		`- thumbnailData = { exif: {} }`
`284`	`281`	`dirOffset = loadImage.parseExifTags(`
`285`	`282`	`dataView,`
`286`	`283`	`tiffOffset,`
`287`	`284`	`tiffOffset + dirOffset,`
`288`	`285`	`littleEndian,`
`289`		`- thumbnailData`
	`286`	`+ data`
`290`	`287`	`)`
`291`	`288`	`// Check for JPEG Thumbnail offset:`
`292`		`- if (thumbnailData.exif[0x0201]) {`
`293`		`- data.exif.Thumbnail = loadImage.getExifThumbnail(`
	`289`	`+ if (data.exif[0x0201]) {`
	`290`	`+ data.exif[0x0201] = loadImage.getExifThumbnail(`
`294`	`291`	`dataView,`
`295`		`- tiffOffset + thumbnailData.exif[0x0201],`
`296`		`- thumbnailData.exif[0x0202] // Thumbnail data length`
	`292`	`+ tiffOffset + data.exif[0x0201],`
	`293`	`+ data.exif[0x0202] // Thumbnail data length`
`297`	`294`	`)`
`298`	`295`	`}`
`299`	`296`	`}`