Skip to content

Commit 4ed9b7c

Browse files
committed
use latest ZXing release (3.5.1) and JCommander release (1.82)
Release 3.5.0 finally includes all of the improvements that I contributed in 2020 🙌 - zxing/zxing#1333 (decode PDF417 barcodes rotated 90° or 270°) - zxing/zxing#1330 (Aztec encoding of non-default charsets) - zxing/zxing#1328 (Aztec decoding of non-default charsets) Added a test image to verify this.
1 parent f2e5cbc commit 4ed9b7c

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.png -text binary

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ It will allow you to read and decode barcode images from Python.
1212
Use the Python 3 version of pip (usually invoked via `pip3`) to install: `pip3 install zxing`
1313

1414
* You'll neeed to have a recent `java` binary somewhere in your path. (Tested with OpenJDK v7, v8, v11.)
15-
* pip will automatically download the relevant [JAR](https://en.wikipedia.org/wiki/JAR_(file_format)) files for the Java ZXing libraries (currently v3.4.1)
15+
* pip will automatically download the relevant [JAR](https://en.wikipedia.org/wiki/JAR_(file_format)) files for the Java ZXing libraries (currently v3.5.1)
1616

1717
## Usage
1818

@@ -22,7 +22,7 @@ The `BarCodeReader` class is used to decode images:
2222
>>> import zxing
2323
>>> reader = zxing.BarCodeReader()
2424
>>> print(reader.zxing_version, reader.zxing_version_info)
25-
3.4.1 (3, 4, 1)
25+
3.5.1 (3, 5, 1)
2626
>>> barcode = reader.decode("test/barcodes/QR_CODE-easy.png")
2727
>>> print(barcode)
2828
BarCode(raw='This should be QR_CODE', parsed='This should be QR_CODE', path='test/barcodes/QR_CODE-easy.png', format='QR_CODE', type='TEXT', points=[(15.0, 87.0), (15.0, 15.0), (87.0, 15.0), (75.0, 75.0)])

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323

2424

2525
def download_java_files(force=False):
26-
files = {'java/javase.jar': 'https://repo1.maven.org/maven2/com/google/zxing/javase/3.4.1/javase-3.4.1.jar',
27-
'java/core.jar': 'https://repo1.maven.org/maven2/com/google/zxing/core/3.4.1/core-3.4.1.jar',
28-
'java/jcommander.jar': 'https://repo1.maven.org/maven2/com/beust/jcommander/1.78/jcommander-1.78.jar'}
26+
files = {'java/javase.jar': 'https://repo1.maven.org/maven2/com/google/zxing/javase/3.5.1/javase-3.5.1.jar',
27+
'java/core.jar': 'https://repo1.maven.org/maven2/com/google/zxing/core/3.5.1/core-3.5.1.jar',
28+
'java/jcommander.jar': 'https://repo1.maven.org/maven2/com/beust/jcommander/1.82/jcommander-1.82.jar'}
2929

3030
for fn, url in files.items():
3131
p = path.join(path.dirname(__file__), 'zxing', fn)

test/barcodes/AZTEC-utf8.png

191 Bytes
Loading

test/test_all.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
('CODE_128-easy.jpg', 'CODE_128', 'This should be CODE_128'),
1717
('PDF_417-easy.bmp', 'PDF_417', 'This should be PDF_417'),
1818
('AZTEC-easy.jpg', 'AZTEC', 'This should be AZTEC'),
19+
('AZTEC-utf8.png', 'AZTEC', 'L’état, c’est moi'),
1920
('QR CODE (¡filenáme törture test! 😉).png', 'QR_CODE', 'This should be QR_CODE'),
2021
('QR_CODE-png-but-wrong-extension.bmp', 'QR_CODE', 'This should be QR_CODE'),
2122
('QR_CODE-fun-with-whitespace.png', 'QR_CODE', '\n\r\t\r\r\r\n '),

0 commit comments

Comments
 (0)