Typos, Bundled driver needs a lookupType method also, class name fixes etc...

diff --git a/framework/Image/lib/Horde/Image/Exif/Bundled.php b/framework/Image/lib/Horde/Image/Exif/Bundled.php
index 1b972af..5efb66a 100644 (file)
--- a/framework/Image/lib/Horde/Image/Exif/Bundled.php
+++ b/framework/Image/lib/Horde/Image/Exif/Bundled.php
@@ -354,7 +354,7 @@ class Horde_Image_Exif_Bundled extends Horde_Image_Exif_Base
         // 2 byte datatype
         $type = bin2hex(fread($in, 2));
         if ($intel == 1) $type = Horde_Image_Exif::intel2Moto($type);
-        lookup_type($type, $size);
+        self::_lookupType($type, $size);
 
         // 4 byte number of elements
         $count = bin2hex(fread($in, 4));
@@ -668,4 +668,30 @@ class Horde_Image_Exif_Bundled extends Horde_Image_Exif_Base
         return $data;
     }
 
+    /**
+     *
+     * @param $type
+     * @param $size
+     * @return unknown_type
+     */
+    static protected function _lookupType(&$type,&$size) {
+        switch ($type) {
+            case '0001': $type = 'UBYTE'; $size=1; break;
+            case '0002': $type = 'ASCII'; $size=1; break;
+            case '0003': $type = 'USHORT'; $size=2; break;
+            case '0004': $type = 'ULONG'; $size=4; break;
+            case '0005': $type = 'URATIONAL'; $size=8; break;
+            case '0006': $type = 'SBYTE'; $size=1; break;
+            case '0007': $type = 'UNDEFINED'; $size=1; break;
+            case '0008': $type = 'SSHORT'; $size=2; break;
+            case '0009': $type = 'SLONG'; $size=4; break;
+            case '000a': $type = 'SRATIONAL'; $size=8; break;
+            case '000b': $type = 'FLOAT'; $size=4; break;
+            case '000c': $type = 'DOUBLE'; $size=8; break;
+            default: $type = 'error:'.$type; $size=0; break;
+        }
+
+        return $type;
+    }
+
 }
\ No newline at end of file

diff --git a/framework/Image/lib/Horde/Image/Exif/Parser/Gps.php b/framework/Image/lib/Horde/Image/Exif/Parser/Gps.php
index ab8df41..d0cb80e 100644 (file)
--- a/framework/Image/lib/Horde/Image/Exif/Parser/Gps.php
+++ b/framework/Image/lib/Horde/Image/Exif/Parser/Gps.php
@@ -233,7 +233,7 @@ class Horde_Image_Exif_Parser_Gps extends Horde_Image_Exif_Parser_Base
             if ($intel == 1) {
                 $tag = Horde_Image_Exif::intel2Moto($tag);
             }
-            $tag_name = self::_lookpTag($tag);
+            $tag_name = self::_lookupTag($tag);
 
             //2 byte datatype
             $type = bin2hex(substr($block, $place, 2));