@@ -492,10 +492,9 @@ module EXIFR attr_reader :short, :long def initialize(file) - @file = file.respond_to?(:read) ? file : File.open(file, "rb") - @buff = [] + @file = file.respond_to?(:read) ? file : File.open(file, 'rb') + @buffer = '' @pos = 0 - @size = 0 case self[0..1] when 'II'; @short, @long = 'v', 'V' @@ -505,20 +504,15 @@ module EXIFR end def [](pos) - # handle Ranges - if (pos.respond_to?(:min) and pos.respond_to?(:max)) - min = pos.min - max = pos.max - else - min = pos - max = pos + unless pos.respond_to?(:begin) && pos.respond_to?(:end) + pos = pos..pos end - if (min < @pos or max >= @pos + @size) - buff_read(min, max - min) + if pos.begin < @pos || pos.end >= @pos + @buffer.size + read_for(pos) end - return @buffer[(min - @pos)..(max - @pos)] + @buffer[(pos.begin - @pos)..(pos.end - @pos)] end def readshort(pos) @@ -531,17 +525,13 @@ module EXIFR def size @file.seek(0, IO::SEEK_END) - return @file.pos + @file.pos end - private - def buff_read(pos, size) - @pos = pos - @size = size < 4096? 4096 : size; - @file.seek(pos) - @buffer = @file.read(@size) - # read can read less then the requested size - @size = @buffer.size + private + def read_for(pos) + @file.seek(@pos = pos.begin) + @buffer = @file.read([pos.end - pos.begin, 4096].max) end end end lib/tiff.rb 5355d7eb825dc5240fc690ac0509f5971404379b Remco van 't Veer rwvtveer@xs4all.nl http://github.com/remvee/exifr/commit/563672c04cc82d413df51b1c00f7648bee3d5113 563672c04cc82d413df51b1c00f7648bee3d5113 2009-02-23T00:59:50-08:00 2009-02-23T00:59:50-08:00 style changes and performance enhancements 014d1903b6439f7db074edf23b7c9ae8ff16d474 Remco van 't Veer rwvtveer@xs4all.nl