@@ -1,5 +1,6 @@ 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 CHANGELOG @@ -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 bin/exifr @@ -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 lib/jpeg.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,7 +418,7 @@ module EXIFR end def to_yaml_properties - '@fields' + ['@fields'] end private @@ -471,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 lib/tiff.rb 8da576219d5d7f5b63c205c0384d8e7c8168c530 Remco van 't Veer rwvtveer@xs4all.nl http://github.com/remvee/exifr/commit/0623780ac70ec778f53a9227ded874b69d9e6d79 0623780ac70ec778f53a9227ded874b69d9e6d79 2007-12-28T03:02:32-08:00 2007-12-28T03:02:32-08:00 r3716@RemBook2: remco | 2007-12-28 12:02:21 +0100 Ruby 1.9 compatibility git-svn-id: http://exifr.rubyforge.org/svn/trunk@109 7dc9e74c-6311-0410-82d3-e275c7e2d18c 1aaf18f0117d26605a6e2ab4de40d4a5030370df Remco van 't Veer rwvtveer@xs4all.nl