This commit is contained in:
smiley
2022-07-12 19:23:20 +02:00
parent 3f38ccc496
commit 60735bafc2
3 changed files with 14 additions and 15 deletions
+1 -1
View File
@@ -128,7 +128,7 @@ final class BitBuffer{
$numBits -= $toRead;
$this->bitsRead += $toRead;
if($this->bitsRead == 8){
if($this->bitsRead === 8){
$this->bitsRead = 0;
$this->bytesRead++;
}
+2 -3
View File
@@ -14,7 +14,7 @@ use chillerlan\QRCode\Common\{BitBuffer, EccLevel, MaskPattern, Mode, Version};
use chillerlan\QRCode\QRCode;
use chillerlan\Settings\SettingsContainerInterface;
use function range, sprintf;
use function sprintf;
/**
* Processes the binary data and maps it on a matrix which is then being returned
@@ -144,8 +144,7 @@ final class QRData{
$total = $this->estimateTotalBitLength();
// guess the version number within the given range
foreach(range($this->options->versionMin, $this->options->versionMax) as $version){
for($version = $this->options->versionMin; $version <= $this->options->versionMax; $version++){
if($total <= $this->maxBitsForEcc[$version]){
return $version;
}
+11 -11
View File
@@ -363,6 +363,17 @@ trait QROptionsTrait{
$this->setMinMaxVersion($this->versionMin, $version);
}
/**
* sets/clamps the version number
*/
protected function set_version(int $version):void{
if($version !== QRCode::VERSION_AUTO){
$this->version = max(1, min(40, $version));
}
}
/**
* sets the error correction level
*
@@ -428,17 +439,6 @@ trait QROptionsTrait{
$this->imageTransparencyBG = array_values($this->imageTransparencyBG);
}
/**
* sets/clamps the version number
*/
protected function set_version(int $version):void{
if($version !== QRCode::VERSION_AUTO){
$this->version = max(1, min(40, $version));
}
}
/**
* sets the FPDF measurement unit
*