cul_image_props 0.1.2 → 0.2.0

data/lib/cul_image_props/image/magic.rb

@@ -1,22 +1,23 @@
 module Cul
 module Image
 module Magic
-  BMP = "\x42\x4D"
-  GIF = "\x47\x49\x46\x38"
-  JPEG = "\xFF\xD8"
-  JPEG_FRAME_MARKERS = ["\xFF\xC0","\xFF\xC1","\xFF\xC2","\xFF\xC5","\xFF\xC6","\xFF\xC9","\xFF\xCA","\xFF\xCD","\xFF\xCE"]
+  BMP = [0x42, 0x4d] # "\x42\x4D"
+  GIF = [0x47,0x49,0x46,0x38]  # "\x47\x49\x46\x38"
+  JPEG = [0xff,0xd8] # "\xFF\xD8"
+  JFM_BYTES = [[0xff,0xc0],[0xff,0xc1],[0xff,0xc2],[0xff,0xc5],[0xff,0xc6],[0xff,0xc9],[0xff,0xca],[0xff,0xcd],[0xff,0xce]]
+  JPEG_FRAME_MARKERS = JFM_BYTES.collect {|bytes| bytes.pack('C*')}
   JPEG_SEGMENTS = {
-    "\xFF\xE0"=>"APP0",
-    "\xFF\xE1"=>"APP1",
-    "\xFF\xC1"=>"SOF1", # image data: extended sequential dct
-    "\xFF\xC2"=>"SOF2", # image data: progressive dct
-    "\xFF\xC4"=>"DHT", # image data: huffman table(s)
-    "\xFF\xDA"=>"SOS", # image data: start of scan
-    "\xFF\xDB"=>"DQT" # quantization tables
+    [0xFF,0xE0]=>"APP0",
+    [0xFF,0xE1]=>"APP1",
+    [0xFF,0xC1]=>"SOF1", # image data: extended sequential dct
+    [0xFF,0xC2]=>"SOF2", # image data: progressive dct
+    [0xFF,0xC4]=>"DHT", # image data: huffman table(s)
+    [0xFF,0xDA]=>"SOS", # image data: start of scan
+    [0xFF,0xDB]=>"DQT" # quantization tables
   }
-  PNG = "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a"
-  TIFF_MOTOROLA_BE = "\x4d\x4d\x00\x2a"
-  TIFF_INTEL_LE = "\x49\x49\x2a\x00"
+  PNG = [0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a] # "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a"
+  TIFF_MOTOROLA_BE = [0x4d,0x4d,0x00,0x2a] # "\x4d\x4d\x00\x2a"
+  TIFF_INTEL_LE = [0x49,0x49,0x2a,0x00] # "\x49\x49\x2a\x00"
 end
 end
 end

data/lib/cul_image_props/image/properties/exif.rb

@@ -6,6 +6,14 @@ module Image
 module Properties
 module Exif
 
+# return the value that should be compared to stringvalue[Fixnum] for a given number 'h'
+def self.hex_comparison_value(h)
+  ("X".respond_to? :ord) ? [h].pack('C') : h
+end
+XFF = hex_comparison_value(0xff)
+X00 = hex_comparison_value(0x00)
+X01 = hex_comparison_value(0x01)
+X02 = hex_comparison_value(0x02)
 
 # process an image file (expects an open file object)
 # this is the function that has to deal with all the arbitrary nasty bits
@@ -23,70 +31,76 @@ def self.process_file(f, opts={})
     # determine whether it's a JPEG or TIFF
     data = f.read(12)
     jfif = {}
-    if [Cul::Image::Magic::TIFF_MOTOROLA_BE, Cul::Image::Magic::TIFF_INTEL_LE].include? data[0, 4]
+    if [Cul::Image::Magic::TIFF_MOTOROLA_BE, Cul::Image::Magic::TIFF_INTEL_LE].include? data[0, 4].unpack('C*')
         f.seek(0)
         endian = data[0,1]
         offset = 0
-    elsif data[0,2] == Cul::Image::Magic::JPEG
+    elsif data[0,2].unpack('C*') == Cul::Image::Magic::JPEG
         # it's a JPEG file
         base = 0
-        while data[2] == "\xFF" and ['JFIF', 'JFXX', 'OLYM', 'Phot'].include? data[6, 4]
+        while data[2] == XFF and ['JFIF', 'JFXX', 'OLYM', 'Phot'].include? data[6, 4]
             length = data[4,2].unpack('n')[0]
             f.read(length-8)
             # fake an EXIF beginning of file
-            data = "\xFF\x00"+f.read(10)
+            data = [0xff,0x00].pack('C*') + f.read(10)
             fake_exif = 1
             base = base + length
         end
         # Big ugly patch to deal with APP2 (or other) data coming before APP1
         f.seek(0)
-        data = f.read(base+8000) # in theory, this could be insufficient --gd
+        flen = base+8000
+        data = f.read(flen) # in theory, this could be insufficient --gd
 
         base = 2
         fptr = base
         while true
-            if data[fptr,2]=="\xFF\xE1"
+            if data[fptr,2].unpack('C*') == [0xff,0xe1]
                 if data[fptr+4,4] == "Exif"
                     base = fptr-2
                     break
                 end
                 fptr += 2
                 fptr += data[fptr+2,2].unpack('n')[0]
-            elsif data[fptr,2]=="\xFF\xE2"
+            elsif data[fptr,2].unpack('C*') == [0xff,0xe2]
                 fptr += 2
                 fptr += data[fptr+2,2].unpack('n')[0]
-            elsif data[fptr,2]=="\xFF\xE0"
+            elsif data[fptr,2].unpack('C*') == [0xff,0xe0]
                 offset = fptr
                 fptr += 2
                 fptr += data[fptr,2].unpack('n')[0]
-
-                exif = EXIF_TAGS[0x0128]
+                if data.length < offset + 16
+                  lack = (offset + 16 - data.length)
+                  data.concat f.read(lack)
+                end
+                exif = EXIF_TAGS[0x0128] # resolution unit
                 label = 'Image ' + exif.name
-                if (data[offset+11] == 0x00)
-                    jfif[label] = IFD_Tag.new(exif.value[1],label,3,[0],offset+11,1)
-                elsif (data[offset+11] == 0x01)
-                    jfif[label] = IFD_Tag.new(exif.value[2],label,3,[0],offset+11,1)
-                elsif (data[offset+11] == 0x02)
-                    jfif[label] = IFD_Tag.new(exif.value[3],label,3,[0],offset+11,1)
+                if (data[offset+11] == X00)
+                  jfif[label] = IFD_Tag.new(exif.value[1],label,3,[0],offset+11,1)
+                elsif (data[offset+11] == X01)
+                  jfif[label] = IFD_Tag.new(exif.value[2],label,3,[0],offset+11,1)
+                elsif (data[offset+11] == X02)
+                  jfif[label] = IFD_Tag.new(exif.value[3],label,3,[0],offset+11,1)
                 else
-                    jfif[label] = IFD_Tag.new("Unknown",label,3,[0],offset+11,1)
+                  puts "Unknown jfif tag: #{data[offset+11]}"
+                  jfif[label] = IFD_Tag.new("Unknown",label,3,[0],offset+11,1)
                 end
                 xres= data[offset+12,2].unpack('n')[0]
                 yres= data[offset+14,2].unpack('n')[0]
-                exif = EXIF_TAGS[0x011a]
+                exif = EXIF_TAGS[0x011a] # x resolution
                 label = 'Image ' + EXIF_TAGS[0x011a].name
                 jfif[label] = IFD_Tag.new(xres.to_s,label,5,[xres],offset+12,2)
-                label = 'Image ' + EXIF_TAGS[0x011b].name
+                label = 'Image ' + EXIF_TAGS[0x011b].name # y resolution
                 jfif[label] = IFD_Tag.new(yres.to_s,label,5,[yres],offset+13,2)
             else
                 if(data.length < fptr + 2)
                     break
                 end
                 # scan for the next APP header, /\xFF(^[\x00])/
-                _next = data.index("\xff",fptr + 2)
+                ff = [0xff].pack('C')
+                _next = data.index(ff,fptr + 2)
                 _next = nil if !_next.nil? and _next + 2 >= data.length
-                while (!_next.nil? and data[_next + 1] == 0x00)
-                    _next = data.index("\xff",_next + 2)
+                while (!_next.nil? and data[_next + 1] == X00)
+                    _next = data.index(ff,_next + 2)
                     _next = nil if !_next.nil? and _next + 2 >= data.length
                 end
                 unless (_next.nil?)
@@ -97,7 +111,7 @@ def self.process_file(f, opts={})
             end
         end
         f.seek(base+12)
-        if data[2+base] == 0xFF and data[6+base, 4] == 'Exif'
+        if data[2+base] == XFF and data[6+base, 4] == 'Exif'
             # detected EXIF header
             offset = base+12 # f.tell()
             endian = f.read(1)

data/lib/cul_image_props/image/properties/types.rb

@@ -35,6 +35,16 @@ xml
     @src.rewind
     @ng_xml = BASE_XML.clone
   end
+  # this is a hack to deal with Ruby 1.9 shenanigans
+  def ord_value(val)
+    if val.is_a? Fixnum
+      return val
+    elsif val.is_a? String
+      return val.unpack('C')[0]
+    else
+      return val.to_i
+    end
+  end
   def nodeset
     @ng_xml.root.element_children
   end
@@ -84,13 +94,21 @@ xml
   def extent=(value)
     add_dt_prop("dcmi", "extent", value)
   end
+  
+  def hex_inspect(str)
+    result = []
+    (0...str.length).each {|ix| result << str[ix].to_s(16)}
+    result.inspect
+  end
 end
 
 class Bmp < Base
   def initialize(srcfile=nil)
     super
     header_bytes = @src.read(18)
-    raise "Source file is not a bitmap" unless header_bytes[0...2] == Cul::Image::Magic::BMP
+    unless header_bytes[0...2].unpack('C*') == Cul::Image::Magic::BMP
+      raise "Source file is not a bitmap: #{hex_inspect(header_bytes[0...2])}"
+    end
     size = header_bytes[-4,4].unpack('V')[0]
     header_bytes = header_bytes + @src.read(size)
     dims = header_bytes[0x12...0x1a].unpack('VV')
@@ -108,7 +126,9 @@ class Gif < Base
   def initialize(srcfile=nil)
     super
     header_bytes = @src.read(13)
-    raise "Source file is not a gif" unless header_bytes[0...4] == Cul::Image::Magic::GIF
+    unless header_bytes[0...4].unpack('C*') == Cul::Image::Magic::GIF
+      raise "Source file is not a gif: #{hex_inspect(header_bytes[0...4])}"
+    end
     self.width= header_bytes[6,2].unpack('v')[0]
     self.length= header_bytes[8,2].unpack('v')[0]
     self.extent= srcfile.stat.size unless srcfile.nil?
@@ -119,14 +139,16 @@ class Jpeg < Base
   def initialize(srcfile=nil)
     super
     header_bytes = @src.read(2)
-    raise "Source file is not a jpeg" unless header_bytes[0...2] == Cul::Image::Magic::JPEG
+    unless header_bytes[0...2].unpack('C*') == Cul::Image::Magic::JPEG
+      raise "Source file is not a jpeg: #{hex_inspect(header_bytes[0...2])}"
+    end
     xpix = 0
     ypix = 0
     while (!@src.eof?)
-      if "\xFF" == @src.read(1)
-        mrkr = "\xFF" + @src.read(1)
+      if 0xff == ord_value(@src.read(1))
+        mrkr = [0xff, ord_value(@src.read(1))]
         blen = @src.read(2).unpack('n')[0]
-        if Cul::Image::Magic::JPEG_FRAME_MARKERS.include? mrkr  # SOFn, Start of frame for scans
+        if Cul::Image::Magic::JFM_BYTES.include? mrkr  # SOFn, Start of frame for scans
           @src.read(1) #skip bits per sample
           self.length= @src.read(2).unpack('n')[0]
           self.width= @src.read(2).unpack('n')[0]
@@ -170,7 +192,9 @@ class Png < Base
   def initialize(srcfile=nil)
     super
     header_bytes = @src.read(8)
-    raise "Source file is not a png" unless header_bytes[0...8] == Cul::Image::Magic::PNG
+    unless header_bytes[0...8].unpack('C*') == Cul::Image::Magic::PNG
+      raise "Source file is not a png #{hex_inspect(header_bytes[0...8])}"
+    end
     until @src.eof?
       clen = @src.read(4).unpack('N')[0]
       ctype = @src.read(4)
@@ -193,7 +217,7 @@ class Png < Base
     val = @src.read(9)
     xres = val[0,4].unpack('N')[0]
     yres = val[4,4].unpack('N')[0]
-    unit = val[8]
+    unit = ord_value(val[8])
     if unit == 1 # resolution unit is METER
       xres = (xres / 100).ceil
       yres = (yres / 100).ceil
@@ -277,13 +301,13 @@ class Tiff < Base
   def initialize(srcfile=nil)
     super
     header_bytes = @src.read(14)
-    case header_bytes[0...4]
+    case header_bytes[0...4].unpack('C*')
     when Cul::Image::Magic::TIFF_INTEL_LE
       @endian = header_bytes[12]
     when Cul::Image::Magic::TIFF_MOTOROLA_BE
       @endian = header_bytes[12]
     else
-      raise "Source file is not a tiff" 
+      raise "Source file is not a tiff #{hex_inspect(header_bytes[0...4])}" 
     end
     @src.rewind
     tags = Cul::Image::Properties::Exif.process_file(srcfile)

data/lib/cul_image_props/image/properties/version.rb

@@ -1,7 +1,7 @@
 module Cul
 module Image
 module Properties
-VERSION = "0.1.2"
+VERSION = "0.2.0"
 end
 end
 end

data/lib/cul_image_props/image/properties.rb

@@ -16,7 +16,7 @@ module Properties
     buf = ''
     src.read(2,buf)
     magic_bytes << buf
-    case magic_bytes
+    case magic_bytes.unpack('C*')
     when Cul::Image::Magic::BMP
       result = Cul::Image::Properties::Bmp.new(src)
     when Cul::Image::Magic::JPEG
@@ -26,7 +26,7 @@ module Properties
     if result.nil?
       src.read(2,buf)
       magic_bytes << buf
-      case magic_bytes
+      case magic_bytes.unpack('C*')
       when Cul::Image::Magic::TIFF_MOTOROLA_BE
         result = Cul::Image::Properties::Tiff.new(src)
       when Cul::Image::Magic::TIFF_INTEL_LE
@@ -38,10 +38,10 @@ module Properties
     if result.nil?
       src.read(4,buf)
       magic_bytes << buf
-      if magic_bytes == Cul::Image::Magic::PNG
+      if magic_bytes.unpack('C*') == Cul::Image::Magic::PNG
         result = Cul::Image::Properties::Png.new(src)
       else
-        puts magic_bytes.unpack('H2H2H2H2H2H2H2H2').inspect
+        puts "Unknown magic bytes: " + magic_bytes.unpack('H2H2H2H2H2H2H2H2').inspect
       end
     end
     return result

metadata

@@ -1,77 +1,86 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cul_image_props
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Benjamin Armintor
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
+date: 2012-06-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
 description: Library for extracting basic image properties
 email: armintor@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/cul_image_props/image/magic.rb
 - lib/cul_image_props/image/properties/exif/constants.rb
 - lib/cul_image_props/image/properties/exif/types.rb
@@ -83,36 +92,26 @@ files:
 - lib/cul_image_props.rb
 homepage: 
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Library for extracting basic image properties
 test_files: []
-