exifr 0.10.4 → 0.10.5

data/CHANGELOG

@@ -1,3 +1,7 @@
+EXIF Reader 0.10.5
+* bug fix; "[#15421] duplicate orientation field behavior", first field (of any type) is leading now
+* Ruby 1.9 compatible
+
 EXIF Reader 0.10.4
 * Thumbnail extraction; [#15317] Please add thumbnail extraction
 

data/Rakefile

@@ -21,7 +21,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name = 'exifr'
-  s.version = '0.10.4'
+  s.version = '0.10.5'
   s.author = "R.W. van 't Veer"
   s.email = 'remco@remvee.net'
   s.homepage = 'http://exifr.rubyforge.org/'

data/bin/exifr

@@ -41,8 +41,8 @@ if ARGV.size == 0
 else
   ARGV.each do |fname|
     case fname
-    when /\.(jpg|jpeg)$/i: pp_jpeg fname
-    when /\.(tif|tiff)$/i: pp_tiff fname
+    when /\.(jpg|jpeg)$/i; pp_jpeg fname
+    when /\.(tif|tiff)$/i; pp_tiff fname
     end
     puts
   end

data/lib/jpeg.rb

@@ -50,28 +50,29 @@ module EXIFR
     
   private
     def examine(io)
-      raise 'malformed JPEG' unless io.getc == 0xFF && io.getc == 0xD8 # SOI
-
       class << io
-        def readint; (readchar << 8) + readchar; end
+        def readbyte; readchar; end unless method_defined?(:readbyte)
+        def readint; (readbyte << 8) + readbyte; end
         def readframe; read(readint - 2); end
-        def readsof; [readint, readchar, readint, readint, readchar]; end
+        def readsof; [readint, readbyte, readint, readint, readbyte]; end
         def next
-          c = readchar while c != 0xFF
-          c = readchar while c == 0xFF
+          c = readbyte while c != 0xFF
+          c = readbyte while c == 0xFF
           c
         end
       end unless io.respond_to? :readsof
 
+      raise 'malformed JPEG' unless io.readbyte == 0xFF && io.readbyte == 0xD8 # SOI
+
       app1s = []
       while marker = io.next
         case marker
           when 0xC0..0xC3, 0xC5..0xC7, 0xC9..0xCB, 0xCD..0xCF # SOF markers
             length, @bits, @height, @width, components = io.readsof
             raise 'malformed JPEG' unless length == 8 + components * 3
-          when 0xD9, 0xDA:  break # EOI, SOS
-          when 0xFE:        (@comment ||= []) << io.readframe # COM
-          when 0xE1:        app1s << io.readframe # APP1, may contain EXIF tag
+          when 0xD9, 0xDA;  break # EOI, SOS
+          when 0xFE;        (@comment ||= []) << io.readframe # COM
+          when 0xE1;        app1s << io.readframe # APP1, may contain EXIF tag
           else              io.readframe # ignore frame
         end
       end

data/lib/tiff.rb

@@ -238,7 +238,7 @@ module EXIFR
     
     time_proc = proc do |value|
       if value =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/
-        Time.mktime($1, $2, $3, $4, $5, $6) rescue nil
+        Time.mktime($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i) rescue nil
       else
         value
       end
@@ -258,13 +258,13 @@ module EXIFR
       # Rotate and/or flip for proper viewing.
       def transform_rmagick(img)
         case @type
-        when :TopRight    : img.flop
-        when :BottomRight : img.rotate(180)
-        when :BottomLeft  : img.flip
-        when :LeftTop     : img.rotate(90).flop
-        when :RightTop    : img.rotate(90)
-        when :RightBottom : img.rotate(270).flop
-        when :LeftBottom  : img.rotate(270)     
+        when :TopRight    ; img.flop
+        when :BottomRight ; img.rotate(180)
+        when :BottomLeft  ; img.flip
+        when :LeftTop     ; img.rotate(90).flop
+        when :RightTop    ; img.rotate(90)
+        when :RightBottom ; img.rotate(270).flop
+        when :LeftBottom  ; img.rotate(270)
         else
           img
         end
@@ -418,11 +418,13 @@ module EXIFR
       end
     
       def to_yaml_properties
-        '@fields'
+        ['@fields']
       end
+      
     private
       def add_field(field)
         return unless tag = TAG_MAPPING[@type][field.tag]
+        return if @fields[tag]
         
         if IFD_TAGS.include? tag
           @fields[tag] = IFD.new(@data, field.offset, tag)
@@ -469,7 +471,7 @@ module EXIFR
 
         if len && pack
           start = len > 4 ? @offset : (pos + 8)
-          @value = pack[data[start..(start + len - 1)]]
+          @value = [pack[data[start..(start + len - 1)]]].flatten
         end
       end
     end

metadata

@@ -1,33 +1,27 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: exifr
 version: !ruby/object:Gem::Version 
-  version: 0.10.4
-date: 2007-11-04 00:00:00 +01:00
-summary: EXIF Reader is a module to read EXIF from JPEG images.
-require_paths: 
-- lib
-email: remco@remvee.net
-homepage: http://exifr.rubyforge.org/
-rubyforge_project: 
-description: 
-autorequire: exifr
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.10.5
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - R.W. van 't Veer
+autorequire: exifr
+bindir: bin
+cert_chain: []
+
+date: 2007-12-28 00:00:00 +01:00
+default_executable: 
+dependencies: []
+
+description: 
+email: remco@remvee.net
+executables: 
+- exifr
+extensions: []
+
+extra_rdoc_files: 
+- README
+- CHANGELOG
 files: 
 - Rakefile
 - bin/exifr
@@ -55,18 +49,31 @@ files:
 - tests/data/weird_date.exif
 - README
 - CHANGELOG
-test_files: []
-
+has_rdoc: true
+homepage: http://exifr.rubyforge.org/
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
-- CHANGELOG
-executables: 
-- exifr
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: 
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: EXIF Reader is a module to read EXIF from JPEG images.
+test_files: []