mambax7 / references

class/wideimage/Canvas.php

Doc Comments +3 added lines

@@ -41,6 +41,9 @@
 		protected $image = null;
 		protected $font = null;
 		
+		/**
+		 * @param WideImage_Image $img
+		 */
 		function __construct($img)
 		{
 			$this->handle = $img->getHandle();

Indentation +4 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 	/**
- * @author Gasper Kozak
- * @copyright 2007, 2008, 2009
+	 * @author Gasper Kozak
+	 * @copyright 2007, 2008, 2009
 
     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 WideImage
-  **/
+	 * @package WideImage
+	 **/
 	
 	/**
 	 * @package Exceptions

Spacing +2 added lines, -2 removed lines

@@ -90,10 +90,10 @@
 		 */
 		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 WideImage_InvalidCanvasMethodException("Function doesn't exist: image{$method}.");

Braces +8 added lines, -6 removed lines

@@ -64,12 +64,14 @@ 
 		 */
 		function writeText($x, $y, $text, $angle = 0)
 		{
-			if ($this->font === null)
-				throw new WideImage_NoFontException("Can't write text without a font.");
+			if ($this->font === null) {
+							throw new WideImage_NoFontException("Can't write text without a font.");
+			}
 			
 			$angle = - floatval($angle);
-			if ($angle < 0)
-				$angle = 360 + $angle;
+			if ($angle < 0) {
+							$angle = 360 + $angle;
+			}
 			$angle = $angle % 360;
 			
 			$this->font->writeText($this->image, $x, $y, $text, $angle);
@@ -94,9 +96,9 @@ 
 			{
 				array_unshift($params, $this->handle);
 				call_user_func_array('image' . $method, $params);
+			} else {
+							throw new WideImage_InvalidCanvasMethodException("Function doesn't exist: image{$method}.");
 			}
-			else
-				throw new WideImage_InvalidCanvasMethodException("Function doesn't exist: image{$method}.");
 		}
 	}
 ?>
\ No newline at end of file

class/wideimage/Coordinate.php

Doc Comments +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 		 * Parses a numeric or string representation of a corrdinate into a structure
 		 * 
 		 * @param string $coord Smart coordinate
-		 * @return array Parsed smart coordinate
+		 * @return integer Parsed smart coordinate
 		 */
 		static function parse($coord)
 		{

Indentation +4 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 	/**
- * @author Gasper Kozak
- * @copyright 2007, 2008, 2009
+	 * @author Gasper Kozak
+	 * @copyright 2007, 2008, 2009
 
     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 Internals
-  **/
+	 * @package Internals
+	 **/
 	
 	
 	/**

Spacing +3 added lines, -3 removed lines

@@ -56,14 +56,14 @@ 
 			{
 				if ($match[1] == '')
 					$match[1] = '+';
-				return array('type' => 'abs', 'value' => $match[1] . $match[3]);
+				return array('type' => 'abs', 'value' => $match[1].$match[3]);
 			}
 			
 			if (preg_match("/^([+-])?(\s+)?({$comp_regex})(\s+)?([+-])(\s+)?({$comp_regex})$/", $coord, $match))
 			{
 				if ($match[1] == '')
 					$match[1] = '+';
-				return array('type' => 'cal', 'pivot' => $match[1] . $match[3], 'value' => $match[5] . $match[7]);
+				return array('type' => 'cal', 'pivot' => $match[1].$match[3], 'value' => $match[5].$match[7]);
 			}
 		}
 		
@@ -79,7 +79,7 @@ 
 			$comp_regex = implode('|', self::$coord_regex);
 			if (preg_match("/^([+-])?({$comp_regex})$/", $coord, $matches))
 			{
-				$sign = intval($matches[1] . "1");
+				$sign = intval($matches[1]."1");
 				$val = $matches[2];
 				if (substr($val, -1) === '%')
 					return intval(round($sign * $dim * floatval(str_replace('%', '', $val)) / 100));

Braces +38 added lines, -28 removed lines

@@ -47,22 +47,25 @@ 
 		{
 			$coord = trim($coord);
 			
-			if (strlen($coord) == 0)
-				return array('type' => 'abs', 'value' => '+0');
+			if (strlen($coord) == 0) {
+							return array('type' => 'abs', 'value' => '+0');
+			}
 			
 			$comp_regex = implode('|', self::$coord_regex);
 			
 			if (preg_match("/^([+-])?(\s+)?({$comp_regex})$/", $coord, $match))
 			{
-				if ($match[1] == '')
-					$match[1] = '+';
+				if ($match[1] == '') {
+									$match[1] = '+';
+				}
 				return array('type' => 'abs', 'value' => $match[1] . $match[3]);
 			}
 			
 			if (preg_match("/^([+-])?(\s+)?({$comp_regex})(\s+)?([+-])(\s+)?({$comp_regex})$/", $coord, $match))
 			{
-				if ($match[1] == '')
-					$match[1] = '+';
+				if ($match[1] == '') {
+									$match[1] = '+';
+				}
 				return array('type' => 'cal', 'pivot' => $match[1] . $match[3], 'value' => $match[5] . $match[7]);
 			}
 		}
@@ -81,10 +84,11 @@ 
 			{
 				$sign = intval($matches[1] . "1");
 				$val = $matches[2];
-				if (substr($val, -1) === '%')
-					return intval(round($sign * $dim * floatval(str_replace('%', '', $val)) / 100));
-				else
-					return $sign * intval(round($val));
+				if (substr($val, -1) === '%') {
+									return intval(round($sign * $dim * floatval(str_replace('%', '', $val)) / 100));
+				} else {
+									return $sign * intval(round($val));
+				}
 			}
 		}
 		
@@ -99,14 +103,14 @@ 
 		static function fix($dim, $value, $clip = false)
 		{
 			$coord = self::parse($value);
-			if ($coord === null)
-				throw new WideImage_InvalidCoordinateException("Couldn't parse coordinate '$value' properly.");
+			if ($coord === null) {
+							throw new WideImage_InvalidCoordinateException("Couldn't parse coordinate '$value' properly.");
+			}
 			
 			if ($coord['type'] === 'abs')
 			{
 				$result = self::evaluate($coord['value'], $dim);
-			}
-			elseif ($coord['type'] === 'cal')
+			} elseif ($coord['type'] === 'cal')
 			{
 				$p = self::evaluate($coord['pivot'], $dim);
 				$v = self::evaluate($coord['value'], $dim);
@@ -115,10 +119,11 @@ 
 			
 			if ($clip)
 			{
-				if ($result < 0)
-					return 0;
-				elseif ($result >= $dim)
-					return $dim;
+				if ($result < 0) {
+									return 0;
+				} elseif ($result >= $dim) {
+									return $dim;
+				}
 			}
 			return $result;
 		}
@@ -133,20 +138,25 @@ 
 		 */
 		static function fixForResize($img, $width, $height)
 		{
-			if ($width === null && $height === null)
-				return array($img->getWidth(), $img->getHeight());
+			if ($width === null && $height === null) {
+							return array($img->getWidth(), $img->getHeight());
+			}
 			
-			if ($width !== null)
-				$width = self::fix($img->getWidth(), $width);
+			if ($width !== null) {
+							$width = self::fix($img->getWidth(), $width);
+			}
 			
-			if ($height !== null)
-				$height = self::fix($img->getHeight(), $height);
+			if ($height !== null) {
+							$height = self::fix($img->getHeight(), $height);
+			}
 			
-			if ($width === null)
-				$width = floor($img->getWidth() * $height / $img->getHeight());
+			if ($width === null) {
+							$width = floor($img->getWidth() * $height / $img->getHeight());
+			}
 			
-			if ($height === null)
-				$height = floor($img->getHeight() * $width / $img->getWidth());
+			if ($height === null) {
+							$height = floor($img->getHeight() * $width / $img->getWidth());
+			}
 			
 			return array($width, $height);
 		}

class/wideimage/Image.php

Doc Comments +8 added lines, -6 removed lines

@@ -159,7 +159,7 @@ 
 		/**
 		 * Output a header to browser.
 		 * 
-		 * @param $name Name of the header
+		 * @param string $name Name of the header
 		 * @param $data Data
 		 */
 		protected function writeHeader($name, $data)
@@ -348,7 +348,7 @@ 
 		 * Copies transparency information from $sourceImage. Optionally fills
 		 * the image with the transparent color at (0, 0).
 		 * 
-		 * @param object $sourceImage
+		 * @param WideImage_Image $sourceImage
 		 * @param bool $fill True if you want to fill the image with transparent color
 		 */
 		function copyTransparencyFrom($sourceImage, $fill = true)
@@ -425,6 +425,8 @@ 
 		 * @var mixed $height The new height (smart coordinate), or null.
 		 * @var string $fit 'inside', 'outside', 'fill'
 		 * @var string $scale 'down', 'up', 'any'
+		 * @param integer $width
+		 * @param integer $height
 		 * @return WideImage_Image resized image
 		 */
 		function resize($width = null, $height = null, $fit = 'inside', $scale = 'any')
@@ -479,8 +481,8 @@ 
 		 * Hint: if the overlay is a truecolor image with alpha channel, you should leave $pct at 100.
 		 * 
 		 * @param WideImage_Image $overlay The overlay image
-		 * @param mixed $left Left position of the overlay, smart coordinate
-		 * @param mixed $top Top position of the overlay, smart coordinate
+		 * @param integer $left Left position of the overlay, smart coordinate
+		 * @param integer $top Top position of the overlay, smart coordinate
 		 * @param int $pct The opacity of the overlay
 		 * @return WideImage_Image The merged image
 		 */
@@ -496,8 +498,8 @@ 
 		 * and white is fully opaque.
 		 * 
 		 * @param WideImage_Image $mask The mask image, greyscale
-		 * @param mixed $left Left coordinate, smart coordinate
-		 * @param mixed $top Top coordinate, smart coordinate
+		 * @param integer $left Left coordinate, smart coordinate
+		 * @param integer $top Top coordinate, smart coordinate
 		 * @return WideImage_Image The resulting image
 		 **/
 		function applyMask($mask, $left = 0, $top = 0)

Indentation +4 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 	/**
- * @author Gasper Kozak
- * @copyright 2007, 2008, 2009
+	 * @author Gasper Kozak
+	 * @copyright 2007, 2008, 2009
 
     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 WideImage
-  **/
+	 * @package WideImage
+	 **/
 	
 	/**
 	 * Thrown when an invalid dimension is passed for some operations

Spacing +1 added lines, -1 removed lines

@@ -164,7 +164,7 @@
 		 */
 		protected function writeHeader($name, $data)
 		{
-			header($name . ": " . $data);
+			header($name.": ".$data);
 		}
 		
 		/**

Braces +34 added lines, -26 removed lines

@@ -83,8 +83,9 @@ 
 		 */
 		function destroy()
 		{
-			if ($this->isValid() && !$this->handleReleased)
-				imagedestroy($this->handle);
+			if ($this->isValid() && !$this->handleReleased) {
+							imagedestroy($this->handle);
+			}
 			
 			$this->handle = null;
 		}
@@ -210,10 +211,11 @@ 
 		 */
 		function allocateColor($R, $G = null, $B = null)
 		{
-			if (is_array($R))
-				return imageColorAllocate($this->handle, $R['red'], $R['green'], $R['blue']);
-			else
-				return imageColorAllocate($this->handle, $R, $G, $B);
+			if (is_array($R)) {
+							return imageColorAllocate($this->handle, $R['red'], $R['green'], $R['blue']);
+			} else {
+							return imageColorAllocate($this->handle, $R, $G, $B);
+			}
 		}
 		
 		/**
@@ -321,10 +323,11 @@ 
 		 */
 		function getClosestColor($R, $G = null, $B = null)
 		{
-			if (is_array($R))
-				return imagecolorclosest($this->handle, $R['red'], $R['green'], $R['blue']);
-			else
-				return imagecolorclosest($this->handle, $R, $G, $B);
+			if (is_array($R)) {
+							return imagecolorclosest($this->handle, $R['red'], $R['green'], $R['blue']);
+			} else {
+							return imagecolorclosest($this->handle, $R, $G, $B);
+			}
 		}
 		
 		/**
@@ -338,10 +341,11 @@ 
 		 */
 		function getExactColor($R, $G = null, $B = null)
 		{
-			if (is_array($R))
-				return imagecolorexact($this->handle, $R['red'], $R['green'], $R['blue']);
-			else
-				return imagecolorexact($this->handle, $R, $G, $B);
+			if (is_array($R)) {
+							return imagecolorexact($this->handle, $R['red'], $R['green'], $R['blue']);
+			} else {
+							return imagecolorexact($this->handle, $R, $G, $B);
+			}
 		}
 		
 		/**
@@ -358,8 +362,9 @@ 
 				$rgba = $sourceImage->getTransparentColorRGB();
 				$color = $this->allocateColor($rgba);
 				$this->setTransparentColor($color);
-				if ($fill)
-					$this->fill(0, 0, $color);
+				if ($fill) {
+									$this->fill(0, 0, $color);
+				}
 			}
 		}
 		
@@ -591,10 +596,11 @@ 
 		 */
 		function asNegative()
 		{
-			if ($this instanceof WideImage_PaletteImage && $this->isTransparent())
-				$trgb = $this->getTransparentColorRGB();
-			else
-				$trgb = null;
+			if ($this instanceof WideImage_PaletteImage && $this->isTransparent()) {
+							$trgb = $this->getTransparentColorRGB();
+			} else {
+							$trgb = null;
+			}
 			
 			$img = $this->getOperation('ApplyFilter')->execute($this, IMG_FILTER_NEGATE);
 			
@@ -689,10 +695,11 @@ 
 		 */
 		function __toString()
 		{
-			if ($this->isTransparent())
-				return $this->asString('gif');
-			else
-				return $this->asString('png');
+			if ($this->isTransparent()) {
+							return $this->asString('gif');
+			} else {
+							return $this->asString('png');
+			}
 		}
 		
 		/**
@@ -739,8 +746,9 @@ 
 		 **/
 		function getCanvas()
 		{
-			if ($this->canvas == null)
-				$this->canvas = new WideImage_Canvas($this);
+			if ($this->canvas == null) {
+							$this->canvas = new WideImage_Canvas($this);
+			}
 			return $this->canvas;
 		}
 		

class/wideimage/MapperFactory.php

Doc Comments +7 added lines

@@ -78,6 +78,10 @@ 
 			throw new WideImage_UnsupportedFormatException("Format '{$format}' is not supported.");
 		}
 		
+		/**
+		 * @param string $uri
+		 * @param string $format
+		 */
 		static function determineFormat($uri, $format = null)
 		{
 			if ($format == null)
@@ -98,6 +102,9 @@ 
 			return $format;
 		}
 		
+		/**
+		 * @param string $format
+		 */
 		static function mimeType($format)
 		{
 			return array_search(strtoupper($format), self::$mimeTable);

Indentation +4 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 	/**
- * @author Gasper Kozak
- * @copyright 2007, 2008, 2009
+	 * @author Gasper Kozak
+	 * @copyright 2007, 2008, 2009
 
     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 WideImage
-  **/
+	 * @package WideImage
+	 **/
 	
 	/**
 	 * Thrown when image format isn't supported

Spacing +2 added lines, -2 removed lines

@@ -61,10 +61,10 @@
 			if (array_key_exists($format, self::$mappers))
 				return self::$mappers[$format];
 			
-			$mapperClassName = 'WideImage_Mapper_' . $format;
+			$mapperClassName = 'WideImage_Mapper_'.$format;
 			if (!class_exists($mapperClassName, false))
 			{
-				$mapperFileName = WideImage::path() . 'Mapper/' . $format . '.php';
+				$mapperFileName = WideImage::path().'Mapper/'.$format.'.php';
 				if (file_exists($mapperFileName))
 					require_once($mapperFileName);
 			}

Braces +20 added lines, -14 removed lines

@@ -58,15 +58,17 @@ 
 		{
 			$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;
 			if (!class_exists($mapperClassName, false))
 			{
 				$mapperFileName = WideImage::path() . 'Mapper/' . $format . '.php';
-				if (file_exists($mapperFileName))
-					require_once($mapperFileName);
+				if (file_exists($mapperFileName)) {
+									require_once($mapperFileName);
+				}
 			}
 			
 			if (class_exists($mapperClassName, false))
@@ -80,20 +82,23 @@ 
 		
 		static function determineFormat($uri, $format = null)
 		{
-			if ($format == null)
-				$format = self::extractExtension($uri);
+			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)]))
+			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';
+			if ($format == 'JPG') {
+							$format = 'JPEG';
+			}
 			
 			return $format;
 		}
@@ -106,10 +111,11 @@ 
 		static function extractExtension($uri)
 		{
 			$p = strrpos($uri, '.');
-			if ($p === false)
-				return '';
-			else
-				return substr($uri, $p + 1);
+			if ($p === false) {
+							return '';
+			} else {
+							return substr($uri, $p + 1);
+			}
 		}
 	}
 ?>
\ No newline at end of file

class/wideimage/Operation/ApplyMask.php

Doc Comments +2 added lines, -2 removed lines

@@ -34,8 +34,8 @@
 		 *
 		 * @param WideImage_Image $image
 		 * @param WideImage_Image $mask
-		 * @param smart_coordinate $left
-		 * @param smart_coordinate $top
+		 * @param integer $left
+		 * @param integer $top
 		 * @return WideImage_Image
 		 */
 		function execute($image, $mask, $left = 0, $top = 0)

Indentation +4 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 	/**
- * @author Gasper Kozak
- * @copyright 2007, 2008, 2009
+	 * @author Gasper Kozak
+	 * @copyright 2007, 2008, 2009
 
     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
+	 **/
 	
 	/**
 	 * ApplyMask operation class

Braces +27 added lines, -21 removed lines

@@ -44,12 +44,14 @@ 
 			$top = WideImage_Coordinate::fix($image->getHeight(), $top);
 			
 			$width = $image->getWidth();
-			if ($width > $mask->getWidth())
-				$width = $mask->getWidth();
+			if ($width > $mask->getWidth()) {
+							$width = $mask->getWidth();
+			}
 			
 			$height = $image->getHeight();
-			if ($height > $mask->getHeight())
-				$height = $mask->getHeight();
+			if ($height > $mask->getHeight()) {
+							$height = $mask->getHeight();
+			}
 			
 			$result = $image->asTrueColor();
 			$result->alphaBlending(false);
@@ -62,34 +64,38 @@ 
 				$trgb['alpha'] = 127;
 				$destTransparentColor = $result->allocateColorAlpha($trgb);
 				$result->setTransparentColor($destTransparentColor);
+			} else {
+							$destTransparentColor = $result->allocateColorAlpha(255, 255, 255, 127);
 			}
-			else
-				$destTransparentColor = $result->allocateColorAlpha(255, 255, 255, 127);
 			
-			for ($x = 0; $x < $width; $x++)
-				for ($y = 0; $y < $height; $y++)
-					if ($left + $x < $image->getWidth() && $top + $y < $image->getHeight())
+			for ($x = 0; $x < $width; $x++) {
+							for ($y = 0;
+			}
+			$y < $height; $y++) {
+									if ($left + $x < $image->getWidth() && $top + $y < $image->getHeight())
 					{
 						$srcColor = $image->getColorAt($left + $x, $top + $y);
-						if ($srcColor == $srcTransparentColor)
-							$destColor = $destTransparentColor;
-						else
+				}
+						if ($srcColor == $srcTransparentColor) {
+													$destColor = $destTransparentColor;
+						} else
 						{
 							$maskRGB = $mask->getRGBAt($x, $y);
-							if ($maskRGB['red'] == 0)
-								$destColor = $destTransparentColor;
-							elseif ($srcColor >= 0)
+							if ($maskRGB['red'] == 0) {
+															$destColor = $destTransparentColor;
+							} elseif ($srcColor >= 0)
 							{
 								$imageRGB = $image->getRGBAt($left + $x, $top + $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);
+								if ($imageRGB['alpha'] == 127) {
+																	$destColor = $destTransparentColor;
+								} else {
+																	$destColor = $result->allocateColorAlpha($imageRGB);
+								}
+							} else {
+															$destColor = $destTransparentColor;
 							}
-							else
-								$destColor = $destTransparentColor;
 						}
 						$result->setColorAt($left + $x, $top + $y, $destColor);
 					}

class/wideimage/OperationFactory.php

Doc Comments +3 added lines

@@ -36,6 +36,9 @@
 	{
 		static protected $cache = array();
 		
+		/**
+		 * @param string $operationName
+		 */
 		static function get($operationName)
 		{
 			if (!isset(self::$cache[$operationName]))

Indentation +4 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 	/**
- * @author Gasper Kozak
- * @copyright 2007, 2008, 2009
+	 * @author Gasper Kozak
+	 * @copyright 2007, 2008, 2009
 
     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 Internals
-  **/
+	 * @package Internals
+	 **/
 	
 	/**
 	 * @package Exceptions

Spacing +2 added lines, -2 removed lines

@@ -40,10 +40,10 @@
 		{
 			if (!isset(self::$cache[$operationName]))
 			{
-				$opClassName = "WideImage_Operation_" . $operationName;
+				$opClassName = "WideImage_Operation_".$operationName;
 				if (!class_exists($opClassName, false))
 				{
-					$fileName = WideImage::path() . 'Operation/' . $operationName . '.php';
+					$fileName = WideImage::path().'Operation/'.$operationName.'.php';
 					if (file_exists($fileName))
 						require_once($fileName);
 					else

Braces +5 added lines, -4 removed lines

@@ -44,10 +44,11 @@
 				if (!class_exists($opClassName, false))
 				{
 					$fileName = WideImage::path() . 'Operation/' . $operationName . '.php';
-					if (file_exists($fileName))
-						require_once($fileName);
-					else
-						throw new WideImage_UnknownImageOperationException("Can't load '{$operationName}' operation.");
+					if (file_exists($fileName)) {
+											require_once($fileName);
+					} else {
+											throw new WideImage_UnknownImageOperationException("Can't load '{$operationName}' operation.");
+					}
 				}
 				self::$cache[$operationName] = new $opClassName();
 			}

class/wideimage/vendor/JPEXS/bmp.php

Doc Comments +16 added lines, -1 removed lines

@@ -34,7 +34,7 @@ 
  * @param resource $img Image resource to convert
  * @param string $file File to save image to. If ommited or "", file is written to standard output
  * @param boolean $useRLE When true, file will be saved with RLE compression (EXPERIMENTAL)
- * @return boolean True when successfully writen to specified file
+ * @return resource|null True when successfully writen to specified file
  */
 function imagebmp($img,$file="",$useRLE=false)
 {
@@ -461,6 +461,9 @@ 
 };
 
 
+/**
+ * @param resource $f
+ */
 function jpexs_freadlngint($f)
 {
 	return jpexs_freaddword($f);
@@ -475,6 +478,9 @@ 
 
 
 
+/**
+ * @param integer $byte
+ */
 function jpexs_retBits($byte,$start,$len)
 {
 	$bin=jpexs_decbin8($byte);
@@ -486,6 +492,9 @@ 
 
 
 $jpexs_CurrentBit=0;
+/**
+ * @param resource $f
+ */
 function jpexs_freadbits($f,$count)
 {
 	global $jpexs_CurrentBit,$SMode;
@@ -509,6 +518,9 @@ 
 {
 	return chr($n & 255).chr(($n >> 8) & 255).chr(($n >> 16) & 255).chr(($n >> 24) & 255);
 }
+/**
+ * @param integer $n
+ */
 function jpexs_int_to_word($n)
 {
 	return chr($n & 255).chr(($n >> 8) & 255);
@@ -520,6 +532,9 @@ 
 	return jpexs_decbinx($d,8);
 };
 
+/**
+ * @param integer $n
+ */
 function jpexs_decbinx($d,$n)
 {
 	$bin=decbin($d);

Spacing +233 added lines, -233 removed lines

@@ -36,165 +36,165 @@ 
  * @param boolean $useRLE When true, file will be saved with RLE compression (EXPERIMENTAL)
  * @return boolean True when successfully writen to specified file
  */
-function imagebmp($img,$file="",$useRLE=false)
+function imagebmp($img, $file = "", $useRLE = false)
 {
 
 
-	$ColorCount=imagecolorstotal($img);
+	$ColorCount = imagecolorstotal($img);
 
-	$Transparent=imagecolortransparent($img);
-	$IsTransparent=$Transparent!=-1;
+	$Transparent = imagecolortransparent($img);
+	$IsTransparent = $Transparent != -1;
 
 
-	if($IsTransparent) $ColorCount--;
+	if ($IsTransparent) $ColorCount--;
 
-	if($ColorCount==0) {$ColorCount=0; $BitCount=24; $palsize = 0; };
-	if(($ColorCount>0)and($ColorCount<=2)) {$ColorCount=2; $BitCount=1;};
-	if(($ColorCount>2)and($ColorCount<=16)) { $ColorCount=16; $BitCount=4;};
-	if(($ColorCount>16)and($ColorCount<=256)) { $ColorCount=0; $BitCount=8;};
+	if ($ColorCount == 0) {$ColorCount = 0; $BitCount = 24; $palsize = 0; };
+	if (($ColorCount > 0) and ($ColorCount <= 2)) {$ColorCount = 2; $BitCount = 1; };
+	if (($ColorCount > 2) and ($ColorCount <= 16)) { $ColorCount = 16; $BitCount = 4; };
+	if (($ColorCount > 16) and ($ColorCount <= 256)) { $ColorCount = 0; $BitCount = 8; };
 	
-	$Width=imagesx($img);
-	$Height=imagesy($img);
+	$Width = imagesx($img);
+	$Height = imagesy($img);
 
-	$Zbytek=(4-($Width/(8/$BitCount))%4)%4;
+	$Zbytek = (4 - ($Width / (8 / $BitCount)) % 4) % 4;
 
-	if($BitCount<24) $palsize=pow(2,$BitCount)*4;
+	if ($BitCount < 24) $palsize = pow(2, $BitCount) * 4;
 
-	$size=(floor($Width/(8/$BitCount))+$Zbytek)*$Height+54;
-	$size+=$palsize;
-	$offset=54+$palsize;
+	$size = (floor($Width / (8 / $BitCount)) + $Zbytek) * $Height + 54;
+	$size += $palsize;
+	$offset = 54 + $palsize;
 
 	// Bitmap File Header
-	$ret = 'BM';                        // header (2b)
-	$ret .= jpexs_int_to_dword($size);        // size of file (4b)
-	$ret .= jpexs_int_to_dword(0);        // reserved (4b)
-	$ret .= jpexs_int_to_dword($offset);        // byte location in the file which is first byte of IMAGE (4b)
+	$ret = 'BM'; // header (2b)
+	$ret .= jpexs_int_to_dword($size); // size of file (4b)
+	$ret .= jpexs_int_to_dword(0); // reserved (4b)
+	$ret .= jpexs_int_to_dword($offset); // byte location in the file which is first byte of IMAGE (4b)
 	// Bitmap Info Header
-	$ret .= jpexs_int_to_dword(40);        // Size of BITMAPINFOHEADER (4b)
-	$ret .= jpexs_int_to_dword($Width);        // width of bitmap (4b)
-	$ret .= jpexs_int_to_dword($Height);        // height of bitmap (4b)
-	$ret .= jpexs_int_to_word(1);        // biPlanes = 1 (2b)
-	$ret .= jpexs_int_to_word($BitCount);        // biBitCount = {1 (mono) or 4 (16 clr ) or 8 (256 clr) or 24 (16 Mil)} (2b)
-	$ret .= jpexs_int_to_dword($useRLE);        // RLE COMPRESSION (4b)
-	$ret .= jpexs_int_to_dword(0);        // width x height (4b)
-	$ret .= jpexs_int_to_dword(0);        // biXPelsPerMeter (4b)
-	$ret .= jpexs_int_to_dword(0);        // biYPelsPerMeter (4b)
-	$ret .= jpexs_int_to_dword(0);        // Number of palettes used (4b)
-	$ret .= jpexs_int_to_dword(0);        // Number of important colour (4b)
+	$ret .= jpexs_int_to_dword(40); // Size of BITMAPINFOHEADER (4b)
+	$ret .= jpexs_int_to_dword($Width); // width of bitmap (4b)
+	$ret .= jpexs_int_to_dword($Height); // height of bitmap (4b)
+	$ret .= jpexs_int_to_word(1); // biPlanes = 1 (2b)
+	$ret .= jpexs_int_to_word($BitCount); // biBitCount = {1 (mono) or 4 (16 clr ) or 8 (256 clr) or 24 (16 Mil)} (2b)
+	$ret .= jpexs_int_to_dword($useRLE); // RLE COMPRESSION (4b)
+	$ret .= jpexs_int_to_dword(0); // width x height (4b)
+	$ret .= jpexs_int_to_dword(0); // biXPelsPerMeter (4b)
+	$ret .= jpexs_int_to_dword(0); // biYPelsPerMeter (4b)
+	$ret .= jpexs_int_to_dword(0); // Number of palettes used (4b)
+	$ret .= jpexs_int_to_dword(0); // Number of important colour (4b)
 	// image data
 	
 	$retd = "";
 	
-	$CC=$ColorCount;
-	$sl1=strlen($ret);
-	if($CC==0) $CC=256;
-	if($BitCount<24)
+	$CC = $ColorCount;
+	$sl1 = strlen($ret);
+	if ($CC == 0) $CC = 256;
+	if ($BitCount < 24)
 	{
-		$ColorTotal=imagecolorstotal($img);
-		if($IsTransparent) $ColorTotal--;
+		$ColorTotal = imagecolorstotal($img);
+		if ($IsTransparent) $ColorTotal--;
 
-		for($p=0;$p<$ColorTotal;$p++)
+		for ($p = 0; $p < $ColorTotal; $p++)
 		{
-			$color=imagecolorsforindex($img,$p);
-			$ret.=jpexs_inttobyte($color["blue"]);
-			$ret.=jpexs_inttobyte($color["green"]);
-			$ret.=jpexs_inttobyte($color["red"]);
-			$ret.=jpexs_inttobyte(0); //RESERVED
+			$color = imagecolorsforindex($img, $p);
+			$ret .= jpexs_inttobyte($color["blue"]);
+			$ret .= jpexs_inttobyte($color["green"]);
+			$ret .= jpexs_inttobyte($color["red"]);
+			$ret .= jpexs_inttobyte(0); //RESERVED
 		};
 
-		$CT=$ColorTotal;
-		for($p=$ColorTotal;$p<$CC;$p++)
+		$CT = $ColorTotal;
+		for ($p = $ColorTotal; $p < $CC; $p++)
 		{
-			$ret.=jpexs_inttobyte(0);
-			$ret.=jpexs_inttobyte(0);
-			$ret.=jpexs_inttobyte(0);
-			$ret.=jpexs_inttobyte(0); //RESERVED
+			$ret .= jpexs_inttobyte(0);
+			$ret .= jpexs_inttobyte(0);
+			$ret .= jpexs_inttobyte(0);
+			$ret .= jpexs_inttobyte(0); //RESERVED
 		};
 	};
 
 
-	if($BitCount<=8)
+	if ($BitCount <= 8)
 	{
 
-		for($y=$Height-1;$y>=0;$y--)
+		for ($y = $Height - 1; $y >= 0; $y--)
 		{
-			$bWrite="";
-			for($x=0;$x<$Width;$x++)
+			$bWrite = "";
+			for ($x = 0; $x < $Width; $x++)
 			{
-				$color=imagecolorat($img,$x,$y);
-				$bWrite.=jpexs_decbinx($color,$BitCount);
-				if(strlen($bWrite)==8)
+				$color = imagecolorat($img, $x, $y);
+				$bWrite .= jpexs_decbinx($color, $BitCount);
+				if (strlen($bWrite) == 8)
 				{
-					$retd.=jpexs_inttobyte(bindec($bWrite));
-					$bWrite="";
+					$retd .= jpexs_inttobyte(bindec($bWrite));
+					$bWrite = "";
 				};
 			};
 
-			if((strlen($bWrite)<8)and(strlen($bWrite)!=0))
+			if ((strlen($bWrite) < 8) and (strlen($bWrite) != 0))
 			{
-				$sl=strlen($bWrite);
-				for($t=0;$t<8-$sl;$t++)
-				$sl.="0";
-				$retd.=jpexs_inttobyte(bindec($bWrite));
+				$sl = strlen($bWrite);
+				for ($t = 0; $t < 8 - $sl; $t++)
+				$sl .= "0";
+				$retd .= jpexs_inttobyte(bindec($bWrite));
 			};
-			for($z=0;$z<$Zbytek;$z++)
-			$retd.=jpexs_inttobyte(0);
+			for ($z = 0; $z < $Zbytek; $z++)
+			$retd .= jpexs_inttobyte(0);
 		};
 	};
 
-	if(($useRLE)and($BitCount==8))
+	if (($useRLE) and ($BitCount == 8))
 	{
-		for($t=0;$t<strlen($retd);$t+=4)
+		for ($t = 0; $t < strlen($retd); $t += 4)
 		{
-			if($t!=0)
-			if(($t)%$Width==0)
-			$ret.=chr(0).chr(0);
+			if ($t != 0)
+			if (($t) % $Width == 0)
+			$ret .= chr(0).chr(0);
 
-			if(($t+5)%$Width==0)
+			if (($t + 5) % $Width == 0)
 			{
-				$ret.=chr(0).chr(5).substr($retd,$t,5).chr(0);
-				$t+=1;
+				$ret .= chr(0).chr(5).substr($retd, $t, 5).chr(0);
+				$t += 1;
 			}
-			if(($t+6)%$Width==0)
+			if (($t + 6) % $Width == 0)
 			{
-				$ret.=chr(0).chr(6).substr($retd,$t,6);
-				$t+=2;
+				$ret .= chr(0).chr(6).substr($retd, $t, 6);
+				$t += 2;
 			}
 			else
 			{
-				$ret.=chr(0).chr(4).substr($retd,$t,4);
+				$ret .= chr(0).chr(4).substr($retd, $t, 4);
 			};
 		};
-		$ret.=chr(0).chr(1);
+		$ret .= chr(0).chr(1);
 	}
 	else
 	{
-		$ret.=$retd;
+		$ret .= $retd;
 	};
 
 	$Dopl = "";
-	if($BitCount==24)
+	if ($BitCount == 24)
 	{
-		for($z=0;$z<$Zbytek;$z++)
-		$Dopl.=chr(0);
+		for ($z = 0; $z < $Zbytek; $z++)
+		$Dopl .= chr(0);
 
-		for($y=$Height-1;$y>=0;$y--)
+		for ($y = $Height - 1; $y >= 0; $y--)
 		{
-			for($x=0;$x<$Width;$x++)
+			for ($x = 0; $x < $Width; $x++)
 			{
-				$color=imagecolorsforindex($img,ImageColorAt($img,$x,$y));
-				$ret.=chr($color["blue"]).chr($color["green"]).chr($color["red"]);
+				$color = imagecolorsforindex($img, ImageColorAt($img, $x, $y));
+				$ret .= chr($color["blue"]).chr($color["green"]).chr($color["red"]);
 			}
-			$ret.=$Dopl;
+			$ret .= $Dopl;
 		};
 
 	};
 
-	if($file!="")
+	if ($file != "")
 	{
-		$r=($f=fopen($file,"w"));
-		$r=$r and fwrite($f,$ret);
-		$r=$r and fclose($f);
+		$r = ($f = fopen($file, "w"));
+		$r = $r and fwrite($f, $ret);
+		$r = $r and fclose($f);
 		return $r;
 	}
 	else
@@ -218,58 +218,58 @@ 
 {
 	global  $jpexs_CurrentBit;
 
-	$f=fopen($file,"r");
-	$Header=fread($f,2);
+	$f = fopen($file, "r");
+	$Header = fread($f, 2);
 
-	if($Header=="BM")
+	if ($Header == "BM")
 	{
-		$Size=jpexs_freaddword($f);
-		$Reserved1=jpexs_freadword($f);
-		$Reserved2=jpexs_freadword($f);
-		$FirstByteOfImage=jpexs_freaddword($f);
-
-		$SizeBITMAPINFOHEADER=jpexs_freaddword($f);
-		$Width=jpexs_freaddword($f);
-		$Height=jpexs_freaddword($f);
-		$biPlanes=jpexs_freadword($f);
-		$biBitCount=jpexs_freadword($f);
-		$RLECompression=jpexs_freaddword($f);
-		$WidthxHeight=jpexs_freaddword($f);
-		$biXPelsPerMeter=jpexs_freaddword($f);
-		$biYPelsPerMeter=jpexs_freaddword($f);
-		$NumberOfPalettesUsed=jpexs_freaddword($f);
-		$NumberOfImportantColors=jpexs_freaddword($f);
-
-		if($biBitCount<24)
+		$Size = jpexs_freaddword($f);
+		$Reserved1 = jpexs_freadword($f);
+		$Reserved2 = jpexs_freadword($f);
+		$FirstByteOfImage = jpexs_freaddword($f);
+
+		$SizeBITMAPINFOHEADER = jpexs_freaddword($f);
+		$Width = jpexs_freaddword($f);
+		$Height = jpexs_freaddword($f);
+		$biPlanes = jpexs_freadword($f);
+		$biBitCount = jpexs_freadword($f);
+		$RLECompression = jpexs_freaddword($f);
+		$WidthxHeight = jpexs_freaddword($f);
+		$biXPelsPerMeter = jpexs_freaddword($f);
+		$biYPelsPerMeter = jpexs_freaddword($f);
+		$NumberOfPalettesUsed = jpexs_freaddword($f);
+		$NumberOfImportantColors = jpexs_freaddword($f);
+
+		if ($biBitCount < 24)
 		{
-			$img=imagecreate($Width,$Height);
-			$Colors=pow(2,$biBitCount);
-			for($p=0;$p<$Colors;$p++)
+			$img = imagecreate($Width, $Height);
+			$Colors = pow(2, $biBitCount);
+			for ($p = 0; $p < $Colors; $p++)
 			{
-				$B=jpexs_freadbyte($f);
-				$G=jpexs_freadbyte($f);
-				$R=jpexs_freadbyte($f);
-				$Reserved=jpexs_freadbyte($f);
-				$Palette[]=imagecolorallocate($img,$R,$G,$B);
+				$B = jpexs_freadbyte($f);
+				$G = jpexs_freadbyte($f);
+				$R = jpexs_freadbyte($f);
+				$Reserved = jpexs_freadbyte($f);
+				$Palette[] = imagecolorallocate($img, $R, $G, $B);
 			};
 
 
 
 
-			if($RLECompression==0)
+			if ($RLECompression == 0)
 			{
-				$Zbytek=(4-ceil(($Width/(8/$biBitCount)))%4)%4;
+				$Zbytek = (4 - ceil(($Width / (8 / $biBitCount))) % 4) % 4;
 
-				for($y=$Height-1;$y>=0;$y--)
+				for ($y = $Height - 1; $y >= 0; $y--)
 				{
-					$jpexs_CurrentBit=0;
-					for($x=0;$x<$Width;$x++)
+					$jpexs_CurrentBit = 0;
+					for ($x = 0; $x < $Width; $x++)
 					{
-						$C=jpexs_freadbits($f,$biBitCount);
-						imagesetpixel($img,$x,$y,$Palette[$C]);
+						$C = jpexs_freadbits($f, $biBitCount);
+						imagesetpixel($img, $x, $y, $Palette[$C]);
 					};
-					if($jpexs_CurrentBit!=0) {jpexs_freadbyte($f);};
-					for($g=0;$g<$Zbytek;$g++)
+					if ($jpexs_CurrentBit != 0) {jpexs_freadbyte($f); };
+					for ($g = 0; $g < $Zbytek; $g++)
 					jpexs_freadbyte($f);
 				};
 
@@ -277,149 +277,149 @@ 
 		};
 
 
-		if($RLECompression==1) //$BI_RLE8
+		if ($RLECompression == 1) //$BI_RLE8
 		{
-			$y=$Height;
+			$y = $Height;
 
-			$pocetb=0;
+			$pocetb = 0;
 
-			while(true)
+			while (true)
 			{
 				$y--;
-				$prefix=jpexs_freadbyte($f);
-				$suffix=jpexs_freadbyte($f);
-				$pocetb+=2;
+				$prefix = jpexs_freadbyte($f);
+				$suffix = jpexs_freadbyte($f);
+				$pocetb += 2;
 
-				$echoit=false;
+				$echoit = false;
 
-				if($echoit)echo "Prefix: $prefix Suffix: $suffix<BR>";
-				if(($prefix==0)and($suffix==1)) break;
-				if(feof($f)) break;
+				if ($echoit)echo "Prefix: $prefix Suffix: $suffix<BR>";
+				if (($prefix == 0) and ($suffix == 1)) break;
+				if (feof($f)) break;
 
-				while(!(($prefix==0)and($suffix==0)))
+				while (!(($prefix == 0) and ($suffix == 0)))
 				{
-					if($prefix==0)
+					if ($prefix == 0)
 					{
-						$pocet=$suffix;
-						$Data.=fread($f,$pocet);
-						$pocetb+=$pocet;
-						if($pocetb%2==1) {jpexs_freadbyte($f); $pocetb++;};
+						$pocet = $suffix;
+						$Data .= fread($f, $pocet);
+						$pocetb += $pocet;
+						if ($pocetb % 2 == 1) {jpexs_freadbyte($f); $pocetb++; };
 					};
-					if($prefix>0)
+					if ($prefix > 0)
 					{
-						$pocet=$prefix;
-						for($r=0;$r<$pocet;$r++)
-						$Data.=chr($suffix);
+						$pocet = $prefix;
+						for ($r = 0; $r < $pocet; $r++)
+						$Data .= chr($suffix);
 					};
-					$prefix=jpexs_freadbyte($f);
-					$suffix=jpexs_freadbyte($f);
-					$pocetb+=2;
-					if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
+					$prefix = jpexs_freadbyte($f);
+					$suffix = jpexs_freadbyte($f);
+					$pocetb += 2;
+					if ($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
 				};
 
-				for($x=0;$x<strlen($Data);$x++)
+				for ($x = 0; $x < strlen($Data); $x++)
 				{
-					imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]);
+					imagesetpixel($img, $x, $y, $Palette[ord($Data[$x])]);
 				};
-				$Data="";
+				$Data = "";
 
 			};
 
 		};
 
 
-		if($RLECompression==2) //$BI_RLE4
+		if ($RLECompression == 2) //$BI_RLE4
 		{
-			$y=$Height;
-			$pocetb=0;
+			$y = $Height;
+			$pocetb = 0;
 
 			/*while(!feof($f))
 			 echo freadbyte($f)."_".freadbyte($f)."<BR>";*/
-			while(true)
+			while (true)
 			{
 				//break;
 				$y--;
-				$prefix=jpexs_freadbyte($f);
-				$suffix=jpexs_freadbyte($f);
-				$pocetb+=2;
+				$prefix = jpexs_freadbyte($f);
+				$suffix = jpexs_freadbyte($f);
+				$pocetb += 2;
 
-				$echoit=false;
+				$echoit = false;
 
-				if($echoit)echo "Prefix: $prefix Suffix: $suffix<BR>";
-				if(($prefix==0)and($suffix==1)) break;
-				if(feof($f)) break;
+				if ($echoit)echo "Prefix: $prefix Suffix: $suffix<BR>";
+				if (($prefix == 0) and ($suffix == 1)) break;
+				if (feof($f)) break;
 
-				while(!(($prefix==0)and($suffix==0)))
+				while (!(($prefix == 0) and ($suffix == 0)))
 				{
-					if($prefix==0)
+					if ($prefix == 0)
 					{
-						$pocet=$suffix;
-
-						$jpexs_CurrentBit=0;
-						for($h=0;$h<$pocet;$h++)
-						$Data.=chr(jpexs_freadbits($f,4));
-						if($jpexs_CurrentBit!=0) jpexs_freadbits($f,4);
-						$pocetb+=ceil(($pocet/2));
-						if($pocetb%2==1) {jpexs_freadbyte($f); $pocetb++;};
+						$pocet = $suffix;
+
+						$jpexs_CurrentBit = 0;
+						for ($h = 0; $h < $pocet; $h++)
+						$Data .= chr(jpexs_freadbits($f, 4));
+						if ($jpexs_CurrentBit != 0) jpexs_freadbits($f, 4);
+						$pocetb += ceil(($pocet / 2));
+						if ($pocetb % 2 == 1) {jpexs_freadbyte($f); $pocetb++; };
 					};
-					if($prefix>0)
+					if ($prefix > 0)
 					{
-						$pocet=$prefix;
-						$i=0;
-						for($r=0;$r<$pocet;$r++)
+						$pocet = $prefix;
+						$i = 0;
+						for ($r = 0; $r < $pocet; $r++)
 						{
-							if($i%2==0)
+							if ($i % 2 == 0)
 							{
-								$Data.=chr($suffix%16);
+								$Data .= chr($suffix % 16);
 							}
 							else
 							{
-								$Data.=chr(floor($suffix/16));
+								$Data .= chr(floor($suffix / 16));
 							};
 							$i++;
 						};
 					};
-					$prefix=jpexs_freadbyte($f);
-					$suffix=jpexs_freadbyte($f);
-					$pocetb+=2;
-					if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
+					$prefix = jpexs_freadbyte($f);
+					$suffix = jpexs_freadbyte($f);
+					$pocetb += 2;
+					if ($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
 				};
 
-				for($x=0;$x<strlen($Data);$x++)
+				for ($x = 0; $x < strlen($Data); $x++)
 				{
-					imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]);
+					imagesetpixel($img, $x, $y, $Palette[ord($Data[$x])]);
 				};
-				$Data="";
+				$Data = "";
 
 			};
 
 		};
 
 
-		if($biBitCount==24)
+		if ($biBitCount == 24)
 		{
-			$img=imagecreatetruecolor($Width,$Height);
-			$Zbytek=$Width%4;
+			$img = imagecreatetruecolor($Width, $Height);
+			$Zbytek = $Width % 4;
 
-			for($y=$Height-1;$y>=0;$y--)
+			for ($y = $Height - 1; $y >= 0; $y--)
 			{
-				for($x=0;$x<$Width;$x++)
+				for ($x = 0; $x < $Width; $x++)
 				{
-					$B=jpexs_freadbyte($f);
-					$G=jpexs_freadbyte($f);
-					$R=jpexs_freadbyte($f);
-					$color=imagecolorexact($img,$R,$G,$B);
-					if($color==-1) $color=imagecolorallocate($img,$R,$G,$B);
-					imagesetpixel($img,$x,$y,$color);
+					$B = jpexs_freadbyte($f);
+					$G = jpexs_freadbyte($f);
+					$R = jpexs_freadbyte($f);
+					$color = imagecolorexact($img, $R, $G, $B);
+					if ($color == -1) $color = imagecolorallocate($img, $R, $G, $B);
+					imagesetpixel($img, $x, $y, $color);
 				}
-				for($z=0;$z<$Zbytek;$z++)
+				for ($z = 0; $z < $Zbytek; $z++)
 				jpexs_freadbyte($f);
 			};
 		};
 		return $img;
 
 	}
-	else{
+	else {
 		return false;
 	}
 
@@ -450,14 +450,14 @@ 
 
 function jpexs_freadbyte($f)
 {
-	return ord(fread($f,1));
+	return ord(fread($f, 1));
 };
 
 function jpexs_freadword($f)
 {
-	$b1=jpexs_freadbyte($f);
-	$b2=jpexs_freadbyte($f);
-	return $b2*256+$b1;
+	$b1 = jpexs_freadbyte($f);
+	$b2 = jpexs_freadbyte($f);
+	return $b2 * 256 + $b1;
 };
 
 
@@ -468,64 +468,64 @@ 
 
 function jpexs_freaddword($f)
 {
-	$b1=jpexs_freadword($f);
-	$b2=jpexs_freadword($f);
-	return $b2*65536+$b1;
+	$b1 = jpexs_freadword($f);
+	$b2 = jpexs_freadword($f);
+	return $b2 * 65536 + $b1;
 };
 
 
 
-function jpexs_retBits($byte,$start,$len)
+function jpexs_retBits($byte, $start, $len)
 {
-	$bin=jpexs_decbin8($byte);
-	$r=bindec(substr($bin,$start,$len));
+	$bin = jpexs_decbin8($byte);
+	$r = bindec(substr($bin, $start, $len));
 	return $r;
 
 };
 
 
 
-$jpexs_CurrentBit=0;
-function jpexs_freadbits($f,$count)
+$jpexs_CurrentBit = 0;
+function jpexs_freadbits($f, $count)
 {
-	global $jpexs_CurrentBit,$SMode;
-	$Byte=jpexs_freadbyte($f);
-	$LastCBit=$jpexs_CurrentBit;
-	$jpexs_CurrentBit+=$count;
-	if($jpexs_CurrentBit==8)
+	global $jpexs_CurrentBit, $SMode;
+	$Byte = jpexs_freadbyte($f);
+	$LastCBit = $jpexs_CurrentBit;
+	$jpexs_CurrentBit += $count;
+	if ($jpexs_CurrentBit == 8)
 	{
-		$jpexs_CurrentBit=0;
+		$jpexs_CurrentBit = 0;
 	}
 	else
 	{
-		fseek($f,ftell($f)-1);
+		fseek($f, ftell($f) - 1);
 	};
-	return jpexs_retBits($Byte,$LastCBit,$count);
+	return jpexs_retBits($Byte, $LastCBit, $count);
 };
 
 
 
 function jpexs_int_to_dword($n)
 {
-	return chr($n & 255).chr(($n >> 8) & 255).chr(($n >> 16) & 255).chr(($n >> 24) & 255);
+	return chr($n&255).chr(($n >> 8)&255).chr(($n >> 16)&255).chr(($n >> 24)&255);
 }
 function jpexs_int_to_word($n)
 {
-	return chr($n & 255).chr(($n >> 8) & 255);
+	return chr($n&255).chr(($n >> 8)&255);
 }
 
 
 function jpexs_decbin8($d)
 {
-	return jpexs_decbinx($d,8);
+	return jpexs_decbinx($d, 8);
 };
 
-function jpexs_decbinx($d,$n)
+function jpexs_decbinx($d, $n)
 {
-	$bin=decbin($d);
-	$sbin=strlen($bin);
-	for($j=0;$j<$n-$sbin;$j++)
-	$bin="0$bin";
+	$bin = decbin($d);
+	$sbin = strlen($bin);
+	for ($j = 0; $j < $n - $sbin; $j++)
+	$bin = "0$bin";
 	return $bin;
 };
 

Braces +81 added lines, -46 removed lines

@@ -46,7 +46,9 @@ 
 	$IsTransparent=$Transparent!=-1;
 
 
-	if($IsTransparent) $ColorCount--;
+	if($IsTransparent) {
+		$ColorCount--;
+	}
 
 	if($ColorCount==0) {$ColorCount=0; $BitCount=24; $palsize = 0; };
 	if(($ColorCount>0)and($ColorCount<=2)) {$ColorCount=2; $BitCount=1;};
@@ -58,7 +60,9 @@ 
 
 	$Zbytek=(4-($Width/(8/$BitCount))%4)%4;
 
-	if($BitCount<24) $palsize=pow(2,$BitCount)*4;
+	if($BitCount<24) {
+		$palsize=pow(2,$BitCount)*4;
+	}
 
 	$size=(floor($Width/(8/$BitCount))+$Zbytek)*$Height+54;
 	$size+=$palsize;
@@ -87,11 +91,15 @@ 
 	
 	$CC=$ColorCount;
 	$sl1=strlen($ret);
-	if($CC==0) $CC=256;
+	if($CC==0) {
+		$CC=256;
+	}
 	if($BitCount<24)
 	{
 		$ColorTotal=imagecolorstotal($img);
-		if($IsTransparent) $ColorTotal--;
+		if($IsTransparent) {
+			$ColorTotal--;
+		}
 
 		for($p=0;$p<$ColorTotal;$p++)
 		{
@@ -133,12 +141,14 @@ 
 			if((strlen($bWrite)<8)and(strlen($bWrite)!=0))
 			{
 				$sl=strlen($bWrite);
-				for($t=0;$t<8-$sl;$t++)
-				$sl.="0";
+				for($t=0;$t<8-$sl;$t++) {
+								$sl.="0";
+				}
 				$retd.=jpexs_inttobyte(bindec($bWrite));
 			};
-			for($z=0;$z<$Zbytek;$z++)
-			$retd.=jpexs_inttobyte(0);
+			for($z=0;$z<$Zbytek;$z++) {
+						$retd.=jpexs_inttobyte(0);
+			}
 		};
 	};
 
@@ -146,9 +156,10 @@ 
 	{
 		for($t=0;$t<strlen($retd);$t+=4)
 		{
-			if($t!=0)
-			if(($t)%$Width==0)
+			if($t!=0) {
+						if(($t)%$Width==0)
 			$ret.=chr(0).chr(0);
+			}
 
 			if(($t+5)%$Width==0)
 			{
@@ -159,15 +170,13 @@ 
 			{
 				$ret.=chr(0).chr(6).substr($retd,$t,6);
 				$t+=2;
-			}
-			else
+			} else
 			{
 				$ret.=chr(0).chr(4).substr($retd,$t,4);
 			};
 		};
 		$ret.=chr(0).chr(1);
-	}
-	else
+	} else
 	{
 		$ret.=$retd;
 	};
@@ -175,8 +184,9 @@ 
 	$Dopl = "";
 	if($BitCount==24)
 	{
-		for($z=0;$z<$Zbytek;$z++)
-		$Dopl.=chr(0);
+		for($z=0;$z<$Zbytek;$z++) {
+				$Dopl.=chr(0);
+		}
 
 		for($y=$Height-1;$y>=0;$y--)
 		{
@@ -196,8 +206,7 @@ 
 		$r=$r and fwrite($f,$ret);
 		$r=$r and fclose($f);
 		return $r;
-	}
-	else
+	} else
 	{
 		echo $ret;
 	};
@@ -269,17 +278,20 @@ 
 						imagesetpixel($img,$x,$y,$Palette[$C]);
 					};
 					if($jpexs_CurrentBit!=0) {jpexs_freadbyte($f);};
-					for($g=0;$g<$Zbytek;$g++)
-					jpexs_freadbyte($f);
+					for($g=0;$g<$Zbytek;$g++) {
+										jpexs_freadbyte($f);
+					}
 				};
 
 			};
 		};
 
 
-		if($RLECompression==1) //$BI_RLE8
+		if($RLECompression==1) {
+			//$BI_RLE8
 		{
 			$y=$Height;
+		}
 
 			$pocetb=0;
 
@@ -292,9 +304,15 @@ 
 
 				$echoit=false;
 
-				if($echoit)echo "Prefix: $prefix Suffix: $suffix<BR>";
-				if(($prefix==0)and($suffix==1)) break;
-				if(feof($f)) break;
+				if($echoit) {
+					echo "Prefix: $prefix Suffix: $suffix<BR>";
+				}
+				if(($prefix==0)and($suffix==1)) {
+					break;
+				}
+				if(feof($f)) {
+					break;
+				}
 
 				while(!(($prefix==0)and($suffix==0)))
 				{
@@ -308,13 +326,16 @@ 
 					if($prefix>0)
 					{
 						$pocet=$prefix;
-						for($r=0;$r<$pocet;$r++)
-						$Data.=chr($suffix);
+						for($r=0;$r<$pocet;$r++) {
+												$Data.=chr($suffix);
+						}
 					};
 					$prefix=jpexs_freadbyte($f);
 					$suffix=jpexs_freadbyte($f);
 					$pocetb+=2;
-					if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
+					if($echoit) {
+						echo "Prefix: $prefix Suffix: $suffix<BR>";
+					}
 				};
 
 				for($x=0;$x<strlen($Data);$x++)
@@ -328,9 +349,11 @@ 
 		};
 
 
-		if($RLECompression==2) //$BI_RLE4
+		if($RLECompression==2) {
+			//$BI_RLE4
 		{
 			$y=$Height;
+		}
 			$pocetb=0;
 
 			/*while(!feof($f))
@@ -345,9 +368,15 @@ 
 
 				$echoit=false;
 
-				if($echoit)echo "Prefix: $prefix Suffix: $suffix<BR>";
-				if(($prefix==0)and($suffix==1)) break;
-				if(feof($f)) break;
+				if($echoit) {
+					echo "Prefix: $prefix Suffix: $suffix<BR>";
+				}
+				if(($prefix==0)and($suffix==1)) {
+					break;
+				}
+				if(feof($f)) {
+					break;
+				}
 
 				while(!(($prefix==0)and($suffix==0)))
 				{
@@ -356,9 +385,12 @@ 
 						$pocet=$suffix;
 
 						$jpexs_CurrentBit=0;
-						for($h=0;$h<$pocet;$h++)
-						$Data.=chr(jpexs_freadbits($f,4));
-						if($jpexs_CurrentBit!=0) jpexs_freadbits($f,4);
+						for($h=0;$h<$pocet;$h++) {
+												$Data.=chr(jpexs_freadbits($f,4));
+						}
+						if($jpexs_CurrentBit!=0) {
+							jpexs_freadbits($f,4);
+						}
 						$pocetb+=ceil(($pocet/2));
 						if($pocetb%2==1) {jpexs_freadbyte($f); $pocetb++;};
 					};
@@ -371,8 +403,7 @@ 
 							if($i%2==0)
 							{
 								$Data.=chr($suffix%16);
-							}
-							else
+							} else
 							{
 								$Data.=chr(floor($suffix/16));
 							};
@@ -382,7 +413,9 @@ 
 					$prefix=jpexs_freadbyte($f);
 					$suffix=jpexs_freadbyte($f);
 					$pocetb+=2;
-					if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
+					if($echoit) {
+						echo "Prefix: $prefix Suffix: $suffix<BR>";
+					}
 				};
 
 				for($x=0;$x<strlen($Data);$x++)
@@ -409,17 +442,19 @@ 
 					$G=jpexs_freadbyte($f);
 					$R=jpexs_freadbyte($f);
 					$color=imagecolorexact($img,$R,$G,$B);
-					if($color==-1) $color=imagecolorallocate($img,$R,$G,$B);
+					if($color==-1) {
+						$color=imagecolorallocate($img,$R,$G,$B);
+					}
 					imagesetpixel($img,$x,$y,$color);
 				}
-				for($z=0;$z<$Zbytek;$z++)
-				jpexs_freadbyte($f);
+				for($z=0;$z<$Zbytek;$z++) {
+								jpexs_freadbyte($f);
+				}
 			};
 		};
 		return $img;
 
-	}
-	else{
+	} else{
 		return false;
 	}
 
@@ -495,8 +530,7 @@ 
 	if($jpexs_CurrentBit==8)
 	{
 		$jpexs_CurrentBit=0;
-	}
-	else
+	} else
 	{
 		fseek($f,ftell($f)-1);
 	};
@@ -524,8 +558,9 @@ 
 {
 	$bin=decbin($d);
 	$sbin=strlen($bin);
-	for($j=0;$j<$n-$sbin;$j++)
-	$bin="0$bin";
+	for($j=0;$j<$n-$sbin;$j++) {
+		$bin="0$bin";
+	}
 	return $bin;
 };
 

class/wideimage/vendor/JPEXS/ico.php

Doc Comments +22 added lines, -2 removed lines

@@ -225,6 +225,10 @@ 
 
 
 
+/**
+ * @param string $filename
+ * @param integer $id
+ */
 function jpexs_readIcon($filename,$id,&$Ikona)
 {
 global $jpexs_currentBit;
@@ -348,6 +352,9 @@ 
 
 };
 
+/**
+ * @param string $filename
+ */
 function jpexs_GetIconsInfo($filename)
 {
 global $jpexs_currentBit;
@@ -414,8 +421,8 @@ 
  * @global int $jpexs_ResVirtualAddress Internal reserved variable
  * @param string $filename Target exefile
  * @param string $icoFileNameOrPath Filename to save ico or path (Default "") Path if you want more than 1 icon. If "", the filename is "$icoIndex.ico"
- * @param int|array $iconIndex Index(es) of the icon in exefile  (Default -1) If -1, all icons are saved, Can be an array of indexes.
- * @return boolean True on successful save
+ * @param integer $iconIndex Index(es) of the icon in exefile  (Default -1) If -1, all icons are saved, Can be an array of indexes.
+ * @return boolean|null True on successful save
  */
 function saveExeIcon($filename,$icoFileNameOrPath="",$iconIndex=-1) /*-1 for all,or can be array*/
 {
@@ -539,6 +546,7 @@ 
 
 /**
  * Internal function for reading exe icons
+ * @param integer $offset
  */
 function jpexs_readResDirectoryEntry(&$parentRes,$offset)
 {
@@ -884,6 +892,9 @@ 
 return jpexs_decbinx($d,8);
 };
 
+/**
+ * @param integer $n
+ */
 function jpexs_decbinx($d,$n)
 {
 $bin=decbin($d);
@@ -893,6 +904,9 @@ 
 return $bin;
 };
 
+/**
+ * @param integer $byte
+ */
 function jpexs_retBits($byte,$start,$len)
 {
 $bin=jpexs_decbin8($byte);
@@ -904,6 +918,9 @@ 
 
 
 $jpexs_currentBit=0;
+/**
+ * @param resource $f
+ */
 function jpexs_freadbits($f,$count)
 {
  global $jpexs_currentBit,$jpexs_SMode;
@@ -935,6 +952,9 @@ 
 };
 
 
+/**
+ * @param resource $f
+ */
 function jpexs_freadlngint($f)
 {
 return jpexs_freaddword($f);

Indentation +219 added lines, -219 removed lines

@@ -207,13 +207,13 @@ 
    imagetruecolortopalette($img,true,255);
 
    };
-    $Pruhledna=imagecolorallocate($img,0,0,0);
-    for($y=0;$y<$Ikona[$IconID]["Height"];$y++)
-     for($x=0;$x<$Ikona[$IconID]["Width"];$x++)
-      if($Ikona[$IconID]["Maska"][$x][$y]==1)
-       {
-        imagesetpixel($img,$x,$y,$Pruhledna);
-       };
+	$Pruhledna=imagecolorallocate($img,0,0,0);
+	for($y=0;$y<$Ikona[$IconID]["Height"];$y++)
+	 for($x=0;$x<$Ikona[$IconID]["Width"];$x++)
+	  if($Ikona[$IconID]["Maska"][$x][$y]==1)
+	   {
+		imagesetpixel($img,$x,$y,$Pruhledna);
+	   };
   imagecolortransparent($img,$Pruhledna);
  };
 
@@ -261,29 +261,29 @@ 
  $barev=pow(2,$biBitCount);
 
   for($b=0;$b<$barev;$b++)
-    {
-    $Ikona[$p]["Paleta"][$b]["b"]=jpexs_freadbyte($f);
-    $Ikona[$p]["Paleta"][$b]["g"]=jpexs_freadbyte($f);
-    $Ikona[$p]["Paleta"][$b]["r"]=jpexs_freadbyte($f);
-    jpexs_freadbyte($f);
-    };
+	{
+	$Ikona[$p]["Paleta"][$b]["b"]=jpexs_freadbyte($f);
+	$Ikona[$p]["Paleta"][$b]["g"]=jpexs_freadbyte($f);
+	$Ikona[$p]["Paleta"][$b]["r"]=jpexs_freadbyte($f);
+	jpexs_freadbyte($f);
+	};
 
 $Zbytek=(4-ceil(($Width/(8/$biBitCount)))%4)%4;
 
 
 for($y=$Height-1;$y>=0;$y--)
-    {
-     $jpexs_currentBit=0;
-     for($x=0;$x<$Width;$x++)
-      {
-         $C=jpexs_freadbits($f,$biBitCount);
-         $Ikona[$p]["Data"][$x][$y]=$C;
-      };
-
-    if($jpexs_currentBit!=0) {jpexs_freadbyte($f);};
-    for($g=0;$g<$Zbytek;$g++)
-     jpexs_freadbyte($f);
-     };
+	{
+	 $jpexs_currentBit=0;
+	 for($x=0;$x<$Width;$x++)
+	  {
+		 $C=jpexs_freadbits($f,$biBitCount);
+		 $Ikona[$p]["Data"][$x][$y]=$C;
+	  };
+
+	if($jpexs_currentBit!=0) {jpexs_freadbyte($f);};
+	for($g=0;$g<$Zbytek;$g++)
+	 jpexs_freadbyte($f);
+	 };
 
 }
 elseif($biBitCount==24)
@@ -291,18 +291,18 @@ 
  $Zbytek=$Width%4;
 
    for($y=$Height-1;$y>=0;$y--)
-    {
-     for($x=0;$x<$Width;$x++)
-      {
-       $B=jpexs_freadbyte($f);
-       $G=jpexs_freadbyte($f);
-       $R=jpexs_freadbyte($f);
-       $Ikona[$p]["Data"][$x][$y]["r"]=$R;
-       $Ikona[$p]["Data"][$x][$y]["g"]=$G;
-       $Ikona[$p]["Data"][$x][$y]["b"]=$B;
-      }
-    for($z=0;$z<$Zbytek;$z++)
-     jpexs_freadbyte($f);
+	{
+	 for($x=0;$x<$Width;$x++)
+	  {
+	   $B=jpexs_freadbyte($f);
+	   $G=jpexs_freadbyte($f);
+	   $R=jpexs_freadbyte($f);
+	   $Ikona[$p]["Data"][$x][$y]["r"]=$R;
+	   $Ikona[$p]["Data"][$x][$y]["g"]=$G;
+	   $Ikona[$p]["Data"][$x][$y]["b"]=$B;
+	  }
+	for($z=0;$z<$Zbytek;$z++)
+	 jpexs_freadbyte($f);
    };
 }
 elseif($biBitCount==32)
@@ -310,20 +310,20 @@ 
  $Zbytek=$Width%4;
 
    for($y=$Height-1;$y>=0;$y--)
-    {
-     for($x=0;$x<$Width;$x++)
-      {
-       $B=jpexs_freadbyte($f);
-       $G=jpexs_freadbyte($f);
-       $R=jpexs_freadbyte($f);
-       $Alpha=jpexs_freadbyte($f);
-       $Ikona[$p]["Data"][$x][$y]["r"]=$R;
-       $Ikona[$p]["Data"][$x][$y]["g"]=$G;
-       $Ikona[$p]["Data"][$x][$y]["b"]=$B;
-       $Ikona[$p]["Data"][$x][$y]["alpha"]=$Alpha;
-      }
-    for($z=0;$z<$Zbytek;$z++)
-     jpexs_freadbyte($f);
+	{
+	 for($x=0;$x<$Width;$x++)
+	  {
+	   $B=jpexs_freadbyte($f);
+	   $G=jpexs_freadbyte($f);
+	   $R=jpexs_freadbyte($f);
+	   $Alpha=jpexs_freadbyte($f);
+	   $Ikona[$p]["Data"][$x][$y]["r"]=$R;
+	   $Ikona[$p]["Data"][$x][$y]["g"]=$G;
+	   $Ikona[$p]["Data"][$x][$y]["b"]=$B;
+	   $Ikona[$p]["Data"][$x][$y]["alpha"]=$Alpha;
+	  }
+	for($z=0;$z<$Zbytek;$z++)
+	 jpexs_freadbyte($f);
    };
 };
 
@@ -331,17 +331,17 @@ 
 //Maska
 $Zbytek=(4-ceil(($Width/(8)))%4)%4;
 for($y=$Height-1;$y>=0;$y--)
-    {
-     $jpexs_currentBit=0;
-     for($x=0;$x<$Width;$x++)
-      {
-         $C=jpexs_freadbits($f,1);
-         $Ikona[$p]["Maska"][$x][$y]=$C;
-      };
-    if($jpexs_currentBit!=0) {jpexs_freadbyte($f);};
-    for($g=0;$g<$Zbytek;$g++)
-     jpexs_freadbyte($f);
-     };
+	{
+	 $jpexs_currentBit=0;
+	 for($x=0;$x<$Width;$x++)
+	  {
+		 $C=jpexs_freadbits($f,1);
+		 $Ikona[$p]["Maska"][$x][$y]=$C;
+	  };
+	if($jpexs_currentBit!=0) {jpexs_freadbyte($f);};
+	for($g=0;$g<$Zbytek;$g++)
+	 jpexs_freadbyte($f);
+	 };
 //--------------
 
 fclose($f);
@@ -372,8 +372,8 @@ 
 if(!feof($f)):
   for($p=0;$p<$Count;$p++)
    {
-    fseek($f,$Ikona[$p]["ImageOffset"]+14);
-    $Ikona[$p]["Info"]["BitsPerPixel"]=jpexs_freadword($f);
+	fseek($f,$Ikona[$p]["ImageOffset"]+14);
+	$Ikona[$p]["Info"]["BitsPerPixel"]=jpexs_freadword($f);
    };
 endif;
 fclose($f);
@@ -436,102 +436,102 @@ 
   fseek($jpexs_f,$PosMagic+$SizeOfOptionalHeader);
 
   for($p=0;$p<$NumberOfSections;$p++):
-    $SectionName[$p]=trim(fread($jpexs_f,8));
-    $VirtualSize[$p]=jpexs_freaddword($jpexs_f);
-    $VirtualAddress[$p]=jpexs_freaddword($jpexs_f);
-    $PhysicalSize[$p]=jpexs_freaddword($jpexs_f);
-    $PhysicalOffset[$p]=jpexs_freaddword($jpexs_f);
-    fread($jpexs_f,16);
-    if($SectionName[$p]==".rsrc"):
-      $jpexs_ResVirtualAddress=$VirtualAddress[$p];
-      fseek($jpexs_f,$PhysicalOffset[$p]);
-      $jpexs_StartOfRsrc=$PhysicalOffset[$p];
-      jpexs_readResDirectoryEntry($R,$PhysicalOffset[$p]);
-      $IconCount=null;
-      $Ikona=null;
-      while (list ($key, $val) = each ($R["Subdir"])):
-        if($key==14):
-          $r=0;
-          while (list ($key2, $val2) = each ($R["Subdir"][$key]["Subdir"])):
-             while (list ($key3, $val3) = each ($R["Subdir"][$key]["Subdir"][$key2]["Subdir"])):
-               fseek($jpexs_f,$val3["DataOffset"]);
-               $Reserved=jpexs_freadword($jpexs_f);
-               $Type=jpexs_freadword($jpexs_f);
-               $ic=jpexs_freadword($jpexs_f);
-               $IconCount[]=$ic;
-               for($s=0;$s<$ic;$s++)
-                {
-                 $Ikona[$r][$s]["Width"]=jpexs_freadbyte($jpexs_f);
-                 $Ikona[$r][$s]["Height"]=jpexs_freadbyte($jpexs_f);
-                 $Ikona[$r][$s]["ColorCount"]=jpexs_freadword($jpexs_f);
-                 $Ikona[$r][$s]["Planes"]=jpexs_freadword($jpexs_f);
-                 $Ikona[$r][$s]["BitCount"]=jpexs_freadword($jpexs_f);
-                 $Ikona[$r][$s]["BytesInRes"]=jpexs_freaddword($jpexs_f);
-                 $Ikona[$r][$s]["IconId"]=jpexs_freadword($jpexs_f);
-                };
-               fseek($jpexs_f,$val3["DataOffset"]);
-               $r++;
-             endwhile;
-          endwhile;
-        endif;
-      endwhile;
-
-      reset ($R["Subdir"]);
-
-      while (list ($key, $val) = each ($R["Subdir"])):
-        if($key==3):
-          while (list ($key2, $val2) = each ($R["Subdir"][$key]["Subdir"])):
-          for($r=0;$r<count($Ikona);$r++):
-           for($s=0;$s<count($Ikona[$r]);$s++):
-             while (list ($key3, $val3) = each ($R["Subdir"][$key]["Subdir"][$Ikona[$r][$s]["IconId"]]["Subdir"])):
-               if(($iconIndex==$r)or($iconIndex==-1)or((is_array($iconIndex))and(in_array($r,$iconIndex)))):
-                 fseek($jpexs_f,$val3["DataOffset"]);
-                 $Ikona[$r][$s]["Data"]=fread($jpexs_f,$val3["DataSize"]);
-                 $Ikona[$r][$s]["DataSize"]=$val3["DataSize"];
-               endif;
-             endwhile;
-           endfor;
-           endfor;
-          endwhile;
-        endif;
-      endwhile;
-      $ok=false;
-      for($r=0;$r<count($Ikona);$r++):
-        if(($iconIndex==$r)or($iconIndex==-1)or((is_array($iconIndex))and(in_array($r,$iconIndex)))):
-          $savefile=$icoFileNameOrPath;
-          if($icoFileNameOrPath=="")
-           {
-             $savefile="$r.ico";
-           }
-           else
-           {
-            if(($iconIndex==-1)or(is_array($iconIndex)))
-              $savefile=$icoFileNameOrPath."$r.ico";
-           };
-          $f2=fopen($savefile,"w");
-          fwrite($f2,jpexs_inttoword(0));
-          fwrite($f2,jpexs_inttoword(1));
-          fwrite($f2,jpexs_inttoword(count($Ikona[$r])));
-          $Offset=6+16*count($Ikona[$r]);
-          for($s=0;$s<count($Ikona[$r]);$s++):
-            fwrite($f2,jpexs_inttobyte($Ikona[$r][$s]["Width"]));
-            fwrite($f2,jpexs_inttobyte($Ikona[$r][$s]["Height"]));
-            fwrite($f2,jpexs_inttoword($Ikona[$r][$s]["ColorCount"]));
-            fwrite($f2,jpexs_inttoword($Ikona[$r][$s]["Planes"]));
-            fwrite($f2,jpexs_inttoword($Ikona[$r][$s]["BitCount"]));
-            fwrite($f2,jpexs_inttodword($Ikona[$r][$s]["BytesInRes"]));
-            fwrite($f2,jpexs_inttodword($Offset));
-            $Offset+=$Ikona[$r][$s]["DataSize"];
-          endfor;
-          for($s=0;$s<count($Ikona[$r]);$s++):
-            fwrite($f2,$Ikona[$r][$s]["Data"]);
-          endfor;
-          fclose($f2);
-          $ok=true;
-        endif;
-      endfor;
-      return $ok;
-    endif;
+	$SectionName[$p]=trim(fread($jpexs_f,8));
+	$VirtualSize[$p]=jpexs_freaddword($jpexs_f);
+	$VirtualAddress[$p]=jpexs_freaddword($jpexs_f);
+	$PhysicalSize[$p]=jpexs_freaddword($jpexs_f);
+	$PhysicalOffset[$p]=jpexs_freaddword($jpexs_f);
+	fread($jpexs_f,16);
+	if($SectionName[$p]==".rsrc"):
+	  $jpexs_ResVirtualAddress=$VirtualAddress[$p];
+	  fseek($jpexs_f,$PhysicalOffset[$p]);
+	  $jpexs_StartOfRsrc=$PhysicalOffset[$p];
+	  jpexs_readResDirectoryEntry($R,$PhysicalOffset[$p]);
+	  $IconCount=null;
+	  $Ikona=null;
+	  while (list ($key, $val) = each ($R["Subdir"])):
+		if($key==14):
+		  $r=0;
+		  while (list ($key2, $val2) = each ($R["Subdir"][$key]["Subdir"])):
+			 while (list ($key3, $val3) = each ($R["Subdir"][$key]["Subdir"][$key2]["Subdir"])):
+			   fseek($jpexs_f,$val3["DataOffset"]);
+			   $Reserved=jpexs_freadword($jpexs_f);
+			   $Type=jpexs_freadword($jpexs_f);
+			   $ic=jpexs_freadword($jpexs_f);
+			   $IconCount[]=$ic;
+			   for($s=0;$s<$ic;$s++)
+				{
+				 $Ikona[$r][$s]["Width"]=jpexs_freadbyte($jpexs_f);
+				 $Ikona[$r][$s]["Height"]=jpexs_freadbyte($jpexs_f);
+				 $Ikona[$r][$s]["ColorCount"]=jpexs_freadword($jpexs_f);
+				 $Ikona[$r][$s]["Planes"]=jpexs_freadword($jpexs_f);
+				 $Ikona[$r][$s]["BitCount"]=jpexs_freadword($jpexs_f);
+				 $Ikona[$r][$s]["BytesInRes"]=jpexs_freaddword($jpexs_f);
+				 $Ikona[$r][$s]["IconId"]=jpexs_freadword($jpexs_f);
+				};
+			   fseek($jpexs_f,$val3["DataOffset"]);
+			   $r++;
+			 endwhile;
+		  endwhile;
+		endif;
+	  endwhile;
+
+	  reset ($R["Subdir"]);
+
+	  while (list ($key, $val) = each ($R["Subdir"])):
+		if($key==3):
+		  while (list ($key2, $val2) = each ($R["Subdir"][$key]["Subdir"])):
+		  for($r=0;$r<count($Ikona);$r++):
+		   for($s=0;$s<count($Ikona[$r]);$s++):
+			 while (list ($key3, $val3) = each ($R["Subdir"][$key]["Subdir"][$Ikona[$r][$s]["IconId"]]["Subdir"])):
+			   if(($iconIndex==$r)or($iconIndex==-1)or((is_array($iconIndex))and(in_array($r,$iconIndex)))):
+				 fseek($jpexs_f,$val3["DataOffset"]);
+				 $Ikona[$r][$s]["Data"]=fread($jpexs_f,$val3["DataSize"]);
+				 $Ikona[$r][$s]["DataSize"]=$val3["DataSize"];
+			   endif;
+			 endwhile;
+		   endfor;
+		   endfor;
+		  endwhile;
+		endif;
+	  endwhile;
+	  $ok=false;
+	  for($r=0;$r<count($Ikona);$r++):
+		if(($iconIndex==$r)or($iconIndex==-1)or((is_array($iconIndex))and(in_array($r,$iconIndex)))):
+		  $savefile=$icoFileNameOrPath;
+		  if($icoFileNameOrPath=="")
+		   {
+			 $savefile="$r.ico";
+		   }
+		   else
+		   {
+			if(($iconIndex==-1)or(is_array($iconIndex)))
+			  $savefile=$icoFileNameOrPath."$r.ico";
+		   };
+		  $f2=fopen($savefile,"w");
+		  fwrite($f2,jpexs_inttoword(0));
+		  fwrite($f2,jpexs_inttoword(1));
+		  fwrite($f2,jpexs_inttoword(count($Ikona[$r])));
+		  $Offset=6+16*count($Ikona[$r]);
+		  for($s=0;$s<count($Ikona[$r]);$s++):
+			fwrite($f2,jpexs_inttobyte($Ikona[$r][$s]["Width"]));
+			fwrite($f2,jpexs_inttobyte($Ikona[$r][$s]["Height"]));
+			fwrite($f2,jpexs_inttoword($Ikona[$r][$s]["ColorCount"]));
+			fwrite($f2,jpexs_inttoword($Ikona[$r][$s]["Planes"]));
+			fwrite($f2,jpexs_inttoword($Ikona[$r][$s]["BitCount"]));
+			fwrite($f2,jpexs_inttodword($Ikona[$r][$s]["BytesInRes"]));
+			fwrite($f2,jpexs_inttodword($Offset));
+			$Offset+=$Ikona[$r][$s]["DataSize"];
+		  endfor;
+		  for($s=0;$s<count($Ikona[$r]);$s++):
+			fwrite($f2,$Ikona[$r][$s]["Data"]);
+		  endfor;
+		  fclose($f2);
+		  $ok=true;
+		endif;
+	  endfor;
+	  return $ok;
+	endif;
   endfor;
 
   fclose($jpexs_f);
@@ -547,45 +547,45 @@ 
 $Res=null;
 fseek($jpexs_f,$offset);
 //IMAGE_RESOURCE_DIRECTORY
-      $Characteristics=jpexs_freaddword($jpexs_f);
-      $TimeDateStamp=jpexs_freaddword($jpexs_f);
-      $MajorVersion=jpexs_freadword($jpexs_f);
-      $MinorVersion=jpexs_freadword($jpexs_f);
-      $NumberOfNamedEntries=jpexs_freadword($jpexs_f);
-      $NumberOfIdEntries=jpexs_freadword($jpexs_f);
-      for($q=0;$q<$NumberOfNamedEntries+$NumberOfIdEntries;$q++):
-        //IMAGE_RESOURCE_DIRECTORY_ENTRY
-        $ResName=jpexs_freaddword($jpexs_f);
-        $lastPos2=ftell($jpexs_f);
-        if($ResName>=0x80000000):
-          //String Name
-          $ResNameOffset=$ResName-0x80000000;
-          fseek($jpexs_f,$jpexs_StartOfRsrc+$ResNameOffset);
-          $StringLength=jpexs_freadword($jpexs_f);
-          $Identificator=(fread($jpexs_f,$StringLength*2));
-          fseek($jpexs_f,$lastPos2);
-        else:
-          //Integer Id
-          $Identificator=$ResName;
-        endif;
-
-        $ResOffsetToData=jpexs_freaddword($jpexs_f);
-        if($ResOffsetToData>=0x80000000):
-          $SubResOffset=$ResOffsetToData-0x80000000;
-          jpexs_readResDirectoryEntry($Res["$Identificator"],$jpexs_StartOfRsrc+$SubResOffset);
-        else:
-          $RawDataOffset=$ResOffsetToData;
-          $lastPos2=ftell($jpexs_f);
-          fseek($jpexs_f,$jpexs_StartOfRsrc+$RawDataOffset);
-          //IMAGE_RESOURCE_DATA_ENTRY
-          $OffsetToData=jpexs_freaddword($jpexs_f);
-          $Res["$Identificator"]["DataOffset"]=$jpexs_StartOfRsrc-$jpexs_ResVirtualAddress+$OffsetToData;
-          $Res["$Identificator"]["DataSize"]=jpexs_freaddword($jpexs_f);
-          $CodePage=jpexs_freaddword($jpexs_f);
-          $Reserved=jpexs_freaddword($jpexs_f);
-          fseek($jpexs_f,$lastPos2);
-        endif;
-      endfor;
+	  $Characteristics=jpexs_freaddword($jpexs_f);
+	  $TimeDateStamp=jpexs_freaddword($jpexs_f);
+	  $MajorVersion=jpexs_freadword($jpexs_f);
+	  $MinorVersion=jpexs_freadword($jpexs_f);
+	  $NumberOfNamedEntries=jpexs_freadword($jpexs_f);
+	  $NumberOfIdEntries=jpexs_freadword($jpexs_f);
+	  for($q=0;$q<$NumberOfNamedEntries+$NumberOfIdEntries;$q++):
+		//IMAGE_RESOURCE_DIRECTORY_ENTRY
+		$ResName=jpexs_freaddword($jpexs_f);
+		$lastPos2=ftell($jpexs_f);
+		if($ResName>=0x80000000):
+		  //String Name
+		  $ResNameOffset=$ResName-0x80000000;
+		  fseek($jpexs_f,$jpexs_StartOfRsrc+$ResNameOffset);
+		  $StringLength=jpexs_freadword($jpexs_f);
+		  $Identificator=(fread($jpexs_f,$StringLength*2));
+		  fseek($jpexs_f,$lastPos2);
+		else:
+		  //Integer Id
+		  $Identificator=$ResName;
+		endif;
+
+		$ResOffsetToData=jpexs_freaddword($jpexs_f);
+		if($ResOffsetToData>=0x80000000):
+		  $SubResOffset=$ResOffsetToData-0x80000000;
+		  jpexs_readResDirectoryEntry($Res["$Identificator"],$jpexs_StartOfRsrc+$SubResOffset);
+		else:
+		  $RawDataOffset=$ResOffsetToData;
+		  $lastPos2=ftell($jpexs_f);
+		  fseek($jpexs_f,$jpexs_StartOfRsrc+$RawDataOffset);
+		  //IMAGE_RESOURCE_DATA_ENTRY
+		  $OffsetToData=jpexs_freaddword($jpexs_f);
+		  $Res["$Identificator"]["DataOffset"]=$jpexs_StartOfRsrc-$jpexs_ResVirtualAddress+$OffsetToData;
+		  $Res["$Identificator"]["DataSize"]=jpexs_freaddword($jpexs_f);
+		  $CodePage=jpexs_freaddword($jpexs_f);
+		  $Reserved=jpexs_freaddword($jpexs_f);
+		  fseek($jpexs_f,$lastPos2);
+		endif;
+	  endfor;
 fseek($jpexs_f,$lastPos);
 $parentRes["Subdir"]=$Res;
 };
@@ -764,25 +764,25 @@ 
    {
    $color=imagecolorat($img,$x,$y);
    if($color==$Transparent)
-    $color=imagecolorexact($img,0,0,0);
+	$color=imagecolorexact($img,0,0,0);
    if($color==-1) $color=0;
    if($color>pow(2,$BitCount)-1) $color=0;
 
    $bWrite.=jpexs_decbinx($color,$BitCount);
    if(strlen($bWrite)==8)
-    {
-     $ret.=jpexs_inttobyte(bindec($bWrite));
-     $bWrite="";
-    };
+	{
+	 $ret.=jpexs_inttobyte(bindec($bWrite));
+	 $bWrite="";
+	};
    };
 
   if((strlen($bWrite)<8)and(strlen($bWrite)!=0))
-    {
-     $sl=strlen($bWrite);
-     for($t=0;$t<8-$sl;$t++)
-      $sl.="0";
-     $ret.=jpexs_inttobyte(bindec($bWrite));
-    };
+	{
+	 $sl=strlen($bWrite);
+	 for($t=0;$t<8-$sl;$t++)
+	  $sl.="0";
+	 $ret.=jpexs_inttobyte(bindec($bWrite));
+	};
   for($z=0;$z<$Zbytek;$z++)
    $ret.=jpexs_inttobyte(0);
  };
@@ -801,7 +801,7 @@ 
    $ret.=jpexs_inttobyte($color["green"]);
    $ret.=jpexs_inttobyte($color["red"]);
    if($BitCount==32)
-    $ret.=jpexs_inttobyte(0);//Alpha for ICO_XP_COLORS
+	$ret.=jpexs_inttobyte(0);//Alpha for ICO_XP_COLORS
    };
   for($z=0;$z<$Zbytek;$z++)
    $ret.=jpexs_inttobyte(0);
@@ -817,14 +817,14 @@ 
   $bOut="";
   for($x=0;$x<$Width;$x++)
    {
-    if(($Transparent!=-1)and(imagecolorat($img,$x,$y)==$Transparent))
-     {
-      $bOut.="1";
-     }
-     else
-     {
-      $bOut.="0";
-     };
+	if(($Transparent!=-1)and(imagecolorat($img,$x,$y)==$Transparent))
+	 {
+	  $bOut.="1";
+	 }
+	 else
+	 {
+	  $bOut.="0";
+	 };
    };
   for($p=0;$p<strlen($bOut);$p+=8)
   {

Spacing +460 added lines, -460 removed lines

@@ -69,152 +69,152 @@ 
  * @param int $alphaBgB Background color B value for alpha-channel images (Default is White)
  * @return resource Image resource
  */
-function imageCreateFromIco($filename,$icoColorCount=16,$icoSize=16,$alphaBgR=255,$alphaBgG=255,$alphaBgB=255)
+function imageCreateFromIco($filename, $icoColorCount = 16, $icoSize = 16, $alphaBgR = 255, $alphaBgG = 255, $alphaBgB = 255)
 {
-$Ikona=jpexs_GetIconsInfo($filename);
+$Ikona = jpexs_GetIconsInfo($filename);
 
-$IconID=-1;
+$IconID = -1;
 
-$ColMax=-1;
-$SizeMax=-1;
+$ColMax = -1;
+$SizeMax = -1;
 
-for($p=0;$p<count($Ikona);$p++)
+for ($p = 0; $p < count($Ikona); $p++)
 {
-$Ikona[$p]["NumberOfColors"]=pow(2,$Ikona[$p]["Info"]["BitsPerPixel"]);
+$Ikona[$p]["NumberOfColors"] = pow(2, $Ikona[$p]["Info"]["BitsPerPixel"]);
 };
 
 
-for($p=0;$p<count($Ikona);$p++)
+for ($p = 0; $p < count($Ikona); $p++)
 {
 
-if(($ColMax==-1)or($Ikona[$p]["NumberOfColors"]>=$Ikona[$ColMax]["NumberOfColors"]))
-if(($icoSize==$Ikona[$p]["Width"])or($icoSize==ICO_MAX_SIZE))
+if (($ColMax == -1) or ($Ikona[$p]["NumberOfColors"] >= $Ikona[$ColMax]["NumberOfColors"]))
+if (($icoSize == $Ikona[$p]["Width"]) or ($icoSize == ICO_MAX_SIZE))
  {
-  $ColMax=$p;
+  $ColMax = $p;
  };
 
-if(($SizeMax==-1)or($Ikona[$p]["Width"]>=$Ikona[$SizeMax]["Width"]))
-if(($icoColorCount==$Ikona[$p]["NumberOfColors"])or($icoColorCount==ICO_MAX_COLOR))
+if (($SizeMax == -1) or ($Ikona[$p]["Width"] >= $Ikona[$SizeMax]["Width"]))
+if (($icoColorCount == $Ikona[$p]["NumberOfColors"]) or ($icoColorCount == ICO_MAX_COLOR))
  {
-   $SizeMax=$p;
+   $SizeMax = $p;
  };
 
 
-if($Ikona[$p]["NumberOfColors"]==$icoColorCount)
-if($Ikona[$p]["Width"]==$icoSize)
+if ($Ikona[$p]["NumberOfColors"] == $icoColorCount)
+if ($Ikona[$p]["Width"] == $icoSize)
  {
 
- $IconID=$p;
+ $IconID = $p;
  };
 };
 
-  if($icoColorCount==ICO_MAX_COLOR) $IconID=$ColMax;
-  if($icoSize==ICO_MAX_SIZE) $IconID=$SizeMax;
+  if ($icoColorCount == ICO_MAX_COLOR) $IconID = $ColMax;
+  if ($icoSize == ICO_MAX_SIZE) $IconID = $SizeMax;
 
-$ColName=$icoColorCount;
+$ColName = $icoColorCount;
 
-if($icoSize==ICO_MAX_SIZE) $icoSize="Max";
-if($ColName==ICO_TRUE_COLOR) $ColName="True";
-if($ColName==ICO_XP_COLOR) $ColName="XP";
-if($ColName==ICO_MAX_COLOR) $ColName="Max";
-if($IconID==-1) die("Icon with $ColName colors and $icoSize x $icoSize size doesn't exist in this file!");
+if ($icoSize == ICO_MAX_SIZE) $icoSize = "Max";
+if ($ColName == ICO_TRUE_COLOR) $ColName = "True";
+if ($ColName == ICO_XP_COLOR) $ColName = "XP";
+if ($ColName == ICO_MAX_COLOR) $ColName = "Max";
+if ($IconID == -1) die("Icon with $ColName colors and $icoSize x $icoSize size doesn't exist in this file!");
 
 
-jpexs_readIcon($filename,$IconID,$Ikona);
+jpexs_readIcon($filename, $IconID, $Ikona);
 
- $biBitCount=$Ikona[$IconID]["Info"]["BitsPerPixel"];
+ $biBitCount = $Ikona[$IconID]["Info"]["BitsPerPixel"];
 
 
-  if($Ikona[$IconID]["Info"]["BitsPerPixel"]==0)
+  if ($Ikona[$IconID]["Info"]["BitsPerPixel"] == 0)
   {
-  $Ikona[$IconID]["Info"]["BitsPerPixel"]=24;
+  $Ikona[$IconID]["Info"]["BitsPerPixel"] = 24;
   };
 
- $biBitCount=$Ikona[$IconID]["Info"]["BitsPerPixel"];
- if($biBitCount==0) $biBitCount=1;
+ $biBitCount = $Ikona[$IconID]["Info"]["BitsPerPixel"];
+ if ($biBitCount == 0) $biBitCount = 1;
 
 
-$Ikona[$IconID]["BitCount"]=$Ikona[$IconID]["Info"]["BitsPerPixel"];
+$Ikona[$IconID]["BitCount"] = $Ikona[$IconID]["Info"]["BitsPerPixel"];
 
 
 
-if($Ikona[$IconID]["BitCount"]>=24)
+if ($Ikona[$IconID]["BitCount"] >= 24)
 {
-$img=imagecreatetruecolor($Ikona[$IconID]["Width"],$Ikona[$IconID]["Height"]);
-if($Ikona[$IconID]["BitCount"]==32):
-  $backcolor=imagecolorallocate($img,$alphaBgR,$alphaBgG,$alphaBgB);
-  imagefilledrectangle($img,0,0,$Ikona[$IconID]["Width"]-1,$Ikona[$IconID]["Height"]-1,$backcolor);
+$img = imagecreatetruecolor($Ikona[$IconID]["Width"], $Ikona[$IconID]["Height"]);
+if ($Ikona[$IconID]["BitCount"] == 32):
+  $backcolor = imagecolorallocate($img, $alphaBgR, $alphaBgG, $alphaBgB);
+  imagefilledrectangle($img, 0, 0, $Ikona[$IconID]["Width"] - 1, $Ikona[$IconID]["Height"] - 1, $backcolor);
 endif;
-for($y=0;$y<$Ikona[$IconID]["Height"];$y++)
-for($x=0;$x<$Ikona[$IconID]["Width"];$x++)
+for ($y = 0; $y < $Ikona[$IconID]["Height"]; $y++)
+for ($x = 0; $x < $Ikona[$IconID]["Width"]; $x++)
  {
- $R=$Ikona[$IconID]["Data"][$x][$y]["r"];
- $G=$Ikona[$IconID]["Data"][$x][$y]["g"];
- $B=$Ikona[$IconID]["Data"][$x][$y]["b"];
- if($Ikona[$IconID]["BitCount"]==32)
+ $R = $Ikona[$IconID]["Data"][$x][$y]["r"];
+ $G = $Ikona[$IconID]["Data"][$x][$y]["g"];
+ $B = $Ikona[$IconID]["Data"][$x][$y]["b"];
+ if ($Ikona[$IconID]["BitCount"] == 32)
  {
- $Alpha=127-round($Ikona[$IconID]["Data"][$x][$y]["alpha"]*127/255);
- if($Ikona[$IconID]["Maska"][$x][$y]==1) $Alpha=127;
- $color=imagecolorexactalpha($img,$R,$G,$B,$Alpha);
- if($color==-1) $color=imagecolorallocatealpha($img,$R,$G,$B,$Alpha);
+ $Alpha = 127 - round($Ikona[$IconID]["Data"][$x][$y]["alpha"] * 127 / 255);
+ if ($Ikona[$IconID]["Maska"][$x][$y] == 1) $Alpha = 127;
+ $color = imagecolorexactalpha($img, $R, $G, $B, $Alpha);
+ if ($color == -1) $color = imagecolorallocatealpha($img, $R, $G, $B, $Alpha);
  }
  else
  {
- $color=imagecolorexact($img,$R,$G,$B);
- if($color==-1) $color=imagecolorallocate($img,$R,$G,$B);
+ $color = imagecolorexact($img, $R, $G, $B);
+ if ($color == -1) $color = imagecolorallocate($img, $R, $G, $B);
  };
 
- imagesetpixel($img,$x,$y,$color);
+ imagesetpixel($img, $x, $y, $color);
 
  };
 
 }
 else
 {
-$img=imagecreate($Ikona[$IconID]["Width"],$Ikona[$IconID]["Height"]);
-for($p=0;$p<count($Ikona[$IconID]["Paleta"]);$p++)
- $Paleta[$p]=imagecolorallocate($img,$Ikona[$IconID]["Paleta"][$p]["r"],$Ikona[$IconID]["Paleta"][$p]["g"],$Ikona[$IconID]["Paleta"][$p]["b"]);
+$img = imagecreate($Ikona[$IconID]["Width"], $Ikona[$IconID]["Height"]);
+for ($p = 0; $p < count($Ikona[$IconID]["Paleta"]); $p++)
+ $Paleta[$p] = imagecolorallocate($img, $Ikona[$IconID]["Paleta"][$p]["r"], $Ikona[$IconID]["Paleta"][$p]["g"], $Ikona[$IconID]["Paleta"][$p]["b"]);
 
-for($y=0;$y<$Ikona[$IconID]["Height"];$y++)
-for($x=0;$x<$Ikona[$IconID]["Width"];$x++)
+for ($y = 0; $y < $Ikona[$IconID]["Height"]; $y++)
+for ($x = 0; $x < $Ikona[$IconID]["Width"]; $x++)
  {
- imagesetpixel($img,$x,$y,$Paleta[$Ikona[$IconID]["Data"][$x][$y]]);
+ imagesetpixel($img, $x, $y, $Paleta[$Ikona[$IconID]["Data"][$x][$y]]);
  };
 };
-$IsTransparent=false;  
-for($y=0;$y<$Ikona[$IconID]["Height"];$y++)
-for($x=0;$x<$Ikona[$IconID]["Width"];$x++)
- if($Ikona[$IconID]["Maska"][$x][$y]==1)
+$IsTransparent = false;  
+for ($y = 0; $y < $Ikona[$IconID]["Height"]; $y++)
+for ($x = 0; $x < $Ikona[$IconID]["Width"]; $x++)
+ if ($Ikona[$IconID]["Maska"][$x][$y] == 1)
   {
-   $IsTransparent=true;
+   $IsTransparent = true;
    break;
   };
-if($Ikona[$IconID]["BitCount"]==32)
+if ($Ikona[$IconID]["BitCount"] == 32)
 {
  imagealphablending($img, false);
- if(function_exists("imagesavealpha"))
-  imagesavealpha($img,true);
+ if (function_exists("imagesavealpha"))
+  imagesavealpha($img, true);
 };
 
-if($IsTransparent)
+if ($IsTransparent)
  {
-  if(($Ikona[$IconID]["BitCount"]>=24)or(imagecolorstotal($img)>=256))
+  if (($Ikona[$IconID]["BitCount"] >= 24) or (imagecolorstotal($img) >= 256))
    {
-   $img2=imagecreatetruecolor(imagesx($img),imagesy($img));
-   imagecopy($img2,$img,0,0,0,0,imagesx($img),imagesy($img));
+   $img2 = imagecreatetruecolor(imagesx($img), imagesy($img));
+   imagecopy($img2, $img, 0, 0, 0, 0, imagesx($img), imagesy($img));
    imagedestroy($img);
-   $img=$img2;
-   imagetruecolortopalette($img,true,255);
+   $img = $img2;
+   imagetruecolortopalette($img, true, 255);
 
    };
-    $Pruhledna=imagecolorallocate($img,0,0,0);
-    for($y=0;$y<$Ikona[$IconID]["Height"];$y++)
-     for($x=0;$x<$Ikona[$IconID]["Width"];$x++)
-      if($Ikona[$IconID]["Maska"][$x][$y]==1)
+    $Pruhledna = imagecolorallocate($img, 0, 0, 0);
+    for ($y = 0; $y < $Ikona[$IconID]["Height"]; $y++)
+     for ($x = 0; $x < $Ikona[$IconID]["Width"]; $x++)
+      if ($Ikona[$IconID]["Maska"][$x][$y] == 1)
        {
-        imagesetpixel($img,$x,$y,$Pruhledna);
+        imagesetpixel($img, $x, $y, $Pruhledna);
        };
-  imagecolortransparent($img,$Pruhledna);
+  imagecolortransparent($img, $Pruhledna);
  };
 
 return $img;
@@ -225,121 +225,121 @@ 
 
 
 
-function jpexs_readIcon($filename,$id,&$Ikona)
+function jpexs_readIcon($filename, $id, &$Ikona)
 {
 global $jpexs_currentBit;
 
-$f=fopen($filename,"rb");
+$f = fopen($filename, "rb");
 
-fseek($f,6+$id*16);
-  $Width=jpexs_freadbyte($f);
-  $Height=jpexs_freadbyte($f);
-fseek($f,6+$id*16+12);
-$OffSet=jpexs_freaddword($f);
-fseek($f,$OffSet);
+fseek($f, 6 + $id * 16);
+  $Width = jpexs_freadbyte($f);
+  $Height = jpexs_freadbyte($f);
+fseek($f, 6 + $id * 16 + 12);
+$OffSet = jpexs_freaddword($f);
+fseek($f, $OffSet);
 
-$p=$id;
+$p = $id;
 
-  $Ikona[$p]["Info"]["HeaderSize"]=jpexs_freadlngint($f);
-  $Ikona[$p]["Info"]["ImageWidth"]=jpexs_freadlngint($f);
-  $Ikona[$p]["Info"]["ImageHeight"]=jpexs_freadlngint($f);
-  $Ikona[$p]["Info"]["NumberOfImagePlanes"]=jpexs_freadword($f);
-  $Ikona[$p]["Info"]["BitsPerPixel"]=jpexs_freadword($f);
-  $Ikona[$p]["Info"]["CompressionMethod"]=jpexs_freadlngint($f);
-  $Ikona[$p]["Info"]["SizeOfBitmap"]=jpexs_freadlngint($f);
-  $Ikona[$p]["Info"]["HorzResolution"]=jpexs_freadlngint($f);
-  $Ikona[$p]["Info"]["VertResolution"]=jpexs_freadlngint($f);
-  $Ikona[$p]["Info"]["NumColorUsed"]=jpexs_freadlngint($f);
-  $Ikona[$p]["Info"]["NumSignificantColors"]=jpexs_freadlngint($f);
+  $Ikona[$p]["Info"]["HeaderSize"] = jpexs_freadlngint($f);
+  $Ikona[$p]["Info"]["ImageWidth"] = jpexs_freadlngint($f);
+  $Ikona[$p]["Info"]["ImageHeight"] = jpexs_freadlngint($f);
+  $Ikona[$p]["Info"]["NumberOfImagePlanes"] = jpexs_freadword($f);
+  $Ikona[$p]["Info"]["BitsPerPixel"] = jpexs_freadword($f);
+  $Ikona[$p]["Info"]["CompressionMethod"] = jpexs_freadlngint($f);
+  $Ikona[$p]["Info"]["SizeOfBitmap"] = jpexs_freadlngint($f);
+  $Ikona[$p]["Info"]["HorzResolution"] = jpexs_freadlngint($f);
+  $Ikona[$p]["Info"]["VertResolution"] = jpexs_freadlngint($f);
+  $Ikona[$p]["Info"]["NumColorUsed"] = jpexs_freadlngint($f);
+  $Ikona[$p]["Info"]["NumSignificantColors"] = jpexs_freadlngint($f);
 
 
- $biBitCount=$Ikona[$p]["Info"]["BitsPerPixel"];
+ $biBitCount = $Ikona[$p]["Info"]["BitsPerPixel"];
 
- if($Ikona[$p]["Info"]["BitsPerPixel"]<=8)
+ if ($Ikona[$p]["Info"]["BitsPerPixel"] <= 8)
   {
 
- $barev=pow(2,$biBitCount);
+ $barev = pow(2, $biBitCount);
 
-  for($b=0;$b<$barev;$b++)
+  for ($b = 0; $b < $barev; $b++)
     {
-    $Ikona[$p]["Paleta"][$b]["b"]=jpexs_freadbyte($f);
-    $Ikona[$p]["Paleta"][$b]["g"]=jpexs_freadbyte($f);
-    $Ikona[$p]["Paleta"][$b]["r"]=jpexs_freadbyte($f);
+    $Ikona[$p]["Paleta"][$b]["b"] = jpexs_freadbyte($f);
+    $Ikona[$p]["Paleta"][$b]["g"] = jpexs_freadbyte($f);
+    $Ikona[$p]["Paleta"][$b]["r"] = jpexs_freadbyte($f);
     jpexs_freadbyte($f);
     };
 
-$Zbytek=(4-ceil(($Width/(8/$biBitCount)))%4)%4;
+$Zbytek = (4 - ceil(($Width / (8 / $biBitCount))) % 4) % 4;
 
 
-for($y=$Height-1;$y>=0;$y--)
+for ($y = $Height - 1; $y >= 0; $y--)
     {
-     $jpexs_currentBit=0;
-     for($x=0;$x<$Width;$x++)
+     $jpexs_currentBit = 0;
+     for ($x = 0; $x < $Width; $x++)
       {
-         $C=jpexs_freadbits($f,$biBitCount);
-         $Ikona[$p]["Data"][$x][$y]=$C;
+         $C = jpexs_freadbits($f, $biBitCount);
+         $Ikona[$p]["Data"][$x][$y] = $C;
       };
 
-    if($jpexs_currentBit!=0) {jpexs_freadbyte($f);};
-    for($g=0;$g<$Zbytek;$g++)
+    if ($jpexs_currentBit != 0) {jpexs_freadbyte($f); };
+    for ($g = 0; $g < $Zbytek; $g++)
      jpexs_freadbyte($f);
      };
 
 }
-elseif($biBitCount==24)
+elseif ($biBitCount == 24)
 {
- $Zbytek=$Width%4;
+ $Zbytek = $Width % 4;
 
-   for($y=$Height-1;$y>=0;$y--)
+   for ($y = $Height - 1; $y >= 0; $y--)
     {
-     for($x=0;$x<$Width;$x++)
+     for ($x = 0; $x < $Width; $x++)
       {
-       $B=jpexs_freadbyte($f);
-       $G=jpexs_freadbyte($f);
-       $R=jpexs_freadbyte($f);
-       $Ikona[$p]["Data"][$x][$y]["r"]=$R;
-       $Ikona[$p]["Data"][$x][$y]["g"]=$G;
-       $Ikona[$p]["Data"][$x][$y]["b"]=$B;
+       $B = jpexs_freadbyte($f);
+       $G = jpexs_freadbyte($f);
+       $R = jpexs_freadbyte($f);
+       $Ikona[$p]["Data"][$x][$y]["r"] = $R;
+       $Ikona[$p]["Data"][$x][$y]["g"] = $G;
+       $Ikona[$p]["Data"][$x][$y]["b"] = $B;
       }
-    for($z=0;$z<$Zbytek;$z++)
+    for ($z = 0; $z < $Zbytek; $z++)
      jpexs_freadbyte($f);
    };
 }
-elseif($biBitCount==32)
+elseif ($biBitCount == 32)
 {
- $Zbytek=$Width%4;
+ $Zbytek = $Width % 4;
 
-   for($y=$Height-1;$y>=0;$y--)
+   for ($y = $Height - 1; $y >= 0; $y--)
     {
-     for($x=0;$x<$Width;$x++)
+     for ($x = 0; $x < $Width; $x++)
       {
-       $B=jpexs_freadbyte($f);
-       $G=jpexs_freadbyte($f);
-       $R=jpexs_freadbyte($f);
-       $Alpha=jpexs_freadbyte($f);
-       $Ikona[$p]["Data"][$x][$y]["r"]=$R;
-       $Ikona[$p]["Data"][$x][$y]["g"]=$G;
-       $Ikona[$p]["Data"][$x][$y]["b"]=$B;
-       $Ikona[$p]["Data"][$x][$y]["alpha"]=$Alpha;
+       $B = jpexs_freadbyte($f);
+       $G = jpexs_freadbyte($f);
+       $R = jpexs_freadbyte($f);
+       $Alpha = jpexs_freadbyte($f);
+       $Ikona[$p]["Data"][$x][$y]["r"] = $R;
+       $Ikona[$p]["Data"][$x][$y]["g"] = $G;
+       $Ikona[$p]["Data"][$x][$y]["b"] = $B;
+       $Ikona[$p]["Data"][$x][$y]["alpha"] = $Alpha;
       }
-    for($z=0;$z<$Zbytek;$z++)
+    for ($z = 0; $z < $Zbytek; $z++)
      jpexs_freadbyte($f);
    };
 };
 
 
 //Maska
-$Zbytek=(4-ceil(($Width/(8)))%4)%4;
-for($y=$Height-1;$y>=0;$y--)
+$Zbytek = (4 - ceil(($Width / (8))) % 4) % 4;
+for ($y = $Height - 1; $y >= 0; $y--)
     {
-     $jpexs_currentBit=0;
-     for($x=0;$x<$Width;$x++)
+     $jpexs_currentBit = 0;
+     for ($x = 0; $x < $Width; $x++)
       {
-         $C=jpexs_freadbits($f,1);
-         $Ikona[$p]["Maska"][$x][$y]=$C;
+         $C = jpexs_freadbits($f, 1);
+         $Ikona[$p]["Maska"][$x][$y] = $C;
       };
-    if($jpexs_currentBit!=0) {jpexs_freadbyte($f);};
-    for($g=0;$g<$Zbytek;$g++)
+    if ($jpexs_currentBit != 0) {jpexs_freadbyte($f); };
+    for ($g = 0; $g < $Zbytek; $g++)
      jpexs_freadbyte($f);
      };
 //--------------
@@ -352,28 +352,28 @@ 
 {
 global $jpexs_currentBit;
 
-$f=fopen($filename,"rb");
+$f = fopen($filename, "rb");
 
-$Reserved=jpexs_freadword($f);
-$Type=jpexs_freadword($f);
-$Count=jpexs_freadword($f);
-for($p=0;$p<$Count;$p++)
+$Reserved = jpexs_freadword($f);
+$Type = jpexs_freadword($f);
+$Count = jpexs_freadword($f);
+for ($p = 0; $p < $Count; $p++)
  {
-  $Ikona[$p]["Width"]=jpexs_freadbyte($f);
-  $Ikona[$p]["Height"]=jpexs_freadbyte($f);
-  $Ikona[$p]["ColorCount"]=jpexs_freadword($f);
- if($Ikona[$p]["ColorCount"]==0) $Ikona[$p]["ColorCount"]=256;
-  $Ikona[$p]["Planes"]=jpexs_freadword($f);
-  $Ikona[$p]["BitCount"]=jpexs_freadword($f);
-  $Ikona[$p]["BytesInRes"]=jpexs_freaddword($f);
-  $Ikona[$p]["ImageOffset"]=jpexs_freaddword($f);
+  $Ikona[$p]["Width"] = jpexs_freadbyte($f);
+  $Ikona[$p]["Height"] = jpexs_freadbyte($f);
+  $Ikona[$p]["ColorCount"] = jpexs_freadword($f);
+ if ($Ikona[$p]["ColorCount"] == 0) $Ikona[$p]["ColorCount"] = 256;
+  $Ikona[$p]["Planes"] = jpexs_freadword($f);
+  $Ikona[$p]["BitCount"] = jpexs_freadword($f);
+  $Ikona[$p]["BytesInRes"] = jpexs_freaddword($f);
+  $Ikona[$p]["ImageOffset"] = jpexs_freaddword($f);
  };
 
-if(!feof($f)):
-  for($p=0;$p<$Count;$p++)
+if (!feof($f)):
+  for ($p = 0; $p < $Count; $p++)
    {
-    fseek($f,$Ikona[$p]["ImageOffset"]+14);
-    $Ikona[$p]["Info"]["BitsPerPixel"]=jpexs_freadword($f);
+    fseek($f, $Ikona[$p]["ImageOffset"] + 14);
+    $Ikona[$p]["Info"]["BitsPerPixel"] = jpexs_freadword($f);
    };
 endif;
 fclose($f);
@@ -394,13 +394,13 @@ 
  * @param int $alphaBgB Background color B value for alpha-channel images (Default is White)
  * @return resource Image resource or false on error
  */
-function imageCreateFromExeIco($filename,$icoIndex,$icoColorCount=16,$icoSize=16,$alphaBgR=255,$alphaBgG=255,$alphaBgB=255)
+function imageCreateFromExeIco($filename, $icoIndex, $icoColorCount = 16, $icoSize = 16, $alphaBgR = 255, $alphaBgG = 255, $alphaBgB = 255)
 {
- $ok=saveExeIcon($filename,"icotemp.dat",$icoIndex);
- if(!$ok):
-  $im=false;
+ $ok = saveExeIcon($filename, "icotemp.dat", $icoIndex);
+ if (!$ok):
+  $im = false;
  else:
-   $im=imageCreateFromIco("icotemp.dat",$icoColorCount,$icoSize,$alphaBgR,$alphaBgG,$alphaBgB);
+   $im = imageCreateFromIco("icotemp.dat", $icoColorCount, $icoSize, $alphaBgR, $alphaBgG, $alphaBgB);
    unlink("icotemp.dat");
  endif;
  return $im;
@@ -417,77 +417,77 @@ 
  * @param int|array $iconIndex Index(es) of the icon in exefile  (Default -1) If -1, all icons are saved, Can be an array of indexes.
  * @return boolean True on successful save
  */
-function saveExeIcon($filename,$icoFileNameOrPath="",$iconIndex=-1) /*-1 for all,or can be array*/
-{
-  global $jpexs_f,$jpexs_StartOfRsrc,$jpexs_ImageBase,$jpexs_ResVirtualAddress;
-  $jpexs_f=fopen($filename,"r");
-  $MZ=fread($jpexs_f,2);
-  if($MZ!="MZ") NotValidExe();
-  fseek($jpexs_f,60);
-  $OffsetToNewHeader=jpexs_freaddword($jpexs_f);
-  fseek($jpexs_f,$OffsetToNewHeader);
-  $PE=fread($jpexs_f,2);
-  if($PE!="PE") NotValidExe();
-  fread($jpexs_f,4);
-  $NumberOfSections=jpexs_freadword($jpexs_f);
-  fseek($jpexs_f,ftell($jpexs_f)+12);
-  $SizeOfOptionalHeader=jpexs_freadword($jpexs_f);
-  $PosMagic=ftell($jpexs_f)+2;
-  fseek($jpexs_f,$PosMagic+$SizeOfOptionalHeader);
-
-  for($p=0;$p<$NumberOfSections;$p++):
-    $SectionName[$p]=trim(fread($jpexs_f,8));
-    $VirtualSize[$p]=jpexs_freaddword($jpexs_f);
-    $VirtualAddress[$p]=jpexs_freaddword($jpexs_f);
-    $PhysicalSize[$p]=jpexs_freaddword($jpexs_f);
-    $PhysicalOffset[$p]=jpexs_freaddword($jpexs_f);
-    fread($jpexs_f,16);
-    if($SectionName[$p]==".rsrc"):
-      $jpexs_ResVirtualAddress=$VirtualAddress[$p];
-      fseek($jpexs_f,$PhysicalOffset[$p]);
-      $jpexs_StartOfRsrc=$PhysicalOffset[$p];
-      jpexs_readResDirectoryEntry($R,$PhysicalOffset[$p]);
-      $IconCount=null;
-      $Ikona=null;
-      while (list ($key, $val) = each ($R["Subdir"])):
-        if($key==14):
-          $r=0;
-          while (list ($key2, $val2) = each ($R["Subdir"][$key]["Subdir"])):
-             while (list ($key3, $val3) = each ($R["Subdir"][$key]["Subdir"][$key2]["Subdir"])):
-               fseek($jpexs_f,$val3["DataOffset"]);
-               $Reserved=jpexs_freadword($jpexs_f);
-               $Type=jpexs_freadword($jpexs_f);
-               $ic=jpexs_freadword($jpexs_f);
-               $IconCount[]=$ic;
-               for($s=0;$s<$ic;$s++)
+function saveExeIcon($filename, $icoFileNameOrPath = "", $iconIndex = -1) /*-1 for all,or can be array*/
+{
+  global $jpexs_f, $jpexs_StartOfRsrc, $jpexs_ImageBase, $jpexs_ResVirtualAddress;
+  $jpexs_f = fopen($filename, "r");
+  $MZ = fread($jpexs_f, 2);
+  if ($MZ != "MZ") NotValidExe();
+  fseek($jpexs_f, 60);
+  $OffsetToNewHeader = jpexs_freaddword($jpexs_f);
+  fseek($jpexs_f, $OffsetToNewHeader);
+  $PE = fread($jpexs_f, 2);
+  if ($PE != "PE") NotValidExe();
+  fread($jpexs_f, 4);
+  $NumberOfSections = jpexs_freadword($jpexs_f);
+  fseek($jpexs_f, ftell($jpexs_f) + 12);
+  $SizeOfOptionalHeader = jpexs_freadword($jpexs_f);
+  $PosMagic = ftell($jpexs_f) + 2;
+  fseek($jpexs_f, $PosMagic + $SizeOfOptionalHeader);
+
+  for ($p = 0; $p < $NumberOfSections; $p++):
+    $SectionName[$p] = trim(fread($jpexs_f, 8));
+    $VirtualSize[$p] = jpexs_freaddword($jpexs_f);
+    $VirtualAddress[$p] = jpexs_freaddword($jpexs_f);
+    $PhysicalSize[$p] = jpexs_freaddword($jpexs_f);
+    $PhysicalOffset[$p] = jpexs_freaddword($jpexs_f);
+    fread($jpexs_f, 16);
+    if ($SectionName[$p] == ".rsrc"):
+      $jpexs_ResVirtualAddress = $VirtualAddress[$p];
+      fseek($jpexs_f, $PhysicalOffset[$p]);
+      $jpexs_StartOfRsrc = $PhysicalOffset[$p];
+      jpexs_readResDirectoryEntry($R, $PhysicalOffset[$p]);
+      $IconCount = null;
+      $Ikona = null;
+      while (list ($key, $val) = each($R["Subdir"])):
+        if ($key == 14):
+          $r = 0;
+          while (list ($key2, $val2) = each($R["Subdir"][$key]["Subdir"])):
+             while (list ($key3, $val3) = each($R["Subdir"][$key]["Subdir"][$key2]["Subdir"])):
+               fseek($jpexs_f, $val3["DataOffset"]);
+               $Reserved = jpexs_freadword($jpexs_f);
+               $Type = jpexs_freadword($jpexs_f);
+               $ic = jpexs_freadword($jpexs_f);
+               $IconCount[] = $ic;
+               for ($s = 0; $s < $ic; $s++)
                 {
-                 $Ikona[$r][$s]["Width"]=jpexs_freadbyte($jpexs_f);
-                 $Ikona[$r][$s]["Height"]=jpexs_freadbyte($jpexs_f);
-                 $Ikona[$r][$s]["ColorCount"]=jpexs_freadword($jpexs_f);
-                 $Ikona[$r][$s]["Planes"]=jpexs_freadword($jpexs_f);
-                 $Ikona[$r][$s]["BitCount"]=jpexs_freadword($jpexs_f);
-                 $Ikona[$r][$s]["BytesInRes"]=jpexs_freaddword($jpexs_f);
-                 $Ikona[$r][$s]["IconId"]=jpexs_freadword($jpexs_f);
+                 $Ikona[$r][$s]["Width"] = jpexs_freadbyte($jpexs_f);
+                 $Ikona[$r][$s]["Height"] = jpexs_freadbyte($jpexs_f);
+                 $Ikona[$r][$s]["ColorCount"] = jpexs_freadword($jpexs_f);
+                 $Ikona[$r][$s]["Planes"] = jpexs_freadword($jpexs_f);
+                 $Ikona[$r][$s]["BitCount"] = jpexs_freadword($jpexs_f);
+                 $Ikona[$r][$s]["BytesInRes"] = jpexs_freaddword($jpexs_f);
+                 $Ikona[$r][$s]["IconId"] = jpexs_freadword($jpexs_f);
                 };
-               fseek($jpexs_f,$val3["DataOffset"]);
+               fseek($jpexs_f, $val3["DataOffset"]);
                $r++;
              endwhile;
           endwhile;
         endif;
       endwhile;
 
-      reset ($R["Subdir"]);
-
-      while (list ($key, $val) = each ($R["Subdir"])):
-        if($key==3):
-          while (list ($key2, $val2) = each ($R["Subdir"][$key]["Subdir"])):
-          for($r=0;$r<count($Ikona);$r++):
-           for($s=0;$s<count($Ikona[$r]);$s++):
-             while (list ($key3, $val3) = each ($R["Subdir"][$key]["Subdir"][$Ikona[$r][$s]["IconId"]]["Subdir"])):
-               if(($iconIndex==$r)or($iconIndex==-1)or((is_array($iconIndex))and(in_array($r,$iconIndex)))):
-                 fseek($jpexs_f,$val3["DataOffset"]);
-                 $Ikona[$r][$s]["Data"]=fread($jpexs_f,$val3["DataSize"]);
-                 $Ikona[$r][$s]["DataSize"]=$val3["DataSize"];
+      reset($R["Subdir"]);
+
+      while (list ($key, $val) = each($R["Subdir"])):
+        if ($key == 3):
+          while (list ($key2, $val2) = each($R["Subdir"][$key]["Subdir"])):
+          for ($r = 0; $r < count($Ikona); $r++):
+           for ($s = 0; $s < count($Ikona[$r]); $s++):
+             while (list ($key3, $val3) = each($R["Subdir"][$key]["Subdir"][$Ikona[$r][$s]["IconId"]]["Subdir"])):
+               if (($iconIndex == $r) or ($iconIndex == -1) or ((is_array($iconIndex)) and (in_array($r, $iconIndex)))):
+                 fseek($jpexs_f, $val3["DataOffset"]);
+                 $Ikona[$r][$s]["Data"] = fread($jpexs_f, $val3["DataSize"]);
+                 $Ikona[$r][$s]["DataSize"] = $val3["DataSize"];
                endif;
              endwhile;
            endfor;
@@ -495,39 +495,39 @@ 
           endwhile;
         endif;
       endwhile;
-      $ok=false;
-      for($r=0;$r<count($Ikona);$r++):
-        if(($iconIndex==$r)or($iconIndex==-1)or((is_array($iconIndex))and(in_array($r,$iconIndex)))):
-          $savefile=$icoFileNameOrPath;
-          if($icoFileNameOrPath=="")
+      $ok = false;
+      for ($r = 0; $r < count($Ikona); $r++):
+        if (($iconIndex == $r) or ($iconIndex == -1) or ((is_array($iconIndex)) and (in_array($r, $iconIndex)))):
+          $savefile = $icoFileNameOrPath;
+          if ($icoFileNameOrPath == "")
            {
-             $savefile="$r.ico";
+             $savefile = "$r.ico";
            }
            else
            {
-            if(($iconIndex==-1)or(is_array($iconIndex)))
-              $savefile=$icoFileNameOrPath."$r.ico";
+            if (($iconIndex == -1) or (is_array($iconIndex)))
+              $savefile = $icoFileNameOrPath."$r.ico";
            };
-          $f2=fopen($savefile,"w");
-          fwrite($f2,jpexs_inttoword(0));
-          fwrite($f2,jpexs_inttoword(1));
-          fwrite($f2,jpexs_inttoword(count($Ikona[$r])));
-          $Offset=6+16*count($Ikona[$r]);
-          for($s=0;$s<count($Ikona[$r]);$s++):
-            fwrite($f2,jpexs_inttobyte($Ikona[$r][$s]["Width"]));
-            fwrite($f2,jpexs_inttobyte($Ikona[$r][$s]["Height"]));
-            fwrite($f2,jpexs_inttoword($Ikona[$r][$s]["ColorCount"]));
-            fwrite($f2,jpexs_inttoword($Ikona[$r][$s]["Planes"]));
-            fwrite($f2,jpexs_inttoword($Ikona[$r][$s]["BitCount"]));
-            fwrite($f2,jpexs_inttodword($Ikona[$r][$s]["BytesInRes"]));
-            fwrite($f2,jpexs_inttodword($Offset));
-            $Offset+=$Ikona[$r][$s]["DataSize"];
+          $f2 = fopen($savefile, "w");
+          fwrite($f2, jpexs_inttoword(0));
+          fwrite($f2, jpexs_inttoword(1));
+          fwrite($f2, jpexs_inttoword(count($Ikona[$r])));
+          $Offset = 6 + 16 * count($Ikona[$r]);
+          for ($s = 0; $s < count($Ikona[$r]); $s++):
+            fwrite($f2, jpexs_inttobyte($Ikona[$r][$s]["Width"]));
+            fwrite($f2, jpexs_inttobyte($Ikona[$r][$s]["Height"]));
+            fwrite($f2, jpexs_inttoword($Ikona[$r][$s]["ColorCount"]));
+            fwrite($f2, jpexs_inttoword($Ikona[$r][$s]["Planes"]));
+            fwrite($f2, jpexs_inttoword($Ikona[$r][$s]["BitCount"]));
+            fwrite($f2, jpexs_inttodword($Ikona[$r][$s]["BytesInRes"]));
+            fwrite($f2, jpexs_inttodword($Offset));
+            $Offset += $Ikona[$r][$s]["DataSize"];
           endfor;
-          for($s=0;$s<count($Ikona[$r]);$s++):
-            fwrite($f2,$Ikona[$r][$s]["Data"]);
+          for ($s = 0; $s < count($Ikona[$r]); $s++):
+            fwrite($f2, $Ikona[$r][$s]["Data"]);
           endfor;
           fclose($f2);
-          $ok=true;
+          $ok = true;
         endif;
       endfor;
       return $ok;
@@ -540,212 +540,212 @@ 
 /**
  * Internal function for reading exe icons
  */
-function jpexs_readResDirectoryEntry(&$parentRes,$offset)
+function jpexs_readResDirectoryEntry(&$parentRes, $offset)
 {
-global $jpexs_f,$jpexs_StartOfRsrc,$jpexs_ImageBase,$jpexs_ResVirtualAddress;
-$lastPos=ftell($jpexs_f);
-$Res=null;
-fseek($jpexs_f,$offset);
+global $jpexs_f, $jpexs_StartOfRsrc, $jpexs_ImageBase, $jpexs_ResVirtualAddress;
+$lastPos = ftell($jpexs_f);
+$Res = null;
+fseek($jpexs_f, $offset);
 //IMAGE_RESOURCE_DIRECTORY
-      $Characteristics=jpexs_freaddword($jpexs_f);
-      $TimeDateStamp=jpexs_freaddword($jpexs_f);
-      $MajorVersion=jpexs_freadword($jpexs_f);
-      $MinorVersion=jpexs_freadword($jpexs_f);
-      $NumberOfNamedEntries=jpexs_freadword($jpexs_f);
-      $NumberOfIdEntries=jpexs_freadword($jpexs_f);
-      for($q=0;$q<$NumberOfNamedEntries+$NumberOfIdEntries;$q++):
+      $Characteristics = jpexs_freaddword($jpexs_f);
+      $TimeDateStamp = jpexs_freaddword($jpexs_f);
+      $MajorVersion = jpexs_freadword($jpexs_f);
+      $MinorVersion = jpexs_freadword($jpexs_f);
+      $NumberOfNamedEntries = jpexs_freadword($jpexs_f);
+      $NumberOfIdEntries = jpexs_freadword($jpexs_f);
+      for ($q = 0; $q < $NumberOfNamedEntries + $NumberOfIdEntries; $q++):
         //IMAGE_RESOURCE_DIRECTORY_ENTRY
-        $ResName=jpexs_freaddword($jpexs_f);
-        $lastPos2=ftell($jpexs_f);
-        if($ResName>=0x80000000):
+        $ResName = jpexs_freaddword($jpexs_f);
+        $lastPos2 = ftell($jpexs_f);
+        if ($ResName >= 0x80000000):
           //String Name
-          $ResNameOffset=$ResName-0x80000000;
-          fseek($jpexs_f,$jpexs_StartOfRsrc+$ResNameOffset);
-          $StringLength=jpexs_freadword($jpexs_f);
-          $Identificator=(fread($jpexs_f,$StringLength*2));
-          fseek($jpexs_f,$lastPos2);
+          $ResNameOffset = $ResName - 0x80000000;
+          fseek($jpexs_f, $jpexs_StartOfRsrc + $ResNameOffset);
+          $StringLength = jpexs_freadword($jpexs_f);
+          $Identificator = (fread($jpexs_f, $StringLength * 2));
+          fseek($jpexs_f, $lastPos2);
         else:
           //Integer Id
-          $Identificator=$ResName;
+          $Identificator = $ResName;
         endif;
 
-        $ResOffsetToData=jpexs_freaddword($jpexs_f);
-        if($ResOffsetToData>=0x80000000):
-          $SubResOffset=$ResOffsetToData-0x80000000;
-          jpexs_readResDirectoryEntry($Res["$Identificator"],$jpexs_StartOfRsrc+$SubResOffset);
+        $ResOffsetToData = jpexs_freaddword($jpexs_f);
+        if ($ResOffsetToData >= 0x80000000):
+          $SubResOffset = $ResOffsetToData - 0x80000000;
+          jpexs_readResDirectoryEntry($Res["$Identificator"], $jpexs_StartOfRsrc + $SubResOffset);
         else:
-          $RawDataOffset=$ResOffsetToData;
-          $lastPos2=ftell($jpexs_f);
-          fseek($jpexs_f,$jpexs_StartOfRsrc+$RawDataOffset);
+          $RawDataOffset = $ResOffsetToData;
+          $lastPos2 = ftell($jpexs_f);
+          fseek($jpexs_f, $jpexs_StartOfRsrc + $RawDataOffset);
           //IMAGE_RESOURCE_DATA_ENTRY
-          $OffsetToData=jpexs_freaddword($jpexs_f);
-          $Res["$Identificator"]["DataOffset"]=$jpexs_StartOfRsrc-$jpexs_ResVirtualAddress+$OffsetToData;
-          $Res["$Identificator"]["DataSize"]=jpexs_freaddword($jpexs_f);
-          $CodePage=jpexs_freaddword($jpexs_f);
-          $Reserved=jpexs_freaddword($jpexs_f);
-          fseek($jpexs_f,$lastPos2);
+          $OffsetToData = jpexs_freaddword($jpexs_f);
+          $Res["$Identificator"]["DataOffset"] = $jpexs_StartOfRsrc - $jpexs_ResVirtualAddress + $OffsetToData;
+          $Res["$Identificator"]["DataSize"] = jpexs_freaddword($jpexs_f);
+          $CodePage = jpexs_freaddword($jpexs_f);
+          $Reserved = jpexs_freaddword($jpexs_f);
+          fseek($jpexs_f, $lastPos2);
         endif;
       endfor;
-fseek($jpexs_f,$lastPos);
-$parentRes["Subdir"]=$Res;
+fseek($jpexs_f, $lastPos);
+$parentRes["Subdir"] = $Res;
 };
 
 /**
  * Creates ico file from image resource(s)
  * @param resource|array $images Target Image resource (Can be array of image resources)
  * @param string $filename Target ico file to save icon to, If ommited or "", image is written to snadard output - use header("Content-type: image/x-icon"); */
-function imageIco($images,$filename="")
+function imageIco($images, $filename = "")
 {
 
-if(is_array($images))
+if (is_array($images))
 {
-$ImageCount=count($images);
-$Image=$images;
+$ImageCount = count($images);
+$Image = $images;
 }
 else
 {
-$Image[0]=$images;
-$ImageCount=1;
+$Image[0] = $images;
+$ImageCount = 1;
 };
 
 
-$WriteToFile=false;
+$WriteToFile = false;
 
-if($filename!="")
+if ($filename != "")
 {
-$WriteToFile=true;
+$WriteToFile = true;
 };
 
 
-$ret="";
+$ret = "";
 
-$ret.=jpexs_inttoword(0); //PASSWORD
-$ret.=jpexs_inttoword(1); //SOURCE
-$ret.=jpexs_inttoword($ImageCount); //ICONCOUNT
+$ret .= jpexs_inttoword(0); //PASSWORD
+$ret .= jpexs_inttoword(1); //SOURCE
+$ret .= jpexs_inttoword($ImageCount); //ICONCOUNT
 
 
-for($q=0;$q<$ImageCount;$q++)
+for ($q = 0; $q < $ImageCount; $q++)
 {
-$img=$Image[$q];
+$img = $Image[$q];
 
-$Width=imagesx($img);
-$Height=imagesy($img);
+$Width = imagesx($img);
+$Height = imagesy($img);
 
-$ColorCount=imagecolorstotal($img);
+$ColorCount = imagecolorstotal($img);
 
-$Transparent=imagecolortransparent($img);
-$IsTransparent=$Transparent!=-1;
+$Transparent = imagecolortransparent($img);
+$IsTransparent = $Transparent != -1;
 
 
-if($IsTransparent) $ColorCount--;
+if ($IsTransparent) $ColorCount--;
 
-if($ColorCount==0) {$ColorCount=0; $BitCount=24;};
-if(($ColorCount>0)and($ColorCount<=2)) {$ColorCount=2; $BitCount=1;};
-if(($ColorCount>2)and($ColorCount<=16)) { $ColorCount=16; $BitCount=4;};
-if(($ColorCount>16)and($ColorCount<=256)) { $ColorCount=0; $BitCount=8;};
+if ($ColorCount == 0) {$ColorCount = 0; $BitCount = 24; };
+if (($ColorCount > 0) and ($ColorCount <= 2)) {$ColorCount = 2; $BitCount = 1; };
+if (($ColorCount > 2) and ($ColorCount <= 16)) { $ColorCount = 16; $BitCount = 4; };
+if (($ColorCount > 16) and ($ColorCount <= 256)) { $ColorCount = 0; $BitCount = 8; };
 
 
 
 
 
 //ICONINFO:
-$ret.=jpexs_inttobyte($Width);//
-$ret.=jpexs_inttobyte($Height);//
-$ret.=jpexs_inttobyte($ColorCount);//
-$ret.=jpexs_inttobyte(0);//RESERVED
-
-$Planes=0;
-if($BitCount>=8) $Planes=1;
-
-$ret.=jpexs_inttoword($f,$Planes);//PLANES
-if($BitCount>=8) $WBitCount=$BitCount;
-if($BitCount==4) $WBitCount=0;
-if($BitCount==1) $WBitCount=0;
-$ret.=jpexs_inttoword($WBitCount);//BITS
-
-$Zbytek=(4-($Width/(8/$BitCount))%4)%4;
-$ZbytekMask=(4-($Width/8)%4)%4;
-
-$PalSize=0;
-
-$Size=40+($Width/(8/$BitCount)+$Zbytek)*$Height+(($Width/8+$ZbytekMask) * $Height);
-if($BitCount<24)
- $Size+=pow(2,$BitCount)*4;
-$IconId=1;
-$ret.=jpexs_inttodword($Size); //SIZE
-$OffSet=6+16*$ImageCount+$FullSize;
-$ret.=jpexs_inttodword(6+16*$ImageCount+$FullSize);//OFFSET
-$FullSize+=$Size;
+$ret .= jpexs_inttobyte($Width); //
+$ret .= jpexs_inttobyte($Height); //
+$ret .= jpexs_inttobyte($ColorCount); //
+$ret .= jpexs_inttobyte(0); //RESERVED
+
+$Planes = 0;
+if ($BitCount >= 8) $Planes = 1;
+
+$ret .= jpexs_inttoword($f, $Planes); //PLANES
+if ($BitCount >= 8) $WBitCount = $BitCount;
+if ($BitCount == 4) $WBitCount = 0;
+if ($BitCount == 1) $WBitCount = 0;
+$ret .= jpexs_inttoword($WBitCount); //BITS
+
+$Zbytek = (4 - ($Width / (8 / $BitCount)) % 4) % 4;
+$ZbytekMask = (4 - ($Width / 8) % 4) % 4;
+
+$PalSize = 0;
+
+$Size = 40 + ($Width / (8 / $BitCount) + $Zbytek) * $Height + (($Width / 8 + $ZbytekMask) * $Height);
+if ($BitCount < 24)
+ $Size += pow(2, $BitCount) * 4;
+$IconId = 1;
+$ret .= jpexs_inttodword($Size); //SIZE
+$OffSet = 6 + 16 * $ImageCount + $FullSize;
+$ret .= jpexs_inttodword(6 + 16 * $ImageCount + $FullSize); //OFFSET
+$FullSize += $Size;
 //-------------
 
 };
 
 
-for($q=0;$q<$ImageCount;$q++)
+for ($q = 0; $q < $ImageCount; $q++)
 {
-$img=$Image[$q];
-$Width=imagesx($img);
-$Height=imagesy($img);
-$ColorCount=imagecolorstotal($img);
+$img = $Image[$q];
+$Width = imagesx($img);
+$Height = imagesy($img);
+$ColorCount = imagecolorstotal($img);
 
-$Transparent=imagecolortransparent($img);
-$IsTransparent=$Transparent!=-1;
+$Transparent = imagecolortransparent($img);
+$IsTransparent = $Transparent != -1;
 
-if($IsTransparent) $ColorCount--;
-if($ColorCount==0) {$ColorCount=0; $BitCount=24;};
-if(($ColorCount>0)and($ColorCount<=2)) {$ColorCount=2; $BitCount=1;};
-if(($ColorCount>2)and($ColorCount<=16)) { $ColorCount=16; $BitCount=4;};
-if(($ColorCount>16)and($ColorCount<=256)) { $ColorCount=0; $BitCount=8;};
+if ($IsTransparent) $ColorCount--;
+if ($ColorCount == 0) {$ColorCount = 0; $BitCount = 24; };
+if (($ColorCount > 0) and ($ColorCount <= 2)) {$ColorCount = 2; $BitCount = 1; };
+if (($ColorCount > 2) and ($ColorCount <= 16)) { $ColorCount = 16; $BitCount = 4; };
+if (($ColorCount > 16) and ($ColorCount <= 256)) { $ColorCount = 0; $BitCount = 8; };
 
 
 
 //ICONS
-$ret.=jpexs_inttodword(40);//HEADSIZE
-$ret.=jpexs_inttodword($Width);//
-$ret.=jpexs_inttodword(2*$Height);//
-$ret.=jpexs_inttoword(1); //PLANES
-$ret.=jpexs_inttoword($BitCount);   //
-$ret.=jpexs_inttodword(0);//Compress method
+$ret .= jpexs_inttodword(40); //HEADSIZE
+$ret .= jpexs_inttodword($Width); //
+$ret .= jpexs_inttodword(2 * $Height); //
+$ret .= jpexs_inttoword(1); //PLANES
+$ret .= jpexs_inttoword($BitCount); //
+$ret .= jpexs_inttodword(0); //Compress method
 
 
-$ZbytekMask=($Width/8)%4;
+$ZbytekMask = ($Width / 8) % 4;
 
-$Zbytek=($Width/(8/$BitCount))%4;
-$Size=($Width/(8/$BitCount)+$Zbytek)*$Height+(($Width/8+$ZbytekMask) * $Height);
+$Zbytek = ($Width / (8 / $BitCount)) % 4;
+$Size = ($Width / (8 / $BitCount) + $Zbytek) * $Height + (($Width / 8 + $ZbytekMask) * $Height);
 
-$ret.=jpexs_inttodword($Size);//SIZE
+$ret .= jpexs_inttodword($Size); //SIZE
 
-$ret.=jpexs_inttodword(0);//HPIXEL_M
-$ret.=jpexs_inttodword(0);//V_PIXEL_M
-$ret.=jpexs_inttodword($ColorCount); //UCOLORS
-$ret.=jpexs_inttodword(0); //DCOLORS
+$ret .= jpexs_inttodword(0); //HPIXEL_M
+$ret .= jpexs_inttodword(0); //V_PIXEL_M
+$ret .= jpexs_inttodword($ColorCount); //UCOLORS
+$ret .= jpexs_inttodword(0); //DCOLORS
 //---------------
 
 
-$CC=$ColorCount;
-if($CC==0) $CC=256;
+$CC = $ColorCount;
+if ($CC == 0) $CC = 256;
 
-if($BitCount<24)
+if ($BitCount < 24)
 {
- $ColorTotal=imagecolorstotal($img);
- if($IsTransparent) $ColorTotal--;
+ $ColorTotal = imagecolorstotal($img);
+ if ($IsTransparent) $ColorTotal--;
 
- for($p=0;$p<$ColorTotal;$p++)
+ for ($p = 0; $p < $ColorTotal; $p++)
   {
-   $color=imagecolorsforindex($img,$p);
-   $ret.=jpexs_inttobyte($color["blue"]);
-   $ret.=jpexs_inttobyte($color["green"]);
-   $ret.=jpexs_inttobyte($color["red"]);
-   $ret.=jpexs_inttobyte(0); //RESERVED
+   $color = imagecolorsforindex($img, $p);
+   $ret .= jpexs_inttobyte($color["blue"]);
+   $ret .= jpexs_inttobyte($color["green"]);
+   $ret .= jpexs_inttobyte($color["red"]);
+   $ret .= jpexs_inttobyte(0); //RESERVED
   };
 
- $CT=$ColorTotal;
- for($p=$ColorTotal;$p<$CC;$p++)
+ $CT = $ColorTotal;
+ for ($p = $ColorTotal; $p < $CC; $p++)
   {
-   $ret.=jpexs_inttobyte(0);
-   $ret.=jpexs_inttobyte(0);
-   $ret.=jpexs_inttobyte(0);
-   $ret.=jpexs_inttobyte(0); //RESERVED
+   $ret .= jpexs_inttobyte(0);
+   $ret .= jpexs_inttobyte(0);
+   $ret .= jpexs_inttobyte(0);
+   $ret .= jpexs_inttobyte(0); //RESERVED
   };
 };
 
@@ -754,88 +754,88 @@ 
 
 
 
-if($BitCount<=8)
+if ($BitCount <= 8)
 {
 
- for($y=$Height-1;$y>=0;$y--)
+ for ($y = $Height - 1; $y >= 0; $y--)
  {
-  $bWrite="";
-  for($x=0;$x<$Width;$x++)
+  $bWrite = "";
+  for ($x = 0; $x < $Width; $x++)
    {
-   $color=imagecolorat($img,$x,$y);
-   if($color==$Transparent)
-    $color=imagecolorexact($img,0,0,0);
-   if($color==-1) $color=0;
-   if($color>pow(2,$BitCount)-1) $color=0;
-
-   $bWrite.=jpexs_decbinx($color,$BitCount);
-   if(strlen($bWrite)==8)
+   $color = imagecolorat($img, $x, $y);
+   if ($color == $Transparent)
+    $color = imagecolorexact($img, 0, 0, 0);
+   if ($color == -1) $color = 0;
+   if ($color > pow(2, $BitCount) - 1) $color = 0;
+
+   $bWrite .= jpexs_decbinx($color, $BitCount);
+   if (strlen($bWrite) == 8)
     {
-     $ret.=jpexs_inttobyte(bindec($bWrite));
-     $bWrite="";
+     $ret .= jpexs_inttobyte(bindec($bWrite));
+     $bWrite = "";
     };
    };
 
-  if((strlen($bWrite)<8)and(strlen($bWrite)!=0))
+  if ((strlen($bWrite) < 8) and (strlen($bWrite) != 0))
     {
-     $sl=strlen($bWrite);
-     for($t=0;$t<8-$sl;$t++)
-      $sl.="0";
-     $ret.=jpexs_inttobyte(bindec($bWrite));
+     $sl = strlen($bWrite);
+     for ($t = 0; $t < 8 - $sl; $t++)
+      $sl .= "0";
+     $ret .= jpexs_inttobyte(bindec($bWrite));
     };
-  for($z=0;$z<$Zbytek;$z++)
-   $ret.=jpexs_inttobyte(0);
+  for ($z = 0; $z < $Zbytek; $z++)
+   $ret .= jpexs_inttobyte(0);
  };
 };
 
 
 
-if($BitCount>=24)
+if ($BitCount >= 24)
 {
- for($y=$Height-1;$y>=0;$y--)
+ for ($y = $Height - 1; $y >= 0; $y--)
  {
-  for($x=0;$x<$Width;$x++)
+  for ($x = 0; $x < $Width; $x++)
    {
-   $color=imagecolorsforindex($img,imagecolorat($img,$x,$y));
-   $ret.=jpexs_inttobyte($color["blue"]);
-   $ret.=jpexs_inttobyte($color["green"]);
-   $ret.=jpexs_inttobyte($color["red"]);
-   if($BitCount==32)
-    $ret.=jpexs_inttobyte(0);//Alpha for ICO_XP_COLORS
+   $color = imagecolorsforindex($img, imagecolorat($img, $x, $y));
+   $ret .= jpexs_inttobyte($color["blue"]);
+   $ret .= jpexs_inttobyte($color["green"]);
+   $ret .= jpexs_inttobyte($color["red"]);
+   if ($BitCount == 32)
+    $ret .= jpexs_inttobyte(0); //Alpha for ICO_XP_COLORS
    };
-  for($z=0;$z<$Zbytek;$z++)
-   $ret.=jpexs_inttobyte(0);
+  for ($z = 0; $z < $Zbytek; $z++)
+   $ret .= jpexs_inttobyte(0);
  };
 };
 
 
 //MASK
 
- for($y=$Height-1;$y>=0;$y--)
+ for ($y = $Height - 1; $y >= 0; $y--)
  {
-  $byteCount=0;
-  $bOut="";
-  for($x=0;$x<$Width;$x++)
+  $byteCount = 0;
+  $bOut = "";
+  for ($x = 0; $x < $Width; $x++)
    {
-    if(($Transparent!=-1)and(imagecolorat($img,$x,$y)==$Transparent))
+    if (($Transparent != -1) and (imagecolorat($img, $x, $y) == $Transparent))
      {
-      $bOut.="1";
+      $bOut .= "1";
      }
      else
      {
-      $bOut.="0";
+      $bOut .= "0";
      };
    };
-  for($p=0;$p<strlen($bOut);$p+=8)
+  for ($p = 0; $p < strlen($bOut); $p += 8)
   {
-   $byte=bindec(substr($bOut,$p,8));
+   $byte = bindec(substr($bOut, $p, 8));
    $byteCount++;
-   $ret.=jpexs_inttobyte($byte);
+   $ret .= jpexs_inttobyte($byte);
   };
- $Zbytek=$byteCount%4;
-  for($z=0;$z<$Zbytek;$z++)
+ $Zbytek = $byteCount % 4;
+  for ($z = 0; $z < $Zbytek; $z++)
    {
-   $ret.=jpexs_inttobyte(0xff);
+   $ret .= jpexs_inttobyte(0xff);
    };
  };
 
@@ -847,10 +847,10 @@ 
 
 
 
-if($WriteToFile)
+if ($WriteToFile)
 {
- $f=fopen($filename,"w");
- fwrite($f,$ret);
+ $f = fopen($filename, "w");
+ fwrite($f, $ret);
  fclose($f);
 }
 else
@@ -881,57 +881,57 @@ 
 
 function jpexs_decbin8($d)
 {
-return jpexs_decbinx($d,8);
+return jpexs_decbinx($d, 8);
 };
 
-function jpexs_decbinx($d,$n)
+function jpexs_decbinx($d, $n)
 {
-$bin=decbin($d);
-$sbin=strlen($bin);
-for($j=0;$j<$n-$sbin;$j++)
- $bin="0$bin";
+$bin = decbin($d);
+$sbin = strlen($bin);
+for ($j = 0; $j < $n - $sbin; $j++)
+ $bin = "0$bin";
 return $bin;
 };
 
-function jpexs_retBits($byte,$start,$len)
+function jpexs_retBits($byte, $start, $len)
 {
-$bin=jpexs_decbin8($byte);
-$r=bindec(substr($bin,$start,$len));
+$bin = jpexs_decbin8($byte);
+$r = bindec(substr($bin, $start, $len));
 return $r;
 
 };
 
 
 
-$jpexs_currentBit=0;
-function jpexs_freadbits($f,$count)
+$jpexs_currentBit = 0;
+function jpexs_freadbits($f, $count)
 {
- global $jpexs_currentBit,$jpexs_SMode;
- $Byte=jpexs_freadbyte($f);
- $LastCBit=$jpexs_currentBit;
- $jpexs_currentBit+=$count;
- if($jpexs_currentBit==8)
+ global $jpexs_currentBit, $jpexs_SMode;
+ $Byte = jpexs_freadbyte($f);
+ $LastCBit = $jpexs_currentBit;
+ $jpexs_currentBit += $count;
+ if ($jpexs_currentBit == 8)
   {
-   $jpexs_currentBit=0;
+   $jpexs_currentBit = 0;
   }
  else
   {
-   fseek($f,ftell($f)-1);
+   fseek($f, ftell($f) - 1);
   };
- return jpexs_retBits($Byte,$LastCBit,$count);
+ return jpexs_retBits($Byte, $LastCBit, $count);
 };
 
 
 function jpexs_freadbyte($f)
 {
- return ord(fread($f,1));
+ return ord(fread($f, 1));
 };
 
 function jpexs_freadword($f)
 {
- $b1=jpexs_freadbyte($f);
- $b2=jpexs_freadbyte($f);
- return $b2*256+$b1;
+ $b1 = jpexs_freadbyte($f);
+ $b2 = jpexs_freadbyte($f);
+ return $b2 * 256 + $b1;
 };
 
 
@@ -942,9 +942,9 @@ 
 
 function jpexs_freaddword($f)
 {
- $b1=jpexs_freadword($f);
- $b2=jpexs_freadword($f);
- return $b2*65536+$b1;
+ $b1 = jpexs_freadword($f);
+ $b2 = jpexs_freadword($f);
+ return $b2 * 65536 + $b1;
 };
 
 function jpexs_inttobyte($n)
@@ -954,12 +954,12 @@ 
 
 function jpexs_inttodword($n)
 {
-return chr($n & 255).chr(($n >> 8) & 255).chr(($n >> 16) & 255).chr(($n >> 24) & 255);
+return chr($n&255).chr(($n >> 8)&255).chr(($n >> 16)&255).chr(($n >> 24)&255);
 };
 
 function jpexs_inttoword($n)
  {
- return chr($n & 255).chr(($n >> 8) & 255);
+ return chr($n&255).chr(($n >> 8)&255);
  };
 
 ?>
\ No newline at end of file

Braces +158 added lines, -85 removed lines

@@ -87,37 +87,54 @@ 
 for($p=0;$p<count($Ikona);$p++)
 {
 
-if(($ColMax==-1)or($Ikona[$p]["NumberOfColors"]>=$Ikona[$ColMax]["NumberOfColors"]))
-if(($icoSize==$Ikona[$p]["Width"])or($icoSize==ICO_MAX_SIZE))
+if(($ColMax==-1)or($Ikona[$p]["NumberOfColors"]>=$Ikona[$ColMax]["NumberOfColors"])) {
+	if(($icoSize==$Ikona[$p]["Width"])or($icoSize==ICO_MAX_SIZE))
  {
   $ColMax=$p;
+}
  };
 
-if(($SizeMax==-1)or($Ikona[$p]["Width"]>=$Ikona[$SizeMax]["Width"]))
-if(($icoColorCount==$Ikona[$p]["NumberOfColors"])or($icoColorCount==ICO_MAX_COLOR))
+if(($SizeMax==-1)or($Ikona[$p]["Width"]>=$Ikona[$SizeMax]["Width"])) {
+	if(($icoColorCount==$Ikona[$p]["NumberOfColors"])or($icoColorCount==ICO_MAX_COLOR))
  {
    $SizeMax=$p;
+}
  };
 
 
-if($Ikona[$p]["NumberOfColors"]==$icoColorCount)
-if($Ikona[$p]["Width"]==$icoSize)
+if($Ikona[$p]["NumberOfColors"]==$icoColorCount) {
+	if($Ikona[$p]["Width"]==$icoSize)
  {
 
  $IconID=$p;
+}
  };
 };
 
-  if($icoColorCount==ICO_MAX_COLOR) $IconID=$ColMax;
-  if($icoSize==ICO_MAX_SIZE) $IconID=$SizeMax;
+  if($icoColorCount==ICO_MAX_COLOR) {
+  	$IconID=$ColMax;
+  }
+  if($icoSize==ICO_MAX_SIZE) {
+  	$IconID=$SizeMax;
+  }
 
 $ColName=$icoColorCount;
 
-if($icoSize==ICO_MAX_SIZE) $icoSize="Max";
-if($ColName==ICO_TRUE_COLOR) $ColName="True";
-if($ColName==ICO_XP_COLOR) $ColName="XP";
-if($ColName==ICO_MAX_COLOR) $ColName="Max";
-if($IconID==-1) die("Icon with $ColName colors and $icoSize x $icoSize size doesn't exist in this file!");
+if($icoSize==ICO_MAX_SIZE) {
+	$icoSize="Max";
+}
+if($ColName==ICO_TRUE_COLOR) {
+	$ColName="True";
+}
+if($ColName==ICO_XP_COLOR) {
+	$ColName="XP";
+}
+if($ColName==ICO_MAX_COLOR) {
+	$ColName="Max";
+}
+if($IconID==-1) {
+	die("Icon with $ColName colors and $icoSize x $icoSize size doesn't exist in this file!");
+}
 
 
 jpexs_readIcon($filename,$IconID,$Ikona);
@@ -131,7 +148,9 @@ 
   };
 
  $biBitCount=$Ikona[$IconID]["Info"]["BitsPerPixel"];
- if($biBitCount==0) $biBitCount=1;
+ if($biBitCount==0) {
+ 	$biBitCount=1;
+ }
 
 
 $Ikona[$IconID]["BitCount"]=$Ikona[$IconID]["Info"]["BitsPerPixel"];
@@ -145,8 +164,10 @@ 
   $backcolor=imagecolorallocate($img,$alphaBgR,$alphaBgG,$alphaBgB);
   imagefilledrectangle($img,0,0,$Ikona[$IconID]["Width"]-1,$Ikona[$IconID]["Height"]-1,$backcolor);
 endif;
-for($y=0;$y<$Ikona[$IconID]["Height"];$y++)
-for($x=0;$x<$Ikona[$IconID]["Width"];$x++)
+for($y=0;$y<$Ikona[$IconID]["Height"];$y++) {
+	for($x=0;
+}
+$x<$Ikona[$IconID]["Width"];$x++)
  {
  $R=$Ikona[$IconID]["Data"][$x][$y]["r"];
  $G=$Ikona[$IconID]["Data"][$x][$y]["g"];
@@ -154,47 +175,58 @@ 
  if($Ikona[$IconID]["BitCount"]==32)
  {
  $Alpha=127-round($Ikona[$IconID]["Data"][$x][$y]["alpha"]*127/255);
- if($Ikona[$IconID]["Maska"][$x][$y]==1) $Alpha=127;
+ if($Ikona[$IconID]["Maska"][$x][$y]==1) {
+ 	$Alpha=127;
+ }
  $color=imagecolorexactalpha($img,$R,$G,$B,$Alpha);
- if($color==-1) $color=imagecolorallocatealpha($img,$R,$G,$B,$Alpha);
+ if($color==-1) {
+ 	$color=imagecolorallocatealpha($img,$R,$G,$B,$Alpha);
  }
- else
+ } else
  {
  $color=imagecolorexact($img,$R,$G,$B);
- if($color==-1) $color=imagecolorallocate($img,$R,$G,$B);
+ if($color==-1) {
+ 	$color=imagecolorallocate($img,$R,$G,$B);
+ }
  };
 
  imagesetpixel($img,$x,$y,$color);
 
  };
 
-}
-else
+} else
 {
 $img=imagecreate($Ikona[$IconID]["Width"],$Ikona[$IconID]["Height"]);
-for($p=0;$p<count($Ikona[$IconID]["Paleta"]);$p++)
+for($p=0;$p<count($Ikona[$IconID]["Paleta"]);$p++) {
  $Paleta[$p]=imagecolorallocate($img,$Ikona[$IconID]["Paleta"][$p]["r"],$Ikona[$IconID]["Paleta"][$p]["g"],$Ikona[$IconID]["Paleta"][$p]["b"]);
+}
 
-for($y=0;$y<$Ikona[$IconID]["Height"];$y++)
-for($x=0;$x<$Ikona[$IconID]["Width"];$x++)
+for($y=0;$y<$Ikona[$IconID]["Height"];$y++) {
+	for($x=0;
+}
+$x<$Ikona[$IconID]["Width"];$x++)
  {
  imagesetpixel($img,$x,$y,$Paleta[$Ikona[$IconID]["Data"][$x][$y]]);
  };
 };
 $IsTransparent=false;  
-for($y=0;$y<$Ikona[$IconID]["Height"];$y++)
-for($x=0;$x<$Ikona[$IconID]["Width"];$x++)
+for($y=0;$y<$Ikona[$IconID]["Height"];$y++) {
+	for($x=0;
+}
+$x<$Ikona[$IconID]["Width"];$x++) {
  if($Ikona[$IconID]["Maska"][$x][$y]==1)
   {
    $IsTransparent=true;
+}
    break;
   };
 if($Ikona[$IconID]["BitCount"]==32)
 {
  imagealphablending($img, false);
- if(function_exists("imagesavealpha"))
-  imagesavealpha($img,true);
-};
+ if(function_exists("imagesavealpha")) {
+   imagesavealpha($img,true);
+ }
+ };
 
 if($IsTransparent)
  {
@@ -208,11 +240,14 @@ 
 
    };
     $Pruhledna=imagecolorallocate($img,0,0,0);
-    for($y=0;$y<$Ikona[$IconID]["Height"];$y++)
-     for($x=0;$x<$Ikona[$IconID]["Width"];$x++)
-      if($Ikona[$IconID]["Maska"][$x][$y]==1)
+    for($y=0;$y<$Ikona[$IconID]["Height"];$y++) {
+         for($x=0;
+    }
+    $x<$Ikona[$IconID]["Width"];$x++) {
+           if($Ikona[$IconID]["Maska"][$x][$y]==1)
        {
         imagesetpixel($img,$x,$y,$Pruhledna);
+     }
        };
   imagecolortransparent($img,$Pruhledna);
  };
@@ -281,12 +316,12 @@ 
       };
 
     if($jpexs_currentBit!=0) {jpexs_freadbyte($f);};
-    for($g=0;$g<$Zbytek;$g++)
-     jpexs_freadbyte($f);
+    for($g=0;$g<$Zbytek;$g++) {
+         jpexs_freadbyte($f);
+    }
      };
 
-}
-elseif($biBitCount==24)
+} elseif($biBitCount==24)
 {
  $Zbytek=$Width%4;
 
@@ -301,11 +336,11 @@ 
        $Ikona[$p]["Data"][$x][$y]["g"]=$G;
        $Ikona[$p]["Data"][$x][$y]["b"]=$B;
       }
-    for($z=0;$z<$Zbytek;$z++)
-     jpexs_freadbyte($f);
+    for($z=0;$z<$Zbytek;$z++) {
+         jpexs_freadbyte($f);
+    }
    };
-}
-elseif($biBitCount==32)
+} elseif($biBitCount==32)
 {
  $Zbytek=$Width%4;
 
@@ -322,8 +357,9 @@ 
        $Ikona[$p]["Data"][$x][$y]["b"]=$B;
        $Ikona[$p]["Data"][$x][$y]["alpha"]=$Alpha;
       }
-    for($z=0;$z<$Zbytek;$z++)
-     jpexs_freadbyte($f);
+    for($z=0;$z<$Zbytek;$z++) {
+         jpexs_freadbyte($f);
+    }
    };
 };
 
@@ -339,8 +375,9 @@ 
          $Ikona[$p]["Maska"][$x][$y]=$C;
       };
     if($jpexs_currentBit!=0) {jpexs_freadbyte($f);};
-    for($g=0;$g<$Zbytek;$g++)
-     jpexs_freadbyte($f);
+    for($g=0;$g<$Zbytek;$g++) {
+         jpexs_freadbyte($f);
+    }
      };
 //--------------
 
@@ -362,7 +399,9 @@ 
   $Ikona[$p]["Width"]=jpexs_freadbyte($f);
   $Ikona[$p]["Height"]=jpexs_freadbyte($f);
   $Ikona[$p]["ColorCount"]=jpexs_freadword($f);
- if($Ikona[$p]["ColorCount"]==0) $Ikona[$p]["ColorCount"]=256;
+ if($Ikona[$p]["ColorCount"]==0) {
+ 	$Ikona[$p]["ColorCount"]=256;
+ }
   $Ikona[$p]["Planes"]=jpexs_freadword($f);
   $Ikona[$p]["BitCount"]=jpexs_freadword($f);
   $Ikona[$p]["BytesInRes"]=jpexs_freaddword($f);
@@ -399,8 +438,10 @@ 
  $ok=saveExeIcon($filename,"icotemp.dat",$icoIndex);
  if(!$ok):
   $im=false;
- else:
+ else {
+ 	:
    $im=imageCreateFromIco("icotemp.dat",$icoColorCount,$icoSize,$alphaBgR,$alphaBgG,$alphaBgB);
+ }
    unlink("icotemp.dat");
  endif;
  return $im;
@@ -422,12 +463,16 @@ 
   global $jpexs_f,$jpexs_StartOfRsrc,$jpexs_ImageBase,$jpexs_ResVirtualAddress;
   $jpexs_f=fopen($filename,"r");
   $MZ=fread($jpexs_f,2);
-  if($MZ!="MZ") NotValidExe();
+  if($MZ!="MZ") {
+  	NotValidExe();
+  }
   fseek($jpexs_f,60);
   $OffsetToNewHeader=jpexs_freaddword($jpexs_f);
   fseek($jpexs_f,$OffsetToNewHeader);
   $PE=fread($jpexs_f,2);
-  if($PE!="PE") NotValidExe();
+  if($PE!="PE") {
+  	NotValidExe();
+  }
   fread($jpexs_f,4);
   $NumberOfSections=jpexs_freadword($jpexs_f);
   fseek($jpexs_f,ftell($jpexs_f)+12);
@@ -502,11 +547,11 @@ 
           if($icoFileNameOrPath=="")
            {
              $savefile="$r.ico";
-           }
-           else
+           } else
            {
-            if(($iconIndex==-1)or(is_array($iconIndex)))
-              $savefile=$icoFileNameOrPath."$r.ico";
+            if(($iconIndex==-1)or(is_array($iconIndex))) {
+                          $savefile=$icoFileNameOrPath."$r.ico";
+            }
            };
           $f2=fopen($savefile,"w");
           fwrite($f2,jpexs_inttoword(0));
@@ -564,17 +609,21 @@ 
           $StringLength=jpexs_freadword($jpexs_f);
           $Identificator=(fread($jpexs_f,$StringLength*2));
           fseek($jpexs_f,$lastPos2);
-        else:
+        else {
+        	:
           //Integer Id
           $Identificator=$ResName;
+        }
         endif;
 
         $ResOffsetToData=jpexs_freaddword($jpexs_f);
         if($ResOffsetToData>=0x80000000):
           $SubResOffset=$ResOffsetToData-0x80000000;
           jpexs_readResDirectoryEntry($Res["$Identificator"],$jpexs_StartOfRsrc+$SubResOffset);
-        else:
+        else {
+        	:
           $RawDataOffset=$ResOffsetToData;
+        }
           $lastPos2=ftell($jpexs_f);
           fseek($jpexs_f,$jpexs_StartOfRsrc+$RawDataOffset);
           //IMAGE_RESOURCE_DATA_ENTRY
@@ -601,8 +650,7 @@ 
 {
 $ImageCount=count($images);
 $Image=$images;
-}
-else
+} else
 {
 $Image[0]=$images;
 $ImageCount=1;
@@ -637,7 +685,9 @@ 
 $IsTransparent=$Transparent!=-1;
 
 
-if($IsTransparent) $ColorCount--;
+if($IsTransparent) {
+	$ColorCount--;
+}
 
 if($ColorCount==0) {$ColorCount=0; $BitCount=24;};
 if(($ColorCount>0)and($ColorCount<=2)) {$ColorCount=2; $BitCount=1;};
@@ -655,12 +705,20 @@ 
 $ret.=jpexs_inttobyte(0);//RESERVED
 
 $Planes=0;
-if($BitCount>=8) $Planes=1;
+if($BitCount>=8) {
+	$Planes=1;
+}
 
 $ret.=jpexs_inttoword($f,$Planes);//PLANES
-if($BitCount>=8) $WBitCount=$BitCount;
-if($BitCount==4) $WBitCount=0;
-if($BitCount==1) $WBitCount=0;
+if($BitCount>=8) {
+	$WBitCount=$BitCount;
+}
+if($BitCount==4) {
+	$WBitCount=0;
+}
+if($BitCount==1) {
+	$WBitCount=0;
+}
 $ret.=jpexs_inttoword($WBitCount);//BITS
 
 $Zbytek=(4-($Width/(8/$BitCount))%4)%4;
@@ -669,8 +727,9 @@ 
 $PalSize=0;
 
 $Size=40+($Width/(8/$BitCount)+$Zbytek)*$Height+(($Width/8+$ZbytekMask) * $Height);
-if($BitCount<24)
+if($BitCount<24) {
  $Size+=pow(2,$BitCount)*4;
+}
 $IconId=1;
 $ret.=jpexs_inttodword($Size); //SIZE
 $OffSet=6+16*$ImageCount+$FullSize;
@@ -691,7 +750,9 @@ 
 $Transparent=imagecolortransparent($img);
 $IsTransparent=$Transparent!=-1;
 
-if($IsTransparent) $ColorCount--;
+if($IsTransparent) {
+	$ColorCount--;
+}
 if($ColorCount==0) {$ColorCount=0; $BitCount=24;};
 if(($ColorCount>0)and($ColorCount<=2)) {$ColorCount=2; $BitCount=1;};
 if(($ColorCount>2)and($ColorCount<=16)) { $ColorCount=16; $BitCount=4;};
@@ -723,12 +784,16 @@ 
 
 
 $CC=$ColorCount;
-if($CC==0) $CC=256;
+if($CC==0) {
+	$CC=256;
+}
 
 if($BitCount<24)
 {
  $ColorTotal=imagecolorstotal($img);
- if($IsTransparent) $ColorTotal--;
+ if($IsTransparent) {
+ 	$ColorTotal--;
+ }
 
  for($p=0;$p<$ColorTotal;$p++)
   {
@@ -763,10 +828,15 @@ 
   for($x=0;$x<$Width;$x++)
    {
    $color=imagecolorat($img,$x,$y);
-   if($color==$Transparent)
-    $color=imagecolorexact($img,0,0,0);
-   if($color==-1) $color=0;
-   if($color>pow(2,$BitCount)-1) $color=0;
+   if($color==$Transparent) {
+       $color=imagecolorexact($img,0,0,0);
+   }
+   if($color==-1) {
+   	$color=0;
+   }
+   if($color>pow(2,$BitCount)-1) {
+   	$color=0;
+   }
 
    $bWrite.=jpexs_decbinx($color,$BitCount);
    if(strlen($bWrite)==8)
@@ -779,12 +849,14 @@ 
   if((strlen($bWrite)<8)and(strlen($bWrite)!=0))
     {
      $sl=strlen($bWrite);
-     for($t=0;$t<8-$sl;$t++)
-      $sl.="0";
+     for($t=0;$t<8-$sl;$t++) {
+           $sl.="0";
+     }
      $ret.=jpexs_inttobyte(bindec($bWrite));
     };
-  for($z=0;$z<$Zbytek;$z++)
-   $ret.=jpexs_inttobyte(0);
+  for($z=0;$z<$Zbytek;$z++) {
+     $ret.=jpexs_inttobyte(0);
+  }
  };
 };
 
@@ -800,11 +872,14 @@ 
    $ret.=jpexs_inttobyte($color["blue"]);
    $ret.=jpexs_inttobyte($color["green"]);
    $ret.=jpexs_inttobyte($color["red"]);
-   if($BitCount==32)
-    $ret.=jpexs_inttobyte(0);//Alpha for ICO_XP_COLORS
+   if($BitCount==32) {
+       $ret.=jpexs_inttobyte(0);
+   }
+   //Alpha for ICO_XP_COLORS
    };
-  for($z=0;$z<$Zbytek;$z++)
-   $ret.=jpexs_inttobyte(0);
+  for($z=0;$z<$Zbytek;$z++) {
+     $ret.=jpexs_inttobyte(0);
+  }
  };
 };
 
@@ -820,8 +895,7 @@ 
     if(($Transparent!=-1)and(imagecolorat($img,$x,$y)==$Transparent))
      {
       $bOut.="1";
-     }
-     else
+     } else
      {
       $bOut.="0";
      };
@@ -852,8 +926,7 @@ 
  $f=fopen($filename,"w");
  fwrite($f,$ret);
  fclose($f);
-}
-else
+} else
 {
  echo $ret;
 };
@@ -888,8 +961,9 @@ 
 {
 $bin=decbin($d);
 $sbin=strlen($bin);
-for($j=0;$j<$n-$sbin;$j++)
+for($j=0;$j<$n-$sbin;$j++) {
  $bin="0$bin";
+}
 return $bin;
 };
 
@@ -913,8 +987,7 @@ 
  if($jpexs_currentBit==8)
   {
    $jpexs_currentBit=0;
-  }
- else
+  } else
   {
    fseek($f,ftell($f)-1);
   };

class/wideimage/WideImage.php

Doc Comments +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
 		 * $img = WideImage::load($string);
 		 * </code>
 		 * 
-		 * @param mixed $source File name, url, binary string, or GD image resource
+		 * @param string $source File name, url, binary string, or GD image resource
 		 * @param string $format Hint for image format
 		 * @return WideImage_Image WideImage_PaletteImage or WideImage_TrueColorImage instance
 		 */
@@ -226,7 +226,7 @@ 
 		/**
 		 * Throws exception if the handle isn't a valid GD resource
 		 * 
-		 * @param mixed $handle The variable to check
+		 * @param resource $handle The variable to check
 		 */
 		static function assertValidImageHandle($handle)
 		{

Indentation +4 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 	/**
- * @author Gasper Kozak
- * @copyright 2007, 2008, 2009
+	 * @author Gasper Kozak
+	 * @copyright 2007, 2008, 2009
 
     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 WideImage
-  **/
+	 * @package WideImage
+	 **/
 	
 	require_once(WideImage::path() . 'Exception.php');
 	require_once(WideImage::path() . 'Image.php');

Spacing +15 added lines, -15 removed lines

@@ -22,21 +22,21 @@ 
     * @package WideImage
   **/
 	
-	require_once(WideImage::path() . 'Exception.php');
-	require_once(WideImage::path() . 'Image.php');
-	require_once(WideImage::path() . 'TrueColorImage.php');
-	require_once(WideImage::path() . 'PaletteImage.php');
+	require_once(WideImage::path().'Exception.php');
+	require_once(WideImage::path().'Image.php');
+	require_once(WideImage::path().'TrueColorImage.php');
+	require_once(WideImage::path().'PaletteImage.php');
 	
-	require_once(WideImage::path() . 'Coordinate.php');
-	require_once(WideImage::path() . 'Canvas.php');
-	require_once(WideImage::path() . 'PaletteImage.php');
-	require_once(WideImage::path() . 'TrueColorImage.php');
-	require_once(WideImage::path() . 'MapperFactory.php');
-	require_once(WideImage::path() . 'OperationFactory.php');
+	require_once(WideImage::path().'Coordinate.php');
+	require_once(WideImage::path().'Canvas.php');
+	require_once(WideImage::path().'PaletteImage.php');
+	require_once(WideImage::path().'TrueColorImage.php');
+	require_once(WideImage::path().'MapperFactory.php');
+	require_once(WideImage::path().'OperationFactory.php');
 	
-	require_once(WideImage::path() . 'Font/TTF.php');
-	require_once(WideImage::path() . 'Font/GDF.php');
-	require_once(WideImage::path() . 'Font/PS.php');
+	require_once(WideImage::path().'Font/TTF.php');
+	require_once(WideImage::path().'Font/GDF.php');
+	require_once(WideImage::path().'Font/PS.php');
 	
 	/**
 	 * @package Exceptions
@@ -75,7 +75,7 @@ 
 		static function path()
 		{
 			if (self::$path === null)
-				self::$path = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+				self::$path = dirname(__FILE__).DIRECTORY_SEPARATOR;
 			return self::$path;
 		}
 		
@@ -126,7 +126,7 @@ 
 			if (!$predictedSourceType)
 				$predictedSourceType = 'File';
 			
-			return call_user_func(array('WideImage', 'loadFrom' . $predictedSourceType), $source, $format);
+			return call_user_func(array('WideImage', 'loadFrom'.$predictedSourceType), $source, $format);
 		}			
 		
 		/**

Braces +35 added lines, -24 removed lines

@@ -74,8 +74,9 @@ 
 		 */
 		static function path()
 		{
-			if (self::$path === null)
-				self::$path = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+			if (self::$path === null) {
+							self::$path = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+			}
 			return self::$path;
 		}
 		
@@ -103,8 +104,9 @@ 
 		{
 			$predictedSourceType = '';
 			
-			if (!$predictedSourceType && self::isValidImageHandle($source))
-				$predictedSourceType = 'Handle';
+			if (!$predictedSourceType && self::isValidImageHandle($source)) {
+							$predictedSourceType = 'Handle';
+			}
 			
 			if (!$predictedSourceType)
 			{
@@ -112,19 +114,22 @@ 
 				$binLength = 64;
 				$sourceLength = strlen($source);
 				$maxlen = ($sourceLength > $binLength) ? $binLength : $sourceLength;
-				for ($i = 0; $i < $maxlen; $i++)
-					if (ord($source[$i]) < 32)
+				for ($i = 0; $i < $maxlen; $i++) {
+									if (ord($source[$i]) < 32)
 					{
 						$predictedSourceType = 'String';
+				}
 						break;
 					}
 			}
 			
-			if (isset($_FILES[$source]) && isset($_FILES[$source]['tmp_name']))
-				$predictedSourceType = 'Upload';
+			if (isset($_FILES[$source]) && isset($_FILES[$source]['tmp_name'])) {
+							$predictedSourceType = 'Upload';
+			}
 			
-			if (!$predictedSourceType)
-				$predictedSourceType = 'File';
+			if (!$predictedSourceType) {
+							$predictedSourceType = 'File';
+			}
 			
 			return call_user_func(array('WideImage', 'loadFrom' . $predictedSourceType), $source, $format);
 		}			
@@ -146,8 +151,9 @@ 
 				$mapper = WideImage_MapperFactory::selectMapper($uri, $format);
 				$handle = $mapper->load($uri);
 			}
-			if (!self::isValidImageHandle($handle))
-				throw new WideImage_InvalidImageSourceException("File '{$uri}' appears to be an invalid image source.");
+			if (!self::isValidImageHandle($handle)) {
+							throw new WideImage_InvalidImageSourceException("File '{$uri}' appears to be an invalid image source.");
+			}
 			
 			return self::loadFromHandle($handle);
 		}
@@ -161,8 +167,9 @@ 
 		static function loadFromString($string)
 		{
 			$handle = imagecreatefromstring($string);
-			if (!self::isValidImageHandle($handle))
-				throw new WideImage_InvalidImageSourceException("String doesn't contain valid image data.");
+			if (!self::isValidImageHandle($handle)) {
+							throw new WideImage_InvalidImageSourceException("String doesn't contain valid image data.");
+			}
 			
 			return self::loadFromHandle($handle);
 		}
@@ -187,13 +194,15 @@ 
 		 */
 		static function loadFromHandle($handle)
 		{
-			if (!self::isValidImageHandle($handle))
-				throw new WideImage_InvalidImageSourceException("Handle is not a valid GD image resource.");
+			if (!self::isValidImageHandle($handle)) {
+							throw new WideImage_InvalidImageSourceException("Handle is not a valid GD image resource.");
+			}
 			
-			if (imageistruecolor($handle))
-				return new WideImage_TrueColorImage($handle);
-			else
-				return new WideImage_PaletteImage($handle);
+			if (imageistruecolor($handle)) {
+							return new WideImage_TrueColorImage($handle);
+			} else {
+							return new WideImage_PaletteImage($handle);
+			}
 		}
 		
 		/**
@@ -206,8 +215,9 @@ 
 		 */
 		static function loadFromUpload($field_name)
 		{
-			if (!array_key_exists($field_name, $_FILES) || !file_exists($_FILES[$field_name]['tmp_name']))
-				throw new WideImage_InvalidImageSourceException("Upload field '{$field_name}' or file doesn't exist.");
+			if (!array_key_exists($field_name, $_FILES) || !file_exists($_FILES[$field_name]['tmp_name'])) {
+							throw new WideImage_InvalidImageSourceException("Upload field '{$field_name}' or file doesn't exist.");
+			}
 			
 			return self::loadFromFile($_FILES[$field_name]['tmp_name'], $_FILES[$field_name]['type']);
 		}
@@ -230,8 +240,9 @@ 
 		 */
 		static function assertValidImageHandle($handle)
 		{
-			if (!self::isValidImageHandle($handle))
-				throw new WideImage_InvalidImageHandleException("{$handle} is not a valid image handle.");
+			if (!self::isValidImageHandle($handle)) {
+							throw new WideImage_InvalidImageHandleException("{$handle} is not a valid image handle.");
+			}
 		}
 		
 	}