Changeset 13174

Timestamp:

11/20/08 06:02:45 (4 years ago)

Author:

gnat

Message:

update to the latest version with array style params

Files:

• plugins/gsImageProcessorPlugin/trunk/lib/ImageProcessorHelper.class.php (modified) (7 diffs)
• plugins/gsImageProcessorPlugin/trunk/lib/gdImage.class.php (modified) (1 diff)
• plugins/gsImageProcessorPlugin/trunk/lib/gsBorderProcessor.class.php (modified) (2 diffs)
• plugins/gsImageProcessorPlugin/trunk/lib/gsColorizeProcessor.class.php (modified) (2 diffs)
• plugins/gsImageProcessorPlugin/trunk/lib/gsRotationProcessor.class.php (modified) (1 diff)
• plugins/gsImageProcessorPlugin/trunk/lib/gsShadowProcessor.class.php (modified) (5 diffs)
• plugins/gsImageProcessorPlugin/trunk/lib/gsTextOverlayProcessor.class.php (modified) (2 diffs)
• plugins/gsImageProcessorPlugin/trunk/lib/gsWatermarkProcessor.class.php (modified) (18 diffs)

plugins/gsImageProcessorPlugin/trunk/lib/ImageProcessorHelper.class.php

@@ -32 +32 @@
-            throw new sfException('Missing required params dimensions array!');
-
-
+ and if so, where
-        if(isset($params['save']) && !empty($output_file))
-        {
@@ -39 +39 @@
-
-            // determines the output file type
-output_
-output_
+save']['
+save']['
-            else
-            {
@@ -52 +52 @@
-                $output_type = 'png';
-
-quality']))?$params
-
-output_
-
-output_
-output_
+save']['quality']))?$params['save']
+
+save']['
+
+save']['
+save']['
-            else
-                $save = false;
@@ -69 +69 @@
-            $cparams     = &$params['create'];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-            switch($depth)
-            {
-                case '8':
-                    $im = imagecreate($imageWidth, $imageHeight);
+                    break;
-                case '32':
-                default:
@@ -98 +88 @@
-            }
-
+            if(!$im)
+                throw new sfException('Unable to create image from scratch');
+
-            // set values for transparency and opacity
-params['transparency
-= ($transparency) ? 127 
+cparams['transparent
+     = ($transparency) ? (isset($cparams['opacity']) ? $cparams['opacity']: 127)
-
-            if(isset($cparams['bgcolor']) || isset($cparams['bgcolour']))
@@ -109 +102 @@
-                @imagefill($im, 0, 0, $bgcolor);
-            }
-
-            if(!$im)
-                throw new sfException('Unable to create image from scratch');
-
-            $img = new gdImage($im);
@@ -123 +113 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                else
-                {
-0,$params['max_height
-
-Width() > $params['max_width']) // still too wide
-params['max_width'],$params['max_
+$rparams['width
+
+Height() > $rparams['height']) // still too long
+rparams['width'],$rparams['
-                }
-            }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if( isset($params['colorize']) && is_array($params['colorize']) )
-            $img = gsColorizeProcessor::colorize($img,$params['colorize']);
-
+        /*
+         * border:
+         *   width:  10   (default if not specified)
+         *   color:  [ R,G,B ] or FFAAFF
+         *   clone:  false (apply to passed in
+         */
-        if( isset($params['border']) && $params['border'] )
-
-
+
+
+
+
+
+
+
+
-        if( isset($params['shadow']) && $params['shadow'] )
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if( isset($params['watermark']) && is_array($params['watermark']))
-            $img = gsWatermarkProcessor::createWatermark($img, $params['watermark']);
-
+        /*
+         * textoverlay:
+         *
+         */
-        if( isset($params['textoverlay']) && is_array($params['textoverlay']))
-            $img = gsTextOverlayProcessor::overlayText($img, $params['textoverlay']);
-
-        if($save)
-transparent']))?$params
+save']['transparent'])) ? $params['save']
-
-        return $img;
-    }
-
-    static public function autoSize($params = array())
-    {
-        /*
-         * First, we find the bounding box of the text:
-         */
-
-        $dims = imagettfbbox($params['font']['size'], 0, $params['font']['file'], $params['text']['content']);
-
-        /* Then we calculate the total width of the image (the x-coord of
-         * the left corners of the image may be negative, due to anti-aliasing
-         * and various other font metrics issues, so we need to use absolute
-         * values)
-         */
-
-        $width = abs($dims[2] - $dims[0]);
-
-        /*
-         * Playing around with dimensions depending on just HOW far the text
-         * moves off the left side
-         */
-
-        if($dims[0] < -1)
-            $boxWidth = abs($dims[2]) + abs($dims[0]) - 1;
-
-        /*
-         * Then we calculate the total height of the image using the same
-         * logic
-         */
-
-        $height = abs($dims[7]) - abs($dims[1]);
-
-        /* Account for AA again */
-        if($dims[3] > 0)
-            $boxHeight = abs($dims[7] - $dims[1]) - 1;
-
-        /*
-         * Now, we find where we need to place the x-coord of the font's baseline.
-         * This is usually the same as the x-coord of the bottom-left corner,
-         * give or take a pixel or two
-         */
-
-        $x = ($dims[0] >= -1) ? abs($dims[0] + 1) * -1: abs($dims[0] + 2);
-
-        /* This is the important one.  For reasons I admittedly don't fully understand,
-         * the y-coord of the top right (or left) corner of the bounding box is
-         * a negative value equal to the inverse of the baseline height of the
-         * font: I.E. if the b-line height = 24px, then the y-coord of the top-
-         * right = -24. So we set the baseline-y position of the text to the
-         * absolute value of the y-coord of the top-right corner, plus one pixel
-         * to account for anti-aliasing.
-         */
-
-        $y = abs($dims[5] + 1);
-
-        return array('width'=>$boxWidth,'height'=>$boxHeight);
-    }
-}

plugins/gsImageProcessorPlugin/trunk/lib/gdImage.class.php

@@ -226 +226 @@
-        }
-
-
+
+
+
-            $this->_is_saved = $func($this->_img, $filename);
-
-
-
-
+
+
+
-            $err = error_get_last();
-          throw new sfException('Unable to save image to filesystem. '.$err['message']);

plugins/gsImageProcessorPlugin/trunk/lib/gsBorderProcessor.class.php

@@ -3 +3 @@
-/**
- * gsBorderProcessor
- 
+
- * @package gsImageProcessorPlugin
- * @version $id$
- 
- 
+
+
- * @license GPL Version 2
- */
@@ -13 +13 @@
-class gsBorderProcessor
-{
-mg, $size = 10, $colou
+nput_img, $params = array()) //$width = 10, $colo
-    {
-
-
+
-
-
-
+
+
+
-
-
+
+
-
-@imagefilledrectangle($img->getData(),0,0,$size,$img->getHeight(),$mask
+$mask = @imagecolorallocate($img->getData(),$color[0],$color[1],$color[2]
-
-img->getWidth(),$size
+width,$img->getHeight()
-
-($img->getWidth()-$size),0,$img->getWidth(),$img->getHeight()
+0,0,$img->getWidth(),$width
-
-
+
+
+
-
-        return $img;

plugins/gsImageProcessorPlugin/trunk/lib/gsColorizeProcessor.class.php

@@ -10 +10 @@
- * @license GPL Version 2
- * @description : colourizes photos.
-u
+
-                   to get these numbers, use photoshop, grayscale your image
-                   duplicate onto a new layer & colourize as you wish. Use
@@ -17 +17 @@
- */
-
- 
+
-{
-mg,$colou
+nput_img,$params = array()) //$colo
-    {
-
+
+
+
-            throw new sfException('No Color provided to colourize with!');
-
-
-
+
-
-u
+
-            throw new sfException('Wrong parameter count for colourization!');
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
-    }
-}

plugins/gsImageProcessorPlugin/trunk/lib/gsRotationProcessor.class.php

@@ -13 +13 @@
- */
-
- 
+
-{
-mg,$degree ,$background = '000000',$ret_new=false
+nput_img, $params = array()
-    {
-
+
+
+
+
+
+
+
+
-        {
-
-
-
-
-
+
+
-        }
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-}

plugins/gsImageProcessorPlugin/trunk/lib/gsShadowProcessor.class.php

@@ -2 +2 @@
-
-/**
- 
- 
+
+
- * @package gsImageProcessorPlugin
- * @version $id$
- 
- 
+
+
- * @license GPL Version 2
- */
@@ -17 +17 @@
-     * applyShadow
-     *
- 
-  
- 
+
+
+
-     * @return gdImage a new image with drop shadow applied
- 
- 
+
+
-     * @param string $shadowPath the path to the shadow images defaults to the plugin data/img directory
-     * @access public
- 
+
-     */
-$img=null,
+&$img, $params = array() ) //
-    {
-        // make sure we have the image resource
@@ -33 +33 @@
-            throw new sfException('Cannot apply a shadow to a non-existant image.');
-
-
+
+
+
-
-        $shadows = array();
-        // attempt to load the drop shadow array
-        if (!isset($shadows['l']) && empty($shadows['l']))
-"ds_left.png"
- 
-"ds_right.png"
- 
-"ds_top.png"
- 
-"ds_bottom.png"
- 
-"ds_tlcorner.png"
- 
-"ds_trcorner.png"
- 
-"ds_blcorner.png"
- 
-"ds_brcorner.png"
+'ds_left.png'
+
+'ds_right.png'
+
+'ds_top.png'
+
+'ds_bottom.png'
+
+'ds_tlcorner.png'
+
+'ds_trcorner.png'
+
+'ds_blcorner.png'
+
+'ds_brcorner.png'
-
-        // verify all is well
@@ -74 +76 @@
-
-        // pre-process the image
-gsImageHelper::HTMLHexToBinArray($bgcolour)
+(!is_array($bgcolour)) ? gsImageHelper::HTMLHexToBinArray($bgcolour):$bgcolour
-        $back_color = @ImageColorAllocate($tmp, $background[0], $background[1], $background[2]);
-        @imageColorTransparent($back_color);
@@ -124 +126 @@
-    }
-
-
+
-}

plugins/gsImageProcessorPlugin/trunk/lib/gsTextOverlayProcessor.class.php

@@ -55 +55 @@
-     */
-
-, $text = null
+
-    {
-        if( !($input_img instanceof gdImage))
@@ -66 +66 @@
-            throw new sfException('Cannot create a text overlay without text parameters!');
-
-
-
+
+
+
+
-
-        $img = (isset($params['modify_original'])) ? $input_img: new gdImage($input_img->getData());
-
-        // what is this for???
-      $safeText         = str_replace(array(' ', '-'), array('_', '_'), $text);
-
-      $leading          = (isset($params['text']['leading']) && !empty($params['text']['leading'])) ? $params['leading'] : false;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-      // add shadow
-      if (isset($params['dropshadow']))
-      {
-array(0,0,0
+((isset($params['dropshadow']['color']) && !is_array($params['dropshadow']['color'])) ? gsImageHelper::HTMLHexToBinArray($params['dropshadow']['color']): array(0,0,0)
-            $shadowColor  = @imagecolorallocatealpha($img->getData(), $shadowRGB[0], $shadowRGB[1], $shadowRGB[2], 0);
-            $shadowOffset = (isset($params['dropshadow']['offset']) && is_array($params['dropshadow']['offset']) && count($params['dropshadow']['offset']) == 2) ? $params['dropshadow']['offset'] : array(-2,2);
-
-            if ($leading) //letter by letter
-position[0]+$shadowOffset[0], $position[1]+$shadowOffset[1]), $text, $textAngle, $params['font']['file']
+x+$shadowOffset[0], $y+$shadowOffset[1]), $params['text']['content'], $textAngle, $fontFile
-            else
-TTFText($img->getData(), $params['font']['size'], $textAngle, $position[0] + $shadowOffset[0], ( $position[1]+$params['font']['size'] + $shadowOffset[1] ), $shadowColor, $params['font']['file'], $text
+ttftext($img->getData(), $params['font']['size'], $textAngle, $x + $shadowOffset[0], ( $y + $shadowOffset[1] ), $shadowColor, $fontFile, $params['text']['content']
-      }
-
-    // text color
-
+
+
-
-        // add text
-      if ($leading) //letter by letter
-$position, $text, $textAngle, $params['font']['file'], $params['font']['size'], $textRGB
+array($x,$y), $params['text']['content'], $textAngle, $fontFile, $params['font']['size'], $textColor
-      else
-ImageTTFText($img->getData(), $params['font']['size'], $textAngle, $position[0], $position[1]+$params['font']['size'], $textRGB, $params['font']['file'], $text
+imagettftext($img->getData(), $params['font']['size'], $textAngle, $x, $y, $textColor, $fontFile, $params['text']['content']
-
-      return $img;
-    }
-
+    // FIX ME This won't work with autosized images because the autosizer doesn't pay attention to that
-    private function createTextWithLeading(&$im, $textPosition, &$text, &$textAngle, &$font, &$fontSize, &$fontColor, &$leading)
-    {

plugins/gsImageProcessorPlugin/trunk/lib/gsWatermarkProcessor.class.php

@@ -2 +2 @@
-
-/**
- 
- 
+
+
- * @package gsImageProcessorPlugin
- * @version $id$
- 
- 
+
+
- * @license GPL Version 2
- */
@@ -24 +24 @@
-     *      string || array position - positioning of the watermark
-     *          @option array (x, y)
- 
- 
+
+
-                    'center' (default)
-                    'bottom' || bottom left' || 'bottom right'
@@ -34 +34 @@
-        if($img == null || !($img instanceof gdImage))
-            throw new sfException('Cannot apply a watermark to a non-existant image.');
-
+
-        //set and check alpha
-        $alpha = (!empty($params['alpha'])) ? $params['alpha'] /= 100 : 1;
-        if ($params['alpha'] > 1 || $params['alpha'] < 0)
-            throw new sfException('Watermark alpha setting out of range, use a number within the range of 0-100.');
-
+
-        //set and check watermark image file existance
-        $watermarkFile = sfConfig::get('sf_root_dir').DIRECTORY_SEPARATOR.$params['image'];
-        if ( !is_file($watermarkFile) )
-            throw new sfException('Cannot apply a non-existent watermark. Path supplied: '.$watermarkFile);
-
+
-        // create the watermark image
-        $watermarkImage = ImageCreateFromPng($watermarkFile);
-
+
-        //calculate image dimensions
-        $mainImageWidth = $img->getWidth();
@@ -54 +54 @@
-        $watermarkImageHeight = imagesy($watermarkImage );
-
-        
-        //determine positioning
-        if (isset($params['position']))
@@ -78 +77 @@
-                        $yPosition = 0;
-                    break;
-
+
-                    case 'right': //right center
-                        $xPosition = ceil($mainImageWidth - $watermarkImageWidth);
-                        $yPosition = ceil(($mainImageHeight / 2) - ($watermarkImageHeight / 2));
-                    break;
-
+
-                    case 'bottom': //bottom center
-                        $xPosition = ceil(($mainImageWidth / 2) - ($watermarkImageWidth / 2));
-                        $yPosition = ceil($mainImageHeight - $watermarkImageHeight);
-                    break;
-
+
-                    case 'left': //left center
-                        $xPosition = 0;
-                        $yPosition = ceil(($mainImageHeight / 2) - ($watermarkImageHeight / 2));
-                    break;
-
+
-                    case 'top right':
-                        $xPosition = 0;
-                        $yPosition = ceil($mainImageWidth - $watermarkImageWidth);
-                    break;
-
+
-                    case 'top left':
-                        $xPosition = 0;
-                        $yPosition = 0;
-                    break;
-
+
-                    case 'bottom right':
-                        $xPosition = ceil($mainImageWidth - $watermarkImageWidth);
-                        $yPosition = ceil($mainImageHeight - $watermarkImageHeight);
-                    break;
-
+
-                    case 'bottom left':
-                        $xPosition = 0;
-                        $yPosition = ceil($mainImageHeight - $watermarkImageHeight);
-                    break;
-
+
-                    //center it
-                    default:
@@ -119 +118 @@
-                        $yPosition = ceil(($mainImageHeight / 2) - ($watermarkImageHeight / 2));
-                    break;
-
+
-                }
-            }
@@ -128 +127 @@
-            $yPosition = ceil(($mainImageHeight / 2) - ($watermarkImageHeight / 2));
-        }
-
+
-        if(sfConfig::get('sf_logging_enabled'))
-            sfLogger::getInstance()->debug('Watermarking: xpos='.$xPosition.' ypos='.$yPosition);
-
+
-        //create new image to hold merged changes
-        $watermarkedImage = imagecreatetruecolor($mainImageWidth, $mainImageHeight);
@@ -141 +140 @@
-            {
-                $returnColor = NULL;
-
+
-                //determine the correct pixel location within our watermark
-                $watermarkX = $x - $xPosition;// - $mainImageMinWidth;
-                $watermarkY = $y - $yPosition;// - $mainImageMinHeight;
-
+
-                //fetch color information for both of our images
-                $mainRGB = imagecolorsforindex($img->getData(), imagecolorat($img->getData(), $x, $y));
-
+
-                //if our watermark has a non-transparent value at this pixel intersection
-                //and we're still within the bounds of the watermark image
@@ -154 +153 @@
-                {
-                    $watermarkRGB = imagecolorsforindex($watermarkImage, imagecolorat($watermarkImage, $watermarkX, $watermarkY));
-
+
-                    //using image alpha, and user specified alpha, calculate average
-                    $watermarkAlpha = round(((127 - $watermarkRGB['alpha']) / 127), 2);
-                    $watermarkAlpha = $watermarkAlpha * $alpha;
-
+
-                    //calculate the color 'average' between the two - taking into account the specified alpha level
-                    $avgRed = self::getAverageColor($mainRGB['red'], $watermarkRGB['red'], $watermarkAlpha );
-                    $avgGreen = self::getAverageColor($mainRGB['green'], $watermarkRGB['green'], $watermarkAlpha );
-                    $avgBlue = self::getAverageColor($mainRGB['blue'], $watermarkRGB['blue'], $watermarkAlpha );
-
+
-                    //calculate a color index value using the average RGB values we've determined
-                    $returnColor = self::getImageColor($watermarkedImage, $avgRed, $avgGreen, $avgBlue);
- 
+
-                else //if we're not dealing with an average color here, then let's just copy over the main color
-                {
-                  $returnColor = imagecolorat($img->getData(), $x, $y);
-                }
-
+
-                //draw the appropriate color onto the return image
-                imagesetpixel( $watermarkedImage, $x, $y, $returnColor);
@@ -180 +179 @@
-        return new gdImage($watermarkedImage);
-    }
-
-
+
+
-    /**
-     * getImageColor
@@ -194 +193 @@
-    {
-        return round( ( ( $colorA * ( 1 - $alpha ) ) + ( $colorB  * $alpha ) ) );
-    
-
+
+
-    /**
-     * getImageColor
@@ -214 +213 @@
-        return imagecolorclosest($img, $red, $green, $blue);
-    }
-
-
+
+
-    /**
-     * applyWatermark
@@ -221 +220 @@
-     * Creates a copy of the image, and merges the copy with the defined watermark image
-     * The watermark images should to be stored in 'data/watermarks/'
- 
- 
+
+
-     * @return gdImage a new image with watermark applied
- 
+
-     * @param string $watermarkFile
-     * @access public
- 
+
-     */
-
+
-    static public function applyWatermarkImage(&$img = null, $params = array()) //$watermarkFile = null, $watermarkScale=null, $watermarkPosition=null)
-    {
@@ -235 +234 @@
-        if($img == null || !($img instanceof gdImage))
-            throw new sfException('Cannot apply a watermark to a non-existant image.');
-
+
-        if ( empty($params) || !isseT($params['image']))
-            throw new sfException('Cannot apply a non-existent watermark.');
@@ -242 +241 @@
-        if ( !is_file($water_full_path) )
-            throw new sfException('Cannot apply a non-existent watermark.'.$water_full_path);
-
+
-        // create the watermark image
-        $watermark = ImageCreateFromPng($water_full_path);
-
+
-        // scale the watermark, if asked for
-        if (isset($params['scale']))
@@ -251 +250 @@
-            //pass to image processor, which returns a copy of the image????
-        }
-
+
-        // grab height and width of the watermark after scaling
-        $watermarkWidth = imagesx($watermark);
@@ -282 +281 @@
-                        $yPosition = 0;
-                    break;
-
+
-                    case 'right': //right center
-                        $xPosition = $imageWidth - $watermarkWidth;
-                        $yPosition = ($imageHeight / 2) - ($watermarkHeight / 2);
-                    break;
-
+
-                    case 'bottom': //bottom center
-                        $xPosition = ($imageWidth / 2) - ($watermarkWidth / 2);
-                        $yPosition = $imageHeight - $watermarkHeight;
-                    break;
-
+
-                    case 'left': //left center
-                        $xPosition = 0;
-                        $yPosition = ($imageHeight / 2) - ($watermarkHeight / 2);
-                    break;
-
+
-                    case 'top right':
-                        $xPosition = 0;
-                        $yPosition = $imageWidth - $watermarkWidth;
-                    break;
-
+
-                    case 'top left':
-                        $xPosition = 0;
-                        $yPosition = 0;
-                    break;
-
+
-                    case 'bottom right':
-                        $xPosition = $imageWidth - $watermarkWidth;
-                        $yPosition = $imageHeight - $watermarkHeight;
-                    break;
-
+
-                    case 'bottom left':
-                        $xPosition = 0;
-                        $yPosition = $imageHeight - $watermarkHeight;
-                    break;
-
+
-                    //center it
-                    default:
@@ -323 +322 @@
-                        $yPosition = ($imageHeight / 2) - ($watermarkHeight / 2);
-                    break;
-
+
-                }
-            }
-        }
-
+
-        if(!is_array($params['transparent']))
-            $params['transparent'] = gsImageHelper::HTMLHexToBinArray($params['transparent']);
-
-        @ImageColorTransparent($watermark, @imagecolorallocate($watermark,$params['transparent'][0],$params['transparent'][1],$params['transparent'][2]));
-
+
-        @ImageCopyMerge($img->getData(), $watermark, $xPosition, $yPosition, 4, 4, $watermarkWidth-8, $watermarkHeight-8, 100);
-        return $img;