@@ -36,8 +36,8 @@ discard block |
||
| 36 | 36 | // This class uses 5x5 blocks to compute local luminance, where each block is 8x8 pixels. |
| 37 | 37 | // So this is the smallest dimension in each axis we can accept. |
| 38 | 38 | private const BLOCK_SIZE_POWER = 3; |
| 39 | - private const BLOCK_SIZE = 8; // ...0100...00 |
|
| 40 | - private const BLOCK_SIZE_MASK = 7; // ...0011...11 |
|
| 39 | + private const BLOCK_SIZE = 8; // ...0100...00 |
|
| 40 | + private const BLOCK_SIZE_MASK = 7; // ...0011...11 |
|
| 41 | 41 | private const MINIMUM_DIMENSION = 40; |
| 42 | 42 | private const MIN_DYNAMIC_RANGE = 24; |
| 43 | 43 | |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | |
| 235 | 235 | for($xx = 0; $xx < self::BLOCK_SIZE; $xx++){ |
| 236 | 236 | $pixel = (int)($this->luminances[(int)($offset + $xx)]) & 0xff; |
| 237 | - $sum += $pixel; |
|
| 237 | + $sum += $pixel; |
|
| 238 | 238 | // still looking for good contrast |
| 239 | 239 | if($pixel < $min){ |
| 240 | 240 | $min = $pixel; |
@@ -59,13 +59,13 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | protected const neighbours = [ |
| 61 | 61 | 0b00000001 => [-1, -1], |
| 62 | - 0b00000010 => [ 0, -1], |
|
| 63 | - 0b00000100 => [ 1, -1], |
|
| 64 | - 0b00001000 => [ 1, 0], |
|
| 65 | - 0b00010000 => [ 1, 1], |
|
| 66 | - 0b00100000 => [ 0, 1], |
|
| 67 | - 0b01000000 => [-1, 1], |
|
| 68 | - 0b10000000 => [-1, 0] |
|
| 62 | + 0b00000010 => [0, -1], |
|
| 63 | + 0b00000100 => [1, -1], |
|
| 64 | + 0b00001000 => [1, 0], |
|
| 65 | + 0b00010000 => [1, 1], |
|
| 66 | + 0b00100000 => [0, 1], |
|
| 67 | + 0b01000000 => [-1, 1], |
|
| 68 | + 0b10000000 => [-1, 0] |
|
| 69 | 69 | ]; |
| 70 | 70 | |
| 71 | 71 | /** |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | $matrix[$y] = []; |
| 139 | 139 | |
| 140 | 140 | foreach($row as $x => $val){ |
| 141 | - $matrix[$y][$x] = ($val & $this::IS_DARK) === $this::IS_DARK; |
|
| 141 | + $matrix[$y][$x] = ($val&$this::IS_DARK) === $this::IS_DARK; |
|
| 142 | 142 | } |
| 143 | 143 | } |
| 144 | 144 | |
@@ -148,21 +148,21 @@ discard block |
||
| 148 | 148 | /** |
| 149 | 149 | * Returns the current version number |
| 150 | 150 | */ |
| 151 | - public function version():?Version{ |
|
| 151 | + public function version(): ?Version{ |
|
| 152 | 152 | return $this->version; |
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | /** |
| 156 | 156 | * Returns the current ECC level |
| 157 | 157 | */ |
| 158 | - public function eccLevel():?EccLevel{ |
|
| 158 | + public function eccLevel(): ?EccLevel{ |
|
| 159 | 159 | return $this->eccLevel; |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | /** |
| 163 | 163 | * Returns the current mask pattern |
| 164 | 164 | */ |
| 165 | - public function maskPattern():?MaskPattern{ |
|
| 165 | + public function maskPattern(): ?MaskPattern{ |
|
| 166 | 166 | return $this->maskPattern; |
| 167 | 167 | } |
| 168 | 168 | |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | public function set(int $x, int $y, bool $value, int $M_TYPE):self{ |
| 197 | 197 | |
| 198 | 198 | if(isset($this->matrix[$y][$x])){ |
| 199 | - $this->matrix[$y][$x] = $M_TYPE | ($value ? $this::IS_DARK : 0); |
|
| 199 | + $this->matrix[$y][$x] = $M_TYPE|($value ? $this::IS_DARK : 0); |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | return $this; |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | return false; |
| 226 | 226 | } |
| 227 | 227 | |
| 228 | - return ($this->matrix[$y][$x] & $M_TYPE) === $M_TYPE; |
|
| 228 | + return ($this->matrix[$y][$x]&$M_TYPE) === $M_TYPE; |
|
| 229 | 229 | } |
| 230 | 230 | |
| 231 | 231 | /** |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | [$ix, $iy] = $coord; |
| 271 | 271 | |
| 272 | 272 | // check if the field is the same type |
| 273 | - if($M_TYPE_VALUE !== null && ($this->get($x + $ix, $y + $iy) | $this::IS_DARK) !== ($M_TYPE_VALUE | $this::IS_DARK)){ |
|
| 273 | + if($M_TYPE_VALUE !== null && ($this->get($x + $ix, $y + $iy)|$this::IS_DARK) !== ($M_TYPE_VALUE|$this::IS_DARK)){ |
|
| 274 | 274 | continue; |
| 275 | 275 | } |
| 276 | 276 | |
@@ -349,8 +349,8 @@ discard block |
||
| 349 | 349 | |
| 350 | 350 | for($c = 0; $c < 3; $c++){ |
| 351 | 351 | for($i = 0; $i < 8; $i++){ |
| 352 | - $this->set($h[$c][0] , $h[$c][1] + $i, false, $this::M_SEPARATOR); |
|
| 353 | - $this->set($v[$c][0] - $i, $v[$c][1] , false, $this::M_SEPARATOR); |
|
| 352 | + $this->set($h[$c][0], $h[$c][1] + $i, false, $this::M_SEPARATOR); |
|
| 353 | + $this->set($v[$c][0] - $i, $v[$c][1], false, $this::M_SEPARATOR); |
|
| 354 | 354 | } |
| 355 | 355 | } |
| 356 | 356 | |
@@ -574,7 +574,7 @@ discard block |
||
| 574 | 574 | foreach($this->matrix as $y => $row){ |
| 575 | 575 | foreach($row as $x => $val){ |
| 576 | 576 | // out of bounds, skip |
| 577 | - if($x < $start || $y < $start ||$x >= $end || $y >= $end){ |
|
| 577 | + if($x < $start || $y < $start || $x >= $end || $y >= $end){ |
|
| 578 | 578 | continue; |
| 579 | 579 | } |
| 580 | 580 | // a match |
@@ -642,7 +642,7 @@ discard block |
||
| 642 | 642 | |
| 643 | 643 | foreach($this->matrix as $y => $row){ |
| 644 | 644 | foreach($row as $x => $val){ |
| 645 | - if($mask($x, $y) && ($val & $this::M_DATA) === $this::M_DATA){ |
|
| 645 | + if($mask($x, $y) && ($val&$this::M_DATA) === $this::M_DATA){ |
|
| 646 | 646 | $this->flip($x, $y); |
| 647 | 647 | } |
| 648 | 648 | } |