1
This commit is contained in:
@@ -884,14 +884,15 @@ class QRcode {
|
||||
protected function getCode() {
|
||||
if ($this->count < $this->dataLength) {
|
||||
$row = $this->count % $this->blocks;
|
||||
$col = $this->count / $this->blocks;
|
||||
$col = (int)($this->count / $this->blocks);
|
||||
if ($col >= $this->rsblocks[0]['dataLength']) {
|
||||
$row += $this->b1;
|
||||
}
|
||||
$row = (int) $row;
|
||||
$ret = $this->rsblocks[$row]['data'][$col];
|
||||
} elseif ($this->count < $this->dataLength + $this->eccLength) {
|
||||
$row = ($this->count - $this->dataLength) % $this->blocks;
|
||||
$col = ($this->count - $this->dataLength) / $this->blocks;
|
||||
$col = (int)(($this->count - $this->dataLength) / $this->blocks);
|
||||
$ret = $this->rsblocks[$row]['ecc'][$col];
|
||||
} else {
|
||||
return 0;
|
||||
@@ -1062,7 +1063,7 @@ class QRcode {
|
||||
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;
|
||||
}
|
||||
@@ -1460,7 +1461,7 @@ class QRcode {
|
||||
$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 {
|
||||
@@ -1692,7 +1693,7 @@ class QRcode {
|
||||
return -1;
|
||||
}
|
||||
$buf = array($size, $index, $parity);
|
||||
$entry = $this->newInputItem(QR_MODE_ST, 3, buf);
|
||||
$entry = $this->newInputItem(QR_MODE_ST, 3, $buf);
|
||||
array_unshift($items, $entry);
|
||||
return $items;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user