mambax7 / references

class/wideimage/WideImage.php

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.");
+			}
 		}
 		
 	}

class/wideimage/Canvas.php

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/Mapper/GIF.php

Braces +5 added lines, -4 removed lines

@@ -42,10 +42,11 @@
 			// then trying to save an image to a '' location (which results in an
 			// error, of course). And the same thing works fine for imagepng() and 
 			// imagejpeg(). It's a bug! ;)
-			if ($uri)
-				imagegif($handle, $uri);
-			else
-				imagegif($handle);
+			if ($uri) {
+							imagegif($handle, $uri);
+			} else {
+							imagegif($handle);
+			}
 		}
 	}
 ?>
\ No newline at end of file

class/wideimage/Mapper/BMP.php

Braces +5 added lines, -4 removed lines

@@ -41,10 +41,11 @@
 		
 		function save($handle, $uri = null)
 		{
-			if ($uri == null)
-				imagebmp($handle);
-			else
-				imagebmp($handle, $uri);
+			if ($uri == null) {
+							imagebmp($handle);
+			} else {
+							imagebmp($handle, $uri);
+			}
 		}
 	}
 ?>
\ No newline at end of file

class/wideimage/Mapper/GD.php

Braces +5 added lines, -4 removed lines

@@ -36,10 +36,11 @@
 		
 		function save($handle, $uri = null)
 		{
-			if ($uri == null)
-				imagegd($handle);
-			else
-				imagegd($handle, $uri);
+			if ($uri == null) {
+							imagegd($handle);
+			} else {
+							imagegd($handle, $uri);
+			}
 		}
 	}
 ?>
\ No newline at end of file

class/wideimage/TrueColorImage.php

Braces +32 added lines, -24 removed lines

@@ -48,8 +48,9 @@ 
 		 */
 		static function create($width, $height)
 		{
-			if ($width * $height <= 0 || $width < 0)
-				throw new WideImage_InvalidImageDimensionException("Can't create an image with dimensions [$width, $height].");
+			if ($width * $height <= 0 || $width < 0) {
+							throw new WideImage_InvalidImageDimensionException("Can't create an image with dimensions [$width, $height].");
+			}
 			
 			return new WideImage_TrueColorImage(imagecreatetruecolor($width, $height));
 		}
@@ -101,10 +102,11 @@ 
 		 */
 		function allocateColorAlpha($R, $G = null, $B = null, $A = null)
 		{
-			if (is_array($R))
-				return imageColorAllocateAlpha($this->handle, $R['red'], $R['green'], $R['blue'], $R['alpha']);
-			else
-				return imageColorAllocateAlpha($this->handle, $R, $G, $B, $A);
+			if (is_array($R)) {
+							return imageColorAllocateAlpha($this->handle, $R['red'], $R['green'], $R['blue'], $R['alpha']);
+			} else {
+							return imageColorAllocateAlpha($this->handle, $R, $G, $B, $A);
+			}
 		}
 		
 		/**
@@ -113,19 +115,22 @@ 
 		function asPalette($nColors = 255, $dither = null, $matchPalette = true)
 		{
 			$nColors = intval($nColors);
-			if ($nColors < 1)
-				$nColors = 1;
-			elseif ($nColors > 255)
-				$nColors = 255;
+			if ($nColors < 1) {
+							$nColors = 1;
+			} elseif ($nColors > 255) {
+							$nColors = 255;
+			}
 			
-			if ($dither === null)
-				$dither = $this->isTransparent();
+			if ($dither === null) {
+							$dither = $this->isTransparent();
+			}
 			
 			$temp = $this->copy();
 			imagetruecolortopalette($temp->handle, $dither, $nColors);
 			
-			if ($matchPalette == true)
-				imagecolormatch($this->handle, $temp->handle);
+			if ($matchPalette == true) {
+							imagecolormatch($this->handle, $temp->handle);
+			}
 			
 			if ($this->isTransparent())
 			{
@@ -153,10 +158,11 @@ 
 		 */
 		function getClosestColorAlpha($R, $G = null, $B = null, $A = null)
 		{
-			if (is_array($R))
-				return imagecolorclosestalpha($this->handle, $R['red'], $R['green'], $R['blue'], $R['alpha']);
-			else
-				return imagecolorclosestalpha($this->handle, $R, $G, $B, $A);
+			if (is_array($R)) {
+							return imagecolorclosestalpha($this->handle, $R['red'], $R['green'], $R['blue'], $R['alpha']);
+			} else {
+							return imagecolorclosestalpha($this->handle, $R, $G, $B, $A);
+			}
 		}
 		
 		/**
@@ -174,10 +180,11 @@ 
 		 */
 		function getExactColorAlpha($R, $G = null, $B = null, $A = null)
 		{
-			if (is_array($R))
-				return imagecolorexactalpha($this->handle, $R['red'], $R['green'], $R['blue'], $R['alpha']);
-			else
-				return imagecolorexactalpha($this->handle, $R, $G, $B, $A);
+			if (is_array($R)) {
+							return imagecolorexactalpha($this->handle, $R['red'], $R['green'], $R['blue'], $R['alpha']);
+			} else {
+							return imagecolorexactalpha($this->handle, $R, $G, $B, $A);
+			}
 		}
 		
 		/**
@@ -186,8 +193,9 @@ 
 		function getChannels()
 		{
 			$args = func_get_args();
-			if (count($args) == 1 && is_array($args[0]))
-				$args = $args[0];
+			if (count($args) == 1 && is_array($args[0])) {
+							$args = $args[0];
+			}
 			return WideImage_OperationFactory::get('CopyChannelsTrueColor')->execute($this, $args);
 		}
 		

class/wideimage/vendor/JPEXS/ico.php

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/vendor/JPEXS/bmp.php

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/Image.php

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;
 		}