mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix incorrectly applied java port in j2239

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2334 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
smparkes@smparkes.net 2012-06-27 16:02:48 +00:00
parent f6840498b3
commit 024829cea4
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cpp/blackboxtest.results
View file

@ -95,7 +95,7 @@ Processing: ../core/test/data/blackbox/ean13-2/23.png ... FAILED
Detected: zxing::ReaderException: No code detected Detected: zxing::ReaderException: No code detected
Processing: ../core/test/data/blackbox/ean13-2/24.png ... FAILED Processing: ../core/test/data/blackbox/ean13-2/24.png ... FAILED
Expected: 9784872348880 Expected: 9784872348880
Detected: zxing::ReaderException: No code detected Detected: zxing::IllegalArgumentException: Invalid position (ReedSolomonDecoder)
Processing: ../core/test/data/blackbox/ean13-2/25.png ... FAILED Processing: ../core/test/data/blackbox/ean13-2/25.png ... FAILED
Expected: 9784872348880 Expected: 9784872348880
Detected: zxing::ReaderException: No code detected Detected: zxing::ReaderException: No code detected
@ -119,7 +119,7 @@ Processing: ../core/test/data/blackbox/ean13-3/09.jpg ... passed.
Processing: ../core/test/data/blackbox/ean13-3/10.jpg ... passed. Processing: ../core/test/data/blackbox/ean13-3/10.jpg ... passed.
Processing: ../core/test/data/blackbox/ean13-3/11.jpg ... FAILED Processing: ../core/test/data/blackbox/ean13-3/11.jpg ... FAILED
Expected: 9780596008574 Expected: 9780596008574
Detected: zxing::ReaderException: No code detected Detected: zxing::IllegalArgumentException: Invalid position (ReedSolomonDecoder)
Processing: ../core/test/data/blackbox/ean13-3/12.jpg ... passed. Processing: ../core/test/data/blackbox/ean13-3/12.jpg ... passed.
Processing: ../core/test/data/blackbox/ean13-3/13.jpg ... passed. Processing: ../core/test/data/blackbox/ean13-3/13.jpg ... passed.
Processing: ../core/test/data/blackbox/ean13-3/14.jpg ... passed. Processing: ../core/test/data/blackbox/ean13-3/14.jpg ... passed.
@ -266,7 +266,7 @@ Processing: ../core/test/data/blackbox/ean13-5/14.png ... FAILED
Detected: zxing::ReaderException: No code detected Detected: zxing::ReaderException: No code detected
Processing: ../core/test/data/blackbox/ean13-5/15.png ... FAILED Processing: ../core/test/data/blackbox/ean13-5/15.png ... FAILED
Expected: 9780446579803 Expected: 9780446579803
Detected: zxing::IllegalArgumentException: Invalid position (ReedSolomonDecoder) Detected: zxing::ReaderException: No code detected
Processing: ../core/test/data/blackbox/ean13-5/16.png ... FAILED Processing: ../core/test/data/blackbox/ean13-5/16.png ... FAILED
Expected: 9780446579803 Expected: 9780446579803
Detected: zxing::ReaderException: No code detected Detected: zxing::ReaderException: No code detected
@ -593,7 +593,7 @@ Processing: ../core/test/data/blackbox/upca-4/6.jpg ... FAILED
Detected: zxing::ReaderException: No code detected Detected: zxing::ReaderException: No code detected
Processing: ../core/test/data/blackbox/upca-4/7.jpg ... FAILED Processing: ../core/test/data/blackbox/upca-4/7.jpg ... FAILED
Expected: 023942431015 Expected: 023942431015
Detected: zxing::ReaderException: No code detected Detected: zxing::IllegalArgumentException: Invalid position (ReedSolomonDecoder)
Processing: ../core/test/data/blackbox/upca-4/8.jpg ... passed. Processing: ../core/test/data/blackbox/upca-4/8.jpg ... passed.
Processing: ../core/test/data/blackbox/upca-4/9.jpg ... FAILED Processing: ../core/test/data/blackbox/upca-4/9.jpg ... FAILED
Expected: 060410049235 Expected: 060410049235
@ -1039,7 +1039,7 @@ Processing: ../core/test/data/blackbox/aztec-2/08.png ... FAILED
Detected: zxing::ReaderException: No code detected Detected: zxing::ReaderException: No code detected
Processing: ../core/test/data/blackbox/aztec-2/09.png ... FAILED Processing: ../core/test/data/blackbox/aztec-2/09.png ... FAILED
Expected: mailto:zxing@googlegroups.com Expected: mailto:zxing@googlegroups.com
Detected: zxing::ReaderException: No code detected Detected: zxing::IllegalArgumentException: Invalid position (ReedSolomonDecoder)
Processing: ../core/test/data/blackbox/aztec-2/10.png ... FAILED Processing: ../core/test/data/blackbox/aztec-2/10.png ... FAILED
Expected: mailto:zxing@googlegroups.com Expected: mailto:zxing@googlegroups.com
Detected: zxing::ReaderException: No code detected Detected: zxing::ReaderException: No code detected

4
cpp/core/src/zxing/datamatrix/detector/Detector.cpp
View file

@ -288,7 +288,7 @@ Ref<ResultPoint> Detector::correctTopRight(Ref<ResultPoint> bottomLeft,
Ref<ResultPoint> bottomRight, Ref<ResultPoint> topLeft, Ref<ResultPoint> topRight, Ref<ResultPoint> bottomRight, Ref<ResultPoint> topLeft, Ref<ResultPoint> topRight,
int dimension) { int dimension) {
float corr = distance(bottomLeft, topLeft) / (float) dimension; float corr = distance(bottomLeft, bottomRight) / (float) dimension;
int norm = distance(topLeft, topRight); int norm = distance(topLeft, topRight);
float cos = (topRight->getX() - topLeft->getX()) / norm; float cos = (topRight->getX() - topLeft->getX()) / norm;
float sin = (topRight->getY() - topLeft->getY()) / norm; float sin = (topRight->getY() - topLeft->getY()) / norm;
@ -296,7 +296,7 @@ Ref<ResultPoint> Detector::correctTopRight(Ref<ResultPoint> bottomLeft,
Ref<ResultPoint> c1( Ref<ResultPoint> c1(
new ResultPoint(topRight->getX() + corr * cos, topRight->getY() + corr * sin)); new ResultPoint(topRight->getX() + corr * cos, topRight->getY() + corr * sin));
corr = distance(bottomLeft, bottomRight) / (float) dimension; corr = distance(bottomLeft, topLeft) / (float) dimension;
norm = distance(bottomRight, topRight); norm = distance(bottomRight, topRight);
cos = (topRight->getX() - bottomRight->getX()) / norm; cos = (topRight->getX() - bottomRight->getX()) / norm;
sin = (topRight->getY() - bottomRight->getY()) / norm; sin = (topRight->getY() - bottomRight->getY()) / norm;