chillerlan /
php-qrcode
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | * @see \sprintf() |
| 28 | 28 | */ |
| 29 | 29 | protected string $svgHeader = '<svg xmlns="http://www.w3.org/2000/svg" class="qr-svg %1$s" '. |
| 30 | - 'style="width: 100%%; height: auto;" viewBox="0 0 %2$d %2$d">'; |
|
| 30 | + 'style="width: 100%%; height: auto;" viewBox="0 0 %2$d %2$d">'; |
|
| 31 | 31 | |
| 32 | 32 | /** |
| 33 | 33 | * @inheritDoc |
@@ -75,8 +75,8 @@ discard block |
||
| 75 | 75 | |
| 76 | 76 | if($file !== null){ |
| 77 | 77 | return '<!DOCTYPE html>'. |
| 78 | - '<head><meta charset="UTF-8"><title>QR Code</title></head>'. |
|
| 79 | - '<body>'.$this->options->eol.$html.'</body>'; |
|
| 78 | + '<head><meta charset="UTF-8"><title>QR Code</title></head>'. |
|
| 79 | + '<body>'.$this->options->eol.$html.'</body>'; |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | return $html; |
@@ -91,9 +91,9 @@ discard block |
||
| 91 | 91 | $matrix = $this->matrix->matrix(); |
| 92 | 92 | |
| 93 | 93 | $svg = sprintf($this->svgHeader, $this->options->cssClass, $this->options->svgViewBoxSize ?? $this->moduleCount) |
| 94 | - .$this->options->eol |
|
| 95 | - .'<defs>'.$this->options->svgDefs.'</defs>' |
|
| 96 | - .$this->options->eol; |
|
| 94 | + .$this->options->eol |
|
| 95 | + .'<defs>'.$this->options->svgDefs.'</defs>' |
|
| 96 | + .$this->options->eol; |
|
| 97 | 97 | |
| 98 | 98 | foreach($this->moduleValues as $M_TYPE => $value){ |
| 99 | 99 | $path = ''; |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | // if saving to file, append the correct headers |
| 148 | 148 | if($file !== null){ |
| 149 | 149 | return '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">'. |
| 150 | - $this->options->eol.$svg; |
|
| 150 | + $this->options->eol.$svg; |
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | if($this->options->imageBase64){ |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | |
| 39 | 39 | private const logTable = [ |
| 40 | 40 | 0, // the first value is never returned, index starts at 1 |
| 41 | - 0, 1, 25, 2, 50, 26, 198, 3, 223, 51, 238, 27, 104, 199, 75, |
|
| 41 | + 0, 1, 25, 2, 50, 26, 198, 3, 223, 51, 238, 27, 104, 199, 75, |
|
| 42 | 42 | 4, 100, 224, 14, 52, 141, 239, 129, 28, 193, 105, 248, 200, 8, 76, 113, |
| 43 | 43 | 5, 138, 101, 47, 225, 36, 15, 33, 53, 147, 142, 218, 240, 18, 130, 69, |
| 44 | 44 | 29, 181, 194, 125, 106, 39, 249, 185, 201, 154, 9, 120, 77, 228, 114, 166, |
@@ -44,8 +44,8 @@ |
||
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | /** |
| 47 | - * @inheritDoc |
|
| 48 | - */ |
|
| 47 | + * @inheritDoc |
|
| 48 | + */ |
|
| 49 | 49 | public function write(BitBuffer $bitBuffer, int $versionNumber):void{ |
| 50 | 50 | $bitBuffer |
| 51 | 51 | ->put($this::$datamode, 4) |
@@ -143,7 +143,8 @@ |
||
| 143 | 143 | // This is a direct application of Chien's search |
| 144 | 144 | $numErrors = $errorLocator->getDegree(); |
| 145 | 145 | |
| 146 | - if($numErrors === 1){ // shortcut |
|
| 146 | + if($numErrors === 1){ |
|
| 147 | +// shortcut |
|
| 147 | 148 | return [$errorLocator->getCoefficient(1)]; |
| 148 | 149 | } |
| 149 | 150 | |
@@ -152,7 +152,8 @@ |
||
| 152 | 152 | } |
| 153 | 153 | } |
| 154 | 154 | } |
| 155 | - catch(Exception $aioobe){//ArrayIndexOutOfBoundsException |
|
| 155 | + catch(Exception $aioobe){ |
|
| 156 | +//ArrayIndexOutOfBoundsException |
|
| 156 | 157 | // This feels wrong, but, sometimes if the finder patterns are misidentified, the resulting |
| 157 | 158 | // transform gets "twisted" such that it maps a straight line of points to a set of points |
| 158 | 159 | // whose endpoints are in bounds, but others are not. There is probably some mathematical |
@@ -580,7 +580,7 @@ |
||
| 580 | 580 | $this->hasSkipped = true; |
| 581 | 581 | |
| 582 | 582 | return (int)((abs($firstConfirmedCenter->getX() - $center->getX()) - |
| 583 | - abs($firstConfirmedCenter->getY() - $center->getY())) / 2); |
|
| 583 | + abs($firstConfirmedCenter->getY() - $center->getY())) / 2); |
|
| 584 | 584 | } |
| 585 | 585 | } |
| 586 | 586 | } |
@@ -88,7 +88,8 @@ |
||
| 88 | 88 | |
| 89 | 89 | if($this->bitMatrix->get($j, $i)){ |
| 90 | 90 | // Black pixel |
| 91 | - if($currentState === 1){ // Counting black pixels |
|
| 91 | + if($currentState === 1){ |
|
| 92 | +// Counting black pixels |
|
| 92 | 93 | $stateCount[$currentState]++; |
| 93 | 94 | } |
| 94 | 95 | // Counting white pixels |
@@ -59,7 +59,8 @@ |
||
| 59 | 59 | $estAlignmentY = (int)($topLeft->getY() + $correctionToTopLeft * ($bottomRightY - $topLeft->getY())); |
| 60 | 60 | |
| 61 | 61 | // Kind of arbitrary -- expand search radius before giving up |
| 62 | - for($i = 4; $i <= 16; $i <<= 1){//?????????? |
|
| 62 | + for($i = 4; $i <= 16; $i <<= 1){ |
|
| 63 | +//?????????? |
|
| 63 | 64 | $alignmentPattern = $this->findAlignmentInRegion($moduleSize, $estAlignmentX, $estAlignmentY, (float)$i); |
| 64 | 65 | |
| 65 | 66 | if($alignmentPattern !== null){ |
