codysnider /
tt-rss
@@ -108,13 +108,15 @@ discard block |
||
| 108 | 108 | //---------------------------------------------------------------------- |
| 109 | 109 | public function appendNum($bits, $num) |
| 110 | 110 | {
|
| 111 | - if ($bits == 0) |
|
| 112 | - return 0; |
|
| 111 | + if ($bits == 0) { |
|
| 112 | + return 0; |
|
| 113 | + } |
|
| 113 | 114 | |
| 114 | 115 | $b = QRbitstream::newFromNum($bits, $num); |
| 115 | 116 | |
| 116 | - if (is_null($b)) |
|
| 117 | - return -1; |
|
| 117 | + if (is_null($b)) { |
|
| 118 | + return -1; |
|
| 119 | + } |
|
| 118 | 120 | |
| 119 | 121 | $ret = $this->append($b); |
| 120 | 122 | unset($b); |
@@ -125,13 +127,15 @@ discard block |
||
| 125 | 127 | //---------------------------------------------------------------------- |
| 126 | 128 | public function appendBytes($size, $data) |
| 127 | 129 | {
|
| 128 | - if ($size == 0) |
|
| 129 | - return 0; |
|
| 130 | + if ($size == 0) { |
|
| 131 | + return 0; |
|
| 132 | + } |
|
| 130 | 133 | |
| 131 | 134 | $b = QRbitstream::newFromBytes($size, $data); |
| 132 | 135 | |
| 133 | - if (is_null($b)) |
|
| 134 | - return -1; |
|
| 136 | + if (is_null($b)) { |
|
| 137 | + return -1; |
|
| 138 | + } |
|
| 135 | 139 | |
| 136 | 140 | $ret = $this->append($b); |
| 137 | 141 | unset($b); |
@@ -230,8 +230,9 @@ |
||
| 230 | 230 | |
| 231 | 231 | $frameY = $frame[$y]; |
| 232 | 232 | |
| 233 | - if ($y > 0) |
|
| 234 | - $frameYM = $frame[$y - 1]; |
|
| 233 | + if ($y > 0) { |
|
| 234 | + $frameYM = $frame[$y - 1]; |
|
| 235 | + } |
|
| 235 | 236 | |
| 236 | 237 | for ($x = 0; $x < $width; $x++) {
|
| 237 | 238 | if (($x > 0) && ($y > 0)) {
|
@@ -115,8 +115,9 @@ discard block |
||
| 115 | 115 | |
| 116 | 116 | for ($i = 1; $i <= QRSPEC_VERSION_MAX; $i++) {
|
| 117 | 117 | $words = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level]; |
| 118 | - if ($words >= $size) |
|
| 119 | - return $i; |
|
| 118 | + if ($words >= $size) { |
|
| 119 | + return $i; |
|
| 120 | + } |
|
| 120 | 121 | } |
| 121 | 122 | |
| 122 | 123 | return -1; |
@@ -152,8 +153,9 @@ discard block |
||
| 152 | 153 | //---------------------------------------------------------------------- |
| 153 | 154 | public static function maximumWords($mode, $version) |
| 154 | 155 | {
|
| 155 | - if ($mode == QR_MODE_STRUCTURE) |
|
| 156 | - return 3; |
|
| 156 | + if ($mode == QR_MODE_STRUCTURE) { |
|
| 157 | + return 3; |
|
| 158 | + } |
|
| 157 | 159 | |
| 158 | 160 | if ($version <= 9) {
|
| 159 | 161 | $l = 0; |
@@ -299,8 +301,9 @@ discard block |
||
| 299 | 301 | //---------------------------------------------------------------------- |
| 300 | 302 | public static function putAlignmentPattern($version, &$frame, $width) |
| 301 | 303 | {
|
| 302 | - if ($version < 2) |
|
| 303 | - return; |
|
| 304 | + if ($version < 2) { |
|
| 305 | + return; |
|
| 306 | + } |
|
| 304 | 307 | |
| 305 | 308 | $d = self::$alignmentPattern[$version][1] - self::$alignmentPattern[$version][0]; |
| 306 | 309 | if ($d < 0) {
|
@@ -352,8 +355,9 @@ discard block |
||
| 352 | 355 | //---------------------------------------------------------------------- |
| 353 | 356 | public static function getVersionPattern($version) |
| 354 | 357 | {
|
| 355 | - if ($version < 7 || $version > QRSPEC_VERSION_MAX) |
|
| 356 | - return 0; |
|
| 358 | + if ($version < 7 || $version > QRSPEC_VERSION_MAX) { |
|
| 359 | + return 0; |
|
| 360 | + } |
|
| 357 | 361 | |
| 358 | 362 | return self::$versionPattern[$version - 7]; |
| 359 | 363 | } |
@@ -370,11 +374,13 @@ discard block |
||
| 370 | 374 | |
| 371 | 375 | public static function getFormatInfo($mask, $level) |
| 372 | 376 | {
|
| 373 | - if ($mask < 0 || $mask > 7) |
|
| 374 | - return 0; |
|
| 377 | + if ($mask < 0 || $mask > 7) { |
|
| 378 | + return 0; |
|
| 379 | + } |
|
| 375 | 380 | |
| 376 | - if ($level < 0 || $level > 3) |
|
| 377 | - return 0; |
|
| 381 | + if ($level < 0 || $level > 3) { |
|
| 382 | + return 0; |
|
| 383 | + } |
|
| 378 | 384 | |
| 379 | 385 | return self::$formatInfo[$level][$mask]; |
| 380 | 386 | } |
@@ -554,8 +560,9 @@ discard block |
||
| 554 | 560 | //---------------------------------------------------------------------- |
| 555 | 561 | public static function newFrame($version) |
| 556 | 562 | {
|
| 557 | - if ($version < 1 || $version > QRSPEC_VERSION_MAX) |
|
| 558 | - return null; |
|
| 563 | + if ($version < 1 || $version > QRSPEC_VERSION_MAX) { |
|
| 564 | + return null; |
|
| 565 | + } |
|
| 559 | 566 | |
| 560 | 567 | if (!isset(self::$frames[$version])) {
|
| 561 | 568 | |
@@ -573,8 +580,9 @@ discard block |
||
| 573 | 580 | } |
| 574 | 581 | } |
| 575 | 582 | |
| 576 | - if (is_null(self::$frames[$version])) |
|
| 577 | - return null; |
|
| 583 | + if (is_null(self::$frames[$version])) { |
|
| 584 | + return null; |
|
| 585 | + } |
|
| 578 | 586 | |
| 579 | 587 | return self::$frames[$version]; |
| 580 | 588 | } |
@@ -197,8 +197,9 @@ discard block |
||
| 197 | 197 | {
|
| 198 | 198 | $bits = 0; |
| 199 | 199 | |
| 200 | - if ($version == 0) |
|
| 201 | - $version = 1; |
|
| 200 | + if ($version == 0) { |
|
| 201 | + $version = 1; |
|
| 202 | + } |
|
| 202 | 203 | |
| 203 | 204 | switch ($this->mode) {
|
| 204 | 205 | case QR_MODE_NUM: $bits = QRinput::estimateBitsModeNum($this->size); break; |
@@ -257,8 +258,9 @@ discard block |
||
| 257 | 258 | break; |
| 258 | 259 | } |
| 259 | 260 | |
| 260 | - if ($ret < 0) |
|
| 261 | - return -1; |
|
| 261 | + if ($ret < 0) { |
|
| 262 | + return -1; |
|
| 263 | + } |
|
| 262 | 264 | } |
| 263 | 265 | |
| 264 | 266 | return $this->bstream->size(); |
@@ -475,8 +477,9 @@ discard block |
||
| 475 | 477 | //---------------------------------------------------------------------- |
| 476 | 478 | public static function checkModeKanji($size, $data) |
| 477 | 479 | {
|
| 478 | - if ($size & 1) |
|
| 479 | - return false; |
|
| 480 | + if ($size & 1) { |
|
| 481 | + return false; |
|
| 482 | + } |
|
| 480 | 483 | |
| 481 | 484 | for ($i = 0; $i < $size; $i += 2) {
|
| 482 | 485 | $val = (ord($data[$i]) << 8) | ord($data[$i + 1]); |
@@ -496,8 +499,9 @@ discard block |
||
| 496 | 499 | |
| 497 | 500 | public static function check($mode, $size, $data) |
| 498 | 501 | {
|
| 499 | - if ($size <= 0) |
|
| 500 | - return false; |
|
| 502 | + if ($size <= 0) { |
|
| 503 | + return false; |
|
| 504 | + } |
|
| 501 | 505 | |
| 502 | 506 | switch ($mode) {
|
| 503 | 507 | case QR_MODE_NUM: return self::checkModeNum($size, $data); break; |
@@ -562,8 +566,9 @@ discard block |
||
| 562 | 566 | $chunks = (int) ($payload / 11); |
| 563 | 567 | $remain = $payload - $chunks * 11; |
| 564 | 568 | $size = $chunks * 2; |
| 565 | - if ($remain >= 6) |
|
| 566 | - $size++; |
|
| 569 | + if ($remain >= 6) { |
|
| 570 | + $size++; |
|
| 571 | + } |
|
| 567 | 572 | break; |
| 568 | 573 | case QR_MODE_8: |
| 569 | 574 | $size = (int) ($payload / 8); |
@@ -580,8 +585,12 @@ discard block |
||
| 580 | 585 | } |
| 581 | 586 | |
| 582 | 587 | $maxsize = QRspec::maximumWords($mode, $version); |
| 583 | - if ($size < 0) $size = 0; |
|
| 584 | - if ($size > $maxsize) $size = $maxsize; |
|
| 588 | + if ($size < 0) { |
|
| 589 | + $size = 0; |
|
| 590 | + } |
|
| 591 | + if ($size > $maxsize) { |
|
| 592 | + $size = $maxsize; |
|
| 593 | + } |
|
| 585 | 594 | |
| 586 | 595 | return $size; |
| 587 | 596 | } |
@@ -594,8 +603,9 @@ discard block |
||
| 594 | 603 | foreach ($this->items as $item) {
|
| 595 | 604 | $bits = $item->encodeBitStream($this->version); |
| 596 | 605 | |
| 597 | - if ($bits < 0) |
|
| 598 | - return -1; |
|
| 606 | + if ($bits < 0) { |
|
| 607 | + return -1; |
|
| 608 | + } |
|
| 599 | 609 | |
| 600 | 610 | $total += $bits; |
| 601 | 611 | } |
@@ -614,8 +624,9 @@ discard block |
||
| 614 | 624 | for (;;) {
|
| 615 | 625 | $bits = $this->createBitStream(); |
| 616 | 626 | |
| 617 | - if ($bits < 0) |
|
| 618 | - return -1; |
|
| 627 | + if ($bits < 0) { |
|
| 628 | + return -1; |
|
| 629 | + } |
|
| 619 | 630 | |
| 620 | 631 | $ver = QRspec::getMinimumVersion((int) (($bits + 7) / 8), $this->level); |
| 621 | 632 | if ($ver < 0) {
|
@@ -652,8 +663,9 @@ discard block |
||
| 652 | 663 | $padding = new QRbitstream(); |
| 653 | 664 | $ret = $padding->appendNum($words * 8 - $bits + 4, 0); |
| 654 | 665 | |
| 655 | - if ($ret < 0) |
|
| 656 | - return $ret; |
|
| 666 | + if ($ret < 0) { |
|
| 667 | + return $ret; |
|
| 668 | + } |
|
| 657 | 669 | |
| 658 | 670 | $padlen = $maxwords - $words; |
| 659 | 671 | |
@@ -666,8 +678,9 @@ discard block |
||
| 666 | 678 | |
| 667 | 679 | $ret = $padding->appendBytes($padlen, $padbuf); |
| 668 | 680 | |
| 669 | - if ($ret < 0) |
|
| 670 | - return $ret; |
|
| 681 | + if ($ret < 0) { |
|
| 682 | + return $ret; |
|
| 683 | + } |
|
| 671 | 684 | |
| 672 | 685 | } |
| 673 | 686 | |
@@ -195,8 +195,9 @@ discard block |
||
| 195 | 195 | |
| 196 | 196 | foreach ($qrTab as $line) {
|
| 197 | 197 | $arrAdd = array(); |
| 198 | - foreach (str_split($line) as $char) |
|
| 199 | - $arrAdd[] = ($char == '1') ? 1 : 0; |
|
| 198 | + foreach (str_split($line) as $char) { |
|
| 199 | + $arrAdd[] = ($char == '1') ? 1 : 0; |
|
| 200 | + } |
|
| 200 | 201 | $barcode_array['bcode'][] = $arrAdd; |
| 201 | 202 | } |
| 202 | 203 | |
@@ -224,8 +225,9 @@ discard block |
||
| 224 | 225 | |
| 225 | 226 | $width = count($frame); |
| 226 | 227 | $bitMask = array_fill(0, $width, array_fill(0, $width, 0)); |
| 227 | - for ($maskNo = 0; $maskNo < 8; $maskNo++) |
|
| 228 | - $mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true); |
|
| 228 | + for ($maskNo = 0; $maskNo < 8; $maskNo++) { |
|
| 229 | + $mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true); |
|
| 230 | + } |
|
| 229 | 231 | } |
| 230 | 232 | |
| 231 | 233 | QRtools::markTime('after_build_cache');
|
@@ -429,8 +431,9 @@ discard block |
||
| 429 | 431 | |
| 430 | 432 | for ($i = 1; $i <= QRSPEC_VERSION_MAX; $i++) {
|
| 431 | 433 | $words = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level]; |
| 432 | - if ($words >= $size) |
|
| 433 | - return $i; |
|
| 434 | + if ($words >= $size) { |
|
| 435 | + return $i; |
|
| 436 | + } |
|
| 434 | 437 | } |
| 435 | 438 | |
| 436 | 439 | return -1; |
@@ -466,8 +469,9 @@ discard block |
||
| 466 | 469 | //---------------------------------------------------------------------- |
| 467 | 470 | public static function maximumWords($mode, $version) |
| 468 | 471 | {
|
| 469 | - if ($mode == QR_MODE_STRUCTURE) |
|
| 470 | - return 3; |
|
| 472 | + if ($mode == QR_MODE_STRUCTURE) { |
|
| 473 | + return 3; |
|
| 474 | + } |
|
| 471 | 475 | |
| 472 | 476 | if ($version <= 9) {
|
| 473 | 477 | $l = 0; |
@@ -613,8 +617,9 @@ discard block |
||
| 613 | 617 | //---------------------------------------------------------------------- |
| 614 | 618 | public static function putAlignmentPattern($version, &$frame, $width) |
| 615 | 619 | {
|
| 616 | - if ($version < 2) |
|
| 617 | - return; |
|
| 620 | + if ($version < 2) { |
|
| 621 | + return; |
|
| 622 | + } |
|
| 618 | 623 | |
| 619 | 624 | $d = self::$alignmentPattern[$version][1] - self::$alignmentPattern[$version][0]; |
| 620 | 625 | if ($d < 0) {
|
@@ -666,8 +671,9 @@ discard block |
||
| 666 | 671 | //---------------------------------------------------------------------- |
| 667 | 672 | public static function getVersionPattern($version) |
| 668 | 673 | {
|
| 669 | - if ($version < 7 || $version > QRSPEC_VERSION_MAX) |
|
| 670 | - return 0; |
|
| 674 | + if ($version < 7 || $version > QRSPEC_VERSION_MAX) { |
|
| 675 | + return 0; |
|
| 676 | + } |
|
| 671 | 677 | |
| 672 | 678 | return self::$versionPattern[$version - 7]; |
| 673 | 679 | } |
@@ -684,11 +690,13 @@ discard block |
||
| 684 | 690 | |
| 685 | 691 | public static function getFormatInfo($mask, $level) |
| 686 | 692 | {
|
| 687 | - if ($mask < 0 || $mask > 7) |
|
| 688 | - return 0; |
|
| 693 | + if ($mask < 0 || $mask > 7) { |
|
| 694 | + return 0; |
|
| 695 | + } |
|
| 689 | 696 | |
| 690 | - if ($level < 0 || $level > 3) |
|
| 691 | - return 0; |
|
| 697 | + if ($level < 0 || $level > 3) { |
|
| 698 | + return 0; |
|
| 699 | + } |
|
| 692 | 700 | |
| 693 | 701 | return self::$formatInfo[$level][$mask]; |
| 694 | 702 | } |
@@ -868,8 +876,9 @@ discard block |
||
| 868 | 876 | //---------------------------------------------------------------------- |
| 869 | 877 | public static function newFrame($version) |
| 870 | 878 | {
|
| 871 | - if ($version < 1 || $version > QRSPEC_VERSION_MAX) |
|
| 872 | - return null; |
|
| 879 | + if ($version < 1 || $version > QRSPEC_VERSION_MAX) { |
|
| 880 | + return null; |
|
| 881 | + } |
|
| 873 | 882 | |
| 874 | 883 | if (!isset(self::$frames[$version])) {
|
| 875 | 884 | |
@@ -887,8 +896,9 @@ discard block |
||
| 887 | 896 | } |
| 888 | 897 | } |
| 889 | 898 | |
| 890 | - if (is_null(self::$frames[$version])) |
|
| 891 | - return null; |
|
| 899 | + if (is_null(self::$frames[$version])) { |
|
| 900 | + return null; |
|
| 901 | + } |
|
| 892 | 902 | |
| 893 | 903 | return self::$frames[$version]; |
| 894 | 904 | } |
@@ -1213,8 +1223,9 @@ discard block |
||
| 1213 | 1223 | {
|
| 1214 | 1224 | $bits = 0; |
| 1215 | 1225 | |
| 1216 | - if ($version == 0) |
|
| 1217 | - $version = 1; |
|
| 1226 | + if ($version == 0) { |
|
| 1227 | + $version = 1; |
|
| 1228 | + } |
|
| 1218 | 1229 | |
| 1219 | 1230 | switch ($this->mode) {
|
| 1220 | 1231 | case QR_MODE_NUM: $bits = QRinput::estimateBitsModeNum($this->size); break; |
@@ -1273,8 +1284,9 @@ discard block |
||
| 1273 | 1284 | break; |
| 1274 | 1285 | } |
| 1275 | 1286 | |
| 1276 | - if ($ret < 0) |
|
| 1277 | - return -1; |
|
| 1287 | + if ($ret < 0) { |
|
| 1288 | + return -1; |
|
| 1289 | + } |
|
| 1278 | 1290 | } |
| 1279 | 1291 | |
| 1280 | 1292 | return $this->bstream->size(); |
@@ -1491,8 +1503,9 @@ discard block |
||
| 1491 | 1503 | //---------------------------------------------------------------------- |
| 1492 | 1504 | public static function checkModeKanji($size, $data) |
| 1493 | 1505 | {
|
| 1494 | - if ($size & 1) |
|
| 1495 | - return false; |
|
| 1506 | + if ($size & 1) { |
|
| 1507 | + return false; |
|
| 1508 | + } |
|
| 1496 | 1509 | |
| 1497 | 1510 | for ($i = 0; $i < $size; $i += 2) {
|
| 1498 | 1511 | $val = (ord($data[$i]) << 8) | ord($data[$i + 1]); |
@@ -1512,8 +1525,9 @@ discard block |
||
| 1512 | 1525 | |
| 1513 | 1526 | public static function check($mode, $size, $data) |
| 1514 | 1527 | {
|
| 1515 | - if ($size <= 0) |
|
| 1516 | - return false; |
|
| 1528 | + if ($size <= 0) { |
|
| 1529 | + return false; |
|
| 1530 | + } |
|
| 1517 | 1531 | |
| 1518 | 1532 | switch ($mode) {
|
| 1519 | 1533 | case QR_MODE_NUM: return self::checkModeNum($size, $data); break; |
@@ -1578,8 +1592,9 @@ discard block |
||
| 1578 | 1592 | $chunks = (int) ($payload / 11); |
| 1579 | 1593 | $remain = $payload - $chunks * 11; |
| 1580 | 1594 | $size = $chunks * 2; |
| 1581 | - if ($remain >= 6) |
|
| 1582 | - $size++; |
|
| 1595 | + if ($remain >= 6) { |
|
| 1596 | + $size++; |
|
| 1597 | + } |
|
| 1583 | 1598 | break; |
| 1584 | 1599 | case QR_MODE_8: |
| 1585 | 1600 | $size = (int) ($payload / 8); |
@@ -1596,8 +1611,12 @@ discard block |
||
| 1596 | 1611 | } |
| 1597 | 1612 | |
| 1598 | 1613 | $maxsize = QRspec::maximumWords($mode, $version); |
| 1599 | - if ($size < 0) $size = 0; |
|
| 1600 | - if ($size > $maxsize) $size = $maxsize; |
|
| 1614 | + if ($size < 0) { |
|
| 1615 | + $size = 0; |
|
| 1616 | + } |
|
| 1617 | + if ($size > $maxsize) { |
|
| 1618 | + $size = $maxsize; |
|
| 1619 | + } |
|
| 1601 | 1620 | |
| 1602 | 1621 | return $size; |
| 1603 | 1622 | } |
@@ -1610,8 +1629,9 @@ discard block |
||
| 1610 | 1629 | foreach ($this->items as $item) {
|
| 1611 | 1630 | $bits = $item->encodeBitStream($this->version); |
| 1612 | 1631 | |
| 1613 | - if ($bits < 0) |
|
| 1614 | - return -1; |
|
| 1632 | + if ($bits < 0) { |
|
| 1633 | + return -1; |
|
| 1634 | + } |
|
| 1615 | 1635 | |
| 1616 | 1636 | $total += $bits; |
| 1617 | 1637 | } |
@@ -1630,8 +1650,9 @@ discard block |
||
| 1630 | 1650 | for (;;) {
|
| 1631 | 1651 | $bits = $this->createBitStream(); |
| 1632 | 1652 | |
| 1633 | - if ($bits < 0) |
|
| 1634 | - return -1; |
|
| 1653 | + if ($bits < 0) { |
|
| 1654 | + return -1; |
|
| 1655 | + } |
|
| 1635 | 1656 | |
| 1636 | 1657 | $ver = QRspec::getMinimumVersion((int) (($bits + 7) / 8), $this->level); |
| 1637 | 1658 | if ($ver < 0) {
|
@@ -1668,8 +1689,9 @@ discard block |
||
| 1668 | 1689 | $padding = new QRbitstream(); |
| 1669 | 1690 | $ret = $padding->appendNum($words * 8 - $bits + 4, 0); |
| 1670 | 1691 | |
| 1671 | - if ($ret < 0) |
|
| 1672 | - return $ret; |
|
| 1692 | + if ($ret < 0) { |
|
| 1693 | + return $ret; |
|
| 1694 | + } |
|
| 1673 | 1695 | |
| 1674 | 1696 | $padlen = $maxwords - $words; |
| 1675 | 1697 | |
@@ -1682,8 +1704,9 @@ discard block |
||
| 1682 | 1704 | |
| 1683 | 1705 | $ret = $padding->appendBytes($padlen, $padbuf); |
| 1684 | 1706 | |
| 1685 | - if ($ret < 0) |
|
| 1686 | - return $ret; |
|
| 1707 | + if ($ret < 0) { |
|
| 1708 | + return $ret; |
|
| 1709 | + } |
|
| 1687 | 1710 | |
| 1688 | 1711 | } |
| 1689 | 1712 | |
@@ -1860,13 +1883,15 @@ discard block |
||
| 1860 | 1883 | //---------------------------------------------------------------------- |
| 1861 | 1884 | public function appendNum($bits, $num) |
| 1862 | 1885 | {
|
| 1863 | - if ($bits == 0) |
|
| 1864 | - return 0; |
|
| 1886 | + if ($bits == 0) { |
|
| 1887 | + return 0; |
|
| 1888 | + } |
|
| 1865 | 1889 | |
| 1866 | 1890 | $b = QRbitstream::newFromNum($bits, $num); |
| 1867 | 1891 | |
| 1868 | - if (is_null($b)) |
|
| 1869 | - return -1; |
|
| 1892 | + if (is_null($b)) { |
|
| 1893 | + return -1; |
|
| 1894 | + } |
|
| 1870 | 1895 | |
| 1871 | 1896 | $ret = $this->append($b); |
| 1872 | 1897 | unset($b); |
@@ -1877,13 +1902,15 @@ discard block |
||
| 1877 | 1902 | //---------------------------------------------------------------------- |
| 1878 | 1903 | public function appendBytes($size, $data) |
| 1879 | 1904 | {
|
| 1880 | - if ($size == 0) |
|
| 1881 | - return 0; |
|
| 1905 | + if ($size == 0) { |
|
| 1906 | + return 0; |
|
| 1907 | + } |
|
| 1882 | 1908 | |
| 1883 | 1909 | $b = QRbitstream::newFromBytes($size, $data); |
| 1884 | 1910 | |
| 1885 | - if (is_null($b)) |
|
| 1886 | - return -1; |
|
| 1911 | + if (is_null($b)) { |
|
| 1912 | + return -1; |
|
| 1913 | + } |
|
| 1887 | 1914 | |
| 1888 | 1915 | $ret = $this->append($b); |
| 1889 | 1916 | unset($b); |
@@ -2063,8 +2090,9 @@ discard block |
||
| 2063 | 2090 | } |
| 2064 | 2091 | |
| 2065 | 2092 | $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr)); |
| 2066 | - if ($ret < 0) |
|
| 2067 | - return -1; |
|
| 2093 | + if ($ret < 0) { |
|
| 2094 | + return -1; |
|
| 2095 | + } |
|
| 2068 | 2096 | |
| 2069 | 2097 | return $run; |
| 2070 | 2098 | } |
@@ -2110,8 +2138,9 @@ discard block |
||
| 2110 | 2138 | } |
| 2111 | 2139 | |
| 2112 | 2140 | $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr)); |
| 2113 | - if ($ret < 0) |
|
| 2114 | - return -1; |
|
| 2141 | + if ($ret < 0) { |
|
| 2142 | + return -1; |
|
| 2143 | + } |
|
| 2115 | 2144 | |
| 2116 | 2145 | return $run; |
| 2117 | 2146 | } |
@@ -2126,8 +2155,9 @@ discard block |
||
| 2126 | 2155 | } |
| 2127 | 2156 | |
| 2128 | 2157 | $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr)); |
| 2129 | - if ($ret < 0) |
|
| 2130 | - return -1; |
|
| 2158 | + if ($ret < 0) { |
|
| 2159 | + return -1; |
|
| 2160 | + } |
|
| 2131 | 2161 | |
| 2132 | 2162 | return $run; |
| 2133 | 2163 | } |
@@ -2181,8 +2211,9 @@ discard block |
||
| 2181 | 2211 | $run = $p; |
| 2182 | 2212 | $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr)); |
| 2183 | 2213 | |
| 2184 | - if ($ret < 0) |
|
| 2185 | - return -1; |
|
| 2214 | + if ($ret < 0) { |
|
| 2215 | + return -1; |
|
| 2216 | + } |
|
| 2186 | 2217 | |
| 2187 | 2218 | return $run; |
| 2188 | 2219 | } |
@@ -2192,8 +2223,9 @@ discard block |
||
| 2192 | 2223 | {
|
| 2193 | 2224 | while (strlen($this->dataStr) > 0) |
| 2194 | 2225 | {
|
| 2195 | - if ($this->dataStr == '') |
|
| 2196 | - return 0; |
|
| 2226 | + if ($this->dataStr == '') { |
|
| 2227 | + return 0; |
|
| 2228 | + } |
|
| 2197 | 2229 | |
| 2198 | 2230 | $mode = $this->identifyMode(0); |
| 2199 | 2231 | |
@@ -2201,16 +2233,22 @@ discard block |
||
| 2201 | 2233 | case QR_MODE_NUM: $length = $this->eatNum(); break; |
| 2202 | 2234 | case QR_MODE_AN: $length = $this->eatAn(); break; |
| 2203 | 2235 | case QR_MODE_KANJI: |
| 2204 | - if ($this->modeHint == QR_MODE_KANJI) |
|
| 2205 | - $length = $this->eatKanji(); |
|
| 2206 | - else $length = $this->eat8(); |
|
| 2236 | + if ($this->modeHint == QR_MODE_KANJI) { |
|
| 2237 | + $length = $this->eatKanji(); |
|
| 2238 | + } else { |
|
| 2239 | + $length = $this->eat8(); |
|
| 2240 | + } |
|
| 2207 | 2241 | break; |
| 2208 | 2242 | default: $length = $this->eat8(); break; |
| 2209 | 2243 | |
| 2210 | 2244 | } |
| 2211 | 2245 | |
| 2212 | - if ($length == 0) return 0; |
|
| 2213 | - if ($length < 0) return -1; |
|
| 2246 | + if ($length == 0) { |
|
| 2247 | + return 0; |
|
| 2248 | + } |
|
| 2249 | + if ($length < 0) { |
|
| 2250 | + return -1; |
|
| 2251 | + } |
|
| 2214 | 2252 | |
| 2215 | 2253 | $this->dataStr = substr($this->dataStr, $length); |
| 2216 | 2254 | } |
@@ -2246,8 +2284,9 @@ discard block |
||
| 2246 | 2284 | |
| 2247 | 2285 | $split = new QRsplit($string, $input, $modeHint); |
| 2248 | 2286 | |
| 2249 | - if (!$casesensitive) |
|
| 2250 | - $split->toUpper(); |
|
| 2287 | + if (!$casesensitive) { |
|
| 2288 | + $split->toUpper(); |
|
| 2289 | + } |
|
| 2251 | 2290 | |
| 2252 | 2291 | return $split->splitString(); |
| 2253 | 2292 | } |
@@ -2324,11 +2363,23 @@ discard block |
||
| 2324 | 2363 | $rs = null; |
| 2325 | 2364 | |
| 2326 | 2365 | // Check parameter ranges |
| 2327 | - if ($symsize < 0 || $symsize > 8) return $rs; |
|
| 2328 | - if ($fcr < 0 || $fcr >= (1 << $symsize)) return $rs; |
|
| 2329 | - if ($prim <= 0 || $prim >= (1 << $symsize)) return $rs; |
|
| 2330 | - if ($nroots < 0 || $nroots >= (1 << $symsize)) return $rs; // Can't have more roots than symbol values! |
|
| 2331 | - if ($pad < 0 || $pad >= ((1 << $symsize) - 1 - $nroots)) return $rs; // Too much padding |
|
| 2366 | + if ($symsize < 0 || $symsize > 8) { |
|
| 2367 | + return $rs; |
|
| 2368 | + } |
|
| 2369 | + if ($fcr < 0 || $fcr >= (1 << $symsize)) { |
|
| 2370 | + return $rs; |
|
| 2371 | + } |
|
| 2372 | + if ($prim <= 0 || $prim >= (1 << $symsize)) { |
|
| 2373 | + return $rs; |
|
| 2374 | + } |
|
| 2375 | + if ($nroots < 0 || $nroots >= (1 << $symsize)) { |
|
| 2376 | + return $rs; |
|
| 2377 | + } |
|
| 2378 | + // Can't have more roots than symbol values! |
|
| 2379 | + if ($pad < 0 || $pad >= ((1 << $symsize) - 1 - $nroots)) { |
|
| 2380 | + return $rs; |
|
| 2381 | + } |
|
| 2382 | + // Too much padding |
|
| 2332 | 2383 | |
| 2333 | 2384 | $rs = new QRrsItem(); |
| 2334 | 2385 | $rs->mm = $symsize; |
@@ -2454,12 +2505,24 @@ discard block |
||
| 2454 | 2505 | public static function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad) |
| 2455 | 2506 | {
|
| 2456 | 2507 | foreach (self::$items as $rs) {
|
| 2457 | - if ($rs->pad != $pad) continue; |
|
| 2458 | - if ($rs->nroots != $nroots) continue; |
|
| 2459 | - if ($rs->mm != $symsize) continue; |
|
| 2460 | - if ($rs->gfpoly != $gfpoly) continue; |
|
| 2461 | - if ($rs->fcr != $fcr) continue; |
|
| 2462 | - if ($rs->prim != $prim) continue; |
|
| 2508 | + if ($rs->pad != $pad) { |
|
| 2509 | + continue; |
|
| 2510 | + } |
|
| 2511 | + if ($rs->nroots != $nroots) { |
|
| 2512 | + continue; |
|
| 2513 | + } |
|
| 2514 | + if ($rs->mm != $symsize) { |
|
| 2515 | + continue; |
|
| 2516 | + } |
|
| 2517 | + if ($rs->gfpoly != $gfpoly) { |
|
| 2518 | + continue; |
|
| 2519 | + } |
|
| 2520 | + if ($rs->fcr != $fcr) { |
|
| 2521 | + continue; |
|
| 2522 | + } |
|
| 2523 | + if ($rs->prim != $prim) { |
|
| 2524 | + continue; |
|
| 2525 | + } |
|
| 2463 | 2526 | |
| 2464 | 2527 | return $rs; |
| 2465 | 2528 | } |
@@ -2709,8 +2772,9 @@ discard block |
||
| 2709 | 2772 | |
| 2710 | 2773 | $frameY = $frame[$y]; |
| 2711 | 2774 | |
| 2712 | - if ($y > 0) |
|
| 2713 | - $frameYM = $frame[$y - 1]; |
|
| 2775 | + if ($y > 0) { |
|
| 2776 | + $frameYM = $frame[$y - 1]; |
|
| 2777 | + } |
|
| 2714 | 2778 | |
| 2715 | 2779 | for ($x = 0; $x < $width; $x++) {
|
| 2716 | 2780 | if (($x > 0) && ($y > 0)) {
|
@@ -2923,14 +2987,17 @@ discard block |
||
| 2923 | 2987 | $blockNo++; |
| 2924 | 2988 | } |
| 2925 | 2989 | |
| 2926 | - if (QRspec::rsBlockNum2($spec) == 0) |
|
| 2927 | - return 0; |
|
| 2990 | + if (QRspec::rsBlockNum2($spec) == 0) { |
|
| 2991 | + return 0; |
|
| 2992 | + } |
|
| 2928 | 2993 | |
| 2929 | 2994 | $dl = QRspec::rsDataCodes2($spec); |
| 2930 | 2995 | $el = QRspec::rsEccCodes2($spec); |
| 2931 | 2996 | $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el); |
| 2932 | 2997 | |
| 2933 | - if ($rs == null) return -1; |
|
| 2998 | + if ($rs == null) { |
|
| 2999 | + return -1; |
|
| 3000 | + } |
|
| 2934 | 3001 | |
| 2935 | 3002 | for ($i = 0; $i < QRspec::rsBlockNum2($spec); $i++) {
|
| 2936 | 3003 | $ecc = array_slice($this->ecccode, $eccPos); |
@@ -3068,7 +3135,9 @@ discard block |
||
| 3068 | 3135 | } |
| 3069 | 3136 | |
| 3070 | 3137 | $input = new QRinput($version, $level); |
| 3071 | - if ($input == null) return null; |
|
| 3138 | + if ($input == null) { |
|
| 3139 | + return null; |
|
| 3140 | + } |
|
| 3072 | 3141 | |
| 3073 | 3142 | $ret = $input->append(QR_MODE_8, strlen($string), str_split($string)); |
| 3074 | 3143 | if ($ret < 0) {
|
@@ -3088,7 +3157,9 @@ discard block |
||
| 3088 | 3157 | } |
| 3089 | 3158 | |
| 3090 | 3159 | $input = new QRinput($version, $level); |
| 3091 | - if ($input == null) return null; |
|
| 3160 | + if ($input == null) { |
|
| 3161 | + return null; |
|
| 3162 | + } |
|
| 3092 | 3163 | |
| 3093 | 3164 | $ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive); |
| 3094 | 3165 | if ($ret < 0) {
|
@@ -3198,7 +3269,9 @@ discard block |
||
| 3198 | 3269 | } |
| 3199 | 3270 | } |
| 3200 | 3271 | } |
| 3201 | - if ($x < 0 || $y < 0) return null; |
|
| 3272 | + if ($x < 0 || $y < 0) { |
|
| 3273 | + return null; |
|
| 3274 | + } |
|
| 3202 | 3275 | |
| 3203 | 3276 | $this->x = $x; |
| 3204 | 3277 | $this->y = $y; |
@@ -123,8 +123,9 @@ discard block |
||
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr)); |
| 126 | - if ($ret < 0) |
|
| 127 | - return -1; |
|
| 126 | + if ($ret < 0) { |
|
| 127 | + return -1; |
|
| 128 | + } |
|
| 128 | 129 | |
| 129 | 130 | return $run; |
| 130 | 131 | } |
@@ -170,8 +171,9 @@ discard block |
||
| 170 | 171 | } |
| 171 | 172 | |
| 172 | 173 | $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr)); |
| 173 | - if ($ret < 0) |
|
| 174 | - return -1; |
|
| 174 | + if ($ret < 0) { |
|
| 175 | + return -1; |
|
| 176 | + } |
|
| 175 | 177 | |
| 176 | 178 | return $run; |
| 177 | 179 | } |
@@ -186,8 +188,9 @@ discard block |
||
| 186 | 188 | } |
| 187 | 189 | |
| 188 | 190 | $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr)); |
| 189 | - if ($ret < 0) |
|
| 190 | - return -1; |
|
| 191 | + if ($ret < 0) { |
|
| 192 | + return -1; |
|
| 193 | + } |
|
| 191 | 194 | |
| 192 | 195 | return $ret; |
| 193 | 196 | } |
@@ -241,8 +244,9 @@ discard block |
||
| 241 | 244 | $run = $p; |
| 242 | 245 | $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr)); |
| 243 | 246 | |
| 244 | - if ($ret < 0) |
|
| 245 | - return -1; |
|
| 247 | + if ($ret < 0) { |
|
| 248 | + return -1; |
|
| 249 | + } |
|
| 246 | 250 | |
| 247 | 251 | return $run; |
| 248 | 252 | } |
@@ -252,8 +256,9 @@ discard block |
||
| 252 | 256 | {
|
| 253 | 257 | while (strlen($this->dataStr) > 0) |
| 254 | 258 | {
|
| 255 | - if ($this->dataStr == '') |
|
| 256 | - return 0; |
|
| 259 | + if ($this->dataStr == '') { |
|
| 260 | + return 0; |
|
| 261 | + } |
|
| 257 | 262 | |
| 258 | 263 | $mode = $this->identifyMode(0); |
| 259 | 264 | |
@@ -261,16 +266,22 @@ discard block |
||
| 261 | 266 | case QR_MODE_NUM: $length = $this->eatNum(); break; |
| 262 | 267 | case QR_MODE_AN: $length = $this->eatAn(); break; |
| 263 | 268 | case QR_MODE_KANJI: |
| 264 | - if ($this->modeHint == QR_MODE_KANJI) |
|
| 265 | - $length = $this->eatKanji(); |
|
| 266 | - else $length = $this->eat8(); |
|
| 269 | + if ($this->modeHint == QR_MODE_KANJI) { |
|
| 270 | + $length = $this->eatKanji(); |
|
| 271 | + } else { |
|
| 272 | + $length = $this->eat8(); |
|
| 273 | + } |
|
| 267 | 274 | break; |
| 268 | 275 | default: $length = $this->eat8(); break; |
| 269 | 276 | |
| 270 | 277 | } |
| 271 | 278 | |
| 272 | - if ($length == 0) return 0; |
|
| 273 | - if ($length < 0) return -1; |
|
| 279 | + if ($length == 0) { |
|
| 280 | + return 0; |
|
| 281 | + } |
|
| 282 | + if ($length < 0) { |
|
| 283 | + return -1; |
|
| 284 | + } |
|
| 274 | 285 | |
| 275 | 286 | $this->dataStr = substr($this->dataStr, $length); |
| 276 | 287 | } |
@@ -306,8 +317,9 @@ discard block |
||
| 306 | 317 | |
| 307 | 318 | $split = new QRsplit($string, $input, $modeHint); |
| 308 | 319 | |
| 309 | - if (!$casesensitive) |
|
| 310 | - $split->toUpper(); |
|
| 320 | + if (!$casesensitive) { |
|
| 321 | + $split->toUpper(); |
|
| 322 | + } |
|
| 311 | 323 | |
| 312 | 324 | return $split->splitString(); |
| 313 | 325 | } |
