:octocat: moved mask pattern clamp to options

This commit is contained in:
codemasher
2018-11-06 13:48:51 +01:00
parent 8b94aa6426
commit 736d05dd5b
2 changed files with 5 additions and 1 deletions
+1 -1
View File
@@ -156,7 +156,7 @@ class QRCode{
$maskPattern = $this->options->maskPattern === $this::MASK_PATTERN_AUTO
? $this->getBestMaskPattern()
: min(7, max(0, (int)$this->options->maskPattern));
: $this->options->maskPattern;
$matrix = $this->dataInterface->initMatrix($maskPattern);
+4
View File
@@ -251,6 +251,10 @@ trait QROptionsTrait{
$min = $this->versionMin;
$this->versionMin = (int)min($min, $max);
$this->versionMax = (int)max($min, $max);
if($this->maskPattern !== QRCode::MASK_PATTERN_AUTO){
$this->maskPattern = min(7, max(0, (int)$this->maskPattern));
}
}
}