@@ -452,8 +452,9 @@ module EXIFR def initialize(data, pos) @tag, count, @offset = data.readshort(pos), data.readlong(pos + 4), data.readlong(pos + 8) + @type = data.readshort(pos + 2) - case data.readshort(pos + 2) + case @type when 1, 6 # byte, signed byte # TODO handle signed bytes len, pack = count, proc { |d| d } @@ -465,6 +466,14 @@ module EXIFR when 4, 9 # long, signed long # TODO handle signed len, pack = count * 4, proc { |d| d.unpack(data.long + '*') } + when 7 # undefined + # UserComment + if @tag == 0x9286 + len, pack = count, proc { |d| d.strip } + len -= 8 # reduce to account for first 8 bytes + 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 len, pack = count * 8, proc do |d| r = [] @@ -481,7 +490,7 @@ module EXIFR end end - if len && pack + if len && pack && @type != 7 start = len > 4 ? @offset : (pos + 8) @value = [pack[data[start..(start + len - 1)]]].flatten end lib/tiff.rb 9b9dd47839d631db9ea8b530e19f3ae65bb1acc4 Mark Lundquist mlundquist@xenon.hrn.amberjack.net http://github.com/remvee/exifr/commit/41c3366571640f751ba0d91d32ffc4bd63917794 41c3366571640f751ba0d91d32ffc4bd63917794 2009-08-30T14:01:40-07:00 2009-08-30T14:01:40-07:00 Added handling of UserComment (type Undefined) to extract data. This fixes the bug with user_comment returning nil. ea628e2446cdbd623ef8037fa4495c2d2bf55e79 Mark Lundquist mlundquist@xenon.hrn.amberjack.net