diff options
author | Andrew Dolgov <[email protected]> | 2013-05-07 01:34:49 -0700 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-05-07 01:34:49 -0700 |
commit | a4fd183b5853867a9293dba438512d8400e6b65e (patch) | |
tree | 9776db47df16c7daa91f7a0e2c257031be75d33e /lib/phpqrcode/bindings | |
parent | 75933cf00d4331fd27821af03cadbb2e7c83da79 (diff) | |
parent | 6f7798b6434f5ef6073447998c436901b507e3df (diff) |
Merge pull request #180 from rlerdorf/master
Fix some bugs found by static analysis
Diffstat (limited to 'lib/phpqrcode/bindings')
-rw-r--r-- | lib/phpqrcode/bindings/tcpdf/qrcode.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/phpqrcode/bindings/tcpdf/qrcode.php b/lib/phpqrcode/bindings/tcpdf/qrcode.php index 7995460b5..9001e3a2e 100644 --- a/lib/phpqrcode/bindings/tcpdf/qrcode.php +++ b/lib/phpqrcode/bindings/tcpdf/qrcode.php @@ -1101,7 +1101,7 @@ if (!class_exists('QRcode', false)) { protected function makeMaskNo($maskNo, $width, $s, &$d, $maskGenOnly=false) { $b = 0; $bitMask = array(); - $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d); + $bitMask = $this->generateMaskNo($maskNo, $width, $s); if ($maskGenOnly) { return; } @@ -1399,7 +1399,7 @@ if (!class_exists('QRcode', false)) { $p += 2; } $this->items = $this->appendNewInputItem($this->items, QR_MODE_KJ, $p, str_split($this->dataStr)); - return $run; + return $p; } /** @@ -1470,7 +1470,7 @@ if (!class_exists('QRcode', false)) { break; } case QR_MODE_KJ: { - if ($hint == QR_MODE_KJ) { + if ($this->hint == QR_MODE_KJ) { $length = $this->eatKanji(); } else { $length = $this->eat8(); @@ -1499,7 +1499,7 @@ if (!class_exists('QRcode', false)) { $stringLen = strlen($this->dataStr); $p = 0; while ($p < $stringLen) { - $mode = $this->identifyMode(substr($this->dataStr, $p), $this->hint); + $mode = $this->identifyMode(substr($this->dataStr, $p)); if ($mode == QR_MODE_KJ) { $p += 2; } else { |