cul_image_props 0.3.4 → 0.3.5

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTk4NWQ0ZWUxNjkzMDc3NzIzMWQ4MDE3OTUwOGQzZDI1MmZkOWVlMQ==
+  data.tar.gz: !binary |-
+    NzZjZWU2YTlkZDNmYTI1MzI1OTRiMzk4NWE4YmZjOWViNmFjNjFkNQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NjVmODFiYWVlZDJjZGViMjgzNGFmM2JmOGM0OGExMDJhZTEyMDRhMTRlMjI2
+    OTFiODg4OGJlNzVhYjZjNWQ1MGE1MzMwMjY2ZDMyNWJiYjBjNjJjYzc3Nzcz
+    NjQzZDc1YjcwNzQwNDc5MGUzZTBhMDhhNmNiODYzMWE2YTA3NTM=
+  data.tar.gz: !binary |-
+    MWI3ZWU1MTBkNWM1YWY2N2Q2NjAyY2IxMThjYjQwZTAxYzdjZjY4ZDczODMy
+    MzE4NGViNjE5MmFmYjFmZjI1NTY3OGM1YWU4YzBiZmNjZWE4YzE1OGY4OTRl
+    MjJlODRlMzZkMDcwYmM1ZGUwZmY3OTA4NDJkMTgxYmYxYzQ4Nzk=

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

@@ -133,11 +133,11 @@ FIELD_TYPES = [
     FieldType.new(2, 'S', 'Short'),
     FieldType.new(4, 'L', 'Long'),
     FieldType.new(8, 'R', 'Ratio'),
-    FieldType.new(1, 'SB', 'Signed Byte'),
+    FieldType.new(1, 'SB', 'Signed Byte', true),
     FieldType.new(1, 'U', 'Undefined'),
-    FieldType.new(2, 'SS', 'Signed Short'),
-    FieldType.new(4, 'SL', 'Signed Long'),
-    FieldType.new(8, 'SR', 'Signed Ratio')
+    FieldType.new(2, 'SS', 'Signed Short', true),
+    FieldType.new(4, 'SL', 'Signed Long', true),
+    FieldType.new(8, 'SR', 'Signed Ratio', true)
     ]
 
 # dictionary of main EXIF tag names

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

@@ -4,11 +4,12 @@ module Properties
 module Exif
 
 class FieldType
-  attr_accessor :length, :abbreviation, :name
-  def initialize(length, abb, name)
+  attr_accessor :length, :abbreviation, :name, :signed
+  def initialize(length, abb, name, signed=false)
     @length = length
     @abbreviation = abb
     @name = name
+    @signed = signed
   end
   def [](index)
     case index
@@ -148,6 +149,7 @@ end
 class EXIF_header
     X00 = [0x00].pack('C')
     attr_accessor :tags
+    attr_reader :endian, :offset
     def initialize(file, endian, offset, fake_exif, strict, detail=true)
         @file = file
         @endian = endian
@@ -293,6 +295,7 @@ class EXIF_header
                     end
                 end
                 typelen = FIELD_TYPES[field_type].length
+                signed = FIELD_TYPES[field_type].signed
                 count = unpack_number(@file.read(4))
 
                 # If the value exceeds 4 bytes, it is a pointer to values.
@@ -324,7 +327,6 @@ class EXIF_header
                     end
                 else
                     values = []
-                    signed = [6, 8, 9, 10].include? field_type
                     
                     # @todo investigate
                     # some entries get too big to handle could be malformed file
@@ -342,6 +344,10 @@ class EXIF_header
                         }
                     end
                 end
+            if (tag_id == 0x8769)
+                puts "tag_id #{tag_id} field_type #{field_type} count #{count} values #{values.inspect}"
+
+            end
                 
                 self.tags[ifd_name + ' ' + tag_entry.name] = IFD_Tag.new(tag_id,
                                                           field_type, tag_entry,

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

@@ -150,18 +150,20 @@ def self.process_file(f, opts={})
         hdr.dump_IFD(i, ifd_name, {:dict=>EXIF_TAGS, :relative=>false, :stop_tag=>stop_tag})
         # EXIF IFD
         exif_off = hdr.tags[ifd_name +' ExifOffset']
-        if exif_off
+        if exif_off and exif_off.values[0] < f.size
             hdr.dump_IFD(exif_off.values[0], 'EXIF', {:dict=>EXIF_TAGS, :relative=>false, :stop_tag =>stop_tag})
             # Interoperability IFD contained in EXIF IFD
             intr_off = hdr.tags['EXIF SubIFD InteroperabilityOffset']
             if intr_off
+                puts "INTEROP OFFSET"
                 hdr.dump_IFD(intr_off.values[0], 'EXIF Interoperability',
                              :dict=>INTR_TAGS, :relative=>false, :stop_tag =>stop_tag)
             end
         end
         # GPS IFD
         gps_off = hdr.tags[ifd_name+' GPSInfo']
-        if gps_off
+        if gps_off and gps_off.values[0] < f.size
+            puts "GPSINFO"
             hdr.dump_IFD(gps_off.values[0], 'GPS', {:dict=>GPS_TAGS, :relative=>false, :stop_tag =>stop_tag})
         end
         ctr += 1

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

@@ -100,6 +100,10 @@ xml
     (0...str.length).each {|ix| result << str[ix].to_s(16)}
     result.inspect
   end
+
+  def inspect
+    @ng_xml.to_s
+  end
 end
 
 class Bmp < Base

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

@@ -1,7 +1,7 @@
 module Cul
 module Image
 module Properties
-VERSION = "0.3.4"
+VERSION = "0.3.5"
 end
 end
 end

data/lib/cul_image_props.rb

@@ -1,3 +1,37 @@
+# This library was originally adapted from exif-py, a python library
+# created by Gene Cash. 
+# Copyright (c) 2002-2007 Gene Cash
+# Copyright (c) 2007-2013 Columbia University Libraries
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#
+#  2. Redistributions in binary form must reproduce the above
+#     copyright notice, this list of conditions and the following
+#     disclaimer in the documentation and/or other materials provided
+#     with the distribution.
+#
+#  3. Neither the name of the authors nor the names of its contributors
+#     may be used to endorse or promote products derived from this
+#     software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
 require 'cul_image_props/image/properties/version'
 require 'cul_image_props/image'
 module Cul
@@ -8,4 +42,4 @@ module Properties
   end
 end
 end
-end
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: cul_image_props
 version: !ruby/object:Gem::Version
-  version: 0.3.4
-  prerelease: 
+  version: 0.3.5
 platform: ruby
 authors:
 - Benjamin Armintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-08-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
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -92,26 +83,25 @@ files:
 - lib/cul_image_props.rb
 homepage: 
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Library for extracting basic image properties
 test_files: []