mambax7 / XoopsCore25

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

Indentation +60 added lines, -61 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,74 +31,74 @@ 
  */
 class ApplyMask
 {
-	/**
-	 * Applies a mask on the copy of source image
-	 *
-	 * @param \WideImage\Image $image
-	 * @param \WideImage\Image $mask
-	 * @param smart_coordinate $left
-	 * @param smart_coordinate $top
-	 * @return \WideImage\Image
-	 */
-	public function execute($image, $mask, $left = 0, $top = 0)
-	{
-		$left = Coordinate::fix($left, $image->getWidth(), $mask->getWidth());
-		$top  = Coordinate::fix($top, $image->getHeight(), $mask->getHeight());
+    /**
+     * Applies a mask on the copy of source image
+     *
+     * @param \WideImage\Image $image
+     * @param \WideImage\Image $mask
+     * @param smart_coordinate $left
+     * @param smart_coordinate $top
+     * @return \WideImage\Image
+     */
+    public function execute($image, $mask, $left = 0, $top = 0)
+    {
+        $left = Coordinate::fix($left, $image->getWidth(), $mask->getWidth());
+        $top  = Coordinate::fix($top, $image->getHeight(), $mask->getHeight());
 		
-		$width      = $image->getWidth();
-		$mask_width = $mask->getWidth();
+        $width      = $image->getWidth();
+        $mask_width = $mask->getWidth();
 		
-		$height      = $image->getHeight();
-		$mask_height = $mask->getHeight();
+        $height      = $image->getHeight();
+        $mask_height = $mask->getHeight();
 		
-		$result = $image->asTrueColor();
+        $result = $image->asTrueColor();
 		
-		$result->alphaBlending(false);
-		$result->saveAlpha(true);
+        $result->alphaBlending(false);
+        $result->saveAlpha(true);
 		
-		$srcTransparentColor = $result->getTransparentColor();
+        $srcTransparentColor = $result->getTransparentColor();
 		
-		if ($srcTransparentColor >= 0) {
-			$destTransparentColor = $srcTransparentColor;
-		} else {
-			$destTransparentColor = $result->allocateColorAlpha(255, 255, 255, 127);
-		}
+        if ($srcTransparentColor >= 0) {
+            $destTransparentColor = $srcTransparentColor;
+        } else {
+            $destTransparentColor = $result->allocateColorAlpha(255, 255, 255, 127);
+        }
 		
-		for ($x = 0; $x < $width; $x++) {
-			for ($y = 0; $y < $height; $y++) {
-				$mx = $x - $left;
-				$my = $y - $top;
+        for ($x = 0; $x < $width; $x++) {
+            for ($y = 0; $y < $height; $y++) {
+                $mx = $x - $left;
+                $my = $y - $top;
 				
-				if ($mx >= 0 && $mx < $mask_width && $my >= 0 && $my < $mask_height) {
-					$srcColor = $image->getColorAt($x, $y);
+                if ($mx >= 0 && $mx < $mask_width && $my >= 0 && $my < $mask_height) {
+                    $srcColor = $image->getColorAt($x, $y);
 					
-					if ($srcColor == $srcTransparentColor) {
-						$destColor = $destTransparentColor;
-					} else {
-						$maskRGB = $mask->getRGBAt($mx, $my);
+                    if ($srcColor == $srcTransparentColor) {
+                        $destColor = $destTransparentColor;
+                    } else {
+                        $maskRGB = $mask->getRGBAt($mx, $my);
 						
-						if ($maskRGB['red'] == 0) {
-							$destColor = $destTransparentColor;
-						} elseif ($srcColor >= 0) {
-							$imageRGB          = $image->getRGBAt($x, $y);
-							$level             = ($maskRGB['red'] / 255) * (1 - $imageRGB['alpha'] / 127);
-							$imageRGB['alpha'] = 127 - round($level * 127);
+                        if ($maskRGB['red'] == 0) {
+                            $destColor = $destTransparentColor;
+                        } elseif ($srcColor >= 0) {
+                            $imageRGB          = $image->getRGBAt($x, $y);
+                            $level             = ($maskRGB['red'] / 255) * (1 - $imageRGB['alpha'] / 127);
+                            $imageRGB['alpha'] = 127 - round($level * 127);
 							
-							if ($imageRGB['alpha'] == 127) {
-								$destColor = $destTransparentColor;
-							} else {
-								$destColor = $result->allocateColorAlpha($imageRGB);
-							}
-						} else {
-							$destColor = $destTransparentColor;
-						}
-					}
+                            if ($imageRGB['alpha'] == 127) {
+                                $destColor = $destTransparentColor;
+                            } else {
+                                $destColor = $result->allocateColorAlpha($imageRGB);
+                            }
+                        } else {
+                            $destColor = $destTransparentColor;
+                        }
+                    }
 					
-					$result->setColorAt($x, $y, $destColor);
-				}
-			}
-		}
+                    $result->setColorAt($x, $y, $destColor);
+                }
+            }
+        }
 		
-		return $result;
-	}
+        return $result;
+    }
 }

htdocs/class/libraries/vendor/smottt/wideimage/lib/WideImage/MapperFactory.php

Indentation +77 added lines, -78 removed lines

@@ -18,7 +18,6 @@ 
  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 WideImage
  **/
 
@@ -34,99 +33,99 @@ 
  **/
 abstract class MapperFactory
 {
-	static protected $mappers       = array();
-	static protected $customMappers = array();
+    static protected $mappers       = array();
+    static protected $customMappers = array();
 	
-	static protected $mimeTable = array(
-		'image/jpg'   => 'JPEG', 
-		'image/jpeg'  => 'JPEG', 
-		'image/pjpeg' => 'JPEG', 
-		'image/gif'   => 'GIF', 
-		'image/png'   => 'PNG',
-		'image/webp'  => 'WEBP'
-	);
+    static protected $mimeTable = array(
+        'image/jpg'   => 'JPEG', 
+        'image/jpeg'  => 'JPEG', 
+        'image/pjpeg' => 'JPEG', 
+        'image/gif'   => 'GIF', 
+        'image/png'   => 'PNG',
+        'image/webp'  => 'WEBP'
+    );
 	
-	/**
-	 * Returns a mapper, based on the $uri and $format
-	 * 
-	 * @param string $uri File URI
-	 * @param string $format File format (extension or mime-type) or null
-	 * @return mixed
-	 **/
-	public static function selectMapper($uri, $format = null)
-	{
-		$format = self::determineFormat($uri, $format);
+    /**
+     * Returns a mapper, based on the $uri and $format
+     * 
+     * @param string $uri File URI
+     * @param string $format File format (extension or mime-type) or null
+     * @return mixed
+     **/
+    public static function selectMapper($uri, $format = null)
+    {
+        $format = self::determineFormat($uri, $format);
 		
-		if (array_key_exists($format, self::$mappers)) {
-			return self::$mappers[$format];
-		}
+        if (array_key_exists($format, self::$mappers)) {
+            return self::$mappers[$format];
+        }
 		
-		$mapperClassName = '\\WideImage\\Mapper\\' . $format;
+        $mapperClassName = '\\WideImage\\Mapper\\' . $format;
 		
-		// why not use autoloading?
-		// if (!class_exists($mapperClassName, false)) {
-		if (!class_exists($mapperClassName)) {
-			throw new UnsupportedFormatException("Format '{$format}' is not supported.");
-		}
+        // why not use autoloading?
+        // if (!class_exists($mapperClassName, false)) {
+        if (!class_exists($mapperClassName)) {
+            throw new UnsupportedFormatException("Format '{$format}' is not supported.");
+        }
 		
-		if (class_exists($mapperClassName)) {
-			self::$mappers[$format] = new $mapperClassName();
-			return self::$mappers[$format];
-		}
-	}
+        if (class_exists($mapperClassName)) {
+            self::$mappers[$format] = new $mapperClassName();
+            return self::$mappers[$format];
+        }
+    }
 	
-	public static function registerMapper($mapper_class_name, $mime_type, $extension)
-	{
-		self::$customMappers[$mime_type] = $mapper_class_name;
-		self::$mimeTable[$mime_type] = $extension;
-	}
+    public static function registerMapper($mapper_class_name, $mime_type, $extension)
+    {
+        self::$customMappers[$mime_type] = $mapper_class_name;
+        self::$mimeTable[$mime_type] = $extension;
+    }
 	
-	public static function getCustomMappers()
-	{
-		return self::$customMappers;
-	}
+    public static function getCustomMappers()
+    {
+        return self::$customMappers;
+    }
 	
-	public static function determineFormat($uri, $format = null)
-	{
-		if ($format == null) {
-			$format = self::extractExtension($uri);
-		}
+    public static function determineFormat($uri, $format = null)
+    {
+        if ($format == null) {
+            $format = self::extractExtension($uri);
+        }
 		
-		// mime-type match
-		if (preg_match('~[a-z]*/[a-z-]*~i', $format)) {
-			if (isset(self::$mimeTable[strtolower($format)])) {
-				return self::$mimeTable[strtolower($format)];
-			}
-		}
+        // mime-type match
+        if (preg_match('~[a-z]*/[a-z-]*~i', $format)) {
+            if (isset(self::$mimeTable[strtolower($format)])) {
+                return self::$mimeTable[strtolower($format)];
+            }
+        }
 		
-		// clean the string
-		$format = strtoupper(preg_replace('/[^a-z0-9_-]/i', '', $format));
-		if ($format == 'JPG') {
-			$format = 'JPEG';
-		}
+        // clean the string
+        $format = strtoupper(preg_replace('/[^a-z0-9_-]/i', '', $format));
+        if ($format == 'JPG') {
+            $format = 'JPEG';
+        }
 		
-		return $format;
-	}
+        return $format;
+    }
 	
-	public static function mimeType($format)
-	{
-		$format = strtoupper($format);
+    public static function mimeType($format)
+    {
+        $format = strtoupper($format);
 		
-		if ($format == 'JPG') {
-			$format = 'JPEG';
-		}
+        if ($format == 'JPG') {
+            $format = 'JPEG';
+        }
 		
-		return array_search($format, self::$mimeTable);
-	}
+        return array_search($format, self::$mimeTable);
+    }
 	
-	public static function extractExtension($uri)
-	{
-		$p = strrpos($uri, '.');
+    public static function extractExtension($uri)
+    {
+        $p = strrpos($uri, '.');
 		
-		if ($p === false) {
-			return '';
-		}
+        if ($p === false) {
+            return '';
+        }
 		
-		return substr($uri, $p + 1);
-	}
+        return substr($uri, $p + 1);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 			return self::$mappers[$format];
 		}
 		
-		$mapperClassName = '\\WideImage\\Mapper\\' . $format;
+		$mapperClassName = '\\WideImage\\Mapper\\'.$format;
 		
 		// why not use autoloading?
 		// if (!class_exists($mapperClassName, false)) {

htdocs/class/libraries/vendor/smottt/wideimage/lib/WideImage/vendor/de77/TGA.php

Indentation +154 added lines, -155 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/Mappers
-  **/
+     * @package Internal/Mappers
+     **/
 
 /**
  * External code for TGA
@@ -39,155 +38,155 @@ 
 
 class TGA
 {
-	public static function rle_decode($data, $datalen)
-	{
-		$len = strlen($data);
-
-		$out = '';
-
-		$i = 0;
-		$k = 0;
-
-		while ($i < $len) {
-			static::dec_bits(ord($data[$i]), $type, $value);
-
-			if ($k >= $datalen) {
-				break;
-			}
-
-			$i++;
-
-			if ($type == 0) { //raw
-				for ($j = 0; $j < (3 * $value); $j++) {
-					$out .= $data[$j+$i];
-					$k++;
-				}
-
-				$i += $value * 3;
-			} else { //rle
-				for ($j = 0; $j < $value; $j++) {
-					$out .= $data[$i] . $data[$i+1] . $data[$i+2];
-					$k++;
-				}
-
-				$i += 3;
-			}
-		}
-
-		return $out;
-	}
-
-	public static function dec_bits($byte, &$type, &$value)
-	{
-		$type  = ($byte & 0x80) >> 7;
-		$value = 1 + ($byte & 0x7F);
-	}
-
-	public static function imagecreatefromstring($bin_data)
-	{
-		if (!trim($bin_data)) {
-			return false;
-		}
-
-		$bin_pos  = 0;
-		$header   = substr($bin_data, $bin_pos, 18);
-		$bin_pos += 18;
-		$header   = unpack(	"cimage_id_len/ccolor_map_type/cimage_type/vcolor_map_origin/vcolor_map_len/" .
-							"ccolor_map_entry_size/vx_origin/vy_origin/vwidth/vheight/" .
-							"cpixel_size/cdescriptor", $header);
-
-		switch ($header['image_type']) {
-			case 2:		//no palette, uncompressed
-			case 10:	//no palette, rle
-						break;
-			default:	return false;
-		}
-
-		if ($header['pixel_size'] != 24) {
-			return false;
-			//die('Unsupported TGA color depth');
-		}
-
-		$bytes = $header['pixel_size'] / 8;
-
-		if ($header['image_id_len'] > 0) {
-			$header['image_id'] = substr($bin_data, $bin_pos, $header['image_id_len']);
-			$bin_pos += $header['image_id_len'];
-		} else {
-			$header['image_id'] = '';
-		}
-
-		$im = imagecreatetruecolor($header['width'], $header['height']);
-
-		$size = $header['width'] * $header['height'] * 3;
-
-		//-- check whether this is NEW TGA or not
-		$pos     = $bin_pos;
-		$bin_pos = strlen($bin_data) - 26;
-		$newtga  = substr($bin_data, $bin_pos, 26);
-
-		if (substr($newtga, 8, 16) != 'TRUEVISION-XFILE') {
-			$newtga = false;
-		}
-
-		$bin_pos  = strlen($bin_data);
-		$datasize = $bin_pos - $pos;
-
-		if ($newtga) {
-			$datasize -= 26;
-		}
-
-		$bin_pos = $pos;
-
-		//-- end of check
-		$data     = substr($bin_data, $bin_pos, $datasize);
-		$bin_pos += $datasize;
-
-		if ($header['image_type'] == 10) {
-			$data = self::rle_decode($data, $size);
-		}
-
-		$reverse = self::bit5($header['descriptor']) == 1;
-		$pixels  = str_split($data, 3);
-
-		$i = 0;
-
-		//read pixels
-		if ($reverse) {
-		    for ($y = 0; $y < $header['height']; $y++) {
-		    	for ($x = 0; $x < $header['width']; $x++) {
-		    		imagesetpixel($im, $x, $y, self::dwordize($pixels[$i]));
-		    		$i++;
-		    	}
-		    }
-	    } else {
-	        for ($y = $header['height']-1; $y >= 0; $y--) {
-		    	for ($x=0; $x<$header['width']; $x++) {
-		    		imagesetpixel($im, $x, $y, self::dwordize($pixels[$i]));
-		    		$i++;
-		    	}
-		    }
-	    }
-
-		return $im;
-	}
-
-	public static function imagecreatefromtga($filename)
-	{
-		return self::imagecreatefromstring(file_get_contents($filename));
-	}
-
-	public static function dwordize($str)
-	{
-		$a = ord($str[0]);
-		$b = ord($str[1]);
-		$c = ord($str[2]);
-
-		return $c*256*256 + $b*256 + $a;
-	}
-
-	public static function bit5($x)
-	{
-		return ($x & 32) >> 5;
-	}
+    public static function rle_decode($data, $datalen)
+    {
+        $len = strlen($data);
+
+        $out = '';
+
+        $i = 0;
+        $k = 0;
+
+        while ($i < $len) {
+            static::dec_bits(ord($data[$i]), $type, $value);
+
+            if ($k >= $datalen) {
+                break;
+            }
+
+            $i++;
+
+            if ($type == 0) { //raw
+                for ($j = 0; $j < (3 * $value); $j++) {
+                    $out .= $data[$j+$i];
+                    $k++;
+                }
+
+                $i += $value * 3;
+            } else { //rle
+                for ($j = 0; $j < $value; $j++) {
+                    $out .= $data[$i] . $data[$i+1] . $data[$i+2];
+                    $k++;
+                }
+
+                $i += 3;
+            }
+        }
+
+        return $out;
+    }
+
+    public static function dec_bits($byte, &$type, &$value)
+    {
+        $type  = ($byte & 0x80) >> 7;
+        $value = 1 + ($byte & 0x7F);
+    }
+
+    public static function imagecreatefromstring($bin_data)
+    {
+        if (!trim($bin_data)) {
+            return false;
+        }
+
+        $bin_pos  = 0;
+        $header   = substr($bin_data, $bin_pos, 18);
+        $bin_pos += 18;
+        $header   = unpack(	"cimage_id_len/ccolor_map_type/cimage_type/vcolor_map_origin/vcolor_map_len/" .
+                            "ccolor_map_entry_size/vx_origin/vy_origin/vwidth/vheight/" .
+                            "cpixel_size/cdescriptor", $header);
+
+        switch ($header['image_type']) {
+            case 2:		//no palette, uncompressed
+            case 10:	//no palette, rle
+                        break;
+            default:	return false;
+        }
+
+        if ($header['pixel_size'] != 24) {
+            return false;
+            //die('Unsupported TGA color depth');
+        }
+
+        $bytes = $header['pixel_size'] / 8;
+
+        if ($header['image_id_len'] > 0) {
+            $header['image_id'] = substr($bin_data, $bin_pos, $header['image_id_len']);
+            $bin_pos += $header['image_id_len'];
+        } else {
+            $header['image_id'] = '';
+        }
+
+        $im = imagecreatetruecolor($header['width'], $header['height']);
+
+        $size = $header['width'] * $header['height'] * 3;
+
+        //-- check whether this is NEW TGA or not
+        $pos     = $bin_pos;
+        $bin_pos = strlen($bin_data) - 26;
+        $newtga  = substr($bin_data, $bin_pos, 26);
+
+        if (substr($newtga, 8, 16) != 'TRUEVISION-XFILE') {
+            $newtga = false;
+        }
+
+        $bin_pos  = strlen($bin_data);
+        $datasize = $bin_pos - $pos;
+
+        if ($newtga) {
+            $datasize -= 26;
+        }
+
+        $bin_pos = $pos;
+
+        //-- end of check
+        $data     = substr($bin_data, $bin_pos, $datasize);
+        $bin_pos += $datasize;
+
+        if ($header['image_type'] == 10) {
+            $data = self::rle_decode($data, $size);
+        }
+
+        $reverse = self::bit5($header['descriptor']) == 1;
+        $pixels  = str_split($data, 3);
+
+        $i = 0;
+
+        //read pixels
+        if ($reverse) {
+            for ($y = 0; $y < $header['height']; $y++) {
+                for ($x = 0; $x < $header['width']; $x++) {
+                    imagesetpixel($im, $x, $y, self::dwordize($pixels[$i]));
+                    $i++;
+                }
+            }
+        } else {
+            for ($y = $header['height']-1; $y >= 0; $y--) {
+                for ($x=0; $x<$header['width']; $x++) {
+                    imagesetpixel($im, $x, $y, self::dwordize($pixels[$i]));
+                    $i++;
+                }
+            }
+        }
+
+        return $im;
+    }
+
+    public static function imagecreatefromtga($filename)
+    {
+        return self::imagecreatefromstring(file_get_contents($filename));
+    }
+
+    public static function dwordize($str)
+    {
+        $a = ord($str[0]);
+        $b = ord($str[1]);
+        $c = ord($str[2]);
+
+        return $c*256*256 + $b*256 + $a;
+    }
+
+    public static function bit5($x)
+    {
+        return ($x & 32) >> 5;
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -59,14 +59,14 @@ 
 
 			if ($type == 0) { //raw
 				for ($j = 0; $j < (3 * $value); $j++) {
-					$out .= $data[$j+$i];
+					$out .= $data[$j + $i];
 					$k++;
 				}
 
 				$i += $value * 3;
 			} else { //rle
 				for ($j = 0; $j < $value; $j++) {
-					$out .= $data[$i] . $data[$i+1] . $data[$i+2];
+					$out .= $data[$i].$data[$i + 1].$data[$i + 2];
 					$k++;
 				}
 
@@ -92,8 +92,8 @@ 
 		$bin_pos  = 0;
 		$header   = substr($bin_data, $bin_pos, 18);
 		$bin_pos += 18;
-		$header   = unpack(	"cimage_id_len/ccolor_map_type/cimage_type/vcolor_map_origin/vcolor_map_len/" .
-							"ccolor_map_entry_size/vx_origin/vy_origin/vwidth/vheight/" .
+		$header   = unpack("cimage_id_len/ccolor_map_type/cimage_type/vcolor_map_origin/vcolor_map_len/".
+							"ccolor_map_entry_size/vx_origin/vy_origin/vwidth/vheight/".
 							"cpixel_size/cdescriptor", $header);
 
 		switch ($header['image_type']) {
@@ -161,8 +161,8 @@ 
 		    	}
 		    }
 	    } else {
-	        for ($y = $header['height']-1; $y >= 0; $y--) {
-		    	for ($x=0; $x<$header['width']; $x++) {
+	        for ($y = $header['height'] - 1; $y >= 0; $y--) {
+		    	for ($x = 0; $x < $header['width']; $x++) {
 		    		imagesetpixel($im, $x, $y, self::dwordize($pixels[$i]));
 		    		$i++;
 		    	}
@@ -183,7 +183,7 @@ 
 		$b = ord($str[1]);
 		$c = ord($str[2]);
 
-		return $c*256*256 + $b*256 + $a;
+		return $c * 256 * 256 + $b * 256 + $a;
 	}
 
 	public static function bit5($x)

htdocs/class/libraries/vendor/smottt/wideimage/lib/WideImage/vendor/de77/BMP.php

Indentation +216 added lines, -217 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-	/**
+    /**
 ##DOC-SIGNATURE##
 
     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/Mappers
-  **/
+     * @package Internal/Mappers
+     **/
 
 /**
  * External code for BMP
@@ -40,217 +39,217 @@ 
 
 class BMP
 {
-	public static function imagebmp(&$img, $filename = false)
-	{
-		$wid     = imagesx($img);
-		$hei     = imagesy($img);
-		$wid_pad = str_pad('', $wid % 4, "\0");
-
-		$size = 54 + ($wid + $wid_pad) * $hei * 3; //fixed
-
-		//prepare & save header
-		$header['identifier']		= 'BM';
-		$header['file_size']		= self::dword($size);
-		$header['reserved']			= self::dword(0);
-		$header['bitmap_data']		= self::dword(54);
-		$header['header_size']		= self::dword(40);
-		$header['width']			= self::dword($wid);
-		$header['height']			= self::dword($hei);
-		$header['planes']			= self::word(1);
-		$header['bits_per_pixel']	= self::word(24);
-		$header['compression']		= self::dword(0);
-		$header['data_size']		= self::dword(0);
-		$header['h_resolution']		= self::dword(0);
-		$header['v_resolution']		= self::dword(0);
-		$header['colors']			= self::dword(0);
-		$header['important_colors']	= self::dword(0);
-
-		if ($filename) {
-		    $f = fopen($filename, "wb");
-
-		    foreach ($header as $h) {
-		    	fwrite($f, $h);
-		    }
-
-			//save pixels
-			for ($y = $hei-1; $y >= 0; $y--) {
-				for ($x = 0; $x < $wid; $x++) {
-					$rgb = imagecolorat($img, $x, $y);
-					fwrite($f, self::byte3($rgb));
-				}
-
-				fwrite($f, $wid_pad);
-			}
-
-			fclose($f);
-		} else {
-		    foreach ($header as $h) {
-		    	echo $h;
-		    }
-
-			//save pixels
-			for ($y = $hei-1; $y >= 0; $y--) {
-				for ($x = 0; $x < $wid; $x++) {
-					$rgb = imagecolorat($img, $x, $y);
-					echo self::byte3($rgb);
-				}
-
-				echo $wid_pad;
-			}
-		}
-
-		return true;
-	}
-
-	public static function imagecreatefromstring($data)
-	{
-		//read header
-		$pos    = 0;
-		$header = substr($data, 0, 54);
-		$pos    = 54;
-
-		if (strlen($header) < 54) {
-			return false;
-		}
-
-	    $header = unpack(	'c2identifier/Vfile_size/Vreserved/Vbitmap_data/Vheader_size/' .
-							'Vwidth/Vheight/vplanes/vbits_per_pixel/Vcompression/Vdata_size/'.
-							'Vh_resolution/Vv_resolution/Vcolors/Vimportant_colors', $header);
-
-	    if ($header['identifier1'] != 66 or $header['identifier2'] != 77) {
-	    	return false;
-	    }
-
-	    if (!in_array($header['bits_per_pixel'], array(24, 32, 8, 4, 1))) {
-	    	return false;
-	    }
-
-		$bps    = $header['bits_per_pixel']; //bits per pixel
-	    $wid2   = ceil(($bps/8 * $header['width']) / 4) * 4;
-		$colors = $header['colors'];
-
-	    $wid = $header['width'];
-	    $hei = $header['height'];
-
-	    $img = imagecreatetruecolor($header['width'], $header['height']);
-
-		//read palette
-		if ($bps < 9) {
-			for ($i = 0; $i < $colors; $i++) {
-				$palette[] = self::undword(substr($data, $pos, 4));
-				$pos += 4;
-			}
-		} else {
-			if ($bps == 32) {
-				imagealphablending($img, false);
-				imagesavealpha($img, true);
-			}
-
-			$palette = array();
-		}
-
-		//read pixels
-	    for ($y = $hei-1; $y >= 0; $y--) {
-			$row    = substr($data, $pos, $wid2);
-			$pos   += $wid2;
-			$pixels = self::str_split2($row, $bps, $palette);
-
-	    	for ($x = 0; $x < $wid; $x++) {
-	    		self::makepixel($img, $x, $y, $pixels[$x], $bps);
-	    	}
-	    }
-
-		return $img;
-	}
-
-	public static function imagecreatefrombmp($filename)
-	{
-		return self::imagecreatefromstring(file_get_contents($filename));
-	}
-
-	private static function str_split2($row, $bps, $palette)
-	{
-		switch ($bps) {
-			case 32:
-			case 24:	return str_split($row, $bps / 8);
-			case  8:	$out   = array();
-						$count = strlen($row);
-
-						for ($i = 0; $i < $count; $i++) {
-							$out[] = $palette[	ord($row[$i])		];
-						}
-
-						return $out;
-			case  4:	$out   = array();
-						$count = strlen($row);
-
-						for ($i = 0; $i < $count; $i++) {
-							$roww  = ord($row[$i]);
-							$out[] = $palette[	($roww & 240) >> 4	];
-							$out[] = $palette[	($roww & 15) 		];
-						}
-
-						return $out;
-			case  1:	$out   = array();
-						$count = strlen($row);
-
-						for ($i = 0; $i < $count; $i++) {
-							$roww  = ord($row[$i]);
-							$out[] = $palette[	($roww & 128) >> 7	];
-							$out[] = $palette[	($roww & 64) >> 6	];
-							$out[] = $palette[	($roww & 32) >> 5	];
-							$out[] = $palette[	($roww & 16) >> 4	];
-							$out[] = $palette[	($roww & 8) >> 3	];
-							$out[] = $palette[	($roww & 4) >> 2	];
-							$out[] = $palette[	($roww & 2) >> 1	];
-							$out[] = $palette[	($roww & 1)			];
-						}
-
-						return $out;
-		}
-	}
-
-	private static function makepixel($img, $x, $y, $str, $bps)
-	{
-		switch ($bps) {
-			case 32 :	$a = ord($str[0]);
-						$b = ord($str[1]);
-						$c = ord($str[2]);
-						$d = 256 - ord($str[3]); //TODO: gives imperfect results
-						$pixel = $d*256*256*256 + $c*256*256 + $b*256 + $a;
-						imagesetpixel($img, $x, $y, $pixel);
-						break;
-			case 24 :	$a = ord($str[0]);
-						$b = ord($str[1]);
-						$c = ord($str[2]);
-						$pixel = $c*256*256 + $b*256 + $a;
-						imagesetpixel($img, $x, $y, $pixel);
-						break;
-			case 8 :
-			case 4 :
-			case 1 :	imagesetpixel($img, $x, $y, $str);
-						break;
-		}
-	}
-
-	private static function byte3($n)
-	{
-		return chr($n & 255) . chr(($n >> 8) & 255) . chr(($n >> 16) & 255);
-	}
-
-	private static function undword($n)
-	{
-		$r = unpack("V", $n);
-		return $r[1];
-	}
-
-	private static function dword($n)
-	{
-		return pack("V", $n);
-	}
-
-	private static function word($n)
-	{
-		return pack("v", $n);
-	}
+    public static function imagebmp(&$img, $filename = false)
+    {
+        $wid     = imagesx($img);
+        $hei     = imagesy($img);
+        $wid_pad = str_pad('', $wid % 4, "\0");
+
+        $size = 54 + ($wid + $wid_pad) * $hei * 3; //fixed
+
+        //prepare & save header
+        $header['identifier']		= 'BM';
+        $header['file_size']		= self::dword($size);
+        $header['reserved']			= self::dword(0);
+        $header['bitmap_data']		= self::dword(54);
+        $header['header_size']		= self::dword(40);
+        $header['width']			= self::dword($wid);
+        $header['height']			= self::dword($hei);
+        $header['planes']			= self::word(1);
+        $header['bits_per_pixel']	= self::word(24);
+        $header['compression']		= self::dword(0);
+        $header['data_size']		= self::dword(0);
+        $header['h_resolution']		= self::dword(0);
+        $header['v_resolution']		= self::dword(0);
+        $header['colors']			= self::dword(0);
+        $header['important_colors']	= self::dword(0);
+
+        if ($filename) {
+            $f = fopen($filename, "wb");
+
+            foreach ($header as $h) {
+                fwrite($f, $h);
+            }
+
+            //save pixels
+            for ($y = $hei-1; $y >= 0; $y--) {
+                for ($x = 0; $x < $wid; $x++) {
+                    $rgb = imagecolorat($img, $x, $y);
+                    fwrite($f, self::byte3($rgb));
+                }
+
+                fwrite($f, $wid_pad);
+            }
+
+            fclose($f);
+        } else {
+            foreach ($header as $h) {
+                echo $h;
+            }
+
+            //save pixels
+            for ($y = $hei-1; $y >= 0; $y--) {
+                for ($x = 0; $x < $wid; $x++) {
+                    $rgb = imagecolorat($img, $x, $y);
+                    echo self::byte3($rgb);
+                }
+
+                echo $wid_pad;
+            }
+        }
+
+        return true;
+    }
+
+    public static function imagecreatefromstring($data)
+    {
+        //read header
+        $pos    = 0;
+        $header = substr($data, 0, 54);
+        $pos    = 54;
+
+        if (strlen($header) < 54) {
+            return false;
+        }
+
+        $header = unpack(	'c2identifier/Vfile_size/Vreserved/Vbitmap_data/Vheader_size/' .
+                            'Vwidth/Vheight/vplanes/vbits_per_pixel/Vcompression/Vdata_size/'.
+                            'Vh_resolution/Vv_resolution/Vcolors/Vimportant_colors', $header);
+
+        if ($header['identifier1'] != 66 or $header['identifier2'] != 77) {
+            return false;
+        }
+
+        if (!in_array($header['bits_per_pixel'], array(24, 32, 8, 4, 1))) {
+            return false;
+        }
+
+        $bps    = $header['bits_per_pixel']; //bits per pixel
+        $wid2   = ceil(($bps/8 * $header['width']) / 4) * 4;
+        $colors = $header['colors'];
+
+        $wid = $header['width'];
+        $hei = $header['height'];
+
+        $img = imagecreatetruecolor($header['width'], $header['height']);
+
+        //read palette
+        if ($bps < 9) {
+            for ($i = 0; $i < $colors; $i++) {
+                $palette[] = self::undword(substr($data, $pos, 4));
+                $pos += 4;
+            }
+        } else {
+            if ($bps == 32) {
+                imagealphablending($img, false);
+                imagesavealpha($img, true);
+            }
+
+            $palette = array();
+        }
+
+        //read pixels
+        for ($y = $hei-1; $y >= 0; $y--) {
+            $row    = substr($data, $pos, $wid2);
+            $pos   += $wid2;
+            $pixels = self::str_split2($row, $bps, $palette);
+
+            for ($x = 0; $x < $wid; $x++) {
+                self::makepixel($img, $x, $y, $pixels[$x], $bps);
+            }
+        }
+
+        return $img;
+    }
+
+    public static function imagecreatefrombmp($filename)
+    {
+        return self::imagecreatefromstring(file_get_contents($filename));
+    }
+
+    private static function str_split2($row, $bps, $palette)
+    {
+        switch ($bps) {
+            case 32:
+            case 24:	return str_split($row, $bps / 8);
+            case  8:	$out   = array();
+                        $count = strlen($row);
+
+                        for ($i = 0; $i < $count; $i++) {
+                            $out[] = $palette[	ord($row[$i])		];
+                        }
+
+                        return $out;
+            case  4:	$out   = array();
+                        $count = strlen($row);
+
+                        for ($i = 0; $i < $count; $i++) {
+                            $roww  = ord($row[$i]);
+                            $out[] = $palette[	($roww & 240) >> 4	];
+                            $out[] = $palette[	($roww & 15) 		];
+                        }
+
+                        return $out;
+            case  1:	$out   = array();
+                        $count = strlen($row);
+
+                        for ($i = 0; $i < $count; $i++) {
+                            $roww  = ord($row[$i]);
+                            $out[] = $palette[	($roww & 128) >> 7	];
+                            $out[] = $palette[	($roww & 64) >> 6	];
+                            $out[] = $palette[	($roww & 32) >> 5	];
+                            $out[] = $palette[	($roww & 16) >> 4	];
+                            $out[] = $palette[	($roww & 8) >> 3	];
+                            $out[] = $palette[	($roww & 4) >> 2	];
+                            $out[] = $palette[	($roww & 2) >> 1	];
+                            $out[] = $palette[	($roww & 1)			];
+                        }
+
+                        return $out;
+        }
+    }
+
+    private static function makepixel($img, $x, $y, $str, $bps)
+    {
+        switch ($bps) {
+            case 32 :	$a = ord($str[0]);
+                        $b = ord($str[1]);
+                        $c = ord($str[2]);
+                        $d = 256 - ord($str[3]); //TODO: gives imperfect results
+                        $pixel = $d*256*256*256 + $c*256*256 + $b*256 + $a;
+                        imagesetpixel($img, $x, $y, $pixel);
+                        break;
+            case 24 :	$a = ord($str[0]);
+                        $b = ord($str[1]);
+                        $c = ord($str[2]);
+                        $pixel = $c*256*256 + $b*256 + $a;
+                        imagesetpixel($img, $x, $y, $pixel);
+                        break;
+            case 8 :
+            case 4 :
+            case 1 :	imagesetpixel($img, $x, $y, $str);
+                        break;
+        }
+    }
+
+    private static function byte3($n)
+    {
+        return chr($n & 255) . chr(($n >> 8) & 255) . chr(($n >> 16) & 255);
+    }
+
+    private static function undword($n)
+    {
+        $r = unpack("V", $n);
+        return $r[1];
+    }
+
+    private static function dword($n)
+    {
+        return pack("V", $n);
+    }
+
+    private static function word($n)
+    {
+        return pack("v", $n);
+    }
 }

Spacing +29 added lines, -29 removed lines

@@ -49,21 +49,21 @@ 
 		$size = 54 + ($wid + $wid_pad) * $hei * 3; //fixed
 
 		//prepare & save header
-		$header['identifier']		= 'BM';
+		$header['identifier'] = 'BM';
 		$header['file_size']		= self::dword($size);
 		$header['reserved']			= self::dword(0);
 		$header['bitmap_data']		= self::dword(54);
 		$header['header_size']		= self::dword(40);
-		$header['width']			= self::dword($wid);
+		$header['width'] = self::dword($wid);
 		$header['height']			= self::dword($hei);
 		$header['planes']			= self::word(1);
-		$header['bits_per_pixel']	= self::word(24);
-		$header['compression']		= self::dword(0);
-		$header['data_size']		= self::dword(0);
+		$header['bits_per_pixel'] = self::word(24);
+		$header['compression'] = self::dword(0);
+		$header['data_size'] = self::dword(0);
 		$header['h_resolution']		= self::dword(0);
 		$header['v_resolution']		= self::dword(0);
-		$header['colors']			= self::dword(0);
-		$header['important_colors']	= self::dword(0);
+		$header['colors'] = self::dword(0);
+		$header['important_colors'] = self::dword(0);
 
 		if ($filename) {
 		    $f = fopen($filename, "wb");
@@ -73,7 +73,7 @@ 
 		    }
 
 			//save pixels
-			for ($y = $hei-1; $y >= 0; $y--) {
+			for ($y = $hei - 1; $y >= 0; $y--) {
 				for ($x = 0; $x < $wid; $x++) {
 					$rgb = imagecolorat($img, $x, $y);
 					fwrite($f, self::byte3($rgb));
@@ -89,7 +89,7 @@ 
 		    }
 
 			//save pixels
-			for ($y = $hei-1; $y >= 0; $y--) {
+			for ($y = $hei - 1; $y >= 0; $y--) {
 				for ($x = 0; $x < $wid; $x++) {
 					$rgb = imagecolorat($img, $x, $y);
 					echo self::byte3($rgb);
@@ -113,7 +113,7 @@ 
 			return false;
 		}
 
-	    $header = unpack(	'c2identifier/Vfile_size/Vreserved/Vbitmap_data/Vheader_size/' .
+	    $header = unpack('c2identifier/Vfile_size/Vreserved/Vbitmap_data/Vheader_size/'.
 							'Vwidth/Vheight/vplanes/vbits_per_pixel/Vcompression/Vdata_size/'.
 							'Vh_resolution/Vv_resolution/Vcolors/Vimportant_colors', $header);
 
@@ -126,7 +126,7 @@ 
 	    }
 
 		$bps    = $header['bits_per_pixel']; //bits per pixel
-	    $wid2   = ceil(($bps/8 * $header['width']) / 4) * 4;
+	    $wid2 = ceil(($bps / 8 * $header['width']) / 4) * 4;
 		$colors = $header['colors'];
 
 	    $wid = $header['width'];
@@ -150,7 +150,7 @@ 
 		}
 
 		//read pixels
-	    for ($y = $hei-1; $y >= 0; $y--) {
+	    for ($y = $hei - 1; $y >= 0; $y--) {
 			$row    = substr($data, $pos, $wid2);
 			$pos   += $wid2;
 			$pixels = self::str_split2($row, $bps, $palette);
@@ -173,37 +173,37 @@ 
 		switch ($bps) {
 			case 32:
 			case 24:	return str_split($row, $bps / 8);
-			case  8:	$out   = array();
+			case  8:	$out = array();
 						$count = strlen($row);
 
 						for ($i = 0; $i < $count; $i++) {
-							$out[] = $palette[	ord($row[$i])		];
+							$out[] = $palette[ord($row[$i])];
 						}
 
 						return $out;
-			case  4:	$out   = array();
+			case  4:	$out = array();
 						$count = strlen($row);
 
 						for ($i = 0; $i < $count; $i++) {
 							$roww  = ord($row[$i]);
-							$out[] = $palette[	($roww & 240) >> 4	];
-							$out[] = $palette[	($roww & 15) 		];
+							$out[] = $palette[($roww & 240) >> 4];
+							$out[] = $palette[($roww & 15)];
 						}
 
 						return $out;
-			case  1:	$out   = array();
+			case  1:	$out = array();
 						$count = strlen($row);
 
 						for ($i = 0; $i < $count; $i++) {
 							$roww  = ord($row[$i]);
-							$out[] = $palette[	($roww & 128) >> 7	];
-							$out[] = $palette[	($roww & 64) >> 6	];
-							$out[] = $palette[	($roww & 32) >> 5	];
-							$out[] = $palette[	($roww & 16) >> 4	];
-							$out[] = $palette[	($roww & 8) >> 3	];
-							$out[] = $palette[	($roww & 4) >> 2	];
-							$out[] = $palette[	($roww & 2) >> 1	];
-							$out[] = $palette[	($roww & 1)			];
+							$out[] = $palette[($roww & 128) >> 7];
+							$out[] = $palette[($roww & 64) >> 6];
+							$out[] = $palette[($roww & 32) >> 5];
+							$out[] = $palette[($roww & 16) >> 4];
+							$out[] = $palette[($roww & 8) >> 3];
+							$out[] = $palette[($roww & 4) >> 2];
+							$out[] = $palette[($roww & 2) >> 1];
+							$out[] = $palette[($roww & 1)];
 						}
 
 						return $out;
@@ -217,13 +217,13 @@ 
 						$b = ord($str[1]);
 						$c = ord($str[2]);
 						$d = 256 - ord($str[3]); //TODO: gives imperfect results
-						$pixel = $d*256*256*256 + $c*256*256 + $b*256 + $a;
+						$pixel = $d * 256 * 256 * 256 + $c * 256 * 256 + $b * 256 + $a;
 						imagesetpixel($img, $x, $y, $pixel);
 						break;
 			case 24 :	$a = ord($str[0]);
 						$b = ord($str[1]);
 						$c = ord($str[2]);
-						$pixel = $c*256*256 + $b*256 + $a;
+						$pixel = $c * 256 * 256 + $b * 256 + $a;
 						imagesetpixel($img, $x, $y, $pixel);
 						break;
 			case 8 :
@@ -235,7 +235,7 @@ 
 
 	private static function byte3($n)
 	{
-		return chr($n & 255) . chr(($n >> 8) & 255) . chr(($n >> 16) & 255);
+		return chr($n & 255).chr(($n >> 8) & 255).chr(($n >> 16) & 255);
 	}
 
 	private static function undword($n)

htdocs/class/libraries/vendor/smottt/wideimage/lib/WideImage/Exception/Exception.php

Indentation -1 removed lines

@@ -18,7 +18,6 @@
  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 WideImage
 **/
 

htdocs/class/libraries/vendor/smottt/wideimage/lib/WideImage/OperationFactory.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 Internals
-  **/
+     * @package Internals
+     **/
 
 namespace WideImage;
 
@@ -33,24 +32,24 @@ 
  **/
 class OperationFactory
 {
-	protected static $cache = array();
+    protected static $cache = array();
 	
-	public static function get($operationName)
-	{
-		$lcname = strtolower($operationName);
+    public static function get($operationName)
+    {
+        $lcname = strtolower($operationName);
 		
-		if (!isset(self::$cache[$lcname])) {
-			$opClassName = "\\WideImage\\Operation\\" . ucfirst($operationName);
+        if (!isset(self::$cache[$lcname])) {
+            $opClassName = "\\WideImage\\Operation\\" . ucfirst($operationName);
 			
-			// why not use autoloading?			
-			// if (!class_exists($opClassName, false)) {
-			if (!class_exists($opClassName)) {
-				throw new UnknownImageOperationException("Can't load '{$operationName}' operation.");
-			}
+            // why not use autoloading?			
+            // if (!class_exists($opClassName, false)) {
+            if (!class_exists($opClassName)) {
+                throw new UnknownImageOperationException("Can't load '{$operationName}' operation.");
+            }
 			
-			self::$cache[$lcname] = new $opClassName();
-		}
+            self::$cache[$lcname] = new $opClassName();
+        }
 		
-		return self::$cache[$lcname];
-	}
+        return self::$cache[$lcname];
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 		$lcname = strtolower($operationName);
 		
 		if (!isset(self::$cache[$lcname])) {
-			$opClassName = "\\WideImage\\Operation\\" . ucfirst($operationName);
+			$opClassName = "\\WideImage\\Operation\\".ucfirst($operationName);
 			
 			// why not use autoloading?			
 			// if (!class_exists($opClassName, false)) {

htdocs/class/libraries/vendor/smottt/wideimage/lib/WideImage/Canvas.php

Indentation +116 added lines, -117 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 WideImage
-  **/
+     * @package WideImage
+     **/
 
 namespace WideImage;
 
@@ -33,129 +32,129 @@ 
  */
 class Canvas
 {
-	protected $handle = 0;
-	protected $image  = null;
-	protected $font   = null;
+    protected $handle = 0;
+    protected $image  = null;
+    protected $font   = null;
 	
-	/**
-	 * Creates a canvas object that writes to the image passed as a parameter
-	 *
-	 * Shouldn't be used directly, use \WideImage\Image::getCanvas() instead.
-	 *
-	 * @param \WideImage\Image $img Image object
-	 */
-	public function __construct($img)
-	{
-		$this->handle = $img->getHandle();
-		$this->image  = $img;
-	}
+    /**
+     * Creates a canvas object that writes to the image passed as a parameter
+     *
+     * Shouldn't be used directly, use \WideImage\Image::getCanvas() instead.
+     *
+     * @param \WideImage\Image $img Image object
+     */
+    public function __construct($img)
+    {
+        $this->handle = $img->getHandle();
+        $this->image  = $img;
+    }
 	
-	/**
-	 * Sets the active font. Can be an instance of 
-	 * \WideImage\Font\TTF, \WideImage\Font\PS, or \WideImage\Font\GDF.
-	 * 
-	 * @param object $font Font object to set for writeText()
-	 */
-	public function setFont($font)
-	{
-		$this->font = $font;
-	}
+    /**
+     * Sets the active font. Can be an instance of 
+     * \WideImage\Font\TTF, \WideImage\Font\PS, or \WideImage\Font\GDF.
+     * 
+     * @param object $font Font object to set for writeText()
+     */
+    public function setFont($font)
+    {
+        $this->font = $font;
+    }
 	
-	/**
-	 * Creates and sets the current font
-	 * 
-	 * The supported font types are: TTF/OTF, PS, and GDF.
-	 * Font type is detected from the extension. If the $file parameter doesn't have an extension, TTF font is presumed.
-	 * 
-	 * Note: not all parameters are supported by all fonts.
-	 * 
-	 * @param string $file Font file name (string)
-	 * @param int $size Font size (supported for TTF/OTF and PS fonts, ignored for GDF)
-	 * @param int $color Text color
-	 * @param int $bgcolor Background color (supported only for PS font, ignored for TTF and PS)
-	 * @return mixed One of the \WideImage\Font\* objects
-	 */
-	public function useFont($file, $size = 12, $color = 0, $bgcolor = null)
-	{
-		$p = strrpos($file, '.');
+    /**
+     * Creates and sets the current font
+     * 
+     * The supported font types are: TTF/OTF, PS, and GDF.
+     * Font type is detected from the extension. If the $file parameter doesn't have an extension, TTF font is presumed.
+     * 
+     * Note: not all parameters are supported by all fonts.
+     * 
+     * @param string $file Font file name (string)
+     * @param int $size Font size (supported for TTF/OTF and PS fonts, ignored for GDF)
+     * @param int $color Text color
+     * @param int $bgcolor Background color (supported only for PS font, ignored for TTF and PS)
+     * @return mixed One of the \WideImage\Font\* objects
+     */
+    public function useFont($file, $size = 12, $color = 0, $bgcolor = null)
+    {
+        $p = strrpos($file, '.');
 		
-		if ($p === false || $p < strlen($file) - 4) {
-			$ext = 'ttf';
-		} else {
-			$ext = strtolower(substr($file, $p + 1));
-		}
+        if ($p === false || $p < strlen($file) - 4) {
+            $ext = 'ttf';
+        } else {
+            $ext = strtolower(substr($file, $p + 1));
+        }
 		
-		if ($ext == 'ttf' || $ext == 'otf') {
-			$font = new Font\TTF($file, $size, $color);
-		} elseif ($ext == 'ps') {
-			$font = new Font\PS($file, $size, $color, $bgcolor);
-		} elseif ($ext == 'gdf') {
-			$font = new Font\GDF($file, $color);
-		} else {
-			throw new InvalidFontFileException("'$file' appears to be an invalid font file.");
-		}
+        if ($ext == 'ttf' || $ext == 'otf') {
+            $font = new Font\TTF($file, $size, $color);
+        } elseif ($ext == 'ps') {
+            $font = new Font\PS($file, $size, $color, $bgcolor);
+        } elseif ($ext == 'gdf') {
+            $font = new Font\GDF($file, $color);
+        } else {
+            throw new InvalidFontFileException("'$file' appears to be an invalid font file.");
+        }
 		
-		$this->setFont($font);
-		return $font;
-	}
+        $this->setFont($font);
+        return $font;
+    }
 	
-	/**
-	 * Write text on the image at specified position
-	 * 
-	 * You must set a font with a call to \WideImage\Canvas::setFont() prior to writing text to the image.
-	 * 
-	 * Smart coordinates are supported for $x and $y arguments, but currently only for TTF/OTF fonts.
-	 * 
-	 * Example:
-	 * <code>
-	 * $img = WideImage::load('pic.jpg');
-	 * $canvas = $img->getCanvas();
-	 * $canvas->useFont('Verdana.ttf', 16, $img->allocateColor(255, 0, 0));
-	 * $canvas->writeText('right', 'bottom', 'www.website.com');
-	 * </code>
-	 * 
-	 * @param int $x Left
-	 * @param int $y Top
-	 * @param string $text Text to write
-	 * @param int $angle The angle, defaults to 0
-	 */
-	public function writeText($x, $y, $text, $angle = 0)
-	{
-		if ($this->font === null) {
-			throw new NoFontException("Can't write text without a font.");
-		}
+    /**
+     * Write text on the image at specified position
+     * 
+     * You must set a font with a call to \WideImage\Canvas::setFont() prior to writing text to the image.
+     * 
+     * Smart coordinates are supported for $x and $y arguments, but currently only for TTF/OTF fonts.
+     * 
+     * Example:
+     * <code>
+     * $img = WideImage::load('pic.jpg');
+     * $canvas = $img->getCanvas();
+     * $canvas->useFont('Verdana.ttf', 16, $img->allocateColor(255, 0, 0));
+     * $canvas->writeText('right', 'bottom', 'www.website.com');
+     * </code>
+     * 
+     * @param int $x Left
+     * @param int $y Top
+     * @param string $text Text to write
+     * @param int $angle The angle, defaults to 0
+     */
+    public function writeText($x, $y, $text, $angle = 0)
+    {
+        if ($this->font === null) {
+            throw new NoFontException("Can't write text without a font.");
+        }
 		
-		$angle = - floatval($angle);
+        $angle = - floatval($angle);
 		
-		if ($angle < 0) {
-			$angle = 360 + $angle;
-		}
+        if ($angle < 0) {
+            $angle = 360 + $angle;
+        }
 		
-		$angle = $angle % 360;
+        $angle = $angle % 360;
 		
-		$this->font->writeText($this->image, $x, $y, $text, $angle);
-	}
+        $this->font->writeText($this->image, $x, $y, $text, $angle);
+    }
 	
-	/**
-	 * A magic method that allows you to call any PHP function that starts with "image".
-	 * 
-	 * This is a shortcut to call custom functions on the image handle.
-	 * 
-	 * Example:
-	 * <code>
-	 * $img = WideImage::load('pic.jpg');
-	 * $canvas = $img->getCanvas();
-	 * $canvas->filledRect(10, 10, 20, 30, $img->allocateColor(0, 0, 0));
-	 * $canvas->line(60, 80, 30, 100, $img->allocateColor(255, 0, 0));
-	 * </code>
-	 */
-	function __call($method, $params)
-	{
-		if (function_exists('image' . $method)) {
-			array_unshift($params, $this->handle);
-			call_user_func_array('image' . $method, $params);
-		} else {
-			throw new InvalidCanvasMethodException("Function doesn't exist: image{$method}.");
-		}
-	}
+    /**
+     * A magic method that allows you to call any PHP function that starts with "image".
+     * 
+     * This is a shortcut to call custom functions on the image handle.
+     * 
+     * Example:
+     * <code>
+     * $img = WideImage::load('pic.jpg');
+     * $canvas = $img->getCanvas();
+     * $canvas->filledRect(10, 10, 20, 30, $img->allocateColor(0, 0, 0));
+     * $canvas->line(60, 80, 30, 100, $img->allocateColor(255, 0, 0));
+     * </code>
+     */
+    function __call($method, $params)
+    {
+        if (function_exists('image' . $method)) {
+            array_unshift($params, $this->handle);
+            call_user_func_array('image' . $method, $params);
+        } else {
+            throw new InvalidCanvasMethodException("Function doesn't exist: image{$method}.");
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -151,9 +151,9 @@
 	 */
 	function __call($method, $params)
 	{
-		if (function_exists('image' . $method)) {
+		if (function_exists('image'.$method)) {
 			array_unshift($params, $this->handle);
-			call_user_func_array('image' . $method, $params);
+			call_user_func_array('image'.$method, $params);
 		} else {
 			throw new InvalidCanvasMethodException("Function doesn't exist: image{$method}.");
 		}

htdocs/class/libraries/vendor/smottt/wideimage/lib/WideImage/Mapper/GD2.php

Indentation +11 added lines, -12 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/Mappers
-  **/
+     * @package Internal/Mappers
+     **/
 
 namespace WideImage\Mapper;
 
@@ -30,13 +29,13 @@ 
  */
 class GD2
 {
-	public function load($uri)
-	{
-		return @imagecreatefromgd2($uri);
-	}
+    public function load($uri)
+    {
+        return @imagecreatefromgd2($uri);
+    }
 	
-	public function save($handle, $uri = null, $chunk_size = null, $type = null)
-	{
-		return imagegd2($handle, $uri, $chunk_size, $type);
-	}
+    public function save($handle, $uri = null, $chunk_size = null, $type = null)
+    {
+        return imagegd2($handle, $uri, $chunk_size, $type);
+    }
 }

htdocs/class/libraries/vendor/smottt/wideimage/lib/WideImage/Mapper/GD.php

Indentation +14 added lines, -15 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/Mappers
-  **/
+     * @package Internal/Mappers
+     **/
 
 namespace WideImage\Mapper;
 
@@ -30,17 +29,17 @@ 
  */
 class GD
 {
-	public function load($uri)
-	{
-		return @imagecreatefromgd($uri);
-	}
+    public function load($uri)
+    {
+        return @imagecreatefromgd($uri);
+    }
 	
-	public function save($handle, $uri = null)
-	{
-		if ($uri == null) {
-			return imagegd($handle);
-		}
+    public function save($handle, $uri = null)
+    {
+        if ($uri == null) {
+            return imagegd($handle);
+        }
 		
-		return imagegd($handle, $uri);
-	}
+        return imagegd($handle, $uri);
+    }
 }