exifr 0.9.2 → 0.9.3

data/CHANGELOG

@@ -1,3 +1,8 @@
+EXIF Reader 0.9.3
+* bug fix; "[#4876] Unable to extract gpsinfo"
+* one-off bug in TiffHeader found and fixed
+* make "InteroperabilityIndex" available
+
 EXIF Reader 0.9.2
 * bug fix; "[#4595] EXIFR::JPEG doesn't support multiple comments", the
   comment property of a JPEG object now contains an array instead of a string

data/bin/exifr

@@ -18,7 +18,7 @@ def pp(fname)
   
   puts "#{fname}:"
   f = "  %#{l.sort{|a,b|a[0].size <=> b[0].size}.last[0].size}s = %s\n"
-  l.each{|k,v|puts f  % [k, v]}
+  l.each{|k,v|puts f  % [k, [v].flatten.map{|t|t.to_s}.join(', ')]}
 end
 
 if ARGV.size == 0

data/lib/exif.rb

@@ -37,106 +37,146 @@ module EXIFR
   class EXIF < Hash
     TAGS = {} # :nodoc:
     TAGS.merge!({
-      0x0100 => :image_width,
-      0x0101 => :image_length,
-      0x0102 => :bits_per_sample,
-      0x0103 => :compression,
-      0x0106 => :photometric_interpretation,
-      0x010a => :fill_order,
-      0x010d => :document_name,
-      0x010e => :image_description,
-      0x010f => :make,
-      0x0110 => :model,
-      0x0111 => :strip_offsets,
-      0x0112 => :orientation,
-      0x0115 => :samples_per_pixel,
-      0x0116 => :rows_per_strip,
-      0x0117 => :strip_byte_counts,
-      0x011a => :xresolution,
-      0x011b => :yresolution,
-      0x011c => :planar_configuration,
-      0x0128 => :resolution_unit,
-      0x012d => :transfer_function,
-      0x0131 => :software,
-      0x0132 => :date_time,
-      0x013b => :artist,
-      0x013e => :white_point,
-      0x013f => :primary_chromaticities,
-      0x0156 => :transfer_range,
-      0x0200 => :jpegproc,
-      0x0201 => :jpeg_interchange_format,
-      0x0202 => :jpeg_interchange_format_length,
-      0x0211 => :ycb_cr_coefficients,
-      0x0212 => :ycb_cr_sub_sampling,
-      0x0213 => :ycb_cr_positioning,
-      0x0214 => :reference_black_white,
-      0x828d => :cfarepeat_pattern_dim,
-      0x828e => :cfapattern,
-      0x828f => :battery_level,
-      0x8298 => :copyright,
-      0x829a => :exposure_time,
-      0x829d => :fnumber,
-      0x83bb => :iptc_naa,
-      0x8769 => :exif_offset,
-      0x8773 => :inter_color_profile,
-      0x8822 => :exposure_program,
-      0x8824 => :spectral_sensitivity,
-      0x8825 => :gpsinfo,
-      0x8827 => :isospeed_ratings,
-      0x8828 => :oecf,
-      0x9000 => :exif_version,
-      0x9003 => :date_time_original,
-      0x9004 => :date_time_digitized,
-      0x9101 => :components_configuration,
-      0x9102 => :compressed_bits_per_pixel,
-      0x9201 => :shutter_speed_value,
-      0x9202 => :aperture_value,
-      0x9203 => :brightness_value,
-      0x9204 => :exposure_bias_value,
-      0x9205 => :max_aperture_value,
-      0x9206 => :subject_distance,
-      0x9207 => :metering_mode,
-      0x9208 => :light_source,
-      0x9209 => :flash,
-      0x920a => :focal_length,
-      0x9214 => :subject_area,
-      0x927c => :maker_note,
-      0x9286 => :user_comment,
-      0x9290 => :subsec_time,
-      0x9291 => :subsec_time_orginal,
-      0x9292 => :subsec_time_digitized,
-      0xa000 => :flash_pix_version,
-      0xa001 => :color_space,
-      0xa002 => :pixel_xdimension,
-      0xa003 => :pixel_ydimension,
-      0xa004 => :related_sound_file,
-      0xa005 => :interoperability_offset,
-      0xa20b => :flash_energy,
-      0xa20c => :spatial_frequency_response,
-      0xa20e => :focal_plane_xresolution,
-      0xa20f => :focal_plane_yresolution,
-      0xa210 => :focal_plane_resolution_unit,
-      0xa214 => :subject_location,
-      0xa215 => :exposure_index,
-      0xa217 => :sensing_method,
-      0xa300 => :file_source,
-      0xa301 => :scene_type,
-      0xa302 => :cfapattern,
-      0xa401 => :custom_rendered,
-      0xa402 => :exposure_mode,
-      0xa403 => :white_balance,
-      0xa404 => :digital_zoom_ratio,
-      0xa405 => :focal_len_in_35mm_film,
-      0xa406 => :scene_capture_type,
-      0xa407 => :gain_control,
-      0xa408 => :contrast,
-      0xa409 => :saturation,
-      0xa40a => :sharpness,
-      0xa40b => :device_setting_descr,
-      0xa40c => :subject_dist_range,
-      0xa420 => :image_unique_id
+      :exif => {
+        0x0100 => :image_width,
+        0x0101 => :image_length,
+        0x0102 => :bits_per_sample,
+        0x0103 => :compression,
+        0x0106 => :photometric_interpretation,
+        0x010a => :fill_order,
+        0x010d => :document_name,
+        0x010e => :image_description,
+        0x010f => :make,
+        0x0110 => :model,
+        0x0111 => :strip_offsets,
+        0x0112 => :orientation,
+        0x0115 => :samples_per_pixel,
+        0x0116 => :rows_per_strip,
+        0x0117 => :strip_byte_counts,
+        0x011a => :xresolution,
+        0x011b => :yresolution,
+        0x011c => :planar_configuration,
+        0x0128 => :resolution_unit,
+        0x012d => :transfer_function,
+        0x0131 => :software,
+        0x0132 => :date_time,
+        0x013b => :artist,
+        0x013e => :white_point,
+        0x013f => :primary_chromaticities,
+        0x0156 => :transfer_range,
+        0x0200 => :jpegproc,
+        0x0201 => :jpeg_interchange_format,
+        0x0202 => :jpeg_interchange_format_length,
+        0x0211 => :ycb_cr_coefficients,
+        0x0212 => :ycb_cr_sub_sampling,
+        0x0213 => :ycb_cr_positioning,
+        0x0214 => :reference_black_white,
+        0x828d => :cfarepeat_pattern_dim,
+        0x828e => :cfapattern,
+        0x828f => :battery_level,
+        0x8298 => :copyright,
+        0x829a => :exposure_time,
+        0x829d => :fnumber,
+        0x83bb => :iptc_naa,        
+        0x8769 => :exif,
+        0x8773 => :inter_color_profile,
+        0x8822 => :exposure_program,
+        0x8824 => :spectral_sensitivity,
+        0x8825 => :gps,
+        0x8827 => :isospeed_ratings,
+        0x8828 => :oecf,
+        0x9000 => :exif_version,
+        0x9003 => :date_time_original,
+        0x9004 => :date_time_digitized,
+        0x9101 => :components_configuration,
+        0x9102 => :compressed_bits_per_pixel,
+        0x9201 => :shutter_speed_value,
+        0x9202 => :aperture_value,
+        0x9203 => :brightness_value,
+        0x9204 => :exposure_bias_value,
+        0x9205 => :max_aperture_value,
+        0x9206 => :subject_distance,
+        0x9207 => :metering_mode,
+        0x9208 => :light_source,
+        0x9209 => :flash,
+        0x920a => :focal_length,
+        0x9214 => :subject_area,
+        0x927c => :maker_note,
+        0x9286 => :user_comment,
+        0x9290 => :subsec_time,
+        0x9291 => :subsec_time_orginal,
+        0x9292 => :subsec_time_digitized,
+        0xa000 => :flash_pix_version,
+        0xa001 => :color_space,
+        0xa002 => :pixel_xdimension,
+        0xa003 => :pixel_ydimension,
+        0xa004 => :related_sound_file,
+        0xa005 => :interoperability,
+        0xa20b => :flash_energy,
+        0xa20c => :spatial_frequency_response,
+        0xa20e => :focal_plane_xresolution,
+        0xa20f => :focal_plane_yresolution,
+        0xa210 => :focal_plane_resolution_unit,
+        0xa214 => :subject_location,
+        0xa215 => :exposure_index,
+        0xa217 => :sensing_method,
+        0xa300 => :file_source,
+        0xa301 => :scene_type,
+        0xa302 => :cfapattern,
+        0xa401 => :custom_rendered,
+        0xa402 => :exposure_mode,
+        0xa403 => :white_balance,
+        0xa404 => :digital_zoom_ratio,
+        0xa405 => :focal_len_in_35mm_film,
+        0xa406 => :scene_capture_type,
+        0xa407 => :gain_control,
+        0xa408 => :contrast,
+        0xa409 => :saturation,
+        0xa40a => :sharpness,
+        0xa40b => :device_setting_descr,
+        0xa40c => :subject_dist_range,
+        0xa420 => :image_unique_id
+      },
+      
+      :gps => {
+        0x0000 => :gps_version_id,
+        0x0001 => :gps_latitude_ref,
+        0x0002 => :gps_latitude,
+        0x0003 => :gps_longitude_ref,
+        0x0004 => :gps_longitude,
+        0x0005 => :gps_altitude_ref,
+        0x0006 => :gps_altitude  ,
+        0x0007 => :gps_time_stamp,
+        0x0008 => :gps_satellites,
+        0x0009 => :gps_status,
+        0x000a => :gps_measure_mode,
+        0x000b => :gpsdop,
+        0x000c => :gps_speed_ref,
+        0x000d => :gps_speed  ,
+        0x000e => :gps_track_ref,
+        0x000f => :gps_track,
+        0x0010 => :gps_img_direction_ref,
+        0x0011 => :gps_img_direction,
+        0x0012 => :gps_map_datum,
+        0x0013 => :gps_dest_latitude_ref,
+        0x0014 => :gps_dest_latitude,
+        0x0015 => :gps_dest_longitude_ref,
+        0x0016 => :gps_dest_longitude,
+        0x0017 => :gps_dest_bearing_ref,
+        0x0018 => :gps_dest_bearing,
+        0x0019 => :gps_dest_distance_ref,
+        0x001a => :gps_dest_distance,
+        0x001b => :gps_processing_method,
+        0x001c => :gps_area_information,
+        0x001d => :gps_date_stamp,
+        0x001e => :gps_differential,
+      },
+      
+      :interoperability => {
+        0x0001 => :interoperability_index
+      }
     })
-    EXIF_HEADERS = [0x8769, 0x8825, 0xa005] # :nodoc:
+    EXIF_HEADERS = [:exif, :gps, :interoperability] # :nodoc:
 
     time_proc = proc do |value|
       if value =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/
@@ -197,13 +237,13 @@ module EXIFR
     end
 
   private
-    def traverse(tiff)
+    def traverse(tiff, ifd = :exif)
       tiff.fields.each do |f|
-        tag = TAGS[f.tag]
+        tag = TAGS[ifd][f.tag]
         value = f.value.map { |v| ADAPTERS[tag][v] } if f.value
         value = (value.kind_of?(Array) && value.size == 1) ? value.first : value
-        if EXIF_HEADERS.include?(f.tag)
-          traverse(TiffHeader.new(@data, f.offset))
+        if EXIF_HEADERS.include?(tag)
+          traverse(TiffHeader.new(@data, f.offset), tag)
         elsif tag
           self[tag] = value
         end

data/lib/tiff_header.rb

@@ -51,7 +51,7 @@ module EXIFR
         # TODO handle signed bytes
         len, pack = count, proc { |d| d }
       when 2 # ascii
-        len, pack = count, proc { |d| d.sub(/\0.*$/, '').strip }
+        len, pack = count, proc { |d| d.strip }
       when 3, 8 # short, signed short
         # TODO handle signed
         len, pack = count * 2, proc { |d| d.unpack(data.short + '*') }
@@ -76,7 +76,7 @@ module EXIFR
 
       if len && pack
         start = len > 4 ? @offset : (pos + 8)
-        @value = pack[data[start..(start + len)]]
+        @value = pack[data[start..(start + len - 1)]]
       end
     end
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: exifr
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
-date: 2006-05-30 00:00:00 +02:00
+  version: 0.9.3
+date: 2006-06-29 00:00:00 +02:00
 summary: EXIF Reader is a module to read EXIF from JPEG images.
 require_paths: 
 - lib