ylvarw / module

a/vendor/mos/cimage/CImage.php

Indentation +20 added lines, -20 removed lines

@@ -223,8 +223,8 @@ 
     /**
      * Path to command to optimize jpeg images, for example jpegtran or null.
      */
-     private $jpegOptimize;
-     private $jpegOptimizeCmd;
+        private $jpegOptimize;
+        private $jpegOptimizeCmd;
 
 
 
@@ -395,8 +395,8 @@ 
 
 
     /**
-    * Disable the fasttrackCacke to start with, inject an object to enable it.
-    */
+     * Disable the fasttrackCacke to start with, inject an object to enable it.
+     */
     private $fastTrackCache = null;
 
 
@@ -426,9 +426,9 @@ 
     /*
      * Image copy strategy, defaults to RESAMPLE.
      */
-     const RESIZE = 1;
-     const RESAMPLE = 2;
-     private $copyStrategy = NULL;
+        const RESIZE = 1;
+        const RESAMPLE = 2;
+        private $copyStrategy = NULL;
 
 
 
@@ -1253,7 +1253,7 @@ 
         $this->crop      = $this->cropOrig;
 
         $this->initDimensions()
-             ->calculateNewWidthAndHeight();
+                ->calculateNewWidthAndHeight();
 
         return $this;
     }
@@ -1684,14 +1684,14 @@ 
         if ($this->rotateBefore) {
             $this->log("Rotating image.");
             $this->rotate($this->rotateBefore, $this->bgColor)
-                 ->reCalculateDimensions();
+                    ->reCalculateDimensions();
         }
 
         // Auto-rotate image
         if ($this->autoRotate) {
             $this->log("Auto rotating image.");
             $this->rotateExif()
-                 ->reCalculateDimensions();
+                    ->reCalculateDimensions();
         }
 
         // Scale the original image before starting
@@ -1718,11 +1718,11 @@ 
      *
      * @return $this
      */
-     public function setCopyResizeStrategy($strategy)
-     {
-         $this->copyStrategy = $strategy;
-         return $this;
-     }
+        public function setCopyResizeStrategy($strategy)
+        {
+            $this->copyStrategy = $strategy;
+            return $this;
+        }
 
 
 
@@ -2233,7 +2233,7 @@ 
      * @param string $color as hex value.
      *
      * @return $this
-    */
+     */
     public function setDefaultBackgroundColor($color)
     {
         $this->log("Setting default background color to '$color'.");
@@ -2285,7 +2285,7 @@ 
      * @param resource $img the image to work with or null if using $this->image.
      *
      * @return color value or null if no background color is set.
-    */
+     */
     private function getBackgroundColor($img = null)
     {
         $img = isset($img) ? $img : $this->image;
@@ -2319,7 +2319,7 @@ 
      * @param int $height of the new image.
      *
      * @return image resource.
-    */
+     */
     private function createImageKeepTransparency($width, $height)
     {
         $this->log("Creating a new working image width={$width}px, height={$height}px.");
@@ -2564,8 +2564,8 @@ 
 
         // Prepare
         $this->setSaveFolder($cache)
-             ->setSource($src, $dir)
-             ->generateFilename(null, false, 'srgb_');
+                ->setSource($src, $dir)
+                ->generateFilename(null, false, 'srgb_');
 
         // Check if the cached version is accurate.
         if ($useCache && is_readable($this->cacheFileName)) {

Spacing +87 added lines, -87 removed lines

@@ -231,7 +231,7 @@ 
     /**
      * Image dimensions, calculated from loaded image.
      */
-    private $width;  // Calculated from source image
+    private $width; // Calculated from source image
     private $height; // Calculated from source image
 
 
@@ -239,7 +239,7 @@ 
      * New image dimensions, incoming as argument or calculated.
      */
     private $newWidth;
-    private $newWidthOrig;  // Save original value
+    private $newWidthOrig; // Save original value
     private $newHeight;
     private $newHeightOrig; // Save original value
 
@@ -545,7 +545,7 @@ 
      */
     public function createDummyImage($width = null, $height = null)
     {
-        $this->newWidth  = $this->newWidth  ?: $width  ?: 100;
+        $this->newWidth  = $this->newWidth ?: $width ?: 100;
         $this->newHeight = $this->newHeight ?: $height ?: 100;
 
         $this->image = $this->CreateImageKeepTransparency($this->newWidth, $this->newHeight);
@@ -875,7 +875,7 @@ 
                 $parts = explode(',', $filterStr);
                 $filter = $this->mapFilter($parts[0]);
                 $filter['str'] = $filterStr;
-                for ($i=1; $i<=$filter['argc']; $i++) {
+                for ($i = 1; $i <= $filter['argc']; $i++) {
                     if (isset($parts[$i])) {
                         $filter["arg{$i}"] = $parts[$i];
                     } else {
@@ -921,16 +921,16 @@ 
     private function mapFilter($name)
     {
         $map = array(
-            'negate'          => array('id'=>0,  'argc'=>0, 'type'=>IMG_FILTER_NEGATE),
-            'grayscale'       => array('id'=>1,  'argc'=>0, 'type'=>IMG_FILTER_GRAYSCALE),
-            'brightness'      => array('id'=>2,  'argc'=>1, 'type'=>IMG_FILTER_BRIGHTNESS),
-            'contrast'        => array('id'=>3,  'argc'=>1, 'type'=>IMG_FILTER_CONTRAST),
-            'colorize'        => array('id'=>4,  'argc'=>4, 'type'=>IMG_FILTER_COLORIZE),
-            'edgedetect'      => array('id'=>5,  'argc'=>0, 'type'=>IMG_FILTER_EDGEDETECT),
-            'emboss'          => array('id'=>6,  'argc'=>0, 'type'=>IMG_FILTER_EMBOSS),
-            'gaussian_blur'   => array('id'=>7,  'argc'=>0, 'type'=>IMG_FILTER_GAUSSIAN_BLUR),
-            'selective_blur'  => array('id'=>8,  'argc'=>0, 'type'=>IMG_FILTER_SELECTIVE_BLUR),
-            'mean_removal'    => array('id'=>9,  'argc'=>0, 'type'=>IMG_FILTER_MEAN_REMOVAL),
+            'negate'          => array('id'=>0, 'argc'=>0, 'type'=>IMG_FILTER_NEGATE),
+            'grayscale'       => array('id'=>1, 'argc'=>0, 'type'=>IMG_FILTER_GRAYSCALE),
+            'brightness'      => array('id'=>2, 'argc'=>1, 'type'=>IMG_FILTER_BRIGHTNESS),
+            'contrast'        => array('id'=>3, 'argc'=>1, 'type'=>IMG_FILTER_CONTRAST),
+            'colorize'        => array('id'=>4, 'argc'=>4, 'type'=>IMG_FILTER_COLORIZE),
+            'edgedetect'      => array('id'=>5, 'argc'=>0, 'type'=>IMG_FILTER_EDGEDETECT),
+            'emboss'          => array('id'=>6, 'argc'=>0, 'type'=>IMG_FILTER_EMBOSS),
+            'gaussian_blur'   => array('id'=>7, 'argc'=>0, 'type'=>IMG_FILTER_GAUSSIAN_BLUR),
+            'selective_blur'  => array('id'=>8, 'argc'=>0, 'type'=>IMG_FILTER_SELECTIVE_BLUR),
+            'mean_removal'    => array('id'=>9, 'argc'=>0, 'type'=>IMG_FILTER_MEAN_REMOVAL),
             'smooth'          => array('id'=>10, 'argc'=>1, 'type'=>IMG_FILTER_SMOOTH),
             'pixelate'        => array('id'=>11, 'argc'=>2, 'type'=>IMG_FILTER_PIXELATE),
         );
@@ -1024,15 +1024,15 @@ 
 
         // width as %
         if ($this->newWidth
-            && $this->newWidth[strlen($this->newWidth)-1] == '%') {
-            $this->newWidth = $this->width * substr($this->newWidth, 0, -1) / 100;
+            && $this->newWidth[strlen($this->newWidth) - 1] == '%') {
+            $this->newWidth = $this->width*substr($this->newWidth, 0, -1)/100;
             $this->log("Setting new width based on % to {$this->newWidth}");
         }
 
         // height as %
         if ($this->newHeight
-            && $this->newHeight[strlen($this->newHeight)-1] == '%') {
-            $this->newHeight = $this->height * substr($this->newHeight, 0, -1) / 100;
+            && $this->newHeight[strlen($this->newHeight) - 1] == '%') {
+            $this->newHeight = $this->height*substr($this->newHeight, 0, -1)/100;
             $this->log("Setting new height based on % to {$this->newHeight}");
         }
 
@@ -1042,32 +1042,32 @@ 
         if ($this->aspectRatio && is_null($this->newWidth) && is_null($this->newHeight)) {
             if ($this->aspectRatio >= 1) {
                 $this->newWidth   = $this->width;
-                $this->newHeight  = $this->width / $this->aspectRatio;
+                $this->newHeight  = $this->width/$this->aspectRatio;
                 $this->log("Setting new width & height based on width & aspect ratio (>=1) to (w x h) {$this->newWidth} x {$this->newHeight}");
 
             } else {
                 $this->newHeight  = $this->height;
-                $this->newWidth   = $this->height * $this->aspectRatio;
+                $this->newWidth   = $this->height*$this->aspectRatio;
                 $this->log("Setting new width & height based on width & aspect ratio (<1) to (w x h) {$this->newWidth} x {$this->newHeight}");
             }
 
         } elseif ($this->aspectRatio && is_null($this->newWidth)) {
-            $this->newWidth   = $this->newHeight * $this->aspectRatio;
+            $this->newWidth = $this->newHeight*$this->aspectRatio;
             $this->log("Setting new width based on aspect ratio to {$this->newWidth}");
 
         } elseif ($this->aspectRatio && is_null($this->newHeight)) {
-            $this->newHeight  = $this->newWidth / $this->aspectRatio;
+            $this->newHeight = $this->newWidth/$this->aspectRatio;
             $this->log("Setting new height based on aspect ratio to {$this->newHeight}");
         }
 
         // Change width & height based on dpr
         if ($this->dpr != 1) {
             if (!is_null($this->newWidth)) {
-                $this->newWidth  = round($this->newWidth * $this->dpr);
+                $this->newWidth = round($this->newWidth*$this->dpr);
                 $this->log("Setting new width based on dpr={$this->dpr} - w={$this->newWidth}");
             }
             if (!is_null($this->newHeight)) {
-                $this->newHeight = round($this->newHeight * $this->dpr);
+                $this->newHeight = round($this->newHeight*$this->dpr);
                 $this->log("Setting new height based on dpr={$this->dpr} - h={$this->newHeight}");
             }
         }
@@ -1102,10 +1102,10 @@ 
 
         // Check if there is an area to crop off
         if (isset($this->area)) {
-            $this->offset['top']    = round($this->area['top'] / 100 * $this->height);
-            $this->offset['right']  = round($this->area['right'] / 100 * $this->width);
-            $this->offset['bottom'] = round($this->area['bottom'] / 100 * $this->height);
-            $this->offset['left']   = round($this->area['left'] / 100 * $this->width);
+            $this->offset['top']    = round($this->area['top']/100*$this->height);
+            $this->offset['right']  = round($this->area['right']/100*$this->width);
+            $this->offset['bottom'] = round($this->area['bottom']/100*$this->height);
+            $this->offset['left']   = round($this->area['left']/100*$this->width);
             $this->offset['width']  = $this->width - $this->offset['left'] - $this->offset['right'];
             $this->offset['height'] = $this->height - $this->offset['top'] - $this->offset['bottom'];
             $this->width  = $this->offset['width'];
@@ -1127,7 +1127,7 @@ 
             } elseif ($this->crop['start_x'] == 'right') {
                 $this->crop['start_x'] = $this->width - $width;
             } elseif ($this->crop['start_x'] == 'center') {
-                $this->crop['start_x'] = round($this->width / 2) - round($width / 2);
+                $this->crop['start_x'] = round($this->width/2) - round($width/2);
             }
 
             if ($this->crop['start_y'] == 'top') {
@@ -1135,7 +1135,7 @@ 
             } elseif ($this->crop['start_y'] == 'bottom') {
                 $this->crop['start_y'] = $this->height - $height;
             } elseif ($this->crop['start_y'] == 'center') {
-                $this->crop['start_y'] = round($this->height / 2) - round($height / 2);
+                $this->crop['start_y'] = round($this->height/2) - round($height/2);
             }
 
             $this->log("Crop area is width {$width}px, height {$height}px, start_x {$this->crop['start_x']}px, start_y {$this->crop['start_y']}px.");
@@ -1156,25 +1156,25 @@ 
 
                 // Both new width and height are set.
                 // Use newWidth and newHeigh as max width/height, image should not be larger.
-                $ratioWidth  = $width  / $this->newWidth;
-                $ratioHeight = $height / $this->newHeight;
+                $ratioWidth  = $width/$this->newWidth;
+                $ratioHeight = $height/$this->newHeight;
                 $ratio = ($ratioWidth > $ratioHeight) ? $ratioWidth : $ratioHeight;
-                $this->newWidth  = round($width  / $ratio);
-                $this->newHeight = round($height / $ratio);
+                $this->newWidth  = round($width/$ratio);
+                $this->newHeight = round($height/$ratio);
                 $this->log("New width and height was set.");
 
             } elseif (isset($this->newWidth)) {
 
                 // Use new width as max-width
-                $factor = (float)$this->newWidth / (float)$width;
-                $this->newHeight = round($factor * $height);
+                $factor = (float)$this->newWidth/(float)$width;
+                $this->newHeight = round($factor*$height);
                 $this->log("New width was set.");
 
             } elseif (isset($this->newHeight)) {
 
                 // Use new height as max-hight
-                $factor = (float)$this->newHeight / (float)$height;
-                $this->newWidth = round($factor * $width);
+                $factor = (float)$this->newHeight/(float)$height;
+                $this->newWidth = round($factor*$width);
                 $this->log("New height was set.");
 
             } else {
@@ -1189,8 +1189,8 @@ 
             if ($this->cropToFit || $this->fillToFit) {
 
                 // Get relations of original & target image
-                $ratioWidth  = $width  / $this->newWidth;
-                $ratioHeight = $height / $this->newHeight;
+                $ratioWidth  = $width/$this->newWidth;
+                $ratioHeight = $height/$this->newHeight;
 
                 if ($this->cropToFit) {
 
@@ -1198,8 +1198,8 @@ 
                     // image should fit the area.
                     $this->log("Crop to fit.");
                     $ratio = ($ratioWidth < $ratioHeight) ? $ratioWidth : $ratioHeight;
-                    $this->cropWidth  = round($width  / $ratio);
-                    $this->cropHeight = round($height / $ratio);
+                    $this->cropWidth  = round($width/$ratio);
+                    $this->cropHeight = round($height/$ratio);
                     $this->log("Crop width, height, ratio: $this->cropWidth x $this->cropHeight ($ratio).");
 
                 } elseif ($this->fillToFit) {
@@ -1208,8 +1208,8 @@ 
                     // image should fit the area.
                     $this->log("Fill to fit.");
                     $ratio = ($ratioWidth < $ratioHeight) ? $ratioHeight : $ratioWidth;
-                    $this->fillWidth  = round($width  / $ratio);
-                    $this->fillHeight = round($height / $ratio);
+                    $this->fillWidth  = round($width/$ratio);
+                    $this->fillHeight = round($height/$ratio);
                     $this->log("Fill width, height, ratio: $this->fillWidth x $this->fillHeight ($ratio).");
                 }
             }
@@ -1391,17 +1391,17 @@ 
     public function generateFilename($base = null, $useSubdir = true, $prefix = null)
     {
         $filename     = basename($this->pathToImage);
-        $cropToFit    = $this->cropToFit    ? '_cf'                      : null;
-        $fillToFit    = $this->fillToFit    ? '_ff'                      : null;
-        $crop_x       = $this->crop_x       ? "_x{$this->crop_x}"        : null;
-        $crop_y       = $this->crop_y       ? "_y{$this->crop_y}"        : null;
-        $scale        = $this->scale        ? "_s{$this->scale}"         : null;
-        $bgColor      = $this->bgColor      ? "_bgc{$this->bgColor}"     : null;
-        $quality      = $this->quality      ? "_q{$this->quality}"       : null;
-        $compress     = $this->compress     ? "_co{$this->compress}"     : null;
+        $cropToFit    = $this->cropToFit ? '_cf' : null;
+        $fillToFit    = $this->fillToFit ? '_ff' : null;
+        $crop_x       = $this->crop_x ? "_x{$this->crop_x}" : null;
+        $crop_y       = $this->crop_y ? "_y{$this->crop_y}" : null;
+        $scale        = $this->scale ? "_s{$this->scale}" : null;
+        $bgColor      = $this->bgColor ? "_bgc{$this->bgColor}" : null;
+        $quality      = $this->quality ? "_q{$this->quality}" : null;
+        $compress     = $this->compress ? "_co{$this->compress}" : null;
         $rotateBefore = $this->rotateBefore ? "_rb{$this->rotateBefore}" : null;
-        $rotateAfter  = $this->rotateAfter  ? "_ra{$this->rotateAfter}"  : null;
-        $lossy        = $this->lossy        ? "_l"                       : null;
+        $rotateAfter  = $this->rotateAfter ? "_ra{$this->rotateAfter}" : null;
+        $lossy        = $this->lossy ? "_l" : null;
 
         $saveAs = $this->normalizeFileExtension();
         $saveAs = $saveAs ? "_$saveAs" : null;
@@ -1411,7 +1411,7 @@ 
             $copyStrat = "_rs";
         }
 
-        $width  = $this->newWidth  ? '_' . $this->newWidth  : null;
+        $width  = $this->newWidth ? '_' . $this->newWidth : null;
         $height = $this->newHeight ? '_' . $this->newHeight : null;
 
         $offset = isset($this->offset)
@@ -1427,23 +1427,23 @@ 
             foreach ($this->filters as $filter) {
                 if (is_array($filter)) {
                     $filters .= "_f{$filter['id']}";
-                    for ($i=1; $i<=$filter['argc']; $i++) {
-                        $filters .= "-".$filter["arg{$i}"];
+                    for ($i = 1; $i <= $filter['argc']; $i++) {
+                        $filters .= "-" . $filter["arg{$i}"];
                     }
                 }
             }
         }
 
         $sharpen = $this->sharpen ? 's' : null;
-        $emboss  = $this->emboss  ? 'e' : null;
-        $blur    = $this->blur    ? 'b' : null;
+        $emboss  = $this->emboss ? 'e' : null;
+        $blur    = $this->blur ? 'b' : null;
         $palette = $this->palette ? 'p' : null;
 
         $autoRotate = $this->autoRotate ? 'ar' : null;
 
         $optimize  = $this->jpegOptimize ? 'o' : null;
-        $optimize .= $this->pngFilter    ? 'f' : null;
-        $optimize .= $this->pngDeflate   ? 'd' : null;
+        $optimize .= $this->pngFilter ? 'f' : null;
+        $optimize .= $this->pngDeflate ? 'd' : null;
 
         $convolve = null;
         if ($this->convolve) {
@@ -1657,9 +1657,9 @@ 
             $h = imagesy($im);
             $w = imagesx($im);
             $c = array();
-            for ($x=0; $x < $w; $x++) {
-                for ($y=0; $y < $h; $y++) {
-                    @$c['c'.imagecolorat($im, $x, $y)]++;
+            for ($x = 0; $x < $w; $x++) {
+                for ($y = 0; $y < $h; $y++) {
+                    @$c['c' . imagecolorat($im, $x, $y)]++;
                 }
             }
             return count($c);
@@ -1697,8 +1697,8 @@ 
         // Scale the original image before starting
         if (isset($this->scale)) {
             $this->log("Scale by {$this->scale}%");
-            $newWidth  = $this->width * $this->scale / 100;
-            $newHeight = $this->height * $this->scale / 100;
+            $newWidth  = $this->width*$this->scale/100;
+            $newHeight = $this->height*$this->scale/100;
             $img = $this->CreateImageKeepTransparency($newWidth, $newHeight);
             imagecopyresampled($img, $this->image, 0, 0, 0, 0, $newWidth, $newHeight, $this->width, $this->height);
             $this->image = $img;
@@ -1733,7 +1733,7 @@ 
      */
     public function imageCopyResampled($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h)
     {
-        if($this->copyStrategy == self::RESIZE) {
+        if ($this->copyStrategy == self::RESIZE) {
             $this->log("Copy by resize");
             imagecopyresized($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
         } else {
@@ -1798,14 +1798,14 @@ 
                 $cropY = 0;
 
                 if ($this->newWidth > $this->width) {
-                    $posX = round(($this->newWidth - $this->width) / 2);
+                    $posX = round(($this->newWidth - $this->width)/2);
                 }
                 if ($this->newWidth < $this->width) {
                     $cropX = round(($this->width/2) - ($this->newWidth/2));
                 }
 
                 if ($this->newHeight > $this->height) {
-                    $posY = round(($this->newHeight - $this->height) / 2);
+                    $posY = round(($this->newHeight - $this->height)/2);
                 }
                 if ($this->newHeight < $this->height) {
                     $cropY = round(($this->height/2) - ($this->newHeight/2));
@@ -1844,14 +1844,14 @@ 
             $posX = 0;
             $posY = 0;
 
-            $ratioOrig = $this->width / $this->height;
-            $ratioNew  = $this->newWidth / $this->newHeight;
+            $ratioOrig = $this->width/$this->height;
+            $ratioNew  = $this->newWidth/$this->newHeight;
 
             // Check ratio for landscape or portrait
             if ($ratioOrig < $ratioNew) {
-                $posX = round(($this->newWidth - $this->fillWidth) / 2);
+                $posX = round(($this->newWidth - $this->fillWidth)/2);
             } else {
-                $posY = round(($this->newHeight - $this->fillHeight) / 2);
+                $posY = round(($this->newHeight - $this->fillHeight)/2);
             }
 
             if (!$this->upscale
@@ -1859,8 +1859,8 @@ 
             ) {
 
                 $this->log("Resizing - smaller image, do not upscale.");
-                $posX = round(($this->newWidth - $this->width) / 2);
-                $posY = round(($this->newHeight - $this->height) / 2);
+                $posX = round(($this->newWidth - $this->width)/2);
+                $posY = round(($this->newHeight - $this->height)/2);
                 $imageResized = $this->CreateImageKeepTransparency($this->newWidth, $this->newHeight);
                 imagecopy($imageResized, $this->image, $posX, $posY, 0, 0, $this->width, $this->height);
 
@@ -1894,14 +1894,14 @@ 
                     $cropY = 0;
 
                     if ($this->newWidth > $this->width && $this->newHeight > $this->height) {
-                        $posX = round(($this->newWidth - $this->width) / 2);
-                        $posY = round(($this->newHeight - $this->height) / 2);
+                        $posX = round(($this->newWidth - $this->width)/2);
+                        $posY = round(($this->newHeight - $this->height)/2);
                     } elseif ($this->newWidth > $this->width) {
-                        $posX = round(($this->newWidth - $this->width) / 2);
-                        $cropY = round(($this->height - $this->newHeight) / 2);
+                        $posX = round(($this->newWidth - $this->width)/2);
+                        $cropY = round(($this->height - $this->newHeight)/2);
                     } elseif ($this->newHeight > $this->height) {
-                        $posY = round(($this->newHeight - $this->height) / 2);
-                        $cropX = round(($this->width - $this->newWidth) / 2);
+                        $posY = round(($this->newHeight - $this->height)/2);
+                        $cropX = round(($this->width - $this->newWidth)/2);
                     }
 
                     $imageResized = $this->CreateImageKeepTransparency($this->newWidth, $this->newHeight);
@@ -2164,7 +2164,7 @@ 
             );
         }
 
-        array_walk($part, function ($item, $key) {
+        array_walk($part, function($item, $key) {
             if (!is_numeric($item)) {
                 throw new Exception("Argument to convolve expression should be float but is not.");
             }
@@ -2436,7 +2436,7 @@ 
 
         $type = $this->getTargetImageExtension();
         $this->Log("Saving image as " . $type);
-        switch($type) {
+        switch ($type) {
 
             case 'jpeg':
             case 'jpg':
@@ -2788,16 +2788,16 @@ 
         $details['mimeType']    = $this->getMimeType($this->fileType);
         $details['width']       = $this->width;
         $details['height']      = $this->height;
-        $details['aspectRatio'] = round($this->width / $this->height, 3);
+        $details['aspectRatio'] = round($this->width/$this->height, 3);
         $details['size']        = filesize($file);
         $details['colors'] = $this->colorsTotal($this->image);
         $details['includedFiles'] = count(get_included_files());
-        $details['memoryPeek'] = round(memory_get_peak_usage()/1024/1024, 3) . " MB" ;
+        $details['memoryPeek'] = round(memory_get_peak_usage()/1024/1024, 3) . " MB";
         $details['memoryCurrent'] = round(memory_get_usage()/1024/1024, 3) . " MB";
         $details['memoryLimit'] = ini_get('memory_limit');
 
         if (isset($_SERVER['REQUEST_TIME_FLOAT'])) {
-            $details['loadTime'] = (string) round((microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']), 3) . "s";
+            $details['loadTime'] = (string)round((microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']), 3) . "s";
         }
 
         if ($details['mimeType'] == 'image/png') {
@@ -2889,7 +2889,7 @@ 
         $log = null;
         $this->log("### Summary of verbose log");
         $this->log("As JSON: \n" . $this->json());
-        $this->log("Memory peak: " . round(memory_get_peak_usage() /1024/1024) . "M");
+        $this->log("Memory peak: " . round(memory_get_peak_usage()/1024/1024) . "M");
         $this->log("Memory limit: " . ini_get('memory_limit'));
 
         $included = get_included_files();

a/vendor/mos/cimage/autoload.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
  *
  * @return void
  */
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
     //$path = CIMAGE_SOURCE_PATH . "/{$class}.php";
     $path = __DIR__ . "/{$class}.php";
     if (is_file($path)) {

a/vendor/mos/cimage/CAsciiArt.php

Spacing +9 added lines, -9 removed lines

@@ -116,11 +116,11 @@ 
 
         $ascii = null;
         $incY = $this->scale;
-        $incX = $this->scale / 2;
+        $incX = $this->scale/2;
         
         for ($y = 0; $y < $height - 1; $y += $incY) {
             for ($x = 0; $x < $width - 1; $x += $incX) {
-                $toX = min($x + $this->scale / 2, $width - 1);
+                $toX = min($x + $this->scale/2, $width - 1);
                 $toY = min($y + $this->scale, $height - 1);
                 $luminance = $this->luminanceAreaAverage($img, $x, $y, $toX, $toY);
                 $ascii .= $this->luminance2character($luminance);
@@ -146,7 +146,7 @@ 
      */
     public function luminanceAreaAverage($img, $x1, $y1, $x2, $y2)
     {
-        $numPixels = ($x2 - $x1 + 1) * ($y2 - $y1 + 1);
+        $numPixels = ($x2 - $x1 + 1)*($y2 - $y1 + 1);
         $luminance = 0;
         
         for ($x = $x1; $x <= $x2; $x++) {
@@ -159,7 +159,7 @@ 
             }
         }
         
-        return $luminance / $numPixels;
+        return $luminance/$numPixels;
     }
 
 
@@ -177,17 +177,17 @@ 
     {
         switch ($this->luminanceStrategy) {
             case 1:
-                $luminance = ($red * 0.2126 + $green * 0.7152 + $blue * 0.0722) / 255;
+                $luminance = ($red*0.2126 + $green*0.7152 + $blue*0.0722)/255;
                 break;
             case 2:
-                $luminance = ($red * 0.299 + $green * 0.587 + $blue * 0.114) / 255;
+                $luminance = ($red*0.299 + $green*0.587 + $blue*0.114)/255;
                 break;
             case 3:
-                $luminance = sqrt(0.299 * pow($red, 2) + 0.587 * pow($green, 2) + 0.114 * pow($blue, 2)) / 255;
+                $luminance = sqrt(0.299*pow($red, 2) + 0.587*pow($green, 2) + 0.114*pow($blue, 2))/255;
                 break;
             case 0:
             default:
-                $luminance = ($red + $green + $blue) / (255 * 3);
+                $luminance = ($red + $green + $blue)/(255*3);
         }
 
         return $luminance;
@@ -205,7 +205,7 @@ 
      */
     public function luminance2character($luminance)
     {
-        $position = (int) round($luminance * ($this->charCount - 1));
+        $position = (int)round($luminance*($this->charCount - 1));
         $char = $this->characters[$position];
         return $char;
     }

a/vendor/mos/cimage/webroot/img_config.php

Indentation +105 added lines, -105 removed lines

@@ -40,9 +40,9 @@ 
      * Default values:
      *  mode: 'production'
      */
-     //'mode' => 'production',
-     'mode' => 'development',
-     //'mode' => 'strict',
+        //'mode' => 'production',
+        'mode' => 'development',
+        //'mode' => 'strict',
 
 
 
@@ -93,9 +93,9 @@ 
      *  CCache: CCache
      *  CFastTrackCache: CFastTrackCache
      */
-     //'CImage' => 'CImage',
-     //'CCache' => 'CCache',
-     //'CFastTrackCache' => 'CFastTrackCache',
+        //'CImage' => 'CImage',
+        //'CCache' => 'CCache',
+        //'CFastTrackCache' => 'CFastTrackCache',
 
 
 
@@ -160,8 +160,8 @@ 
      * Default value:
      *  src_alt:  null //disabled by default
      */
-     //'src_alt' => 'car.png',
-     //'src_alt' => 'dummy',
+        //'src_alt' => 'car.png',
+        //'src_alt' => 'dummy',
 
 
 
@@ -172,62 +172,62 @@ 
      *  valid_filename:  '#^[a-z0-9A-Z-/_ \.:]+$#'
      *  valid_aliasname: '#^[a-z0-9A-Z-_]+$#'
      */
-     //'valid_filename'  => '#^[a-z0-9A-Z-/_ \.:]+$#',
-     //'valid_aliasname' => '#^[a-z0-9A-Z-_]+$#',
-
-
-
-     /**
-      * Change the default values for CImage quality and compression used
-      * when saving images.
-      *
-      * Default value:
-      *  jpg_quality:     null, integer between 0-100
-      *  png_compression: null, integer between 0-9
-      */
-      //'jpg_quality'  => 75,
-      //'png_compression' => 1,
-
-
-
-      /**
-       * Convert the image to srgb before processing. Saves the converted
-       * image in a cache subdir 'srgb'. This option is default false but can
-       * be changed to default true to do this conversion for all images.
-       * This option requires PHP extension imagick and will silently fail
-       * if that is not installed.
-       *
-       * Default value:
-       *  srgb_default:      false
-       *  srgb_colorprofile: __DIR__ . '/../icc/sRGB_IEC61966-2-1_black_scaled.icc'
-       */
-       //'srgb_default' => false,
-       //'srgb_colorprofile' => __DIR__ . '/../icc/sRGB_IEC61966-2-1_black_scaled.icc',
-
-
-
-       /**
-        * Set skip-original to true to always process the image and use
-        * the cached version. Default is false and to use the original
-        * image when its no processing needed.
-        *
-        * Default value:
-        *  skip_original: false
-        */
+        //'valid_filename'  => '#^[a-z0-9A-Z-/_ \.:]+$#',
+        //'valid_aliasname' => '#^[a-z0-9A-Z-_]+$#',
+
+
+
+        /**
+         * Change the default values for CImage quality and compression used
+         * when saving images.
+         *
+         * Default value:
+         *  jpg_quality:     null, integer between 0-100
+         *  png_compression: null, integer between 0-9
+         */
+        //'jpg_quality'  => 75,
+        //'png_compression' => 1,
+
+
+
+        /**
+         * Convert the image to srgb before processing. Saves the converted
+         * image in a cache subdir 'srgb'. This option is default false but can
+         * be changed to default true to do this conversion for all images.
+         * This option requires PHP extension imagick and will silently fail
+         * if that is not installed.
+         *
+         * Default value:
+         *  srgb_default:      false
+         *  srgb_colorprofile: __DIR__ . '/../icc/sRGB_IEC61966-2-1_black_scaled.icc'
+         */
+        //'srgb_default' => false,
+        //'srgb_colorprofile' => __DIR__ . '/../icc/sRGB_IEC61966-2-1_black_scaled.icc',
+
+
+
+        /**
+         * Set skip-original to true to always process the image and use
+         * the cached version. Default is false and to use the original
+         * image when its no processing needed.
+         *
+         * Default value:
+         *  skip_original: false
+         */
         //'skip_original' => true,
 
 
 
-      /**
-       * A function (hook) can be called after img.php has processed all
-       * configuration options and before processing the image using CImage.
-       * The function receives the $img variabel and an array with the
-       * majority of current settings.
-       *
-       * Default value:
-       *  hook_before_CImage:     null
-       */
-       /*'hook_before_CImage' => function (CImage $img, Array $allConfig) {
+        /**
+         * A function (hook) can be called after img.php has processed all
+         * configuration options and before processing the image using CImage.
+         * The function receives the $img variabel and an array with the
+         * majority of current settings.
+         *
+         * Default value:
+         *  hook_before_CImage:     null
+         */
+        /*'hook_before_CImage' => function (CImage $img, Array $allConfig) {
            if ($allConfig['newWidth'] > 10) {
                $allConfig['newWidth'] *= 2;
            }
@@ -236,53 +236,53 @@ 
 
 
 
-       /**
-        * Add header for cache control when outputting images.
-        *
-        * Default value:
-        *  cache_control: null, or set to string
-        */
+        /**
+         * Add header for cache control when outputting images.
+         *
+         * Default value:
+         *  cache_control: null, or set to string
+         */
         //'cache_control' => "max-age=86400",
 
 
 
-     /**
-      * The name representing a dummy image which is automatically created
-      * and stored as a image in the dir CACHE_PATH/dummy. The dummy image
-      * can then be used as a placeholder image.
-      * The dir CACHE_PATH/dummy is automatically created when needed.
-      * Write protect the CACHE_PATH/dummy to prevent creation of new
-      * dummy images, but continue to use the existing ones.
-      *
-      * Default value:
-      *  dummy_enabled:  true as default, disable dummy feature by setting
-      *                  to false.
-      *  dummy_filename: 'dummy' use this as ?src=dummy to create a dummy image.
-      */
-      //'dummy_enabled' => true,
-      //'dummy_filename' => 'dummy',
-
-
-
-     /**
-     * Check that the imagefile is a file below 'image_path' using realpath().
-     * Security constraint to avoid reaching images outside image_path.
-     * This means that symbolic links to images outside the image_path will
-     * fail.
-     *
-     * Default value:
-     *  image_path_constraint: true
-     */
-     //'image_path_constraint' => false,
-
-
-
-     /**
-     * Set default timezone.
-     *
-     * Default values.
-     *  default_timezone: ini_get('default_timezone') or 'UTC'
-     */
+        /**
+         * The name representing a dummy image which is automatically created
+         * and stored as a image in the dir CACHE_PATH/dummy. The dummy image
+         * can then be used as a placeholder image.
+         * The dir CACHE_PATH/dummy is automatically created when needed.
+         * Write protect the CACHE_PATH/dummy to prevent creation of new
+         * dummy images, but continue to use the existing ones.
+         *
+         * Default value:
+         *  dummy_enabled:  true as default, disable dummy feature by setting
+         *                  to false.
+         *  dummy_filename: 'dummy' use this as ?src=dummy to create a dummy image.
+         */
+        //'dummy_enabled' => true,
+        //'dummy_filename' => 'dummy',
+
+
+
+        /**
+         * Check that the imagefile is a file below 'image_path' using realpath().
+         * Security constraint to avoid reaching images outside image_path.
+         * This means that symbolic links to images outside the image_path will
+         * fail.
+         *
+         * Default value:
+         *  image_path_constraint: true
+         */
+        //'image_path_constraint' => false,
+
+
+
+        /**
+         * Set default timezone.
+         *
+         * Default values.
+         *  default_timezone: ini_get('default_timezone') or 'UTC'
+         */
     //'default_timezone' => 'UTC',
 
 
@@ -388,7 +388,7 @@ 
      *  allow_hotlinking:     true
      *  hotlinking_whitelist: array()
      */
-     /*
+        /*
     'allow_hotlinking' => false,
     'hotlinking_whitelist' => array(
         '^dbwebb\.se$',
@@ -404,7 +404,7 @@ 
      *      'sepia' => "&f=grayscale&f0=brightness,-10&f1=contrast,-20&f2=colorize,120,60,0,0&sharpen",
      *  )
      */
-     /*
+        /*
     'shortcut' => array(
         'sepia' => "&f=grayscale&f0=brightness,-10&f1=contrast,-20&f2=colorize,120,60,0,0&sharpen",
     ),*/

a/vendor/mos/cimage/webroot/imgp.php

Indentation +23 added lines, -23 removed lines

@@ -234,9 +234,9 @@ 
 
 
     /**
-    * Constructor
-    *
-    */
+     * Constructor
+     *
+     */
     public function __construct()
     {
         $this->request['header'] = array();
@@ -1333,8 +1333,8 @@ 
     /**
      * Path to command to optimize jpeg images, for example jpegtran or null.
      */
-     private $jpegOptimize;
-     private $jpegOptimizeCmd;
+        private $jpegOptimize;
+        private $jpegOptimizeCmd;
 
 
 
@@ -1505,8 +1505,8 @@ 
 
 
     /**
-    * Disable the fasttrackCacke to start with, inject an object to enable it.
-    */
+     * Disable the fasttrackCacke to start with, inject an object to enable it.
+     */
     private $fastTrackCache = null;
 
 
@@ -1536,9 +1536,9 @@ 
     /*
      * Image copy strategy, defaults to RESAMPLE.
      */
-     const RESIZE = 1;
-     const RESAMPLE = 2;
-     private $copyStrategy = NULL;
+        const RESIZE = 1;
+        const RESAMPLE = 2;
+        private $copyStrategy = NULL;
 
 
 
@@ -2363,7 +2363,7 @@ 
         $this->crop      = $this->cropOrig;
 
         $this->initDimensions()
-             ->calculateNewWidthAndHeight();
+                ->calculateNewWidthAndHeight();
 
         return $this;
     }
@@ -2794,14 +2794,14 @@ 
         if ($this->rotateBefore) {
             $this->log("Rotating image.");
             $this->rotate($this->rotateBefore, $this->bgColor)
-                 ->reCalculateDimensions();
+                    ->reCalculateDimensions();
         }
 
         // Auto-rotate image
         if ($this->autoRotate) {
             $this->log("Auto rotating image.");
             $this->rotateExif()
-                 ->reCalculateDimensions();
+                    ->reCalculateDimensions();
         }
 
         // Scale the original image before starting
@@ -2828,11 +2828,11 @@ 
      *
      * @return $this
      */
-     public function setCopyResizeStrategy($strategy)
-     {
-         $this->copyStrategy = $strategy;
-         return $this;
-     }
+        public function setCopyResizeStrategy($strategy)
+        {
+            $this->copyStrategy = $strategy;
+            return $this;
+        }
 
 
 
@@ -3343,7 +3343,7 @@ 
      * @param string $color as hex value.
      *
      * @return $this
-    */
+     */
     public function setDefaultBackgroundColor($color)
     {
         $this->log("Setting default background color to '$color'.");
@@ -3395,7 +3395,7 @@ 
      * @param resource $img the image to work with or null if using $this->image.
      *
      * @return color value or null if no background color is set.
-    */
+     */
     private function getBackgroundColor($img = null)
     {
         $img = isset($img) ? $img : $this->image;
@@ -3429,7 +3429,7 @@ 
      * @param int $height of the new image.
      *
      * @return image resource.
-    */
+     */
     private function createImageKeepTransparency($width, $height)
     {
         $this->log("Creating a new working image width={$width}px, height={$height}px.");
@@ -3674,8 +3674,8 @@ 
 
         // Prepare
         $this->setSaveFolder($cache)
-             ->setSource($src, $dir)
-             ->generateFilename(null, false, 'srgb_');
+                ->setSource($src, $dir)
+                ->generateFilename(null, false, 'srgb_');
 
         // Check if the cached version is accurate.
         if ($useCache && is_readable($this->cacheFileName)) {

Spacing +109 added lines, -109 removed lines

@@ -263,7 +263,7 @@ 
         $url .= $parts['host'];
         $url .= isset($parts['port'])
             ? ":" . $parts['port']
-            : "" ;
+            : "";
         $url .= $parts['path'];
 
         return $url;
@@ -409,7 +409,7 @@ 
     public function getStatus()
     {
         return isset($this->response['header']['status'])
-            ? (int) $this->response['header']['status']
+            ? (int)$this->response['header']['status']
             : null;
     }
 
@@ -484,7 +484,7 @@ 
             // max-age=2592000
             $part = explode('=', $cacheControl);
             $maxAge = ($part[0] == "max-age")
-                ? (int) $part[1]
+                ? (int)$part[1]
                 : null;
         }
 
@@ -667,7 +667,7 @@ 
             $cimageVersion = CIMAGE_USER_AGENT;
         }
         
-        $this->http->setHeader("User-Agent", "$cimageVersion (PHP/". phpversion() . " cURL)");
+        $this->http->setHeader("User-Agent", "$cimageVersion (PHP/" . phpversion() . " cURL)");
         $this->http->setHeader("Accept", "image/jpeg,image/png,image/gif");
 
         if ($this->useCache) {
@@ -1012,11 +1012,11 @@ 
 
         $ascii = null;
         $incY = $this->scale;
-        $incX = $this->scale / 2;
+        $incX = $this->scale/2;
         
         for ($y = 0; $y < $height - 1; $y += $incY) {
             for ($x = 0; $x < $width - 1; $x += $incX) {
-                $toX = min($x + $this->scale / 2, $width - 1);
+                $toX = min($x + $this->scale/2, $width - 1);
                 $toY = min($y + $this->scale, $height - 1);
                 $luminance = $this->luminanceAreaAverage($img, $x, $y, $toX, $toY);
                 $ascii .= $this->luminance2character($luminance);
@@ -1042,7 +1042,7 @@ 
      */
     public function luminanceAreaAverage($img, $x1, $y1, $x2, $y2)
     {
-        $numPixels = ($x2 - $x1 + 1) * ($y2 - $y1 + 1);
+        $numPixels = ($x2 - $x1 + 1)*($y2 - $y1 + 1);
         $luminance = 0;
         
         for ($x = $x1; $x <= $x2; $x++) {
@@ -1055,7 +1055,7 @@ 
             }
         }
         
-        return $luminance / $numPixels;
+        return $luminance/$numPixels;
     }
 
 
@@ -1073,17 +1073,17 @@ 
     {
         switch ($this->luminanceStrategy) {
             case 1:
-                $luminance = ($red * 0.2126 + $green * 0.7152 + $blue * 0.0722) / 255;
+                $luminance = ($red*0.2126 + $green*0.7152 + $blue*0.0722)/255;
                 break;
             case 2:
-                $luminance = ($red * 0.299 + $green * 0.587 + $blue * 0.114) / 255;
+                $luminance = ($red*0.299 + $green*0.587 + $blue*0.114)/255;
                 break;
             case 3:
-                $luminance = sqrt(0.299 * pow($red, 2) + 0.587 * pow($green, 2) + 0.114 * pow($blue, 2)) / 255;
+                $luminance = sqrt(0.299*pow($red, 2) + 0.587*pow($green, 2) + 0.114*pow($blue, 2))/255;
                 break;
             case 0:
             default:
-                $luminance = ($red + $green + $blue) / (255 * 3);
+                $luminance = ($red + $green + $blue)/(255*3);
         }
 
         return $luminance;
@@ -1101,7 +1101,7 @@ 
      */
     public function luminance2character($luminance)
     {
-        $position = (int) round($luminance * ($this->charCount - 1));
+        $position = (int)round($luminance*($this->charCount - 1));
         $char = $this->characters[$position];
         return $char;
     }
@@ -1341,7 +1341,7 @@ 
     /**
      * Image dimensions, calculated from loaded image.
      */
-    private $width;  // Calculated from source image
+    private $width; // Calculated from source image
     private $height; // Calculated from source image
 
 
@@ -1349,7 +1349,7 @@ 
      * New image dimensions, incoming as argument or calculated.
      */
     private $newWidth;
-    private $newWidthOrig;  // Save original value
+    private $newWidthOrig; // Save original value
     private $newHeight;
     private $newHeightOrig; // Save original value
 
@@ -1655,7 +1655,7 @@ 
      */
     public function createDummyImage($width = null, $height = null)
     {
-        $this->newWidth  = $this->newWidth  ?: $width  ?: 100;
+        $this->newWidth  = $this->newWidth ?: $width ?: 100;
         $this->newHeight = $this->newHeight ?: $height ?: 100;
 
         $this->image = $this->CreateImageKeepTransparency($this->newWidth, $this->newHeight);
@@ -1985,7 +1985,7 @@ 
                 $parts = explode(',', $filterStr);
                 $filter = $this->mapFilter($parts[0]);
                 $filter['str'] = $filterStr;
-                for ($i=1; $i<=$filter['argc']; $i++) {
+                for ($i = 1; $i <= $filter['argc']; $i++) {
                     if (isset($parts[$i])) {
                         $filter["arg{$i}"] = $parts[$i];
                     } else {
@@ -2031,16 +2031,16 @@ 
     private function mapFilter($name)
     {
         $map = array(
-            'negate'          => array('id'=>0,  'argc'=>0, 'type'=>IMG_FILTER_NEGATE),
-            'grayscale'       => array('id'=>1,  'argc'=>0, 'type'=>IMG_FILTER_GRAYSCALE),
-            'brightness'      => array('id'=>2,  'argc'=>1, 'type'=>IMG_FILTER_BRIGHTNESS),
-            'contrast'        => array('id'=>3,  'argc'=>1, 'type'=>IMG_FILTER_CONTRAST),
-            'colorize'        => array('id'=>4,  'argc'=>4, 'type'=>IMG_FILTER_COLORIZE),
-            'edgedetect'      => array('id'=>5,  'argc'=>0, 'type'=>IMG_FILTER_EDGEDETECT),
-            'emboss'          => array('id'=>6,  'argc'=>0, 'type'=>IMG_FILTER_EMBOSS),
-            'gaussian_blur'   => array('id'=>7,  'argc'=>0, 'type'=>IMG_FILTER_GAUSSIAN_BLUR),
-            'selective_blur'  => array('id'=>8,  'argc'=>0, 'type'=>IMG_FILTER_SELECTIVE_BLUR),
-            'mean_removal'    => array('id'=>9,  'argc'=>0, 'type'=>IMG_FILTER_MEAN_REMOVAL),
+            'negate'          => array('id'=>0, 'argc'=>0, 'type'=>IMG_FILTER_NEGATE),
+            'grayscale'       => array('id'=>1, 'argc'=>0, 'type'=>IMG_FILTER_GRAYSCALE),
+            'brightness'      => array('id'=>2, 'argc'=>1, 'type'=>IMG_FILTER_BRIGHTNESS),
+            'contrast'        => array('id'=>3, 'argc'=>1, 'type'=>IMG_FILTER_CONTRAST),
+            'colorize'        => array('id'=>4, 'argc'=>4, 'type'=>IMG_FILTER_COLORIZE),
+            'edgedetect'      => array('id'=>5, 'argc'=>0, 'type'=>IMG_FILTER_EDGEDETECT),
+            'emboss'          => array('id'=>6, 'argc'=>0, 'type'=>IMG_FILTER_EMBOSS),
+            'gaussian_blur'   => array('id'=>7, 'argc'=>0, 'type'=>IMG_FILTER_GAUSSIAN_BLUR),
+            'selective_blur'  => array('id'=>8, 'argc'=>0, 'type'=>IMG_FILTER_SELECTIVE_BLUR),
+            'mean_removal'    => array('id'=>9, 'argc'=>0, 'type'=>IMG_FILTER_MEAN_REMOVAL),
             'smooth'          => array('id'=>10, 'argc'=>1, 'type'=>IMG_FILTER_SMOOTH),
             'pixelate'        => array('id'=>11, 'argc'=>2, 'type'=>IMG_FILTER_PIXELATE),
         );
@@ -2134,15 +2134,15 @@ 
 
         // width as %
         if ($this->newWidth
-            && $this->newWidth[strlen($this->newWidth)-1] == '%') {
-            $this->newWidth = $this->width * substr($this->newWidth, 0, -1) / 100;
+            && $this->newWidth[strlen($this->newWidth) - 1] == '%') {
+            $this->newWidth = $this->width*substr($this->newWidth, 0, -1)/100;
             $this->log("Setting new width based on % to {$this->newWidth}");
         }
 
         // height as %
         if ($this->newHeight
-            && $this->newHeight[strlen($this->newHeight)-1] == '%') {
-            $this->newHeight = $this->height * substr($this->newHeight, 0, -1) / 100;
+            && $this->newHeight[strlen($this->newHeight) - 1] == '%') {
+            $this->newHeight = $this->height*substr($this->newHeight, 0, -1)/100;
             $this->log("Setting new height based on % to {$this->newHeight}");
         }
 
@@ -2152,32 +2152,32 @@ 
         if ($this->aspectRatio && is_null($this->newWidth) && is_null($this->newHeight)) {
             if ($this->aspectRatio >= 1) {
                 $this->newWidth   = $this->width;
-                $this->newHeight  = $this->width / $this->aspectRatio;
+                $this->newHeight  = $this->width/$this->aspectRatio;
                 $this->log("Setting new width & height based on width & aspect ratio (>=1) to (w x h) {$this->newWidth} x {$this->newHeight}");
 
             } else {
                 $this->newHeight  = $this->height;
-                $this->newWidth   = $this->height * $this->aspectRatio;
+                $this->newWidth   = $this->height*$this->aspectRatio;
                 $this->log("Setting new width & height based on width & aspect ratio (<1) to (w x h) {$this->newWidth} x {$this->newHeight}");
             }
 
         } elseif ($this->aspectRatio && is_null($this->newWidth)) {
-            $this->newWidth   = $this->newHeight * $this->aspectRatio;
+            $this->newWidth = $this->newHeight*$this->aspectRatio;
             $this->log("Setting new width based on aspect ratio to {$this->newWidth}");
 
         } elseif ($this->aspectRatio && is_null($this->newHeight)) {
-            $this->newHeight  = $this->newWidth / $this->aspectRatio;
+            $this->newHeight = $this->newWidth/$this->aspectRatio;
             $this->log("Setting new height based on aspect ratio to {$this->newHeight}");
         }
 
         // Change width & height based on dpr
         if ($this->dpr != 1) {
             if (!is_null($this->newWidth)) {
-                $this->newWidth  = round($this->newWidth * $this->dpr);
+                $this->newWidth = round($this->newWidth*$this->dpr);
                 $this->log("Setting new width based on dpr={$this->dpr} - w={$this->newWidth}");
             }
             if (!is_null($this->newHeight)) {
-                $this->newHeight = round($this->newHeight * $this->dpr);
+                $this->newHeight = round($this->newHeight*$this->dpr);
                 $this->log("Setting new height based on dpr={$this->dpr} - h={$this->newHeight}");
             }
         }
@@ -2212,10 +2212,10 @@ 
 
         // Check if there is an area to crop off
         if (isset($this->area)) {
-            $this->offset['top']    = round($this->area['top'] / 100 * $this->height);
-            $this->offset['right']  = round($this->area['right'] / 100 * $this->width);
-            $this->offset['bottom'] = round($this->area['bottom'] / 100 * $this->height);
-            $this->offset['left']   = round($this->area['left'] / 100 * $this->width);
+            $this->offset['top']    = round($this->area['top']/100*$this->height);
+            $this->offset['right']  = round($this->area['right']/100*$this->width);
+            $this->offset['bottom'] = round($this->area['bottom']/100*$this->height);
+            $this->offset['left']   = round($this->area['left']/100*$this->width);
             $this->offset['width']  = $this->width - $this->offset['left'] - $this->offset['right'];
             $this->offset['height'] = $this->height - $this->offset['top'] - $this->offset['bottom'];
             $this->width  = $this->offset['width'];
@@ -2237,7 +2237,7 @@ 
             } elseif ($this->crop['start_x'] == 'right') {
                 $this->crop['start_x'] = $this->width - $width;
             } elseif ($this->crop['start_x'] == 'center') {
-                $this->crop['start_x'] = round($this->width / 2) - round($width / 2);
+                $this->crop['start_x'] = round($this->width/2) - round($width/2);
             }
 
             if ($this->crop['start_y'] == 'top') {
@@ -2245,7 +2245,7 @@ 
             } elseif ($this->crop['start_y'] == 'bottom') {
                 $this->crop['start_y'] = $this->height - $height;
             } elseif ($this->crop['start_y'] == 'center') {
-                $this->crop['start_y'] = round($this->height / 2) - round($height / 2);
+                $this->crop['start_y'] = round($this->height/2) - round($height/2);
             }
 
             $this->log("Crop area is width {$width}px, height {$height}px, start_x {$this->crop['start_x']}px, start_y {$this->crop['start_y']}px.");
@@ -2266,25 +2266,25 @@ 
 
                 // Both new width and height are set.
                 // Use newWidth and newHeigh as max width/height, image should not be larger.
-                $ratioWidth  = $width  / $this->newWidth;
-                $ratioHeight = $height / $this->newHeight;
+                $ratioWidth  = $width/$this->newWidth;
+                $ratioHeight = $height/$this->newHeight;
                 $ratio = ($ratioWidth > $ratioHeight) ? $ratioWidth : $ratioHeight;
-                $this->newWidth  = round($width  / $ratio);
-                $this->newHeight = round($height / $ratio);
+                $this->newWidth  = round($width/$ratio);
+                $this->newHeight = round($height/$ratio);
                 $this->log("New width and height was set.");
 
             } elseif (isset($this->newWidth)) {
 
                 // Use new width as max-width
-                $factor = (float)$this->newWidth / (float)$width;
-                $this->newHeight = round($factor * $height);
+                $factor = (float)$this->newWidth/(float)$width;
+                $this->newHeight = round($factor*$height);
                 $this->log("New width was set.");
 
             } elseif (isset($this->newHeight)) {
 
                 // Use new height as max-hight
-                $factor = (float)$this->newHeight / (float)$height;
-                $this->newWidth = round($factor * $width);
+                $factor = (float)$this->newHeight/(float)$height;
+                $this->newWidth = round($factor*$width);
                 $this->log("New height was set.");
 
             } else {
@@ -2299,8 +2299,8 @@ 
             if ($this->cropToFit || $this->fillToFit) {
 
                 // Get relations of original & target image
-                $ratioWidth  = $width  / $this->newWidth;
-                $ratioHeight = $height / $this->newHeight;
+                $ratioWidth  = $width/$this->newWidth;
+                $ratioHeight = $height/$this->newHeight;
 
                 if ($this->cropToFit) {
 
@@ -2308,8 +2308,8 @@ 
                     // image should fit the area.
                     $this->log("Crop to fit.");
                     $ratio = ($ratioWidth < $ratioHeight) ? $ratioWidth : $ratioHeight;
-                    $this->cropWidth  = round($width  / $ratio);
-                    $this->cropHeight = round($height / $ratio);
+                    $this->cropWidth  = round($width/$ratio);
+                    $this->cropHeight = round($height/$ratio);
                     $this->log("Crop width, height, ratio: $this->cropWidth x $this->cropHeight ($ratio).");
 
                 } elseif ($this->fillToFit) {
@@ -2318,8 +2318,8 @@ 
                     // image should fit the area.
                     $this->log("Fill to fit.");
                     $ratio = ($ratioWidth < $ratioHeight) ? $ratioHeight : $ratioWidth;
-                    $this->fillWidth  = round($width  / $ratio);
-                    $this->fillHeight = round($height / $ratio);
+                    $this->fillWidth  = round($width/$ratio);
+                    $this->fillHeight = round($height/$ratio);
                     $this->log("Fill width, height, ratio: $this->fillWidth x $this->fillHeight ($ratio).");
                 }
             }
@@ -2501,17 +2501,17 @@ 
     public function generateFilename($base = null, $useSubdir = true, $prefix = null)
     {
         $filename     = basename($this->pathToImage);
-        $cropToFit    = $this->cropToFit    ? '_cf'                      : null;
-        $fillToFit    = $this->fillToFit    ? '_ff'                      : null;
-        $crop_x       = $this->crop_x       ? "_x{$this->crop_x}"        : null;
-        $crop_y       = $this->crop_y       ? "_y{$this->crop_y}"        : null;
-        $scale        = $this->scale        ? "_s{$this->scale}"         : null;
-        $bgColor      = $this->bgColor      ? "_bgc{$this->bgColor}"     : null;
-        $quality      = $this->quality      ? "_q{$this->quality}"       : null;
-        $compress     = $this->compress     ? "_co{$this->compress}"     : null;
+        $cropToFit    = $this->cropToFit ? '_cf' : null;
+        $fillToFit    = $this->fillToFit ? '_ff' : null;
+        $crop_x       = $this->crop_x ? "_x{$this->crop_x}" : null;
+        $crop_y       = $this->crop_y ? "_y{$this->crop_y}" : null;
+        $scale        = $this->scale ? "_s{$this->scale}" : null;
+        $bgColor      = $this->bgColor ? "_bgc{$this->bgColor}" : null;
+        $quality      = $this->quality ? "_q{$this->quality}" : null;
+        $compress     = $this->compress ? "_co{$this->compress}" : null;
         $rotateBefore = $this->rotateBefore ? "_rb{$this->rotateBefore}" : null;
-        $rotateAfter  = $this->rotateAfter  ? "_ra{$this->rotateAfter}"  : null;
-        $lossy        = $this->lossy        ? "_l"                       : null;
+        $rotateAfter  = $this->rotateAfter ? "_ra{$this->rotateAfter}" : null;
+        $lossy        = $this->lossy ? "_l" : null;
 
         $saveAs = $this->normalizeFileExtension();
         $saveAs = $saveAs ? "_$saveAs" : null;
@@ -2521,7 +2521,7 @@ 
             $copyStrat = "_rs";
         }
 
-        $width  = $this->newWidth  ? '_' . $this->newWidth  : null;
+        $width  = $this->newWidth ? '_' . $this->newWidth : null;
         $height = $this->newHeight ? '_' . $this->newHeight : null;
 
         $offset = isset($this->offset)
@@ -2537,23 +2537,23 @@ 
             foreach ($this->filters as $filter) {
                 if (is_array($filter)) {
                     $filters .= "_f{$filter['id']}";
-                    for ($i=1; $i<=$filter['argc']; $i++) {
-                        $filters .= "-".$filter["arg{$i}"];
+                    for ($i = 1; $i <= $filter['argc']; $i++) {
+                        $filters .= "-" . $filter["arg{$i}"];
                     }
                 }
             }
         }
 
         $sharpen = $this->sharpen ? 's' : null;
-        $emboss  = $this->emboss  ? 'e' : null;
-        $blur    = $this->blur    ? 'b' : null;
+        $emboss  = $this->emboss ? 'e' : null;
+        $blur    = $this->blur ? 'b' : null;
         $palette = $this->palette ? 'p' : null;
 
         $autoRotate = $this->autoRotate ? 'ar' : null;
 
         $optimize  = $this->jpegOptimize ? 'o' : null;
-        $optimize .= $this->pngFilter    ? 'f' : null;
-        $optimize .= $this->pngDeflate   ? 'd' : null;
+        $optimize .= $this->pngFilter ? 'f' : null;
+        $optimize .= $this->pngDeflate ? 'd' : null;
 
         $convolve = null;
         if ($this->convolve) {
@@ -2767,9 +2767,9 @@ 
             $h = imagesy($im);
             $w = imagesx($im);
             $c = array();
-            for ($x=0; $x < $w; $x++) {
-                for ($y=0; $y < $h; $y++) {
-                    @$c['c'.imagecolorat($im, $x, $y)]++;
+            for ($x = 0; $x < $w; $x++) {
+                for ($y = 0; $y < $h; $y++) {
+                    @$c['c' . imagecolorat($im, $x, $y)]++;
                 }
             }
             return count($c);
@@ -2807,8 +2807,8 @@ 
         // Scale the original image before starting
         if (isset($this->scale)) {
             $this->log("Scale by {$this->scale}%");
-            $newWidth  = $this->width * $this->scale / 100;
-            $newHeight = $this->height * $this->scale / 100;
+            $newWidth  = $this->width*$this->scale/100;
+            $newHeight = $this->height*$this->scale/100;
             $img = $this->CreateImageKeepTransparency($newWidth, $newHeight);
             imagecopyresampled($img, $this->image, 0, 0, 0, 0, $newWidth, $newHeight, $this->width, $this->height);
             $this->image = $img;
@@ -2843,7 +2843,7 @@ 
      */
     public function imageCopyResampled($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h)
     {
-        if($this->copyStrategy == self::RESIZE) {
+        if ($this->copyStrategy == self::RESIZE) {
             $this->log("Copy by resize");
             imagecopyresized($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
         } else {
@@ -2908,14 +2908,14 @@ 
                 $cropY = 0;
 
                 if ($this->newWidth > $this->width) {
-                    $posX = round(($this->newWidth - $this->width) / 2);
+                    $posX = round(($this->newWidth - $this->width)/2);
                 }
                 if ($this->newWidth < $this->width) {
                     $cropX = round(($this->width/2) - ($this->newWidth/2));
                 }
 
                 if ($this->newHeight > $this->height) {
-                    $posY = round(($this->newHeight - $this->height) / 2);
+                    $posY = round(($this->newHeight - $this->height)/2);
                 }
                 if ($this->newHeight < $this->height) {
                     $cropY = round(($this->height/2) - ($this->newHeight/2));
@@ -2954,14 +2954,14 @@ 
             $posX = 0;
             $posY = 0;
 
-            $ratioOrig = $this->width / $this->height;
-            $ratioNew  = $this->newWidth / $this->newHeight;
+            $ratioOrig = $this->width/$this->height;
+            $ratioNew  = $this->newWidth/$this->newHeight;
 
             // Check ratio for landscape or portrait
             if ($ratioOrig < $ratioNew) {
-                $posX = round(($this->newWidth - $this->fillWidth) / 2);
+                $posX = round(($this->newWidth - $this->fillWidth)/2);
             } else {
-                $posY = round(($this->newHeight - $this->fillHeight) / 2);
+                $posY = round(($this->newHeight - $this->fillHeight)/2);
             }
 
             if (!$this->upscale
@@ -2969,8 +2969,8 @@ 
             ) {
 
                 $this->log("Resizing - smaller image, do not upscale.");
-                $posX = round(($this->newWidth - $this->width) / 2);
-                $posY = round(($this->newHeight - $this->height) / 2);
+                $posX = round(($this->newWidth - $this->width)/2);
+                $posY = round(($this->newHeight - $this->height)/2);
                 $imageResized = $this->CreateImageKeepTransparency($this->newWidth, $this->newHeight);
                 imagecopy($imageResized, $this->image, $posX, $posY, 0, 0, $this->width, $this->height);
 
@@ -3004,14 +3004,14 @@ 
                     $cropY = 0;
 
                     if ($this->newWidth > $this->width && $this->newHeight > $this->height) {
-                        $posX = round(($this->newWidth - $this->width) / 2);
-                        $posY = round(($this->newHeight - $this->height) / 2);
+                        $posX = round(($this->newWidth - $this->width)/2);
+                        $posY = round(($this->newHeight - $this->height)/2);
                     } elseif ($this->newWidth > $this->width) {
-                        $posX = round(($this->newWidth - $this->width) / 2);
-                        $cropY = round(($this->height - $this->newHeight) / 2);
+                        $posX = round(($this->newWidth - $this->width)/2);
+                        $cropY = round(($this->height - $this->newHeight)/2);
                     } elseif ($this->newHeight > $this->height) {
-                        $posY = round(($this->newHeight - $this->height) / 2);
-                        $cropX = round(($this->width - $this->newWidth) / 2);
+                        $posY = round(($this->newHeight - $this->height)/2);
+                        $cropX = round(($this->width - $this->newWidth)/2);
                     }
 
                     $imageResized = $this->CreateImageKeepTransparency($this->newWidth, $this->newHeight);
@@ -3274,7 +3274,7 @@ 
             );
         }
 
-        array_walk($part, function ($item, $key) {
+        array_walk($part, function($item, $key) {
             if (!is_numeric($item)) {
                 throw new Exception("Argument to convolve expression should be float but is not.");
             }
@@ -3546,7 +3546,7 @@ 
 
         $type = $this->getTargetImageExtension();
         $this->Log("Saving image as " . $type);
-        switch($type) {
+        switch ($type) {
 
             case 'jpeg':
             case 'jpg':
@@ -3898,16 +3898,16 @@ 
         $details['mimeType']    = $this->getMimeType($this->fileType);
         $details['width']       = $this->width;
         $details['height']      = $this->height;
-        $details['aspectRatio'] = round($this->width / $this->height, 3);
+        $details['aspectRatio'] = round($this->width/$this->height, 3);
         $details['size']        = filesize($file);
         $details['colors'] = $this->colorsTotal($this->image);
         $details['includedFiles'] = count(get_included_files());
-        $details['memoryPeek'] = round(memory_get_peak_usage()/1024/1024, 3) . " MB" ;
+        $details['memoryPeek'] = round(memory_get_peak_usage()/1024/1024, 3) . " MB";
         $details['memoryCurrent'] = round(memory_get_usage()/1024/1024, 3) . " MB";
         $details['memoryLimit'] = ini_get('memory_limit');
 
         if (isset($_SERVER['REQUEST_TIME_FLOAT'])) {
-            $details['loadTime'] = (string) round((microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']), 3) . "s";
+            $details['loadTime'] = (string)round((microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']), 3) . "s";
         }
 
         if ($details['mimeType'] == 'image/png') {
@@ -3999,7 +3999,7 @@ 
         $log = null;
         $this->log("### Summary of verbose log");
         $this->log("As JSON: \n" . $this->json());
-        $this->log("Memory peak: " . round(memory_get_peak_usage() /1024/1024) . "M");
+        $this->log("Memory peak: " . round(memory_get_peak_usage()/1024/1024) . "M");
         $this->log("Memory limit: " . ini_get('memory_limit'));
 
         $included = get_included_files();
@@ -4407,7 +4407,7 @@ 
 /**
  * Custom exception handler.
  */
-set_exception_handler(function ($exception) {
+set_exception_handler(function($exception) {
     errorPage(
         "<p><b>img.php: Uncaught exception:</b> <p>"
         . $exception->getMessage()
@@ -4424,7 +4424,7 @@ 
  * Get configuration options from file, if the file exists, else use $config
  * if its defined or create an empty $config.
  */
-$configFile = __DIR__.'/'.basename(__FILE__, '.php').'_config.php';
+$configFile = __DIR__ . '/' . basename(__FILE__, '.php') . '_config.php';
 
 if (is_file($configFile)) {
     $config = require $configFile;
@@ -4800,7 +4800,7 @@ 
  * Manage size constants from config file, use constants to replace values
  * for width and height.
  */
-$sizeConstant = getConfig('size_constant', function () {
+$sizeConstant = getConfig('size_constant', function() {
 
     // Set sizes to map constant to value, easier to use with width or height
     $sizes = array(
@@ -4814,7 +4814,7 @@ 
     $gridColumns     = 24;
 
     for ($i = 1; $i <= $gridColumns; $i++) {
-        $sizes['c' . $i] = ($gridColumnWidth + $gridGutterWidth) * $i - $gridGutterWidth;
+        $sizes['c' . $i] = ($gridColumnWidth + $gridGutterWidth)*$i - $gridGutterWidth;
     }
 
     return $sizes;
@@ -4836,7 +4836,7 @@ 
 }
 
 // Support width as % of original width
-if ($newWidth && $newWidth[strlen($newWidth)-1] == '%') {
+if ($newWidth && $newWidth[strlen($newWidth) - 1] == '%') {
     is_numeric(substr($newWidth, 0, -1))
         or errorPage('Width % not numeric.', 404);
 } else {
@@ -4861,7 +4861,7 @@ 
 }
 
 // height
-if ($newHeight && $newHeight[strlen($newHeight)-1] == '%') {
+if ($newHeight && $newHeight[strlen($newHeight) - 1] == '%') {
     is_numeric(substr($newHeight, 0, -1))
         or errorPage('Height % out of range.', 404);
 } else {
@@ -4878,7 +4878,7 @@ 
  * aspect-ratio, ar - affecting the resulting image width, height and resize options
  */
 $aspectRatio         = get(array('aspect-ratio', 'ar'));
-$aspectRatioConstant = getConfig('aspect_ratio_constant', function () {
+$aspectRatioConstant = getConfig('aspect_ratio_constant', function() {
     return array(
         '3:1'    => 3/1,
         '3:2'    => 3/2,
@@ -4900,7 +4900,7 @@ 
 }
 
 if ($negateAspectRatio) {
-    $aspectRatio = 1 / $aspectRatio;
+    $aspectRatio = 1/$aspectRatio;
 }
 
 is_null($aspectRatio)
@@ -4964,7 +4964,7 @@ 
 if ($fillToFit !== null) {
 
     if (!empty($fillToFit)) {
-        $bgColor   = $fillToFit;
+        $bgColor = $fillToFit;
         verbose("fillToFit changed bgColor to = $bgColor");
     }
 

a/vendor/mos/cimage/webroot/imgd.php

Spacing +110 added lines, -110 removed lines

@@ -26,7 +26,7 @@ 
  */
 $config = array(
 
-    'mode'         => 'development',               // 'production', 'development', 'strict'
+    'mode'         => 'development', // 'production', 'development', 'strict'
     //'image_path'   =>  __DIR__ . '/img/',
     //'cache_path'   =>  __DIR__ . '/../cache/',
     //'alias_path'   =>  __DIR__ . '/img/alias/',
@@ -263,7 +263,7 @@ 
         $url .= $parts['host'];
         $url .= isset($parts['port'])
             ? ":" . $parts['port']
-            : "" ;
+            : "";
         $url .= $parts['path'];
 
         return $url;
@@ -409,7 +409,7 @@ 
     public function getStatus()
     {
         return isset($this->response['header']['status'])
-            ? (int) $this->response['header']['status']
+            ? (int)$this->response['header']['status']
             : null;
     }
 
@@ -484,7 +484,7 @@ 
             // max-age=2592000
             $part = explode('=', $cacheControl);
             $maxAge = ($part[0] == "max-age")
-                ? (int) $part[1]
+                ? (int)$part[1]
                 : null;
         }
 
@@ -667,7 +667,7 @@ 
             $cimageVersion = CIMAGE_USER_AGENT;
         }
         
-        $this->http->setHeader("User-Agent", "$cimageVersion (PHP/". phpversion() . " cURL)");
+        $this->http->setHeader("User-Agent", "$cimageVersion (PHP/" . phpversion() . " cURL)");
         $this->http->setHeader("Accept", "image/jpeg,image/png,image/gif");
 
         if ($this->useCache) {
@@ -1012,11 +1012,11 @@ 
 
         $ascii = null;
         $incY = $this->scale;
-        $incX = $this->scale / 2;
+        $incX = $this->scale/2;
         
         for ($y = 0; $y < $height - 1; $y += $incY) {
             for ($x = 0; $x < $width - 1; $x += $incX) {
-                $toX = min($x + $this->scale / 2, $width - 1);
+                $toX = min($x + $this->scale/2, $width - 1);
                 $toY = min($y + $this->scale, $height - 1);
                 $luminance = $this->luminanceAreaAverage($img, $x, $y, $toX, $toY);
                 $ascii .= $this->luminance2character($luminance);
@@ -1042,7 +1042,7 @@ 
      */
     public function luminanceAreaAverage($img, $x1, $y1, $x2, $y2)
     {
-        $numPixels = ($x2 - $x1 + 1) * ($y2 - $y1 + 1);
+        $numPixels = ($x2 - $x1 + 1)*($y2 - $y1 + 1);
         $luminance = 0;
         
         for ($x = $x1; $x <= $x2; $x++) {
@@ -1055,7 +1055,7 @@ 
             }
         }
         
-        return $luminance / $numPixels;
+        return $luminance/$numPixels;
     }
 
 
@@ -1073,17 +1073,17 @@ 
     {
         switch ($this->luminanceStrategy) {
             case 1:
-                $luminance = ($red * 0.2126 + $green * 0.7152 + $blue * 0.0722) / 255;
+                $luminance = ($red*0.2126 + $green*0.7152 + $blue*0.0722)/255;
                 break;
             case 2:
-                $luminance = ($red * 0.299 + $green * 0.587 + $blue * 0.114) / 255;
+                $luminance = ($red*0.299 + $green*0.587 + $blue*0.114)/255;
                 break;
             case 3:
-                $luminance = sqrt(0.299 * pow($red, 2) + 0.587 * pow($green, 2) + 0.114 * pow($blue, 2)) / 255;
+                $luminance = sqrt(0.299*pow($red, 2) + 0.587*pow($green, 2) + 0.114*pow($blue, 2))/255;
                 break;
             case 0:
             default:
-                $luminance = ($red + $green + $blue) / (255 * 3);
+                $luminance = ($red + $green + $blue)/(255*3);
         }
 
         return $luminance;
@@ -1101,7 +1101,7 @@ 
      */
     public function luminance2character($luminance)
     {
-        $position = (int) round($luminance * ($this->charCount - 1));
+        $position = (int)round($luminance*($this->charCount - 1));
         $char = $this->characters[$position];
         return $char;
     }
@@ -1341,7 +1341,7 @@ 
     /**
      * Image dimensions, calculated from loaded image.
      */
-    private $width;  // Calculated from source image
+    private $width; // Calculated from source image
     private $height; // Calculated from source image
 
 
@@ -1349,7 +1349,7 @@ 
      * New image dimensions, incoming as argument or calculated.
      */
     private $newWidth;
-    private $newWidthOrig;  // Save original value
+    private $newWidthOrig; // Save original value
     private $newHeight;
     private $newHeightOrig; // Save original value
 
@@ -1655,7 +1655,7 @@ 
      */
     public function createDummyImage($width = null, $height = null)
     {
-        $this->newWidth  = $this->newWidth  ?: $width  ?: 100;
+        $this->newWidth  = $this->newWidth ?: $width ?: 100;
         $this->newHeight = $this->newHeight ?: $height ?: 100;
 
         $this->image = $this->CreateImageKeepTransparency($this->newWidth, $this->newHeight);
@@ -1985,7 +1985,7 @@ 
                 $parts = explode(',', $filterStr);
                 $filter = $this->mapFilter($parts[0]);
                 $filter['str'] = $filterStr;
-                for ($i=1; $i<=$filter['argc']; $i++) {
+                for ($i = 1; $i <= $filter['argc']; $i++) {
                     if (isset($parts[$i])) {
                         $filter["arg{$i}"] = $parts[$i];
                     } else {
@@ -2031,16 +2031,16 @@ 
     private function mapFilter($name)
     {
         $map = array(
-            'negate'          => array('id'=>0,  'argc'=>0, 'type'=>IMG_FILTER_NEGATE),
-            'grayscale'       => array('id'=>1,  'argc'=>0, 'type'=>IMG_FILTER_GRAYSCALE),
-            'brightness'      => array('id'=>2,  'argc'=>1, 'type'=>IMG_FILTER_BRIGHTNESS),
-            'contrast'        => array('id'=>3,  'argc'=>1, 'type'=>IMG_FILTER_CONTRAST),
-            'colorize'        => array('id'=>4,  'argc'=>4, 'type'=>IMG_FILTER_COLORIZE),
-            'edgedetect'      => array('id'=>5,  'argc'=>0, 'type'=>IMG_FILTER_EDGEDETECT),
-            'emboss'          => array('id'=>6,  'argc'=>0, 'type'=>IMG_FILTER_EMBOSS),
-            'gaussian_blur'   => array('id'=>7,  'argc'=>0, 'type'=>IMG_FILTER_GAUSSIAN_BLUR),
-            'selective_blur'  => array('id'=>8,  'argc'=>0, 'type'=>IMG_FILTER_SELECTIVE_BLUR),
-            'mean_removal'    => array('id'=>9,  'argc'=>0, 'type'=>IMG_FILTER_MEAN_REMOVAL),
+            'negate'          => array('id'=>0, 'argc'=>0, 'type'=>IMG_FILTER_NEGATE),
+            'grayscale'       => array('id'=>1, 'argc'=>0, 'type'=>IMG_FILTER_GRAYSCALE),
+            'brightness'      => array('id'=>2, 'argc'=>1, 'type'=>IMG_FILTER_BRIGHTNESS),
+            'contrast'        => array('id'=>3, 'argc'=>1, 'type'=>IMG_FILTER_CONTRAST),
+            'colorize'        => array('id'=>4, 'argc'=>4, 'type'=>IMG_FILTER_COLORIZE),
+            'edgedetect'      => array('id'=>5, 'argc'=>0, 'type'=>IMG_FILTER_EDGEDETECT),
+            'emboss'          => array('id'=>6, 'argc'=>0, 'type'=>IMG_FILTER_EMBOSS),
+            'gaussian_blur'   => array('id'=>7, 'argc'=>0, 'type'=>IMG_FILTER_GAUSSIAN_BLUR),
+            'selective_blur'  => array('id'=>8, 'argc'=>0, 'type'=>IMG_FILTER_SELECTIVE_BLUR),
+            'mean_removal'    => array('id'=>9, 'argc'=>0, 'type'=>IMG_FILTER_MEAN_REMOVAL),
             'smooth'          => array('id'=>10, 'argc'=>1, 'type'=>IMG_FILTER_SMOOTH),
             'pixelate'        => array('id'=>11, 'argc'=>2, 'type'=>IMG_FILTER_PIXELATE),
         );
@@ -2134,15 +2134,15 @@ 
 
         // width as %
         if ($this->newWidth
-            && $this->newWidth[strlen($this->newWidth)-1] == '%') {
-            $this->newWidth = $this->width * substr($this->newWidth, 0, -1) / 100;
+            && $this->newWidth[strlen($this->newWidth) - 1] == '%') {
+            $this->newWidth = $this->width*substr($this->newWidth, 0, -1)/100;
             $this->log("Setting new width based on % to {$this->newWidth}");
         }
 
         // height as %
         if ($this->newHeight
-            && $this->newHeight[strlen($this->newHeight)-1] == '%') {
-            $this->newHeight = $this->height * substr($this->newHeight, 0, -1) / 100;
+            && $this->newHeight[strlen($this->newHeight) - 1] == '%') {
+            $this->newHeight = $this->height*substr($this->newHeight, 0, -1)/100;
             $this->log("Setting new height based on % to {$this->newHeight}");
         }
 
@@ -2152,32 +2152,32 @@ 
         if ($this->aspectRatio && is_null($this->newWidth) && is_null($this->newHeight)) {
             if ($this->aspectRatio >= 1) {
                 $this->newWidth   = $this->width;
-                $this->newHeight  = $this->width / $this->aspectRatio;
+                $this->newHeight  = $this->width/$this->aspectRatio;
                 $this->log("Setting new width & height based on width & aspect ratio (>=1) to (w x h) {$this->newWidth} x {$this->newHeight}");
 
             } else {
                 $this->newHeight  = $this->height;
-                $this->newWidth   = $this->height * $this->aspectRatio;
+                $this->newWidth   = $this->height*$this->aspectRatio;
                 $this->log("Setting new width & height based on width & aspect ratio (<1) to (w x h) {$this->newWidth} x {$this->newHeight}");
             }
 
         } elseif ($this->aspectRatio && is_null($this->newWidth)) {
-            $this->newWidth   = $this->newHeight * $this->aspectRatio;
+            $this->newWidth = $this->newHeight*$this->aspectRatio;
             $this->log("Setting new width based on aspect ratio to {$this->newWidth}");
 
         } elseif ($this->aspectRatio && is_null($this->newHeight)) {
-            $this->newHeight  = $this->newWidth / $this->aspectRatio;
+            $this->newHeight = $this->newWidth/$this->aspectRatio;
             $this->log("Setting new height based on aspect ratio to {$this->newHeight}");
         }
 
         // Change width & height based on dpr
         if ($this->dpr != 1) {
             if (!is_null($this->newWidth)) {
-                $this->newWidth  = round($this->newWidth * $this->dpr);
+                $this->newWidth = round($this->newWidth*$this->dpr);
                 $this->log("Setting new width based on dpr={$this->dpr} - w={$this->newWidth}");
             }
             if (!is_null($this->newHeight)) {
-                $this->newHeight = round($this->newHeight * $this->dpr);
+                $this->newHeight = round($this->newHeight*$this->dpr);
                 $this->log("Setting new height based on dpr={$this->dpr} - h={$this->newHeight}");
             }
         }
@@ -2212,10 +2212,10 @@ 
 
         // Check if there is an area to crop off
         if (isset($this->area)) {
-            $this->offset['top']    = round($this->area['top'] / 100 * $this->height);
-            $this->offset['right']  = round($this->area['right'] / 100 * $this->width);
-            $this->offset['bottom'] = round($this->area['bottom'] / 100 * $this->height);
-            $this->offset['left']   = round($this->area['left'] / 100 * $this->width);
+            $this->offset['top']    = round($this->area['top']/100*$this->height);
+            $this->offset['right']  = round($this->area['right']/100*$this->width);
+            $this->offset['bottom'] = round($this->area['bottom']/100*$this->height);
+            $this->offset['left']   = round($this->area['left']/100*$this->width);
             $this->offset['width']  = $this->width - $this->offset['left'] - $this->offset['right'];
             $this->offset['height'] = $this->height - $this->offset['top'] - $this->offset['bottom'];
             $this->width  = $this->offset['width'];
@@ -2237,7 +2237,7 @@ 
             } elseif ($this->crop['start_x'] == 'right') {
                 $this->crop['start_x'] = $this->width - $width;
             } elseif ($this->crop['start_x'] == 'center') {
-                $this->crop['start_x'] = round($this->width / 2) - round($width / 2);
+                $this->crop['start_x'] = round($this->width/2) - round($width/2);
             }
 
             if ($this->crop['start_y'] == 'top') {
@@ -2245,7 +2245,7 @@ 
             } elseif ($this->crop['start_y'] == 'bottom') {
                 $this->crop['start_y'] = $this->height - $height;
             } elseif ($this->crop['start_y'] == 'center') {
-                $this->crop['start_y'] = round($this->height / 2) - round($height / 2);
+                $this->crop['start_y'] = round($this->height/2) - round($height/2);
             }
 
             $this->log("Crop area is width {$width}px, height {$height}px, start_x {$this->crop['start_x']}px, start_y {$this->crop['start_y']}px.");
@@ -2266,25 +2266,25 @@ 
 
                 // Both new width and height are set.
                 // Use newWidth and newHeigh as max width/height, image should not be larger.
-                $ratioWidth  = $width  / $this->newWidth;
-                $ratioHeight = $height / $this->newHeight;
+                $ratioWidth  = $width/$this->newWidth;
+                $ratioHeight = $height/$this->newHeight;
                 $ratio = ($ratioWidth > $ratioHeight) ? $ratioWidth : $ratioHeight;
-                $this->newWidth  = round($width  / $ratio);
-                $this->newHeight = round($height / $ratio);
+                $this->newWidth  = round($width/$ratio);
+                $this->newHeight = round($height/$ratio);
                 $this->log("New width and height was set.");
 
             } elseif (isset($this->newWidth)) {
 
                 // Use new width as max-width
-                $factor = (float)$this->newWidth / (float)$width;
-                $this->newHeight = round($factor * $height);
+                $factor = (float)$this->newWidth/(float)$width;
+                $this->newHeight = round($factor*$height);
                 $this->log("New width was set.");
 
             } elseif (isset($this->newHeight)) {
 
                 // Use new height as max-hight
-                $factor = (float)$this->newHeight / (float)$height;
-                $this->newWidth = round($factor * $width);
+                $factor = (float)$this->newHeight/(float)$height;
+                $this->newWidth = round($factor*$width);
                 $this->log("New height was set.");
 
             } else {
@@ -2299,8 +2299,8 @@ 
             if ($this->cropToFit || $this->fillToFit) {
 
                 // Get relations of original & target image
-                $ratioWidth  = $width  / $this->newWidth;
-                $ratioHeight = $height / $this->newHeight;
+                $ratioWidth  = $width/$this->newWidth;
+                $ratioHeight = $height/$this->newHeight;
 
                 if ($this->cropToFit) {
 
@@ -2308,8 +2308,8 @@ 
                     // image should fit the area.
                     $this->log("Crop to fit.");
                     $ratio = ($ratioWidth < $ratioHeight) ? $ratioWidth : $ratioHeight;
-                    $this->cropWidth  = round($width  / $ratio);
-                    $this->cropHeight = round($height / $ratio);
+                    $this->cropWidth  = round($width/$ratio);
+                    $this->cropHeight = round($height/$ratio);
                     $this->log("Crop width, height, ratio: $this->cropWidth x $this->cropHeight ($ratio).");
 
                 } elseif ($this->fillToFit) {
@@ -2318,8 +2318,8 @@ 
                     // image should fit the area.
                     $this->log("Fill to fit.");
                     $ratio = ($ratioWidth < $ratioHeight) ? $ratioHeight : $ratioWidth;
-                    $this->fillWidth  = round($width  / $ratio);
-                    $this->fillHeight = round($height / $ratio);
+                    $this->fillWidth  = round($width/$ratio);
+                    $this->fillHeight = round($height/$ratio);
                     $this->log("Fill width, height, ratio: $this->fillWidth x $this->fillHeight ($ratio).");
                 }
             }
@@ -2501,17 +2501,17 @@ 
     public function generateFilename($base = null, $useSubdir = true, $prefix = null)
     {
         $filename     = basename($this->pathToImage);
-        $cropToFit    = $this->cropToFit    ? '_cf'                      : null;
-        $fillToFit    = $this->fillToFit    ? '_ff'                      : null;
-        $crop_x       = $this->crop_x       ? "_x{$this->crop_x}"        : null;
-        $crop_y       = $this->crop_y       ? "_y{$this->crop_y}"        : null;
-        $scale        = $this->scale        ? "_s{$this->scale}"         : null;
-        $bgColor      = $this->bgColor      ? "_bgc{$this->bgColor}"     : null;
-        $quality      = $this->quality      ? "_q{$this->quality}"       : null;
-        $compress     = $this->compress     ? "_co{$this->compress}"     : null;
+        $cropToFit    = $this->cropToFit ? '_cf' : null;
+        $fillToFit    = $this->fillToFit ? '_ff' : null;
+        $crop_x       = $this->crop_x ? "_x{$this->crop_x}" : null;
+        $crop_y       = $this->crop_y ? "_y{$this->crop_y}" : null;
+        $scale        = $this->scale ? "_s{$this->scale}" : null;
+        $bgColor      = $this->bgColor ? "_bgc{$this->bgColor}" : null;
+        $quality      = $this->quality ? "_q{$this->quality}" : null;
+        $compress     = $this->compress ? "_co{$this->compress}" : null;
         $rotateBefore = $this->rotateBefore ? "_rb{$this->rotateBefore}" : null;
-        $rotateAfter  = $this->rotateAfter  ? "_ra{$this->rotateAfter}"  : null;
-        $lossy        = $this->lossy        ? "_l"                       : null;
+        $rotateAfter  = $this->rotateAfter ? "_ra{$this->rotateAfter}" : null;
+        $lossy        = $this->lossy ? "_l" : null;
 
         $saveAs = $this->normalizeFileExtension();
         $saveAs = $saveAs ? "_$saveAs" : null;
@@ -2521,7 +2521,7 @@ 
             $copyStrat = "_rs";
         }
 
-        $width  = $this->newWidth  ? '_' . $this->newWidth  : null;
+        $width  = $this->newWidth ? '_' . $this->newWidth : null;
         $height = $this->newHeight ? '_' . $this->newHeight : null;
 
         $offset = isset($this->offset)
@@ -2537,23 +2537,23 @@ 
             foreach ($this->filters as $filter) {
                 if (is_array($filter)) {
                     $filters .= "_f{$filter['id']}";
-                    for ($i=1; $i<=$filter['argc']; $i++) {
-                        $filters .= "-".$filter["arg{$i}"];
+                    for ($i = 1; $i <= $filter['argc']; $i++) {
+                        $filters .= "-" . $filter["arg{$i}"];
                     }
                 }
             }
         }
 
         $sharpen = $this->sharpen ? 's' : null;
-        $emboss  = $this->emboss  ? 'e' : null;
-        $blur    = $this->blur    ? 'b' : null;
+        $emboss  = $this->emboss ? 'e' : null;
+        $blur    = $this->blur ? 'b' : null;
         $palette = $this->palette ? 'p' : null;
 
         $autoRotate = $this->autoRotate ? 'ar' : null;
 
         $optimize  = $this->jpegOptimize ? 'o' : null;
-        $optimize .= $this->pngFilter    ? 'f' : null;
-        $optimize .= $this->pngDeflate   ? 'd' : null;
+        $optimize .= $this->pngFilter ? 'f' : null;
+        $optimize .= $this->pngDeflate ? 'd' : null;
 
         $convolve = null;
         if ($this->convolve) {
@@ -2767,9 +2767,9 @@ 
             $h = imagesy($im);
             $w = imagesx($im);
             $c = array();
-            for ($x=0; $x < $w; $x++) {
-                for ($y=0; $y < $h; $y++) {
-                    @$c['c'.imagecolorat($im, $x, $y)]++;
+            for ($x = 0; $x < $w; $x++) {
+                for ($y = 0; $y < $h; $y++) {
+                    @$c['c' . imagecolorat($im, $x, $y)]++;
                 }
             }
             return count($c);
@@ -2807,8 +2807,8 @@ 
         // Scale the original image before starting
         if (isset($this->scale)) {
             $this->log("Scale by {$this->scale}%");
-            $newWidth  = $this->width * $this->scale / 100;
-            $newHeight = $this->height * $this->scale / 100;
+            $newWidth  = $this->width*$this->scale/100;
+            $newHeight = $this->height*$this->scale/100;
             $img = $this->CreateImageKeepTransparency($newWidth, $newHeight);
             imagecopyresampled($img, $this->image, 0, 0, 0, 0, $newWidth, $newHeight, $this->width, $this->height);
             $this->image = $img;
@@ -2843,7 +2843,7 @@ 
      */
     public function imageCopyResampled($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h)
     {
-        if($this->copyStrategy == self::RESIZE) {
+        if ($this->copyStrategy == self::RESIZE) {
             $this->log("Copy by resize");
             imagecopyresized($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
         } else {
@@ -2908,14 +2908,14 @@ 
                 $cropY = 0;
 
                 if ($this->newWidth > $this->width) {
-                    $posX = round(($this->newWidth - $this->width) / 2);
+                    $posX = round(($this->newWidth - $this->width)/2);
                 }
                 if ($this->newWidth < $this->width) {
                     $cropX = round(($this->width/2) - ($this->newWidth/2));
                 }
 
                 if ($this->newHeight > $this->height) {
-                    $posY = round(($this->newHeight - $this->height) / 2);
+                    $posY = round(($this->newHeight - $this->height)/2);
                 }
                 if ($this->newHeight < $this->height) {
                     $cropY = round(($this->height/2) - ($this->newHeight/2));
@@ -2954,14 +2954,14 @@ 
             $posX = 0;
             $posY = 0;
 
-            $ratioOrig = $this->width / $this->height;
-            $ratioNew  = $this->newWidth / $this->newHeight;
+            $ratioOrig = $this->width/$this->height;
+            $ratioNew  = $this->newWidth/$this->newHeight;
 
             // Check ratio for landscape or portrait
             if ($ratioOrig < $ratioNew) {
-                $posX = round(($this->newWidth - $this->fillWidth) / 2);
+                $posX = round(($this->newWidth - $this->fillWidth)/2);
             } else {
-                $posY = round(($this->newHeight - $this->fillHeight) / 2);
+                $posY = round(($this->newHeight - $this->fillHeight)/2);
             }
 
             if (!$this->upscale
@@ -2969,8 +2969,8 @@ 
             ) {
 
                 $this->log("Resizing - smaller image, do not upscale.");
-                $posX = round(($this->newWidth - $this->width) / 2);
-                $posY = round(($this->newHeight - $this->height) / 2);
+                $posX = round(($this->newWidth - $this->width)/2);
+                $posY = round(($this->newHeight - $this->height)/2);
                 $imageResized = $this->CreateImageKeepTransparency($this->newWidth, $this->newHeight);
                 imagecopy($imageResized, $this->image, $posX, $posY, 0, 0, $this->width, $this->height);
 
@@ -3004,14 +3004,14 @@ 
                     $cropY = 0;
 
                     if ($this->newWidth > $this->width && $this->newHeight > $this->height) {
-                        $posX = round(($this->newWidth - $this->width) / 2);
-                        $posY = round(($this->newHeight - $this->height) / 2);
+                        $posX = round(($this->newWidth - $this->width)/2);
+                        $posY = round(($this->newHeight - $this->height)/2);
                     } elseif ($this->newWidth > $this->width) {
-                        $posX = round(($this->newWidth - $this->width) / 2);
-                        $cropY = round(($this->height - $this->newHeight) / 2);
+                        $posX = round(($this->newWidth - $this->width)/2);
+                        $cropY = round(($this->height - $this->newHeight)/2);
                     } elseif ($this->newHeight > $this->height) {
-                        $posY = round(($this->newHeight - $this->height) / 2);
-                        $cropX = round(($this->width - $this->newWidth) / 2);
+                        $posY = round(($this->newHeight - $this->height)/2);
+                        $cropX = round(($this->width - $this->newWidth)/2);
                     }
 
                     $imageResized = $this->CreateImageKeepTransparency($this->newWidth, $this->newHeight);
@@ -3274,7 +3274,7 @@ 
             );
         }
 
-        array_walk($part, function ($item, $key) {
+        array_walk($part, function($item, $key) {
             if (!is_numeric($item)) {
                 throw new Exception("Argument to convolve expression should be float but is not.");
             }
@@ -3546,7 +3546,7 @@ 
 
         $type = $this->getTargetImageExtension();
         $this->Log("Saving image as " . $type);
-        switch($type) {
+        switch ($type) {
 
             case 'jpeg':
             case 'jpg':
@@ -3898,16 +3898,16 @@ 
         $details['mimeType']    = $this->getMimeType($this->fileType);
         $details['width']       = $this->width;
         $details['height']      = $this->height;
-        $details['aspectRatio'] = round($this->width / $this->height, 3);
+        $details['aspectRatio'] = round($this->width/$this->height, 3);
         $details['size']        = filesize($file);
         $details['colors'] = $this->colorsTotal($this->image);
         $details['includedFiles'] = count(get_included_files());
-        $details['memoryPeek'] = round(memory_get_peak_usage()/1024/1024, 3) . " MB" ;
+        $details['memoryPeek'] = round(memory_get_peak_usage()/1024/1024, 3) . " MB";
         $details['memoryCurrent'] = round(memory_get_usage()/1024/1024, 3) . " MB";
         $details['memoryLimit'] = ini_get('memory_limit');
 
         if (isset($_SERVER['REQUEST_TIME_FLOAT'])) {
-            $details['loadTime'] = (string) round((microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']), 3) . "s";
+            $details['loadTime'] = (string)round((microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']), 3) . "s";
         }
 
         if ($details['mimeType'] == 'image/png') {
@@ -3999,7 +3999,7 @@ 
         $log = null;
         $this->log("### Summary of verbose log");
         $this->log("As JSON: \n" . $this->json());
-        $this->log("Memory peak: " . round(memory_get_peak_usage() /1024/1024) . "M");
+        $this->log("Memory peak: " . round(memory_get_peak_usage()/1024/1024) . "M");
         $this->log("Memory limit: " . ini_get('memory_limit'));
 
         $included = get_included_files();
@@ -4407,7 +4407,7 @@ 
 /**
  * Custom exception handler.
  */
-set_exception_handler(function ($exception) {
+set_exception_handler(function($exception) {
     errorPage(
         "<p><b>img.php: Uncaught exception:</b> <p>"
         . $exception->getMessage()
@@ -4424,7 +4424,7 @@ 
  * Get configuration options from file, if the file exists, else use $config
  * if its defined or create an empty $config.
  */
-$configFile = __DIR__.'/'.basename(__FILE__, '.php').'_config.php';
+$configFile = __DIR__ . '/' . basename(__FILE__, '.php') . '_config.php';
 
 if (is_file($configFile)) {
     $config = require $configFile;
@@ -4800,7 +4800,7 @@ 
  * Manage size constants from config file, use constants to replace values
  * for width and height.
  */
-$sizeConstant = getConfig('size_constant', function () {
+$sizeConstant = getConfig('size_constant', function() {
 
     // Set sizes to map constant to value, easier to use with width or height
     $sizes = array(
@@ -4814,7 +4814,7 @@ 
     $gridColumns     = 24;
 
     for ($i = 1; $i <= $gridColumns; $i++) {
-        $sizes['c' . $i] = ($gridColumnWidth + $gridGutterWidth) * $i - $gridGutterWidth;
+        $sizes['c' . $i] = ($gridColumnWidth + $gridGutterWidth)*$i - $gridGutterWidth;
     }
 
     return $sizes;
@@ -4836,7 +4836,7 @@ 
 }
 
 // Support width as % of original width
-if ($newWidth && $newWidth[strlen($newWidth)-1] == '%') {
+if ($newWidth && $newWidth[strlen($newWidth) - 1] == '%') {
     is_numeric(substr($newWidth, 0, -1))
         or errorPage('Width % not numeric.', 404);
 } else {
@@ -4861,7 +4861,7 @@ 
 }
 
 // height
-if ($newHeight && $newHeight[strlen($newHeight)-1] == '%') {
+if ($newHeight && $newHeight[strlen($newHeight) - 1] == '%') {
     is_numeric(substr($newHeight, 0, -1))
         or errorPage('Height % out of range.', 404);
 } else {
@@ -4878,7 +4878,7 @@ 
  * aspect-ratio, ar - affecting the resulting image width, height and resize options
  */
 $aspectRatio         = get(array('aspect-ratio', 'ar'));
-$aspectRatioConstant = getConfig('aspect_ratio_constant', function () {
+$aspectRatioConstant = getConfig('aspect_ratio_constant', function() {
     return array(
         '3:1'    => 3/1,
         '3:2'    => 3/2,
@@ -4900,7 +4900,7 @@ 
 }
 
 if ($negateAspectRatio) {
-    $aspectRatio = 1 / $aspectRatio;
+    $aspectRatio = 1/$aspectRatio;
 }
 
 is_null($aspectRatio)
@@ -4964,7 +4964,7 @@ 
 if ($fillToFit !== null) {
 
     if (!empty($fillToFit)) {
-        $bgColor   = $fillToFit;
+        $bgColor = $fillToFit;
         verbose("fillToFit changed bgColor to = $bgColor");
     }
 

Indentation +23 added lines, -23 removed lines

@@ -234,9 +234,9 @@ 
 
 
     /**
-    * Constructor
-    *
-    */
+     * Constructor
+     *
+     */
     public function __construct()
     {
         $this->request['header'] = array();
@@ -1333,8 +1333,8 @@ 
     /**
      * Path to command to optimize jpeg images, for example jpegtran or null.
      */
-     private $jpegOptimize;
-     private $jpegOptimizeCmd;
+        private $jpegOptimize;
+        private $jpegOptimizeCmd;
 
 
 
@@ -1505,8 +1505,8 @@ 
 
 
     /**
-    * Disable the fasttrackCacke to start with, inject an object to enable it.
-    */
+     * Disable the fasttrackCacke to start with, inject an object to enable it.
+     */
     private $fastTrackCache = null;
 
 
@@ -1536,9 +1536,9 @@ 
     /*
      * Image copy strategy, defaults to RESAMPLE.
      */
-     const RESIZE = 1;
-     const RESAMPLE = 2;
-     private $copyStrategy = NULL;
+        const RESIZE = 1;
+        const RESAMPLE = 2;
+        private $copyStrategy = NULL;
 
 
 
@@ -2363,7 +2363,7 @@ 
         $this->crop      = $this->cropOrig;
 
         $this->initDimensions()
-             ->calculateNewWidthAndHeight();
+                ->calculateNewWidthAndHeight();
 
         return $this;
     }
@@ -2794,14 +2794,14 @@ 
         if ($this->rotateBefore) {
             $this->log("Rotating image.");
             $this->rotate($this->rotateBefore, $this->bgColor)
-                 ->reCalculateDimensions();
+                    ->reCalculateDimensions();
         }
 
         // Auto-rotate image
         if ($this->autoRotate) {
             $this->log("Auto rotating image.");
             $this->rotateExif()
-                 ->reCalculateDimensions();
+                    ->reCalculateDimensions();
         }
 
         // Scale the original image before starting
@@ -2828,11 +2828,11 @@ 
      *
      * @return $this
      */
-     public function setCopyResizeStrategy($strategy)
-     {
-         $this->copyStrategy = $strategy;
-         return $this;
-     }
+        public function setCopyResizeStrategy($strategy)
+        {
+            $this->copyStrategy = $strategy;
+            return $this;
+        }
 
 
 
@@ -3343,7 +3343,7 @@ 
      * @param string $color as hex value.
      *
      * @return $this
-    */
+     */
     public function setDefaultBackgroundColor($color)
     {
         $this->log("Setting default background color to '$color'.");
@@ -3395,7 +3395,7 @@ 
      * @param resource $img the image to work with or null if using $this->image.
      *
      * @return color value or null if no background color is set.
-    */
+     */
     private function getBackgroundColor($img = null)
     {
         $img = isset($img) ? $img : $this->image;
@@ -3429,7 +3429,7 @@ 
      * @param int $height of the new image.
      *
      * @return image resource.
-    */
+     */
     private function createImageKeepTransparency($width, $height)
     {
         $this->log("Creating a new working image width={$width}px, height={$height}px.");
@@ -3674,8 +3674,8 @@ 
 
         // Prepare
         $this->setSaveFolder($cache)
-             ->setSource($src, $dir)
-             ->generateFilename(null, false, 'srgb_');
+                ->setSource($src, $dir)
+                ->generateFilename(null, false, 'srgb_');
 
         // Check if the cached version is accurate.
         if ($useCache && is_readable($this->cacheFileName)) {

a/vendor/mos/cimage/webroot/test/template.php

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
 
 <p>The following images are used for this test.</p>
 
-<?php foreach($images as $image) : ?>
+<?php foreach ($images as $image) : ?>
   <p>
     <code>
       <a href="img/<?=$image?>"><?=$image?></a> 
@@ -50,7 +50,7 @@ 
 
 <p>The following testcases are used for each image.</p>
 
-<?php foreach($testcase as $tc) : ?>
+<?php foreach ($testcase as $tc) : ?>
   <code><?=$tc?></code><br>
 <?php endforeach; ?>
 
@@ -60,7 +60,7 @@ 
 
 <?php 
 $ch1 = 1;
-foreach($images as $image) :
+foreach ($images as $image) :
 ?>
 <h3><?=$ch1?>. Using source image <?=$image?></h3>
 
@@ -79,7 +79,7 @@ 
 
 <?php 
 $ch2 = 1;
-foreach($testcase as $tc) : 
+foreach ($testcase as $tc) : 
 $tcId = "$ch1.$ch2";
 ?>
 <h4>Testcase <?=$tcId?>: <?=$tc?></h4>

a/vendor/mos/cimage/webroot/test/test.php

Indentation +31 added lines, -31 removed lines

@@ -10,33 +10,33 @@ 
 
 <?php
 $testcase = array(
-  array('text'=>'Original image', 'query'=>''),
-  array('text'=>'Crop out a rectangle of 100x100, start by position 200x200.', 'query'=>'&crop=100,100,200,200'),
-  array('text'=>'Crop out a full width rectangle with height of 200, start by position 0x100.', 'query'=>'&crop=0,200,0,100'),
-  array('text'=>'Max width 200.', 'query'=>'&w=200'),
-  array('text'=>'Max height 200.', 'query'=>'&h=200'),
-  array('text'=>'Max width 200 and max height 200.', 'query'=>'&w=200&h=200'),
-  array('text'=>'No-ratio makes image fit in area of width 200 and height 200.', 'query'=>'&w=200&h=200&no-ratio'),
-  array('text'=>'Crop to fit in width 200 and height 200.', 'query'=>'&w=200&h=200&crop-to-fit'),
-  array('text'=>'Crop to fit in width 200 and height 100.', 'query'=>'&w=200&h=100&crop-to-fit'),
-  array('text'=>'Crop to fit in width 100 and height 200.', 'query'=>'&w=100&h=200&crop-to-fit'),
-  array('text'=>'Quality 70', 'query'=>'&w=200&h=200&quality=70'),
-  array('text'=>'Quality 40', 'query'=>'&w=200&h=200&quality=40'),
-  array('text'=>'Quality 10', 'query'=>'&w=200&h=200&quality=10'),
-  array('text'=>'Filter: Negate', 'query'=>'&w=200&h=200&f=negate'),
-  array('text'=>'Filter: Grayscale', 'query'=>'&w=200&h=200&f=grayscale'),
-  array('text'=>'Filter: Brightness 90', 'query'=>'&w=200&h=200&f=brightness,90'),
-  array('text'=>'Filter: Contrast 50', 'query'=>'&w=200&h=200&f=contrast,50'),
-  array('text'=>'Filter: Colorize 0,255,0,0', 'query'=>'&w=200&h=200&f=colorize,0,255,0,0'),
-  array('text'=>'Filter: Edge detect', 'query'=>'&w=200&h=200&f=edgedetect'),
-  array('text'=>'Filter: Emboss', 'query'=>'&w=200&h=200&f=emboss'),
-  array('text'=>'Filter: Gaussian blur', 'query'=>'&w=200&h=200&f=gaussian_blur'),
-  array('text'=>'Filter: Selective blur', 'query'=>'&w=200&h=200&f=selective_blur'),
-  array('text'=>'Filter: Mean removal', 'query'=>'&w=200&h=200&f=mean_removal'),
-  array('text'=>'Filter: Smooth 2', 'query'=>'&w=200&h=200&f=smooth,2'),
-  array('text'=>'Filter: Pixelate 10,10', 'query'=>'&w=200&h=200&f=pixelate,10,10'),
-  array('text'=>'Multiple filter: Negate, Grayscale and Pixelate 10,10', 'query'=>'&w=200&h=200&&f=negate&f0=grayscale&f1=pixelate,10,10'),
-  array('text'=>'Crop with width & height and crop-to-fit with quality and filter', 'query'=>'&crop=100,100,100,100&w=200&h=200&crop-to-fit&q=70&f0=grayscale'),
+    array('text'=>'Original image', 'query'=>''),
+    array('text'=>'Crop out a rectangle of 100x100, start by position 200x200.', 'query'=>'&crop=100,100,200,200'),
+    array('text'=>'Crop out a full width rectangle with height of 200, start by position 0x100.', 'query'=>'&crop=0,200,0,100'),
+    array('text'=>'Max width 200.', 'query'=>'&w=200'),
+    array('text'=>'Max height 200.', 'query'=>'&h=200'),
+    array('text'=>'Max width 200 and max height 200.', 'query'=>'&w=200&h=200'),
+    array('text'=>'No-ratio makes image fit in area of width 200 and height 200.', 'query'=>'&w=200&h=200&no-ratio'),
+    array('text'=>'Crop to fit in width 200 and height 200.', 'query'=>'&w=200&h=200&crop-to-fit'),
+    array('text'=>'Crop to fit in width 200 and height 100.', 'query'=>'&w=200&h=100&crop-to-fit'),
+    array('text'=>'Crop to fit in width 100 and height 200.', 'query'=>'&w=100&h=200&crop-to-fit'),
+    array('text'=>'Quality 70', 'query'=>'&w=200&h=200&quality=70'),
+    array('text'=>'Quality 40', 'query'=>'&w=200&h=200&quality=40'),
+    array('text'=>'Quality 10', 'query'=>'&w=200&h=200&quality=10'),
+    array('text'=>'Filter: Negate', 'query'=>'&w=200&h=200&f=negate'),
+    array('text'=>'Filter: Grayscale', 'query'=>'&w=200&h=200&f=grayscale'),
+    array('text'=>'Filter: Brightness 90', 'query'=>'&w=200&h=200&f=brightness,90'),
+    array('text'=>'Filter: Contrast 50', 'query'=>'&w=200&h=200&f=contrast,50'),
+    array('text'=>'Filter: Colorize 0,255,0,0', 'query'=>'&w=200&h=200&f=colorize,0,255,0,0'),
+    array('text'=>'Filter: Edge detect', 'query'=>'&w=200&h=200&f=edgedetect'),
+    array('text'=>'Filter: Emboss', 'query'=>'&w=200&h=200&f=emboss'),
+    array('text'=>'Filter: Gaussian blur', 'query'=>'&w=200&h=200&f=gaussian_blur'),
+    array('text'=>'Filter: Selective blur', 'query'=>'&w=200&h=200&f=selective_blur'),
+    array('text'=>'Filter: Mean removal', 'query'=>'&w=200&h=200&f=mean_removal'),
+    array('text'=>'Filter: Smooth 2', 'query'=>'&w=200&h=200&f=smooth,2'),
+    array('text'=>'Filter: Pixelate 10,10', 'query'=>'&w=200&h=200&f=pixelate,10,10'),
+    array('text'=>'Multiple filter: Negate, Grayscale and Pixelate 10,10', 'query'=>'&w=200&h=200&&f=negate&f0=grayscale&f1=pixelate,10,10'),
+    array('text'=>'Crop with width & height and crop-to-fit with quality and filter', 'query'=>'&crop=100,100,100,100&w=200&h=200&crop-to-fit&q=70&f0=grayscale'),
 );
 ?>
 
@@ -47,8 +47,8 @@ 
 <tbody>
 <?php
 foreach($testcase as $key => $val) {
-  $url = "../img.php?src=wider.jpg{$val['query']}";
-  echo "<tr><td id=w$key><a href=#w$key>$key</a></br>{$val['text']}</br><code><a href='$url'>".htmlentities($url)."</a></code></td><td><img src='$url' /></td></tr>";
+    $url = "../img.php?src=wider.jpg{$val['query']}";
+    echo "<tr><td id=w$key><a href=#w$key>$key</a></br>{$val['text']}</br><code><a href='$url'>".htmlentities($url)."</a></code></td><td><img src='$url' /></td></tr>";
 }
 ?>
 </tbody>
@@ -61,8 +61,8 @@ 
 <tbody>
 <?php
 foreach($testcase as $key => $val) {
-  $url = "../img.php?src=higher.jpg{$val['query']}";
-  echo "<tr><td id=h$key><a href=#h$key>$key</a></br>{$val['text']}</br><code><a href='$url'>".htmlentities($url)."</a></code></td><td><img src='$url' /></td></tr>";
+    $url = "../img.php?src=higher.jpg{$val['query']}";
+    echo "<tr><td id=h$key><a href=#h$key>$key</a></br>{$val['text']}</br><code><a href='$url'>".htmlentities($url)."</a></code></td><td><img src='$url' /></td></tr>";
 }
 ?>
 </tbody>

Spacing +4 added lines, -4 removed lines

@@ -46,9 +46,9 @@ 
 <thead><tr><th>Testcase:</th><th>Result:</th></tr></thead>
 <tbody>
 <?php
-foreach($testcase as $key => $val) {
+foreach ($testcase as $key => $val) {
   $url = "../img.php?src=wider.jpg{$val['query']}";
-  echo "<tr><td id=w$key><a href=#w$key>$key</a></br>{$val['text']}</br><code><a href='$url'>".htmlentities($url)."</a></code></td><td><img src='$url' /></td></tr>";
+  echo "<tr><td id=w$key><a href=#w$key>$key</a></br>{$val['text']}</br><code><a href='$url'>" . htmlentities($url) . "</a></code></td><td><img src='$url' /></td></tr>";
 }
 ?>
 </tbody>
@@ -60,9 +60,9 @@ 
 <thead><tr><th>Testcase:</th><th>Result:</th></tr></thead>
 <tbody>
 <?php
-foreach($testcase as $key => $val) {
+foreach ($testcase as $key => $val) {
   $url = "../img.php?src=higher.jpg{$val['query']}";
-  echo "<tr><td id=h$key><a href=#h$key>$key</a></br>{$val['text']}</br><code><a href='$url'>".htmlentities($url)."</a></code></td><td><img src='$url' /></td></tr>";
+  echo "<tr><td id=h$key><a href=#h$key>$key</a></br>{$val['text']}</br><code><a href='$url'>" . htmlentities($url) . "</a></code></td><td><img src='$url' /></td></tr>";
 }
 ?>
 </tbody>

a/vendor/mos/cimage/webroot/test/test_issue38.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
 
 // For each image, apply these testcases
-$cache =  "&nc"; // ""; // "&nc"
+$cache = "&nc"; // ""; // "&nc"
 $testcase = array(
     "$cache&w=300&h=300&fill-to-fit",
     "$cache&w=200&h=400&fill-to-fit",