nystudio107 / craft-imageoptimize

src/lib/Potracio.php

Spacing +50 added lines, -50 removed lines

@@ -182,12 +182,12 @@ 
 
     public function __construct()
     {
-        $this->info = (object)$this->info;
+        $this->info = (object) $this->info;
     }
 
     public function setParameter($data)
     {
-        $this->info = (object)array_merge((array)$this->info, $data);
+        $this->info = (object) array_merge((array) $this->info, $data);
     }
 
     public function loadImageFromFile($file)
@@ -216,7 +216,7 @@ 
         $bm1 = clone $bm;
         $currentPoint = new Point(0, 0);
 
-        $findNext = function ($point) use ($bm1) {
+        $findNext = function($point) use ($bm1) {
             $i = $bm1->w * $point->y + $point->x;
             while ($i < $bm1->size && $bm1->data[$i] !== 1) {
                 $i++;
@@ -228,7 +228,7 @@ 
             return 0;
         };
 
-        $majority = function ($x, $y) use ($bm1) {
+        $majority = function($x, $y) use ($bm1) {
             for ($i = 2; $i < 5; $i++) {
                 $ct = 0;
                 for ($a = -$i + 1; $a <= $i - 1; $a++) {
@@ -247,7 +247,7 @@ 
             return 0;
         };
 
-        $findPath = function ($point) use ($bm, $bm1, $majority, $info) {
+        $findPath = function($point) use ($bm, $bm1, $majority, $info) {
             $path = new Path();
             $x = $point->x;
             $y = $point->y;
@@ -311,7 +311,7 @@ 
             return $path;
         };
 
-        $xorPath = function ($path) use (&$bm1) {
+        $xorPath = function($path) use (&$bm1) {
             $y1 = $path->pt[0]->y;
             $len = $path->len;
 
@@ -345,15 +345,15 @@ 
     {
         $info = $this->info;
 
-        $mod = function ($a, $n) {
+        $mod = function($a, $n) {
             return $a >= $n ? $a % $n : ($a >= 0 ? $a : $n - 1 - (-1 - $a) % $n);
         };
 
-        $xprod = function ($p1, $p2) {
+        $xprod = function($p1, $p2) {
             return $p1->x * $p2->y - $p1->y * $p2->x;
         };
 
-        $cyclic = function ($a, $b, $c) {
+        $cyclic = function($a, $b, $c) {
             if ($a <= $c) {
                 return ($a <= $b && $b < $c);
             } else {
@@ -361,11 +361,11 @@ 
             }
         };
 
-        $sign = function ($i) {
+        $sign = function($i) {
             return $i > 0 ? 1 : ($i < 0 ? -1 : 0);
         };
 
-        $quadform = function ($Q, $w) {
+        $quadform = function($Q, $w) {
             $v = array_fill(0, 3, null);
 
             $v[0] = $w->x;
@@ -382,7 +382,7 @@ 
             return $sum;
         };
 
-        $interval = function ($lambda, $a, $b) {
+        $interval = function($lambda, $a, $b) {
             $res = new Point();
 
             $res->x = $a->x + $lambda * ($b->x - $a->x);
@@ -391,7 +391,7 @@ 
             return $res;
         };
 
-        $dorth_infty = function ($p0, $p2) use ($sign) {
+        $dorth_infty = function($p0, $p2) use ($sign) {
             $r = new Point();
 
             $r->y = $sign($p2->x - $p0->x);
@@ -400,13 +400,13 @@ 
             return $r;
         };
 
-        $ddenom = function ($p0, $p2) use ($dorth_infty) {
+        $ddenom = function($p0, $p2) use ($dorth_infty) {
             $r = $dorth_infty($p0, $p2);
 
             return $r->y * ($p2->x - $p0->x) - $r->x * ($p2->y - $p0->y);
         };
 
-        $dpara = function ($p0, $p1, $p2) {
+        $dpara = function($p0, $p1, $p2) {
             $x1 = $p1->x - $p0->x;
             $y1 = $p1->y - $p0->y;
             $x2 = $p2->x - $p0->x;
@@ -415,7 +415,7 @@ 
             return $x1 * $y2 - $x2 * $y1;
         };
 
-        $cprod = function ($p0, $p1, $p2, $p3) {
+        $cprod = function($p0, $p1, $p2, $p3) {
             $x1 = $p1->x - $p0->x;
             $y1 = $p1->y - $p0->y;
             $x2 = $p3->x - $p2->x;
@@ -424,7 +424,7 @@ 
             return $x1 * $y2 - $x2 * $y1;
         };
 
-        $iprod = function ($p0, $p1, $p2) {
+        $iprod = function($p0, $p1, $p2) {
             $x1 = $p1->x - $p0->x;
             $y1 = $p1->y - $p0->y;
             $x2 = $p2->x - $p0->x;
@@ -433,7 +433,7 @@ 
             return $x1 * $x2 + $y1 * $y2;
         };
 
-        $iprod1 = function ($p0, $p1, $p2, $p3) {
+        $iprod1 = function($p0, $p1, $p2, $p3) {
             $x1 = $p1->x - $p0->x;
             $y1 = $p1->y - $p0->y;
             $x2 = $p3->x - $p2->x;
@@ -442,11 +442,11 @@ 
             return $x1 * $x2 + $y1 * $y2;
         };
 
-        $ddist = function ($p, $q) {
+        $ddist = function($p, $q) {
             return sqrt(($p->x - $q->x) * ($p->x - $q->x) + ($p->y - $q->y) * ($p->y - $q->y));
         };
 
-        $bezier = function ($t, $p0, $p1, $p2, $p3) {
+        $bezier = function($t, $p0, $p1, $p2, $p3) {
             $s = 1 - $t;
             $res = new Point();
 
@@ -456,7 +456,7 @@ 
             return $res;
         };
 
-        $tangent = function ($p0, $p1, $p2, $p3, $q0, $q1) use ($cprod) {
+        $tangent = function($p0, $p1, $p2, $p3, $q0, $q1) use ($cprod) {
             $A = $cprod($p0, $p1, $q0, $q1);
             $B = $cprod($p1, $p2, $q0, $q1);
             $C = $cprod($p2, $p3, $q0, $q1);
@@ -487,7 +487,7 @@ 
             }
         };
 
-        $calcSums = function (&$path) {
+        $calcSums = function(&$path) {
             $path->x0 = $path->pt[0]->x;
             $path->y0 = $path->pt[0]->y;
 
@@ -502,7 +502,7 @@ 
             }
         };
 
-        $calcLon = function (&$path) use ($mod, $xprod, $sign, $cyclic) {
+        $calcLon = function(&$path) use ($mod, $xprod, $sign, $cyclic) {
             $n = $path->len;
             $pt = &$path->pt;
             $pivk = array_fill(0, $n, null);
@@ -613,9 +613,9 @@ 
             }
         };
 
-        $bestPolygon = function (&$path) use ($mod) {
+        $bestPolygon = function(&$path) use ($mod) {
 
-            $penalty3 = function ($path, $i, $j) {
+            $penalty3 = function($path, $i, $j) {
                 $n = $path->len;
                 $pt = $path->pt;
                 $sums = $path->sums;
@@ -721,9 +721,9 @@ 
             }
         };
 
-        $adjustVertices = function (&$path) use ($mod, $quadform) {
+        $adjustVertices = function(&$path) use ($mod, $quadform) {
 
-            $pointslope = function ($path, $i, $j, &$ctr, &$dir) {
+            $pointslope = function($path, $i, $j, &$ctr, &$dir) {
 
                 $n = $path->len;
                 $sums = $path->sums;
@@ -928,7 +928,7 @@ 
             }
         };
 
-        $reverse = function (&$path) {
+        $reverse = function(&$path) {
             $curve = &$path->curve;
             $m = $curve->n;
             $v = &$curve->vertex;
@@ -940,7 +940,7 @@ 
             }
         };
 
-        $smooth = function (&$path) use ($mod, $interval, $ddenom, $dpara, $info) {
+        $smooth = function(&$path) use ($mod, $interval, $ddenom, $dpara, $info) {
             $m = $path->curve->n;
             $curve = &$path->curve;
 
@@ -983,8 +983,8 @@ 
             $curve->alphaCurve = 1;
         };
 
-        $optiCurve = function (&$path) use ($mod, $ddist, $sign, $cprod, $dpara, $interval, $tangent, $bezier, $iprod, $iprod1, $info) {
-            $opti_penalty = function ($path, $i, $j, $res, $opttolerance, $convc, $areac) use ($mod, $ddist, $sign, $cprod, $dpara, $interval, $tangent, $bezier, $iprod, $iprod1) {
+        $optiCurve = function(&$path) use ($mod, $ddist, $sign, $cprod, $dpara, $interval, $tangent, $bezier, $iprod, $iprod1, $info) {
+            $opti_penalty = function($path, $i, $j, $res, $opttolerance, $convc, $areac) use ($mod, $ddist, $sign, $cprod, $dpara, $interval, $tangent, $bezier, $iprod, $iprod1) {
                 $m = $path->curve->n;
                 $curve = $path->curve;
                 $vertex = $curve->vertex;
@@ -1250,31 +1250,31 @@ 
     {
         $bm = &$this->bm;
         $pathlist = &$this->pathlist;
-        $path = function ($curve) use ($size) {
+        $path = function($curve) use ($size) {
 
-            $bezier = function ($i) use ($curve, $size) {
-                $b = 'C ' . number_format($curve->c[$i * 3 + 0]->x * $size, 3) . ' ' .
-                    number_format($curve->c[$i * 3 + 0]->y * $size, 3) . ',';
-                $b .= number_format($curve->c[$i * 3 + 1]->x * $size, 3) . ' ' .
-                    number_format($curve->c[$i * 3 + 1]->y * $size, 3) . ',';
-                $b .= number_format($curve->c[$i * 3 + 2]->x * $size, 3) . ' ' .
-                    number_format($curve->c[$i * 3 + 2]->y * $size, 3) . ' ';
+            $bezier = function($i) use ($curve, $size) {
+                $b = 'C '.number_format($curve->c[$i * 3 + 0]->x * $size, 3).' '.
+                    number_format($curve->c[$i * 3 + 0]->y * $size, 3).',';
+                $b .= number_format($curve->c[$i * 3 + 1]->x * $size, 3).' '.
+                    number_format($curve->c[$i * 3 + 1]->y * $size, 3).',';
+                $b .= number_format($curve->c[$i * 3 + 2]->x * $size, 3).' '.
+                    number_format($curve->c[$i * 3 + 2]->y * $size, 3).' ';
 
                 return $b;
             };
 
-            $segment = function ($i) use ($curve, $size) {
-                $s = 'L ' . number_format($curve->c[$i * 3 + 1]->x * $size, 3) . ' ' .
-                    number_format($curve->c[$i * 3 + 1]->y * $size, 3) . ' ';
-                $s .= number_format($curve->c[$i * 3 + 2]->x * $size, 3) . ' ' .
-                    number_format($curve->c[$i * 3 + 2]->y * $size, 3) . ' ';
+            $segment = function($i) use ($curve, $size) {
+                $s = 'L '.number_format($curve->c[$i * 3 + 1]->x * $size, 3).' '.
+                    number_format($curve->c[$i * 3 + 1]->y * $size, 3).' ';
+                $s .= number_format($curve->c[$i * 3 + 2]->x * $size, 3).' '.
+                    number_format($curve->c[$i * 3 + 2]->y * $size, 3).' ';
 
                 return $s;
             };
 
             $n = $curve->n;
-            $p = 'M' . number_format($curve->c[($n - 1) * 3 + 2]->x * $size, 3) .
-                ' ' . number_format($curve->c[($n - 1) * 3 + 2]->y * $size, 3) . ' ';
+            $p = 'M'.number_format($curve->c[($n - 1) * 3 + 2]->x * $size, 3).
+                ' '.number_format($curve->c[($n - 1) * 3 + 2]->y * $size, 3).' ';
 
             for ($i = 0; $i < $n; $i++) {
                 if ($curve->tag[$i] === "CURVE") {
@@ -1293,9 +1293,9 @@ 
         $len = count($pathlist);
 
         $svg = '<svg id="svg" version="1.1"'
-            . ' width="' . $w . '"'
-            . ' height="' . $h . '"'
-            . ' style="background-color: ' .$bgColor . '"'
+            . ' width="'.$w.'"'
+            . ' height="'.$h.'"'
+            . ' style="background-color: '.$bgColor.'"'
             . ' xmlns="http://www.w3.org/2000/svg">';
         $svg .= '<path d="';
         for ($i = 0; $i < $len; $i++) {
@@ -1311,7 +1311,7 @@ 
             $fillc = $fgColor;
             $fillrule = ' fill-rule="evenodd"';
         }
-        $svg .= '" stroke="' . $strokec . '" fill="' . $fillc . '"' . $fillrule . '/></svg>';
+        $svg .= '" stroke="'.$strokec.'" fill="'.$fillc.'"'.$fillrule.'/></svg>';
 
         return $svg;
     }