exifr 1.3.9 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91531cf59588956e8b9675148197cdca2b8bcbe35edb42476bfe56f73959470b
-  data.tar.gz: ddd951e6773d11ce0a0db5214983774b8078e410451920cc441fdd55926c574e
+  metadata.gz: 2799bf290120d558fe48495596a987705abb4bc394622e459d597a746c5b57d6
+  data.tar.gz: e84597a7f20fa3f45219372403851390679841a27f90e50b57bf4d0aba88d1be
 SHA512:
-  metadata.gz: a8ebe84816409a77d19b67d1ac8a244ef63bd3a8046e08f7193e40f8bb01c2866320aa52a3664a43ed07dc6d30c2f17005d33d2408e69574987b2e5127425b0a
-  data.tar.gz: 296a144056ee9da865e663c9ef47dfc59811e24485c133a28a2b6978b62b37f7e8419a6c76e6e6aaacb52a03b599f04e18a9715e287f89c9fbff9fbac67a2c63
+  metadata.gz: c6eef386c693e4ba34e715dbc8c1334a48dbc2d454abeda218beed9cf4184a868089576e5253f3f592a3c0ab4efc9e0315da908332bfb962b070f0519ea549db
+  data.tar.gz: 421ecfff8bffbb3300b48ab7e0c670f3980ce7d39c33c079d7b53096ae7527d6ee47edaf151396979f96c78bb7fd841c31227ab66ceea9dc0590fd90f8b76c14

data/lib/exifr/jpeg.rb

@@ -29,11 +29,11 @@ module EXIFR
     attr_reader :app1s
 
     # +file+ is a filename or an IO object.  Hint: use StringIO when working with slurped data like blobs.
-    def initialize(file)
+    def initialize(file, load_thumbnails: true)
       if file.kind_of? String
-        File.open(file, 'rb') { |io| examine(io) }
+        File.open(file, 'rb') { |io| examine(io, load_thumbnails: load_thumbnails) }
       else
-        examine(file.dup)
+        examine(file.dup, load_thumbnails: load_thumbnails)
       end
     end
 
@@ -95,7 +95,7 @@ module EXIFR
       end
     end
 
-    def examine(io)
+    def examine(io, load_thumbnails: true)
       io = Reader.new(io)
 
       unless io.getbyte == 0xFF && io.getbyte == 0xD8 # SOI
@@ -121,7 +121,7 @@ module EXIFR
 
       if app1 = @app1s.find { |d| d[0..5] == "Exif\0\0" }
         @exif_data = app1[6..-1]
-        @exif = TIFF.new(StringIO.new(@exif_data))
+        @exif = TIFF.new(StringIO.new(@exif_data), load_thumbnails: load_thumbnails)
       end
     end
   end

data/lib/exifr/tiff.rb

@@ -375,7 +375,7 @@ module EXIFR
     TAGS = [TAG_MAPPING.keys, TAG_MAPPING.values.map{|v|v.values}].flatten.uniq - IFD_TAGS
 
     # +file+ is a filename or an +IO+ object.  Hint: use +StringIO+ when working with slurped data like blobs.
-    def initialize(file)
+    def initialize(file, load_thumbnails: true)
       Data.open(file) do |data|
         @ifds = [IFD.new(data)]
         while ifd = @ifds.last.next
@@ -383,17 +383,21 @@ module EXIFR
           @ifds << ifd
         end
 
-        @jpeg_thumbnails = @ifds.map do |v|
-          if v.jpeg_interchange_format && v.jpeg_interchange_format_length
-            start, length = v.jpeg_interchange_format, v.jpeg_interchange_format_length
-            if Integer === start && Integer === length
-              data[start..(start + length)]
-            else
-              EXIFR.logger.warn("Non numeric JpegInterchangeFormat data")
-              nil
+        if load_thumbnails
+          @jpeg_thumbnails = @ifds.map do |v|
+            if v.jpeg_interchange_format && v.jpeg_interchange_format_length
+              start, length = v.jpeg_interchange_format, v.jpeg_interchange_format_length
+              if Integer === start && Integer === length
+                data[start..(start + length)]
+              else
+                EXIFR.logger.warn("Non numeric JpegInterchangeFormat data")
+                nil
+              end
             end
-          end
-        end.compact
+          end.compact
+        else
+          @jpeg_thumbnails = []
+        end
       end
     end
 
@@ -482,10 +486,10 @@ module EXIFR
     end
 
     class IFD # :nodoc:
-      attr_reader :type, :fields, :offset
+      attr_reader :type, :raw_fields, :fields, :offset
 
       def initialize(data, offset = nil, type = :image)
-        @data, @offset, @type, @fields = data, offset, type, {}
+        @data, @offset, @type, @raw_fields, @fields = data, offset, type, {}, {}
 
         pos = offset || @data.readlong(4)
         num = @data.readshort(pos)
@@ -546,15 +550,16 @@ module EXIFR
 
     private
       def add_field(field)
-        return unless tag = TAG_MAPPING[@type][field.tag]
-        return if @fields[tag]
+        return if @raw_fields.include?(field.tag) # first encountered value wins
+        @raw_fields[field.tag] = field.value
 
-        if IFD_TAGS.include? tag
-          @fields[tag] = IFD.new(@data, field.offset, tag)
-        else
-          value = ADAPTERS[tag][field.value]
-          @fields[tag] = value.kind_of?(Array) && value.size == 1 ? value.first : value
-        end
+        return unless tag = TAG_MAPPING[@type][field.tag]
+        @fields[tag] = if IFD_TAGS.include?(tag)
+                         IFD.new(@data, field.offset, tag)
+                       else
+                         value = ADAPTERS[tag][field.value]
+                         value.kind_of?(Array) && value.size == 1 ? value.first : value
+                       end
       end
     end
 
@@ -604,6 +609,10 @@ module EXIFR
             end
             rationals
           end
+        when 11 # float
+          len, pack = count * 4, proc { |d| d.unpack(data.float + '*') }
+        when 12 # double
+          len, pack = count * 8, proc { |d| d.unpack(data.double + '*') }
         else
           return
         end
@@ -638,7 +647,7 @@ module EXIFR
     end
 
     class Data #:nodoc:
-      attr_reader :short, :long, :file
+      attr_reader :short, :long, :float, :double, :file
 
       def initialize(file)
         @io = file.respond_to?(:read) ? file : (@file = File.open(file, 'rb'))
@@ -646,8 +655,8 @@ module EXIFR
         @pos = 0
 
         case self[0..1]
-        when 'II'; @short, @long = 'v', 'V'
-        when 'MM'; @short, @long = 'n', 'N'
+        when 'II'; @short, @long, @float, @double = 'v', 'V', 'e', 'E'
+        when 'MM'; @short, @long, @float, @double = 'n', 'N', 'g', 'G'
         else
           raise MalformedTIFF, "no byte order information found"
         end

data/tests/jpeg_test.rb

@@ -127,6 +127,13 @@ class JPEGTest < TestCase
     assert count > 0, 'no thumbnails found'
   end
 
+  def test_skippable_thumbnail
+    all_test_jpegs.each do |fname|
+      jpeg = JPEG.new(fname, load_thumbnails: false)
+      assert jpeg.thumbnail.nil?
+    end
+  end
+
   def test_gps_with_altitude
     t = JPEG.new(f('gps-altitude.jpg'))
 

data/tests/tiff_test.rb

@@ -165,7 +165,12 @@ class TIFFTest < TestCase
     all_test_tiffs.each do |fname|
       t = TIFF.new(fname)
       y = YAML.dump(t)
-      assert_literally_equal t.to_hash, YAML.load(y).to_hash
+      v = if YAML.respond_to?(:unsafe_load)
+            YAML.unsafe_load(y)
+          else
+            YAML.load(y)
+          end
+      assert_literally_equal t.to_hash, v.to_hash
     end
   end
 
@@ -183,6 +188,13 @@ class TIFFTest < TestCase
     assert count > 0, 'no thumbnails found'
   end
 
+  def test_skippable_jpeg_thumbnails
+    all_test_tiffs.each do |fname|
+      t = TIFF.new(fname, load_thumbnails: false)
+      assert t.jpeg_thumbnails.empty?
+    end
+  end
+
   def test_should_not_loop_endlessly
     TIFF.new(f('endless-loop.exif'))
     assert true
@@ -215,4 +227,8 @@ class TIFFTest < TestCase
     assert t.methods(true).include?(:make)
     assert ! t.methods(false).include?(:make)
   end
+
+  def test_unknow_field
+    assert_equal [1, 1, 1, 1], TIFF.new(f('plain.tif')).first.raw_fields[0x0153] # TIFF Tag SampleFormat
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exifr
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.4.0
 platform: ruby
 authors:
 - R.W. van 't Veer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-19 00:00:00.000000000 Z
+date: 2023-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -59,6 +59,7 @@ files:
 - tests/data/Trust-DC3500_MINI.exif
 - tests/data/apple-aperture-1.5.exif
 - tests/data/bad-shutter_speed_value.exif
+- tests/data/bad_gps.exif
 - tests/data/canon-g3.exif
 - tests/data/endless-loop.exif
 - tests/data/exif.jpg
@@ -66,6 +67,7 @@ files:
 - tests/data/gps-altitude.jpg
 - tests/data/gps.exif
 - tests/data/image.jpg
+- tests/data/ios-mspix-milliseconds.jpg
 - tests/data/multiple-app1.jpg
 - tests/data/negative-exposure-bias-value.exif
 - tests/data/nikon_d1x.tif
@@ -73,6 +75,7 @@ files:
 - tests/data/plain.tif
 - tests/data/samsung-sc-02b.jpg
 - tests/data/sony-a7ii.exif
+- tests/data/truncated.exif
 - tests/data/user-comment.exif
 - tests/data/weird_date.exif
 - tests/jpeg_test.rb
@@ -95,14 +98,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Read EXIF from JPEG and TIFF images