exifr 1.0.0 → 1.0.1

data/CHANGELOG

@@ -1,3 +1,6 @@
+EXIF Reader 1.0.1
+* bug fix; "[GH#7] Unable to properly display exposure_bias_value"; thanks to John Krueger
+
 EXIF Reader 1.0.0
 * bug fix; "ArgumentError: invalid byte sequence in UTF-8" when reading messy field using Ruby 1.9+
 * enhancement; "[GH#4] more informative inspect for EXIFR::TIFF::Orientation instance"

data/bin/exifr

@@ -38,6 +38,14 @@ end
 
 if ARGV.size == 0
   STDERR.puts "Usage: #{$0} FILE .."
+elsif ARGV[0] == "--dump-exif"
+  ARGV[1..-1].each do |fname|
+    STDOUT.write JPEG.new(fname).exif_data
+  end
+elsif ARGV[0] == "--dump-thumbnail"
+  ARGV[1..-1].each do |fname|
+    STDOUT.write JPEG.new(fname).thumbnail
+  end
 else
   ARGV.each do |fname|
     case fname

data/lib/jpeg.rb

@@ -20,6 +20,8 @@ module EXIFR
     attr_reader :comment
     # EXIF data if available
     attr_reader :exif
+    # raw EXIF data
+    attr_reader :exif_data # :nodoc:
 
     # +file+ is a filename or an IO object.  Hint: use StringIO when working with slurped data like blobs.
     def initialize(file)
@@ -102,7 +104,8 @@ module EXIFR
       @comment = @comment.first if @comment && @comment.size == 1
 
       if app1 = app1s.find { |d| d[0..5] == "Exif\0\0" }
-        @exif = TIFF.new(StringIO.new(app1[6..-1]))
+        @exif_data = app1[6..-1]
+        @exif = TIFF.new(StringIO.new(@exif_data))
       end
     end
   end

data/lib/tiff.rb

@@ -459,17 +459,20 @@ module EXIFR
         @type = data.readshort(pos + 2)
 
         case @type
-        when 1, 6 # byte, signed byte
-          # TODO handle signed bytes
+        when 1 # byte
           len, pack = count, proc { |d| d }
+        when 6 # signed byte
+          len, pack = count, proc { |d| sign_byte(d) }
         when 2 # ascii
           len, pack = count, proc { |d| d.unpack("A*") }
-        when 3, 8 # short, signed short
-          # TODO handle signed
+        when 3 # short
           len, pack = count * 2, proc { |d| d.unpack(data.short + '*') }
-        when 4, 9 # long, signed long
-          # TODO handle signed
+        when 8 # signed short
+          len, pack = count * 2, proc { |d| d.unpack(data.short + '*').map{|n| sign_short(n)} }
+        when 4 # long
           len, pack = count * 4, proc { |d| d.unpack(data.long + '*') }
+        when 9 # signed long
+          len, pack = count * 4, proc { |d| d.unpack(data.long + '*').map{|n| sign_long(n)} }
         when 7 # undefined
           # UserComment
           if @tag == 0x9286
@@ -478,18 +481,16 @@ module EXIFR
             start = len > 4 ? @offset + 8 : (pos + 8) # UserComment first 8-bytes is char code
             @value = [pack[data[start..(start + len - 1)]]].flatten
           end
-        when 5, 10
+        when 5 # unsigned rational
           len, pack = count * 8, proc do |d|
-            r = []
-            d.unpack(data.long + '*').each_with_index do |v,i|
-              i % 2 == 0 ? r << [v] : r.last << v
+            d.unpack(data.long + '*').each_slice(2).map do |f|
+              rational(*f)
             end
-            r.map do |f|
-              if f[1] == 0 # allow NaN and Infinity
-                f[0].to_f.quo(f[1])
-              else
-                Rational.respond_to?(:reduce) ? Rational.reduce(*f) : f[0].quo(f[1])
-              end
+          end
+        when 10 # signed rational
+          len, pack = count * 8, proc do |d|
+            d.unpack(data.long + '*').map{|n| sign_long(n)}.each_slice(2).map do |f|
+              rational(*f)
             end
           end
         end
@@ -500,6 +501,27 @@ module EXIFR
           @value = d && [pack[d]].flatten
         end
       end
+
+    private
+      def sign_byte(n)
+        (n & 0x80) != 0 ? n - 0x100 : n
+      end
+      
+      def sign_short(n)
+        (n & 0x8000) != 0 ? n - 0x10000 : n
+      end
+
+      def sign_long(n)
+        (n & 0x80000000) != 0 ? n - 0x100000000 : n
+      end
+
+      def rational(n, d)
+        if d == 0 # allow NaN and Infinity
+          n.to_f.quo(d)
+        else
+          Rational.respond_to?(:reduce) ? Rational.reduce(n, d) : n.quo(d)
+        end
+      end
     end
 
     class Data #:nodoc:

data/tests/tiff_test.rb

@@ -91,7 +91,7 @@ class TIFFTest < Test::Unit::TestCase
     assert_equal [678886.quo(100000), 0.quo(1), 0.quo(1)], t.gps_longitude
     assert_equal 'WGS84', t.gps_map_datum
 
-    (all_test_exifs - %w(gps user-comment out-of-range).map{|v| f("#{v}.exif")}).each do |fname|
+    (all_test_exifs - %w(gps user-comment out-of-range negative-exposure-bias-value).map{|v| f("#{v}.exif")}).each do |fname|
       assert_nil TIFF.new(fname).gps_version_id
     end
   end
@@ -172,4 +172,8 @@ class TIFFTest < Test::Unit::TestCase
       assert 'NIKON', TIFF.new(f('out-of-range.exif')).make
     end
   end
+  
+  def test_negative_exposure_bias_value
+    assert_equal -1.quo(3), TIFF.new(f('negative-exposure-bias-value.exif')).exposure_bias_value
+  end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: exifr
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - R.W. van 't Veer
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 +02:00
+date: 2010-04-26 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -29,21 +34,22 @@ files:
 - lib/jpeg.rb
 - lib/tiff.rb
 - tests/data/1x1.jpg
-- tests/data/Canon_PowerShot_A85.exif
-- tests/data/Casio-EX-S20.exif
-- tests/data/FUJIFILM-FinePix_S3000.exif
-- tests/data/Panasonic-DMC-LC33.exif
-- tests/data/Trust-DC3500_MINI.exif
 - tests/data/apple-aperture-1.5.exif
 - tests/data/canon-g3.exif
+- tests/data/Canon_PowerShot_A85.exif
+- tests/data/Casio-EX-S20.exif
 - tests/data/endless-loop.exif
 - tests/data/exif.jpg
+- tests/data/FUJIFILM-FinePix_S3000.exif
 - tests/data/gps.exif
 - tests/data/image.jpg
 - tests/data/multiple-app1.jpg
+- tests/data/negative-exposure-bias-value.exif
 - tests/data/nikon_d1x.tif
 - tests/data/out-of-range.exif
+- tests/data/Panasonic-DMC-LC33.exif
 - tests/data/plain.tif
+- tests/data/Trust-DC3500_MINI.exif
 - tests/data/user-comment.exif
 - tests/data/weird_date.exif
 - tests/jpeg_test.rb
@@ -67,18 +73,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: EXIF Reader is a module to read EXIF from JPEG images.