Fix even more possible Implicit conversion from float

Author: GenieTim

lib/Common/HybridBinarizer.php

@@ -146,7 +146,7 @@ private static function calculateBlackPoints(
 						// finish the rest of the rows quickly
 						for ($yy++, $offset += $width; $yy < self::$BLOCK_SIZE; $yy++, $offset += $width) {
 							for ($xx = 0; $xx < self::$BLOCK_SIZE; $xx++) {
-								$sum += ($luminances[$offset + $xx] & 0xFF);
+								$sum += (((int)$luminances[(int)round($offset + $xx)]) & 0xFF);
 							}
 						}
 					}

lib/Qrcode/Detector/FinderPatternFinder.php

@@ -58,6 +58,7 @@ final public function find(array|null $hints): \Zxing\Qrcode\Detector\FinderPatt
 		$tryHarder = $hints != null && array_key_exists('TRY_HARDER', $hints) && $hints['TRY_HARDER'];
 		$pureBarcode = $hints != null && array_key_exists('PURE_BARCODE', $hints) && $hints['PURE_BARCODE'];
 		$nrOfRowsSkippable = $hints != null && array_key_exists('NR_ALLOW_SKIP_ROWS', $hints) ? $hints['NR_ALLOW_SKIP_ROWS'] : ($tryHarder ? 0 : null);
+		$allowedDeviation = $hints != null && array_key_exists('ALLOWED_DEVIATION', $hints) ? $hints['ALLOWED_DEVIATION'] : null;
 		$maxI = $this->image->getHeight();
 		$maxJ = $this->image->getWidth();
 		// We are looking for black/white/black/white/black modules in
@@ -99,7 +100,7 @@ final public function find(array|null $hints): \Zxing\Qrcode\Detector\FinderPatt
 									// expensive and didn't improve performance.
 									$iSkip = 3;
 									if ($this->hasSkipped) {
-										$done = $this->haveMultiplyConfirmedCenters();
+										$done = $this->haveMultiplyConfirmedCenters($allowedDeviation);
 									} else {
 										$rowSkip = $nrOfRowsSkippable === null ? $this->findRowSkip() : $nrOfRowsSkippable;
 										if ($rowSkip > $stateCount[2]) {
@@ -153,7 +154,7 @@ final public function find(array|null $hints): \Zxing\Qrcode\Detector\FinderPatt
 					$iSkip = $stateCount[0];
 					if ($this->hasSkipped) {
 						// Found a third one
-						$done = $this->haveMultiplyConfirmedCenters();
+						$done = $this->haveMultiplyConfirmedCenters($allowedDeviation);
 					}
 				}
 			}
@@ -537,7 +538,7 @@ private function crossCheckDiagonal(int $startI, int $centerJ, $maxCount, int|fl
 	/**
 	 * @return bool iff we have found at least 3 finder patterns that have been detected at least {@link #CENTER_QUORUM} times each, and, the estimated module size of the candidates is "pretty similar"
 	 */
-	private function haveMultiplyConfirmedCenters(): bool
+	private function haveMultiplyConfirmedCenters(?float $allowedDeviation = 0.05): bool
 	{
 		$confirmedCount = 0;
 		$totalModuleSize = 0.0;
@@ -561,7 +562,7 @@ private function haveMultiplyConfirmedCenters(): bool
 			$totalDeviation += abs($pattern->getEstimatedModuleSize() - $average);
 		}
 
-		return $totalDeviation <= 0.05 * $totalModuleSize;
+		return $totalDeviation <= $allowedDeviation * $totalModuleSize;
 	}
 
 	/**
@@ -609,7 +610,7 @@ private function selectBestPatterns()
 		$startSize = count($this->possibleCenters);
 		if ($startSize < 3) {
 			// Couldn't find enough finder patterns
-			throw new NotFoundException("Could not find 3 finder patterns");
+			throw new NotFoundException("Could not find 3 finder patterns ($startSize found)");
 		}
 
 		// Filter outlier possibilities whose module size is too different

tests/QrReaderTest.php

@@ -60,7 +60,8 @@ public function testText4()
 		$image = __DIR__ . "/qrcodes/174419877-f6b5dae1-2251-4b67-95f1-5e1143e40fae.jpg";
 		$qrcode = new QrReader($image);
 		$qrcode->decode([
-			'NR_ALLOW_SKIP_ROWS' => 0
+			'NR_ALLOW_SKIP_ROWS' => 0,
+			'ALLOWED_DEVIATION' => 0.1
 		]);
 		$this->assertSame(null, $qrcode->getError());
 		$this->assertSame("some text", $qrcode->text());