exifr 1.3.8 → 1.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19c3f1b08e84425d9d0b8a6e6ee11bd2e25190a49ce34d42ea99800f5030fe20
-  data.tar.gz: 9a834f93b1a02e87bf401b09a033b25fb8b05625b0a60a8795e9ee65e1ea064c
+  metadata.gz: 97fa3270a4d14398a02e6bd725753980ae12b74c2f0a6e3c160b840c59c7febf
+  data.tar.gz: ec8ed547c94ad6dd83c0a07bb78530408d48637b18edfeb68dcb157a55c5c618
 SHA512:
-  metadata.gz: b4fc267041e9090a85eb5ca2a0bfc2fae3d36a72aa45ab716209e6e5e896a775957b65251587e16e7c4e3f0e3c2e491805ce226c68b9b189a8b5bdaf506ebc15
-  data.tar.gz: f39334aa7142a3b918edf30fa3bd6424ddc50c1906beb2c9d5bf384bc939fba35b410d2ee801410769929a29895e75b223d443af01d7acf7752fbf96adad0fa6
+  metadata.gz: 3d10126d25f29634c46c8b5dce11ebd9dbc373c02fc892a74cdb8cbf6aa3cef8086e2a6be2eaac2a65bc83fa64a6f517617e22dc47bc4ea56db631b678a3ee3a
+  data.tar.gz: b98ee638dc85ab51c1f86d5b9c34c417047a79d2abb920ee8a13e7decfaf8b66fb484d7d804461de276a3f87fd40f5e30c1a420e3b25e46db51e801f77acc9c3

data/lib/exifr/tiff.rb

@@ -331,7 +331,9 @@ module EXIFR
 
     class Degrees < Array
       def initialize(arr)
-        raise "expected [degrees, minutes, seconds]" unless arr.length == 3
+        unless arr.length == 3 && arr.all?{|v| Rational === v}
+          raise "expected [degrees, minutes, seconds]; got #{arr.inspect}"
+        end
         super
       end
 
@@ -480,10 +482,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)
@@ -544,15 +546,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
 
@@ -602,6 +605,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
@@ -636,7 +643,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'))
@@ -644,8 +651,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/tiff_test.rb

@@ -119,6 +119,10 @@ class TIFFTest < TestCase
     end
   end
 
+  def test_bad_gps
+    assert_nil TIFF.new(f('bad_gps.exif')).gps
+  end
+
   def test_lens_model
     t = TIFF.new(f('sony-a7ii.exif'))
     assert_equal('FE 16-35mm F4 ZA OSS', t.lens_model)
@@ -161,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
 
@@ -211,4 +220,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.8
+  version: 1.3.10
 platform: ruby
 authors:
 - R.W. van 't Veer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-24 00:00:00.000000000 Z
+date: 2022-10-02 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
@@ -102,8 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Read EXIF from JPEG and TIFF images