From ebb7a15f404a652b39b5e33e8e1df2f600d11cd3 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Wed, 27 May 2009 13:59:43 -0400 Subject: [PATCH] Use new Horde_Image class names --- folks/lib/Driver.php | 2 +- framework/Image/package.xml | 76 +++++++++++++++++++++--------------------- framework/Image/tests/im.php | 36 ++++++++++---------- imp/lib/Mime/Viewer/Images.php | 4 +-- imp/lib/Mime/Viewer/Pdf.php | 2 +- 5 files changed, 60 insertions(+), 60 deletions(-) diff --git a/folks/lib/Driver.php b/folks/lib/Driver.php index c2f8744ae..c9d157891 100644 --- 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 55423f026..92e0c4908 100644 --- a/framework/Image/package.xml +++ b/framework/Image/package.xml @@ -45,32 +45,32 @@ http://pear.php.net/dtd/package-2.0.xsd"> - - - - - - - - - + + + + + + + + + - - - - - + + + + + - - + + - - + + - - + + @@ -105,27 +105,27 @@ http://pear.php.net/dtd/package-2.0.xsd"> - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - + + - - + + diff --git a/framework/Image/tests/im.php b/framework/Image/tests/im.php index 46b5902c7..37b23099d 100644 --- 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 82cec5e1d..eb290e070 100644 --- 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 cfc36642e..a06db2f5e 100644 --- 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; -- 2.11.0