XOOPS / XoopsCore25

htdocs/class/libraries/vendor/smottt/wideimage/lib/WideImage/Operation/AutoCrop.php

Indentation +121 added lines, -122 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	/**
+    /**
 ##DOC-SIGNATURE##
 
     This file is part of WideImage.
@@ -17,9 +17,8 @@ 
     You should have received a copy of the GNU Lesser General Public License
     along with WideImage; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    * @package Internal/Operations
-  **/
+     * @package Internal/Operations
+     **/
 
 namespace WideImage\Operation;
 
@@ -30,137 +29,137 @@ 
  */
 class AutoCrop
 {
-	/**
-	 * Executes the auto-crop operation on the $img
-	 * 
-	 * @param \WideImage\Image $img 
-	 * @param int $rgb_threshold The difference in RGB from $base_color
-	 * @param int $pixel_cutoff The number of pixels on each border that must be over $rgb_threshold
-	 * @param int $base_color The color that will get cropped
-	 * @return \WideImage\Image resulting auto-cropped image
-	 */
-	public function execute($img, $margin, $rgb_threshold, $pixel_cutoff, $base_color)
-	{
-		$margin = intval($margin);
-		
-		$rgb_threshold = intval($rgb_threshold);
-		
-		if ($rgb_threshold < 0) {
-			$rgb_threshold = 0;
-		}
-		
-		$pixel_cutoff = intval($pixel_cutoff);
-		if ($pixel_cutoff <= 1) {
-			$pixel_cutoff = 1;
-		}
-		
-		if ($base_color === null) {
-			$rgb_base = $img->getRGBAt(0, 0);
-		} else {
-			if ($base_color < 0) {
-				return $img->copy();
-			}
+    /**
+     * Executes the auto-crop operation on the $img
+     * 
+     * @param \WideImage\Image $img 
+     * @param int $rgb_threshold The difference in RGB from $base_color
+     * @param int $pixel_cutoff The number of pixels on each border that must be over $rgb_threshold
+     * @param int $base_color The color that will get cropped
+     * @return \WideImage\Image resulting auto-cropped image
+     */
+    public function execute($img, $margin, $rgb_threshold, $pixel_cutoff, $base_color)
+    {
+        $margin = intval($margin);
+		
+        $rgb_threshold = intval($rgb_threshold);
+		
+        if ($rgb_threshold < 0) {
+            $rgb_threshold = 0;
+        }
+		
+        $pixel_cutoff = intval($pixel_cutoff);
+        if ($pixel_cutoff <= 1) {
+            $pixel_cutoff = 1;
+        }
+		
+        if ($base_color === null) {
+            $rgb_base = $img->getRGBAt(0, 0);
+        } else {
+            if ($base_color < 0) {
+                return $img->copy();
+            }
 			
-			$rgb_base = $img->getColorRGB($base_color);
-		}
+            $rgb_base = $img->getColorRGB($base_color);
+        }
 		
-		$cut_rect = array('left' => 0, 'top' => 0, 'right' => $img->getWidth() - 1, 'bottom' => $img->getHeight() - 1);
+        $cut_rect = array('left' => 0, 'top' => 0, 'right' => $img->getWidth() - 1, 'bottom' => $img->getHeight() - 1);
 		
-		for ($y = 0; $y <= $cut_rect['bottom']; $y++) {
-			$count = 0;
+        for ($y = 0; $y <= $cut_rect['bottom']; $y++) {
+            $count = 0;
 			
-			for ($x = 0; $x <= $cut_rect['right']; $x++) {
-				$rgb  = $img->getRGBAt($x, $y);
-				$diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
+            for ($x = 0; $x <= $cut_rect['right']; $x++) {
+                $rgb  = $img->getRGBAt($x, $y);
+                $diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
 				
-				if ($diff > $rgb_threshold) {
-					$count++;
+                if ($diff > $rgb_threshold) {
+                    $count++;
 					
-					if ($count >= $pixel_cutoff) {
-						$cut_rect['top'] = $y;
-						break 2;
-					}
-				}
-			}
-		}
-		
-		for ($y = $img->getHeight() - 1; $y >= $cut_rect['top']; $y--) {
-			$count = 0;
+                    if ($count >= $pixel_cutoff) {
+                        $cut_rect['top'] = $y;
+                        break 2;
+                    }
+                }
+            }
+        }
+		
+        for ($y = $img->getHeight() - 1; $y >= $cut_rect['top']; $y--) {
+            $count = 0;
 			
-			for ($x = 0; $x <= $cut_rect['right']; $x++) {
-				$rgb  = $img->getRGBAt($x, $y);
-				$diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
+            for ($x = 0; $x <= $cut_rect['right']; $x++) {
+                $rgb  = $img->getRGBAt($x, $y);
+                $diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
 				
-				if ($diff > $rgb_threshold) {
-					$count++;
+                if ($diff > $rgb_threshold) {
+                    $count++;
 					
-					if ($count >= $pixel_cutoff) {
-						$cut_rect['bottom'] = $y;
-						break 2;
-					}
-				}
-			}
-		}
-		
-		for ($x = 0; $x <= $cut_rect['right']; $x++) {
-			$count = 0;
+                    if ($count >= $pixel_cutoff) {
+                        $cut_rect['bottom'] = $y;
+                        break 2;
+                    }
+                }
+            }
+        }
+		
+        for ($x = 0; $x <= $cut_rect['right']; $x++) {
+            $count = 0;
 			
-			for ($y = $cut_rect['top']; $y <= $cut_rect['bottom']; $y++) {
-				$rgb  = $img->getRGBAt($x, $y);
-				$diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
+            for ($y = $cut_rect['top']; $y <= $cut_rect['bottom']; $y++) {
+                $rgb  = $img->getRGBAt($x, $y);
+                $diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
 				
-				if ($diff > $rgb_threshold) {
-					$count++;
+                if ($diff > $rgb_threshold) {
+                    $count++;
 					
-					if ($count >= $pixel_cutoff) {
-						$cut_rect['left'] = $x;
-						break 2;
-					}
-				}
-			}
-		}
-		
-		for ($x = $cut_rect['right']; $x >= $cut_rect['left']; $x--) {
-			$count = 0;
+                    if ($count >= $pixel_cutoff) {
+                        $cut_rect['left'] = $x;
+                        break 2;
+                    }
+                }
+            }
+        }
+		
+        for ($x = $cut_rect['right']; $x >= $cut_rect['left']; $x--) {
+            $count = 0;
 			
-			for ($y = $cut_rect['top']; $y <= $cut_rect['bottom']; $y++) {
-				$rgb  = $img->getRGBAt($x, $y);
-				$diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
+            for ($y = $cut_rect['top']; $y <= $cut_rect['bottom']; $y++) {
+                $rgb  = $img->getRGBAt($x, $y);
+                $diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
 				
-				if ($diff > $rgb_threshold) {
-					$count++;
+                if ($diff > $rgb_threshold) {
+                    $count++;
 					
-					if ($count >= $pixel_cutoff) {
-						$cut_rect['right'] = $x;
-						break 2;
-					}
-				}
-			}
-		}
-		
-		$cut_rect = array(
-			'left'   => $cut_rect['left'] - $margin,
-			'top'    => $cut_rect['top'] - $margin,
-			'right'  => $cut_rect['right'] + $margin,
-			'bottom' => $cut_rect['bottom'] + $margin
-		);
-		
-		if ($cut_rect['left'] < 0) {
-			$cut_rect['left'] = 0;
-		}
-		
-		if ($cut_rect['top'] < 0) {
-			$cut_rect['top'] = 0;
-		}
-		
-		if ($cut_rect['right'] >= $img->getWidth()) {
-			$cut_rect['right'] = $img->getWidth() - 1;
-		}
-		
-		if ($cut_rect['bottom'] >= $img->getHeight()) {
-			$cut_rect['bottom'] = $img->getHeight() - 1;
-		}
-		
-		return $img->crop($cut_rect['left'], $cut_rect['top'], $cut_rect['right'] - $cut_rect['left'] + 1, $cut_rect['bottom'] - $cut_rect['top'] + 1);
-	}
+                    if ($count >= $pixel_cutoff) {
+                        $cut_rect['right'] = $x;
+                        break 2;
+                    }
+                }
+            }
+        }
+		
+        $cut_rect = array(
+            'left'   => $cut_rect['left'] - $margin,
+            'top'    => $cut_rect['top'] - $margin,
+            'right'  => $cut_rect['right'] + $margin,
+            'bottom' => $cut_rect['bottom'] + $margin
+        );
+		
+        if ($cut_rect['left'] < 0) {
+            $cut_rect['left'] = 0;
+        }
+		
+        if ($cut_rect['top'] < 0) {
+            $cut_rect['top'] = 0;
+        }
+		
+        if ($cut_rect['right'] >= $img->getWidth()) {
+            $cut_rect['right'] = $img->getWidth() - 1;
+        }
+		
+        if ($cut_rect['bottom'] >= $img->getHeight()) {
+            $cut_rect['bottom'] = $img->getHeight() - 1;
+        }
+		
+        return $img->crop($cut_rect['left'], $cut_rect['top'], $cut_rect['right'] - $cut_rect['left'] + 1, $cut_rect['bottom'] - $cut_rect['top'] + 1);
+    }
 }

htdocs/class/libraries/vendor/smottt/wideimage/lib/WideImage/Operation/Unsharp.php

Indentation +100 added lines, -101 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	/**
+    /**
 ##DOC-SIGNATURE##
 
     This file is part of WideImage.
@@ -17,9 +17,8 @@ 
     You should have received a copy of the GNU Lesser General Public License
     along with WideImage; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    * @package Internal/Operations
-  **/
+     * @package Internal/Operations
+     **/
 
 namespace WideImage\Operation;
 
@@ -34,121 +33,121 @@ 
  */
 class Unsharp
 {
-	/**
-	 * Returns sharpened image
-	 *
-	 * @param \WideImage\Image $image
-	 * @param float $amount
-	 * @param int $radius
-	 * @param float $threshold
-	 * @return \WideImage\Image
-	 */
-	public function execute($image, $amount, $radius, $threshold)
-	{
-		// Attempt to calibrate the parameters to Photoshop:
-		if ($amount > 500) {
-			$amount = 500;
-		}
+    /**
+     * Returns sharpened image
+     *
+     * @param \WideImage\Image $image
+     * @param float $amount
+     * @param int $radius
+     * @param float $threshold
+     * @return \WideImage\Image
+     */
+    public function execute($image, $amount, $radius, $threshold)
+    {
+        // Attempt to calibrate the parameters to Photoshop:
+        if ($amount > 500) {
+            $amount = 500;
+        }
 		
-		$amount = $amount * 0.016;
+        $amount = $amount * 0.016;
 		
-		if ($radius > 50) {
-			$radius = 50;
-		}
+        if ($radius > 50) {
+            $radius = 50;
+        }
 		
-		$radius = $radius * 2;
+        $radius = $radius * 2;
 		
-		if ($threshold > 255) {
-			$threshold = 255;
-		}
+        if ($threshold > 255) {
+            $threshold = 255;
+        }
 		
-		$radius = abs(round($radius)); // Only integers make sense.
+        $radius = abs(round($radius)); // Only integers make sense.
 		
-		if ($radius == 0) {
-			return $image;
-		}
+        if ($radius == 0) {
+            return $image;
+        }
 		
-		// Gaussian blur matrix
-		$matrix = array(
-			array(1, 2, 1),
-			array(2, 4, 2),
-			array(1, 2, 1)
-		);
+        // Gaussian blur matrix
+        $matrix = array(
+            array(1, 2, 1),
+            array(2, 4, 2),
+            array(1, 2, 1)
+        );
 		
-		$blurred = $image->applyConvolution($matrix, 16, 0);
+        $blurred = $image->applyConvolution($matrix, 16, 0);
 		
-		if ($threshold > 0) {
-			// Calculate the difference between the blurred pixels and the original
-			// and set the pixels
-			for ($x = 0; $x < $image->getWidth(); $x++) {
-				for ($y = 0; $y < $image->getHeight(); $y++) {
-					$rgbOrig = $image->getRGBAt($x, $y);
-					$rOrig   = $rgbOrig["red"];
-					$gOrig   = $rgbOrig["green"];
-					$bOrig   = $rgbOrig["blue"];
+        if ($threshold > 0) {
+            // Calculate the difference between the blurred pixels and the original
+            // and set the pixels
+            for ($x = 0; $x < $image->getWidth(); $x++) {
+                for ($y = 0; $y < $image->getHeight(); $y++) {
+                    $rgbOrig = $image->getRGBAt($x, $y);
+                    $rOrig   = $rgbOrig["red"];
+                    $gOrig   = $rgbOrig["green"];
+                    $bOrig   = $rgbOrig["blue"];
 					 
-					$rgbBlur = $blurred->getRGBAt($x, $y);
-					$rBlur   = $rgbBlur["red"];
-					$gBlur   = $rgbBlur["green"];
-					$bBlur   = $rgbBlur["blue"];
+                    $rgbBlur = $blurred->getRGBAt($x, $y);
+                    $rBlur   = $rgbBlur["red"];
+                    $gBlur   = $rgbBlur["green"];
+                    $bBlur   = $rgbBlur["blue"];
 					
-					// When the masked pixels differ less from the original
-					// than the threshold specifies, they are set to their original value.
-					$rNew = (abs($rOrig - $rBlur) >= $threshold)  
-						? max(0, min(255, ($amount * ($rOrig - $rBlur)) + $rOrig))  
-						: $rOrig;
-					$gNew = (abs($gOrig - $gBlur) >= $threshold)  
-						? max(0, min(255, ($amount * ($gOrig - $gBlur)) + $gOrig))  
-						: $gOrig;
-					$bNew = (abs($bOrig - $bBlur) >= $threshold)  
-						? max(0, min(255, ($amount * ($bOrig - $bBlur)) + $bOrig))  
-						: $bOrig;
-					$rgbNew = array("red" => $rNew, "green" => $gNew, "blue" => $bNew, "alpha" => 0);
+                    // When the masked pixels differ less from the original
+                    // than the threshold specifies, they are set to their original value.
+                    $rNew = (abs($rOrig - $rBlur) >= $threshold)  
+                        ? max(0, min(255, ($amount * ($rOrig - $rBlur)) + $rOrig))  
+                        : $rOrig;
+                    $gNew = (abs($gOrig - $gBlur) >= $threshold)  
+                        ? max(0, min(255, ($amount * ($gOrig - $gBlur)) + $gOrig))  
+                        : $gOrig;
+                    $bNew = (abs($bOrig - $bBlur) >= $threshold)  
+                        ? max(0, min(255, ($amount * ($bOrig - $bBlur)) + $bOrig))  
+                        : $bOrig;
+                    $rgbNew = array("red" => $rNew, "green" => $gNew, "blue" => $bNew, "alpha" => 0);
 					
-					if (($rOrig != $rNew) || ($gOrig != $gNew) || ($bOrig != $bNew)) {
-						$image->setRGBAt($x, $y, $rgbNew);
-					}
-				}
-			}
-		} else {
-			$w = $image->getWidth();
-			$h = $image->getHeight();
+                    if (($rOrig != $rNew) || ($gOrig != $gNew) || ($bOrig != $bNew)) {
+                        $image->setRGBAt($x, $y, $rgbNew);
+                    }
+                }
+            }
+        } else {
+            $w = $image->getWidth();
+            $h = $image->getHeight();
 			
-			for ($x = 0; $x < $w; $x++) {
-				for ($y = 0; $y < $h; $y++) {
-					$rgbOrig = $image->getRGBAt($x, $y);
-					$rOrig   = $rgbOrig["red"];
-					$gOrig   = $rgbOrig["green"];
-					$bOrig   = $rgbOrig["blue"];
+            for ($x = 0; $x < $w; $x++) {
+                for ($y = 0; $y < $h; $y++) {
+                    $rgbOrig = $image->getRGBAt($x, $y);
+                    $rOrig   = $rgbOrig["red"];
+                    $gOrig   = $rgbOrig["green"];
+                    $bOrig   = $rgbOrig["blue"];
 					
-					$rgbBlur = $blurred->getRGBAt($x, $y);
-					$rBlur   = $rgbBlur["red"];
-					$gBlur   = $rgbBlur["green"];
-					$bBlur   = $rgbBlur["blue"];
+                    $rgbBlur = $blurred->getRGBAt($x, $y);
+                    $rBlur   = $rgbBlur["red"];
+                    $gBlur   = $rgbBlur["green"];
+                    $bBlur   = $rgbBlur["blue"];
 					
-					$rNew   = static::bit(($amount * ($rOrig - $rBlur)) + $rOrig);
-					$gNew   = static::bit(($amount * ($gOrig - $gBlur)) + $gOrig);
-					$bNew   = static::bit(($amount * ($bOrig - $bBlur)) + $bOrig);
-					$rgbNew = array("red" => $rNew, "green" => $gNew, "blue" => $bNew, "alpha" => 0);
+                    $rNew   = static::bit(($amount * ($rOrig - $rBlur)) + $rOrig);
+                    $gNew   = static::bit(($amount * ($gOrig - $gBlur)) + $gOrig);
+                    $bNew   = static::bit(($amount * ($bOrig - $bBlur)) + $bOrig);
+                    $rgbNew = array("red" => $rNew, "green" => $gNew, "blue" => $bNew, "alpha" => 0);
 					
-					$image->setRGBAt($x, $y, $rgbNew);
-				}
-			}
-		}
+                    $image->setRGBAt($x, $y, $rgbNew);
+                }
+            }
+        }
 		
-		return $image;
-	}
+        return $image;
+    }
 	
-	protected static function bit($val)
-	{
-		if ($val > 255) {
-			return 255;
-		}
+    protected static function bit($val)
+    {
+        if ($val > 255) {
+            return 255;
+        }
 		
-		if ($val < 0) {
-			return 0;
-		}
+        if ($val < 0) {
+            return 0;
+        }
 		
-		return $val;
-	}
+        return $val;
+    }
 }

htdocs/class/libraries/vendor/smottt/wideimage/lib/WideImage/Operation/Mirror.php

Indentation +24 added lines, -25 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	/**
+    /**
 ##DOC-SIGNATURE##
 
     This file is part of WideImage.
@@ -17,9 +17,8 @@ 
     You should have received a copy of the GNU Lesser General Public License
     along with WideImage; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    * @package Internal/Operations
-  **/
+     * @package Internal/Operations
+     **/
 
 namespace WideImage\Operation;
 
@@ -32,29 +31,29 @@ 
  */
 class Mirror
 {
-	/**
-	 * Returns a mirrored image
-	 *
-	 * @param \WideImage\Image $image
-	 * @return \WideImage\Image
-	 */
-	public function execute($image)
-	{
-		$new = $image->copy();
+    /**
+     * Returns a mirrored image
+     *
+     * @param \WideImage\Image $image
+     * @return \WideImage\Image
+     */
+    public function execute($image)
+    {
+        $new = $image->copy();
 		
-		$width  = $image->getWidth();
-		$height = $image->getHeight();
+        $width  = $image->getWidth();
+        $height = $image->getHeight();
 		
-		if ($new->isTransparent()) {
-			imagefilledrectangle($new->getHandle(), 0, 0, $width, $height, $new->getTransparentColor());
-		}
+        if ($new->isTransparent()) {
+            imagefilledrectangle($new->getHandle(), 0, 0, $width, $height, $new->getTransparentColor());
+        }
 		
-		for ($x = 0; $x < $width; $x++) {
-			if (!imagecopy($new->getHandle(), $image->getHandle(), $x, 0, $width - $x - 1, 0, 1, $height)) { 
-				throw new GDFunctionResultException("imagecopy() returned false");
-			}
-		}
+        for ($x = 0; $x < $width; $x++) {
+            if (!imagecopy($new->getHandle(), $image->getHandle(), $x, 0, $width - $x - 1, 0, 1, $height)) { 
+                throw new GDFunctionResultException("imagecopy() returned false");
+            }
+        }
 		
-		return $new;
-	}
+        return $new;
+    }
 }

htdocs/class/libraries/vendor/smottt/wideimage/lib/WideImage/Operation/Crop.php

Indentation +51 added lines, -52 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	/**
+    /**
 ##DOC-SIGNATURE##
 
     This file is part of WideImage.
@@ -17,9 +17,8 @@ 
     You should have received a copy of the GNU Lesser General Public License
     along with WideImage; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    * @package Internal/Operations
-  **/
+     * @package Internal/Operations
+     **/
 
 namespace WideImage\Operation;
 
@@ -35,62 +34,62 @@ 
  */
 class Crop
 {
-	/**
-	 * Returns a cropped image
-	 *
-	 * @param \WideImage\Image $img
-	 * @param smart_coordinate $left
-	 * @param smart_coordinate $top
-	 * @param smart_coordinate $width
-	 * @param smart_coordinate $height
-	 * @return \WideImage\Image
-	 */
-	public function execute($img, $left, $top, $width, $height)
-	{
-		$width  = Coordinate::fix($width, $img->getWidth(), $width);
-		$height = Coordinate::fix($height, $img->getHeight(), $height);
-		$left   = Coordinate::fix($left, $img->getWidth(), $width);
-		$top    = Coordinate::fix($top, $img->getHeight(), $height);
+    /**
+     * Returns a cropped image
+     *
+     * @param \WideImage\Image $img
+     * @param smart_coordinate $left
+     * @param smart_coordinate $top
+     * @param smart_coordinate $width
+     * @param smart_coordinate $height
+     * @return \WideImage\Image
+     */
+    public function execute($img, $left, $top, $width, $height)
+    {
+        $width  = Coordinate::fix($width, $img->getWidth(), $width);
+        $height = Coordinate::fix($height, $img->getHeight(), $height);
+        $left   = Coordinate::fix($left, $img->getWidth(), $width);
+        $top    = Coordinate::fix($top, $img->getHeight(), $height);
 		
-		if ($left < 0) {
-			$width = $left + $width;
-			$left  = 0;
-		}
+        if ($left < 0) {
+            $width = $left + $width;
+            $left  = 0;
+        }
 		
-		if ($width > $img->getWidth() - $left) {
-			$width = $img->getWidth() - $left;
-		}
+        if ($width > $img->getWidth() - $left) {
+            $width = $img->getWidth() - $left;
+        }
 		
-		if ($top < 0) {
-			$height = $top + $height;
-			$top    = 0;
-		}
+        if ($top < 0) {
+            $height = $top + $height;
+            $top    = 0;
+        }
 		
-		if ($height > $img->getHeight() - $top) {
-			$height = $img->getHeight() - $top;
-		}
+        if ($height > $img->getHeight() - $top) {
+            $height = $img->getHeight() - $top;
+        }
 		
-		if ($width <= 0 || $height <= 0) {
-			throw new Exception("Can't crop outside of an image.");
-		}
+        if ($width <= 0 || $height <= 0) {
+            throw new Exception("Can't crop outside of an image.");
+        }
 		
-		$new = $img->doCreate($width, $height);
+        $new = $img->doCreate($width, $height);
 		
-		if ($img->isTransparent() || $img instanceof PaletteImage) {
-			$new->copyTransparencyFrom($img);
+        if ($img->isTransparent() || $img instanceof PaletteImage) {
+            $new->copyTransparencyFrom($img);
 			
-			if (!imagecopyresized($new->getHandle(), $img->getHandle(), 0, 0, $left, $top, $width, $height, $width, $height)) {
-				throw new GDFunctionResultException("imagecopyresized() returned false");
-			}
-		} else {
-			$new->alphaBlending(false);
-			$new->saveAlpha(true);
+            if (!imagecopyresized($new->getHandle(), $img->getHandle(), 0, 0, $left, $top, $width, $height, $width, $height)) {
+                throw new GDFunctionResultException("imagecopyresized() returned false");
+            }
+        } else {
+            $new->alphaBlending(false);
+            $new->saveAlpha(true);
 			
-			if (!imagecopyresampled($new->getHandle(), $img->getHandle(), 0, 0, $left, $top, $width, $height, $width, $height)) {
-				throw new GDFunctionResultException("imagecopyresampled() returned false");
-			}
-		}
+            if (!imagecopyresampled($new->getHandle(), $img->getHandle(), 0, 0, $left, $top, $width, $height, $width, $height)) {
+                throw new GDFunctionResultException("imagecopyresampled() returned false");
+            }
+        }
 		
-		return $new;
-	}
+        return $new;
+    }
 }

htdocs/class/libraries/vendor/smottt/wideimage/lib/WideImage/Operation/AsNegative.php

Indentation +31 added lines, -32 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	/**
+    /**
 ##DOC-SIGNATURE##
 
     This file is part of WideImage.
@@ -17,9 +17,8 @@ 
     You should have received a copy of the GNU Lesser General Public License
     along with WideImage; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    * @package Internal/Operations
-  **/
+     * @package Internal/Operations
+     **/
 
 namespace WideImage\Operation;
 
@@ -32,39 +31,39 @@ 
  */
 class AsNegative
 {
-	/**
-	 * Returns a greyscale copy of an image
-	 *
-	 * @param \WideImage\Image $image
-	 * @return \WideImage\Image
-	 */
-	public function execute($image)
-	{
-		$palette     = !$image->isTrueColor();
-		$transparent = $image->isTransparent();
+    /**
+     * Returns a greyscale copy of an image
+     *
+     * @param \WideImage\Image $image
+     * @return \WideImage\Image
+     */
+    public function execute($image)
+    {
+        $palette     = !$image->isTrueColor();
+        $transparent = $image->isTransparent();
 		
-		if ($palette && $transparent) {
-			$tcrgb = $image->getTransparentColorRGB();
-		}
+        if ($palette && $transparent) {
+            $tcrgb = $image->getTransparentColorRGB();
+        }
 		
-		$new = $image->asTrueColor();
+        $new = $image->asTrueColor();
 		
-		if (!imagefilter($new->getHandle(), IMG_FILTER_NEGATE)) {
-			throw new GDFunctionResultException("imagefilter() returned false");
-		}
+        if (!imagefilter($new->getHandle(), IMG_FILTER_NEGATE)) {
+            throw new GDFunctionResultException("imagefilter() returned false");
+        }
 		
-		if ($palette) {
-			$new = $new->asPalette();
+        if ($palette) {
+            $new = $new->asPalette();
 			
-			if ($transparent) {
-				$irgb = array('red' => 255 - $tcrgb['red'], 'green' => 255 - $tcrgb['green'], 'blue' => 255 - $tcrgb['blue'], 'alpha' => 127);
+            if ($transparent) {
+                $irgb = array('red' => 255 - $tcrgb['red'], 'green' => 255 - $tcrgb['green'], 'blue' => 255 - $tcrgb['blue'], 'alpha' => 127);
 				
-				// needs imagecolorexactalpha instead of imagecolorexact, otherwise doesn't work on some transparent GIF images
-				$new_tci = imagecolorexactalpha($new->getHandle(), $irgb['red'], $irgb['green'], $irgb['blue'], 127);
-				$new->setTransparentColor($new_tci);
-			}
-		}
+                // needs imagecolorexactalpha instead of imagecolorexact, otherwise doesn't work on some transparent GIF images
+                $new_tci = imagecolorexactalpha($new->getHandle(), $irgb['red'], $irgb['green'], $irgb['blue'], 127);
+                $new->setTransparentColor($new_tci);
+            }
+        }
 		
-		return $new;
-	}
+        return $new;
+    }
 }

htdocs/class/libraries/vendor/smottt/wideimage/lib/WideImage/Operation/CopyChannelsPalette.php

Indentation +51 added lines, -52 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	/**
+    /**
 ##DOC-SIGNATURE##
 
     This file is part of WideImage.
@@ -17,9 +17,8 @@ 
     You should have received a copy of the GNU Lesser General Public License
     along with WideImage; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    * @package Internal/Operations
-  **/
+     * @package Internal/Operations
+     **/
 
 namespace WideImage\Operation;
 
@@ -34,65 +33,65 @@ 
  */
 class CopyChannelsPalette
 {
-	/**
-	 * Returns an image with only specified channels copied
-	 *
-	 * @param \WideImage\PaletteImage $img
-	 * @param array $channels
-	 * @return \WideImage\PaletteImage
-	 */
-	public function execute($img, $channels)
-	{
-		$blank = array('red' => 0, 'green' => 0, 'blue' => 0);
+    /**
+     * Returns an image with only specified channels copied
+     *
+     * @param \WideImage\PaletteImage $img
+     * @param array $channels
+     * @return \WideImage\PaletteImage
+     */
+    public function execute($img, $channels)
+    {
+        $blank = array('red' => 0, 'green' => 0, 'blue' => 0);
 		
-		if (isset($channels['alpha'])) {
-			unset($channels['alpha']);
-		}
+        if (isset($channels['alpha'])) {
+            unset($channels['alpha']);
+        }
 		
-		$width  = $img->getWidth();
-		$height = $img->getHeight();
-		$copy   = PaletteImage::create($width, $height);
+        $width  = $img->getWidth();
+        $height = $img->getHeight();
+        $copy   = PaletteImage::create($width, $height);
 		
-		if ($img->isTransparent()) {
-			$otci = $img->getTransparentColor();
-			$TRGB = $img->getColorRGB($otci);
-			$tci  = $copy->allocateColor($TRGB);
-		} else {
-			$otci = null;
-			$tci  = null;
-		}
+        if ($img->isTransparent()) {
+            $otci = $img->getTransparentColor();
+            $TRGB = $img->getColorRGB($otci);
+            $tci  = $copy->allocateColor($TRGB);
+        } else {
+            $otci = null;
+            $tci  = null;
+        }
 		
-		for ($x = 0; $x < $width; $x++) {
-			for ($y = 0; $y < $height; $y++) {
-				$ci = $img->getColorAt($x, $y);
+        for ($x = 0; $x < $width; $x++) {
+            for ($y = 0; $y < $height; $y++) {
+                $ci = $img->getColorAt($x, $y);
 				
-				if ($ci === $otci) {
-					$copy->setColorAt($x, $y, $tci);
-					continue;
-				}
+                if ($ci === $otci) {
+                    $copy->setColorAt($x, $y, $tci);
+                    continue;
+                }
 				
-				$RGB = $img->getColorRGB($ci);
+                $RGB = $img->getColorRGB($ci);
 				
-				$newRGB = $blank;
+                $newRGB = $blank;
 				
-				foreach ($channels as $channel) {
-					$newRGB[$channel] = $RGB[$channel];
-				}
+                foreach ($channels as $channel) {
+                    $newRGB[$channel] = $RGB[$channel];
+                }
 				
-				$color = $copy->getExactColor($newRGB);
+                $color = $copy->getExactColor($newRGB);
 				
-				if ($color == -1) {
-					$color = $copy->allocateColor($newRGB);
-				}
+                if ($color == -1) {
+                    $color = $copy->allocateColor($newRGB);
+                }
 				
-				$copy->setColorAt($x, $y, $color);
-			}
-		}
+                $copy->setColorAt($x, $y, $color);
+            }
+        }
 		
-		if ($img->isTransparent()) {
-			$copy->setTransparentColor($tci);
-		}
+        if ($img->isTransparent()) {
+            $copy->setTransparentColor($tci);
+        }
 		
-		return $copy;
-	}
+        return $copy;
+    }
 }

htdocs/class/libraries/vendor/smottt/wideimage/lib/WideImage/Operation/ResizeCanvas.php

Indentation +64 added lines, -65 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	/**
+    /**
 ##DOC-SIGNATURE##
 
     This file is part of WideImage.
@@ -17,9 +17,8 @@ 
     You should have received a copy of the GNU Lesser General Public License
     along with WideImage; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    * @package Internal/Operations
-  **/
+     * @package Internal/Operations
+     **/
 
 namespace WideImage\Operation;
 
@@ -33,77 +32,77 @@ 
  */
 class ResizeCanvas
 {
-	/**
-	 * Returns an image with a resized canvas
-	 * 
-	 * The image is filled with $color. Use $scale to determine, when to resize.
-	 *
-	 * @param \WideImage\Image $img
-	 * @param smart_coordinate $width
-	 * @param smart_coordinate $height
-	 * @param smart_coordinate $left
-	 * @param smart_coordinate $top
-	 * @param int $color
-	 * @param string $scale 'up', 'down', 'any'
-	 * @param boolean $merge
-	 * @return \WideImage\Image
-	 */
-	public function execute($img, $width, $height, $left, $top, $color, $scale, $merge)
-	{
-		$new_width  = Coordinate::fix($width, $img->getWidth());
-		$new_height = Coordinate::fix($height, $img->getHeight());
+    /**
+     * Returns an image with a resized canvas
+     * 
+     * The image is filled with $color. Use $scale to determine, when to resize.
+     *
+     * @param \WideImage\Image $img
+     * @param smart_coordinate $width
+     * @param smart_coordinate $height
+     * @param smart_coordinate $left
+     * @param smart_coordinate $top
+     * @param int $color
+     * @param string $scale 'up', 'down', 'any'
+     * @param boolean $merge
+     * @return \WideImage\Image
+     */
+    public function execute($img, $width, $height, $left, $top, $color, $scale, $merge)
+    {
+        $new_width  = Coordinate::fix($width, $img->getWidth());
+        $new_height = Coordinate::fix($height, $img->getHeight());
 		
-		if ($scale == 'down') {
-			$new_width  = min($new_width, $img->getWidth());
-			$new_height = min($new_height, $img->getHeight());
-		} elseif ($scale == 'up') {
-			$new_width  = max($new_width, $img->getWidth());
-			$new_height = max($new_height, $img->getHeight());
-		}
+        if ($scale == 'down') {
+            $new_width  = min($new_width, $img->getWidth());
+            $new_height = min($new_height, $img->getHeight());
+        } elseif ($scale == 'up') {
+            $new_width  = max($new_width, $img->getWidth());
+            $new_height = max($new_height, $img->getHeight());
+        }
 		
-		$new = WideImage::createTrueColorImage($new_width, $new_height);
+        $new = WideImage::createTrueColorImage($new_width, $new_height);
 		
-		if ($img->isTrueColor()) {
-			if ($color === null) {
-				$color = $new->allocateColorAlpha(0, 0, 0, 127);
-			}
-		} else {
-			imagepalettecopy($new->getHandle(), $img->getHandle());
+        if ($img->isTrueColor()) {
+            if ($color === null) {
+                $color = $new->allocateColorAlpha(0, 0, 0, 127);
+            }
+        } else {
+            imagepalettecopy($new->getHandle(), $img->getHandle());
 			
-			if ($img->isTransparent()) {
-				$new->copyTransparencyFrom($img);
-				$tc_rgb  = $img->getTransparentColorRGB();
-				$t_color = $new->allocateColorAlpha($tc_rgb);
-			}
+            if ($img->isTransparent()) {
+                $new->copyTransparencyFrom($img);
+                $tc_rgb  = $img->getTransparentColorRGB();
+                $t_color = $new->allocateColorAlpha($tc_rgb);
+            }
 			
-			if ($color === null) {
-				if ($img->isTransparent()) {
-					$color = $t_color;
-				} else {
-					$color = $new->allocateColorAlpha(255, 0, 127, 127);
-				}
+            if ($color === null) {
+                if ($img->isTransparent()) {
+                    $color = $t_color;
+                } else {
+                    $color = $new->allocateColorAlpha(255, 0, 127, 127);
+                }
 				
-				imagecolortransparent($new->getHandle(), $color);
-			}
-		}
+                imagecolortransparent($new->getHandle(), $color);
+            }
+        }
 		
-		$new->fill(0, 0, $color);
+        $new->fill(0, 0, $color);
 		
-		$x = Coordinate::fix($left, $new->getWidth(), $img->getWidth());
-		$y = Coordinate::fix($top, $new->getHeight(), $img->getHeight());
+        $x = Coordinate::fix($left, $new->getWidth(), $img->getWidth());
+        $y = Coordinate::fix($top, $new->getHeight(), $img->getHeight());
 		
-		// blending for truecolor images
-		if ($img->isTrueColor()) {
-			$new->alphaBlending($merge);
-		}
+        // blending for truecolor images
+        if ($img->isTrueColor()) {
+            $new->alphaBlending($merge);
+        }
 		
-		// not-blending for palette images
-		if (!$merge && !$img->isTrueColor() && isset($t_color)) {
-			$new->getCanvas()->filledRectangle($x, $y, $x + $img->getWidth(), $y + $img->getHeight(), $t_color);
-		}
+        // not-blending for palette images
+        if (!$merge && !$img->isTrueColor() && isset($t_color)) {
+            $new->getCanvas()->filledRectangle($x, $y, $x + $img->getWidth(), $y + $img->getHeight(), $t_color);
+        }
 		
-		$img->copyTo($new, $x, $y);
+        $img->copyTo($new, $x, $y);
 		
-		return $new;
-	}
+        return $new;
+    }
 }

htdocs/class/libraries/vendor/smottt/wideimage/lib/WideImage/Operation/CorrectGamma.php

Indentation +18 added lines, -19 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	/**
+    /**
 ##DOC-SIGNATURE##
 
     This file is part of WideImage.
@@ -17,9 +17,8 @@ 
     You should have received a copy of the GNU Lesser General Public License
     along with WideImage; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    * @package Internal/Operations
-  **/
+     * @package Internal/Operations
+     **/
 
 namespace WideImage\Operation;
 
@@ -32,21 +31,21 @@ 
  */
 class CorrectGamma
 {
-	/**
-	 * Executes imagegammacorrect()
-	 *
-	 * @param \WideImage\Image $image
-	 * @param numeric $input_gamma
-	 * @param numeric $output_gamma
-	 * @return \WideImage\TrueColorImage
-	 */
-	public function execute($image, $input_gamma, $output_gamma) {
-		$new = $image->copy();
+    /**
+     * Executes imagegammacorrect()
+     *
+     * @param \WideImage\Image $image
+     * @param numeric $input_gamma
+     * @param numeric $output_gamma
+     * @return \WideImage\TrueColorImage
+     */
+    public function execute($image, $input_gamma, $output_gamma) {
+        $new = $image->copy();
 		
-		if (!imagegammacorrect($new->getHandle(), $input_gamma, $output_gamma)) {
-			throw new GDFunctionResultException("imagegammacorrect() returned false");
-		}
+        if (!imagegammacorrect($new->getHandle(), $input_gamma, $output_gamma)) {
+            throw new GDFunctionResultException("imagegammacorrect() returned false");
+        }
 		
-		return $new;
-	}
+        return $new;
+    }
 }

htdocs/class/libraries/vendor/smottt/wideimage/lib/WideImage/Operation/AddNoise.php

Indentation +123 added lines, -124 removed lines

@@ -1,7 +1,7 @@ 
 <?php
-	/**
-	* @author Tomasz Kapusta
-	* @copyright 2010
+    /**
+     * @author Tomasz Kapusta
+     * @copyright 2010
 	
 	This file is part of WideImage.
 		
@@ -18,9 +18,8 @@ 
 	You should have received a copy of the GNU Lesser General Public License
 	along with WideImage; if not, write to the Free Software
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-	
-	* @package Internal/Operations
-	**/
+     * @package Internal/Operations
+     **/
 
 namespace WideImage\Operation;
 
@@ -31,137 +30,137 @@ 
  */
 class AddNoise
 {
-	/**
-	 * Returns image with noise added
-	 *
-	 * @param \WideImage\Image $image
-	 * @param float $amount
-	 * @param const $type
-	 * @param float $threshold
-	 * @return \WideImage\Image
-	 */
-	public function execute($image, $amount, $type) {
-		switch ($type) {
-			case 'salt&pepper':
-				$fun = 'saltPepperNoise_fun'; 
-				break;
-			case 'color':
-				$fun = 'colorNoise_fun';
-				break;	
-			default	:
-				$fun = 'monoNoise_fun';
-				break; 			
-		}
+    /**
+     * Returns image with noise added
+     *
+     * @param \WideImage\Image $image
+     * @param float $amount
+     * @param const $type
+     * @param float $threshold
+     * @return \WideImage\Image
+     */
+    public function execute($image, $amount, $type) {
+        switch ($type) {
+            case 'salt&pepper':
+                $fun = 'saltPepperNoise_fun'; 
+                break;
+            case 'color':
+                $fun = 'colorNoise_fun';
+                break;	
+            default	:
+                $fun = 'monoNoise_fun';
+                break; 			
+        }
 		
-		return static::filter($image->asTrueColor(), $fun, $amount);			
-	}
+        return static::filter($image->asTrueColor(), $fun, $amount);			
+    }
 	
-	/**
-	 * Returns image with every pixel changed by specififed function
-	 *
-	 * @param \WideImage\Image $image
-	 * @param str $function
-	 * @param int $value
-	 * @return \WideImage\Image
-	 */
-	public function filter($image, $function, $value)
-	{
-		for ($y = 0; $y < $image->getHeight(); $y++) {
-	    	for ($x = 0; $x< $image->getWidth(); $x++) {	     
-				$rgb = imagecolorat($image->getHandle(), $x, $y);				
+    /**
+     * Returns image with every pixel changed by specififed function
+     *
+     * @param \WideImage\Image $image
+     * @param str $function
+     * @param int $value
+     * @return \WideImage\Image
+     */
+    public function filter($image, $function, $value)
+    {
+        for ($y = 0; $y < $image->getHeight(); $y++) {
+            for ($x = 0; $x< $image->getWidth(); $x++) {	     
+                $rgb = imagecolorat($image->getHandle(), $x, $y);				
 				
-				$a = ($rgb >> 24) & 0xFF;
-				$r = ($rgb >> 16) & 0xFF;
-				$g = ($rgb >> 8) & 0xFF;
-				$b = $rgb & 0xFF;
+                $a = ($rgb >> 24) & 0xFF;
+                $r = ($rgb >> 16) & 0xFF;
+                $g = ($rgb >> 8) & 0xFF;
+                $b = $rgb & 0xFF;
 				
-				static::$function($r, $g, $b, $value);
+                static::$function($r, $g, $b, $value);
 				
-				$color = imagecolorallocatealpha($image->getHandle(), $r, $g, $b, $a);				
-				imagesetpixel($image->getHandle(), $x, $y, $color); 
-	      	}
-	    }
+                $color = imagecolorallocatealpha($image->getHandle(), $r, $g, $b, $a);				
+                imagesetpixel($image->getHandle(), $x, $y, $color); 
+                }
+        }
 	    
-	    return $image;
-	}
+        return $image;
+    }
 	
-	/**
-	 * Adds color noise by altering given R,G,B values using specififed amount
-	 *
-	 * @param int $r
-	 * @param int $g
-	 * @param int $b
-	 * @param int $value		 
-	 * @return void
-	 */
-	public function colorNoise_fun(&$r, &$g, &$b, $amount)
-	{				
-		$r = static::byte($r + mt_rand(0, $amount) - ($amount >> 1) );
-		$g = static::byte($g + mt_rand(0, $amount) - ($amount >> 1) );
-		$b = static::byte($b + mt_rand(0, $amount) - ($amount >> 1) );
-	}
+    /**
+     * Adds color noise by altering given R,G,B values using specififed amount
+     *
+     * @param int $r
+     * @param int $g
+     * @param int $b
+     * @param int $value		 
+     * @return void
+     */
+    public function colorNoise_fun(&$r, &$g, &$b, $amount)
+    {				
+        $r = static::byte($r + mt_rand(0, $amount) - ($amount >> 1) );
+        $g = static::byte($g + mt_rand(0, $amount) - ($amount >> 1) );
+        $b = static::byte($b + mt_rand(0, $amount) - ($amount >> 1) );
+    }
 	
-	/**
-	 * Adds mono noise by altering given R,G,B values using specififed amount
-	 *
-	 * @param int $r
-	 * @param int $g
-	 * @param int $b
-	 * @param int $value		 
-	 * @return void
-	 */
-	public function monoNoise_fun(&$r, &$g, &$b, $amount)
-	{				
-		$rand = mt_rand(0, $amount) - ($amount >> 1);
+    /**
+     * Adds mono noise by altering given R,G,B values using specififed amount
+     *
+     * @param int $r
+     * @param int $g
+     * @param int $b
+     * @param int $value		 
+     * @return void
+     */
+    public function monoNoise_fun(&$r, &$g, &$b, $amount)
+    {				
+        $rand = mt_rand(0, $amount) - ($amount >> 1);
 		
-		$r = static::byte($r + $rand);
-		$g = static::byte($g + $rand);
-		$b = static::byte($b + $rand);
-	}
+        $r = static::byte($r + $rand);
+        $g = static::byte($g + $rand);
+        $b = static::byte($b + $rand);
+    }
 	
-	/**
-	 * Adds salt&pepper noise by altering given R,G,B values using specififed amount
-	 *
-	 * @param int $r
-	 * @param int $g
-	 * @param int $b
-	 * @param int $value		 
-	 * @return void
-	 */
-	public function saltPepperNoise_fun(&$r, &$g, &$b, $amount)
-	{
-		if (mt_rand(0, 255 - $amount) != 0) {
-			return;
-		}
+    /**
+     * Adds salt&pepper noise by altering given R,G,B values using specififed amount
+     *
+     * @param int $r
+     * @param int $g
+     * @param int $b
+     * @param int $value		 
+     * @return void
+     */
+    public function saltPepperNoise_fun(&$r, &$g, &$b, $amount)
+    {
+        if (mt_rand(0, 255 - $amount) != 0) {
+            return;
+        }
 		
-		$rand = mt_rand(0, 1);
+        $rand = mt_rand(0, 1);
 		
-		switch ($rand) {
-			case 0:
-				$r = $g = $b = 0;
-				break;
-			case 1:
-				$r = $g = $b = 255;
-				break;
-		}
-	}
+        switch ($rand) {
+            case 0:
+                $r = $g = $b = 0;
+                break;
+            case 1:
+                $r = $g = $b = 255;
+                break;
+        }
+    }
 	
-	/**
-	 * Returns value within (0,255)
-	 *
-	 * @param int $b		 
-	 * @return int
-	 */		
-	public function byte($b)
-	{
-		if ($b > 255) {
-			return 255;
-		}
+    /**
+     * Returns value within (0,255)
+     *
+     * @param int $b		 
+     * @return int
+     */		
+    public function byte($b)
+    {
+        if ($b > 255) {
+            return 255;
+        }
 		
-		if ($b < 0) {
-			return 0;
-		}
+        if ($b < 0) {
+            return 0;
+        }
 		
-		return (int) $b;
-	}
+        return (int) $b;
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -67,7 +67,7 @@ 
 	public function filter($image, $function, $value)
 	{
 		for ($y = 0; $y < $image->getHeight(); $y++) {
-	    	for ($x = 0; $x< $image->getWidth(); $x++) {	     
+	    	for ($x = 0; $x < $image->getWidth(); $x++) {	     
 				$rgb = imagecolorat($image->getHandle(), $x, $y);				
 				
 				$a = ($rgb >> 24) & 0xFF;
@@ -96,9 +96,9 @@ 
 	 */
 	public function colorNoise_fun(&$r, &$g, &$b, $amount)
 	{				
-		$r = static::byte($r + mt_rand(0, $amount) - ($amount >> 1) );
-		$g = static::byte($g + mt_rand(0, $amount) - ($amount >> 1) );
-		$b = static::byte($b + mt_rand(0, $amount) - ($amount >> 1) );
+		$r = static::byte($r + mt_rand(0, $amount) - ($amount >> 1));
+		$g = static::byte($g + mt_rand(0, $amount) - ($amount >> 1));
+		$b = static::byte($b + mt_rand(0, $amount) - ($amount >> 1));
 	}
 	
 	/**
@@ -162,6 +162,6 @@ 
 			return 0;
 		}
 		
-		return (int) $b;
+		return (int)$b;
 	}
 }