diff options
| author | Andrew Dolgov <[email protected]> | 2013-05-07 15:36:14 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-05-07 15:36:14 +0400 |
| commit | 82076ce53113be9cc053f8740356e7e1b81e5643 (patch) | |
| tree | 5eba36805f593ec7dd0aad671b5bcca0ae01cf53 /lib/phpqrcode/qrmask.php | |
| parent | 66af65f14b4f3c670bb3f9ca7b1c80081f9281d1 (diff) | |
| parent | 23923fb29b345c1eea5b70a6df4d30395425bf37 (diff) | |
Merge branch 'master' into css-feedtree-counter
Conflicts:
tt-rss.css
Diffstat (limited to 'lib/phpqrcode/qrmask.php')
| -rw-r--r-- | lib/phpqrcode/qrmask.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/phpqrcode/qrmask.php b/lib/phpqrcode/qrmask.php index b14d7ae16..43d653ce3 100644 --- a/lib/phpqrcode/qrmask.php +++ b/lib/phpqrcode/qrmask.php @@ -149,13 +149,13 @@ if (file_exists($fileName)) {
$bitMask = self::unserial(file_get_contents($fileName));
} else {
- $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
+ $bitMask = $this->generateMaskNo($maskNo, $width, $s);
if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo))
mkdir(QR_CACHE_DIR.'mask_'.$maskNo);
file_put_contents($fileName, self::serial($bitMask));
}
} else {
- $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
+ $bitMask = $this->generateMaskNo($maskNo, $width, $s);
}
if ($maskGenOnly)
|