Use new Horde_Image class names

diff --git a/folks/lib/Driver.php b/folks/lib/Driver.php
index c2f8744..c9d1578 100644 (file)
--- a/folks/lib/Driver.php
+++ b/folks/lib/Driver.php
@@ -91,7 +91,7 @@ class Folks_Driver {
         $p = hash('md5', $user);
         $vfspath = Folks::VFS_PATH . '/' . substr(str_pad($p, 2, 0, STR_PAD_LEFT), -2) . '/';
         $vfs_name = $p . '.' . $conf['images']['image_type'];
-        $driver = empty($conf['image']['convert']) ? 'gd' : 'im';
+        $driver = empty($conf['image']['convert']) ? 'Gd' : 'Im';
         $context = array('tmpdir' => Horde::getTempDir());
         if (!empty($conf['image']['convert'])) {
             $context['convert'] = $conf['image']['convert'];

diff --git a/framework/Image/package.xml b/framework/Image/package.xml
index 55423f0..92e0c49 100644 (file)
--- a/framework/Image/package.xml
+++ b/framework/Image/package.xml
@@ -45,32 +45,32 @@ http://pear.php.net/dtd/package-2.0.xsd">
     <dir name="Horde">
      <dir name="Image">
       <dir name="Effect">
-       <file name="border.php" role="php" />
-       <dir name="im">
-        <file name="drop_shadow.php" role="php" />
-        <file name="round_corners.php" role="php" />
-        <file name="text_watermark.php" role="php" />
-        <file name="photo_stack.php" role="php" />
-        <file name="polaroid_image.php" role="php" />
-        <file name="border.php" role="php" />
-        <file name="composite.php" role="php" />
+       <file name="Border.php" role="php" />
+       <dir name="Im">
+        <file name="DropShadow.php" role="php" />
+        <file name="RoundCorners.php" role="php" />
+        <file name="TextWatermark.php" role="php" />
+        <file name="PhotoStack.php" role="php" />
+        <file name="PolaroidImage.php" role="php" />
+        <file name="Border.php" role="php" />
+        <file name="Composite.php" role="php" />
        </dir> <!-- /Horde/Image/Effect/im -->
-       <dir name="gd">
-        <file name="drop_shadow.php" role="php" />
-        <file name="round_corners.php" role="php" />
-        <file name="text_watermark.php" role="php" />
-        <file name="unsharp_mask.php" role="php" />
+       <dir name="Gd">
+        <file name="DropShadow.php" role="php" />
+        <file name="RoundCorners.php" role="php" />
+        <file name="TextWatermark.php" role="php" />
+        <file name="UnsharpMask.php" role="php" />
        </dir> <!-- /Horde/Image/Effect/gd -->
       </dir> <!-- /Horde/Image/Effect -->
       <file name="Effect.php" role="php" />
-      <file name="gd.php" role="php" />
-      <file name="im.php" role="php" />
+      <file name="Gd.php" role="php" />
+      <file name="Im.php" role="php" />
       <file name="ImagickProxy.php" role="php" />
-      <file name="imagick.php" role="php" />
-      <file name="png.php" role="php" />
+      <file name="Imagick.php" role="php" />
+      <file name="Png.php" role="php" />
       <file name="rgb.php" role="php" />
-      <file name="svg.php" role="php" />
-      <file name="swf.php" role="php" />
+      <file name="Svg.php" role="php" />
+      <file name="Swf.php" role="php" />
      </dir> <!-- /Horde/Image -->
      <dir name="tests">
       <file name="gd.php" role="test" />
@@ -105,27 +105,27 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </dependencies>
  <phprelease>
   <filelist>
-   <install name="lib/Horde/Image/Effect/border.php" as="Horde/Image/Effect/border.php" />
-   <install name="lib/Horde/Image/Effect/im/drop_shadow.php" as="Horde/Image/Effect/im/drop_shadow.php" />
-   <install name="lib/Horde/Image/Effect/im/round_corners.php" as="Horde/Image/Effect/im/round_corners.php" />
-   <install name="lib/Horde/Image/Effect/im/text_watermark.php" as="Horde/Image/Effect/im/text_watermark.php" />
-   <install name="lib/Horde/Image/Effect/im/photo_stack.php" as="Horde/Image/Effect/im/photo_stack.php" />
-   <install name="lib/Horde/Image/Effect/im/polaroid_image.php" as="Horde/Image/Effect/im/polaroid_image.php" />
-   <install name="lib/Horde/Image/Effect/im/border.php" as="Horde/Image/Effect/im/border.php" />
-   <install name="lib/Horde/Image/Effect/im/composite.php" as="Horde/Image/Effect/im/composite.php" />
-   <install name="lib/Horde/Image/Effect/gd/drop_shadow.php" as="Horde/Image/Effect/gd/drop_shadow.php" />
-   <install name="lib/Horde/Image/Effect/gd/round_corners.php" as="Horde/Image/Effect/gd/round_corners.php" />
-   <install name="lib/Horde/Image/Effect/gd/text_watermark.php" as="Horde/Image/Effect/gd/text_watermark.php" />
-   <install name="lib/Horde/Image/Effect/gd/unsharp_mask.php" as="Horde/Image/Effect/gd/unsharp_mask.php" />
+   <install name="lib/Horde/Image/Effect/Border.php" as="Horde/Image/Effect/Border.php" />
+   <install name="lib/Horde/Image/Effect/Im/DropShadow.php" as="Horde/Image/Effect/Im/DropShadow.php" />
+   <install name="lib/Horde/Image/Effect/Im/RoundCorners.php" as="Horde/Image/Effect/Im/RoundCorners.php" />
+   <install name="lib/Horde/Image/Effect/Im/TextWatermark.php" as="Horde/Image/Effect/Im/TextWatermark.php" />
+   <install name="lib/Horde/Image/Effect/Im/PhotoStack.php" as="Horde/Image/Effect/Im/PhotoStack.php" />
+   <install name="lib/Horde/Image/Effect/Im/PolaroidImage.php" as="Horde/Image/Effect/Im/PolaroidImage.php" />
+   <install name="lib/Horde/Image/Effect/Im/Border.php" as="Horde/Image/Effect/Im/Border.php" />
+   <install name="lib/Horde/Image/Effect/Im/Composite.php" as="Horde/Image/Effect/Im/Composite.php" />
+   <install name="lib/Horde/Image/Effect/Gd/DropShadow.php" as="Horde/Image/Effect/Gd/DropShadow.php" />
+   <install name="lib/Horde/Image/Effect/Gd/RoundCorners.php" as="Horde/Image/Effect/Gd/RoundCorners.php" />
+   <install name="lib/Horde/Image/Effect/Gd/TextWatermark.php" as="Horde/Image/Effect/Gd/TextWatermark.php" />
+   <install name="lib/Horde/Image/Effect/Gd/UnsharpMask.php" as="Horde/Image/Effect/Gd/UnsharpMask.php" />
    <install name="lib/Horde/Image/Effect.php" as="Horde/Image/Effect.php" />
-   <install name="lib/Horde/Image/gd.php" as="Horde/Image/gd.php" />
-   <install name="lib/Horde/Image/im.php" as="Horde/Image/im.php" />
+   <install name="lib/Horde/Image/Gd.php" as="Horde/Image/Gd.php" />
+   <install name="lib/Horde/Image/Im.php" as="Horde/Image/Im.php" />
    <install name="lib/Horde/Image/ImagickProxy.php" as="Horde/Image/ImagickProxy.php" />
-   <install name="lib/Horde/Image/imagick.php" as="Horde/Image/imagick.php" />
-   <install name="lib/Horde/Image/png.php" as="Horde/Image/png.php" />
+   <install name="lib/Horde/Image/Imagick.php" as="Horde/Image/Imagick.php" />
+   <install name="lib/Horde/Image/Png.php" as="Horde/Image/Png.php" />
    <install name="lib/Horde/Image/rgb.php" as="Horde/Image/rgb.php" />
-   <install name="lib/Horde/Image/svg.php" as="Horde/Image/svg.php" />
-   <install name="lib/Horde/Image/swf.php" as="Horde/Image/swf.php" />
+   <install name="lib/Horde/Image/Svg.php" as="Horde/Image/Svg.php" />
+   <install name="lib/Horde/Image/Swf.php" as="Horde/Image/Swf.php" />
    <install name="lib/Horde/Image.php" as="Horde/Image.php" />
   </filelist>
  </phprelease>

diff --git a/framework/Image/tests/im.php b/framework/Image/tests/im.php
index 46b5902..37b2309 100644 (file)
--- a/framework/Image/tests/im.php
+++ b/framework/Image/tests/im.php
@@ -118,7 +118,7 @@ case 'testRoundCorners':
     // Tests resizing, and rounding corners with appropriate background maintained.
     $image = getImageObject(array('filename' => 'img1.jpg'));
     $image->resize(150,150);
-    $image->addEffect('round_corners',
+    $image->addEffect('RoundCorners',
                       array('border' => 2,
                             'bordercolor' => '#333',
                             'background' => 'none'));
@@ -129,7 +129,7 @@ case 'testRoundCornersRedBG':
     // Tests resizing, and rounding corners with appropriate background maintained.
     $image = getImageObject(array('filename' => 'img1.jpg'));
     $image->resize(150,150);
-    $image->addEffect('round_corners',
+    $image->addEffect('RoundCorners',
                       array('border' => 2,
                             'bordercolor' => '#333',
                             'background' => 'red'));
@@ -139,10 +139,10 @@ case 'testRoundCornersRedBG':
 case 'testRoundCornersDropShadowTransparentBG':
     $image = getImageObject(array('filename' => 'img1.jpg'));
     $image->resize(150,150);
-    $image->addEffect('round_corners',
+    $image->addEffect('RoundCorners',
                       array('border' => 2,
                             'bordercolor' => '#333'));
-    $image->addEffect('drop_shadow',
+    $image->addEffect('DropShadow',
                       array('background' => 'none',
                             'padding' => 5,
                             'distance' => 5,
@@ -153,10 +153,10 @@ case 'testRoundCornersDropShadowTransparentBG':
 case 'testRoundCornersDropShadowYellowBG':
     $image = getImageObject(array('filename' => 'img1.jpg'));
     $image->resize(150,150);
-    $image->addEffect('round_corners',
+    $image->addEffect('RoundCorners',
                       array('border' => 2,
                             'bordercolor' => '#333'));
-    $image->addEffect('drop_shadow',
+    $image->addEffect('DropShadow',
                       array('background' => 'yellow',
                             'padding' => 5,
                             'distance' => 5,
@@ -168,8 +168,8 @@ case 'testBorderedDropShadowTransparentBG':
     $image = getImageObject(array('filename' => 'img1.jpg',
                                   'background' => 'none'));
     $image->resize(150,150);
-    $image->addEffect('border', array('bordercolor' => '#333', 'borderwidth' => 1));
-    $image->addEffect('drop_shadow',
+    $image->addEffect('Border', array('bordercolor' => '#333', 'borderwidth' => 1));
+    $image->addEffect('DropShadow',
                       array('background' => 'none',
                             'padding' => 5,
                             'distance' => '8',
@@ -181,8 +181,8 @@ case 'testBorderedDropShadowBlueBG':
     $image = getImageObject(array('filename' => 'img1.jpg',
                                   'background' => 'none'));
     $image->resize(150,150);
-    $image->addEffect('border', array('bordercolor' => '#333', 'borderwidth' => 1));
-    $image->addEffect('drop_shadow',
+    $image->addEffect('Border', array('bordercolor' => '#333', 'borderwidth' => 1));
+    $image->addEffect('DropShadow',
                       array('background' => 'blue',
                             'padding' => 5,
                             'distance' => '8',
@@ -193,7 +193,7 @@ case 'testBorderedDropShadowBlueBG':
 case 'testPolaroidTransparentBG':
     $image = getImageObject(array('filename' => 'img1.jpg'));
     $image->resize(150, 150);
-    $image->addEffect('polaroid_image',
+    $image->addEffect('PolaroidImage',
                       array('background' => 'none',
                             'padding' => 5));
     $image->display();
@@ -202,7 +202,7 @@ case 'testPolaroidTransparentBG':
 case 'testPolaroidBlueBG':
     $image = getImageObject(array('filename' => 'img1.jpg'));
     $image->resize(150, 150);
-    $image->addEffect('polaroid_image',
+    $image->addEffect('PolaroidImage',
                       array('background' => 'blue',
                             'padding' => 5));
     $image->display();
@@ -216,7 +216,7 @@ case 'testPlainstackTransparentBG':
                                     'height' => 1,
                                     'background' => 'none'));
 
-    $baseImg->addEffect('photo_stack',
+    $baseImg->addEffect('PhotoStack',
                         array('images' => $imgs,
                               'resize_height' => 150,
                               'padding' => 0,
@@ -234,7 +234,7 @@ case 'testPlainstackBlueBG':
                                     'height' => 1,
                                     'background' => 'none'));
 
-    $baseImg->addEffect('photo_stack',
+    $baseImg->addEffect('PhotoStack',
                         array('images' => $imgs,
                               'resize_height' => 150,
                               'padding' => 0,
@@ -252,7 +252,7 @@ case 'testRoundstackTransparentBG':
                                     'height' => 1,
                                     'background' => 'none'));
 
-    $baseImg->addEffect('photo_stack',
+    $baseImg->addEffect('PhotoStack',
                         array('images' => $imgs,
                               'resize_height' => 150,
                               'padding' => 0,
@@ -270,7 +270,7 @@ case 'testRoundstackBlueBG':
                                     'height' => 1,
                                     'background' => 'none'));
 
-    $baseImg->addEffect('photo_stack',
+    $baseImg->addEffect('PhotoStack',
                         array('images' => $imgs,
                               'resize_height' => 150,
                               'padding' => 0,
@@ -288,7 +288,7 @@ case 'testPolaroidstackTransparentBG':
                                     'height' => 1,
                                     'background' => 'none'));
 
-    $baseImg->addEffect('photo_stack',
+    $baseImg->addEffect('PhotoStack',
                         array('images' => $imgs,
                               'resize_height' => 150,
                               'padding' => 0,
@@ -306,7 +306,7 @@ case 'testPolaroidstackBlueBG':
                                     'height' => 1,
                                     'background' => 'none'));
 
-    $baseImg->addEffect('photo_stack',
+    $baseImg->addEffect('PhotoStack',
                         array('images' => $imgs,
                               'resize_height' => 150,
                               'padding' => 0,

diff --git a/imp/lib/Mime/Viewer/Images.php b/imp/lib/Mime/Viewer/Images.php
index 82cec5e..eb290e0 100644 (file)
--- a/imp/lib/Mime/Viewer/Images.php
+++ b/imp/lib/Mime/Viewer/Images.php
@@ -262,9 +262,9 @@ EOD;
         $context = array('tmpdir' => Horde::getTempDir());
         if (!empty($GLOBALS['conf']['image']['convert'])) {
             $context['convert'] = $GLOBALS['conf']['image']['convert'];
-            $img = Horde_Image::factory('im', array('context' => $context));
+            $img = Horde_Image::factory('Im', array('context' => $context));
         } elseif (Util::extensionExists('gd')) {
-            $img = Horde_Image::factory('gd', array('context' => $context));
+            $img = Horde_Image::factory('Gd', array('context' => $context));
         }
 
         if (!$img || is_a($img, 'PEAR_Error')) {

diff --git a/imp/lib/Mime/Viewer/Pdf.php b/imp/lib/Mime/Viewer/Pdf.php
index cfc3664..a06db2f 100644 (file)
--- a/imp/lib/Mime/Viewer/Pdf.php
+++ b/imp/lib/Mime/Viewer/Pdf.php
@@ -114,7 +114,7 @@ class IMP_Horde_Mime_Viewer_Pdf extends Horde_Mime_Viewer_Pdf
             return false;
         }
 
-        $img = Horde_Image::factory('im', array('context' => array('tmpdir' => Horde::getTempdir(),
+        $img = Horde_Image::factory('Im', array('context' => array('tmpdir' => Horde::getTempdir(),
                                                                    'convert' => $GLOBALS['conf']['image']['convert'])));
         if (is_a($img, 'PEAR_Error')) {
             return false;