From 4372720db00efb8c34aa5a7b463a21c546c415eb Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Tue, 16 Feb 2010 20:05:20 -0500 Subject: [PATCH] 2nd try --- ansel/lib/ImageView/mini.php | 19 ------------- ansel/lib/ImageView/plainstack.php | 41 ---------------------------- ansel/lib/ImageView/polaroidstack.php | 41 ---------------------------- ansel/lib/ImageView/polaroidthumb.php | 42 ----------------------------- ansel/lib/ImageView/prettythumb.php | 46 -------------------------------- ansel/lib/ImageView/roundedstack.php | 43 ----------------------------- ansel/lib/ImageView/screen.php | 19 ------------- ansel/lib/ImageView/shadowsharpthumb.php | 44 ------------------------------ ansel/lib/ImageView/thumb.php | 18 ------------- 9 files changed, 313 deletions(-) delete mode 100755 ansel/lib/ImageView/mini.php delete mode 100644 ansel/lib/ImageView/plainstack.php delete mode 100644 ansel/lib/ImageView/polaroidstack.php delete mode 100644 ansel/lib/ImageView/polaroidthumb.php delete mode 100644 ansel/lib/ImageView/prettythumb.php delete mode 100644 ansel/lib/ImageView/roundedstack.php delete mode 100755 ansel/lib/ImageView/screen.php delete mode 100644 ansel/lib/ImageView/shadowsharpthumb.php delete mode 100755 ansel/lib/ImageView/thumb.php diff --git a/ansel/lib/ImageView/mini.php b/ansel/lib/ImageView/mini.php deleted file mode 100755 index 8b9f1418a..000000000 --- a/ansel/lib/ImageView/mini.php +++ /dev/null @@ -1,19 +0,0 @@ - - * @package Ansel - */ -class Ansel_ImageView_mini extends Ansel_ImageView { - - function _create() - { - $this->_image->resize(min(50, $this->_dimensions['width']), - min(50, $this->_dimensions['height']), - true); - - return true; - } - -} diff --git a/ansel/lib/ImageView/plainstack.php b/ansel/lib/ImageView/plainstack.php deleted file mode 100644 index ad19bdefd..000000000 --- a/ansel/lib/ImageView/plainstack.php +++ /dev/null @@ -1,41 +0,0 @@ - - * @package Ansel - */ -class Ansel_ImageView_plainstack extends Ansel_ImageView { - - var $need = array('PhotoStack'); - - function _create() - { - $imgobjs = $this->_getStackImages(); - $style = $this->_params['style']; - $params = array('width' => 100, - 'height' => 100, - 'background' => $style['background']); - - $baseImg = Ansel::getImageObject($params); - 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; - } - - return $baseImg; - - } - -} diff --git a/ansel/lib/ImageView/polaroidstack.php b/ansel/lib/ImageView/polaroidstack.php deleted file mode 100644 index a712931e1..000000000 --- a/ansel/lib/ImageView/polaroidstack.php +++ /dev/null @@ -1,41 +0,0 @@ - - * @package Ansel - */ -class Ansel_ImageView_polaroidstack extends Ansel_ImageView { - - var $need = array('PhotoStack'); - - function _create() - { - $imgobjs = $this->_getStackImages(); - $style = $this->_params['style']; - $params = array('width' => 100, - 'height' => 100, - 'background' => $style['background']); - - $baseImg = Ansel::getImageObject($params); - 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; - } - - return $baseImg; - - } - -} diff --git a/ansel/lib/ImageView/polaroidthumb.php b/ansel/lib/ImageView/polaroidthumb.php deleted file mode 100644 index 90fe1199d..000000000 --- a/ansel/lib/ImageView/polaroidthumb.php +++ /dev/null @@ -1,42 +0,0 @@ - - * @package Ansel - */ - -class Ansel_ImageView_polaroidthumb extends Ansel_ImageView { - - var $need = array('PolaroidImage'); - - function _create() - { - $this->_image->resize(min($GLOBALS['conf']['thumbnail']['width'], $this->_dimensions['width']), - min($GLOBALS['conf']['thumbnail']['height'], $this->_dimensions['height']), - true); - - /* Don't bother with these effects for a custom gallery default image - (which will have a negative gallery_id). */ - if ($this->_image->gallery > 0) { - if (is_null($this->_style)) { - $gal = $GLOBALS['ansel_storage']->getGallery($this->_image->gallery); - $styleDef = $gal->getStyle(); - } else { - $styleDef = Ansel::getStyleDefinition($this->_style); - } - try { - $this->_image->addEffect('PolaroidImage', - array('background' => $styleDef['background'], - 'padding' => 5)); - - $this->_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 deleted file mode 100644 index 4c5b86fdb..000000000 --- a/ansel/lib/ImageView/prettythumb.php +++ /dev/null @@ -1,46 +0,0 @@ - - * @package Ansel - */ -class Ansel_ImageView_prettythumb extends Ansel_ImageView { - - var $need = array('RoundCorners', 'DropShadow'); - - function _create() - { - $this->_image->resize(min($GLOBALS['conf']['thumbnail']['width'], $this->_dimensions['width']), - min($GLOBALS['conf']['thumbnail']['height'], $this->_dimensions['height']), - true); - - /* Don't bother with these effects for a stack image - * (which will have a negative gallery_id). */ - if ($this->_image->gallery > 0) { - if (is_null($this->_style)) { - $gal = $GLOBALS['ansel_storage']->getGallery($this->_image->gallery); - $styleDef = $gal->getStyle(); - } else { - $styleDef = Ansel::getStyleDefinition($this->_style); - } - - try { - /* Apply the effects - continue on error, but be sure to log */ - $this->_image->addEffect('RoundCorners', array('border' => 2, - 'bordercolor' => '#333')); - - $this->_image->addEffect('DropShadow', array('background' => $styleDef['background'], - 'padding' => 5, - 'distance' => 5, - 'fade' => 3)); - } catch (Horde_Image_Exception $e) { - return false; - } - $this->_image->applyEffects(); - - return true; - } - } - -} diff --git a/ansel/lib/ImageView/roundedstack.php b/ansel/lib/ImageView/roundedstack.php deleted file mode 100644 index 92a0a617b..000000000 --- a/ansel/lib/ImageView/roundedstack.php +++ /dev/null @@ -1,43 +0,0 @@ - - * @package Ansel - * - */ -class Ansel_ImageView_roundedstack extends Ansel_ImageView { - - var $need = array('PhotoStack'); - - function _create() - { - $imgobjs = $this->_getStackImages(); - $style = $this->_params['style']; - $params = array('width' => 100, - 'height' => 100, - 'background' => $style['background']); - - $baseImg = Ansel::getImageObject($params); - - 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/screen.php b/ansel/lib/ImageView/screen.php deleted file mode 100755 index 4d912ed1b..000000000 --- a/ansel/lib/ImageView/screen.php +++ /dev/null @@ -1,19 +0,0 @@ - - * @package Ansel - */ -class Ansel_ImageView_screen extends Ansel_ImageView { - - function _create() - { - $this->_image->resize(min($GLOBALS['conf']['screen']['width'], $this->_dimensions['width']), - min($GLOBALS['conf']['screen']['height'], $this->_dimensions['height']), - true); - - return true; - } - -} diff --git a/ansel/lib/ImageView/shadowsharpthumb.php b/ansel/lib/ImageView/shadowsharpthumb.php deleted file mode 100644 index 305788db3..000000000 --- a/ansel/lib/ImageView/shadowsharpthumb.php +++ /dev/null @@ -1,44 +0,0 @@ - - * @package Ansel - */ -class Ansel_ImageView_shadowsharpthumb extends Ansel_ImageView { - - var $need = array('DropShadow'); - - function _create() - { - $this->_image->resize(min($GLOBALS['conf']['thumbnail']['width'], $this->_dimensions['width']), - min($GLOBALS['conf']['thumbnail']['height'], $this->_dimensions['height']), - true); - - /* Don't bother with these effects for a stack image - * (which will have a negative gallery_id). */ - if ($this->_image->gallery > 0) { - if (is_null($this->_style)) { - $gal = $GLOBALS['ansel_storage']->getGallery($this->_image->gallery); - $styleDef = $gal->getStyle(); - } else { - $styleDef = Ansel::getStyleDefinition($this->_style); - } - - try { - $this->_image->addEffect('border', array('bordercolor' => '#333')); - $this->_image->addEffect('DropShadow', - array('background' => $styleDef['background'], - 'padding' => 5, - 'distance' => '8', - 'fade' => 2)); - $this->_image->applyEffects(); - } catch (Horde_Image_Exception $e) { - return false; - } - - return true; - } - } - -} diff --git a/ansel/lib/ImageView/thumb.php b/ansel/lib/ImageView/thumb.php deleted file mode 100755 index cf769c20d..000000000 --- a/ansel/lib/ImageView/thumb.php +++ /dev/null @@ -1,18 +0,0 @@ - - * @package Ansel - */ -class Ansel_ImageView_thumb extends Ansel_ImageView { - - function _create() - { - $this->_image->resize(min($GLOBALS['conf']['thumbnail']['width'], $this->_dimensions['width']), - min($GLOBALS['conf']['thumbnail']['height'], $this->_dimensions['height']), - true); - return true; - } - -} -- 2.11.0