lib/RMagick.rb in rmagick-2.1.0 vs lib/RMagick.rb in rmagick-2.2.0

@@ -1,6 +1,6 @@
-# $Id: RMagick.rb,v 1.64 2008/01/05 22:21:52 rmagick Exp $
+# $Id: RMagick.rb,v 1.65 2008/01/25 00:43:01 rmagick Exp $
 #==============================================================================
 #                  Copyright (C) 2007 by Timothy P. Hunter
 #   Name:       RMagick.rb
 #   Author:     Tim Hunter
 #   Purpose:    Extend Ruby to interface with ImageMagick.
@@ -773,10 +773,11 @@
             exif_data = self['EXIF:*']
             if exif_data
                 exif_data.split("\n").each { |exif| ary.push(exif.split('=')) }
             end
         else
+            get_exif_by_entry()     # ensure properties is populated with exif data
             entry.each do |name|
                 rval = self["EXIF:#{name}"]
                 ary.push([name, rval])
             end
         end
@@ -794,11 +795,12 @@
                     tag = tag[1,4].hex
                     hash[tag] = value
                 end
             end
         else
+            get_exif_by_number()    # ensure properties is populated with exif data
             tag.each do |num|
-                rval = self["EXIF:#{'#%04X' % num}"]
+                rval = self['#%04X' % num.to_i]
                 hash[num] = rval == 'unknown' ? nil : rval
             end
         end
         return hash
     end