Skip to content

Commit 51a1190

Browse files
committed
Add support for DX Film Edge read
1 parent d3a8d5f commit 51a1190

File tree

22 files changed

+443
-10
lines changed

22 files changed

+443
-10
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ Thanks a lot for your contribution!
4040
| EAN-8 | Code 128 | rMQR Code |
4141
| EAN-13 | Codabar | Aztec |
4242
| DataBar | DataBar Expanded | DataMatrix |
43-
| | ITF | PDF417 |
44-
| | | MaxiCode (partial) |
43+
| | DX Film Edge | PDF417 |
44+
| | ITF | MaxiCode (partial) |
4545

4646
[Note:]
4747
* DataBar used to be called RSS.
48-
* DataBar, MaxiCode, Micro QR Code and rMQR Code are not supported for writing.
48+
* DataBar, DX Film Edge, MaxiCode, Micro QR Code and rMQR Code are not supported for writing.
4949
* 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.
5050

5151
## Getting Started

core/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,8 @@ if (BUILD_READERS)
289289
src/oned/ODDataBarExpandedBitDecoder.cpp
290290
src/oned/ODDataBarExpandedReader.h
291291
src/oned/ODDataBarExpandedReader.cpp
292+
src/oned/ODDXFilmEdgeReader.h
293+
src/oned/ODDXFilmEdgeReader.cpp
292294
src/oned/ODITFReader.h
293295
src/oned/ODITFReader.cpp
294296
src/oned/ODMultiUPCEANReader.h

core/src/BarcodeFormat.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ static BarcodeFormatName NAMES[] = {
3232
{BarcodeFormat::DataBar, "DataBar"},
3333
{BarcodeFormat::DataBarExpanded, "DataBarExpanded"},
3434
{BarcodeFormat::DataMatrix, "DataMatrix"},
35+
{BarcodeFormat::DXFilmEdge, "DXFilmEdge"},
3536
{BarcodeFormat::EAN8, "EAN-8"},
3637
{BarcodeFormat::EAN13, "EAN-13"},
3738
{BarcodeFormat::ITF, "ITF"},

core/src/BarcodeFormat.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
* Copyright 2016 Nu-book Inc.
33
* Copyright 2016 ZXing authors
44
*/
@@ -40,12 +40,13 @@ enum class BarcodeFormat
4040
UPCE = (1 << 15), ///< UPC-E
4141
MicroQRCode = (1 << 16), ///< Micro QR Code
4242
RMQRCode = (1 << 17), ///< Rectangular Micro QR Code
43+
DXFilmEdge = (1 << 18), ///< DX Film Edge Barcode
4344

44-
LinearCodes = Codabar | Code39 | Code93 | Code128 | EAN8 | EAN13 | ITF | DataBar | DataBarExpanded | UPCA | UPCE,
45+
LinearCodes = Codabar | Code39 | Code93 | Code128 | EAN8 | EAN13 | ITF | DataBar | DataBarExpanded | DXFilmEdge | UPCA | UPCE,
4546
MatrixCodes = Aztec | DataMatrix | MaxiCode | PDF417 | QRCode | MicroQRCode | RMQRCode,
4647
Any = LinearCodes | MatrixCodes,
4748

48-
_max = RMQRCode, ///> implementation detail, don't use
49+
_max = DXFilmEdge, ///> implementation detail, don't use
4950
};
5051

5152
ZX_DECLARE_FLAGS(BarcodeFormats, BarcodeFormat)

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy