From af01353a5a07321f62ce8bea79f90fbe629c5fb4 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Sat, 1 Aug 2009 14:40:05 -0400
Subject: [PATCH] Fix variable name, have factory method determine which driver
 to return if none explicitly requested.

---
 framework/Image/lib/Horde/Image/Exif.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/framework/Image/lib/Horde/Image/Exif.php b/framework/Image/lib/Horde/Image/Exif.php
index 2f76c1717..b65da1296 100644
--- a/framework/Image/lib/Horde/Image/Exif.php
+++ b/framework/Image/lib/Horde/Image/Exif.php
@@ -14,7 +14,17 @@ class Horde_Image_Exif
 {
     static public function factory($driver = null)
     {
-        return new Horde_Image_Exif_Php();
+        if (empty($driver) && function_exists('exif_read_data')) {
+            $driver = 'Php';
+        } elseif (empty($driver)) {
+            $driver = 'Bundled';
+        } else {
+            $driver = basename($driver);
+        }
+
+        $class = 'Horde_Image_Exif_' . $driver;
+
+        return new $class;
     }
 
     /**
@@ -24,7 +34,7 @@ class Horde_Image_Exif
      * @param $num
      * @return unknown_type
      */
-    static public function intel2Moto($num)
+    static public function intel2Moto($intel)
     {
         $len  = strlen($intel);
         $moto = '';
-- 
2.11.0