Quadrilateral: new Rectangle factory function for bounding-box application

axxel · axxel · commit ec43e5ffaa67 · 2025-12-16T12:16:41.000+01:00
diff --git a/core/src/GridSampler.h b/core/src/GridSampler.h
@@ -38,12 +38,6 @@ namespace ZXing {
 */
 DetectorResult SampleGrid(const BitMatrix& image, int width, int height, const PerspectiveTransform& mod2Pix);
 
-template <typename PointT = PointF>
-Quadrilateral<PointT> Rectangle(int x0, int x1, int y0, int y1, typename PointT::value_t o = 0.5)
-{
-	return {PointT{x0 + o, y0 + o}, {x1 + o, y0 + o}, {x1 + o, y1 + o}, {x0 + o, y1 + o}};
-}
-
 class ROI
 {
 public:
diff --git a/core/src/Quadrilateral.h b/core/src/Quadrilateral.h
@@ -54,6 +54,21 @@ Quadrilateral<PointT> Rectangle(int width, int height, typename PointT::value_t
 		PointT{margin, margin}, {width - margin, margin}, {width - margin, height - margin}, {margin, height - margin}};
 }
 
+template <typename PointT = PointF>
+Quadrilateral<PointT> Rectangle(int x0, int x1, int y0, int y1, typename PointT::value_t o)
+{
+	return {PointT{x0 + o, y0 + o}, {x1 + o, y0 + o}, {x1 + o, y1 + o}, {x0 + o, y1 + o}};
+}
+
+template <typename PointT = PointF>
+Quadrilateral<PointT> Rectangle(int left, int top, int width, int height)
+{
+	int right  = left + width - 1;
+	int bottom = top + height - 1;
+
+	return {PointT{left, top}, {right, top}, {right, bottom}, {left, bottom}};
+}
+
 template <typename PointT = PointF>
 Quadrilateral<PointT> CenteredSquare(int size)
 {
diff --git a/core/src/datamatrix/DMDetector.cpp b/core/src/datamatrix/DMDetector.cpp
@@ -949,12 +949,9 @@ static DetectorResult DetectPure(const BitMatrix& image)
 		|| !image.isIn(PointF{left + modSizeX / 2 + (dimT - 1) * modSize, top + modSizeY / 2 + (dimR - 1) * modSize}))
 		return {};
 
-	int right  = left + width - 1;
-	int bottom = top + height - 1;
-
 	// Now just read off the bits (this is a crop + subsample)
 	return {Deflate(image, dimT, dimR, top + modSizeY / 2, left + modSizeX / 2, modSize),
-			{{left, top}, {right, top}, {right, bottom}, {left, bottom}}};
+			Rectangle<PointI>(left, top, width, height)};
 }
 
 DetectorResults Detect(const BitMatrix& image, bool tryHarder, bool tryRotate, bool isPure)
diff --git a/core/src/maxicode/MCReader.cpp b/core/src/maxicode/MCReader.cpp
@@ -40,10 +40,7 @@ static DetectorResult ExtractPureBits(const BitMatrix& image)
 		}
 	}
 
-	int right  = left + width - 1;
-	int bottom = top + height - 1;
-
-	return {std::move(bits), {{left, top}, {right, top}, {right, bottom}, {left, bottom}}};
+	return {std::move(bits), Rectangle<PointI>(left, top, width, height)};
 }
 
 Barcode Reader::decode(const BinaryBitmap& image) const
diff --git a/core/src/pdf417/PDFReader.cpp b/core/src/pdf417/PDFReader.cpp
@@ -291,8 +291,6 @@ static Barcode DecodePure(const BinaryBitmap& image_)
 	int left, top, width, height;
 	if (!image.findBoundingBox(left, top, width, height, 9) || (width < 3 * 17 && height < 3 * 17))
 		return {};
-	int right  = left + width - 1;
-	int bottom = top + height - 1;
 
 	// counter intuitively, using a floating point cursor is about twice as fast an integer one (on an AVX architecture)
 	BitMatrixCursorF cur(image, centered(PointI{left, top}), PointF{1, 0});
@@ -315,7 +313,7 @@ static Barcode DecodePure(const BinaryBitmap& image_)
 
 	auto res = DecodeCodewords(codeWords, NumECCodeWords(info.ecLevel));
 
-	return Barcode(std::move(res), {{}, {{left, top}, {right, top}, {right, bottom}, {left, bottom}}}, BarcodeFormat::PDF417);
+	return Barcode(std::move(res), {{}, Rectangle<PointI>(left, top, width, height)}, BarcodeFormat::PDF417);
 }
 
 Barcode
diff --git a/core/src/qrcode/QRDetector.cpp b/core/src/qrcode/QRDetector.cpp
@@ -500,7 +500,7 @@ DetectorResult SampleQR(const BitMatrix& image, const FinderPatternSet& fp)
 			for (int x = 0; x < N; ++x) {
 				int x0 = apM[x], x1 = apM[x + 1], y0 = apM[y], y1 = apM[y + 1];
 				rois.push_back({x0 - (x == 0) * 6, x1 + (x == N - 1) * 7, y0 - (y == 0) * 6, y1 + (y == N - 1) * 7,
-								PerspectiveTransform{Rectangle(x0, x1, y0, y1),
+								PerspectiveTransform{Rectangle(x0, x1, y0, y1, 0.5),
 													 {*apP(x, y), *apP(x + 1, y), *apP(x + 1, y + 1), *apP(x, y + 1)}}});
 			}
 
@@ -530,10 +530,9 @@ DetectorResult DetectPureQR(const BitMatrix& image)
 	int left, top, width, height;
 	if (!image.findBoundingBox(left, top, width, height, MIN_MODULES) || std::abs(width - height) > 1)
 		return {};
-	int right  = left + width - 1;
-	int bottom = top + height - 1;
+	auto pos = Rectangle<PointI>(left, top, width, height);
 
-	PointI tl{left, top}, tr{right, top}, bl{left, bottom};
+	const PointI &tl = pos.topLeft(), &tr = pos.topRight(), &bl = pos.bottomLeft();
 	Pattern diagonal;
 	// allow corners be moved one pixel inside to accommodate for possible aliasing artifacts
 	for (auto [p, d] : {std::pair(tl, PointI{1, 1}), {tr, {-1, 1}}, {bl, {1, -1}}}) {
@@ -561,8 +560,7 @@ DetectorResult DetectPureQR(const BitMatrix& image)
 #endif
 
 	// Now just read off the bits (this is a crop + subsample)
-	return {Deflate(image, dimension, dimension, top + moduleSize / 2, left + moduleSize / 2, moduleSize),
-			{{left, top}, {right, top}, {right, bottom}, {left, bottom}}};
+	return {Deflate(image, dimension, dimension, top + moduleSize / 2, left + moduleSize / 2, moduleSize), std::move(pos)};
 }
 
 DetectorResult DetectPureMQR(const BitMatrix& image)
@@ -574,8 +572,6 @@ DetectorResult DetectPureMQR(const BitMatrix& image)
 	int left, top, width, height;
 	if (!image.findBoundingBox(left, top, width, height, MIN_MODULES) || std::abs(width - height) > 1)
 		return {};
-	int right  = left + width - 1;
-	int bottom = top + height - 1;
 
 	// allow corners be moved one pixel inside to accommodate for possible aliasing artifacts
 	auto diagonal = BitMatrixCursorI(image, {left, top}, {1, 1}).readPatternFromBlack<Pattern>(1);
@@ -601,7 +597,7 @@ DetectorResult DetectPureMQR(const BitMatrix& image)
 
 	// Now just read off the bits (this is a crop + subsample)
 	return {Deflate(image, dimension, dimension, top + moduleSize / 2, left + moduleSize / 2, moduleSize),
-			{{left, top}, {right, top}, {right, bottom}, {left, bottom}}};
+			Rectangle<PointI>(left, top, width, height)};
 }
 
 DetectorResult DetectPureRMQR(const BitMatrix& image)
@@ -622,10 +618,9 @@ DetectorResult DetectPureRMQR(const BitMatrix& image)
 	int left, top, width, height;
 	if (!image.findBoundingBox(left, top, width, height, MIN_MODULES) || height >= width)
 		return {};
-	int right  = left + width - 1;
-	int bottom = top + height - 1;
+	auto pos = Rectangle<PointI>(left, top, width, height);
 
-	PointI tl{left, top}, tr{right, top}, br{right, bottom}, bl{left, bottom};
+	const PointI &tl = pos.topLeft(), &tr = pos.topRight(), &bl = pos.bottomLeft(), &br = pos.bottomRight();
 
 	// allow corners be moved one pixel inside to accommodate for possible aliasing artifacts
 	auto diagonal = BitMatrixCursorI(image, tl, {1, 1}).readPatternFromBlack<Pattern>(1);
@@ -662,11 +657,11 @@ DetectorResult DetectPureRMQR(const BitMatrix& image)
 	LogMatrixWriter lmw(log, image, 5, "grid2.pnm");
 	for (int y = 0; y < dimH; y++)
 		for (int x = 0; x < dimW; x++)
-			log(PointF(left + (x + .5f) * moduleSize, top + (y + .5f) * moduleSize));
+			log(pos.topLeft() + moduleSize * PointF(x + .5f, y + .5f));
 #endif
 
 	// Now just read off the bits (this is a crop + subsample)
-	return {Deflate(image, dimW, dimH, top + moduleSize / 2, left + moduleSize / 2, moduleSize), {tl, tr, br, bl}};
+	return {Deflate(image, dimW, dimH, top + moduleSize / 2, left + moduleSize / 2, moduleSize), std::move(pos)};
 }
 
 DetectorResult SampleMQR(const BitMatrix& image, const ConcentricPattern& fp)

Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,7 @@ static DetectorResult ExtractPureBits(const BitMatrix& image)`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`- int right = left + width - 1;`
`44`		`- int bottom = top + height - 1;`
`45`		`-`
`46`		`- return {std::move(bits), {{left, top}, {right, top}, {right, bottom}, {left, bottom}}};`
	`43`	`+ return {std::move(bits), Rectangle<PointI>(left, top, width, height)};`
`47`	`44`	`}`
`48`	`45`
`49`	`46`	`Barcode Reader::decode(const BinaryBitmap& image) const`