Add support for DX Film Edge read

zxing-cpp · axxel · Dec 12, 2023 · Nov 15, 2023 · Dec 12, 2023 · Dec 10, 2023
commit 51a11904a68a21df41f3b5bb816c587c6550590b
diff --git a/README.md b/README.md
@@ -40,12 +40,12 @@ Thanks a lot for your contribution!
 | EAN-8          | Code 128          | rMQR Code          |
 | EAN-13         | Codabar           | Aztec              |
 | DataBar        | DataBar Expanded  | DataMatrix         |
-|                | ITF               | PDF417             |
-|                |                   | MaxiCode (partial) |
+|                | DX Film Edge      | PDF417             |
+|                | ITF               | MaxiCode (partial) |
 
 [Note:]
  * DataBar used to be called RSS.
- * DataBar, MaxiCode, Micro QR Code and rMQR Code are not supported for writing.
+ * DataBar, DX Film Edge, MaxiCode, Micro QR Code and rMQR Code are not supported for writing.
  * Building with C++20 (see [CMakeLists.txt](https://github.com/zxing-cpp/zxing-cpp/blob/d4b0f502775857f257d13efd25fb840ece1bca3e/CMakeLists.txt#L45)) changes the behaviour of the library: it then supports multi-symbol and position independent detection for DataMatrix. This comes at a noticable performace cost. C++20 is enabled by default for the Android, iOS, Python and WASM wrappers.
 
 ## Getting Started

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -289,6 +289,8 @@ if (BUILD_READERS)
         src/oned/ODDataBarExpandedBitDecoder.cpp
         src/oned/ODDataBarExpandedReader.h
         src/oned/ODDataBarExpandedReader.cpp
+        src/oned/ODDXFilmEdgeReader.h
+        src/oned/ODDXFilmEdgeReader.cpp
         src/oned/ODITFReader.h
         src/oned/ODITFReader.cpp
         src/oned/ODMultiUPCEANReader.h

diff --git a/core/src/BarcodeFormat.cpp b/core/src/BarcodeFormat.cpp
@@ -32,6 +32,7 @@ static BarcodeFormatName NAMES[] = {
 	{BarcodeFormat::DataBar, "DataBar"},
 	{BarcodeFormat::DataBarExpanded, "DataBarExpanded"},
 	{BarcodeFormat::DataMatrix, "DataMatrix"},
+	{BarcodeFormat::DXFilmEdge, "DXFilmEdge"},
 	{BarcodeFormat::EAN8, "EAN-8"},
 	{BarcodeFormat::EAN13, "EAN-13"},
 	{BarcodeFormat::ITF, "ITF"},

diff --git a/core/src/BarcodeFormat.h b/core/src/BarcodeFormat.h
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright 2016 Nu-book Inc.
 * Copyright 2016 ZXing authors
 */
@@ -40,12 +40,13 @@ enum class BarcodeFormat
 	UPCE            = (1 << 15), ///< UPC-E
 	MicroQRCode     = (1 << 16), ///< Micro QR Code
 	RMQRCode        = (1 << 17), ///< Rectangular Micro QR Code
+	DXFilmEdge      = (1 << 18), ///< DX Film Edge Barcode
 
-	LinearCodes = Codabar | Code39 | Code93 | Code128 | EAN8 | EAN13 | ITF | DataBar | DataBarExpanded | UPCA | UPCE,
+	LinearCodes = Codabar | Code39 | Code93 | Code128 | EAN8 | EAN13 | ITF | DataBar | DataBarExpanded | DXFilmEdge | UPCA | UPCE,
 	MatrixCodes = Aztec | DataMatrix | MaxiCode | PDF417 | QRCode | MicroQRCode | RMQRCode,
 	Any         = LinearCodes | MatrixCodes,
 
-	_max = RMQRCode, ///> implementation detail, don't use
+	_max = DXFilmEdge, ///> implementation detail, don't use
 };
 
 ZX_DECLARE_FLAGS(BarcodeFormats, BarcodeFormat)