From 56ff4d1f06c12b89cbea7b93bc868990e429f8e2 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Mon, 3 Aug 2009 17:00:44 -0400 Subject: [PATCH] Catch errors from Horde_Image --- ansel/lib/ImageView.php | 1 + ansel/lib/ImageView/plainstack.php | 28 ++++++++++++++-------------- ansel/lib/ImageView/polaroidstack.php | 28 ++++++++++++++-------------- ansel/lib/ImageView/polaroidthumb.php | 12 ++++++++---- ansel/lib/ImageView/prettythumb.php | 24 ++++++++++-------------- ansel/lib/ImageView/roundedstack.php | 29 +++++++++++++++-------------- ansel/lib/ImageView/shadowsharpthumb.php | 21 +++++++++++---------- 7 files changed, 73 insertions(+), 70 deletions(-) diff --git a/ansel/lib/ImageView.php b/ansel/lib/ImageView.php index 6e9b96694..34f047494 100644 --- a/ansel/lib/ImageView.php +++ b/ansel/lib/ImageView.php @@ -62,6 +62,7 @@ class Ansel_ImageView { if (!empty($this->_image)) { $this->_dimensions = $this->_image->_image->getDimensions(); } + return $this->_create(); } diff --git a/ansel/lib/ImageView/plainstack.php b/ansel/lib/ImageView/plainstack.php index b4bbf1088..ab261984e 100644 --- a/ansel/lib/ImageView/plainstack.php +++ b/ansel/lib/ImageView/plainstack.php @@ -27,22 +27,22 @@ class Ansel_ImageView_plainstack extends Ansel_ImageView { 'background' => $style['background']); $baseImg = Ansel::getImageObject($params); - $result = $baseImg->addEffect( - 'PhotoStack', - array('images' => $imgobjs, - 'resize_height' => $GLOBALS['conf']['thumbnail']['height'], - 'padding' => 0, - 'background' => $style['background'], - 'type' => 'plain')); - - $baseImg->applyEffects(); - if (is_a($result, 'PEAR_Error')) { - return $result; + try { + $baseImg->addEffect( + 'PhotoStack', + array('images' => $imgobjs, + 'resize_height' => $GLOBALS['conf']['thumbnail']['height'], + 'padding' => 0, + 'background' => $style['background'], + 'type' => 'plain')); + + $baseImg->applyEffects(); + $baseImg->resize($GLOBALS['conf']['thumbnail']['width'], + $GLOBALS['conf']['thumbnail']['height']); + } catch (Horde_Image_Exception $e) { + return false; } - $baseImg->resize($GLOBALS['conf']['thumbnail']['width'], - $GLOBALS['conf']['thumbnail']['height']); - return $baseImg; } diff --git a/ansel/lib/ImageView/polaroidstack.php b/ansel/lib/ImageView/polaroidstack.php index 4c0d25199..697f66e9a 100644 --- a/ansel/lib/ImageView/polaroidstack.php +++ b/ansel/lib/ImageView/polaroidstack.php @@ -27,22 +27,22 @@ class Ansel_ImageView_polaroidstack extends Ansel_ImageView { 'background' => $style['background']); $baseImg = Ansel::getImageObject($params); - $result = $baseImg->addEffect( - 'PhotoStack', - array('images' => $imgobjs, - 'resize_height' => $GLOBALS['conf']['thumbnail']['height'], - 'padding' => 10, - 'background' => $style['background'], - 'type' => 'polaroid')); - - $baseImg->applyEffects(); - if (is_a($result, 'PEAR_Error')) { - return $result; + try { + $baseImg->addEffect( + 'PhotoStack', + array('images' => $imgobjs, + 'resize_height' => $GLOBALS['conf']['thumbnail']['height'], + 'padding' => 10, + 'background' => $style['background'], + 'type' => 'polaroid')); + $baseImg->applyEffects(); + $baseImg->resize($GLOBALS['conf']['thumbnail']['width'], + $GLOBALS['conf']['thumbnail']['height']); + + } catch (Horde_Image_Exception $e) { + return false; } - $baseImg->resize($GLOBALS['conf']['thumbnail']['width'], - $GLOBALS['conf']['thumbnail']['height']); - return $baseImg; } diff --git a/ansel/lib/ImageView/polaroidthumb.php b/ansel/lib/ImageView/polaroidthumb.php index 5d4950d4d..67e21b240 100644 --- a/ansel/lib/ImageView/polaroidthumb.php +++ b/ansel/lib/ImageView/polaroidthumb.php @@ -25,11 +25,15 @@ class Ansel_ImageView_polaroidthumb extends Ansel_ImageView { } else { $styleDef = Ansel::getStyleDefinition($this->_style); } - $this->_image->_image->addEffect('PolaroidImage', - array('background' => $styleDef['background'], - 'padding' => 5)); + try { + $this->_image->_image->addEffect('PolaroidImage', + array('background' => $styleDef['background'], + 'padding' => 5)); - $this->_image->_image->applyEffects(); + $this->_image->_image->applyEffects(); + } catch (Horde_Image_Exception $e) { + return false; + } return true; } diff --git a/ansel/lib/ImageView/prettythumb.php b/ansel/lib/ImageView/prettythumb.php index 7f3cf7ea0..2533b88e5 100644 --- a/ansel/lib/ImageView/prettythumb.php +++ b/ansel/lib/ImageView/prettythumb.php @@ -25,21 +25,17 @@ class Ansel_ImageView_prettythumb extends Ansel_ImageView { $styleDef = Ansel::getStyleDefinition($this->_style); } - /* Apply the effects - continue on error, but be sure to log */ - $res = $this->_image->_image->addEffect('RoundCorners', - array('border' => 2, - 'bordercolor' => '#333')); - if (is_a($res, 'PEAR_Error')) { - Horde::logMessage($res, __FILE__, __LINE__, PEAR_LOG_ERR); - } + try { + /* Apply the effects - continue on error, but be sure to log */ + $this->_image->_image->addEffect('RoundCorners', array('border' => 2, + 'bordercolor' => '#333')); - $res = $this->_image->_image->addEffect('DropShadow', - array('background' => $styleDef['background'], - 'padding' => 5, - 'distance' => 5, - 'fade' => 3)); - if (is_a($res, 'PEAR_Error')) { - Horde::logMessage($res, __FILE__, __LINE__, PEAR_LOG_ERR); + $this->_image->_image->addEffect('DropShadow', array('background' => $styleDef['background'], + 'padding' => 5, + 'distance' => 5, + 'fade' => 3)); + } catch (Horde_Image_Exception $e) { + return false; } return $this->_image->_image->applyEffects(); diff --git a/ansel/lib/ImageView/roundedstack.php b/ansel/lib/ImageView/roundedstack.php index 2a6467212..a646c301a 100644 --- a/ansel/lib/ImageView/roundedstack.php +++ b/ansel/lib/ImageView/roundedstack.php @@ -28,21 +28,22 @@ class Ansel_ImageView_roundedstack extends Ansel_ImageView { 'background' => $style['background']); $baseImg = Ansel::getImageObject($params); - $result = $baseImg->addEffect( - 'PhotoStack', - array('images' => $imgobjs, - 'resize_height' => $GLOBALS['conf']['thumbnail']['height'], - 'padding' => 0, - 'background' => $style['background'], - 'type' => 'rounded')); - - $baseImg->applyEffects(); - if (is_a($result, 'PEAR_Error')) { - return $result; - } - $baseImg->resize($GLOBALS['conf']['thumbnail']['width'], - $GLOBALS['conf']['thumbnail']['height']); + try { + $baseImg->addEffect( + 'PhotoStack', + array('images' => $imgobjs, + 'resize_height' => $GLOBALS['conf']['thumbnail']['height'], + 'padding' => 0, + 'background' => $style['background'], + 'type' => 'rounded')); + + $baseImg->applyEffects(); + $baseImg->resize($GLOBALS['conf']['thumbnail']['width'], + $GLOBALS['conf']['thumbnail']['height']); + } catch (Horde_Image_Exception $e) { + return false; + } return $baseImg; diff --git a/ansel/lib/ImageView/shadowsharpthumb.php b/ansel/lib/ImageView/shadowsharpthumb.php index f68e52b3e..e6b668c27 100644 --- a/ansel/lib/ImageView/shadowsharpthumb.php +++ b/ansel/lib/ImageView/shadowsharpthumb.php @@ -25,16 +25,17 @@ class Ansel_ImageView_shadowsharpthumb extends Ansel_ImageView { $styleDef = Ansel::getStyleDefinition($this->_style); } - $res = $this->_image->_image->addEffect( - 'border', array('bordercolor' => '#333')); - - $this->_image->_image->addEffect('DropShadow', - array('background' => $styleDef['background'], - 'padding' => 5, - 'distance' => '8', - 'fade' => 2)); - - $this->_image->_image->applyEffects(); + try { + $this->_image->_image->addEffect('border', array('bordercolor' => '#333')); + $this->_image->_image->addEffect('DropShadow', + array('background' => $styleDef['background'], + 'padding' => 5, + 'distance' => '8', + 'fade' => 2)); + $this->_image->_image->applyEffects(); + } catch (Horde_Image_Exception $e) { + return false; + } return true; } -- 2.11.0