ReadBarcode: fix issue with interacting tryInvert and tryDenoise options

axxel · axxel · commit 445217e7fdaa · 2025-05-13T15:26:36.000+02:00
diff --git a/core/src/BinaryBitmap.cpp b/core/src/BinaryBitmap.cpp
@@ -63,7 +63,7 @@ void BinaryBitmap::invert()
 		auto matrix = const_cast<BitMatrix*>(_cache->matrix.get());
 		matrix->flipAll();
 	}
-	_inverted = true;
+	_inverted = !_inverted;
 }
 
 template <typename F>
diff --git a/core/src/ReadBarcode.cpp b/core/src/ReadBarcode.cpp
@@ -175,8 +175,12 @@ Barcodes ReadBarcodes(const ImageView& _iv, const ReaderOptions& opts)
 	for (auto&& iv : pyramid.layers) {
 		auto bitmap = CreateBitmap(opts.binarizer(), iv);
 		for (int close = 0; close <= (closedReader ? 1 : 0); ++close) {
-			if (close)
+			if (close) {
+				// if we already inverted the image in the first round, we need to undo that first
+				if (bitmap->inverted())
+					bitmap->invert();
 				bitmap->close();
+			}
 
 			// TODO: check if closing after invert would be beneficial
 			for (int invert = 0; invert <= static_cast<int>(opts.tryInvert() && !close); ++invert) {

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ void BinaryBitmap::invert()`
`63`	`63`	`auto matrix = const_cast<BitMatrix*>(_cache->matrix.get());`
`64`	`64`	`matrix->flipAll();`
`65`	`65`	`}`
`66`		`- _inverted = true;`
	`66`	`+ _inverted = !_inverted;`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`template <typename F>`