From d722da86883c70e0a913f78d8431b7b86e4920c4 Mon Sep 17 00:00:00 2001 From: Stefan Brand Date: Tue, 1 Jul 2014 16:09:14 +0200 Subject: [PATCH] Added a harbour-compatible QR-Code Reader --- harbour-sailotp.pro | 3 +- qml/pages/ScanOTP.qml | 5 +- rpm/harbour-sailotp.changes | 2 + rpm/harbour-sailotp.yaml | 11 +- src/FileIO/FileIO.pri | 2 +- src/qzxing/CameraImageWrapper.cpp | 76 +- src/qzxing/CameraImageWrapper.h | 16 +- src/qzxing/QZXing.pri | 448 ++-- src/qzxing/imagehandler.cpp | 44 - src/qzxing/imagehandler.h | 23 - src/qzxing/qzxing.cpp | 217 +- src/qzxing/qzxing.h | 147 +- .../{QZXing_global.h => qzxing_global.h} | 3 +- .../zxing/{zxing => }/BarcodeFormat.cpp | 35 +- src/qzxing/zxing/{zxing => }/BarcodeFormat.h | 48 +- src/qzxing/zxing/{zxing => }/Binarizer.cpp | 8 - src/qzxing/zxing/{zxing => }/Binarizer.h | 4 - src/qzxing/zxing/BinaryBitmap.cpp | 67 + src/qzxing/zxing/{zxing => }/BinaryBitmap.h | 1 + src/qzxing/zxing/DecodeHints.cpp | 120 + src/qzxing/zxing/DecodeHints.h | 72 + src/qzxing/zxing/{zxing => }/Exception.cpp | 27 +- src/qzxing/zxing/{zxing => }/Exception.h | 21 +- .../zxing/{zxing => }/FormatException.cpp | 6 - .../zxing/{zxing => }/FormatException.h | 2 - .../zxing/{zxing => }/LuminanceSource.cpp | 34 +- .../zxing/{zxing => }/LuminanceSource.h | 27 +- src/qzxing/zxing/MultiFormatReader.cpp | 106 + .../zxing/{zxing => }/MultiFormatReader.h | 1 + ...cksumException.h => NotFoundException.cpp} | 22 +- .../zxing/{zxing => }/NotFoundException.h | 12 +- src/qzxing/zxing/{zxing => }/Reader.cpp | 0 src/qzxing/zxing/{zxing => }/Reader.h | 0 ...cksumException.cpp => ReaderException.cpp} | 21 +- .../zxing/{zxing => }/ReaderException.h | 10 +- src/qzxing/zxing/{zxing => }/Result.cpp | 33 +- src/qzxing/zxing/{zxing => }/Result.h | 15 +- src/qzxing/zxing/{zxing => }/ResultPoint.cpp | 14 +- src/qzxing/zxing/{zxing => }/ResultPoint.h | 5 +- .../zxing/{zxing => }/ResultPointCallback.cpp | 0 .../zxing/{zxing => }/ResultPointCallback.h | 0 .../{zxing => }/aztec/AztecDetectorResult.cpp | 49 +- .../{zxing => }/aztec/AztecDetectorResult.h | 30 +- src/qzxing/zxing/aztec/AztecReader.cpp | 64 + .../zxing/{zxing => }/aztec/AztecReader.h | 26 +- .../zxing/aztec/decoder/AztecDecoder.cpp | 496 ++++ src/qzxing/zxing/aztec/decoder/Decoder.h | 63 + .../aztec/detector/AztecDetector.cpp | 203 +- src/qzxing/zxing/aztec/detector/Detector.h | 87 + src/qzxing/zxing/bigint/BigInteger.cc | 405 ---- src/qzxing/zxing/bigint/BigInteger.hh | 215 -- .../zxing/bigint/BigIntegerAlgorithms.cc | 70 - .../zxing/bigint/BigIntegerAlgorithms.hh | 25 - src/qzxing/zxing/bigint/BigIntegerLibrary.hh | 8 - src/qzxing/zxing/bigint/BigIntegerUtils.cc | 50 - src/qzxing/zxing/bigint/BigIntegerUtils.hh | 72 - src/qzxing/zxing/bigint/BigUnsigned.cc | 697 ------ src/qzxing/zxing/bigint/BigUnsigned.hh | 418 ---- src/qzxing/zxing/bigint/BigUnsignedInABase.cc | 125 - src/qzxing/zxing/bigint/BigUnsignedInABase.hh | 122 - src/qzxing/zxing/bigint/ChangeLog | 146 -- src/qzxing/zxing/bigint/NumberlikeArray.hh | 177 -- src/qzxing/zxing/bigint/README | 71 - .../detector/JavaMath.h => common/Array.cpp} | 33 +- src/qzxing/zxing/{zxing => }/common/Array.h | 98 +- src/qzxing/zxing/common/BitArray.cpp | 127 + .../zxing/{zxing => }/common/BitArray.h | 61 +- src/qzxing/zxing/common/BitMatrix.cpp | 157 ++ .../zxing/{zxing => }/common/BitMatrix.h | 48 +- .../zxing/{zxing => }/common/BitSource.cpp | 12 +- .../zxing/{zxing => }/common/BitSource.h | 6 +- .../{zxing => }/common/CharacterSetECI.cpp | 0 .../{zxing => }/common/CharacterSetECI.h | 10 +- .../BitArrayIO.cpp => common/Counted.cpp} | 27 +- src/qzxing/zxing/{zxing => }/common/Counted.h | 64 +- .../{zxing => }/common/DecoderResult.cpp | 8 +- .../zxing/{zxing => }/common/DecoderResult.h | 12 +- .../{zxing => }/common/DetectorResult.cpp | 7 +- .../zxing/{zxing => }/common/DetectorResult.h | 8 +- src/qzxing/zxing/common/EdgeDetector.cpp | 191 ++ src/qzxing/zxing/common/EdgeDetector.h | 38 + .../zxing/common/GlobalHistogramBinarizer.cpp | 209 ++ .../common/GlobalHistogramBinarizer.h | 35 +- .../zxing/common/GreyscaleLuminanceSource.cpp | 70 + .../common/GreyscaleLuminanceSource.h | 39 +- .../GreyscaleRotatedLuminanceSource.cpp | 65 + .../common/GreyscaleRotatedLuminanceSource.h | 34 +- .../zxing/{zxing => }/common/GridSampler.cpp | 4 +- .../zxing/{zxing => }/common/GridSampler.h | 0 .../{zxing => }/common/HybridBinarizer.cpp | 95 +- .../{zxing => }/common/HybridBinarizer.h | 27 +- .../common/IllegalArgumentException.cpp | 12 +- .../common/IllegalArgumentException.h | 5 +- .../common/PerspectiveTransform.cpp | 0 .../{zxing => }/common/PerspectiveTransform.h | 0 src/qzxing/zxing/{zxing => }/common/Point.h | 0 .../{zxing/ResultIO.cpp => common/Str.cpp} | 28 +- src/qzxing/zxing/{zxing => }/common/Str.h | 17 +- .../zxing/{zxing => }/common/StringUtils.cpp | 4 +- .../zxing/{zxing => }/common/StringUtils.h | 12 +- .../detector/MonochromeRectangleDetector.cpp | 171 ++ .../detector/MonochromeRectangleDetector.h | 18 +- .../detector/WhiteRectangleDetector.cpp | 44 +- .../common/detector/WhiteRectangleDetector.h | 4 +- .../common/reedsolomon/GenericGF.cpp | 83 +- .../common/reedsolomon/GenericGF.h | 27 +- .../common/reedsolomon/GenericGFPoly.cpp | 31 +- .../common/reedsolomon/GenericGFPoly.h | 42 +- .../common/reedsolomon/ReedSolomonDecoder.cpp | 97 +- .../common/reedsolomon/ReedSolomonDecoder.h | 5 +- .../reedsolomon/ReedSolomonException.cpp | 0 .../common/reedsolomon/ReedSolomonException.h | 0 .../datamatrix/DataMatrixReader.cpp | 38 +- .../{zxing => }/datamatrix/DataMatrixReader.h | 0 .../datamatrix/DataMatrixVersion.cpp | 0 .../zxing/{zxing => }/datamatrix/Version.h | 0 .../datamatrix/decoder/BitMatrixParser.h | 2 +- .../datamatrix/decoder/DataBlock.h | 8 +- .../decoder/DataMatrixBitMatrixParser.cpp | 24 +- .../decoder/DataMatrixDataBlock.cpp | 16 +- .../DataMatrixDecodedBitStreamParser.cpp | 45 +- .../datamatrix/decoder/DataMatrixDecoder.cpp | 33 +- .../decoder/DecodedBitStreamParser.h | 14 +- .../{zxing => }/datamatrix/decoder/Decoder.h | 2 +- .../datamatrix/detector/CornerPoint.h | 0 .../detector/DataMatrixCornerPoint.cpp | 0 .../detector/DataMatrixDetector.cpp | 178 +- .../detector/DataMatrixDetectorException.cpp | 0 .../DataMatrixMonochromeRectangleDetector.cpp | 172 ++ .../datamatrix/detector/Detector.h | 0 .../datamatrix/detector/DetectorException.h | 0 .../detector/MonochromeRectangleDetector.h | 61 + .../{zxing => }/multi/ByQuadrantReader.cpp | 12 +- .../{zxing => }/multi/ByQuadrantReader.h | 6 +- .../multi/GenericMultipleBarcodeReader.cpp | 128 ++ .../multi/GenericMultipleBarcodeReader.h | 40 +- .../multi/MultipleBarcodeReader.cpp | 0 .../{zxing => }/multi/MultipleBarcodeReader.h | 6 +- .../multi/qrcode/QRCodeMultiReader.cpp | 9 +- .../multi/qrcode/QRCodeMultiReader.h | 6 +- .../multi/qrcode/detector/MultiDetector.cpp | 3 +- .../multi/qrcode/detector/MultiDetector.h | 6 +- .../detector/MultiFinderPatternFinder.cpp | 108 +- .../detector/MultiFinderPatternFinder.h | 2 - src/qzxing/zxing/oned/Code128Reader.cpp | 490 ++++ src/qzxing/zxing/oned/Code128Reader.h | 60 + src/qzxing/zxing/oned/Code39Reader.cpp | 348 +++ src/qzxing/zxing/oned/Code39Reader.h | 58 + src/qzxing/zxing/oned/EAN13Reader.cpp | 99 + .../zxing/{zxing => }/oned/EAN13Reader.h | 27 +- src/qzxing/zxing/oned/EAN8Reader.cpp | 72 + .../zxing/{zxing => }/oned/EAN8Reader.h | 24 +- src/qzxing/zxing/oned/ITFReader.cpp | 367 +++ src/qzxing/zxing/oned/ITFReader.h | 53 + .../zxing/oned/MultiFormatOneDReader.cpp | 66 + .../{zxing => }/oned/MultiFormatOneDReader.h | 0 .../zxing/oned/MultiFormatUPCEANReader.cpp | 87 + .../oned/MultiFormatUPCEANReader.h | 21 +- src/qzxing/zxing/oned/OneDReader.cpp | 207 ++ src/qzxing/zxing/oned/OneDReader.h | 50 + .../{zxing => }/oned/OneDResultPoint.cpp | 0 .../zxing/{zxing => }/oned/OneDResultPoint.h | 0 src/qzxing/zxing/oned/UPCAReader.cpp | 65 + .../zxing/{zxing => }/oned/UPCAReader.h | 33 +- src/qzxing/zxing/oned/UPCEANReader.cpp | 311 +++ src/qzxing/zxing/oned/UPCEANReader.h | 75 + src/qzxing/zxing/oned/UPCEReader.cpp | 147 ++ .../zxing/{zxing => }/oned/UPCEReader.h | 33 +- .../{zxing => }/qrcode/ErrorCorrectionLevel.h | 0 .../{zxing => }/qrcode/FormatInformation.h | 6 +- .../zxing/{zxing => }/qrcode/QRCodeReader.cpp | 38 +- .../zxing/{zxing => }/qrcode/QRCodeReader.h | 25 +- .../qrcode/QRErrorCorrectionLevel.cpp | 0 .../qrcode/QRFormatInformation.cpp | 7 +- .../zxing/{zxing => }/qrcode/QRVersion.cpp | 21 +- src/qzxing/zxing/{zxing => }/qrcode/Version.h | 0 .../qrcode/decoder/BitMatrixParser.h | 2 +- .../{zxing => }/qrcode/decoder/DataBlock.h | 8 +- .../{zxing => }/qrcode/decoder/DataMask.h | 0 .../qrcode/decoder/DecodedBitStreamParser.h | 6 +- .../{zxing => }/qrcode/decoder/Decoder.h | 2 +- .../zxing/{zxing => }/qrcode/decoder/Mode.h | 1 + .../qrcode/decoder/QRBitMatrixParser.cpp | 17 +- .../qrcode/decoder/QRDataBlock.cpp | 16 +- .../{zxing => }/qrcode/decoder/QRDataMask.cpp | 0 .../decoder/QRDecodedBitStreamParser.cpp | 416 ++++ .../{zxing => }/qrcode/decoder/QRDecoder.cpp | 33 +- .../{zxing => }/qrcode/decoder/QRMode.cpp | 64 +- .../qrcode/detector/AlignmentPattern.h | 0 .../qrcode/detector/AlignmentPatternFinder.h | 14 +- .../{zxing => }/qrcode/detector/Detector.h | 9 +- .../qrcode/detector/FinderPattern.h | 3 +- .../qrcode/detector/FinderPatternFinder.h | 5 - .../qrcode/detector/FinderPatternInfo.h | 0 .../qrcode/detector/QRAlignmentPattern.cpp | 12 +- .../detector/QRAlignmentPatternFinder.cpp | 61 +- .../qrcode/detector/QRDetector.cpp | 218 +- .../zxing/qrcode/detector/QREdgeDetector.cpp | 168 ++ .../zxing/qrcode/detector/QREdgeDetector.h | 48 + .../zxing/qrcode/detector/QRFinderPattern.cpp | 71 + .../qrcode/detector/QRFinderPatternFinder.cpp | 70 +- .../qrcode/detector/QRFinderPatternInfo.cpp | 0 src/qzxing/zxing/win32/zxing/iconv.h | 14 - src/qzxing/zxing/win32/zxing/stdint/stdint.h | 247 -- src/qzxing/zxing/win32/zxing/win_iconv.c | 2035 ----------------- src/qzxing/zxing/zxing/BinaryBitmap.cpp | 70 - src/qzxing/zxing/zxing/DecodeHints.cpp | 144 -- src/qzxing/zxing/zxing/DecodeHints.h | 85 - .../zxing/zxing/IllegalStateException.h | 35 - .../zxing/zxing/InvertedLuminanceSource.cpp | 68 - .../zxing/zxing/InvertedLuminanceSource.h | 48 - src/qzxing/zxing/zxing/MultiFormatReader.cpp | 124 - src/qzxing/zxing/zxing/ZXing.h | 147 -- src/qzxing/zxing/zxing/aztec/AztecReader.cpp | 68 - .../zxing/aztec/decoder/AztecDecoder.cpp | 499 ---- .../zxing/zxing/aztec/decoder/Decoder.h | 69 - .../zxing/zxing/aztec/detector/Detector.h | 92 - src/qzxing/zxing/zxing/common/BitArray.cpp | 155 -- src/qzxing/zxing/zxing/common/BitMatrix.cpp | 143 -- .../zxing/common/GlobalHistogramBinarizer.cpp | 212 -- .../zxing/common/GreyscaleLuminanceSource.cpp | 80 - .../GreyscaleRotatedLuminanceSource.cpp | 81 - src/qzxing/zxing/zxing/common/Str.cpp | 61 - .../zxing/zxing/common/detector/MathUtils.h | 57 - .../detector/MonochromeRectangleDetector.cpp | 174 -- .../multi/GenericMultipleBarcodeReader.cpp | 137 -- src/qzxing/zxing/zxing/oned/CodaBarReader.cpp | 340 --- src/qzxing/zxing/zxing/oned/CodaBarReader.h | 57 - src/qzxing/zxing/zxing/oned/Code128Reader.cpp | 494 ---- src/qzxing/zxing/zxing/oned/Code128Reader.h | 48 - src/qzxing/zxing/zxing/oned/Code39Reader.cpp | 328 --- src/qzxing/zxing/zxing/oned/Code39Reader.h | 63 - src/qzxing/zxing/zxing/oned/Code93Reader.cpp | 287 --- src/qzxing/zxing/zxing/oned/Code93Reader.h | 58 - src/qzxing/zxing/zxing/oned/EAN13Reader.cpp | 85 - src/qzxing/zxing/zxing/oned/EAN8Reader.cpp | 65 - src/qzxing/zxing/zxing/oned/ITFReader.cpp | 337 --- src/qzxing/zxing/zxing/oned/ITFReader.h | 54 - .../zxing/oned/MultiFormatOneDReader.cpp | 96 - .../zxing/oned/MultiFormatUPCEANReader.cpp | 110 - src/qzxing/zxing/zxing/oned/OneDReader.cpp | 227 -- src/qzxing/zxing/zxing/oned/OneDReader.h | 81 - src/qzxing/zxing/zxing/oned/UPCAReader.cpp | 71 - src/qzxing/zxing/zxing/oned/UPCEANReader.cpp | 302 --- src/qzxing/zxing/zxing/oned/UPCEANReader.h | 88 - src/qzxing/zxing/zxing/oned/UPCEReader.cpp | 148 -- .../zxing/zxing/pdf417/PDF417Reader.cpp | 170 -- src/qzxing/zxing/zxing/pdf417/PDF417Reader.h | 49 - .../zxing/pdf417/decoder/BitMatrixParser.h | 84 - .../pdf417/decoder/DecodedBitStreamParser.h | 84 - .../zxing/zxing/pdf417/decoder/Decoder.h | 62 - .../pdf417/decoder/PDF417BitMatrixParser.cpp | 997 -------- .../decoder/PDF417DecodedBitStreamParser.cpp | 563 ----- .../zxing/pdf417/decoder/PDF417Decoder.cpp | 118 - .../pdf417/decoder/ec/ErrorCorrection.cpp | 214 -- .../zxing/pdf417/decoder/ec/ErrorCorrection.h | 71 - .../zxing/pdf417/decoder/ec/ModulusGF.cpp | 120 - .../zxing/zxing/pdf417/decoder/ec/ModulusGF.h | 72 - .../zxing/pdf417/decoder/ec/ModulusPoly.cpp | 284 --- .../zxing/pdf417/decoder/ec/ModulusPoly.h | 68 - .../zxing/zxing/pdf417/detector/Detector.h | 106 - .../zxing/pdf417/detector/LinesSampler.cpp | 713 ------ .../zxing/pdf417/detector/LinesSampler.h | 122 - .../zxing/pdf417/detector/PDF417Detector.cpp | 664 ------ .../decoder/QRDecodedBitStreamParser.cpp | 430 ---- .../zxing/qrcode/detector/QRFinderPattern.cpp | 69 - 266 files changed, 7611 insertions(+), 17998 deletions(-) create mode 100644 rpm/harbour-sailotp.changes delete mode 100644 src/qzxing/imagehandler.cpp delete mode 100644 src/qzxing/imagehandler.h rename src/qzxing/{QZXing_global.h => qzxing_global.h} (79%) rename src/qzxing/zxing/{zxing => }/BarcodeFormat.cpp (70%) rename src/qzxing/zxing/{zxing => }/BarcodeFormat.h (60%) rename src/qzxing/zxing/{zxing => }/Binarizer.cpp (84%) rename src/qzxing/zxing/{zxing => }/Binarizer.h (92%) create mode 100644 src/qzxing/zxing/BinaryBitmap.cpp rename src/qzxing/zxing/{zxing => }/BinaryBitmap.h (95%) create mode 100644 src/qzxing/zxing/DecodeHints.cpp create mode 100644 src/qzxing/zxing/DecodeHints.h rename src/qzxing/zxing/{zxing => }/Exception.cpp (68%) rename src/qzxing/zxing/{zxing => }/Exception.h (59%) rename src/qzxing/zxing/{zxing => }/FormatException.cpp (86%) rename src/qzxing/zxing/{zxing => }/FormatException.h (91%) rename src/qzxing/zxing/{zxing => }/LuminanceSource.cpp (57%) rename src/qzxing/zxing/{zxing => }/LuminanceSource.h (68%) create mode 100644 src/qzxing/zxing/MultiFormatReader.cpp rename src/qzxing/zxing/{zxing => }/MultiFormatReader.h (96%) rename src/qzxing/zxing/{zxing/ChecksumException.h => NotFoundException.cpp} (64%) rename src/qzxing/zxing/{zxing => }/NotFoundException.h (78%) rename src/qzxing/zxing/{zxing => }/Reader.cpp (100%) rename src/qzxing/zxing/{zxing => }/Reader.h (100%) rename src/qzxing/zxing/{zxing/ChecksumException.cpp => ReaderException.cpp} (65%) rename src/qzxing/zxing/{zxing => }/ReaderException.h (77%) rename src/qzxing/zxing/{zxing => }/Result.cpp (62%) rename src/qzxing/zxing/{zxing => }/Result.h (73%) rename src/qzxing/zxing/{zxing => }/ResultPoint.cpp (84%) rename src/qzxing/zxing/{zxing => }/ResultPoint.h (92%) rename src/qzxing/zxing/{zxing => }/ResultPointCallback.cpp (100%) rename src/qzxing/zxing/{zxing => }/ResultPointCallback.h (100%) rename src/qzxing/zxing/{zxing => }/aztec/AztecDetectorResult.cpp (51%) rename src/qzxing/zxing/{zxing => }/aztec/AztecDetectorResult.h (66%) create mode 100644 src/qzxing/zxing/aztec/AztecReader.cpp rename src/qzxing/zxing/{zxing => }/aztec/AztecReader.h (68%) create mode 100644 src/qzxing/zxing/aztec/decoder/AztecDecoder.cpp create mode 100644 src/qzxing/zxing/aztec/decoder/Decoder.h rename src/qzxing/zxing/{zxing => }/aztec/detector/AztecDetector.cpp (67%) create mode 100644 src/qzxing/zxing/aztec/detector/Detector.h delete mode 100644 src/qzxing/zxing/bigint/BigInteger.cc delete mode 100644 src/qzxing/zxing/bigint/BigInteger.hh delete mode 100644 src/qzxing/zxing/bigint/BigIntegerAlgorithms.cc delete mode 100644 src/qzxing/zxing/bigint/BigIntegerAlgorithms.hh delete mode 100644 src/qzxing/zxing/bigint/BigIntegerLibrary.hh delete mode 100644 src/qzxing/zxing/bigint/BigIntegerUtils.cc delete mode 100644 src/qzxing/zxing/bigint/BigIntegerUtils.hh delete mode 100644 src/qzxing/zxing/bigint/BigUnsigned.cc delete mode 100644 src/qzxing/zxing/bigint/BigUnsigned.hh delete mode 100644 src/qzxing/zxing/bigint/BigUnsignedInABase.cc delete mode 100644 src/qzxing/zxing/bigint/BigUnsignedInABase.hh delete mode 100644 src/qzxing/zxing/bigint/ChangeLog delete mode 100644 src/qzxing/zxing/bigint/NumberlikeArray.hh delete mode 100644 src/qzxing/zxing/bigint/README rename src/qzxing/zxing/{zxing/common/detector/JavaMath.h => common/Array.cpp} (52%) rename src/qzxing/zxing/{zxing => }/common/Array.h (53%) create mode 100644 src/qzxing/zxing/common/BitArray.cpp rename src/qzxing/zxing/{zxing => }/common/BitArray.h (51%) create mode 100644 src/qzxing/zxing/common/BitMatrix.cpp rename src/qzxing/zxing/{zxing => }/common/BitMatrix.h (60%) rename src/qzxing/zxing/{zxing => }/common/BitSource.cpp (82%) rename src/qzxing/zxing/{zxing => }/common/BitSource.h (92%) rename src/qzxing/zxing/{zxing => }/common/CharacterSetECI.cpp (100%) rename src/qzxing/zxing/{zxing => }/common/CharacterSetECI.h (90%) rename src/qzxing/zxing/{zxing/common/BitArrayIO.cpp => common/Counted.cpp} (55%) rename src/qzxing/zxing/{zxing => }/common/Counted.h (57%) rename src/qzxing/zxing/{zxing => }/common/DecoderResult.cpp (80%) rename src/qzxing/zxing/{zxing => }/common/DecoderResult.h (74%) rename src/qzxing/zxing/{zxing => }/common/DetectorResult.cpp (78%) rename src/qzxing/zxing/{zxing => }/common/DetectorResult.h (81%) create mode 100644 src/qzxing/zxing/common/EdgeDetector.cpp create mode 100644 src/qzxing/zxing/common/EdgeDetector.h create mode 100644 src/qzxing/zxing/common/GlobalHistogramBinarizer.cpp rename src/qzxing/zxing/{zxing => }/common/GlobalHistogramBinarizer.h (58%) create mode 100644 src/qzxing/zxing/common/GreyscaleLuminanceSource.cpp rename src/qzxing/zxing/{zxing => }/common/GreyscaleLuminanceSource.h (62%) create mode 100644 src/qzxing/zxing/common/GreyscaleRotatedLuminanceSource.cpp rename src/qzxing/zxing/{zxing => }/common/GreyscaleRotatedLuminanceSource.h (66%) rename src/qzxing/zxing/{zxing => }/common/GridSampler.cpp (95%) rename src/qzxing/zxing/{zxing => }/common/GridSampler.h (100%) rename src/qzxing/zxing/{zxing => }/common/HybridBinarizer.cpp (67%) rename src/qzxing/zxing/{zxing => }/common/HybridBinarizer.h (69%) rename src/qzxing/zxing/{zxing => }/common/IllegalArgumentException.cpp (78%) rename src/qzxing/zxing/{zxing => }/common/IllegalArgumentException.h (88%) rename src/qzxing/zxing/{zxing => }/common/PerspectiveTransform.cpp (100%) rename src/qzxing/zxing/{zxing => }/common/PerspectiveTransform.h (100%) rename src/qzxing/zxing/{zxing => }/common/Point.h (100%) rename src/qzxing/zxing/{zxing/ResultIO.cpp => common/Str.cpp} (59%) rename src/qzxing/zxing/{zxing => }/common/Str.h (61%) rename src/qzxing/zxing/{zxing => }/common/StringUtils.cpp (95%) rename src/qzxing/zxing/{zxing => }/common/StringUtils.h (84%) create mode 100644 src/qzxing/zxing/common/detector/MonochromeRectangleDetector.cpp rename src/qzxing/zxing/{zxing => }/common/detector/MonochromeRectangleDetector.h (82%) rename src/qzxing/zxing/{zxing => }/common/detector/WhiteRectangleDetector.cpp (88%) rename src/qzxing/zxing/{zxing => }/common/detector/WhiteRectangleDetector.h (87%) rename src/qzxing/zxing/{zxing => }/common/reedsolomon/GenericGF.cpp (62%) rename src/qzxing/zxing/{zxing => }/common/reedsolomon/GenericGF.h (76%) rename src/qzxing/zxing/{zxing => }/common/reedsolomon/GenericGFPoly.cpp (87%) rename src/qzxing/zxing/{zxing => }/common/reedsolomon/GenericGFPoly.h (54%) rename src/qzxing/zxing/{zxing => }/common/reedsolomon/ReedSolomonDecoder.cpp (68%) rename src/qzxing/zxing/{zxing => }/common/reedsolomon/ReedSolomonDecoder.h (93%) rename src/qzxing/zxing/{zxing => }/common/reedsolomon/ReedSolomonException.cpp (100%) rename src/qzxing/zxing/{zxing => }/common/reedsolomon/ReedSolomonException.h (100%) rename src/qzxing/zxing/{zxing => }/datamatrix/DataMatrixReader.cpp (58%) rename src/qzxing/zxing/{zxing => }/datamatrix/DataMatrixReader.h (100%) rename src/qzxing/zxing/{zxing => }/datamatrix/DataMatrixVersion.cpp (100%) rename src/qzxing/zxing/{zxing => }/datamatrix/Version.h (100%) rename src/qzxing/zxing/{zxing => }/datamatrix/decoder/BitMatrixParser.h (94%) rename src/qzxing/zxing/{zxing => }/datamatrix/decoder/DataBlock.h (77%) rename src/qzxing/zxing/{zxing => }/datamatrix/decoder/DataMatrixBitMatrixParser.cpp (90%) rename src/qzxing/zxing/{zxing => }/datamatrix/decoder/DataMatrixDataBlock.cpp (84%) rename src/qzxing/zxing/{zxing => }/datamatrix/decoder/DataMatrixDecodedBitStreamParser.cpp (90%) rename src/qzxing/zxing/{zxing => }/datamatrix/decoder/DataMatrixDecoder.cpp (78%) rename src/qzxing/zxing/{zxing => }/datamatrix/decoder/DecodedBitStreamParser.h (83%) rename src/qzxing/zxing/{zxing => }/datamatrix/decoder/Decoder.h (90%) rename src/qzxing/zxing/{zxing => }/datamatrix/detector/CornerPoint.h (100%) rename src/qzxing/zxing/{zxing => }/datamatrix/detector/DataMatrixCornerPoint.cpp (100%) rename src/qzxing/zxing/{zxing => }/datamatrix/detector/DataMatrixDetector.cpp (69%) rename src/qzxing/zxing/{zxing => }/datamatrix/detector/DataMatrixDetectorException.cpp (100%) create mode 100644 src/qzxing/zxing/datamatrix/detector/DataMatrixMonochromeRectangleDetector.cpp rename src/qzxing/zxing/{zxing => }/datamatrix/detector/Detector.h (100%) rename src/qzxing/zxing/{zxing => }/datamatrix/detector/DetectorException.h (100%) create mode 100644 src/qzxing/zxing/datamatrix/detector/MonochromeRectangleDetector.h rename src/qzxing/zxing/{zxing => }/multi/ByQuadrantReader.cpp (87%) rename src/qzxing/zxing/{zxing => }/multi/ByQuadrantReader.h (92%) create mode 100644 src/qzxing/zxing/multi/GenericMultipleBarcodeReader.cpp rename src/qzxing/zxing/{zxing => }/multi/GenericMultipleBarcodeReader.h (51%) rename src/qzxing/zxing/{zxing => }/multi/MultipleBarcodeReader.cpp (100%) rename src/qzxing/zxing/{zxing => }/multi/MultipleBarcodeReader.h (92%) rename src/qzxing/zxing/{zxing => }/multi/qrcode/QRCodeMultiReader.cpp (88%) rename src/qzxing/zxing/{zxing => }/multi/qrcode/QRCodeMultiReader.h (92%) rename src/qzxing/zxing/{zxing => }/multi/qrcode/detector/MultiDetector.cpp (93%) rename src/qzxing/zxing/{zxing => }/multi/qrcode/detector/MultiDetector.h (92%) rename src/qzxing/zxing/{zxing => }/multi/qrcode/detector/MultiFinderPatternFinder.cpp (69%) rename src/qzxing/zxing/{zxing => }/multi/qrcode/detector/MultiFinderPatternFinder.h (96%) create mode 100644 src/qzxing/zxing/oned/Code128Reader.cpp create mode 100644 src/qzxing/zxing/oned/Code128Reader.h create mode 100644 src/qzxing/zxing/oned/Code39Reader.cpp create mode 100644 src/qzxing/zxing/oned/Code39Reader.h create mode 100644 src/qzxing/zxing/oned/EAN13Reader.cpp rename src/qzxing/zxing/{zxing => }/oned/EAN13Reader.h (59%) create mode 100644 src/qzxing/zxing/oned/EAN8Reader.cpp rename src/qzxing/zxing/{zxing => }/oned/EAN8Reader.h (65%) create mode 100644 src/qzxing/zxing/oned/ITFReader.cpp create mode 100644 src/qzxing/zxing/oned/ITFReader.h create mode 100644 src/qzxing/zxing/oned/MultiFormatOneDReader.cpp rename src/qzxing/zxing/{zxing => }/oned/MultiFormatOneDReader.h (100%) create mode 100644 src/qzxing/zxing/oned/MultiFormatUPCEANReader.cpp rename src/qzxing/zxing/{zxing => }/oned/MultiFormatUPCEANReader.h (68%) create mode 100644 src/qzxing/zxing/oned/OneDReader.cpp create mode 100644 src/qzxing/zxing/oned/OneDReader.h rename src/qzxing/zxing/{zxing => }/oned/OneDResultPoint.cpp (100%) rename src/qzxing/zxing/{zxing => }/oned/OneDResultPoint.h (100%) create mode 100644 src/qzxing/zxing/oned/UPCAReader.cpp rename src/qzxing/zxing/{zxing => }/oned/UPCAReader.h (54%) create mode 100644 src/qzxing/zxing/oned/UPCEANReader.cpp create mode 100644 src/qzxing/zxing/oned/UPCEANReader.h create mode 100644 src/qzxing/zxing/oned/UPCEReader.cpp rename src/qzxing/zxing/{zxing => }/oned/UPCEReader.h (54%) rename src/qzxing/zxing/{zxing => }/qrcode/ErrorCorrectionLevel.h (100%) rename src/qzxing/zxing/{zxing => }/qrcode/FormatInformation.h (90%) rename src/qzxing/zxing/{zxing => }/qrcode/QRCodeReader.cpp (59%) rename src/qzxing/zxing/{zxing => }/qrcode/QRCodeReader.h (74%) rename src/qzxing/zxing/{zxing => }/qrcode/QRErrorCorrectionLevel.cpp (100%) rename src/qzxing/zxing/{zxing => }/qrcode/QRFormatInformation.cpp (93%) rename src/qzxing/zxing/{zxing => }/qrcode/QRVersion.cpp (97%) rename src/qzxing/zxing/{zxing => }/qrcode/Version.h (100%) rename src/qzxing/zxing/{zxing => }/qrcode/decoder/BitMatrixParser.h (93%) rename src/qzxing/zxing/{zxing => }/qrcode/decoder/DataBlock.h (78%) rename src/qzxing/zxing/{zxing => }/qrcode/decoder/DataMask.h (100%) rename src/qzxing/zxing/{zxing => }/qrcode/decoder/DecodedBitStreamParser.h (88%) rename src/qzxing/zxing/{zxing => }/qrcode/decoder/Decoder.h (90%) rename src/qzxing/zxing/{zxing => }/qrcode/decoder/Mode.h (95%) rename src/qzxing/zxing/{zxing => }/qrcode/decoder/QRBitMatrixParser.cpp (89%) rename src/qzxing/zxing/{zxing => }/qrcode/decoder/QRDataBlock.cpp (84%) rename src/qzxing/zxing/{zxing => }/qrcode/decoder/QRDataMask.cpp (100%) create mode 100644 src/qzxing/zxing/qrcode/decoder/QRDecodedBitStreamParser.cpp rename src/qzxing/zxing/{zxing => }/qrcode/decoder/QRDecoder.cpp (76%) rename src/qzxing/zxing/{zxing => }/qrcode/decoder/QRMode.cpp (65%) rename src/qzxing/zxing/{zxing => }/qrcode/detector/AlignmentPattern.h (100%) rename src/qzxing/zxing/{zxing => }/qrcode/detector/AlignmentPatternFinder.h (82%) rename src/qzxing/zxing/{zxing => }/qrcode/detector/Detector.h (89%) rename src/qzxing/zxing/{zxing => }/qrcode/detector/FinderPattern.h (96%) rename src/qzxing/zxing/{zxing => }/qrcode/detector/FinderPatternFinder.h (90%) rename src/qzxing/zxing/{zxing => }/qrcode/detector/FinderPatternInfo.h (100%) rename src/qzxing/zxing/{zxing => }/qrcode/detector/QRAlignmentPattern.cpp (89%) rename src/qzxing/zxing/{zxing => }/qrcode/detector/QRAlignmentPatternFinder.cpp (81%) rename src/qzxing/zxing/{zxing => }/qrcode/detector/QRDetector.cpp (58%) create mode 100644 src/qzxing/zxing/qrcode/detector/QREdgeDetector.cpp create mode 100644 src/qzxing/zxing/qrcode/detector/QREdgeDetector.h create mode 100644 src/qzxing/zxing/qrcode/detector/QRFinderPattern.cpp rename src/qzxing/zxing/{zxing => }/qrcode/detector/QRFinderPatternFinder.cpp (92%) rename src/qzxing/zxing/{zxing => }/qrcode/detector/QRFinderPatternInfo.cpp (100%) delete mode 100644 src/qzxing/zxing/win32/zxing/iconv.h delete mode 100644 src/qzxing/zxing/win32/zxing/stdint/stdint.h delete mode 100644 src/qzxing/zxing/win32/zxing/win_iconv.c delete mode 100644 src/qzxing/zxing/zxing/BinaryBitmap.cpp delete mode 100644 src/qzxing/zxing/zxing/DecodeHints.cpp delete mode 100644 src/qzxing/zxing/zxing/DecodeHints.h delete mode 100644 src/qzxing/zxing/zxing/IllegalStateException.h delete mode 100644 src/qzxing/zxing/zxing/InvertedLuminanceSource.cpp delete mode 100644 src/qzxing/zxing/zxing/InvertedLuminanceSource.h delete mode 100644 src/qzxing/zxing/zxing/MultiFormatReader.cpp delete mode 100644 src/qzxing/zxing/zxing/ZXing.h delete mode 100644 src/qzxing/zxing/zxing/aztec/AztecReader.cpp delete mode 100644 src/qzxing/zxing/zxing/aztec/decoder/AztecDecoder.cpp delete mode 100644 src/qzxing/zxing/zxing/aztec/decoder/Decoder.h delete mode 100644 src/qzxing/zxing/zxing/aztec/detector/Detector.h delete mode 100644 src/qzxing/zxing/zxing/common/BitArray.cpp delete mode 100644 src/qzxing/zxing/zxing/common/BitMatrix.cpp delete mode 100644 src/qzxing/zxing/zxing/common/GlobalHistogramBinarizer.cpp delete mode 100644 src/qzxing/zxing/zxing/common/GreyscaleLuminanceSource.cpp delete mode 100644 src/qzxing/zxing/zxing/common/GreyscaleRotatedLuminanceSource.cpp delete mode 100644 src/qzxing/zxing/zxing/common/Str.cpp delete mode 100644 src/qzxing/zxing/zxing/common/detector/MathUtils.h delete mode 100644 src/qzxing/zxing/zxing/common/detector/MonochromeRectangleDetector.cpp delete mode 100644 src/qzxing/zxing/zxing/multi/GenericMultipleBarcodeReader.cpp delete mode 100644 src/qzxing/zxing/zxing/oned/CodaBarReader.cpp delete mode 100644 src/qzxing/zxing/zxing/oned/CodaBarReader.h delete mode 100644 src/qzxing/zxing/zxing/oned/Code128Reader.cpp delete mode 100644 src/qzxing/zxing/zxing/oned/Code128Reader.h delete mode 100644 src/qzxing/zxing/zxing/oned/Code39Reader.cpp delete mode 100644 src/qzxing/zxing/zxing/oned/Code39Reader.h delete mode 100644 src/qzxing/zxing/zxing/oned/Code93Reader.cpp delete mode 100644 src/qzxing/zxing/zxing/oned/Code93Reader.h delete mode 100644 src/qzxing/zxing/zxing/oned/EAN13Reader.cpp delete mode 100644 src/qzxing/zxing/zxing/oned/EAN8Reader.cpp delete mode 100644 src/qzxing/zxing/zxing/oned/ITFReader.cpp delete mode 100644 src/qzxing/zxing/zxing/oned/ITFReader.h delete mode 100644 src/qzxing/zxing/zxing/oned/MultiFormatOneDReader.cpp delete mode 100644 src/qzxing/zxing/zxing/oned/MultiFormatUPCEANReader.cpp delete mode 100644 src/qzxing/zxing/zxing/oned/OneDReader.cpp delete mode 100644 src/qzxing/zxing/zxing/oned/OneDReader.h delete mode 100644 src/qzxing/zxing/zxing/oned/UPCAReader.cpp delete mode 100644 src/qzxing/zxing/zxing/oned/UPCEANReader.cpp delete mode 100644 src/qzxing/zxing/zxing/oned/UPCEANReader.h delete mode 100644 src/qzxing/zxing/zxing/oned/UPCEReader.cpp delete mode 100644 src/qzxing/zxing/zxing/pdf417/PDF417Reader.cpp delete mode 100644 src/qzxing/zxing/zxing/pdf417/PDF417Reader.h delete mode 100644 src/qzxing/zxing/zxing/pdf417/decoder/BitMatrixParser.h delete mode 100644 src/qzxing/zxing/zxing/pdf417/decoder/DecodedBitStreamParser.h delete mode 100644 src/qzxing/zxing/zxing/pdf417/decoder/Decoder.h delete mode 100644 src/qzxing/zxing/zxing/pdf417/decoder/PDF417BitMatrixParser.cpp delete mode 100644 src/qzxing/zxing/zxing/pdf417/decoder/PDF417DecodedBitStreamParser.cpp delete mode 100644 src/qzxing/zxing/zxing/pdf417/decoder/PDF417Decoder.cpp delete mode 100644 src/qzxing/zxing/zxing/pdf417/decoder/ec/ErrorCorrection.cpp delete mode 100644 src/qzxing/zxing/zxing/pdf417/decoder/ec/ErrorCorrection.h delete mode 100644 src/qzxing/zxing/zxing/pdf417/decoder/ec/ModulusGF.cpp delete mode 100644 src/qzxing/zxing/zxing/pdf417/decoder/ec/ModulusGF.h delete mode 100644 src/qzxing/zxing/zxing/pdf417/decoder/ec/ModulusPoly.cpp delete mode 100644 src/qzxing/zxing/zxing/pdf417/decoder/ec/ModulusPoly.h delete mode 100644 src/qzxing/zxing/zxing/pdf417/detector/Detector.h delete mode 100644 src/qzxing/zxing/zxing/pdf417/detector/LinesSampler.cpp delete mode 100644 src/qzxing/zxing/zxing/pdf417/detector/LinesSampler.h delete mode 100644 src/qzxing/zxing/zxing/pdf417/detector/PDF417Detector.cpp delete mode 100644 src/qzxing/zxing/zxing/qrcode/decoder/QRDecodedBitStreamParser.cpp delete mode 100644 src/qzxing/zxing/zxing/qrcode/detector/QRFinderPattern.cpp diff --git a/harbour-sailotp.pro b/harbour-sailotp.pro index 9126671..2ca910d 100644 --- a/harbour-sailotp.pro +++ b/harbour-sailotp.pro @@ -32,7 +32,8 @@ OTHER_FILES += qml/harbour-sailotp.qml \ qml/components/NotifyBanner.qml \ qml/pages/ScanOTP.qml \ qml/lib/urldecoder.js \ - qml/pages/QRPage.qml + qml/pages/QRPage.qml \ + rpm/harbour-sailotp.changes i18n.files = i18n/*.qm i18n.path = /usr/share/$${TARGET}/i18n diff --git a/qml/pages/ScanOTP.qml b/qml/pages/ScanOTP.qml index 3085129..b15dd47 100644 --- a/qml/pages/ScanOTP.qml +++ b/qml/pages/ScanOTP.qml @@ -30,7 +30,6 @@ import QtQuick 2.0 import QtMultimedia 5.0 import Sailfish.Silica 1.0 -import Sailfish.Media 1.0 // Not allowed in harbour, but normal VideoOutput doesn't work yet! import harbour.sailotp.QZXing 2.2 import harbour.sailotp.FileIO 1.0 import "../lib/urldecoder.js" as URL @@ -87,8 +86,6 @@ Page { QZXing { id: decoder - enabledDecoders: QZXing.DecoderFormat_QR_CODE - onTagFound: { console.log("Barcode data: " + tag) var ret = URL.decode(tag); @@ -107,7 +104,7 @@ Page { id: fileIO } - GStreamerVideoOutput { + VideoOutput { id: prev anchors.horizontalCenter: parent.horizontalCenter anchors.top: header.bottom diff --git a/rpm/harbour-sailotp.changes b/rpm/harbour-sailotp.changes new file mode 100644 index 0000000..67517f0 --- /dev/null +++ b/rpm/harbour-sailotp.changes @@ -0,0 +1,2 @@ +* Tue Jul 01 2014 Stefan Brand 1.0-1 +- Added harbour-compatible QR-Reader diff --git a/rpm/harbour-sailotp.yaml b/rpm/harbour-sailotp.yaml index 459872d..02fe2c0 100644 --- a/rpm/harbour-sailotp.yaml +++ b/rpm/harbour-sailotp.yaml @@ -1,6 +1,6 @@ Name: harbour-sailotp Summary: SailOTP -Version: 0.8 +Version: 1.0 Release: 1 Group: Security URL: https://github.com/seiichiro0185/sailotp/ @@ -18,17 +18,14 @@ PkgConfigBR: - Qt5Quick - Qt5Qml - Qt5Core -- sailfishapp >= 0.0.10 +- Qt5Multimedia +- sailfishapp >= 1.0.2 Requires: - sailfishsilica-qt5 >= 0.10.9 Files: - '%{_bindir}' - '%{_datadir}/%{name}/qml' +- '%{_datadir}/%{name}/i18n' - '%{_datadir}/applications/%{name}.desktop' - '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png' -- /usr/bin -- /usr/share/harbour-sailotp -- /usr/share/applications -- /usr/share/icons/hicolor/86x86/apps -- /usr/share/harbour-sailotp/i18n PkgBR: [] diff --git a/src/FileIO/FileIO.pri b/src/FileIO/FileIO.pri index 816d5bc..3d74003 100644 --- a/src/FileIO/FileIO.pri +++ b/src/FileIO/FileIO.pri @@ -1,4 +1,4 @@ -QT += core declarative +QT += core quick INCLUDEPATH += $$PWD/src diff --git a/src/qzxing/CameraImageWrapper.cpp b/src/qzxing/CameraImageWrapper.cpp index 2120d92..83b742b 100644 --- a/src/qzxing/CameraImageWrapper.cpp +++ b/src/qzxing/CameraImageWrapper.cpp @@ -1,18 +1,16 @@ #include "CameraImageWrapper.h" #include -#include -#include -CameraImageWrapper::CameraImageWrapper() : LuminanceSource(0,0), isSmoothTransformationEnabled(false) +CameraImageWrapper::CameraImageWrapper() : LuminanceSource(), isSmoothTransformationEnabled(false) { } -CameraImageWrapper::CameraImageWrapper(QImage& image) : LuminanceSource(image.width(), image.height()) , isSmoothTransformationEnabled(false) +CameraImageWrapper::CameraImageWrapper(QImage& image) : LuminanceSource() , isSmoothTransformationEnabled(false) { setImage(image); } -CameraImageWrapper::CameraImageWrapper(CameraImageWrapper& otherInstance) : LuminanceSource(otherInstance.getWidth(), otherInstance.getHeight()) , isSmoothTransformationEnabled(false) +CameraImageWrapper::CameraImageWrapper(CameraImageWrapper& otherInstance) : LuminanceSource() , isSmoothTransformationEnabled(false) { image = otherInstance.getOriginalImage().copy(); } @@ -54,33 +52,30 @@ unsigned char* CameraImageWrapper::copyMatrix() const return newMatrix; } -bool CameraImageWrapper::setImage(QString fileName, int maxWidth, int maxHeight) +bool CameraImageWrapper::setImage(QString fileName) { bool isLoaded = image.load(fileName); if(!isLoaded) return false; - width = image.width(); - height = image.height(); - - scale(maxWidth, maxHeight); +// if(image.width() > QApplication::desktop()->width()) +// image = image.scaled(QApplication::desktop()->width(), image.height(), Qt::IgnoreAspectRatio); +// if(image.height() > QApplication::desktop()->height()) +// image = image.scaled(image.width(), QApplication::desktop()->height(), Qt::IgnoreAspectRatio); return true; } -bool CameraImageWrapper::setImage(QImage newImage, int maxWidth, int maxHeight) +bool CameraImageWrapper::setImage(QImage newImage) { if(newImage.isNull()) return false; image = newImage.copy(); - width = image.width(); - height = image.height(); - - scale(maxWidth, maxHeight); - + if(image.width() > 640) + image = image.scaled(640, image.height(), Qt::KeepAspectRatio, isSmoothTransformationEnabled ? Qt::SmoothTransformation : Qt::FastTransformation); return true; } @@ -97,6 +92,8 @@ QImage CameraImageWrapper::grayScaleImage(QImage::Format f) } return tmp; + + //return image.convertToFormat(f); } QImage CameraImageWrapper::getOriginalImage() @@ -104,12 +101,16 @@ QImage CameraImageWrapper::getOriginalImage() return image; } -ArrayRef CameraImageWrapper::getRow(int y, ArrayRef row) const + +unsigned char* CameraImageWrapper::getRow(int y, unsigned char* row) { int width = getWidth(); - if (row->size() != width) - row.reset(ArrayRef(width)); + if (row == NULL) + { + row = new unsigned char[width]; + pRow = row; + } for (int x = 0; x < width; x++) row[x] = getPixel(x,y); @@ -117,48 +118,27 @@ ArrayRef CameraImageWrapper::getRow(int y, ArrayRef row) const return row; } -ArrayRef CameraImageWrapper::getMatrix() const +unsigned char* CameraImageWrapper::getMatrix() { int width = getWidth(); int height = getHeight(); - char* matrix = new char[width*height]; - char* m = matrix; + unsigned char* matrix = new unsigned char[width*height]; + unsigned char* m = matrix; for(int y=0; y tmpRow; - tmpRow = getRow(y, ArrayRef(width)); -#if __cplusplus > 199711L - memcpy(m, tmpRow->values()..data(), width); -#else - memcpy(m, &tmpRow->values()[0], width); -#endif + unsigned char* tmpRow; + memcpy(m, tmpRow = getRow(y, NULL), width); m += width * sizeof(unsigned char); - //delete tmpRow; + delete tmpRow; } - //pMatrix = matrix; - ArrayRef arr = ArrayRef(matrix, width*height); - - if(matrix) - delete matrix; - - - return arr; + pMatrix = matrix; + return matrix; } void CameraImageWrapper::setSmoothTransformation(bool enable) { isSmoothTransformationEnabled = enable; } - -void CameraImageWrapper::scale(int maxWidth, int maxHeight) -{ - if((maxWidth != 1 || maxHeight != 1) && (image.width() > maxWidth || image.height() > maxHeight)) - image = image.scaled( - maxWidth != -1 ? maxWidth : image.width(), - maxHeight != -1 ? maxHeight : image.height(), - Qt::KeepAspectRatio, - isSmoothTransformationEnabled ? Qt::SmoothTransformation : Qt::FastTransformation); -} diff --git a/src/qzxing/CameraImageWrapper.h b/src/qzxing/CameraImageWrapper.h index b6e37f0..76d5071 100644 --- a/src/qzxing/CameraImageWrapper.h +++ b/src/qzxing/CameraImageWrapper.h @@ -3,7 +3,7 @@ #include #include -#include +#include using namespace zxing; @@ -24,24 +24,18 @@ public: /** * Set the source of the image. If it fails, returns false. */ - bool setImage(QString fileName, int maxWidth=-1, int maxHeight=-1); - bool setImage(QImage newImage, int maxWidth=-1, int maxHeight=-1); + bool setImage(QString fileName); + bool setImage(QImage newImage); QImage grayScaleImage(QImage::Format f); QImage getOriginalImage(); // Callers take ownership of the returned memory and must call delete [] on it themselves. - //unsigned char* getRow(int y, unsigned char* row); - //unsigned char* getMatrix(); - - ArrayRef getRow(int y, ArrayRef row) const; - ArrayRef getMatrix() const; + unsigned char* getRow(int y, unsigned char* row); + unsigned char* getMatrix(); void setSmoothTransformation(bool enable); - -private: - void scale(int maxWidth, int maxHeight); private: QImage image; diff --git a/src/qzxing/QZXing.pri b/src/qzxing/QZXing.pri index 3f8e008..70f4cd8 100644 --- a/src/qzxing/QZXing.pri +++ b/src/qzxing/QZXing.pri @@ -1,273 +1,191 @@ -QT += core gui +QT += core gui quick -greaterThan(QT_VERSION, 4.7): QT += declarative - -DEFINES += QZXING_LIBRARY \ - ZXING_ICONV_CONST \ - DISABLE_LIBRARY_FEATURES - -INCLUDEPATH += $$PWD \ - $$PWD/zxing +INCLUDEPATH += \ + $$PWD \ + $$PWD/zxing -HEADERS += $$PWD/QZXing_global.h \ -HEADERS += $$PWD/QZXing_global.h \ +HEADERS += \ $$PWD/CameraImageWrapper.h \ - $$PWD/imagehandler.h \ $$PWD/qzxing.h \ - $$PWD/zxing/zxing/ZXing.h \ - $$PWD/zxing/zxing/IllegalStateException.h \ - $$PWD/zxing/zxing/InvertedLuminanceSource.h \ - $$PWD/zxing/zxing/ChecksumException.h \ - $$PWD/zxing/zxing/ResultPointCallback.h \ - $$PWD/zxing/zxing/ResultPoint.h \ - $$PWD/zxing/zxing/Result.h \ - $$PWD/zxing/zxing/ReaderException.h \ - $$PWD/zxing/zxing/Reader.h \ - $$PWD/zxing/zxing/NotFoundException.h \ - $$PWD/zxing/zxing/MultiFormatReader.h \ - $$PWD/zxing/zxing/LuminanceSource.h \ - $$PWD/zxing/zxing/FormatException.h \ - $$PWD/zxing/zxing/Exception.h \ - $$PWD/zxing/zxing/DecodeHints.h \ - $$PWD/zxing/zxing/BinaryBitmap.h \ - $$PWD/zxing/zxing/Binarizer.h \ - $$PWD/zxing/zxing/BarcodeFormat.h \ - $$PWD/zxing/zxing/aztec/AztecReader.h \ - $$PWD/zxing/zxing/aztec/AztecDetectorResult.h \ - $$PWD/zxing/zxing/aztec/decoder/Decoder.h \ - $$PWD/zxing/zxing/aztec/detector/Detector.h \ - $$PWD/zxing/zxing/common/StringUtils.h \ - $$PWD/zxing/zxing/common/Str.h \ - $$PWD/zxing/zxing/common/Point.h \ - $$PWD/zxing/zxing/common/PerspectiveTransform.h \ - $$PWD/zxing/zxing/common/IllegalArgumentException.h \ - $$PWD/zxing/zxing/common/HybridBinarizer.h \ - $$PWD/zxing/zxing/common/GridSampler.h \ - $$PWD/zxing/zxing/common/GreyscaleRotatedLuminanceSource.h \ - $$PWD/zxing/zxing/common/GreyscaleLuminanceSource.h \ - $$PWD/zxing/zxing/common/GlobalHistogramBinarizer.h \ - $$PWD/zxing/zxing/common/DetectorResult.h \ - $$PWD/zxing/zxing/common/DecoderResult.h \ - $$PWD/zxing/zxing/common/Counted.h \ - $$PWD/zxing/zxing/common/CharacterSetECI.h \ - $$PWD/zxing/zxing/common/BitSource.h \ - $$PWD/zxing/zxing/common/BitMatrix.h \ - $$PWD/zxing/zxing/common/BitArray.h \ - $$PWD/zxing/zxing/common/Array.h \ - $$PWD/zxing/zxing/common/detector/MathUtils.h \ - $$PWD/zxing/zxing/common/detector/JavaMath.h \ - $$PWD/zxing/zxing/common/detector/WhiteRectangleDetector.h \ - $$PWD/zxing/zxing/common/detector/MonochromeRectangleDetector.h \ - $$PWD/zxing/zxing/common/reedsolomon/ReedSolomonException.h \ - $$PWD/zxing/zxing/common/reedsolomon/ReedSolomonDecoder.h \ - $$PWD/zxing/zxing/common/reedsolomon/GenericGFPoly.h \ - $$PWD/zxing/zxing/common/reedsolomon/GenericGF.h \ - $$PWD/zxing/zxing/datamatrix/Version.h \ - $$PWD/zxing/zxing/datamatrix/DataMatrixReader.h \ - $$PWD/zxing/zxing/datamatrix/decoder/Decoder.h \ - $$PWD/zxing/zxing/datamatrix/decoder/DecodedBitStreamParser.h \ - $$PWD/zxing/zxing/datamatrix/decoder/DataBlock.h \ - $$PWD/zxing/zxing/datamatrix/decoder/BitMatrixParser.h \ - $$PWD/zxing/zxing/datamatrix/detector/DetectorException.h \ - $$PWD/zxing/zxing/datamatrix/detector/Detector.h \ - $$PWD/zxing/zxing/datamatrix/detector/CornerPoint.h \ - $$PWD/zxing/zxing/oned/UPCEReader.h \ - $$PWD/zxing/zxing/oned/UPCEANReader.h \ - $$PWD/zxing/zxing/oned/UPCAReader.h \ - $$PWD/zxing/zxing/oned/OneDResultPoint.h \ - $$PWD/zxing/zxing/oned/OneDReader.h \ - $$PWD/zxing/zxing/oned/MultiFormatUPCEANReader.h \ - $$PWD/zxing/zxing/oned/MultiFormatOneDReader.h \ - $$PWD/zxing/zxing/oned/ITFReader.h \ - $$PWD/zxing/zxing/oned/EAN13Reader.h \ - $$PWD/zxing/zxing/oned/EAN8Reader.h \ - $$PWD/zxing/zxing/oned/Code128Reader.h \ - $$PWD/zxing/zxing/oned/Code39Reader.h \ - $$PWD/zxing/zxing/oned/CodaBarReader.h \ - $$PWD/zxing/zxing/oned/Code93Reader.h \ - $$PWD/zxing/zxing/qrcode/Version.h \ - $$PWD/zxing/zxing/qrcode/QRCodeReader.h \ - $$PWD/zxing/zxing/qrcode/FormatInformation.h \ - $$PWD/zxing/zxing/qrcode/ErrorCorrectionLevel.h \ - $$PWD/zxing/zxing/qrcode/decoder/Mode.h \ - $$PWD/zxing/zxing/qrcode/decoder/Decoder.h \ - $$PWD/zxing/zxing/qrcode/decoder/DecodedBitStreamParser.h \ - $$PWD/zxing/zxing/qrcode/decoder/DataMask.h \ - $$PWD/zxing/zxing/qrcode/decoder/DataBlock.h \ - $$PWD/zxing/zxing/qrcode/decoder/BitMatrixParser.h \ - $$PWD/zxing/zxing/qrcode/detector/FinderPatternInfo.h \ - $$PWD/zxing/zxing/qrcode/detector/FinderPatternFinder.h \ - $$PWD/zxing/zxing/qrcode/detector/FinderPattern.h \ - $$PWD/zxing/zxing/qrcode/detector/Detector.h \ - $$PWD/zxing/zxing/qrcode/detector/AlignmentPatternFinder.h \ - $$PWD/zxing/zxing/qrcode/detector/AlignmentPattern.h \ - $$PWD/zxing/zxing/multi/MultipleBarcodeReader.h \ - $$PWD/zxing/zxing/multi/GenericMultipleBarcodeReader.h \ - $$PWD/zxing/zxing/multi/ByQuadrantReader.h \ - $$PWD/zxing/zxing/multi/qrcode/QRCodeMultiReader.h \ - $$PWD/zxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.h \ - $$PWD/zxing/zxing/multi/qrcode/detector/MultiDetector.h \ - $$PWD/zxing/zxing/pdf417/decoder/ec/ErrorCorrection.h \ - $$PWD/zxing/zxing/pdf417/decoder/ec/ModulusGF.h \ - $$PWD/zxing/zxing/pdf417/decoder/ec/ModulusPoly.h \ - $$PWD/zxing/zxing/pdf417/decoder/BitMatrixParser.h \ - $$PWD/zxing/zxing/pdf417/decoder/DecodedBitStreamParser.h \ - $$PWD/zxing/zxing/pdf417/decoder/Decoder.h \ - $$PWD/zxing/zxing/pdf417/detector/Detector.h \ - $$PWD/zxing/zxing/pdf417/detector/LinesSampler.h \ - $$PWD/zxing/zxing/pdf417/PDF417Reader.h \ - $$PWD/zxing/bigint/NumberlikeArray.hh \ - $$PWD/zxing/bigint/BigUnsignedInABase.hh \ - $$PWD/zxing/bigint/BigUnsigned.hh \ - $$PWD/zxing/bigint/BigIntegerUtils.hh \ - $$PWD/zxing/bigint/BigIntegerLibrary.hh \ - $$PWD/zxing/bigint/BigIntegerAlgorithms.hh \ - $$PWD/zxing/bigint/BigInteger.hh + $$PWD/qzxing_global.h \ + $$PWD/zxing/ResultPointCallback.h \ + $$PWD/zxing/ResultPoint.h \ + $$PWD/zxing/Result.h \ + $$PWD/zxing/ReaderException.h \ + $$PWD/zxing/Reader.h \ + $$PWD/zxing/NotFoundException.h \ + $$PWD/zxing/MultiFormatReader.h \ + $$PWD/zxing/LuminanceSource.h \ + $$PWD/zxing/FormatException.h \ + $$PWD/zxing/Exception.h \ + $$PWD/zxing/DecodeHints.h \ + $$PWD/zxing/BinaryBitmap.h \ + $$PWD/zxing/Binarizer.h \ + $$PWD/zxing/BarcodeFormat.h \ + $$PWD/zxing/aztec/AztecReader.h \ + $$PWD/zxing/aztec/AztecDetectorResult.h \ + $$PWD/zxing/aztec/decoder/Decoder.h \ + $$PWD/zxing/aztec/detector/Detector.h \ + $$PWD/zxing/common/StringUtils.h \ + $$PWD/zxing/common/Str.h \ + $$PWD/zxing/common/Point.h \ + $$PWD/zxing/common/PerspectiveTransform.h \ + $$PWD/zxing/common/IllegalArgumentException.h \ + $$PWD/zxing/common/HybridBinarizer.h \ + $$PWD/zxing/common/GridSampler.h \ + $$PWD/zxing/common/GreyscaleRotatedLuminanceSource.h \ + $$PWD/zxing/common/GreyscaleLuminanceSource.h \ + $$PWD/zxing/common/GlobalHistogramBinarizer.h \ + $$PWD/zxing/common/EdgeDetector.h \ + $$PWD/zxing/common/DetectorResult.h \ + $$PWD/zxing/common/DecoderResult.h \ + $$PWD/zxing/common/Counted.h \ + $$PWD/zxing/common/CharacterSetECI.h \ + $$PWD/zxing/common/BitSource.h \ + $$PWD/zxing/common/BitMatrix.h \ + $$PWD/zxing/common/BitArray.h \ + $$PWD/zxing/common/Array.h \ + $$PWD/zxing/common/detector/WhiteRectangleDetector.h \ + $$PWD/zxing/common/detector/MonochromeRectangleDetector.h \ + $$PWD/zxing/common/reedsolomon/ReedSolomonException.h \ + $$PWD/zxing/common/reedsolomon/ReedSolomonDecoder.h \ + $$PWD/zxing/common/reedsolomon/GenericGFPoly.h \ + $$PWD/zxing/common/reedsolomon/GenericGF.h \ + $$PWD/zxing/datamatrix/Version.h \ + $$PWD/zxing/datamatrix/DataMatrixReader.h \ + $$PWD/zxing/datamatrix/decoder/Decoder.h \ + $$PWD/zxing/datamatrix/decoder/DecodedBitStreamParser.h \ + $$PWD/zxing/datamatrix/decoder/DataBlock.h \ + $$PWD/zxing/datamatrix/decoder/BitMatrixParser.h \ + $$PWD/zxing/datamatrix/detector/MonochromeRectangleDetector.h \ + $$PWD/zxing/datamatrix/detector/DetectorException.h \ + $$PWD/zxing/datamatrix/detector/Detector.h \ + $$PWD/zxing/datamatrix/detector/CornerPoint.h \ + $$PWD/zxing/oned/UPCEReader.h \ + $$PWD/zxing/oned/UPCEANReader.h \ + $$PWD/zxing/oned/UPCAReader.h \ + $$PWD/zxing/oned/OneDResultPoint.h \ + $$PWD/zxing/oned/OneDReader.h \ + $$PWD/zxing/oned/MultiFormatUPCEANReader.h \ + $$PWD/zxing/oned/MultiFormatOneDReader.h \ + $$PWD/zxing/oned/ITFReader.h \ + $$PWD/zxing/oned/EAN13Reader.h \ + $$PWD/zxing/oned/EAN8Reader.h \ + $$PWD/zxing/oned/Code128Reader.h \ + $$PWD/zxing/oned/Code39Reader.h \ + $$PWD/zxing/qrcode/Version.h \ + $$PWD/zxing/qrcode/QRCodeReader.h \ + $$PWD/zxing/qrcode/FormatInformation.h \ + $$PWD/zxing/qrcode/ErrorCorrectionLevel.h \ + $$PWD/zxing/qrcode/decoder/Mode.h \ + $$PWD/zxing/qrcode/decoder/Decoder.h \ + $$PWD/zxing/qrcode/decoder/DecodedBitStreamParser.h \ + $$PWD/zxing/qrcode/decoder/DataMask.h \ + $$PWD/zxing/qrcode/decoder/DataBlock.h \ + $$PWD/zxing/qrcode/decoder/BitMatrixParser.h \ + $$PWD/zxing/qrcode/detector/QREdgeDetector.h \ + $$PWD/zxing/qrcode/detector/FinderPatternInfo.h \ + $$PWD/zxing/qrcode/detector/FinderPatternFinder.h \ + $$PWD/zxing/qrcode/detector/FinderPattern.h \ + $$PWD/zxing/qrcode/detector/Detector.h \ + $$PWD/zxing/qrcode/detector/AlignmentPatternFinder.h \ + $$PWD/zxing/qrcode/detector/AlignmentPattern.h \ + $$PWD/zxing/multi/MultipleBarcodeReader.h \ + $$PWD/zxing/multi/GenericMultipleBarcodeReader.h \ + $$PWD/zxing/multi/ByQuadrantReader.h \ + $$PWD/zxing/multi/qrcode/QRCodeMultiReader.h \ + $$PWD/zxing/multi/qrcode/detector/MultiFinderPatternFinder.h \ + $$PWD/zxing/multi/qrcode/detector/MultiDetector.h -SOURCES += $$PWD/CameraImageWrapper.cpp \ +SOURCES += \ + $$PWD/CameraImageWrapper.cpp \ $$PWD/qzxing.cpp \ - $$PWD/imagehandler.cpp \ - $$PWD/zxing/zxing/ResultIO.cpp \ - $$PWD/zxing/zxing/InvertedLuminanceSource.cpp \ - $$PWD/zxing/zxing/ChecksumException.cpp \ - $$PWD/zxing/zxing/ResultPointCallback.cpp \ - $$PWD/zxing/zxing/ResultPoint.cpp \ - $$PWD/zxing/zxing/Result.cpp \ - $$PWD/zxing/zxing/Reader.cpp \ - $$PWD/zxing/zxing/MultiFormatReader.cpp \ - $$PWD/zxing/zxing/LuminanceSource.cpp \ - $$PWD/zxing/zxing/FormatException.cpp \ - $$PWD/zxing/zxing/Exception.cpp \ - $$PWD/zxing/zxing/DecodeHints.cpp \ - $$PWD/zxing/zxing/BinaryBitmap.cpp \ - $$PWD/zxing/zxing/Binarizer.cpp \ - $$PWD/zxing/zxing/BarcodeFormat.cpp \ - $$PWD/zxing/zxing/aztec/AztecReader.cpp \ - $$PWD/zxing/zxing/aztec/AztecDetectorResult.cpp \ - $$PWD/zxing/zxing/common/StringUtils.cpp \ - $$PWD/zxing/zxing/common/Str.cpp \ - $$PWD/zxing/zxing/common/PerspectiveTransform.cpp \ - $$PWD/zxing/zxing/common/IllegalArgumentException.cpp \ - $$PWD/zxing/zxing/common/HybridBinarizer.cpp \ - $$PWD/zxing/zxing/common/GridSampler.cpp \ - $$PWD/zxing/zxing/common/GreyscaleRotatedLuminanceSource.cpp \ - $$PWD/zxing/zxing/common/GreyscaleLuminanceSource.cpp \ - $$PWD/zxing/zxing/common/GlobalHistogramBinarizer.cpp \ - $$PWD/zxing/zxing/common/DetectorResult.cpp \ - $$PWD/zxing/zxing/common/DecoderResult.cpp \ - $$PWD/zxing/zxing/common/CharacterSetECI.cpp \ - $$PWD/zxing/zxing/common/BitSource.cpp \ - $$PWD/zxing/zxing/common/BitMatrix.cpp \ - $$PWD/zxing/zxing/common/BitArray.cpp \ - $$PWD/zxing/zxing/common/BitArrayIO.cpp \ - $$PWD/zxing/zxing/common/detector/WhiteRectangleDetector.cpp \ - $$PWD/zxing/zxing/common/detector/MonochromeRectangleDetector.cpp \ - $$PWD/zxing/zxing/common/reedsolomon/ReedSolomonException.cpp \ - $$PWD/zxing/zxing/common/reedsolomon/ReedSolomonDecoder.cpp \ - $$PWD/zxing/zxing/common/reedsolomon/GenericGFPoly.cpp \ - $$PWD/zxing/zxing/common/reedsolomon/GenericGF.cpp \ - $$PWD/zxing/zxing/datamatrix/DataMatrixReader.cpp \ - $$PWD/zxing/zxing/oned/UPCEReader.cpp \ - $$PWD/zxing/zxing/oned/UPCEANReader.cpp \ - $$PWD/zxing/zxing/oned/UPCAReader.cpp \ - $$PWD/zxing/zxing/oned/OneDResultPoint.cpp \ - $$PWD/zxing/zxing/oned/OneDReader.cpp \ - $$PWD/zxing/zxing/oned/MultiFormatUPCEANReader.cpp \ - $$PWD/zxing/zxing/oned/MultiFormatOneDReader.cpp \ - $$PWD/zxing/zxing/oned/ITFReader.cpp \ - $$PWD/zxing/zxing/oned/EAN13Reader.cpp \ - $$PWD/zxing/zxing/oned/EAN8Reader.cpp \ - $$PWD/zxing/zxing/oned/Code128Reader.cpp \ - $$PWD/zxing/zxing/oned/Code39Reader.cpp \ - $$PWD/zxing/zxing/oned/CodaBarReader.cpp \ - $$PWD/zxing/zxing/oned/Code93Reader.cpp \ - $$PWD/zxing/zxing/qrcode/QRCodeReader.cpp \ - $$PWD/zxing/zxing/multi/MultipleBarcodeReader.cpp \ - $$PWD/zxing/zxing/multi/GenericMultipleBarcodeReader.cpp \ - $$PWD/zxing/zxing/multi/ByQuadrantReader.cpp \ - $$PWD/zxing/zxing/multi/qrcode/QRCodeMultiReader.cpp \ - $$PWD/zxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.cpp \ - $$PWD/zxing/zxing/multi/qrcode/detector/MultiDetector.cpp \ - $$PWD/zxing/zxing/aztec/decoder/AztecDecoder.cpp \ - $$PWD/zxing/zxing/aztec/detector/AztecDetector.cpp \ - $$PWD/zxing/zxing/datamatrix/DataMatrixVersion.cpp \ - $$PWD/zxing/zxing/datamatrix/decoder/DataMatrixDecoder.cpp \ - $$PWD/zxing/zxing/datamatrix/decoder/DataMatrixBitMatrixParser.cpp \ - $$PWD/zxing/zxing/datamatrix/decoder/DataMatrixDataBlock.cpp \ - $$PWD/zxing/zxing/datamatrix/decoder/DataMatrixDecodedBitStreamParser.cpp \ - $$PWD/zxing/zxing/datamatrix/detector/DataMatrixCornerPoint.cpp \ - $$PWD/zxing/zxing/datamatrix/detector/DataMatrixDetector.cpp \ - $$PWD/zxing/zxing/datamatrix/detector/DataMatrixDetectorException.cpp \ - $$PWD/zxing/zxing/qrcode/decoder/QRBitMatrixParser.cpp \ - $$PWD/zxing/zxing/qrcode/decoder/QRDataBlock.cpp \ - $$PWD/zxing/zxing/qrcode/decoder/QRDataMask.cpp \ - $$PWD/zxing/zxing/qrcode/decoder/QRDecodedBitStreamParser.cpp \ - $$PWD/zxing/zxing/qrcode/decoder/QRDecoder.cpp \ - $$PWD/zxing/zxing/qrcode/decoder/QRMode.cpp \ - $$PWD/zxing/zxing/qrcode/detector/QRAlignmentPattern.cpp \ - $$PWD/zxing/zxing/qrcode/detector/QRAlignmentPatternFinder.cpp \ - $$PWD/zxing/zxing/qrcode/detector/QRDetector.cpp \ - $$PWD/zxing/zxing/qrcode/detector/QRFinderPattern.cpp \ - $$PWD/zxing/zxing/qrcode/detector/QRFinderPatternFinder.cpp \ - $$PWD/zxing/zxing/qrcode/detector/QRFinderPatternInfo.cpp \ - $$PWD/zxing/zxing/qrcode/QRVersion.cpp \ - $$PWD/zxing/zxing/qrcode/QRFormatInformation.cpp \ - $$PWD/zxing/zxing/qrcode/QRErrorCorrectionLevel.cpp \ - $$PWD/zxing/zxing/pdf417/decoder/ec/ErrorCorrection.cpp \ - $$PWD/zxing/zxing/pdf417/decoder/ec/ModulusGF.cpp \ - $$PWD/zxing/zxing/pdf417/decoder/ec/ModulusPoly.cpp \ - $$PWD/zxing/zxing/pdf417/decoder/PDF417BitMatrixParser.cpp \ - $$PWD/zxing/zxing/pdf417/decoder/PDF417DecodedBitStreamParser.cpp \ - $$PWD/zxing/zxing/pdf417/decoder/PDF417Decoder.cpp \ - $$PWD/zxing/zxing/pdf417/detector/PDF417Detector.cpp \ - $$PWD/zxing/zxing/pdf417/detector/LinesSampler.cpp \ - $$PWD/zxing/zxing/pdf417/PDF417Reader.cpp \ - $$PWD/zxing/bigint/BigUnsignedInABase.cc \ - $$PWD/zxing/bigint/BigUnsigned.cc \ - $$PWD/zxing/bigint/BigIntegerUtils.cc \ - $$PWD/zxing/bigint/BigIntegerAlgorithms.cc \ - $$PWD/zxing/bigint/BigInteger.cc + $$PWD/zxing/ResultPointCallback.cpp \ + $$PWD/zxing/ResultPoint.cpp \ + $$PWD/zxing/Result.cpp \ + $$PWD/zxing/ReaderException.cpp \ + $$PWD/zxing/Reader.cpp \ + $$PWD/zxing/NotFoundException.cpp \ + $$PWD/zxing/MultiFormatReader.cpp \ + $$PWD/zxing/LuminanceSource.cpp \ + $$PWD/zxing/FormatException.cpp \ + $$PWD/zxing/Exception.cpp \ + $$PWD/zxing/DecodeHints.cpp \ + $$PWD/zxing/BinaryBitmap.cpp \ + $$PWD/zxing/Binarizer.cpp \ + $$PWD/zxing/BarcodeFormat.cpp \ + $$PWD/zxing/aztec/AztecReader.cpp \ + $$PWD/zxing/aztec/AztecDetectorResult.cpp \ + $$PWD/zxing/common/StringUtils.cpp \ + $$PWD/zxing/common/Str.cpp \ + $$PWD/zxing/common/PerspectiveTransform.cpp \ + $$PWD/zxing/common/IllegalArgumentException.cpp \ + $$PWD/zxing/common/HybridBinarizer.cpp \ + $$PWD/zxing/common/GridSampler.cpp \ + $$PWD/zxing/common/GreyscaleRotatedLuminanceSource.cpp \ + $$PWD/zxing/common/GreyscaleLuminanceSource.cpp \ + $$PWD/zxing/common/GlobalHistogramBinarizer.cpp \ + $$PWD/zxing/common/EdgeDetector.cpp \ + $$PWD/zxing/common/DetectorResult.cpp \ + $$PWD/zxing/common/DecoderResult.cpp \ + $$PWD/zxing/common/Counted.cpp \ + $$PWD/zxing/common/CharacterSetECI.cpp \ + $$PWD/zxing/common/BitSource.cpp \ + $$PWD/zxing/common/BitMatrix.cpp \ + $$PWD/zxing/common/BitArray.cpp \ + $$PWD/zxing/common/Array.cpp \ + $$PWD/zxing/common/detector/WhiteRectangleDetector.cpp \ + $$PWD/zxing/common/detector/MonochromeRectangleDetector.cpp \ + $$PWD/zxing/common/reedsolomon/ReedSolomonException.cpp \ + $$PWD/zxing/common/reedsolomon/ReedSolomonDecoder.cpp \ + $$PWD/zxing/common/reedsolomon/GenericGFPoly.cpp \ + $$PWD/zxing/common/reedsolomon/GenericGF.cpp \ + $$PWD/zxing/datamatrix/DataMatrixReader.cpp \ + $$PWD/zxing/oned/UPCEReader.cpp \ + $$PWD/zxing/oned/UPCEANReader.cpp \ + $$PWD/zxing/oned/UPCAReader.cpp \ + $$PWD/zxing/oned/OneDResultPoint.cpp \ + $$PWD/zxing/oned/OneDReader.cpp \ + $$PWD/zxing/oned/MultiFormatUPCEANReader.cpp \ + $$PWD/zxing/oned/MultiFormatOneDReader.cpp \ + $$PWD/zxing/oned/ITFReader.cpp \ + $$PWD/zxing/oned/EAN13Reader.cpp \ + $$PWD/zxing/oned/EAN8Reader.cpp \ + $$PWD/zxing/oned/Code128Reader.cpp \ + $$PWD/zxing/oned/Code39Reader.cpp \ + $$PWD/zxing/qrcode/QRCodeReader.cpp \ + $$PWD/zxing/qrcode/detector/QREdgeDetector.cpp \ + $$PWD/zxing/multi/MultipleBarcodeReader.cpp \ + $$PWD/zxing/multi/GenericMultipleBarcodeReader.cpp \ + $$PWD/zxing/multi/ByQuadrantReader.cpp \ + $$PWD/zxing/multi/qrcode/QRCodeMultiReader.cpp \ + $$PWD/zxing/multi/qrcode/detector/MultiFinderPatternFinder.cpp \ + $$PWD/zxing/multi/qrcode/detector/MultiDetector.cpp \ + $$PWD/zxing/aztec/decoder/AztecDecoder.cpp \ + $$PWD/zxing/aztec/detector/AztecDetector.cpp \ + $$PWD/zxing/datamatrix/DataMatrixVersion.cpp \ + $$PWD/zxing/datamatrix/decoder/DataMatrixDecoder.cpp \ + $$PWD/zxing/datamatrix/decoder/DataMatrixBitMatrixParser.cpp \ + $$PWD/zxing/datamatrix/decoder/DataMatrixDataBlock.cpp \ + $$PWD/zxing/datamatrix/decoder/DataMatrixDecodedBitStreamParser.cpp \ + $$PWD/zxing/datamatrix/detector/DataMatrixCornerPoint.cpp \ + $$PWD/zxing/datamatrix/detector/DataMatrixDetector.cpp \ + $$PWD/zxing/datamatrix/detector/DataMatrixDetectorException.cpp \ + $$PWD/zxing/datamatrix/detector/DataMatrixMonochromeRectangleDetector.cpp \ + $$PWD/zxing/qrcode/decoder/QRBitMatrixParser.cpp \ + $$PWD/zxing/qrcode/decoder/QRDataBlock.cpp \ + $$PWD/zxing/qrcode/decoder/QRDataMask.cpp \ + $$PWD/zxing/qrcode/decoder/QRDecodedBitStreamParser.cpp \ + $$PWD/zxing/qrcode/decoder/QRDecoder.cpp \ + $$PWD/zxing/qrcode/decoder/QRMode.cpp \ + $$PWD/zxing/qrcode/detector/QRAlignmentPattern.cpp \ + $$PWD/zxing/qrcode/detector/QRAlignmentPatternFinder.cpp \ + $$PWD/zxing/qrcode/detector/QRDetector.cpp \ + $$PWD/zxing/qrcode/detector/QRFinderPattern.cpp \ + $$PWD/zxing/qrcode/detector/QRFinderPatternFinder.cpp \ + $$PWD/zxing/qrcode/detector/QRFinderPatternInfo.cpp \ + $$PWD/zxing/qrcode/QRVersion.cpp \ + $$PWD/zxing/qrcode/QRFormatInformation.cpp \ + $$PWD/zxing/qrcode/QRErrorCorrectionLevel.cpp -symbian { - TARGET.UID3 = 0xE618743C - TARGET.EPOCALLOWDLLDATA = 1 - - #TARGET.CAPABILITY = All -TCB -AllFiles -DRM - TARGET.CAPABILITY += NetworkServices \ - ReadUserData \ - WriteUserData \ - LocalServices \ - UserEnvironment \ - Location -} - -unix:!symbian { - maemo5 { - target.path = /opt/usr/lib - } else { - target.path = /usr/lib - } - - DEFINES += NOFMAXL -# INSTALLS += target -} - -win32-msvc*{ - - INCLUDEPATH += $$PWD/zxing/win32/zxing \ - $$PWD/zxing/win32/zxing/stdint - HEADERS += $$PWD/zxing/win32/zxing/stdint/stdint.h \ - $$PWD/zxing/win32/zxing/iconv.h - - SOURCES += $$PWD/zxing/win32/zxing/win_iconv.c -} - -win32-g++{ - - INCLUDEPATH += $$PWD/zxing/win32/zxing - - HEADERS += $$PWD/zxing/win32/zxing/iconv.h - - SOURCES += $$PWD/zxing/win32/zxing/win_iconv.c -} diff --git a/src/qzxing/imagehandler.cpp b/src/qzxing/imagehandler.cpp deleted file mode 100644 index 5aaa5c0..0000000 --- a/src/qzxing/imagehandler.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include "imagehandler.h" -#include -#include -#include -#include -#include - -ImageHandler::ImageHandler(QObject *parent) : - QObject(parent) -{ -} - -QImage ImageHandler::extractQImage(QObject *imageObj, - const double offsetX, const double offsetY, - const double width, const double height) -{ - QGraphicsObject *item = qobject_cast(imageObj); - - if (!item) { - qDebug() << "Item is NULL"; - return QImage(); - } - - QImage img(item->boundingRect().size().toSize(), QImage::Format_RGB32); - img.fill(QColor(255, 255, 255).rgb()); - QPainter painter(&img); - QStyleOptionGraphicsItem styleOption; - item->paint(&painter, &styleOption); - - if(offsetX == 0 && offsetY == 0 && width == 0 && height == 0) - return img; - else - { - return img.copy(offsetX, offsetY, width, height); - } -} - -void ImageHandler::save(QObject *imageObj, const QString &path, - const double offsetX, const double offsetY, - const double width, const double height) -{ - QImage img = extractQImage(imageObj, offsetX, offsetY, width, height); - img.save(path); -} diff --git a/src/qzxing/imagehandler.h b/src/qzxing/imagehandler.h deleted file mode 100644 index fac5489..0000000 --- a/src/qzxing/imagehandler.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef IMAGEHANDLER_H -#define IMAGEHANDLER_H - -#include -#include - -class ImageHandler : public QObject -{ - Q_OBJECT -public: - explicit ImageHandler(QObject *parent = 0); - - QImage extractQImage(QObject *imageObj, - const double offsetX = 0 , const double offsetY = 0, - const double width = 0, const double height = 0); - -public slots: - void save(QObject *item, const QString &path, - const double offsetX = 0, const double offsetY = 0, - const double width = 0, const double height = 0); -}; - -#endif // IMAGEHANDLER_H diff --git a/src/qzxing/qzxing.cpp b/src/qzxing/qzxing.cpp index 1081299..7d5d67e 100644 --- a/src/qzxing/qzxing.cpp +++ b/src/qzxing/qzxing.cpp @@ -1,19 +1,19 @@ #include "qzxing.h" +#include #include #include #include #include #include #include "CameraImageWrapper.h" -#include "imagehandler.h" -#include using namespace zxing; QZXing::QZXing(QObject *parent) : QObject(parent) { decoder = new MultiFormatReader(); + setDecoder(DecoderFormat_QR_CODE); /*setDecoder(DecoderFormat_QR_CODE | DecoderFormat_DATA_MATRIX | DecoderFormat_UPC_E | @@ -24,165 +24,156 @@ QZXing::QZXing(QObject *parent) : QObject(parent) DecoderFormat_CODE_39 | DecoderFormat_ITF | DecoderFormat_Aztec);*/ - imageHandler = new ImageHandler(); } -QZXing::QZXing(QZXing::DecoderFormat decodeHints, QObject *parent) : QObject(parent) -{ - decoder = new MultiFormatReader(); - imageHandler = new ImageHandler(); - - setDecoder(decodeHints); +QZXing::~QZXing() { + delete (MultiFormatReader*)decoder; + decoder = 0; } -void QZXing::setDecoder(const uint &hint) +void QZXing::setDecoder(DecoderFormatType hint) { - unsigned int newHints = 0; - - if(hint & DecoderFormat_Aztec) - newHints |= DecodeHints::AZTEC_HINT; - - if(hint & DecoderFormat_CODABAR) - newHints |= DecodeHints::CODABAR_HINT; - - if(hint & DecoderFormat_CODE_39) - newHints |= DecodeHints::CODE_39_HINT; - - if(hint & DecoderFormat_CODE_93) - newHints |= DecodeHints::CODE_93_HINT; - - if(hint & DecoderFormat_CODE_128) - newHints |= DecodeHints::CODE_128_HINT; - - if(hint & DecoderFormat_DATA_MATRIX) - newHints |= DecodeHints::DATA_MATRIX_HINT; - - if(hint & DecoderFormat_EAN_8) - newHints |= DecodeHints::EAN_8_HINT; - - if(hint & DecoderFormat_EAN_13) - newHints |= DecodeHints::EAN_13_HINT; - - if(hint & DecoderFormat_ITF) - newHints |= DecodeHints::ITF_HINT; - - if(hint & DecoderFormat_MAXICODE) - newHints |= DecodeHints::MAXICODE_HINT; - - if(hint & DecoderFormat_PDF_417) - newHints |= DecodeHints::PDF_417_HINT; + DecodeHints newHints; if(hint & DecoderFormat_QR_CODE) - newHints |= DecodeHints::QR_CODE_HINT; + newHints.addFormat((BarcodeFormat)BarcodeFormat_QR_CODE); - if(hint & DecoderFormat_RSS_14) - newHints |= DecodeHints::RSS_14_HINT; - - if(hint & DecoderFormat_RSS_EXPANDED) - newHints |= DecodeHints::RSS_EXPANDED_HINT; - - if(hint & DecoderFormat_UPC_A) - newHints |= DecodeHints::UPC_A_HINT; + if(hint & DecoderFormat_DATA_MATRIX) + newHints.addFormat((BarcodeFormat)BarcodeFormat_DATA_MATRIX); if(hint & DecoderFormat_UPC_E) - newHints |= DecodeHints::UPC_E_HINT; + newHints.addFormat((BarcodeFormat)BarcodeFormat_UPC_E); - if(hint & DecoderFormat_UPC_EAN_EXTENSION) - newHints |= DecodeHints::UPC_EAN_EXTENSION_HINT; + if(hint & DecoderFormat_UPC_A) + newHints.addFormat((BarcodeFormat)BarcodeFormat_UPC_A); - enabledDecoders = newHints; + if(hint & DecoderFormat_EAN_8) + newHints.addFormat((BarcodeFormat)BarcodeFormat_EAN_8); - emit enabledFormatsChanged(); + if(hint & DecoderFormat_EAN_13) + newHints.addFormat((BarcodeFormat)BarcodeFormat_EAN_13); + + if(hint & DecoderFormat_CODE_128) + newHints.addFormat((BarcodeFormat)BarcodeFormat_CODE_128); + + if(hint & DecoderFormat_CODE_39) + newHints.addFormat((BarcodeFormat)BarcodeFormat_CODE_39); + + if(hint & DecoderFormat_ITF) + newHints.addFormat((BarcodeFormat)BarcodeFormat_ITF); + + if(hint & DecoderFormat_Aztec) + newHints.addFormat((BarcodeFormat)BarcodeFormat_AZTEC); + + supportedFormats = newHints.getCurrentHint(); } -QString QZXing::decodeImage(QImage image, int maxWidth, int maxHeight, bool smoothTransformation) + +QString QZXing::decodeImage(QImage image) { - QTime t; - t.start(); - Ref res; + Ref result; emit decodingStarted(); - if(image.isNull()) - { - emit decodingFinished(false); - processingTime = -1; - return ""; - } + try { + Ref source(new CameraImageWrapper(image)); - try{ - CameraImageWrapper* ciw; + Ref binarizer; + binarizer = new GlobalHistogramBinarizer(source); - if(maxWidth > 0 || maxHeight > 0) - { - ciw = new CameraImageWrapper(); - ciw->setSmoothTransformation(smoothTransformation); - ciw->setImage(image, maxWidth, maxHeight); - } - else - ciw = new CameraImageWrapper(image); + Ref binary(new BinaryBitmap(binarizer)); - Ref imageRef(ciw); - GlobalHistogramBinarizer* binz = new GlobalHistogramBinarizer(imageRef); + DecodeHints hints((int)supportedFormats); - Ref bz (binz); - BinaryBitmap* bb = new BinaryBitmap(bz); + result = ((MultiFormatReader*)decoder)->decode(binary, hints); - Ref ref(bb); - - res = ((MultiFormatReader*)decoder)->decode(ref, DecodeHints((int)enabledDecoders)); - - QString string = QString(res->getText()->getText().c_str()); - processingTime = t.elapsed(); + QString string = QString(result->getText()->getText().c_str()); emit tagFound(string); emit decodingFinished(true); return string; } catch(zxing::Exception& e) { + qDebug() << "[decodeImage()] Exception:" << e.what(); emit decodingFinished(false); - processingTime = -1; return ""; } } -QString QZXing::decodeImageFromFile(QString imageFilePath, int maxWidth, int maxHeight, bool smoothTransformation) +QVariantHash QZXing::decodeImageEx(QImage image) { - //used to have a check if this image exists - //but was removed because if the image file path doesn't point to a valid image - // then the QImage::isNull will return true and the decoding will fail eitherway. - return decodeImage(QImage(imageFilePath), maxWidth, maxHeight, smoothTransformation); + QVariantHash resultMap; + Ref result; + emit decodingStarted(); + + try { + Ref source(new CameraImageWrapper(image)); + + Ref binarizer; + binarizer = new GlobalHistogramBinarizer(source); + + Ref binary(new BinaryBitmap(binarizer)); + + DecodeHints hints((int)supportedFormats); + + result = ((MultiFormatReader*)decoder)->decode(binary, hints); + + QString string = QString(result->getText()->getText().c_str()); + QList points; + emit tagFound(string); + emit decodingFinished(true); + resultMap.insert("content", string); + + std::vector > resultPoints = result->getResultPoints(); + for (unsigned int i = 0; i < resultPoints.size(); i++) { + points.append(QPoint(resultPoints[i]->getX(), resultPoints[i]->getY())); + } + resultMap.insert("points", points); + } + catch(zxing::Exception& e) + { + qDebug() << "[decodeImage()] Exception:" << e.what(); + emit decodingFinished(false); + resultMap.insert("content", QString("")); + resultMap.insert("points", QList()); + } + return resultMap; } -QString QZXing::decodeImageQML(QObject *item) +QString QZXing::decodeImageFromFile(QString imageFilePath) { - return decodeSubImageQML(item); + //used to have a check if this image exists + //but was removed because if the image file path doesn't point to a valid image + // then the QImage::isNull will return true and the decoding will fail eitherway. + return decodeImage(QImage(imageFilePath)); } -QString QZXing::decodeSubImageQML(QObject* item, +QString QZXing::decodeImageQML(const QUrl &imageUrl) +{ + return decodeSubImageQML(imageUrl); +} + +QString QZXing::decodeSubImageQML(const QUrl &imageUrl, const double offsetX, const double offsetY, const double width, const double height) { - if(item == NULL) - { + + QString imagePath = imageUrl.path(); + imagePath = imagePath.trimmed(); + QFile file(imagePath); + + if (!file.exists()) { + qDebug() << "[decodeSubImageQML()] The file" << file.fileName() << "does not exist."; emit decodingFinished(false); return ""; } - QImage img = ((ImageHandler*)imageHandler)->extractQImage(item, offsetX, offsetY, width, height); + QImage img(imageUrl.path()); + + if(!(offsetX == 0 && offsetY == 0 && width == 0 && height == 0)) { + img = img.copy(offsetX, offsetY, width, height); + } return decodeImage(img); + } -int QZXing::getProcessTimeOfLastDecoding() -{ - return processingTime; -} - -uint QZXing::getEnabledFormats() const -{ - return enabledDecoders; -} - - - - diff --git a/src/qzxing/qzxing.h b/src/qzxing/qzxing.h index 287ded2..d4191c4 100644 --- a/src/qzxing/qzxing.h +++ b/src/qzxing/qzxing.h @@ -1,10 +1,11 @@ #ifndef QZXING_H #define QZXING_H -#include "QZXing_global.h" +#include "qzxing_global.h" #include #include -#include // Use QTQuick instead of QTDeclarative in QT5 +#include +#include /** * A class containing a very very small subset of the ZXing library. @@ -15,120 +16,78 @@ * * Regarding DecoderFormat, by default all of those are enabled (except DataMatrix will is still not supported) */ -class -#ifndef DISABLE_LIBRARY_FEATURES - QZXINGSHARED_EXPORT -#endif - QZXing : public QObject{ - +class QZXing : public QObject +{ Q_OBJECT Q_ENUMS(DecoderFormat) - Q_PROPERTY(int processingTime READ getProcessTimeOfLastDecoding) - Q_PROPERTY(uint enabledDecoders READ getEnabledFormats WRITE setDecoder NOTIFY enabledFormatsChanged) public: - /* - * - */ enum DecoderFormat { - DecoderFormat_None = 0, - DecoderFormat_Aztec = 1 << 1, - DecoderFormat_CODABAR = 1 << 2, - DecoderFormat_CODE_39 = 1 << 3, - DecoderFormat_CODE_93 = 1 << 4, - DecoderFormat_CODE_128 = 1 << 5, - DecoderFormat_DATA_MATRIX = 1 << 6, - DecoderFormat_EAN_8 = 1 << 7, - DecoderFormat_EAN_13 = 1 << 8, - DecoderFormat_ITF = 1 << 9, - DecoderFormat_MAXICODE = 1 << 10, - DecoderFormat_PDF_417 = 1 << 11, - DecoderFormat_QR_CODE = 1 << 12, - DecoderFormat_RSS_14 = 1 << 13, - DecoderFormat_RSS_EXPANDED = 1 << 14, - DecoderFormat_UPC_A = 1 << 15, - DecoderFormat_UPC_E = 1 << 16, - DecoderFormat_UPC_EAN_EXTENSION = 1 << 17 - } ; + DecoderFormat_None = 0, + DecoderFormat_QR_CODE = 1, + DecoderFormat_DATA_MATRIX = 2, + DecoderFormat_UPC_E = 4, + DecoderFormat_UPC_A = 8, + DecoderFormat_EAN_8 = 16, + DecoderFormat_EAN_13 = 32, + DecoderFormat_CODE_128 = 64, + DecoderFormat_CODE_39 = 128, + DecoderFormat_ITF = 256, + DecoderFormat_Aztec = 512 + } ; typedef unsigned int DecoderFormatType; +public: QZXing(QObject *parent = NULL); + virtual ~QZXing(); - QZXing(DecoderFormat decodeHints, QObject *parent = NULL); - -#if QT_VERSION >= 0x040700 - static void registerQMLTypes() - { - qmlRegisterType("harbour.sailotp.QZXing", 2, 2, "QZXing"); - } -#endif - -public slots: - /** - * The decoding function. Will try to decode the given image based on the enabled decoders. - * If the image width is larger than maxWidth or image height is larger - * than maxHeight then the image will be scaled down. Either way, in case of scaling, the aspect - * ratio of the image will be kept. - * - * The smoothTransformation flag determines whether the transformation will be smooth or fast. - * Smooth transformation provides better results but fast transformation is...faster. - */ - QString decodeImage(QImage image, int maxWidth=-1, int maxHeight=-1, bool smoothTransformation = false); - - /** - * The decoding function. Will try to decode the given image based on the enabled decoders. - * The input image is read from a local image file. - */ - QString decodeImageFromFile(QString imageFilePath, int maxWidth=-1, int maxHeight=-1, bool smoothTransformation = false); - - /** - * The decoding function accessible from QML - */ - QString decodeImageQML(QObject *item); - - /** - * The decoding function accessible from QML. Able to set the decoding - * of a portion of the image. - */ - QString decodeSubImageQML(QObject* item, - const double offsetX = 0 , const double offsetY = 0, - const double width = 0, const double height = 0); - - /** - * Get the prossecing time in millisecond of the last decode operation. - * Added mainly as a statistic measure. - * Decoding operation fails, the processing time equals to -1. - */ - int getProcessTimeOfLastDecoding(); - - /** - * Get the decoders that are enabled at the moment. - * Returns a uint which is a bitwise OR of DecoderFormat enumeration values. - */ - uint getEnabledFormats() const; /** * Set the enabled decoders. * As argument it is possible to pass conjuction of decoders by using logic OR. * e.x. setDecoder ( DecoderFormat_QR_CODE | DecoderFormat_EAN_13 | DecoderFormat_CODE_39 ) */ - void setDecoder(const uint& hint); + void setDecoder(DecoderFormatType hint); + +#if QT_VERSION >= 0x040700 +static void registerQMLTypes() +{ + qmlRegisterType("harbour.sailotp.QZXing", 2, 2, "QZXing"); +} +#endif + + +public slots: + /** + * The decoding function. Will try to decode the given image based on the enabled decoders. + * + */ + QString decodeImage(QImage image); + QVariantHash decodeImageEx(QImage image); + + /** + * The decoding function accessible from QML + */ + QString decodeImageQML(const QUrl &imageUrl); + + + QString decodeImageFromFile(QString imageFilePath); + + /** + * The decoding function accessible from QML. Able to set the decoding + * of a portion of the image. + */ + QString decodeSubImageQML(const QUrl &imageUrl, + const double offsetX = 0 , const double offsetY = 0, + const double width = 0, const double height = 0); signals: void decodingStarted(); void decodingFinished(bool succeeded); void tagFound(QString tag); - void enabledFormatsChanged(); private: void* decoder; - DecoderFormatType enabledDecoders; - QObject* imageHandler; - int processingTime; - - /** - * If true, the decoding operation will take place at a different thread. - */ - bool isThreaded; + DecoderFormatType supportedFormats; }; #endif // QZXING_H diff --git a/src/qzxing/QZXing_global.h b/src/qzxing/qzxing_global.h similarity index 79% rename from src/qzxing/QZXing_global.h rename to src/qzxing/qzxing_global.h index d55ab05..7b675aa 100644 --- a/src/qzxing/QZXing_global.h +++ b/src/qzxing/qzxing_global.h @@ -1,8 +1,7 @@ #ifndef QZXING_GLOBAL_H #define QZXING_GLOBAL_H -#include -#include +#include #if defined(QZXING_LIBRARY) # define QZXINGSHARED_EXPORT Q_DECL_EXPORT diff --git a/src/qzxing/zxing/zxing/BarcodeFormat.cpp b/src/qzxing/zxing/BarcodeFormat.cpp similarity index 70% rename from src/qzxing/zxing/zxing/BarcodeFormat.cpp rename to src/qzxing/zxing/BarcodeFormat.cpp index a37a294..552ed76 100644 --- a/src/qzxing/zxing/zxing/BarcodeFormat.cpp +++ b/src/qzxing/zxing/BarcodeFormat.cpp @@ -18,23 +18,20 @@ #include -const char* zxing::BarcodeFormat::barcodeFormatNames[] = { - 0, - "AZTEC", - "CODABAR", - "CODE_39", - "CODE_93", - "CODE_128", - "DATA_MATRIX", - "EAN_8", - "EAN_13", - "ITF", - "MAXICODE", - "PDF_417", - "QR_CODE", - "RSS_14", - "RSS_EXPANDED", - "UPC_A", - "UPC_E", - "UPC_EAN_EXTENSION" +namespace zxing { + +const char *barcodeFormatNames[] = { + "None", + "QR_CODE", + "DATA_MATRIX", + "UPC_E", + "UPC_A", + "EAN_8", + "EAN_13", + "CODE_128", + "CODE_39", + "ITF", + "AZTEC" }; + +} diff --git a/src/qzxing/zxing/zxing/BarcodeFormat.h b/src/qzxing/zxing/BarcodeFormat.h similarity index 60% rename from src/qzxing/zxing/zxing/BarcodeFormat.h rename to src/qzxing/zxing/BarcodeFormat.h index 8240097..bbc21a9 100644 --- a/src/qzxing/zxing/zxing/BarcodeFormat.h +++ b/src/qzxing/zxing/BarcodeFormat.h @@ -22,39 +22,23 @@ */ namespace zxing { + + typedef enum BarcodeFormat { + BarcodeFormat_None = 0, + BarcodeFormat_QR_CODE, + BarcodeFormat_DATA_MATRIX, + BarcodeFormat_UPC_E, + BarcodeFormat_UPC_A, + BarcodeFormat_EAN_8, + BarcodeFormat_EAN_13, + BarcodeFormat_CODE_128, + BarcodeFormat_CODE_39, + BarcodeFormat_ITF, + BarcodeFormat_AZTEC + } BarcodeFormat; -class BarcodeFormat { -public: - // if you update the enum, update BarcodeFormat.cpp - - enum Value { - NONE, - AZTEC, - CODABAR, - CODE_39, - CODE_93, - CODE_128, - DATA_MATRIX, - EAN_8, - EAN_13, - ITF, - MAXICODE, - PDF_417, - QR_CODE, - RSS_14, - RSS_EXPANDED, - UPC_A, - UPC_E, - UPC_EAN_EXTENSION - }; - - BarcodeFormat(Value v) : value(v) {} - const Value value; - operator Value () const {return value;} - - static char const* barcodeFormatNames[]; -}; - + /* if you update the enum, please update the name in BarcodeFormat.cpp */ + extern const char *barcodeFormatNames[]; } #endif // __BARCODE_FORMAT_H__ diff --git a/src/qzxing/zxing/zxing/Binarizer.cpp b/src/qzxing/zxing/Binarizer.cpp similarity index 84% rename from src/qzxing/zxing/zxing/Binarizer.cpp rename to src/qzxing/zxing/Binarizer.cpp index 974ba38..ff6cbab 100644 --- a/src/qzxing/zxing/zxing/Binarizer.cpp +++ b/src/qzxing/zxing/Binarizer.cpp @@ -33,13 +33,5 @@ namespace zxing { Ref Binarizer::getLuminanceSource() const { return source_; } - - int Binarizer::getWidth() const { - return source_->getWidth(); - } - - int Binarizer::getHeight() const { - return source_->getHeight(); - } } diff --git a/src/qzxing/zxing/zxing/Binarizer.h b/src/qzxing/zxing/Binarizer.h similarity index 92% rename from src/qzxing/zxing/zxing/Binarizer.h rename to src/qzxing/zxing/Binarizer.h index bd0b0bd..e7292b0 100644 --- a/src/qzxing/zxing/zxing/Binarizer.h +++ b/src/qzxing/zxing/Binarizer.h @@ -40,10 +40,6 @@ class Binarizer : public Counted { Ref getLuminanceSource() const ; virtual Ref createBinarizer(Ref source) = 0; - - int getWidth() const; - int getHeight() const; - }; } diff --git a/src/qzxing/zxing/BinaryBitmap.cpp b/src/qzxing/zxing/BinaryBitmap.cpp new file mode 100644 index 0000000..8538931 --- /dev/null +++ b/src/qzxing/zxing/BinaryBitmap.cpp @@ -0,0 +1,67 @@ +/* + * BinaryBitmap.cpp + * zxing + * + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +namespace zxing { + + BinaryBitmap::BinaryBitmap(Ref binarizer) : binarizer_(binarizer) { + + } + + BinaryBitmap::~BinaryBitmap() { + } + + Ref BinaryBitmap::getBlackRow(int y, Ref row) { + return binarizer_->getBlackRow(y, row); + } + + Ref BinaryBitmap::getBlackMatrix() { + return binarizer_->getBlackMatrix(); + } + + int BinaryBitmap::getWidth() const { + return getLuminanceSource()->getWidth(); + } + + int BinaryBitmap::getHeight() const { + return getLuminanceSource()->getHeight(); + } + + Ref BinaryBitmap::getLuminanceSource() const { + return binarizer_->getLuminanceSource(); + } + + + bool BinaryBitmap::isCropSupported() const { + return getLuminanceSource()->isCropSupported(); + } + + Ref BinaryBitmap::crop(int left, int top, int width, int height) { + return Ref (new BinaryBitmap(binarizer_->createBinarizer(getLuminanceSource()->crop(left, top, width, height)))); + } + + bool BinaryBitmap::isRotateSupported() const { + return getLuminanceSource()->isRotateSupported(); + } + + Ref BinaryBitmap::rotateCounterClockwise() { + return Ref (new BinaryBitmap(binarizer_->createBinarizer(getLuminanceSource()->rotateCounterClockwise()))); + } +} diff --git a/src/qzxing/zxing/zxing/BinaryBitmap.h b/src/qzxing/zxing/BinaryBitmap.h similarity index 95% rename from src/qzxing/zxing/zxing/BinaryBitmap.h rename to src/qzxing/zxing/BinaryBitmap.h index cd14a73..391eb2e 100644 --- a/src/qzxing/zxing/zxing/BinaryBitmap.h +++ b/src/qzxing/zxing/BinaryBitmap.h @@ -30,6 +30,7 @@ namespace zxing { class BinaryBitmap : public Counted { private: Ref binarizer_; + int cached_y_; public: BinaryBitmap(Ref binarizer); diff --git a/src/qzxing/zxing/DecodeHints.cpp b/src/qzxing/zxing/DecodeHints.cpp new file mode 100644 index 0000000..0842c30 --- /dev/null +++ b/src/qzxing/zxing/DecodeHints.cpp @@ -0,0 +1,120 @@ +/* + * DecodeHintType.cpp + * zxing + * + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +namespace zxing { + +const DecodeHintType DecodeHints::CHARACTER_SET; + +const DecodeHints DecodeHints::PRODUCT_HINT( + BARCODEFORMAT_UPC_E_HINT | + BARCODEFORMAT_UPC_A_HINT | + BARCODEFORMAT_EAN_8_HINT | + BARCODEFORMAT_EAN_13_HINT); + +const DecodeHints DecodeHints::ONED_HINT( + BARCODEFORMAT_UPC_E_HINT | + BARCODEFORMAT_UPC_A_HINT | + BARCODEFORMAT_EAN_8_HINT | + BARCODEFORMAT_EAN_13_HINT | + BARCODEFORMAT_CODE_128_HINT | + BARCODEFORMAT_CODE_39_HINT | + BARCODEFORMAT_ITF_HINT); + +const DecodeHints DecodeHints::DEFAULT_HINT( + BARCODEFORMAT_UPC_E_HINT | + BARCODEFORMAT_UPC_A_HINT | + BARCODEFORMAT_EAN_8_HINT | + BARCODEFORMAT_EAN_13_HINT | + BARCODEFORMAT_CODE_128_HINT | + BARCODEFORMAT_CODE_39_HINT | + BARCODEFORMAT_ITF_HINT | + BARCODEFORMAT_DATA_MATRIX_HINT | + BARCODEFORMAT_AZTEC_HINT | + BARCODEFORMAT_QR_CODE_HINT); + +DecodeHints::DecodeHints() { + hints = 0; +} + +DecodeHints::DecodeHints(DecodeHintType init) { + hints = init; +} + +void DecodeHints::addFormat(BarcodeFormat toadd) { + switch (toadd) { + case BarcodeFormat_AZTEC: hints |= BARCODEFORMAT_AZTEC_HINT; break; + case BarcodeFormat_QR_CODE: hints |= BARCODEFORMAT_QR_CODE_HINT; break; + case BarcodeFormat_DATA_MATRIX: hints |= BARCODEFORMAT_DATA_MATRIX_HINT; break; + case BarcodeFormat_UPC_E: hints |= BARCODEFORMAT_UPC_E_HINT; break; + case BarcodeFormat_UPC_A: hints |= BARCODEFORMAT_UPC_A_HINT; break; + case BarcodeFormat_EAN_8: hints |= BARCODEFORMAT_EAN_8_HINT; break; + case BarcodeFormat_EAN_13: hints |= BARCODEFORMAT_EAN_13_HINT; break; + case BarcodeFormat_CODE_128: hints |= BARCODEFORMAT_CODE_128_HINT; break; + case BarcodeFormat_CODE_39: hints |= BARCODEFORMAT_CODE_39_HINT; break; + case BarcodeFormat_ITF: hints |= BARCODEFORMAT_ITF_HINT; break; + default: throw IllegalArgumentException("Unrecognizd barcode format"); + } +} + +bool DecodeHints::containsFormat(BarcodeFormat tocheck) const { + DecodeHintType checkAgainst; + switch (tocheck) { + case BarcodeFormat_AZTEC: checkAgainst = BARCODEFORMAT_AZTEC_HINT; break; + case BarcodeFormat_QR_CODE: checkAgainst = BARCODEFORMAT_QR_CODE_HINT; break; + case BarcodeFormat_DATA_MATRIX: checkAgainst = BARCODEFORMAT_DATA_MATRIX_HINT; break; + case BarcodeFormat_UPC_E: checkAgainst = BARCODEFORMAT_UPC_E_HINT; break; + case BarcodeFormat_UPC_A: checkAgainst = BARCODEFORMAT_UPC_A_HINT; break; + case BarcodeFormat_EAN_8: checkAgainst = BARCODEFORMAT_EAN_8_HINT; break; + case BarcodeFormat_EAN_13: checkAgainst = BARCODEFORMAT_EAN_13_HINT; break; + case BarcodeFormat_CODE_128: checkAgainst = BARCODEFORMAT_CODE_128_HINT; break; + case BarcodeFormat_CODE_39: checkAgainst = BARCODEFORMAT_CODE_39_HINT; break; + case BarcodeFormat_ITF: checkAgainst = BARCODEFORMAT_ITF_HINT; break; + default: throw IllegalArgumentException("Unrecognizd barcode format"); + } + return (hints & checkAgainst); +} + +void DecodeHints::setTryHarder(bool toset) { + if (toset) { + hints |= TRYHARDER_HINT; + } else { + hints &= ~TRYHARDER_HINT; + } +} + +bool DecodeHints::getTryHarder() const { + return (hints & TRYHARDER_HINT); +} + +void DecodeHints::setResultPointCallback(Ref const& _callback) { + callback = _callback; +} + +Ref DecodeHints::getResultPointCallback() const { + return callback; +} + +DecodeHintType DecodeHints::getCurrentHint() +{ + return hints; +} + +} /* namespace */ diff --git a/src/qzxing/zxing/DecodeHints.h b/src/qzxing/zxing/DecodeHints.h new file mode 100644 index 0000000..04f9c9c --- /dev/null +++ b/src/qzxing/zxing/DecodeHints.h @@ -0,0 +1,72 @@ +#ifndef __DECODEHINTS_H_ +#define __DECODEHINTS_H_ +/* + * DecodeHintType.h + * zxing + * + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +namespace zxing { + +typedef unsigned int DecodeHintType; + +class DecodeHints { + + private: + + DecodeHintType hints; + + Ref callback; + + public: + + static const DecodeHintType BARCODEFORMAT_QR_CODE_HINT = 1 << BarcodeFormat_QR_CODE; + static const DecodeHintType BARCODEFORMAT_DATA_MATRIX_HINT = 1 << BarcodeFormat_DATA_MATRIX; + static const DecodeHintType BARCODEFORMAT_UPC_E_HINT = 1 << BarcodeFormat_UPC_E; + static const DecodeHintType BARCODEFORMAT_UPC_A_HINT = 1 << BarcodeFormat_UPC_A; + static const DecodeHintType BARCODEFORMAT_EAN_8_HINT = 1 << BarcodeFormat_EAN_8; + static const DecodeHintType BARCODEFORMAT_EAN_13_HINT = 1 << BarcodeFormat_EAN_13; + static const DecodeHintType BARCODEFORMAT_CODE_128_HINT = 1 << BarcodeFormat_CODE_128; + static const DecodeHintType BARCODEFORMAT_CODE_39_HINT = 1 << BarcodeFormat_CODE_39; + static const DecodeHintType BARCODEFORMAT_ITF_HINT = 1 << BarcodeFormat_ITF; + static const DecodeHintType BARCODEFORMAT_AZTEC_HINT = 1 << BarcodeFormat_AZTEC; + static const DecodeHintType CHARACTER_SET = 1 << 30; + static const DecodeHintType TRYHARDER_HINT = 1 << 31; + + static const DecodeHints PRODUCT_HINT; + static const DecodeHints ONED_HINT; + static const DecodeHints DEFAULT_HINT; + + DecodeHints(); + DecodeHints(DecodeHintType init); + + void addFormat(BarcodeFormat toadd); + bool containsFormat(BarcodeFormat tocheck) const; + void setTryHarder(bool toset); + bool getTryHarder() const; + + void setResultPointCallback(Ref const&); + Ref getResultPointCallback() const; + + DecodeHintType getCurrentHint(); +}; + +} + +#endif diff --git a/src/qzxing/zxing/zxing/Exception.cpp b/src/qzxing/zxing/Exception.cpp similarity index 68% rename from src/qzxing/zxing/zxing/Exception.cpp rename to src/qzxing/zxing/Exception.cpp index 1f512d9..1cb8036 100644 --- a/src/qzxing/zxing/zxing/Exception.cpp +++ b/src/qzxing/zxing/Exception.cpp @@ -20,24 +20,21 @@ */ -#include #include -#include -using zxing::Exception; +namespace zxing { -void Exception::deleteMessage() { - delete [] message; +Exception::Exception() {} + +Exception::Exception(const char *msg) : + message(msg) { +} + +const char* Exception::what() const throw() { + return message.c_str(); +} + +Exception::~Exception() throw() { } -char const* Exception::copy(char const* msg) { - char* message = 0; - if (msg) { - int l = strlen(msg)+1; - if (l) { - message = new char[l]; - strcpy(message, msg); - } - } - return message; } diff --git a/src/qzxing/zxing/zxing/Exception.h b/src/qzxing/zxing/Exception.h similarity index 59% rename from src/qzxing/zxing/zxing/Exception.h rename to src/qzxing/zxing/Exception.h index 3f6ef3b..719d41f 100644 --- a/src/qzxing/zxing/zxing/Exception.h +++ b/src/qzxing/zxing/Exception.h @@ -1,4 +1,3 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- #ifndef __EXCEPTION_H__ #define __EXCEPTION_H__ @@ -28,24 +27,14 @@ namespace zxing { class Exception : public std::exception { private: - char const* const message; + std::string message; public: - Exception() throw() : message(0) {} - Exception(const char* msg) throw() : message(copy(msg)) {} - Exception(Exception const& that) throw() : std::exception(that), message(copy(that.message)) {} - ~Exception() throw() { - if(message) { - deleteMessage(); - } - } - char const* what() const throw() {return message ? message : "";} - -private: - static char const* copy(char const*); - void deleteMessage(); + Exception(); + Exception(const char *msg); + virtual const char* what() const throw(); + virtual ~Exception() throw(); }; } - #endif // __EXCEPTION_H__ diff --git a/src/qzxing/zxing/zxing/FormatException.cpp b/src/qzxing/zxing/FormatException.cpp similarity index 86% rename from src/qzxing/zxing/zxing/FormatException.cpp rename to src/qzxing/zxing/FormatException.cpp index 9136626..fe9b103 100644 --- a/src/qzxing/zxing/zxing/FormatException.cpp +++ b/src/qzxing/zxing/FormatException.cpp @@ -32,10 +32,4 @@ FormatException::FormatException(const char *msg) : FormatException::~FormatException() throw() { } -FormatException const& -FormatException::getFormatInstance() { - static FormatException instance; - return instance; -} - } diff --git a/src/qzxing/zxing/zxing/FormatException.h b/src/qzxing/zxing/FormatException.h similarity index 91% rename from src/qzxing/zxing/zxing/FormatException.h rename to src/qzxing/zxing/FormatException.h index 71b3d3e..fd18e69 100644 --- a/src/qzxing/zxing/zxing/FormatException.h +++ b/src/qzxing/zxing/FormatException.h @@ -29,8 +29,6 @@ public: FormatException(); FormatException(const char *msg); ~FormatException() throw(); - - static FormatException const& getFormatInstance(); }; } diff --git a/src/qzxing/zxing/zxing/LuminanceSource.cpp b/src/qzxing/zxing/LuminanceSource.cpp similarity index 57% rename from src/qzxing/zxing/zxing/LuminanceSource.cpp rename to src/qzxing/zxing/LuminanceSource.cpp index 4178314..77f1290 100644 --- a/src/qzxing/zxing/zxing/LuminanceSource.cpp +++ b/src/qzxing/zxing/LuminanceSource.cpp @@ -20,21 +20,25 @@ #include #include -#include #include -using zxing::Ref; -using zxing::LuminanceSource; +namespace zxing { -LuminanceSource::LuminanceSource(int width_, int height_) :width(width_), height(height_) {} +LuminanceSource::LuminanceSource() { +} -LuminanceSource::~LuminanceSource() {} +LuminanceSource::~LuminanceSource() { +} bool LuminanceSource::isCropSupported() const { return false; } -Ref LuminanceSource::crop(int, int, int, int) const { +Ref LuminanceSource::crop(int left, int top, int width, int height) { + (void)left; + (void)top; + (void)width; + (void)height; throw IllegalArgumentException("This luminance source does not support cropping."); } @@ -42,12 +46,12 @@ bool LuminanceSource::isRotateSupported() const { return false; } -Ref LuminanceSource::rotateCounterClockwise() const { +Ref LuminanceSource::rotateCounterClockwise() { throw IllegalArgumentException("This luminance source does not support rotation."); } -LuminanceSource::operator std::string() const { - ArrayRef row; +LuminanceSource::operator std::string() { + unsigned char* row = 0; std::ostringstream oss; for (int y = 0; y < getHeight(); y++) { row = getRow(y, row); @@ -67,20 +71,10 @@ LuminanceSource::operator std::string() const { } oss << '\n'; } + delete [] row; return oss.str(); } -Ref LuminanceSource::invert() const { - // N.B.: this only works because we use counted objects with the - // count in the object. This is _not_ how things like shared_ptr - // work. They do not allow you to make a smart pointer from a native - // pointer more than once. If we ever switch to (something like) - // shared_ptr's, the luminace source is going to have keep a weak - // pointer to itself from which it can create a strong pointer as - // needed. And, FWIW, that has nasty semantics in the face of - // exceptions during construction. - return Ref - (new InvertedLuminanceSource(Ref(const_cast(this)))); } diff --git a/src/qzxing/zxing/zxing/LuminanceSource.h b/src/qzxing/zxing/LuminanceSource.h similarity index 68% rename from src/qzxing/zxing/zxing/LuminanceSource.h rename to src/qzxing/zxing/LuminanceSource.h index 7250698..5d8cba2 100644 --- a/src/qzxing/zxing/zxing/LuminanceSource.h +++ b/src/qzxing/zxing/LuminanceSource.h @@ -21,37 +21,30 @@ */ #include -#include #include namespace zxing { class LuminanceSource : public Counted { - protected: - int width; - int height; - - public: - LuminanceSource(int width, int height); +public: + LuminanceSource(); virtual ~LuminanceSource(); - int getWidth() const { return width; } - int getHeight() const { return height; } + virtual int getWidth() const = 0; + virtual int getHeight() const = 0; // Callers take ownership of the returned memory and must call delete [] on it themselves. - virtual ArrayRef getRow(int y, ArrayRef row) const = 0; - virtual ArrayRef getMatrix() const = 0; + virtual unsigned char* getRow(int y, unsigned char* row) = 0; + virtual unsigned char* getMatrix() = 0; virtual bool isCropSupported() const; - virtual Ref crop(int left, int top, int width, int height) const; + virtual Ref crop(int left, int top, int width, int height); virtual bool isRotateSupported() const; + virtual Ref rotateCounterClockwise(); - virtual Ref invert() const; - - virtual Ref rotateCounterClockwise() const; - - operator std::string () const; + operator std::string (); // should be const but don't want to make sure a + // large breaking change right now }; } diff --git a/src/qzxing/zxing/MultiFormatReader.cpp b/src/qzxing/zxing/MultiFormatReader.cpp new file mode 100644 index 0000000..8e6f72f --- /dev/null +++ b/src/qzxing/zxing/MultiFormatReader.cpp @@ -0,0 +1,106 @@ +/* + * MultiFormatBarcodeReader.cpp + * ZXing + * + * Created by Lukasz Warchol on 10-01-26. + * Modified by Luiz Silva on 09/02/2010. + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include +#include +#include +#include + +namespace zxing { + MultiFormatReader::MultiFormatReader() { + + } + + Ref MultiFormatReader::decode(Ref image) { + setHints(DecodeHints::DEFAULT_HINT); + return decodeInternal(image); + } + + Ref MultiFormatReader::decode(Ref image, DecodeHints hints) { + setHints(hints); + return decodeInternal(image); + } + + Ref MultiFormatReader::decodeWithState(Ref image) { + // Make sure to set up the default state so we don't crash + if (readers_.size() == 0) { + setHints(DecodeHints::DEFAULT_HINT); + } + return decodeInternal(image); + } + + void MultiFormatReader::setHints(DecodeHints hints) { + hints_ = hints; + readers_.clear(); + bool tryHarder = hints.getTryHarder(); + + bool addOneDReader = hints.containsFormat(BarcodeFormat_UPC_E) || + hints.containsFormat(BarcodeFormat_UPC_A) || + hints.containsFormat(BarcodeFormat_EAN_8) || + hints.containsFormat(BarcodeFormat_EAN_13) || + hints.containsFormat(BarcodeFormat_CODE_128) || + hints.containsFormat(BarcodeFormat_CODE_39) || + hints.containsFormat(BarcodeFormat_ITF); + if (addOneDReader && !tryHarder) { + readers_.push_back(Ref(new zxing::oned::MultiFormatOneDReader(hints))); + } + if (hints.containsFormat(BarcodeFormat_QR_CODE)) { + readers_.push_back(Ref(new zxing::qrcode::QRCodeReader())); + } + if (hints.containsFormat(BarcodeFormat_DATA_MATRIX)) { + readers_.push_back(Ref(new zxing::datamatrix::DataMatrixReader())); + } + if (hints.containsFormat(BarcodeFormat_AZTEC)) { + readers_.push_back(Ref(new zxing::aztec::AztecReader())); + } + //TODO: add PDF417 here once PDF417 reader is implemented + if (addOneDReader && tryHarder) { + readers_.push_back(Ref(new zxing::oned::MultiFormatOneDReader(hints))); + } + if (readers_.size() == 0) { + if (!tryHarder) { + readers_.push_back(Ref(new zxing::oned::MultiFormatOneDReader(hints))); + } + readers_.push_back(Ref(new zxing::qrcode::QRCodeReader())); + if (tryHarder) { + readers_.push_back(Ref(new zxing::oned::MultiFormatOneDReader(hints))); + } + } + } + + Ref MultiFormatReader::decodeInternal(Ref image) { + for (unsigned int i = 0; i < readers_.size(); i++) { + try { + return readers_[i]->decode(image, hints_); + } catch (ReaderException const& re) { + // continue + } + } + throw ReaderException("No code detected"); + } + + MultiFormatReader::~MultiFormatReader() { + + } +} diff --git a/src/qzxing/zxing/zxing/MultiFormatReader.h b/src/qzxing/zxing/MultiFormatReader.h similarity index 96% rename from src/qzxing/zxing/zxing/MultiFormatReader.h rename to src/qzxing/zxing/MultiFormatReader.h index 14e3db2..f4b377c 100644 --- a/src/qzxing/zxing/zxing/MultiFormatReader.h +++ b/src/qzxing/zxing/MultiFormatReader.h @@ -28,6 +28,7 @@ namespace zxing { class MultiFormatReader : public Reader { + private: Ref decodeInternal(Ref image); diff --git a/src/qzxing/zxing/zxing/ChecksumException.h b/src/qzxing/zxing/NotFoundException.cpp similarity index 64% rename from src/qzxing/zxing/zxing/ChecksumException.h rename to src/qzxing/zxing/NotFoundException.cpp index 9a48ce2..985043a 100644 --- a/src/qzxing/zxing/zxing/ChecksumException.h +++ b/src/qzxing/zxing/NotFoundException.cpp @@ -1,8 +1,4 @@ // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- - -#ifndef __CHECKSUM_EXCEPTION_H__ -#define __NOT_FOUND_EXCEPTION_H__ - /* * Copyright 20011 ZXing authors * @@ -19,16 +15,14 @@ * limitations under the License. */ -#include +#include namespace zxing { - class ChecksumException : public ReaderException { - typedef ReaderException Base; - public: - ChecksumException() throw(); - ChecksumException(const char *msg) throw(); - ~ChecksumException() throw(); - }; -} -#endif // __CHECKSUM_EXCEPTION_H__ + NotFoundException::NotFoundException(const char *msg) + : ReaderException(msg) {} + + NotFoundException::~NotFoundException() throw() { + } + +} diff --git a/src/qzxing/zxing/zxing/NotFoundException.h b/src/qzxing/zxing/NotFoundException.h similarity index 78% rename from src/qzxing/zxing/zxing/NotFoundException.h rename to src/qzxing/zxing/NotFoundException.h index df7b5d0..407caa9 100644 --- a/src/qzxing/zxing/zxing/NotFoundException.h +++ b/src/qzxing/zxing/NotFoundException.h @@ -23,13 +23,11 @@ namespace zxing { -class NotFoundException : public ReaderException { -public: - NotFoundException() throw() {} - NotFoundException(const char *msg) throw() : ReaderException(msg) {} - ~NotFoundException() throw() {} -}; + class NotFoundException : public ReaderException { + public: + NotFoundException(const char *msg); + ~NotFoundException() throw(); + }; } - #endif // __NOT_FOUND_EXCEPTION_H__ diff --git a/src/qzxing/zxing/zxing/Reader.cpp b/src/qzxing/zxing/Reader.cpp similarity index 100% rename from src/qzxing/zxing/zxing/Reader.cpp rename to src/qzxing/zxing/Reader.cpp diff --git a/src/qzxing/zxing/zxing/Reader.h b/src/qzxing/zxing/Reader.h similarity index 100% rename from src/qzxing/zxing/zxing/Reader.h rename to src/qzxing/zxing/Reader.h diff --git a/src/qzxing/zxing/zxing/ChecksumException.cpp b/src/qzxing/zxing/ReaderException.cpp similarity index 65% rename from src/qzxing/zxing/zxing/ChecksumException.cpp rename to src/qzxing/zxing/ReaderException.cpp index 6b98665..7321f17 100644 --- a/src/qzxing/zxing/zxing/ChecksumException.cpp +++ b/src/qzxing/zxing/ReaderException.cpp @@ -1,10 +1,10 @@ // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- /* - * ChecksumException.cpp + * ReaderException.cpp * zxing * * Created by Christian Brunschen on 13/05/2008. - * Copyright 2008 ZXing authors All rights reserved. + * Copyright 2008-2011 ZXing authors All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,10 +19,17 @@ * limitations under the License. */ -#include +#include -using zxing::ChecksumException; +namespace zxing { -ChecksumException::ChecksumException() throw() {} -ChecksumException::ChecksumException(const char *msg) throw() : ReaderException(msg) {} -ChecksumException::~ChecksumException() throw() {} +ReaderException::ReaderException() {} + +ReaderException::ReaderException(const char *msg) : + Exception(msg) { +} + +ReaderException::~ReaderException() throw() { +} + +} diff --git a/src/qzxing/zxing/zxing/ReaderException.h b/src/qzxing/zxing/ReaderException.h similarity index 77% rename from src/qzxing/zxing/zxing/ReaderException.h rename to src/qzxing/zxing/ReaderException.h index 2f135b9..17b471b 100644 --- a/src/qzxing/zxing/zxing/ReaderException.h +++ b/src/qzxing/zxing/ReaderException.h @@ -1,4 +1,3 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- #ifndef __READER_EXCEPTION_H__ #define __READER_EXCEPTION_H__ @@ -26,12 +25,11 @@ namespace zxing { class ReaderException : public Exception { - public: - ReaderException() throw() {} - ReaderException(char const* msg) throw() : Exception(msg) {} - ~ReaderException() throw() {} +public: + ReaderException(); + ReaderException(const char *msg); + ~ReaderException() throw(); }; } - #endif // __READER_EXCEPTION_H__ diff --git a/src/qzxing/zxing/zxing/Result.cpp b/src/qzxing/zxing/Result.cpp similarity index 62% rename from src/qzxing/zxing/zxing/Result.cpp rename to src/qzxing/zxing/Result.cpp index 609d063..ccaf669 100644 --- a/src/qzxing/zxing/zxing/Result.cpp +++ b/src/qzxing/zxing/Result.cpp @@ -21,18 +21,10 @@ #include -using zxing::Result; -using zxing::Ref; -using zxing::ArrayRef; -using zxing::String; -using zxing::ResultPoint; +namespace zxing { +using namespace std; -// VC++ -using zxing::BarcodeFormat; - -Result::Result(Ref text, - ArrayRef rawBytes, - ArrayRef< Ref > resultPoints, +Result::Result(Ref text, ArrayRef rawBytes, std::vector > resultPoints, BarcodeFormat format) : text_(text), rawBytes_(rawBytes), resultPoints_(resultPoints), format_(format) { } @@ -44,18 +36,29 @@ Ref Result::getText() { return text_; } -ArrayRef Result::getRawBytes() { +ArrayRef Result::getRawBytes() { return rawBytes_; } -ArrayRef< Ref > const& Result::getResultPoints() const { +const std::vector >& Result::getResultPoints() const { return resultPoints_; } -ArrayRef< Ref >& Result::getResultPoints() { +std::vector >& Result::getResultPoints() { return resultPoints_; } -zxing::BarcodeFormat Result::getBarcodeFormat() const { +BarcodeFormat Result::getBarcodeFormat() const { return format_; } + +ostream& operator<<(ostream &out, Result& result) { + if (result.text_ != 0) { + out << result.text_->getText(); + } else { + out << "[" << result.rawBytes_->size() << " bytes]"; + } + return out; +} + +} diff --git a/src/qzxing/zxing/zxing/Result.h b/src/qzxing/zxing/Result.h similarity index 73% rename from src/qzxing/zxing/zxing/Result.h rename to src/qzxing/zxing/Result.h index 0a4ae80..030bba7 100644 --- a/src/qzxing/zxing/zxing/Result.h +++ b/src/qzxing/zxing/Result.h @@ -21,6 +21,7 @@ */ #include +#include #include #include #include @@ -32,20 +33,18 @@ namespace zxing { class Result : public Counted { private: Ref text_; - ArrayRef rawBytes_; - ArrayRef< Ref > resultPoints_; + ArrayRef rawBytes_; + std::vector > resultPoints_; BarcodeFormat format_; public: - Result(Ref text, - ArrayRef rawBytes, - ArrayRef< Ref > resultPoints, + Result(Ref text, ArrayRef rawBytes, std::vector > resultPoints, BarcodeFormat format); ~Result(); Ref getText(); - ArrayRef getRawBytes(); - ArrayRef< Ref > const& getResultPoints() const; - ArrayRef< Ref >& getResultPoints(); + ArrayRef getRawBytes(); + const std::vector >& getResultPoints() const; + std::vector >& getResultPoints(); BarcodeFormat getBarcodeFormat() const; friend std::ostream& operator<<(std::ostream &out, Result& result); diff --git a/src/qzxing/zxing/zxing/ResultPoint.cpp b/src/qzxing/zxing/ResultPoint.cpp similarity index 84% rename from src/qzxing/zxing/zxing/ResultPoint.cpp rename to src/qzxing/zxing/ResultPoint.cpp index bf9ec51..6fb05fe 100644 --- a/src/qzxing/zxing/zxing/ResultPoint.cpp +++ b/src/qzxing/zxing/ResultPoint.cpp @@ -1,4 +1,3 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- /* * ResultPoint.cpp * zxing @@ -20,17 +19,13 @@ */ #include -#include - -using zxing::common::detector::MathUtils; +#include namespace zxing { ResultPoint::ResultPoint() : posX_(0), posY_(0) {} ResultPoint::ResultPoint(float x, float y) : posX_(x), posY_(y) {} - -ResultPoint::ResultPoint(int x, int y) : posX_(float(x)), posY_(float(y)) {} ResultPoint::~ResultPoint() {} @@ -87,11 +82,8 @@ void ResultPoint::orderBestPatterns(std::vector > &patterns) { patterns[2] = pointC; } - float ResultPoint::distance(Ref pattern1, Ref pattern2) { - return MathUtils::distance(pattern1->posX_, - pattern1->posY_, - pattern2->posX_, - pattern2->posY_); +float ResultPoint::distance(Ref point1, Ref point2) { + return distance(point1->getX(), point1->getY(), point2->getX(), point2->getY()); } float ResultPoint::distance(float x1, float x2, float y1, float y2) { diff --git a/src/qzxing/zxing/zxing/ResultPoint.h b/src/qzxing/zxing/ResultPoint.h similarity index 92% rename from src/qzxing/zxing/zxing/ResultPoint.h rename to src/qzxing/zxing/ResultPoint.h index cb4332c..d7561c7 100644 --- a/src/qzxing/zxing/zxing/ResultPoint.h +++ b/src/qzxing/zxing/ResultPoint.h @@ -28,13 +28,12 @@ namespace zxing { class ResultPoint : public Counted { protected: - const float posX_; - const float posY_; + float posX_; + float posY_; public: ResultPoint(); ResultPoint(float x, float y); - ResultPoint(int x, int y); virtual ~ResultPoint(); virtual float getX() const; diff --git a/src/qzxing/zxing/zxing/ResultPointCallback.cpp b/src/qzxing/zxing/ResultPointCallback.cpp similarity index 100% rename from src/qzxing/zxing/zxing/ResultPointCallback.cpp rename to src/qzxing/zxing/ResultPointCallback.cpp diff --git a/src/qzxing/zxing/zxing/ResultPointCallback.h b/src/qzxing/zxing/ResultPointCallback.h similarity index 100% rename from src/qzxing/zxing/zxing/ResultPointCallback.h rename to src/qzxing/zxing/ResultPointCallback.h diff --git a/src/qzxing/zxing/zxing/aztec/AztecDetectorResult.cpp b/src/qzxing/zxing/aztec/AztecDetectorResult.cpp similarity index 51% rename from src/qzxing/zxing/zxing/aztec/AztecDetectorResult.cpp rename to src/qzxing/zxing/aztec/AztecDetectorResult.cpp index 8a46956..ade9ef0 100644 --- a/src/qzxing/zxing/zxing/aztec/AztecDetectorResult.cpp +++ b/src/qzxing/zxing/aztec/AztecDetectorResult.cpp @@ -21,34 +21,25 @@ #include -using zxing::aztec::AztecDetectorResult; - -// VC++ -using zxing::Ref; -using zxing::ArrayRef; -using zxing::BitMatrix; -using zxing::ResultPoint; - - -AztecDetectorResult::AztecDetectorResult(Ref bits, - ArrayRef< Ref > points, - bool compact, - int nbDatablocks, - int nbLayers) - : DetectorResult(bits, points), - compact_(compact), - nbDatablocks_(nbDatablocks), - nbLayers_(nbLayers) { +namespace zxing { + namespace aztec { + AztecDetectorResult::AztecDetectorResult(Ref bits, std::vector > points, bool compact, int nbDatablocks, int nbLayers) + : DetectorResult(bits, points), + compact_(compact), + nbDatablocks_(nbDatablocks), + nbLayers_(nbLayers) { + } + + bool AztecDetectorResult::isCompact() { + return compact_; + } + + int AztecDetectorResult::getNBDatablocks() { + return nbDatablocks_; + } + + int AztecDetectorResult::getNBLayers() { + return nbLayers_; + } } - -bool AztecDetectorResult::isCompact() { - return compact_; -} - -int AztecDetectorResult::getNBDatablocks() { - return nbDatablocks_; -} - -int AztecDetectorResult::getNBLayers() { - return nbLayers_; } diff --git a/src/qzxing/zxing/zxing/aztec/AztecDetectorResult.h b/src/qzxing/zxing/aztec/AztecDetectorResult.h similarity index 66% rename from src/qzxing/zxing/zxing/aztec/AztecDetectorResult.h rename to src/qzxing/zxing/aztec/AztecDetectorResult.h index 0b1f74f..28822e5 100644 --- a/src/qzxing/zxing/zxing/aztec/AztecDetectorResult.h +++ b/src/qzxing/zxing/aztec/AztecDetectorResult.h @@ -25,24 +25,18 @@ #define ZXingWidget_AtztecDetecorResult_h namespace zxing { -namespace aztec { - -class AztecDetectorResult : public DetectorResult { - private: - bool compact_; - int nbDatablocks_, nbLayers_; - public: - AztecDetectorResult(Ref bits, - ArrayRef< Ref > points, - bool compact, - int nbDatablocks, - int nbLayers); - bool isCompact(); - int getNBDatablocks(); - int getNBLayers(); -}; - -} + namespace aztec { + class AztecDetectorResult : public DetectorResult { + private: + bool compact_; + int nbDatablocks_, nbLayers_; + public: + AztecDetectorResult(Ref bits, std::vector > points, bool compact, int nbDatablocks, int nbLayers); + bool isCompact(); + int getNBDatablocks(); + int getNBLayers(); + }; + } } #endif diff --git a/src/qzxing/zxing/aztec/AztecReader.cpp b/src/qzxing/zxing/aztec/AztecReader.cpp new file mode 100644 index 0000000..8600163 --- /dev/null +++ b/src/qzxing/zxing/aztec/AztecReader.cpp @@ -0,0 +1,64 @@ +// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- +/* + * AztecReader.cpp + * zxing + * + * Created by Lukas Stabe on 08/02/2012. + * Copyright 2012 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include + +namespace zxing { + namespace aztec { + + AztecReader::AztecReader() : decoder_() { + // nothing + } + + Ref AztecReader::decode(Ref image) { + Detector detector(image->getBlackMatrix()); + + Ref detectorResult(detector.detect()); + + std::vector > points(detectorResult->getPoints()); + + Ref decoderResult(decoder_.decode(detectorResult)); + + Ref result(new Result(decoderResult->getText(), + decoderResult->getRawBytes(), + points, + BarcodeFormat_AZTEC)); + + return result; + } + + Ref AztecReader::decode(Ref image, DecodeHints) { + //cout << "decoding with hints not supported for aztec" << "\n" << flush; + return this->decode(image); + } + + AztecReader::~AztecReader() { + // nothing + } + + Decoder& AztecReader::getDecoder() { + return decoder_; + } + + } +} diff --git a/src/qzxing/zxing/zxing/aztec/AztecReader.h b/src/qzxing/zxing/aztec/AztecReader.h similarity index 68% rename from src/qzxing/zxing/zxing/aztec/AztecReader.h rename to src/qzxing/zxing/aztec/AztecReader.h index a8728d0..ede8a4d 100644 --- a/src/qzxing/zxing/zxing/aztec/AztecReader.h +++ b/src/qzxing/zxing/aztec/AztecReader.h @@ -27,23 +27,23 @@ #define ZXingWidget_AztecReader_h namespace zxing { -namespace aztec { + namespace aztec { -class AztecReader : public Reader { - private: - Decoder decoder_; + class AztecReader : public Reader { + private: + Decoder decoder_; - protected: - Decoder &getDecoder(); + protected: + Decoder &getDecoder(); - public: - AztecReader(); - virtual Ref decode(Ref image); - virtual Ref decode(Ref image, DecodeHints hints); - virtual ~AztecReader(); -}; + public: + AztecReader(); + virtual Ref decode(Ref image); + virtual Ref decode(Ref image, DecodeHints hints); + virtual ~AztecReader(); + }; -} + } } #endif diff --git a/src/qzxing/zxing/aztec/decoder/AztecDecoder.cpp b/src/qzxing/zxing/aztec/decoder/AztecDecoder.cpp new file mode 100644 index 0000000..f88df80 --- /dev/null +++ b/src/qzxing/zxing/aztec/decoder/AztecDecoder.cpp @@ -0,0 +1,496 @@ +// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- +/* + * Decoder.cpp + * zxing + * + * Created by Lukas Stabe on 08/02/2012. + * Copyright 2012 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#ifndef NO_ICONV +#include +#endif +#include +#include +#include +#include +#include +#include + +#include + +using zxing::aztec::Decoder; +using zxing::DecoderResult; +using zxing::String; +using zxing::BitArray; +using zxing::BitMatrix; +using zxing::Ref; + +using std::string; + +namespace { + void add(string& result, unsigned char character) { +#ifndef NO_ICONV + char s[] = { character & 0xff }; + char* ss = s; + size_t sl = sizeof(s); + char d[4]; + char* ds = d; + size_t dl = sizeof(d); + iconv_t ic = iconv_open("UTF-8", "ISO-8859-1"); + + +#if defined(Q_OS_SYMBIAN) + iconv(ic, (const char**)&ss, &sl, &ds, &dl); // for Symbian and Mingw +#else + iconv(ic, (char**)&ss, &sl, &ds, &dl); // for Harmattan +#endif + iconv_close(ic); + d[sizeof(d)-dl] = 0; + result.append(d); +#else + result.push_back(character); +#endif + } + + const int NB_BITS_COMPACT[] = { + 0, 104, 240, 408, 608 + }; + + const int NB_BITS[] = { + 0, 128, 288, 480, 704, 960, 1248, 1568, 1920, 2304, 2720, 3168, 3648, 4160, 4704, 5280, 5888, 6528, + 7200, 7904, 8640, 9408, 10208, 11040, 11904, 12800, 13728, 14688, 15680, 16704, 17760, 18848, 19968 + }; + + const int NB_DATABLOCK_COMPACT[] = { + 0, 17, 40, 51, 76 + }; + + const int NB_DATABLOCK[] = { + 0, 21, 48, 60, 88, 120, 156, 196, 240, 230, 272, 316, 364, 416, 470, 528, 588, 652, 720, 790, 864, + 940, 1020, 920, 992, 1066, 1144, 1224, 1306, 1392, 1480, 1570, 1664 + }; + + const char* UPPER_TABLE[] = { + "CTRL_PS", " ", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", + "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "CTRL_LL", "CTRL_ML", "CTRL_DL", "CTRL_BS" + }; + + const char* LOWER_TABLE[] = { + "CTRL_PS", " ", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", + "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "CTRL_US", "CTRL_ML", "CTRL_DL", "CTRL_BS" + }; + + const char* MIXED_TABLE[] = { + "CTRL_PS", " ", "\1", "\2", "\3", "\4", "\5", "\6", "\7", "\b", "\t", "\n", + "\13", "\f", "\r", "\33", "\34", "\35", "\36", "\37", "@", "\\", "^", "_", + "`", "|", "~", "\177", "CTRL_LL", "CTRL_UL", "CTRL_PL", "CTRL_BS" + }; + + const char* PUNCT_TABLE[] = { + "", "\r", "\r\n", ". ", ", ", ": ", "!", "\"", "#", "$", "%", "&", "'", "(", ")", + "*", "+", ",", "-", ".", "/", ":", ";", "<", "=", ">", "?", "[", "]", "{", "}", "CTRL_UL" + }; + + const char* DIGIT_TABLE[] = { + "CTRL_PS", " ", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ",", ".", "CTRL_UL", "CTRL_US" + }; +} + +Decoder::Table Decoder::getTable(char t) { + switch (t) { + case 'L': + return LOWER; + case 'P': + return PUNCT; + case 'M': + return MIXED; + case 'D': + return DIGIT; + case 'B': + return BINARY; + case 'U': + default: + return UPPER; + } +} + +const char* Decoder::getCharacter(zxing::aztec::Decoder::Table table, int code) { + switch (table) { + case UPPER: + return UPPER_TABLE[code]; + case LOWER: + return LOWER_TABLE[code]; + case MIXED: + return MIXED_TABLE[code]; + case PUNCT: + return PUNCT_TABLE[code]; + case DIGIT: + return DIGIT_TABLE[code]; + default: + return ""; + } +} + +Decoder::Decoder() { + // nothing +} + +Ref Decoder::decode(Ref detectorResult) { + ddata_ = detectorResult; + + // std::printf("getting bits\n"); + + Ref matrix = detectorResult->getBits(); + + if (!ddata_->isCompact()) { + // std::printf("removing lines\n"); + matrix = removeDashedLines(ddata_->getBits()); + } + + // std::printf("extracting bits\n"); + Ref rawbits = extractBits(matrix); + + // std::printf("correcting bits\n"); + Ref aCorrectedBits = correctBits(rawbits); + + // std::printf("decoding bits\n"); + Ref result = getEncodedData(aCorrectedBits); + + // std::printf("constructing array\n"); + ArrayRef arrayOut(aCorrectedBits->getSize()); + for (int i = 0; i < aCorrectedBits->count(); i++) { + arrayOut[i] = (unsigned char)aCorrectedBits->get(i); + } + + // std::printf("returning\n"); + + return Ref(new DecoderResult(arrayOut, result)); +} + +Ref Decoder::getEncodedData(Ref correctedBits) { + int endIndex = codewordSize_ * ddata_->getNBDatablocks() - invertedBitCount_; + if (endIndex > (int)correctedBits->getSize()) { + // std::printf("invalid input\n"); + throw FormatException("invalid input data"); + } + + Table lastTable = UPPER; + Table table = UPPER; + int startIndex = 0; + std::string result; + bool end = false; + bool shift = false; + bool switchShift = false; + bool binaryShift = false; + + while (!end) { + // std::printf("decoooooding\n"); + + if (shift) { + switchShift = true; + } else { + lastTable = table; + } + + int code; + if (binaryShift) { + if (endIndex - startIndex < 5) { + break; + } + + int length = readCode(correctedBits, startIndex, 5); + startIndex += 5; + if (length == 0) { + if (endIndex - startIndex < 11) { + break; + } + + length = readCode(correctedBits, startIndex, 11) + 31; + startIndex += 11; + } + for (int charCount = 0; charCount < length; charCount++) { + if (endIndex - startIndex < 8) { + end = true; + break; + } + + code = readCode(correctedBits, startIndex, 8); + add(result, code); + startIndex += 8; + } + binaryShift = false; + } else { + if (table == BINARY) { + if (endIndex - startIndex < 8) { + end = true; + break; + } + code = readCode(correctedBits, startIndex, 8); + startIndex += 8; + + add(result, code); + } else { + int size = 5; + + if (table == DIGIT) { + size = 4; + } + + if (endIndex - startIndex < size) { + end = true; + break; + } + + code = readCode(correctedBits, startIndex, size); + startIndex += size; + + const char *str = getCharacter(table, code); + std::string string(str); + if ((int)string.find("CTRL_") != -1) { + table = getTable(str[5]); + + if (str[6] == 'S') { + shift = true; + if (str[5] == 'B') { + binaryShift = true; + } + } + } else { + result.append(string); + } + + } + } + + if (switchShift) { + table = lastTable; + shift = false; + switchShift = false; + } + + + } + + return Ref(new String(result)); + +} + +Ref Decoder::correctBits(Ref rawbits) { + //return rawbits; + // std::printf("decoding stuff:%d datablocks in %d layers\n", ddata_->getNBDatablocks(), ddata_->getNBLayers()); + + Ref gf = GenericGF::AZTEC_DATA_6; + + if (ddata_->getNBLayers() <= 2) { + codewordSize_ = 6; + gf = GenericGF::AZTEC_DATA_6; + } else if (ddata_->getNBLayers() <= 8) { + codewordSize_ = 8; + gf = GenericGF::AZTEC_DATA_8; + } else if (ddata_->getNBLayers() <= 22) { + codewordSize_ = 10; + gf = GenericGF::AZTEC_DATA_10; + } else { + codewordSize_ = 12; + gf = GenericGF::AZTEC_DATA_12; + } + + int numDataCodewords = ddata_->getNBDatablocks(); + int numECCodewords; + int offset; + + if (ddata_->isCompact()) { + offset = NB_BITS_COMPACT[ddata_->getNBLayers()] - numCodewords_ * codewordSize_; + numECCodewords = NB_DATABLOCK_COMPACT[ddata_->getNBLayers()] - numDataCodewords; + } else { + offset = NB_BITS[ddata_->getNBLayers()] - numCodewords_ * codewordSize_; + numECCodewords = NB_DATABLOCK[ddata_->getNBLayers()] - numDataCodewords; + } + + ArrayRef dataWords(numCodewords_); + + for (int i = 0; i < numCodewords_; i++) { + int flag = 1; + for (int j = 1; j <= codewordSize_; j++) { + if (rawbits->get(codewordSize_ * i + codewordSize_ - j + offset)) { + dataWords[i] += flag; + } + flag <<= 1; + } + + // + // + // + } + + try { + // std::printf("trying reed solomon, numECCodewords:%d\n", numECCodewords); + ReedSolomonDecoder rsDecoder(gf); + rsDecoder.decode(dataWords, numECCodewords); + } catch (ReedSolomonException& rse) { + // std::printf("got reed solomon exception:%s, throwing formatexception\n", rse.what()); + throw FormatException("rs decoding failed"); + } catch (IllegalArgumentException& iae) { + // std::printf("illegal argument exception: %s", iae.what()); + } + + offset = 0; + invertedBitCount_ = 0; + + Ref correctedBits(new BitArray(numDataCodewords * codewordSize_)); + for (int i = 0; i < numDataCodewords; i++) { + + bool seriesColor = false; + int seriesCount = 0; + int flag = 1 << (codewordSize_ - 1); + + for (int j = 0; j < codewordSize_; j++) { + + bool color = (dataWords[i] & flag) == flag; + + if (seriesCount == codewordSize_ - 1) { + + if (color == seriesColor) { + throw FormatException("bit was not inverted"); + } + + seriesColor = false; + seriesCount = 0; + offset++; + invertedBitCount_++; + + } else { + + if (seriesColor == color) { + seriesCount++; + } else { + seriesCount = 1; + seriesColor = color; + } + + if (color) correctedBits->set(i * codewordSize_ + j - offset); + + } + + flag = (unsigned int)flag >> 1; + + } + } + + return correctedBits; +} + +Ref Decoder::extractBits(Ref matrix) { + std::vector rawbits; + + if (ddata_->isCompact()) { + if (ddata_->getNBLayers() > 5) { //NB_BITS_COMPACT length + throw FormatException("data is too long"); + } + rawbits = std::vector(NB_BITS_COMPACT[ddata_->getNBLayers()]); + numCodewords_ = NB_DATABLOCK_COMPACT[ddata_->getNBLayers()]; + } else { + if (ddata_->getNBLayers() > 33) { //NB_BITS length + throw FormatException("data is too long"); + } + rawbits = std::vector(NB_BITS[ddata_->getNBLayers()]); + numCodewords_ = NB_DATABLOCK[ddata_->getNBLayers()]; + } + + int layer = ddata_->getNBLayers(); + int size = matrix->getHeight(); + int rawbitsOffset = 0; + int matrixOffset = 0; + + + while (layer != 0) { + + int flip = 0; + for (int i = 0; i < 2 * size - 4; i++) { + rawbits[rawbitsOffset + i] = matrix->get(matrixOffset + flip, matrixOffset + i / 2); + rawbits[rawbitsOffset + 2 * size - 4 + i] = matrix->get(matrixOffset + i / 2, matrixOffset + size - 1 - flip); + flip = (flip + 1) % 2; + } + + flip = 0; + for (int i = 2 * size + 1; i > 5; i--) { + rawbits[rawbitsOffset + 4 * size - 8 + (2 * size - i) + 1] = + matrix->get(matrixOffset + size - 1 - flip, matrixOffset + i / 2 - 1); + rawbits[rawbitsOffset + 6 * size - 12 + (2 * size - i) + 1] = + matrix->get(matrixOffset + i / 2 - 1, matrixOffset + flip); + flip = (flip + 1) % 2; + } + + matrixOffset += 2; + rawbitsOffset += 8 * size - 16; + layer--; + size -= 4; + + } + + Ref returnValue(new BitArray(rawbits.size())); + for (int i = 0; i < (int)rawbits.size(); i++) { + if (rawbits[i]) returnValue->set(i); + } + + return returnValue; + +} + +Ref Decoder::removeDashedLines(Ref matrix) { + int nbDashed = 1 + 2 * ((matrix->getWidth() - 1) / 2 / 16); + Ref newMatrix(new BitMatrix(matrix->getWidth() - nbDashed, matrix->getHeight() - nbDashed)); + + int nx = 0; + + for (int x = 0; x < (int)matrix->getWidth(); x++) { + + if ((matrix->getWidth() / 2 - x) % 16 == 0) { + continue; + } + + int ny = 0; + for (int y = 0; y < (int)matrix->getHeight(); y++) { + + if ((matrix->getWidth() / 2 - y) % 16 == 0) { + continue; + } + + if (matrix->get(x, y)) { + newMatrix->set(nx, ny); + } + ny++; + + } + nx++; + + } + return newMatrix; +} + +int Decoder::readCode(Ref rawbits, int startIndex, int length) { + int res = 0; + + for (int i = startIndex; i < startIndex + length; i++) { + res <<= 1; + if (rawbits->get(i)) { + res ++; + } + } + + return res; +} diff --git a/src/qzxing/zxing/aztec/decoder/Decoder.h b/src/qzxing/zxing/aztec/decoder/Decoder.h new file mode 100644 index 0000000..6e8a5d0 --- /dev/null +++ b/src/qzxing/zxing/aztec/decoder/Decoder.h @@ -0,0 +1,63 @@ +// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- +/* + * Decoder.h + * zxing + * + * Created by Lukas Stabe on 08/02/2012. + * Copyright 2012 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include + +namespace zxing { + namespace aztec { + + class Decoder : public Counted { + private: + enum Table { + UPPER, + LOWER, + MIXED, + DIGIT, + PUNCT, + BINARY + }; + + static Table getTable(char t); + static const char* getCharacter(Table table, int code); + + int numCodewords_; + int codewordSize_; + Ref ddata_; + int invertedBitCount_; + + Ref getEncodedData(Ref correctedBits); + Ref correctBits(Ref rawbits); + Ref extractBits(Ref matrix); + static Ref removeDashedLines(Ref matrix); + static int readCode(Ref rawbits, int startIndex, int length); + + + public: + Decoder(); + Ref decode(Ref detectorResult); + }; + + } +} + diff --git a/src/qzxing/zxing/zxing/aztec/detector/AztecDetector.cpp b/src/qzxing/zxing/aztec/detector/AztecDetector.cpp similarity index 67% rename from src/qzxing/zxing/zxing/aztec/detector/AztecDetector.cpp rename to src/qzxing/zxing/aztec/detector/AztecDetector.cpp index d0c58fc..f903721 100644 --- a/src/qzxing/zxing/zxing/aztec/detector/AztecDetector.cpp +++ b/src/qzxing/zxing/aztec/detector/AztecDetector.cpp @@ -26,20 +26,17 @@ #include #include #include -#include +#include #include -using std::vector; using zxing::aztec::Detector; using zxing::aztec::Point; using zxing::aztec::AztecDetectorResult; using zxing::Ref; -using zxing::ArrayRef; using zxing::ResultPoint; using zxing::BitArray; using zxing::BitMatrix; -using zxing::common::detector::MathUtils; - + Detector::Detector(Ref image): image_(image), nbLayers_(0), @@ -48,21 +45,18 @@ Detector::Detector(Ref image): } +// using namespace std; + Ref Detector::detect() { Ref pCenter = getMatrixCenter(); std::vector > bullEyeCornerPoints = getBullEyeCornerPoints(pCenter); extractParameters(bullEyeCornerPoints); - - ArrayRef< Ref > corners = getMatrixCornerPoints(bullEyeCornerPoints); - Ref bits = - sampleGrid(image_, - corners[shift_%4], - corners[(shift_+3)%4], - corners[(shift_+2)%4], - corners[(shift_+1)%4]); + std::vector > corners = getMatrixCornerPoints(bullEyeCornerPoints); + + Ref bits = sampleGrid(image_, corners[shift_%4], corners[(shift_+3)%4], corners[(shift_+2)%4], corners[(shift_+1)%4]); // std::printf("------------\ndetected: compact:%s, nbDataBlocks:%d, nbLayers:%d\n------------\n",compact_?"YES":"NO", nbDataBlocks_, nbLayers_); @@ -70,21 +64,20 @@ Ref Detector::detect() { } void Detector::extractParameters(std::vector > bullEyeCornerPoints) { - int twoCenterLayers = 2 * nbCenterLayers_; // get the bits around the bull's eye - Ref resab = sampleLine(bullEyeCornerPoints[0], bullEyeCornerPoints[1], twoCenterLayers+1); - Ref resbc = sampleLine(bullEyeCornerPoints[1], bullEyeCornerPoints[2], twoCenterLayers+1); - Ref rescd = sampleLine(bullEyeCornerPoints[2], bullEyeCornerPoints[3], twoCenterLayers+1); - Ref resda = sampleLine(bullEyeCornerPoints[3], bullEyeCornerPoints[0], twoCenterLayers+1); + Ref resab = sampleLine(bullEyeCornerPoints[0], bullEyeCornerPoints[1], 2*nbCenterLayers_+1); + Ref resbc = sampleLine(bullEyeCornerPoints[1], bullEyeCornerPoints[2], 2*nbCenterLayers_+1); + Ref rescd = sampleLine(bullEyeCornerPoints[2], bullEyeCornerPoints[3], 2*nbCenterLayers_+1); + Ref resda = sampleLine(bullEyeCornerPoints[3], bullEyeCornerPoints[0], 2*nbCenterLayers_+1); // determin the orientation of the matrix - if (resab->get(0) && resab->get(twoCenterLayers)) { + if (resab->get(0) && resab->get(2 * nbCenterLayers_)) { shift_ = 0; - } else if (resbc->get(0) && resbc->get(twoCenterLayers)) { + } else if (resbc->get(0) && resbc->get(2 * nbCenterLayers_)) { shift_ = 1; - } else if (rescd->get(0) && rescd->get(twoCenterLayers)) { + } else if (rescd->get(0) && rescd->get(2 * nbCenterLayers_)) { shift_ = 2; - } else if (resda->get(0) && resda->get(twoCenterLayers)) { + } else if (resda->get(0) && resda->get(2 * nbCenterLayers_)) { shift_ = 3; } else { // std::printf("could not detemine orientation\n"); @@ -120,9 +113,9 @@ void Detector::extractParameters(std::vector > bullEyeCornerPoints) { } if (i > 5) { if (resab->get(2+i)) shiftedParameterData->set(i-1); - if (resbc->get(2+i)) shiftedParameterData->set(i+9); - if (rescd->get(2+i)) shiftedParameterData->set(i+19); - if (resda->get(2+i)) shiftedParameterData->set(i+29); + if (resbc->get(2+i)) shiftedParameterData->set(i+10-1); + if (rescd->get(2+i)) shiftedParameterData->set(i+20-1); + if (resda->get(2+i)) shiftedParameterData->set(i+30-1); } } for (int i = 0; i < 40; i++) { @@ -135,45 +128,44 @@ void Detector::extractParameters(std::vector > bullEyeCornerPoints) { getParameters(parameterData); } -ArrayRef< Ref > -Detector::getMatrixCornerPoints(std::vector > bullEyeCornerPoints) { +std::vector > Detector::getMatrixCornerPoints(std::vector > bullEyeCornerPoints) { float ratio = (2 * nbLayers_ + (nbLayers_ > 4 ? 1 : 0) + (nbLayers_ - 4) / 8) / (2.0f * nbCenterLayers_); - int dx = bullEyeCornerPoints[0]->getX() - bullEyeCornerPoints[2]->getX(); + int dx = bullEyeCornerPoints[0]->x - bullEyeCornerPoints[2]->x; dx += dx > 0 ? 1 : -1; - int dy = bullEyeCornerPoints[0]->getY() - bullEyeCornerPoints[2]->getY(); + int dy = bullEyeCornerPoints[0]->y - bullEyeCornerPoints[2]->y; dy += dy > 0 ? 1 : -1; - int targetcx = MathUtils::round(bullEyeCornerPoints[2]->getX() - ratio * dx); - int targetcy = MathUtils::round(bullEyeCornerPoints[2]->getY() - ratio * dy); + int targetcx = ROUND(bullEyeCornerPoints[2]->x - ratio * dx); + int targetcy = ROUND(bullEyeCornerPoints[2]->y - ratio * dy); - int targetax = MathUtils::round(bullEyeCornerPoints[0]->getX() + ratio * dx); - int targetay = MathUtils::round(bullEyeCornerPoints[0]->getY() + ratio * dy); + int targetax = ROUND(bullEyeCornerPoints[0]->x + ratio * dx); + int targetay = ROUND(bullEyeCornerPoints[0]->y + ratio * dy); - dx = bullEyeCornerPoints[1]->getX() - bullEyeCornerPoints[3]->getX(); + dx = bullEyeCornerPoints[1]->x - bullEyeCornerPoints[3]->x; dx += dx > 0 ? 1 : -1; - dy = bullEyeCornerPoints[1]->getY() - bullEyeCornerPoints[3]->getY(); + dy = bullEyeCornerPoints[1]->y - bullEyeCornerPoints[3]->y; dy += dy > 0 ? 1 : -1; - int targetdx = MathUtils::round(bullEyeCornerPoints[3]->getX() - ratio * dx); - int targetdy = MathUtils::round(bullEyeCornerPoints[3]->getY() - ratio * dy); - int targetbx = MathUtils::round(bullEyeCornerPoints[1]->getX() + ratio * dx); - int targetby = MathUtils::round(bullEyeCornerPoints[1]->getY() + ratio * dy); + int targetdx = ROUND(bullEyeCornerPoints[3]->x - ratio * dx); + int targetdy = ROUND(bullEyeCornerPoints[3]->y - ratio * dy); + int targetbx = ROUND(bullEyeCornerPoints[1]->x + ratio * dx); + int targetby = ROUND(bullEyeCornerPoints[1]->y + ratio * dy); if (!isValid(targetax, targetay) || !isValid(targetbx, targetby) || - !isValid(targetcx, targetcy) || !isValid(targetdx, targetdy)) { throw ReaderException("matrix extends over image bounds"); } - Array< Ref >* array = new Array< Ref >(); - vector< Ref >& returnValue (array->values()); - returnValue.push_back(Ref(new ResultPoint(float(targetax), float(targetay)))); - returnValue.push_back(Ref(new ResultPoint(float(targetbx), float(targetby)))); - returnValue.push_back(Ref(new ResultPoint(float(targetcx), float(targetcy)))); - returnValue.push_back(Ref(new ResultPoint(float(targetdx), float(targetdy)))); - return ArrayRef< Ref >(array); + std::vector > returnValue; + returnValue.push_back(Ref(new ResultPoint(targetax, targetay))); + returnValue.push_back(Ref(new ResultPoint(targetbx, targetby))); + returnValue.push_back(Ref(new ResultPoint(targetcx, targetcy))); + returnValue.push_back(Ref(new ResultPoint(targetdx, targetdy))); + + return returnValue; + } void Detector::correctParameterData(Ref parameterData, bool compact) { @@ -207,8 +199,7 @@ void Detector::correctParameterData(Ref parameterData, bool com // std::printf("parameter data reed solomon\n"); ReedSolomonDecoder rsDecoder(GenericGF::AZTEC_PARAM); rsDecoder.decode(parameterWords, numECCodewords); - } catch (ReedSolomonException const& ignored) { - (void)ignored; + } catch (ReedSolomonException& e) { // std::printf("reed solomon decoding failed\n"); throw ReaderException("failed to decode parameter data"); } @@ -268,21 +259,21 @@ std::vector > Detector::getBullEyeCornerPoints(RefgetX() - pind->getX(); - int dy = pina->getY() - pinc->getY(); + int dx = pina->x - pind->x; + int dy = pina->y - pinc->y; - int targetcx = MathUtils::round(pinc->getX() - ratio * dx); - int targetcy = MathUtils::round(pinc->getY() - ratio * dy); - int targetax = MathUtils::round(pina->getX() + ratio * dx); - int targetay = MathUtils::round(pina->getY() + ratio * dy); + int targetcx = ROUND(pinc->x - ratio * dx); + int targetcy = ROUND(pinc->y - ratio * dy); + int targetax = ROUND(pina->x + ratio * dx); + int targetay = ROUND(pina->y + ratio * dy); - dx = pinb->getX() - pind->getX(); - dy = pinb->getY() - pind->getY(); + dx = pinb->x - pind->x; + dy = pinb->y - pind->y; - int targetdx = MathUtils::round(pind->getX() - ratio * dx); - int targetdy = MathUtils::round(pind->getY() - ratio * dy); - int targetbx = MathUtils::round(pinb->getX() + ratio * dx); - int targetby = MathUtils::round(pinb->getY() + ratio * dy); + int targetdx = ROUND(pind->x - ratio * dx); + int targetdy = ROUND(pind->y - ratio * dy); + int targetbx = ROUND(pinb->x + ratio * dx); + int targetby = ROUND(pinb->y + ratio * dy); if (!isValid(targetax, targetay) || !isValid(targetbx, targetby) || @@ -311,21 +302,20 @@ Ref Detector::getMatrixCenter() { pointC = cornerPoints[2]; pointD = cornerPoints[3]; - } catch (NotFoundException const& e) { - (void)e; + } catch (NotFoundException& e) { int cx = image_->getWidth() / 2; int cy = image_->getHeight() / 2; - pointA = getFirstDifferent(Ref(new Point(cx+7, cy-7)), false, 1, -1)->toResultPoint(); - pointB = getFirstDifferent(Ref(new Point(cx+7, cy+7)), false, 1, 1)->toResultPoint(); - pointC = getFirstDifferent(Ref(new Point(cx-7, cy+7)), false, -1, -1)->toResultPoint(); - pointD = getFirstDifferent(Ref(new Point(cx-7, cy-7)), false, -1, -1)->toResultPoint(); + pointA = getFirstDifferent(Ref(new Point(cx+15/2, cy-15/2)), false, 1, -1)->toResultPoint(); + pointB = getFirstDifferent(Ref(new Point(cx+15/2, cy+15/2)), false, 1, 1)->toResultPoint(); + pointC = getFirstDifferent(Ref(new Point(cx-15/2, cy+15/2)), false, -1, -1)->toResultPoint(); + pointD = getFirstDifferent(Ref(new Point(cx-15/2, cy-15/2)), false, -1, -1)->toResultPoint(); } - int cx = MathUtils::round((pointA->getX() + pointD->getX() + pointB->getX() + pointC->getX()) / 4.0f); - int cy = MathUtils::round((pointA->getY() + pointD->getY() + pointB->getY() + pointC->getY()) / 4.0f); + int cx = ROUND((pointA->getX() + pointD->getX() + pointB->getX() + pointC->getX()) / 4); + int cy = ROUND((pointA->getY() + pointD->getY() + pointB->getY() + pointC->getY()) / 4); try { @@ -335,18 +325,17 @@ Ref Detector::getMatrixCenter() { pointC = cornerPoints[2]; pointD = cornerPoints[3]; - } catch (NotFoundException const& e) { - (void)e; + } catch (NotFoundException& e) { - pointA = getFirstDifferent(Ref(new Point(cx+7, cy-7)), false, 1, -1)->toResultPoint(); - pointB = getFirstDifferent(Ref(new Point(cx+7, cy+7)), false, 1, 1)->toResultPoint(); - pointC = getFirstDifferent(Ref(new Point(cx-7, cy+7)), false, -1, 1)->toResultPoint(); - pointD = getFirstDifferent(Ref(new Point(cx-7, cy-7)), false, -1, -1)->toResultPoint(); + pointA = getFirstDifferent(Ref(new Point(cx+15/2, cy-15/2)), false, 1, -1)->toResultPoint(); + pointB = getFirstDifferent(Ref(new Point(cx+15/2, cy+15/2)), false, 1, 1)->toResultPoint(); + pointC = getFirstDifferent(Ref(new Point(cx-15/2, cy+15/2)), false, -1, -1)->toResultPoint(); + pointD = getFirstDifferent(Ref(new Point(cx-15/2, cy-15/2)), false, -1, -1)->toResultPoint(); } - cx = MathUtils::round((pointA->getX() + pointD->getX() + pointB->getX() + pointC->getX()) / 4.0f); - cy = MathUtils::round((pointA->getY() + pointD->getY() + pointB->getY() + pointC->getY()) / 4.0f); + cx = ROUND((pointA->getX() + pointD->getX() + pointB->getX() + pointC->getX()) / 4); + cy = ROUND((pointA->getY() + pointD->getY() + pointB->getY() + pointC->getY()) / 4); return Ref(new Point(cx, cy)); @@ -408,19 +397,19 @@ void Detector::getParameters(Ref parameterData) { for (int i = 0; i < nbBitsForNbLayers; i++) { nbLayers_ <<= 1; if (parameterData->get(i)) { - nbLayers_++; + nbLayers_ += 1; } } for (int i = nbBitsForNbLayers; i < nbBitsForNbLayers + nbBitsForNbDatablocks; i++) { nbDataBlocks_ <<= 1; if (parameterData->get(i)) { - nbDataBlocks_++; + nbDataBlocks_ += 1; } } - nbLayers_++; - nbDataBlocks_++; + nbLayers_ ++; + nbDataBlocks_ ++; } Ref Detector::sampleLine(Ref p1, Ref p2, int size) { @@ -428,16 +417,16 @@ Ref Detector::sampleLine(Ref p1, RefgetX() - p1->getX())/d; - float dy = moduleSize * float(p2->getY() - p1->getY())/d; - - float px = float(p1->getX()); - float py = float(p1->getY()); + float dx = moduleSize * (p2->x - p1->x)/d; + float dy = moduleSize * (p2->y - p1->y)/d; + + float px = p1->x; + float py = p1->y; for (int i = 0; i < size; i++) { - if (image_->get(MathUtils::round(px), MathUtils::round(py))) res->set(i); - px+=dx; - py+=dy; + if (image_->get(ROUND(px), ROUND(py))) res->set(i); + px += dx; + py += dy; } return res; @@ -449,10 +438,10 @@ bool Detector::isWhiteOrBlackRectangle(Ref p1, Ref p4) { int corr = 3; - p1 = new Point(p1->getX() - corr, p1->getY() + corr); - p2 = new Point(p2->getX() - corr, p2->getY() - corr); - p3 = new Point(p3->getX() + corr, p3->getY() - corr); - p4 = new Point(p4->getX() + corr, p4->getY() + corr); + p1 = new Point(p1->x - corr, p1->y + corr); + p2 = new Point(p2->x - corr, p2->y - corr); + p3 = new Point(p3->x + corr, p3->y - corr); + p4 = new Point(p4->x + corr, p4->y + corr); int cInit = getColor(p4, p1); @@ -484,20 +473,20 @@ bool Detector::isWhiteOrBlackRectangle(Ref p1, int Detector::getColor(Ref p1, Ref p2) { float d = distance(p1, p2); - float dx = (p2->getX() - p1->getX()) / d; - float dy = (p2->getY() - p1->getY()) / d; + float dx = (p2->x - p1->x) / d; + float dy = (p2->y - p1->y) / d; int error = 0; - float px = float(p1->getX()); - float py = float(p1->getY()); + float px = p1->x; + float py = p1->y; - bool colorModel = image_->get(p1->getX(), p1->getY()); + bool colorModel = image_->get(p1->x, p1->y); for (int i = 0; i < d; i++) { px += dx; py += dy; - if (image_->get(MathUtils::round(px), MathUtils::round(py)) != colorModel) { + if (image_->get(ROUND(px), ROUND(py)) != colorModel) { error ++; } } @@ -505,16 +494,20 @@ int Detector::getColor(Ref p1, Ref p2) float errRatio = (float)error/d; - if (errRatio > 0.1f && errRatio < 0.9f) { + if (errRatio > 0.1 && errRatio < 0.9) { return 0; } - return (errRatio <= 0.1) == colorModel ? 1 : -1; + if (errRatio <= 0.1) { + return colorModel?1:-1; + } else { + return colorModel?-1:1; + } } Ref Detector::getFirstDifferent(Ref init, bool color, int dx, int dy) { - int x = init->getX() + dx; - int y = init->getY() + dy; + int x = init->x + dx; + int y = init->y + dy; while (isValid(x, y) && image_->get(x, y) == color) { x += dx; @@ -538,11 +531,11 @@ Ref Detector::getFirstDifferent(Ref init, bool color return Ref(new Point(x, y)); } - + bool Detector::isValid(int x, int y) { return x >= 0 && x < (int)image_->getWidth() && y > 0 && y < (int)image_->getHeight(); } float Detector::distance(Ref a, Ref b) { - return sqrtf((float)((a->getX() - b->getX()) * (a->getX() - b->getX()) + (a->getY() - b->getY()) * (a->getY() - b->getY()))); + return sqrtf((float)((a->x - b->x) * (a->x - b->x) + (a->y - b->y) * (a->y - b->y))); } diff --git a/src/qzxing/zxing/aztec/detector/Detector.h b/src/qzxing/zxing/aztec/detector/Detector.h new file mode 100644 index 0000000..0722971 --- /dev/null +++ b/src/qzxing/zxing/aztec/detector/Detector.h @@ -0,0 +1,87 @@ +// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- +/* + * Detector.h + * zxing + * + * Created by Lukas Stabe on 08/02/2012. + * Copyright 2012 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +#include + +#include +#include +#include +#include +#include + +#define ROUND(a) ((int)(a + 0.5f)) + +namespace zxing { + namespace aztec { + + class Point : public Counted { + public: + int x; + int y; + + Ref toResultPoint() { + return Ref(new ResultPoint(x, y)); + } + + Point(int ax, int ay):x(ax),y(ay) {}; + + }; + + class Detector : public Counted { + + private: + Ref image_; + + bool compact_; + int nbLayers_; + int nbDataBlocks_; + int nbCenterLayers_; + int shift_; + + void extractParameters(std::vector > bullEyeCornerPoints); + std::vector > getMatrixCornerPoints(std::vector > bullEyeCornerPoints); + static void correctParameterData(Ref parameterData, bool compact); + std::vector > getBullEyeCornerPoints(Ref pCenter); + Ref getMatrixCenter(); + Ref sampleGrid(Ref image, + Ref topLeft, + Ref bottomLeft, + Ref bottomRight, + Ref topRight); + void getParameters(Ref parameterData); + Ref sampleLine(Ref p1, Ref p2, int size); + bool isWhiteOrBlackRectangle(Ref p1, + Ref p2, + Ref p3, + Ref p4); + int getColor(Ref p1, Ref p2); + Ref getFirstDifferent(Ref init, bool color, int dx, int dy); + bool isValid(int x, int y); + static float distance(Ref a, Ref b); + + public: + Detector(Ref image); + Ref detect(); + }; + + } +} diff --git a/src/qzxing/zxing/bigint/BigInteger.cc b/src/qzxing/zxing/bigint/BigInteger.cc deleted file mode 100644 index e2d0a75..0000000 --- a/src/qzxing/zxing/bigint/BigInteger.cc +++ /dev/null @@ -1,405 +0,0 @@ -#include "BigInteger.hh" - -void BigInteger::operator =(const BigInteger &x) { - // Calls like a = a have no effect - if (this == &x) - return; - // Copy sign - sign = x.sign; - // Copy the rest - mag = x.mag; -} - -BigInteger::BigInteger(const Blk *b, Index blen, Sign s) : mag(b, blen) { - switch (s) { - case zero: - if (!mag.isZero()) - throw "BigInteger::BigInteger(const Blk *, Index, Sign): Cannot use a sign of zero with a nonzero magnitude"; - sign = zero; - break; - case positive: - case negative: - // If the magnitude is zero, force the sign to zero. - sign = mag.isZero() ? zero : s; - break; - default: - /* g++ seems to be optimizing out this case on the assumption - * that the sign is a valid member of the enumeration. Oh well. */ - throw "BigInteger::BigInteger(const Blk *, Index, Sign): Invalid sign"; - } -} - -BigInteger::BigInteger(const BigUnsigned &x, Sign s) : mag(x) { - switch (s) { - case zero: - if (!mag.isZero()) - throw "BigInteger::BigInteger(const BigUnsigned &, Sign): Cannot use a sign of zero with a nonzero magnitude"; - sign = zero; - break; - case positive: - case negative: - // If the magnitude is zero, force the sign to zero. - sign = mag.isZero() ? zero : s; - break; - default: - /* g++ seems to be optimizing out this case on the assumption - * that the sign is a valid member of the enumeration. Oh well. */ - throw "BigInteger::BigInteger(const BigUnsigned &, Sign): Invalid sign"; - } -} - -/* CONSTRUCTION FROM PRIMITIVE INTEGERS - * Same idea as in BigUnsigned.cc, except that negative input results in a - * negative BigInteger instead of an exception. */ - -// Done longhand to let us use initialization. -BigInteger::BigInteger(unsigned long x) : mag(x) { sign = mag.isZero() ? zero : positive; } -BigInteger::BigInteger(unsigned int x) : mag(x) { sign = mag.isZero() ? zero : positive; } -BigInteger::BigInteger(unsigned short x) : mag(x) { sign = mag.isZero() ? zero : positive; } - -// For signed input, determine the desired magnitude and sign separately. - -namespace { - template - BigInteger::Blk magOf(X x) { - /* UX(...) cast needed to stop short(-2^15), which negates to - * itself, from sign-extending in the conversion to Blk. */ - return BigInteger::Blk(x < 0 ? UX(-x) : x); - } - template - BigInteger::Sign signOf(X x) { - return (x == 0) ? BigInteger::zero - : (x > 0) ? BigInteger::positive - : BigInteger::negative; - } -} - -BigInteger::BigInteger(long x) : sign(signOf(x)), mag(magOf(x)) {} -BigInteger::BigInteger(int x) : sign(signOf(x)), mag(magOf(x)) {} -BigInteger::BigInteger(short x) : sign(signOf(x)), mag(magOf(x)) {} - -// CONVERSION TO PRIMITIVE INTEGERS - -/* Reuse BigUnsigned's conversion to an unsigned primitive integer. - * The friend is a separate function rather than - * BigInteger::convertToUnsignedPrimitive to avoid requiring BigUnsigned to - * declare BigInteger. */ -template -inline X convertBigUnsignedToPrimitiveAccess(const BigUnsigned &a) { - return a.convertToPrimitive(); -} - -template -X BigInteger::convertToUnsignedPrimitive() const { - if (sign == negative) - throw "BigInteger::to: " - "Cannot convert a negative integer to an unsigned type"; - else - return convertBigUnsignedToPrimitiveAccess(mag); -} - -/* Similar to BigUnsigned::convertToPrimitive, but split into two cases for - * nonnegative and negative numbers. */ -template -X BigInteger::convertToSignedPrimitive() const { - if (sign == zero) - return 0; - else if (mag.getLength() == 1) { - // The single block might fit in an X. Try the conversion. - Blk b = mag.getBlock(0); - if (sign == positive) { - X x = X(b); - if (x >= 0 && Blk(x) == b) - return x; - } else { - X x = -X(b); - /* UX(...) needed to avoid rejecting conversion of - * -2^15 to a short. */ - if (x < 0 && Blk(UX(-x)) == b) - return x; - } - // Otherwise fall through. - } - throw "BigInteger::to: " - "Value is too big to fit in the requested type"; -} - -unsigned long BigInteger::toUnsignedLong () const { return convertToUnsignedPrimitive (); } -unsigned int BigInteger::toUnsignedInt () const { return convertToUnsignedPrimitive (); } -unsigned short BigInteger::toUnsignedShort() const { return convertToUnsignedPrimitive (); } -long BigInteger::toLong () const { return convertToSignedPrimitive (); } -int BigInteger::toInt () const { return convertToSignedPrimitive (); } -short BigInteger::toShort () const { return convertToSignedPrimitive (); } - -// COMPARISON -BigInteger::CmpRes BigInteger::compareTo(const BigInteger &x) const { - // A greater sign implies a greater number - if (sign < x.sign) - return less; - else if (sign > x.sign) - return greater; - else switch (sign) { - // If the signs are the same... - case zero: - return equal; // Two zeros are equal - case positive: - // Compare the magnitudes - return mag.compareTo(x.mag); - case negative: - // Compare the magnitudes, but return the opposite result - return CmpRes(-mag.compareTo(x.mag)); - default: - throw "BigInteger internal error"; - } -} - -/* COPY-LESS OPERATIONS - * These do some messing around to determine the sign of the result, - * then call one of BigUnsigned's copy-less operations. */ - -// See remarks about aliased calls in BigUnsigned.cc . -#define DTRT_ALIASED(cond, op) \ - if (cond) { \ - BigInteger tmpThis; \ - tmpThis.op; \ - *this = tmpThis; \ - return; \ - } - -void BigInteger::add(const BigInteger &a, const BigInteger &b) { - DTRT_ALIASED(this == &a || this == &b, add(a, b)); - // If one argument is zero, copy the other. - if (a.sign == zero) - operator =(b); - else if (b.sign == zero) - operator =(a); - // If the arguments have the same sign, take the - // common sign and add their magnitudes. - else if (a.sign == b.sign) { - sign = a.sign; - mag.add(a.mag, b.mag); - } else { - // Otherwise, their magnitudes must be compared. - switch (a.mag.compareTo(b.mag)) { - case equal: - // If their magnitudes are the same, copy zero. - mag = 0; - sign = zero; - break; - // Otherwise, take the sign of the greater, and subtract - // the lesser magnitude from the greater magnitude. - case greater: - sign = a.sign; - mag.subtract(a.mag, b.mag); - break; - case less: - sign = b.sign; - mag.subtract(b.mag, a.mag); - break; - } - } -} - -void BigInteger::subtract(const BigInteger &a, const BigInteger &b) { - // Notice that this routine is identical to BigInteger::add, - // if one replaces b.sign by its opposite. - DTRT_ALIASED(this == &a || this == &b, subtract(a, b)); - // If a is zero, copy b and flip its sign. If b is zero, copy a. - if (a.sign == zero) { - mag = b.mag; - // Take the negative of _b_'s, sign, not ours. - // Bug pointed out by Sam Larkin on 2005.03.30. - sign = Sign(-b.sign); - } else if (b.sign == zero) - operator =(a); - // If their signs differ, take a.sign and add the magnitudes. - else if (a.sign != b.sign) { - sign = a.sign; - mag.add(a.mag, b.mag); - } else { - // Otherwise, their magnitudes must be compared. - switch (a.mag.compareTo(b.mag)) { - // If their magnitudes are the same, copy zero. - case equal: - mag = 0; - sign = zero; - break; - // If a's magnitude is greater, take a.sign and - // subtract a from b. - case greater: - sign = a.sign; - mag.subtract(a.mag, b.mag); - break; - // If b's magnitude is greater, take the opposite - // of b.sign and subtract b from a. - case less: - sign = Sign(-b.sign); - mag.subtract(b.mag, a.mag); - break; - } - } -} - -void BigInteger::multiply(const BigInteger &a, const BigInteger &b) { - DTRT_ALIASED(this == &a || this == &b, multiply(a, b)); - // If one object is zero, copy zero and return. - if (a.sign == zero || b.sign == zero) { - sign = zero; - mag = 0; - return; - } - // If the signs of the arguments are the same, the result - // is positive, otherwise it is negative. - sign = (a.sign == b.sign) ? positive : negative; - // Multiply the magnitudes. - mag.multiply(a.mag, b.mag); -} - -/* - * DIVISION WITH REMAINDER - * Please read the comments before the definition of - * `BigUnsigned::divideWithRemainder' in `BigUnsigned.cc' for lots of - * information you should know before reading this function. - * - * Following Knuth, I decree that x / y is to be - * 0 if y==0 and floor(real-number x / y) if y!=0. - * Then x % y shall be x - y*(integer x / y). - * - * Note that x = y * (x / y) + (x % y) always holds. - * In addition, (x % y) is from 0 to y - 1 if y > 0, - * and from -(|y| - 1) to 0 if y < 0. (x % y) = x if y = 0. - * - * Examples: (q = a / b, r = a % b) - * a b q r - * === === === === - * 4 3 1 1 - * -4 3 -2 2 - * 4 -3 -2 -2 - * -4 -3 1 -1 - */ -void BigInteger::divideWithRemainder(const BigInteger &b, BigInteger &q) { - // Defend against aliased calls; - // same idea as in BigUnsigned::divideWithRemainder . - if (this == &q) - throw "BigInteger::divideWithRemainder: Cannot write quotient and remainder into the same variable"; - if (this == &b || &q == &b) { - BigInteger tmpB(b); - divideWithRemainder(tmpB, q); - return; - } - - // Division by zero gives quotient 0 and remainder *this - if (b.sign == zero) { - q.mag = 0; - q.sign = zero; - return; - } - // 0 / b gives quotient 0 and remainder 0 - if (sign == zero) { - q.mag = 0; - q.sign = zero; - return; - } - - // Here *this != 0, b != 0. - - // Do the operands have the same sign? - if (sign == b.sign) { - // Yes: easy case. Quotient is zero or positive. - q.sign = positive; - } else { - // No: harder case. Quotient is negative. - q.sign = negative; - // Decrease the magnitude of the dividend by one. - mag--; - /* - * We tinker with the dividend before and with the - * quotient and remainder after so that the result - * comes out right. To see why it works, consider the following - * list of examples, where A is the magnitude-decreased - * a, Q and R are the results of BigUnsigned division - * with remainder on A and |b|, and q and r are the - * final results we want: - * - * a A b Q R q r - * -3 -2 3 0 2 -1 0 - * -4 -3 3 1 0 -2 2 - * -5 -4 3 1 1 -2 1 - * -6 -5 3 1 2 -2 0 - * - * It appears that we need a total of 3 corrections: - * Decrease the magnitude of a to get A. Increase the - * magnitude of Q to get q (and make it negative). - * Find r = (b - 1) - R and give it the desired sign. - */ - } - - // Divide the magnitudes. - mag.divideWithRemainder(b.mag, q.mag); - - if (sign != b.sign) { - // More for the harder case (as described): - // Increase the magnitude of the quotient by one. - q.mag++; - // Modify the remainder. - mag.subtract(b.mag, mag); - mag--; - } - - // Sign of the remainder is always the sign of the divisor b. - sign = b.sign; - - // Set signs to zero as necessary. (Thanks David Allen!) - if (mag.isZero()) - sign = zero; - if (q.mag.isZero()) - q.sign = zero; - - // WHEW!!! -} - -// Negation -void BigInteger::negate(const BigInteger &a) { - DTRT_ALIASED(this == &a, negate(a)); - // Copy a's magnitude - mag = a.mag; - // Copy the opposite of a.sign - sign = Sign(-a.sign); -} - -// INCREMENT/DECREMENT OPERATORS - -// Prefix increment -void BigInteger::operator ++() { - if (sign == negative) { - mag--; - if (mag == 0) - sign = zero; - } else { - mag++; - sign = positive; // if not already - } -} - -// Postfix increment: same as prefix -void BigInteger::operator ++(int) { - operator ++(); -} - -// Prefix decrement -void BigInteger::operator --() { - if (sign == positive) { - mag--; - if (mag == 0) - sign = zero; - } else { - mag++; - sign = negative; - } -} - -// Postfix decrement: same as prefix -void BigInteger::operator --(int) { - operator --(); -} - diff --git a/src/qzxing/zxing/bigint/BigInteger.hh b/src/qzxing/zxing/bigint/BigInteger.hh deleted file mode 100644 index 676af45..0000000 --- a/src/qzxing/zxing/bigint/BigInteger.hh +++ /dev/null @@ -1,215 +0,0 @@ -#ifndef BIGINTEGER_H -#define BIGINTEGER_H - -#include "BigUnsigned.hh" - -/* A BigInteger object represents a signed integer of size limited only by - * available memory. BigUnsigneds support most mathematical operators and can - * be converted to and from most primitive integer types. - * - * A BigInteger is just an aggregate of a BigUnsigned and a sign. (It is no - * longer derived from BigUnsigned because that led to harmful implicit - * conversions.) */ -class BigInteger { - -public: - typedef BigUnsigned::Blk Blk; - typedef BigUnsigned::Index Index; - typedef BigUnsigned::CmpRes CmpRes; - static const CmpRes - less = BigUnsigned::less , - equal = BigUnsigned::equal , - greater = BigUnsigned::greater; - // Enumeration for the sign of a BigInteger. - enum Sign { negative = -1, zero = 0, positive = 1 }; - -protected: - Sign sign; - BigUnsigned mag; - -public: - // Constructs zero. - BigInteger() : sign(zero), mag() {} - - // Copy constructor - BigInteger(const BigInteger &x) : sign(x.sign), mag(x.mag) {}; - - // Assignment operator - void operator=(const BigInteger &x); - - // Constructor that copies from a given array of blocks with a sign. - BigInteger(const Blk *b, Index blen, Sign s); - - // Nonnegative constructor that copies from a given array of blocks. - BigInteger(const Blk *b, Index blen) : mag(b, blen) { - sign = mag.isZero() ? zero : positive; - } - - // Constructor from a BigUnsigned and a sign - BigInteger(const BigUnsigned &x, Sign s); - - // Nonnegative constructor from a BigUnsigned - BigInteger(const BigUnsigned &x) : mag(x) { - sign = mag.isZero() ? zero : positive; - } - - // Constructors from primitive integer types - BigInteger(unsigned long x); - BigInteger( long x); - BigInteger(unsigned int x); - BigInteger( int x); - BigInteger(unsigned short x); - BigInteger( short x); - - /* Converters to primitive integer types - * The implicit conversion operators caused trouble, so these are now - * named. */ - unsigned long toUnsignedLong () const; - long toLong () const; - unsigned int toUnsignedInt () const; - int toInt () const; - unsigned short toUnsignedShort() const; - short toShort () const; -protected: - // Helper - template X convertToUnsignedPrimitive() const; - template X convertToSignedPrimitive() const; -public: - - // ACCESSORS - Sign getSign() const { return sign; } - /* The client can't do any harm by holding a read-only reference to the - * magnitude. */ - const BigUnsigned &getMagnitude() const { return mag; } - - // Some accessors that go through to the magnitude - Index getLength() const { return mag.getLength(); } - Index getCapacity() const { return mag.getCapacity(); } - Blk getBlock(Index i) const { return mag.getBlock(i); } - bool isZero() const { return sign == zero; } // A bit special - - // COMPARISONS - - // Compares this to x like Perl's <=> - CmpRes compareTo(const BigInteger &x) const; - - // Ordinary comparison operators - bool operator ==(const BigInteger &x) const { - return sign == x.sign && mag == x.mag; - } - bool operator !=(const BigInteger &x) const { return !operator ==(x); }; - bool operator < (const BigInteger &x) const { return compareTo(x) == less ; } - bool operator <=(const BigInteger &x) const { return compareTo(x) != greater; } - bool operator >=(const BigInteger &x) const { return compareTo(x) != less ; } - bool operator > (const BigInteger &x) const { return compareTo(x) == greater; } - - // OPERATORS -- See the discussion in BigUnsigned.hh. - void add (const BigInteger &a, const BigInteger &b); - void subtract(const BigInteger &a, const BigInteger &b); - void multiply(const BigInteger &a, const BigInteger &b); - /* See the comment on BigUnsigned::divideWithRemainder. Semantics - * differ from those of primitive integers when negatives and/or zeros - * are involved. */ - void divideWithRemainder(const BigInteger &b, BigInteger &q); - void negate(const BigInteger &a); - - /* Bitwise operators are not provided for BigIntegers. Use - * getMagnitude to get the magnitude and operate on that instead. */ - - BigInteger operator +(const BigInteger &x) const; - BigInteger operator -(const BigInteger &x) const; - BigInteger operator *(const BigInteger &x) const; - BigInteger operator /(const BigInteger &x) const; - BigInteger operator %(const BigInteger &x) const; - BigInteger operator -() const; - - void operator +=(const BigInteger &x); - void operator -=(const BigInteger &x); - void operator *=(const BigInteger &x); - void operator /=(const BigInteger &x); - void operator %=(const BigInteger &x); - void flipSign(); - - // INCREMENT/DECREMENT OPERATORS - void operator ++( ); - void operator ++(int); - void operator --( ); - void operator --(int); -}; - -// NORMAL OPERATORS -/* These create an object to hold the result and invoke - * the appropriate put-here operation on it, passing - * this and x. The new object is then returned. */ -inline BigInteger BigInteger::operator +(const BigInteger &x) const { - BigInteger ans; - ans.add(*this, x); - return ans; -} -inline BigInteger BigInteger::operator -(const BigInteger &x) const { - BigInteger ans; - ans.subtract(*this, x); - return ans; -} -inline BigInteger BigInteger::operator *(const BigInteger &x) const { - BigInteger ans; - ans.multiply(*this, x); - return ans; -} -inline BigInteger BigInteger::operator /(const BigInteger &x) const { - if (x.isZero()) throw "BigInteger::operator /: division by zero"; - BigInteger q, r; - r = *this; - r.divideWithRemainder(x, q); - return q; -} -inline BigInteger BigInteger::operator %(const BigInteger &x) const { - if (x.isZero()) throw "BigInteger::operator %: division by zero"; - BigInteger q, r; - r = *this; - r.divideWithRemainder(x, q); - return r; -} -inline BigInteger BigInteger::operator -() const { - BigInteger ans; - ans.negate(*this); - return ans; -} - -/* - * ASSIGNMENT OPERATORS - * - * Now the responsibility for making a temporary copy if necessary - * belongs to the put-here operations. See Assignment Operators in - * BigUnsigned.hh. - */ -inline void BigInteger::operator +=(const BigInteger &x) { - add(*this, x); -} -inline void BigInteger::operator -=(const BigInteger &x) { - subtract(*this, x); -} -inline void BigInteger::operator *=(const BigInteger &x) { - multiply(*this, x); -} -inline void BigInteger::operator /=(const BigInteger &x) { - if (x.isZero()) throw "BigInteger::operator /=: division by zero"; - /* The following technique is slightly faster than copying *this first - * when x is large. */ - BigInteger q; - divideWithRemainder(x, q); - // *this contains the remainder, but we overwrite it with the quotient. - *this = q; -} -inline void BigInteger::operator %=(const BigInteger &x) { - if (x.isZero()) throw "BigInteger::operator %=: division by zero"; - BigInteger q; - // Mods *this by x. Don't care about quotient left in q. - divideWithRemainder(x, q); -} -// This one is trivial -inline void BigInteger::flipSign() { - sign = Sign(-sign); -} - -#endif diff --git a/src/qzxing/zxing/bigint/BigIntegerAlgorithms.cc b/src/qzxing/zxing/bigint/BigIntegerAlgorithms.cc deleted file mode 100644 index 9f7eaeb..0000000 --- a/src/qzxing/zxing/bigint/BigIntegerAlgorithms.cc +++ /dev/null @@ -1,70 +0,0 @@ -#include "BigIntegerAlgorithms.hh" - -BigUnsigned gcd(BigUnsigned a, BigUnsigned b) { - BigUnsigned trash; - // Neat in-place alternating technique. - for (;;) { - if (b.isZero()) - return a; - a.divideWithRemainder(b, trash); - if (a.isZero()) - return b; - b.divideWithRemainder(a, trash); - } -} - -void extendedEuclidean(BigInteger m, BigInteger n, - BigInteger &g, BigInteger &r, BigInteger &s) { - if (&g == &r || &g == &s || &r == &s) - throw "BigInteger extendedEuclidean: Outputs are aliased"; - BigInteger r1(1), s1(0), r2(0), s2(1), q; - /* Invariants: - * r1*m(orig) + s1*n(orig) == m(current) - * r2*m(orig) + s2*n(orig) == n(current) */ - for (;;) { - if (n.isZero()) { - r = r1; s = s1; g = m; - return; - } - // Subtract q times the second invariant from the first invariant. - m.divideWithRemainder(n, q); - r1 -= q*r2; s1 -= q*s2; - - if (m.isZero()) { - r = r2; s = s2; g = n; - return; - } - // Subtract q times the first invariant from the second invariant. - n.divideWithRemainder(m, q); - r2 -= q*r1; s2 -= q*s1; - } -} - -BigUnsigned modinv(const BigInteger &x, const BigUnsigned &n) { - BigInteger g, r, s; - extendedEuclidean(x, n, g, r, s); - if (g == 1) - // r*x + s*n == 1, so r*x === 1 (mod n), so r is the answer. - return (r % n).getMagnitude(); // (r % n) will be nonnegative - else - throw "BigInteger modinv: x and n have a common factor"; -} - -BigUnsigned modexp(const BigInteger &base, const BigUnsigned &exponent, - const BigUnsigned &modulus) { - BigUnsigned ans = 1, base2 = (base % modulus).getMagnitude(); - BigUnsigned::Index i = exponent.bitLength(); - // For each bit of the exponent, most to least significant... - while (i > 0) { - i--; - // Square. - ans *= ans; - ans %= modulus; - // And multiply if the bit is a 1. - if (exponent.getBit(i)) { - ans *= base2; - ans %= modulus; - } - } - return ans; -} diff --git a/src/qzxing/zxing/bigint/BigIntegerAlgorithms.hh b/src/qzxing/zxing/bigint/BigIntegerAlgorithms.hh deleted file mode 100644 index f7210aa..0000000 --- a/src/qzxing/zxing/bigint/BigIntegerAlgorithms.hh +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef BIGINTEGERALGORITHMS_H -#define BIGINTEGERALGORITHMS_H - -#include "BigInteger.hh" - -/* Some mathematical algorithms for big integers. - * This code is new and, as such, experimental. */ - -// Returns the greatest common divisor of a and b. -BigUnsigned gcd(BigUnsigned a, BigUnsigned b); - -/* Extended Euclidean algorithm. - * Given m and n, finds gcd g and numbers r, s such that r*m + s*n == g. */ -void extendedEuclidean(BigInteger m, BigInteger n, - BigInteger &g, BigInteger &r, BigInteger &s); - -/* Returns the multiplicative inverse of x modulo n, or throws an exception if - * they have a common factor. */ -BigUnsigned modinv(const BigInteger &x, const BigUnsigned &n); - -// Returns (base ^ exponent) % modulus. -BigUnsigned modexp(const BigInteger &base, const BigUnsigned &exponent, - const BigUnsigned &modulus); - -#endif diff --git a/src/qzxing/zxing/bigint/BigIntegerLibrary.hh b/src/qzxing/zxing/bigint/BigIntegerLibrary.hh deleted file mode 100644 index f0219ed..0000000 --- a/src/qzxing/zxing/bigint/BigIntegerLibrary.hh +++ /dev/null @@ -1,8 +0,0 @@ -// This header file includes all of the library header files. - -#include "NumberlikeArray.hh" -#include "BigUnsigned.hh" -#include "BigInteger.hh" -#include "BigIntegerAlgorithms.hh" -#include "BigUnsignedInABase.hh" -#include "BigIntegerUtils.hh" diff --git a/src/qzxing/zxing/bigint/BigIntegerUtils.cc b/src/qzxing/zxing/bigint/BigIntegerUtils.cc deleted file mode 100644 index 9a0d952..0000000 --- a/src/qzxing/zxing/bigint/BigIntegerUtils.cc +++ /dev/null @@ -1,50 +0,0 @@ -#include "BigIntegerUtils.hh" -#include "BigUnsignedInABase.hh" - -std::string bigUnsignedToString(const BigUnsigned &x) { - return std::string(BigUnsignedInABase(x, 10)); -} - -std::string bigIntegerToString(const BigInteger &x) { - return (x.getSign() == BigInteger::negative) - ? (std::string("-") + bigUnsignedToString(x.getMagnitude())) - : (bigUnsignedToString(x.getMagnitude())); -} - -BigUnsigned stringToBigUnsigned(const std::string &s) { - return BigUnsigned(BigUnsignedInABase(s, 10)); -} - -BigInteger stringToBigInteger(const std::string &s) { - // Recognize a sign followed by a BigUnsigned. - return (s[0] == '-') ? BigInteger(stringToBigUnsigned(s.substr(1, s.length() - 1)), BigInteger::negative) - : (s[0] == '+') ? BigInteger(stringToBigUnsigned(s.substr(1, s.length() - 1))) - : BigInteger(stringToBigUnsigned(s)); -} - -std::ostream &operator <<(std::ostream &os, const BigUnsigned &x) { - BigUnsignedInABase::Base base; - long osFlags = os.flags(); - if (osFlags & os.dec) - base = 10; - else if (osFlags & os.hex) { - base = 16; - if (osFlags & os.showbase) - os << "0x"; - } else if (osFlags & os.oct) { - base = 8; - if (osFlags & os.showbase) - os << '0'; - } else - throw "std::ostream << BigUnsigned: Could not determine the desired base from output-stream flags"; - std::string s = std::string(BigUnsignedInABase(x, base)); - os << s; - return os; -} - -std::ostream &operator <<(std::ostream &os, const BigInteger &x) { - if (x.getSign() == BigInteger::negative) - os << '-'; - os << x.getMagnitude(); - return os; -} diff --git a/src/qzxing/zxing/bigint/BigIntegerUtils.hh b/src/qzxing/zxing/bigint/BigIntegerUtils.hh deleted file mode 100644 index caeaa17..0000000 --- a/src/qzxing/zxing/bigint/BigIntegerUtils.hh +++ /dev/null @@ -1,72 +0,0 @@ -#ifndef BIGINTEGERUTILS_H -#define BIGINTEGERUTILS_H - -#include "BigInteger.hh" -#include -#include - -/* This file provides: - * - Convenient std::string <-> BigUnsigned/BigInteger conversion routines - * - std::ostream << operators for BigUnsigned/BigInteger */ - -// std::string conversion routines. Base 10 only. -std::string bigUnsignedToString(const BigUnsigned &x); -std::string bigIntegerToString(const BigInteger &x); -BigUnsigned stringToBigUnsigned(const std::string &s); -BigInteger stringToBigInteger(const std::string &s); - -// Creates a BigInteger from data such as `char's; read below for details. -template -BigInteger dataToBigInteger(const T* data, BigInteger::Index length, BigInteger::Sign sign); - -// Outputs x to os, obeying the flags `dec', `hex', `bin', and `showbase'. -std::ostream &operator <<(std::ostream &os, const BigUnsigned &x); - -// Outputs x to os, obeying the flags `dec', `hex', `bin', and `showbase'. -// My somewhat arbitrary policy: a negative sign comes before a base indicator (like -0xFF). -std::ostream &operator <<(std::ostream &os, const BigInteger &x); - -// BEGIN TEMPLATE DEFINITIONS. - -/* - * Converts binary data to a BigInteger. - * Pass an array `data', its length, and the desired sign. - * - * Elements of `data' may be of any type `T' that has the following - * two properties (this includes almost all integral types): - * - * (1) `sizeof(T)' correctly gives the amount of binary data in one - * value of `T' and is a factor of `sizeof(Blk)'. - * - * (2) When a value of `T' is casted to a `Blk', the low bytes of - * the result contain the desired binary data. - */ -template -BigInteger dataToBigInteger(const T* data, BigInteger::Index length, BigInteger::Sign sign) { - // really ceiling(numBytes / sizeof(BigInteger::Blk)) - unsigned int pieceSizeInBits = 8 * sizeof(T); - unsigned int piecesPerBlock = sizeof(BigInteger::Blk) / sizeof(T); - unsigned int numBlocks = (length + piecesPerBlock - 1) / piecesPerBlock; - - // Allocate our block array - BigInteger::Blk *blocks = new BigInteger::Blk[numBlocks]; - - BigInteger::Index blockNum, pieceNum, pieceNumHere; - - // Convert - for (blockNum = 0, pieceNum = 0; blockNum < numBlocks; blockNum++) { - BigInteger::Blk curBlock = 0; - for (pieceNumHere = 0; pieceNumHere < piecesPerBlock && pieceNum < length; - pieceNumHere++, pieceNum++) - curBlock |= (BigInteger::Blk(data[pieceNum]) << (pieceSizeInBits * pieceNumHere)); - blocks[blockNum] = curBlock; - } - - // Create the BigInteger. - BigInteger x(blocks, numBlocks, sign); - - delete [] blocks; - return x; -} - -#endif diff --git a/src/qzxing/zxing/bigint/BigUnsigned.cc b/src/qzxing/zxing/bigint/BigUnsigned.cc deleted file mode 100644 index 53a5c43..0000000 --- a/src/qzxing/zxing/bigint/BigUnsigned.cc +++ /dev/null @@ -1,697 +0,0 @@ -#include "BigUnsigned.hh" - -// Memory management definitions have moved to the bottom of NumberlikeArray.hh. - -// The templates used by these constructors and converters are at the bottom of -// BigUnsigned.hh. - -BigUnsigned::BigUnsigned(unsigned long x) { initFromPrimitive (x); } -BigUnsigned::BigUnsigned(unsigned int x) { initFromPrimitive (x); } -BigUnsigned::BigUnsigned(unsigned short x) { initFromPrimitive (x); } -BigUnsigned::BigUnsigned( long x) { initFromSignedPrimitive(x); } -BigUnsigned::BigUnsigned( int x) { initFromSignedPrimitive(x); } -BigUnsigned::BigUnsigned( short x) { initFromSignedPrimitive(x); } - -unsigned long BigUnsigned::toUnsignedLong () const { return convertToPrimitive (); } -unsigned int BigUnsigned::toUnsignedInt () const { return convertToPrimitive (); } -unsigned short BigUnsigned::toUnsignedShort() const { return convertToPrimitive (); } -long BigUnsigned::toLong () const { return convertToSignedPrimitive< long >(); } -int BigUnsigned::toInt () const { return convertToSignedPrimitive< int >(); } -short BigUnsigned::toShort () const { return convertToSignedPrimitive< short>(); } - -// BIT/BLOCK ACCESSORS - -void BigUnsigned::setBlock(Index i, Blk newBlock) { - if (newBlock == 0) { - if (i < len) { - blk[i] = 0; - zapLeadingZeros(); - } - // If i >= len, no effect. - } else { - if (i >= len) { - // The nonzero block extends the number. - allocateAndCopy(i+1); - // Zero any added blocks that we aren't setting. - for (Index j = len; j < i; j++) - blk[j] = 0; - len = i+1; - } - blk[i] = newBlock; - } -} - -/* Evidently the compiler wants BigUnsigned:: on the return type because, at - * that point, it hasn't yet parsed the BigUnsigned:: on the name to get the - * proper scope. */ -BigUnsigned::Index BigUnsigned::bitLength() const { - if (isZero()) - return 0; - else { - Blk leftmostBlock = getBlock(len - 1); - Index leftmostBlockLen = 0; - while (leftmostBlock != 0) { - leftmostBlock >>= 1; - leftmostBlockLen++; - } - return leftmostBlockLen + (len - 1) * N; - } -} - -void BigUnsigned::setBit(Index bi, bool newBit) { - Index blockI = bi / N; - Blk block = getBlock(blockI), mask = Blk(1) << (bi % N); - block = newBit ? (block | mask) : (block & ~mask); - setBlock(blockI, block); -} - -// COMPARISON -BigUnsigned::CmpRes BigUnsigned::compareTo(const BigUnsigned &x) const { - // A bigger length implies a bigger number. - if (len < x.len) - return less; - else if (len > x.len) - return greater; - else { - // Compare blocks one by one from left to right. - Index i = len; - while (i > 0) { - i--; - if (blk[i] == x.blk[i]) - continue; - else if (blk[i] > x.blk[i]) - return greater; - else - return less; - } - // If no blocks differed, the numbers are equal. - return equal; - } -} - -// COPY-LESS OPERATIONS - -/* - * On most calls to copy-less operations, it's safe to read the inputs little by - * little and write the outputs little by little. However, if one of the - * inputs is coming from the same variable into which the output is to be - * stored (an "aliased" call), we risk overwriting the input before we read it. - * In this case, we first compute the result into a temporary BigUnsigned - * variable and then copy it into the requested output variable *this. - * Each put-here operation uses the DTRT_ALIASED macro (Do The Right Thing on - * aliased calls) to generate code for this check. - * - * I adopted this approach on 2007.02.13 (see Assignment Operators in - * BigUnsigned.hh). Before then, put-here operations rejected aliased calls - * with an exception. I think doing the right thing is better. - * - * Some of the put-here operations can probably handle aliased calls safely - * without the extra copy because (for example) they process blocks strictly - * right-to-left. At some point I might determine which ones don't need the - * copy, but my reasoning would need to be verified very carefully. For now - * I'll leave in the copy. - */ -#define DTRT_ALIASED(cond, op) \ - if (cond) { \ - BigUnsigned tmpThis; \ - tmpThis.op; \ - *this = tmpThis; \ - return; \ - } - - - -void BigUnsigned::add(const BigUnsigned &a, const BigUnsigned &b) { - DTRT_ALIASED(this == &a || this == &b, add(a, b)); - // If one argument is zero, copy the other. - if (a.len == 0) { - operator =(b); - return; - } else if (b.len == 0) { - operator =(a); - return; - } - // Some variables... - // Carries in and out of an addition stage - bool carryIn, carryOut; - Blk temp; - Index i; - // a2 points to the longer input, b2 points to the shorter - const BigUnsigned *a2, *b2; - if (a.len >= b.len) { - a2 = &a; - b2 = &b; - } else { - a2 = &b; - b2 = &a; - } - // Set prelimiary length and make room in this BigUnsigned - len = a2->len + 1; - allocate(len); - // For each block index that is present in both inputs... - for (i = 0, carryIn = false; i < b2->len; i++) { - // Add input blocks - temp = a2->blk[i] + b2->blk[i]; - // If a rollover occurred, the result is less than either input. - // This test is used many times in the BigUnsigned code. - carryOut = (temp < a2->blk[i]); - // If a carry was input, handle it - if (carryIn) { - temp++; - carryOut |= (temp == 0); - } - blk[i] = temp; // Save the addition result - carryIn = carryOut; // Pass the carry along - } - // If there is a carry left over, increase blocks until - // one does not roll over. - for (; i < a2->len && carryIn; i++) { - temp = a2->blk[i] + 1; - carryIn = (temp == 0); - blk[i] = temp; - } - // If the carry was resolved but the larger number - // still has blocks, copy them over. - for (; i < a2->len; i++) - blk[i] = a2->blk[i]; - // Set the extra block if there's still a carry, decrease length otherwise - if (carryIn) - blk[i] = 1; - else - len--; -} - -void BigUnsigned::subtract(const BigUnsigned &a, const BigUnsigned &b) { - DTRT_ALIASED(this == &a || this == &b, subtract(a, b)); - if (b.len == 0) { - // If b is zero, copy a. - operator =(a); - return; - } else if (a.len < b.len) - // If a is shorter than b, the result is negative. - throw "BigUnsigned::subtract: " - "Negative result in unsigned calculation"; - // Some variables... - bool borrowIn, borrowOut; - Blk temp; - Index i; - // Set preliminary length and make room - len = a.len; - allocate(len); - // For each block index that is present in both inputs... - for (i = 0, borrowIn = false; i < b.len; i++) { - temp = a.blk[i] - b.blk[i]; - // If a reverse rollover occurred, - // the result is greater than the block from a. - borrowOut = (temp > a.blk[i]); - // Handle an incoming borrow - if (borrowIn) { - borrowOut |= (temp == 0); - temp--; - } - blk[i] = temp; // Save the subtraction result - borrowIn = borrowOut; // Pass the borrow along - } - // If there is a borrow left over, decrease blocks until - // one does not reverse rollover. - for (; i < a.len && borrowIn; i++) { - borrowIn = (a.blk[i] == 0); - blk[i] = a.blk[i] - 1; - } - /* If there's still a borrow, the result is negative. - * Throw an exception, but zero out this object so as to leave it in a - * predictable state. */ - if (borrowIn) { - len = 0; - throw "BigUnsigned::subtract: Negative result in unsigned calculation"; - } else - // Copy over the rest of the blocks - for (; i < a.len; i++) - blk[i] = a.blk[i]; - // Zap leading zeros - zapLeadingZeros(); -} - -/* - * About the multiplication and division algorithms: - * - * I searched unsucessfully for fast C++ built-in operations like the `b_0' - * and `c_0' Knuth describes in Section 4.3.1 of ``The Art of Computer - * Programming'' (replace `place' by `Blk'): - * - * ``b_0[:] multiplication of a one-place integer by another one-place - * integer, giving a two-place answer; - * - * ``c_0[:] division of a two-place integer by a one-place integer, - * provided that the quotient is a one-place integer, and yielding - * also a one-place remainder.'' - * - * I also missed his note that ``[b]y adjusting the word size, if - * necessary, nearly all computers will have these three operations - * available'', so I gave up on trying to use algorithms similar to his. - * A future version of the library might include such algorithms; I - * would welcome contributions from others for this. - * - * I eventually decided to use bit-shifting algorithms. To multiply `a' - * and `b', we zero out the result. Then, for each `1' bit in `a', we - * shift `b' left the appropriate amount and add it to the result. - * Similarly, to divide `a' by `b', we shift `b' left varying amounts, - * repeatedly trying to subtract it from `a'. When we succeed, we note - * the fact by setting a bit in the quotient. While these algorithms - * have the same O(n^2) time complexity as Knuth's, the ``constant factor'' - * is likely to be larger. - * - * Because I used these algorithms, which require single-block addition - * and subtraction rather than single-block multiplication and division, - * the innermost loops of all four routines are very similar. Study one - * of them and all will become clear. - */ - -/* - * This is a little inline function used by both the multiplication - * routine and the division routine. - * - * `getShiftedBlock' returns the `x'th block of `num << y'. - * `y' may be anything from 0 to N - 1, and `x' may be anything from - * 0 to `num.len'. - * - * Two things contribute to this block: - * - * (1) The `N - y' low bits of `num.blk[x]', shifted `y' bits left. - * - * (2) The `y' high bits of `num.blk[x-1]', shifted `N - y' bits right. - * - * But we must be careful if `x == 0' or `x == num.len', in - * which case we should use 0 instead of (2) or (1), respectively. - * - * If `y == 0', then (2) contributes 0, as it should. However, - * in some computer environments, for a reason I cannot understand, - * `a >> b' means `a >> (b % N)'. This means `num.blk[x-1] >> (N - y)' - * will return `num.blk[x-1]' instead of the desired 0 when `y == 0'; - * the test `y == 0' handles this case specially. - */ -inline BigUnsigned::Blk getShiftedBlock(const BigUnsigned &num, - BigUnsigned::Index x, unsigned int y) { - BigUnsigned::Blk part1 = (x == 0 || y == 0) ? 0 : (num.blk[x - 1] >> (BigUnsigned::N - y)); - BigUnsigned::Blk part2 = (x == num.len) ? 0 : (num.blk[x] << y); - return part1 | part2; -} - -void BigUnsigned::multiply(const BigUnsigned &a, const BigUnsigned &b) { - DTRT_ALIASED(this == &a || this == &b, multiply(a, b)); - // If either a or b is zero, set to zero. - if (a.len == 0 || b.len == 0) { - len = 0; - return; - } - /* - * Overall method: - * - * Set this = 0. - * For each 1-bit of `a' (say the `i2'th bit of block `i'): - * Add `b << (i blocks and i2 bits)' to *this. - */ - // Variables for the calculation - Index i, j, k; - unsigned int i2; - Blk temp; - bool carryIn, carryOut; - // Set preliminary length and make room - len = a.len + b.len; - allocate(len); - // Zero out this object - for (i = 0; i < len; i++) - blk[i] = 0; - // For each block of the first number... - for (i = 0; i < a.len; i++) { - // For each 1-bit of that block... - for (i2 = 0; i2 < N; i2++) { - if ((a.blk[i] & (Blk(1) << i2)) == 0) - continue; - /* - * Add b to this, shifted left i blocks and i2 bits. - * j is the index in b, and k = i + j is the index in this. - * - * `getShiftedBlock', a short inline function defined above, - * is now used for the bit handling. It replaces the more - * complex `bHigh' code, in which each run of the loop dealt - * immediately with the low bits and saved the high bits to - * be picked up next time. The last run of the loop used to - * leave leftover high bits, which were handled separately. - * Instead, this loop runs an additional time with j == b.len. - * These changes were made on 2005.01.11. - */ - for (j = 0, k = i, carryIn = false; j <= b.len; j++, k++) { - /* - * The body of this loop is very similar to the body of the first loop - * in `add', except that this loop does a `+=' instead of a `+'. - */ - temp = blk[k] + getShiftedBlock(b, j, i2); - carryOut = (temp < blk[k]); - if (carryIn) { - temp++; - carryOut |= (temp == 0); - } - blk[k] = temp; - carryIn = carryOut; - } - // No more extra iteration to deal with `bHigh'. - // Roll-over a carry as necessary. - for (; carryIn; k++) { - blk[k]++; - carryIn = (blk[k] == 0); - } - } - } - // Zap possible leading zero - if (blk[len - 1] == 0) - len--; -} - -/* - * DIVISION WITH REMAINDER - * This monstrous function mods *this by the given divisor b while storing the - * quotient in the given object q; at the end, *this contains the remainder. - * The seemingly bizarre pattern of inputs and outputs was chosen so that the - * function copies as little as possible (since it is implemented by repeated - * subtraction of multiples of b from *this). - * - * "modWithQuotient" might be a better name for this function, but I would - * rather not change the name now. - */ -void BigUnsigned::divideWithRemainder(const BigUnsigned &b, BigUnsigned &q) { - /* Defending against aliased calls is more complex than usual because we - * are writing to both *this and q. - * - * It would be silly to try to write quotient and remainder to the - * same variable. Rule that out right away. */ - if (this == &q) - throw "BigUnsigned::divideWithRemainder: Cannot write quotient and remainder into the same variable"; - /* Now *this and q are separate, so the only concern is that b might be - * aliased to one of them. If so, use a temporary copy of b. */ - if (this == &b || &q == &b) { - BigUnsigned tmpB(b); - divideWithRemainder(tmpB, q); - return; - } - - /* - * Knuth's definition of mod (which this function uses) is somewhat - * different from the C++ definition of % in case of division by 0. - * - * We let a / 0 == 0 (it doesn't matter much) and a % 0 == a, no - * exceptions thrown. This allows us to preserve both Knuth's demand - * that a mod 0 == a and the useful property that - * (a / b) * b + (a % b) == a. - */ - if (b.len == 0) { - q.len = 0; - return; - } - - /* - * If *this.len < b.len, then *this < b, and we can be sure that b doesn't go into - * *this at all. The quotient is 0 and *this is already the remainder (so leave it alone). - */ - if (len < b.len) { - q.len = 0; - return; - } - - // At this point we know (*this).len >= b.len > 0. (Whew!) - - /* - * Overall method: - * - * For each appropriate i and i2, decreasing: - * Subtract (b << (i blocks and i2 bits)) from *this, storing the - * result in subtractBuf. - * If the subtraction succeeds with a nonnegative result: - * Turn on bit i2 of block i of the quotient q. - * Copy subtractBuf back into *this. - * Otherwise bit i2 of block i remains off, and *this is unchanged. - * - * Eventually q will contain the entire quotient, and *this will - * be left with the remainder. - * - * subtractBuf[x] corresponds to blk[x], not blk[x+i], since 2005.01.11. - * But on a single iteration, we don't touch the i lowest blocks of blk - * (and don't use those of subtractBuf) because these blocks are - * unaffected by the subtraction: we are subtracting - * (b << (i blocks and i2 bits)), which ends in at least `i' zero - * blocks. */ - // Variables for the calculation - Index i, j, k; - unsigned int i2; - Blk temp; - bool borrowIn, borrowOut; - - /* - * Make sure we have an extra zero block just past the value. - * - * When we attempt a subtraction, we might shift `b' so - * its first block begins a few bits left of the dividend, - * and then we'll try to compare these extra bits with - * a nonexistent block to the left of the dividend. The - * extra zero block ensures sensible behavior; we need - * an extra block in `subtractBuf' for exactly the same reason. - */ - Index origLen = len; // Save real length. - /* To avoid an out-of-bounds access in case of reallocation, allocate - * first and then increment the logical length. */ - allocateAndCopy(len + 1); - len++; - blk[origLen] = 0; // Zero the added block. - - // subtractBuf holds part of the result of a subtraction; see above. - Blk *subtractBuf = new Blk[len]; - - // Set preliminary length for quotient and make room - q.len = origLen - b.len + 1; - q.allocate(q.len); - // Zero out the quotient - for (i = 0; i < q.len; i++) - q.blk[i] = 0; - - // For each possible left-shift of b in blocks... - i = q.len; - while (i > 0) { - i--; - // For each possible left-shift of b in bits... - // (Remember, N is the number of bits in a Blk.) - q.blk[i] = 0; - i2 = N; - while (i2 > 0) { - i2--; - /* - * Subtract b, shifted left i blocks and i2 bits, from *this, - * and store the answer in subtractBuf. In the for loop, `k == i + j'. - * - * Compare this to the middle section of `multiply'. They - * are in many ways analogous. See especially the discussion - * of `getShiftedBlock'. - */ - for (j = 0, k = i, borrowIn = false; j <= b.len; j++, k++) { - temp = blk[k] - getShiftedBlock(b, j, i2); - borrowOut = (temp > blk[k]); - if (borrowIn) { - borrowOut |= (temp == 0); - temp--; - } - // Since 2005.01.11, indices of `subtractBuf' directly match those of `blk', so use `k'. - subtractBuf[k] = temp; - borrowIn = borrowOut; - } - // No more extra iteration to deal with `bHigh'. - // Roll-over a borrow as necessary. - for (; k < origLen && borrowIn; k++) { - borrowIn = (blk[k] == 0); - subtractBuf[k] = blk[k] - 1; - } - /* - * If the subtraction was performed successfully (!borrowIn), - * set bit i2 in block i of the quotient. - * - * Then, copy the portion of subtractBuf filled by the subtraction - * back to *this. This portion starts with block i and ends-- - * where? Not necessarily at block `i + b.len'! Well, we - * increased k every time we saved a block into subtractBuf, so - * the region of subtractBuf we copy is just [i, k). - */ - if (!borrowIn) { - q.blk[i] |= (Blk(1) << i2); - while (k > i) { - k--; - blk[k] = subtractBuf[k]; - } - } - } - } - // Zap possible leading zero in quotient - if (q.blk[q.len - 1] == 0) - q.len--; - // Zap any/all leading zeros in remainder - zapLeadingZeros(); - // Deallocate subtractBuf. - // (Thanks to Brad Spencer for noticing my accidental omission of this!) - delete [] subtractBuf; -} - -/* BITWISE OPERATORS - * These are straightforward blockwise operations except that they differ in - * the output length and the necessity of zapLeadingZeros. */ - -void BigUnsigned::bitAnd(const BigUnsigned &a, const BigUnsigned &b) { - DTRT_ALIASED(this == &a || this == &b, bitAnd(a, b)); - // The bitwise & can't be longer than either operand. - len = (a.len >= b.len) ? b.len : a.len; - allocate(len); - Index i; - for (i = 0; i < len; i++) - blk[i] = a.blk[i] & b.blk[i]; - zapLeadingZeros(); -} - -void BigUnsigned::bitOr(const BigUnsigned &a, const BigUnsigned &b) { - DTRT_ALIASED(this == &a || this == &b, bitOr(a, b)); - Index i; - const BigUnsigned *a2, *b2; - if (a.len >= b.len) { - a2 = &a; - b2 = &b; - } else { - a2 = &b; - b2 = &a; - } - allocate(a2->len); - for (i = 0; i < b2->len; i++) - blk[i] = a2->blk[i] | b2->blk[i]; - for (; i < a2->len; i++) - blk[i] = a2->blk[i]; - len = a2->len; - // Doesn't need zapLeadingZeros. -} - -void BigUnsigned::bitXor(const BigUnsigned &a, const BigUnsigned &b) { - DTRT_ALIASED(this == &a || this == &b, bitXor(a, b)); - Index i; - const BigUnsigned *a2, *b2; - if (a.len >= b.len) { - a2 = &a; - b2 = &b; - } else { - a2 = &b; - b2 = &a; - } - allocate(a2->len); - for (i = 0; i < b2->len; i++) - blk[i] = a2->blk[i] ^ b2->blk[i]; - for (; i < a2->len; i++) - blk[i] = a2->blk[i]; - len = a2->len; - zapLeadingZeros(); -} - -void BigUnsigned::bitShiftLeft(const BigUnsigned &a, int b) { - DTRT_ALIASED(this == &a, bitShiftLeft(a, b)); - if (b < 0) { - if (b << 1 == 0) - throw "BigUnsigned::bitShiftLeft: " - "Pathological shift amount not implemented"; - else { - bitShiftRight(a, -b); - return; - } - } - Index shiftBlocks = b / N; - unsigned int shiftBits = b % N; - // + 1: room for high bits nudged left into another block - len = a.len + shiftBlocks + 1; - allocate(len); - Index i, j; - for (i = 0; i < shiftBlocks; i++) - blk[i] = 0; - for (j = 0, i = shiftBlocks; j <= a.len; j++, i++) - blk[i] = getShiftedBlock(a, j, shiftBits); - // Zap possible leading zero - if (blk[len - 1] == 0) - len--; -} - -void BigUnsigned::bitShiftRight(const BigUnsigned &a, int b) { - DTRT_ALIASED(this == &a, bitShiftRight(a, b)); - if (b < 0) { - if (b << 1 == 0) - throw "BigUnsigned::bitShiftRight: " - "Pathological shift amount not implemented"; - else { - bitShiftLeft(a, -b); - return; - } - } - // This calculation is wacky, but expressing the shift as a left bit shift - // within each block lets us use getShiftedBlock. - Index rightShiftBlocks = (b + N - 1) / N; - unsigned int leftShiftBits = N * rightShiftBlocks - b; - // Now (N * rightShiftBlocks - leftShiftBits) == b - // and 0 <= leftShiftBits < N. - if (rightShiftBlocks >= a.len + 1) { - // All of a is guaranteed to be shifted off, even considering the left - // bit shift. - len = 0; - return; - } - // Now we're allocating a positive amount. - // + 1: room for high bits nudged left into another block - len = a.len + 1 - rightShiftBlocks; - allocate(len); - Index i, j; - for (j = rightShiftBlocks, i = 0; j <= a.len; j++, i++) - blk[i] = getShiftedBlock(a, j, leftShiftBits); - // Zap possible leading zero - if (blk[len - 1] == 0) - len--; -} - -// INCREMENT/DECREMENT OPERATORS - -// Prefix increment -void BigUnsigned::operator ++() { - Index i; - bool carry = true; - for (i = 0; i < len && carry; i++) { - blk[i]++; - carry = (blk[i] == 0); - } - if (carry) { - // Allocate and then increase length, as in divideWithRemainder - allocateAndCopy(len + 1); - len++; - blk[i] = 1; - } -} - -// Postfix increment: same as prefix -void BigUnsigned::operator ++(int) { - operator ++(); -} - -// Prefix decrement -void BigUnsigned::operator --() { - if (len == 0) - throw "BigUnsigned::operator --(): Cannot decrement an unsigned zero"; - Index i; - bool borrow = true; - for (i = 0; borrow; i++) { - borrow = (blk[i] == 0); - blk[i]--; - } - // Zap possible leading zero (there can only be one) - if (blk[len - 1] == 0) - len--; -} - -// Postfix decrement: same as prefix -void BigUnsigned::operator --(int) { - operator --(); -} diff --git a/src/qzxing/zxing/bigint/BigUnsigned.hh b/src/qzxing/zxing/bigint/BigUnsigned.hh deleted file mode 100644 index 55282e9..0000000 --- a/src/qzxing/zxing/bigint/BigUnsigned.hh +++ /dev/null @@ -1,418 +0,0 @@ -#ifndef BIGUNSIGNED_H -#define BIGUNSIGNED_H - -#include "NumberlikeArray.hh" - -/* A BigUnsigned object represents a nonnegative integer of size limited only by - * available memory. BigUnsigneds support most mathematical operators and can - * be converted to and from most primitive integer types. - * - * The number is stored as a NumberlikeArray of unsigned longs as if it were - * written in base 256^sizeof(unsigned long). The least significant block is - * first, and the length is such that the most significant block is nonzero. */ -class BigUnsigned : protected NumberlikeArray { - -public: - // Enumeration for the result of a comparison. - enum CmpRes { less = -1, equal = 0, greater = 1 }; - - // BigUnsigneds are built with a Blk type of unsigned long. - typedef unsigned long Blk; - - typedef NumberlikeArray::Index Index; - using NumberlikeArray::N; - -protected: - // Creates a BigUnsigned with a capacity; for internal use. - BigUnsigned(int, Index c) : NumberlikeArray(0, c) {} - - // Decreases len to eliminate any leading zero blocks. - void zapLeadingZeros() { - while (len > 0 && blk[len - 1] == 0) - len--; - } - -public: - // Constructs zero. - BigUnsigned() : NumberlikeArray() {} - - // Copy constructor - BigUnsigned(const BigUnsigned &x) : NumberlikeArray(x) {} - - // Assignment operator - void operator=(const BigUnsigned &x) { - NumberlikeArray::operator =(x); - } - - // Constructor that copies from a given array of blocks. - BigUnsigned(const Blk *b, Index blen) : NumberlikeArray(b, blen) { - // Eliminate any leading zeros we may have been passed. - zapLeadingZeros(); - } - - // Destructor. NumberlikeArray does the delete for us. - ~BigUnsigned() {} - - // Constructors from primitive integer types - BigUnsigned(unsigned long x); - BigUnsigned( long x); - BigUnsigned(unsigned int x); - BigUnsigned( int x); - BigUnsigned(unsigned short x); - BigUnsigned( short x); -protected: - // Helpers - template void initFromPrimitive (X x); - template void initFromSignedPrimitive(X x); -public: - - /* Converters to primitive integer types - * The implicit conversion operators caused trouble, so these are now - * named. */ - unsigned long toUnsignedLong () const; - long toLong () const; - unsigned int toUnsignedInt () const; - int toInt () const; - unsigned short toUnsignedShort() const; - short toShort () const; -protected: - // Helpers - template X convertToSignedPrimitive() const; - template X convertToPrimitive () const; -public: - - // BIT/BLOCK ACCESSORS - - // Expose these from NumberlikeArray directly. - using NumberlikeArray::getCapacity; - using NumberlikeArray::getLength; - - /* Returns the requested block, or 0 if it is beyond the length (as if - * the number had 0s infinitely to the left). */ - Blk getBlock(Index i) const { return i >= len ? 0 : blk[i]; } - /* Sets the requested block. The number grows or shrinks as necessary. */ - void setBlock(Index i, Blk newBlock); - - // The number is zero if and only if the canonical length is zero. - bool isZero() const { return NumberlikeArray::isEmpty(); } - - /* Returns the length of the number in bits, i.e., zero if the number - * is zero and otherwise one more than the largest value of bi for - * which getBit(bi) returns true. */ - Index bitLength() const; - /* Get the state of bit bi, which has value 2^bi. Bits beyond the - * number's length are considered to be 0. */ - bool getBit(Index bi) const { - return (getBlock(bi / N) & (Blk(1) << (bi % N))) != 0; - } - /* Sets the state of bit bi to newBit. The number grows or shrinks as - * necessary. */ - void setBit(Index bi, bool newBit); - - // COMPARISONS - - // Compares this to x like Perl's <=> - CmpRes compareTo(const BigUnsigned &x) const; - - // Ordinary comparison operators - bool operator ==(const BigUnsigned &x) const { - return NumberlikeArray::operator ==(x); - } - bool operator !=(const BigUnsigned &x) const { - return NumberlikeArray::operator !=(x); - } - bool operator < (const BigUnsigned &x) const { return compareTo(x) == less ; } - bool operator <=(const BigUnsigned &x) const { return compareTo(x) != greater; } - bool operator >=(const BigUnsigned &x) const { return compareTo(x) != less ; } - bool operator > (const BigUnsigned &x) const { return compareTo(x) == greater; } - - /* - * BigUnsigned and BigInteger both provide three kinds of operators. - * Here ``big-integer'' refers to BigInteger or BigUnsigned. - * - * (1) Overloaded ``return-by-value'' operators: - * +, -, *, /, %, unary -, &, |, ^, <<, >>. - * Big-integer code using these operators looks identical to code using - * the primitive integer types. These operators take one or two - * big-integer inputs and return a big-integer result, which can then - * be assigned to a BigInteger variable or used in an expression. - * Example: - * BigInteger a(1), b = 1; - * BigInteger c = a + b; - * - * (2) Overloaded assignment operators: - * +=, -=, *=, /=, %=, flipSign, &=, |=, ^=, <<=, >>=, ++, --. - * Again, these are used on big integers just like on ints. They take - * one writable big integer that both provides an operand and receives a - * result. Most also take a second read-only operand. - * Example: - * BigInteger a(1), b(1); - * a += b; - * - * (3) Copy-less operations: `add', `subtract', etc. - * These named methods take operands as arguments and store the result - * in the receiver (*this), avoiding unnecessary copies and allocations. - * `divideWithRemainder' is special: it both takes the dividend from and - * stores the remainder into the receiver, and it takes a separate - * object in which to store the quotient. NOTE: If you are wondering - * why these don't return a value, you probably mean to use the - * overloaded return-by-value operators instead. - * - * Examples: - * BigInteger a(43), b(7), c, d; - * - * c = a + b; // Now c == 50. - * c.add(a, b); // Same effect but without the two copies. - * - * c.divideWithRemainder(b, d); - * // 50 / 7; now d == 7 (quotient) and c == 1 (remainder). - * - * // ``Aliased'' calls now do the right thing using a temporary - * // copy, but see note on `divideWithRemainder'. - * a.add(a, b); - */ - - // COPY-LESS OPERATIONS - - // These 8: Arguments are read-only operands, result is saved in *this. - void add(const BigUnsigned &a, const BigUnsigned &b); - void subtract(const BigUnsigned &a, const BigUnsigned &b); - void multiply(const BigUnsigned &a, const BigUnsigned &b); - void bitAnd(const BigUnsigned &a, const BigUnsigned &b); - void bitOr(const BigUnsigned &a, const BigUnsigned &b); - void bitXor(const BigUnsigned &a, const BigUnsigned &b); - /* Negative shift amounts translate to opposite-direction shifts, - * except for -2^(8*sizeof(int)-1) which is unimplemented. */ - void bitShiftLeft(const BigUnsigned &a, int b); - void bitShiftRight(const BigUnsigned &a, int b); - - /* `a.divideWithRemainder(b, q)' is like `q = a / b, a %= b'. - * / and % use semantics similar to Knuth's, which differ from the - * primitive integer semantics under division by zero. See the - * implementation in BigUnsigned.cc for details. - * `a.divideWithRemainder(b, a)' throws an exception: it doesn't make - * sense to write quotient and remainder into the same variable. */ - void divideWithRemainder(const BigUnsigned &b, BigUnsigned &q); - - /* `divide' and `modulo' are no longer offered. Use - * `divideWithRemainder' instead. */ - - // OVERLOADED RETURN-BY-VALUE OPERATORS - BigUnsigned operator +(const BigUnsigned &x) const; - BigUnsigned operator -(const BigUnsigned &x) const; - BigUnsigned operator *(const BigUnsigned &x) const; - BigUnsigned operator /(const BigUnsigned &x) const; - BigUnsigned operator %(const BigUnsigned &x) const; - /* OK, maybe unary minus could succeed in one case, but it really - * shouldn't be used, so it isn't provided. */ - BigUnsigned operator &(const BigUnsigned &x) const; - BigUnsigned operator |(const BigUnsigned &x) const; - BigUnsigned operator ^(const BigUnsigned &x) const; - BigUnsigned operator <<(int b) const; - BigUnsigned operator >>(int b) const; - - // OVERLOADED ASSIGNMENT OPERATORS - void operator +=(const BigUnsigned &x); - void operator -=(const BigUnsigned &x); - void operator *=(const BigUnsigned &x); - void operator /=(const BigUnsigned &x); - void operator %=(const BigUnsigned &x); - void operator &=(const BigUnsigned &x); - void operator |=(const BigUnsigned &x); - void operator ^=(const BigUnsigned &x); - void operator <<=(int b); - void operator >>=(int b); - - /* INCREMENT/DECREMENT OPERATORS - * To discourage messy coding, these do not return *this, so prefix - * and postfix behave the same. */ - void operator ++( ); - void operator ++(int); - void operator --( ); - void operator --(int); - - // Helper function that needs access to BigUnsigned internals - friend Blk getShiftedBlock(const BigUnsigned &num, Index x, - unsigned int y); - - // See BigInteger.cc. - template - friend X convertBigUnsignedToPrimitiveAccess(const BigUnsigned &a); -}; - -/* Implementing the return-by-value and assignment operators in terms of the - * copy-less operations. The copy-less operations are responsible for making - * any necessary temporary copies to work around aliasing. */ - -inline BigUnsigned BigUnsigned::operator +(const BigUnsigned &x) const { - BigUnsigned ans; - ans.add(*this, x); - return ans; -} -inline BigUnsigned BigUnsigned::operator -(const BigUnsigned &x) const { - BigUnsigned ans; - ans.subtract(*this, x); - return ans; -} -inline BigUnsigned BigUnsigned::operator *(const BigUnsigned &x) const { - BigUnsigned ans; - ans.multiply(*this, x); - return ans; -} -inline BigUnsigned BigUnsigned::operator /(const BigUnsigned &x) const { - if (x.isZero()) throw "BigUnsigned::operator /: division by zero"; - BigUnsigned q, r; - r = *this; - r.divideWithRemainder(x, q); - return q; -} -inline BigUnsigned BigUnsigned::operator %(const BigUnsigned &x) const { - if (x.isZero()) throw "BigUnsigned::operator %: division by zero"; - BigUnsigned q, r; - r = *this; - r.divideWithRemainder(x, q); - return r; -} -inline BigUnsigned BigUnsigned::operator &(const BigUnsigned &x) const { - BigUnsigned ans; - ans.bitAnd(*this, x); - return ans; -} -inline BigUnsigned BigUnsigned::operator |(const BigUnsigned &x) const { - BigUnsigned ans; - ans.bitOr(*this, x); - return ans; -} -inline BigUnsigned BigUnsigned::operator ^(const BigUnsigned &x) const { - BigUnsigned ans; - ans.bitXor(*this, x); - return ans; -} -inline BigUnsigned BigUnsigned::operator <<(int b) const { - BigUnsigned ans; - ans.bitShiftLeft(*this, b); - return ans; -} -inline BigUnsigned BigUnsigned::operator >>(int b) const { - BigUnsigned ans; - ans.bitShiftRight(*this, b); - return ans; -} - -inline void BigUnsigned::operator +=(const BigUnsigned &x) { - add(*this, x); -} -inline void BigUnsigned::operator -=(const BigUnsigned &x) { - subtract(*this, x); -} -inline void BigUnsigned::operator *=(const BigUnsigned &x) { - multiply(*this, x); -} -inline void BigUnsigned::operator /=(const BigUnsigned &x) { - if (x.isZero()) throw "BigUnsigned::operator /=: division by zero"; - /* The following technique is slightly faster than copying *this first - * when x is large. */ - BigUnsigned q; - divideWithRemainder(x, q); - // *this contains the remainder, but we overwrite it with the quotient. - *this = q; -} -inline void BigUnsigned::operator %=(const BigUnsigned &x) { - if (x.isZero()) throw "BigUnsigned::operator %=: division by zero"; - BigUnsigned q; - // Mods *this by x. Don't care about quotient left in q. - divideWithRemainder(x, q); -} -inline void BigUnsigned::operator &=(const BigUnsigned &x) { - bitAnd(*this, x); -} -inline void BigUnsigned::operator |=(const BigUnsigned &x) { - bitOr(*this, x); -} -inline void BigUnsigned::operator ^=(const BigUnsigned &x) { - bitXor(*this, x); -} -inline void BigUnsigned::operator <<=(int b) { - bitShiftLeft(*this, b); -} -inline void BigUnsigned::operator >>=(int b) { - bitShiftRight(*this, b); -} - -/* Templates for conversions of BigUnsigned to and from primitive integers. - * BigInteger.cc needs to instantiate convertToPrimitive, and the uses in - * BigUnsigned.cc didn't do the trick; I think g++ inlined convertToPrimitive - * instead of generating linkable instantiations. So for consistency, I put - * all the templates here. */ - -// CONSTRUCTION FROM PRIMITIVE INTEGERS - -/* Initialize this BigUnsigned from the given primitive integer. The same - * pattern works for all primitive integer types, so I put it into a template to - * reduce code duplication. (Don't worry: this is protected and we instantiate - * it only with primitive integer types.) Type X could be signed, but x is - * known to be nonnegative. */ -template -void BigUnsigned::initFromPrimitive(X x) { - if (x == 0) - ; // NumberlikeArray already initialized us to zero. - else { - // Create a single block. blk is NULL; no need to delete it. - cap = 1; - blk = new Blk[1]; - len = 1; - blk[0] = Blk(x); - } -} - -/* Ditto, but first check that x is nonnegative. I could have put the check in - * initFromPrimitive and let the compiler optimize it out for unsigned-type - * instantiations, but I wanted to avoid the warning stupidly issued by g++ for - * a condition that is constant in *any* instantiation, even if not in all. */ -template -void BigUnsigned::initFromSignedPrimitive(X x) { - if (x < 0) - throw "BigUnsigned constructor: " - "Cannot construct a BigUnsigned from a negative number"; - else - initFromPrimitive(x); -} - -// CONVERSION TO PRIMITIVE INTEGERS - -/* Template with the same idea as initFromPrimitive. This might be slightly - * slower than the previous version with the masks, but it's much shorter and - * clearer, which is the library's stated goal. */ -template -X BigUnsigned::convertToPrimitive() const { - if (len == 0) - // The number is zero; return zero. - return 0; - else if (len == 1) { - // The single block might fit in an X. Try the conversion. - X x = X(blk[0]); - // Make sure the result accurately represents the block. - if (Blk(x) == blk[0]) - // Successful conversion. - return x; - // Otherwise fall through. - } - throw "BigUnsigned::to: " - "Value is too big to fit in the requested type"; -} - -/* Wrap the above in an x >= 0 test to make sure we got a nonnegative result, - * not a negative one that happened to convert back into the correct nonnegative - * one. (E.g., catch incorrect conversion of 2^31 to the long -2^31.) Again, - * separated to avoid a g++ warning. */ -template -X BigUnsigned::convertToSignedPrimitive() const { - X x = convertToPrimitive(); - if (x >= 0) - return x; - else - throw "BigUnsigned::to(Primitive): " - "Value is too big to fit in the requested type"; -} - -#endif diff --git a/src/qzxing/zxing/bigint/BigUnsignedInABase.cc b/src/qzxing/zxing/bigint/BigUnsignedInABase.cc deleted file mode 100644 index 6985823..0000000 --- a/src/qzxing/zxing/bigint/BigUnsignedInABase.cc +++ /dev/null @@ -1,125 +0,0 @@ -#include "BigUnsignedInABase.hh" - -BigUnsignedInABase::BigUnsignedInABase(const Digit *d, Index l, Base base) - : NumberlikeArray(d, l), base(base) { - // Check the base - if (base < 2) - throw "BigUnsignedInABase::BigUnsignedInABase(const Digit *, Index, Base): The base must be at least 2"; - - // Validate the digits. - for (Index i = 0; i < l; i++) - if (blk[i] >= base) - throw "BigUnsignedInABase::BigUnsignedInABase(const Digit *, Index, Base): A digit is too large for the specified base"; - - // Eliminate any leading zeros we may have been passed. - zapLeadingZeros(); -} - -namespace { - unsigned int bitLen(unsigned int x) { - unsigned int len = 0; - while (x > 0) { - x >>= 1; - len++; - } - return len; - } - unsigned int ceilingDiv(unsigned int a, unsigned int b) { - return (a + b - 1) / b; - } -} - -BigUnsignedInABase::BigUnsignedInABase(const BigUnsigned &x, Base base) { - // Check the base - if (base < 2) - throw "BigUnsignedInABase(BigUnsigned, Base): The base must be at least 2"; - this->base = base; - - // Get an upper bound on how much space we need - int maxBitLenOfX = x.getLength() * BigUnsigned::N; - int minBitsPerDigit = bitLen(base) - 1; - int maxDigitLenOfX = ceilingDiv(maxBitLenOfX, minBitsPerDigit); - len = maxDigitLenOfX; // Another change to comply with `staying in bounds'. - allocate(len); // Get the space - - BigUnsigned x2(x), buBase(base); - Index digitNum = 0; - - while (!x2.isZero()) { - // Get last digit. This is like `lastDigit = x2 % buBase, x2 /= buBase'. - BigUnsigned lastDigit(x2); - lastDigit.divideWithRemainder(buBase, x2); - // Save the digit. - blk[digitNum] = lastDigit.toUnsignedShort(); - // Move on. We can't run out of room: we figured it out above. - digitNum++; - } - - // Save the actual length. - len = digitNum; -} - -BigUnsignedInABase::operator BigUnsigned() const { - BigUnsigned ans(0), buBase(base), temp; - Index digitNum = len; - while (digitNum > 0) { - digitNum--; - temp.multiply(ans, buBase); - ans.add(temp, BigUnsigned(blk[digitNum])); - } - return ans; -} - -BigUnsignedInABase::BigUnsignedInABase(const std::string &s, Base base) { - // Check the base. - if (base > 36) - throw "BigUnsignedInABase(std::string, Base): The default string conversion routines use the symbol set 0-9, A-Z and therefore support only up to base 36. You tried a conversion with a base over 36; write your own string conversion routine."; - // Save the base. - // This pattern is seldom seen in C++, but the analogous ``this.'' is common in Java. - this->base = base; - - // `s.length()' is a `size_t', while `len' is a `NumberlikeArray::Index', - // also known as an `unsigned int'. Some compilers warn without this cast. - len = Index(s.length()); - allocate(len); - - Index digitNum, symbolNumInString; - for (digitNum = 0; digitNum < len; digitNum++) { - symbolNumInString = len - 1 - digitNum; - char theSymbol = s[symbolNumInString]; - if (theSymbol >= '0' && theSymbol <= '9') - blk[digitNum] = theSymbol - '0'; - else if (theSymbol >= 'A' && theSymbol <= 'Z') - blk[digitNum] = theSymbol - 'A' + 10; - else if (theSymbol >= 'a' && theSymbol <= 'z') - blk[digitNum] = theSymbol - 'a' + 10; - else - throw "BigUnsignedInABase(std::string, Base): Bad symbol in input. Only 0-9, A-Z, a-z are accepted."; - - if (blk[digitNum] >= base) - throw "BigUnsignedInABase::BigUnsignedInABase(const Digit *, Index, Base): A digit is too large for the specified base"; - } - zapLeadingZeros(); -} - -BigUnsignedInABase::operator std::string() const { - if (base > 36) - throw "BigUnsignedInABase ==> std::string: The default string conversion routines use the symbol set 0-9, A-Z and therefore support only up to base 36. You tried a conversion with a base over 36; write your own string conversion routine."; - if (len == 0) - return std::string("0"); - // Some compilers don't have push_back, so use a char * buffer instead. - char *s = new char[len + 1]; - s[len] = '\0'; - Index digitNum, symbolNumInString; - for (symbolNumInString = 0; symbolNumInString < len; symbolNumInString++) { - digitNum = len - 1 - symbolNumInString; - Digit theDigit = blk[digitNum]; - if (theDigit < 10) - s[symbolNumInString] = char('0' + theDigit); - else - s[symbolNumInString] = char('A' + theDigit - 10); - } - std::string s2(s); - delete [] s; - return s2; -} diff --git a/src/qzxing/zxing/bigint/BigUnsignedInABase.hh b/src/qzxing/zxing/bigint/BigUnsignedInABase.hh deleted file mode 100644 index b0d8e70..0000000 --- a/src/qzxing/zxing/bigint/BigUnsignedInABase.hh +++ /dev/null @@ -1,122 +0,0 @@ -#ifndef BIGUNSIGNEDINABASE_H -#define BIGUNSIGNEDINABASE_H - -#include "NumberlikeArray.hh" -#include "BigUnsigned.hh" -#include - -/* - * A BigUnsignedInABase object represents a nonnegative integer of size limited - * only by available memory, represented in a user-specified base that can fit - * in an `unsigned short' (most can, and this saves memory). - * - * BigUnsignedInABase is intended as an intermediary class with little - * functionality of its own. BigUnsignedInABase objects can be constructed - * from, and converted to, BigUnsigneds (requiring multiplication, mods, etc.) - * and `std::string's (by switching digit values for appropriate characters). - * - * BigUnsignedInABase is similar to BigUnsigned. Note the following: - * - * (1) They represent the number in exactly the same way, except that - * BigUnsignedInABase uses ``digits'' (or Digit) where BigUnsigned uses - * ``blocks'' (or Blk). - * - * (2) Both use the management features of NumberlikeArray. (In fact, my desire - * to add a BigUnsignedInABase class without duplicating a lot of code led me to - * introduce NumberlikeArray.) - * - * (3) The only arithmetic operation supported by BigUnsignedInABase is an - * equality test. Use BigUnsigned for arithmetic. - */ - -class BigUnsignedInABase : protected NumberlikeArray { - -public: - // The digits of a BigUnsignedInABase are unsigned shorts. - typedef unsigned short Digit; - // That's also the type of a base. - typedef Digit Base; - -protected: - // The base in which this BigUnsignedInABase is expressed - Base base; - - // Creates a BigUnsignedInABase with a capacity; for internal use. - BigUnsignedInABase(int, Index c) : NumberlikeArray(0, c) {} - - // Decreases len to eliminate any leading zero digits. - void zapLeadingZeros() { - while (len > 0 && blk[len - 1] == 0) - len--; - } - -public: - // Constructs zero in base 2. - BigUnsignedInABase() : NumberlikeArray(), base(2) {} - - // Copy constructor - BigUnsignedInABase(const BigUnsignedInABase &x) : NumberlikeArray(x), base(x.base) {} - - // Assignment operator - void operator =(const BigUnsignedInABase &x) { - NumberlikeArray::operator =(x); - base = x.base; - } - - // Constructor that copies from a given array of digits. - BigUnsignedInABase(const Digit *d, Index l, Base base); - - // Destructor. NumberlikeArray does the delete for us. - ~BigUnsignedInABase() {} - - // LINKS TO BIGUNSIGNED - BigUnsignedInABase(const BigUnsigned &x, Base base); - operator BigUnsigned() const; - - /* LINKS TO STRINGS - * - * These use the symbols ``0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'' to - * represent digits of 0 through 35. When parsing strings, lowercase is - * also accepted. - * - * All string representations are big-endian (big-place-value digits - * first). (Computer scientists have adopted zero-based counting; why - * can't they tolerate little-endian numbers?) - * - * No string representation has a ``base indicator'' like ``0x''. - * - * An exception is made for zero: it is converted to ``0'' and not the - * empty string. - * - * If you want different conventions, write your own routines to go - * between BigUnsignedInABase and strings. It's not hard. - */ - operator std::string() const; - BigUnsignedInABase(const std::string &s, Base base); - -public: - - // ACCESSORS - Base getBase() const { return base; } - - // Expose these from NumberlikeArray directly. - using NumberlikeArray::getCapacity; - using NumberlikeArray::getLength; - - /* Returns the requested digit, or 0 if it is beyond the length (as if - * the number had 0s infinitely to the left). */ - Digit getDigit(Index i) const { return i >= len ? 0 : blk[i]; } - - // The number is zero if and only if the canonical length is zero. - bool isZero() const { return NumberlikeArray::isEmpty(); } - - /* Equality test. For the purposes of this test, two BigUnsignedInABase - * values must have the same base to be equal. */ - bool operator ==(const BigUnsignedInABase &x) const { - return base == x.base && NumberlikeArray::operator ==(x); - } - bool operator !=(const BigUnsignedInABase &x) const { return !operator ==(x); } - -}; - -#endif diff --git a/src/qzxing/zxing/bigint/ChangeLog b/src/qzxing/zxing/bigint/ChangeLog deleted file mode 100644 index 5ad2c5c..0000000 --- a/src/qzxing/zxing/bigint/ChangeLog +++ /dev/null @@ -1,146 +0,0 @@ - Change Log - -These entries tell you what was added, fixed, or improved in each version as -compared to the previous one. In case you haven't noticed, a version number -roughly corresponds to the release date of that version in `YYYY.MM.DD[.N]' -format, where `.N' goes `.2', `.3', etc. if there are multiple versions on the -same day. The topmost version listed is the one you have. - -2010.04.30 ----------- -- Strengthen the advice about build/IDE configuration in the README. - -2009.05.03 ----------- -- BigUnsigned::{get,set}Bit: Change two remaining `1 <<' to `Blk(1) <<' to work - on systems where sizeof(unsigned int) != sizeof(Blk). Bug reported by Brad - Spencer. -- dataToBigInteger: Change a `delete' to `delete []' to avoid leaking memory. - Bug reported by Nicolás Carrasco. - -2009.03.26 ----------- -- BigUnsignedInABase(std::string) Reject digits too big for the base. - Bug reported by Niakam Kazemi. - -2008.07.20 ----------- -Dennis Yew pointed out serious problems with ambiguities and unwanted -conversions when mixing BigInteger/BigUnsigned and primitive integers. To fix -these, I removed the implicit conversions from BigInteger/BigUnsigned to -primitive integers and from BigInteger to BigUnsigned. Removing the -BigInteger-to-BigUnsigned conversion required changing BigInteger to have a -BigUnsigned field instead of inheriting from it; this was a complex task but -ultimately gave a saner design. At the same time, I went through the entire -codebase, making the formatting and comments prettier and reworking anything I -thought was unclear. I also added a testsuite (currently for 32-bit systems -only); it doesn't yet cover the entire library but should help to ensure that -things work the way they should. - -A number of changes from version 2007.07.07 break compatibility with existing -code that uses the library, but updating that code should be pretty easy: -- BigInteger can no longer be implicitly converted to BigUnsigned. Use - getMagnitude() instead. -- BigUnsigned and BigInteger can no longer be implicitly converted to primitive - integers. Use the toInt() family of functions instead. -- The easy* functions have been renamed to more mature names: - bigUnsignedToString, bigIntegerToString, stringToBigUnsigned, - stringToBigInteger, dataToBigInteger. -- BigInteger no longer supports bitwise operations. Get the magnitude with - getMagnitude() and operate on that instead. -- The old {BigUnsigned,BigInteger}::{divide,modulo} copy-less options have been - removed. Use divideWithRemainder instead. -- Added a base argument to BigUnsignedInABase's digit-array constructor. I - ope no one used that constructor in its broken state anyway. - -Other notable changes: -- Added BigUnsigned functions setBlock, bitLength, getBit, setBit. -- The bit-shifting operations now support negative shift amounts, which shift in - the other direction. -- Added some big-integer algorithms in BigIntegerAlgorithms.hh: gcd, - extendedEuclidean, modinv, modexp. - -2007.07.07 ----------- -Update the "Running the sample program produces this output:" comment in -sample.cc for the bitwise operators. - -2007.06.14 ----------- -- Implement << and >> for BigUnsigned in response to email from Marco Schulze. -- Fix name: DOTR_ALIASED -> DTRT_ALIASED. -- Demonstrate all bitwise operators (&, |, ^, <<, >>) in sample.cc. - -2007.02.16 ----------- -Boris Dessy pointed out that the library threw an exception on "a *= a", so I changed all the put-here operations to handle aliased calls correctly using a temporary copy instead of throwing exceptions. - -2006.08.14 ----------- -In BigUnsigned::bitXor, change allocate(b2->len) to allocate(a2->len): we should allocate enough space for the longer number, not the shorter one! Thanks to Sriram Sankararaman for pointing this out. - -2006.05.03 ----------- -I ran the sample program using valgrind and discovered a `delete s' that should be `delete [] s' and a `len++' before an `allocateAndCopy(len)' that should have been after an `allocateAndCopy(len + 1)'. I fixed both. Yay for valgrind! - -2006.05.01 ----------- -I fixed incorrect results reported by Mohand Mezmaz and related memory corruption on platforms where Blk is bigger than int. I replaced (1 << x) with (Blk(1) << x) in two places in BigUnsigned.cc. - -2006.04.24 ----------- -Two bug fixes: BigUnsigned "++x" no longer segfaults when x grows in length, and BigUnsigned == and != are now redeclared so as to be usable. I redid the Makefile: I removed the *.tag mechanism and hard-coded the library's header dependencies, I added comments, and I made the Makefile more useful for building one's own programs instead of just the sample. - -2006.02.26 ----------- -A few tweaks in preparation for a group to distribute the library. The project Web site has moved; I updated the references. I fixed a typo and added a missing function in NumberlikeArray.hh. I'm using Eclipse now, so you get Eclipse project files. - -2005.03.30 ----------- -Sam Larkin found a bug in `BigInteger::subtract'; I fixed it. - -2005.01.18 ----------- -I fixed some problems with `easyDataToBI'. Due to some multiply declared variables, this function would not compile. However, it is a template function, so the compiler parses it and doesn't compile the parsed representation until something uses the function; this is how I missed the problems. I also removed debugging output from this function. - -2005.01.17 ----------- -A fix to some out-of-bounds accesses reported by Milan Tomic (see the comment under `BigUnsigned::divideWithRemainder'). `BigUnsigned::multiply' and `BigUnsigned::divideWithRemainder' implementations neatened up a bit with the help of a function `getShiftedBlock'. I (finally!) introduced a constant `BigUnsigned::N', the number of bits in a `BigUnsigned::Blk', which varies depending on machine word size. In both code and comments, it replaces the much clunkier `8*sizeof(Blk)'. Numerous other small changes. There's a new conversion routine `easyDataToBI' that will convert almost any format of binary data to a `BigInteger'. - -I have inserted a significant number of new comments. Most explain unobvious aspects of the code. - -2005.01.06 ----------- -Some changes to the way zero-length arrays are handled by `NumberlikeArray', which fixed a memory leak reported by Milan Tomic. - -2004.12.24.2 ------------- -I tied down a couple of loose ends involving division/modulo. I added an explanation of put-here vs. overloaded operators in the sample program; this has confused too many people. Miscellaneous other improvements. - -I believe that, at this point, the Big Integer Library makes no assumptions about the word size of the machine it is using. `BigUnsigned::Blk' is always an `unsigned long', whatever that may be, and its size is computed with `sizeof' when necessary. However, just in case, I would be interested to have someone test the library on a non-32-bit machine to see if it works. - -2004.12.24 ----------- -This is a _major_ upgrade to the library. Among the things that have changed: - -I wrote the original version of the library, particularly the four ``classical algorithms'' in `BigUnsigned.cc', using array indexing. Then I rewrote it to use pointers because I thought that would be faster. But recently, I revisited the code in `BigUnsigned.cc' and found that I could not begin to understand what it was doing. - -I have decided that the drawbacks of pointers, increased coding difficulty and reduced code readability, far outweigh their speed benefits. Plus, any modern optimizing compiler should produce fast code either way. Therefore, I rewrote the library to use array indexing again. (Thank goodness for regular-expression find-and-replace. It saved me a lot of time.) - -The put-here operations `divide' and `modulo' of each of `BigUnsigned' and `BigInteger' have been supplanted by a single operation `divideWithRemainder'. Read the profuse comments for more information on its exact behavior. - -There is a new class `BigUnsignedInABase' that is like `BigUnsigned' but uses a user-specified, small base instead of `256 ^ sizeof(unsigned long)'. Much of the code common to the two has been factored out into `NumberlikeArray'. - -`BigUnsignedInABase' facilitates conversion between `BigUnsigned's and digit-by-digit string representations using `std::string'. Convenience routines to do this conversion are in `BigIntegerUtils.hh'. `iostream' compatibility has been improved. - -I would like to thank Chris Morbitzer for the e-mail message that catalyzed this major upgrade. He wanted a way to convert a string to a BigInteger. One thing just led to another, roughly in reverse order from how they are listed here. - -2004.1216 ---------- -Brad Spencer pointed out a memory leak in `BigUnsigned::divide'. It is fixed in the December 16, 2004 version. - -2004.1205 ---------- -After months of inactivity, I fixed a bug in the `BigInteger' division routine; thanks to David Allen for reporting the bug. I also added simple routines for decimal output to `std::ostream's, and there is a demo that prints out powers of 3. - -~~~~ diff --git a/src/qzxing/zxing/bigint/NumberlikeArray.hh b/src/qzxing/zxing/bigint/NumberlikeArray.hh deleted file mode 100644 index 61ae6ab..0000000 --- a/src/qzxing/zxing/bigint/NumberlikeArray.hh +++ /dev/null @@ -1,177 +0,0 @@ -#ifndef NUMBERLIKEARRAY_H -#define NUMBERLIKEARRAY_H - -// Make sure we have NULL. -#ifndef NULL -#define NULL 0 -#endif - -/* A NumberlikeArray object holds a heap-allocated array of Blk with a - * length and a capacity and provides basic memory management features. - * BigUnsigned and BigUnsignedInABase both subclass it. - * - * NumberlikeArray provides no information hiding. Subclasses should use - * nonpublic inheritance and manually expose members as desired using - * declarations like this: - * - * public: - * NumberlikeArray< the-type-argument >::getLength; - */ -template -class NumberlikeArray { -public: - - // Type for the index of a block in the array - typedef unsigned int Index; - // The number of bits in a block, defined below. - static const unsigned int N; - - // The current allocated capacity of this NumberlikeArray (in blocks) - Index cap; - // The actual length of the value stored in this NumberlikeArray (in blocks) - Index len; - // Heap-allocated array of the blocks (can be NULL if len == 0) - Blk *blk; - - // Constructs a ``zero'' NumberlikeArray with the given capacity. - NumberlikeArray(Index c) : cap(c), len(0) { - blk = (cap > 0) ? (new Blk[cap]) : NULL; - } - - /* Constructs a zero NumberlikeArray without allocating a backing array. - * A subclass that doesn't know the needed capacity at initialization - * time can use this constructor and then overwrite blk without first - * deleting it. */ - NumberlikeArray() : cap(0), len(0) { - blk = NULL; - } - - // Destructor. Note that `delete NULL' is a no-op. - ~NumberlikeArray() { - delete [] blk; - } - - /* Ensures that the array has at least the requested capacity; may - * destroy the contents. */ - void allocate(Index c); - - /* Ensures that the array has at least the requested capacity; does not - * destroy the contents. */ - void allocateAndCopy(Index c); - - // Copy constructor - NumberlikeArray(const NumberlikeArray &x); - - // Assignment operator - void operator=(const NumberlikeArray &x); - - // Constructor that copies from a given array of blocks - NumberlikeArray(const Blk *b, Index blen); - - // ACCESSORS - Index getCapacity() const { return cap; } - Index getLength() const { return len; } - Blk getBlock(Index i) const { return blk[i]; } - bool isEmpty() const { return len == 0; } - - /* Equality comparison: checks if both objects have the same length and - * equal (==) array elements to that length. Subclasses may wish to - * override. */ - bool operator ==(const NumberlikeArray &x) const; - - bool operator !=(const NumberlikeArray &x) const { - return !operator ==(x); - } -}; - -/* BEGIN TEMPLATE DEFINITIONS. They are present here so that source files that - * include this header file can generate the necessary real definitions. */ - -template -const unsigned int NumberlikeArray::N = 8 * sizeof(Blk); - -template -void NumberlikeArray::allocate(Index c) { - // If the requested capacity is more than the current capacity... - if (c > cap) { - // Delete the old number array - delete [] blk; - // Allocate the new array - cap = c; - blk = new Blk[cap]; - } -} - -template -void NumberlikeArray::allocateAndCopy(Index c) { - // If the requested capacity is more than the current capacity... - if (c > cap) { - Blk *oldBlk = blk; - // Allocate the new number array - cap = c; - blk = new Blk[cap]; - // Copy number blocks - Index i; - for (i = 0; i < len; i++) - blk[i] = oldBlk[i]; - // Delete the old array - delete [] oldBlk; - } -} - -template -NumberlikeArray::NumberlikeArray(const NumberlikeArray &x) - : len(x.len) { - // Create array - cap = len; - blk = new Blk[cap]; - // Copy blocks - Index i; - for (i = 0; i < len; i++) - blk[i] = x.blk[i]; -} - -template -void NumberlikeArray::operator=(const NumberlikeArray &x) { - /* Calls like a = a have no effect; catch them before the aliasing - * causes a problem */ - if (this == &x) - return; - // Copy length - len = x.len; - // Expand array if necessary - allocate(len); - // Copy number blocks - Index i; - for (i = 0; i < len; i++) - blk[i] = x.blk[i]; -} - -template -NumberlikeArray::NumberlikeArray(const Blk *b, Index blen) - : cap(blen), len(blen) { - // Create array - blk = new Blk[cap]; - // Copy blocks - Index i; - for (i = 0; i < len; i++) - blk[i] = b[i]; -} - -template -bool NumberlikeArray::operator ==(const NumberlikeArray &x) const { - if (len != x.len) - // Definitely unequal. - return false; - else { - // Compare corresponding blocks one by one. - Index i; - for (i = 0; i < len; i++) - if (blk[i] != x.blk[i]) - return false; - // No blocks differed, so the objects are equal. - return true; - } -} - -#endif diff --git a/src/qzxing/zxing/bigint/README b/src/qzxing/zxing/bigint/README deleted file mode 100644 index 9bed92c..0000000 --- a/src/qzxing/zxing/bigint/README +++ /dev/null @@ -1,71 +0,0 @@ - - C++ Big Integer Library - (see ChangeLog for version) - - http://mattmccutchen.net/bigint/ - - Written and maintained by Matt McCutchen - -You can use this library in a C++ program to do arithmetic on integers of size -limited only by your computer's memory. The library provides BigUnsigned and -BigInteger classes that represent nonnegative integers and signed integers, -respectively. Most of the C++ arithmetic operators are overloaded for these -classes, so big-integer calculations are as easy as: - - #include "BigIntegerLibrary.hh" - - BigInteger a = 65536; - cout << (a * a * a * a * a * a * a * a); - - (prints 340282366920938463463374607431768211456) - -The code in `sample.cc' demonstrates the most important features of the library. -To get started quickly, read the code and explanations in that file and run it. -If you want more detail or a feature not shown in `sample.cc', consult the -consult the actual header and source files, which are thoroughly commented. - -This library emphasizes ease of use and clarity of implementation over speed; -some users will prefer GMP (http://swox.com/gmp/), which is faster. The code is -intended to be reasonably portable across computers and modern C++ compilers; in -particular, it uses whatever word size the computer provides (32-bit, 64-bit, or -otherwise). - -Compiling programs that use the library ---------------------------------------- -The library consists of a folder full of C++ header files (`.hh') and source -files (`.cc'). Your own programs should `#include' the necessary header files -and link with the source files. A makefile that builds the sample program -(`sample.cc') is included; you can adapt it to replace the sample with your own -program. - -Alternatively, you can use your own build system or IDE. In that case, you must -put the library header files where the compiler will find them and arrange to -have your program linked with the library source files; otherwise, you will get -errors about missing header files or "undefined references". To learn how to do -this, consult the documentation for the build system or IDE; don't bother asking -me. Adding all the library files to your project will work in many IDEs but may -not be the most desirable approach. - -Resources ---------- -The library's Web site (above) provides links to released versions, the current -development version, and a mailing list for release announcements, questions, -bug reports, and other discussion of the library. I would be delighted to hear -from you if you like this library and/or find a good use for it. - -Bugs and enhancements ---------------------- -The library has been tested by me and others but is by no means bug-free. If -you find a bug, please report it, whether it comes in the form of compiling -trouble, a mathematically inaccurate result, or a memory-management blooper -(since I use Java, these are altogether too common in my C++). I generally fix -all reported bugs. You are also welcome to request enhancements, but I am -unlikely to do substantial amounts of work on enhancements at this point. - -Legal ------ -I, Matt McCutchen, the sole author of the original Big Integer Library, waive my -copyright to it, placing it in the public domain. The library comes with -absolutely no warranty. - -~~~~ diff --git a/src/qzxing/zxing/zxing/common/detector/JavaMath.h b/src/qzxing/zxing/common/Array.cpp similarity index 52% rename from src/qzxing/zxing/zxing/common/detector/JavaMath.h rename to src/qzxing/zxing/common/Array.cpp index ce99ab7..a9d19b3 100644 --- a/src/qzxing/zxing/zxing/common/detector/JavaMath.h +++ b/src/qzxing/zxing/common/Array.cpp @@ -1,8 +1,9 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -#ifndef __ZXING_COMMON_DETECTOR_MATH_H__ -#define __ZXING_COMMON_DETECTOR_MATH_H__ /* - * Copyright 2012 ZXing authors All rights reserved. + * Array.cpp + * zxing + * + * Created by Christian Brunschen on 07/05/2008. + * Copyright 2008 Google UK. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,27 +18,5 @@ * limitations under the License. */ -#include +#include -namespace zxing { -namespace common { -namespace detector { - -class Math { - private: - Math(); - ~Math(); - public: - - // Java standard Math.round - static inline int round(float a) { - return (int)std::floor(a +0.5f); - } - -}; - -} -} -} - -#endif diff --git a/src/qzxing/zxing/zxing/common/Array.h b/src/qzxing/zxing/common/Array.h similarity index 53% rename from src/qzxing/zxing/zxing/common/Array.h rename to src/qzxing/zxing/common/Array.h index dbc0df4..d2c6391 100644 --- a/src/qzxing/zxing/zxing/common/Array.h +++ b/src/qzxing/zxing/common/Array.h @@ -23,25 +23,27 @@ #include +#ifdef DEBUG_COUNTING +#include +#include +#endif + #include + namespace zxing { template class Array : public Counted { protected: public: std::vector values_; - Array() {} - Array(int n) : + Array(size_t n) : Counted(), values_(n, T()) { } - Array(T const* ts, int n) : + Array(T *ts, size_t n) : Counted(), values_(ts, ts+n) { } - Array(T const* ts, T const* te) : - Counted(), values_(ts, te) { - } - Array(T v, int n) : + Array(T v, size_t n) : Counted(), values_(n, v) { } Array(std::vector &v) : @@ -56,26 +58,35 @@ public: virtual ~Array() { } Array& operator=(const Array &other) { +#ifdef DEBUG_COUNTING + cout << "assigning values from Array " << &other << " to this Array " << this << ", "; +#endif values_ = other.values_; +#ifdef DEBUG_COUNTING + cout << "new size = " << values_.size() << "\n"; +#endif return *this; } Array& operator=(const std::vector &array) { +#ifdef DEBUG_COUNTING + cout << "assigning values from Array " << &array << " to this Array " << this << ", "; +#endif values_ = array; +#ifdef DEBUG_COUNTING + cout << "new size = " << values_.size() << "\n"; +#endif return *this; } - T const& operator[](int i) const { + T operator[](size_t i) const { return values_[i]; } - T& operator[](int i) { + T& operator[](size_t i) { return values_[i]; } - int size() const { + size_t size() const { return values_.size(); } - bool empty() const { - return values_.size() == 0; - } - std::vector const& values() const { + std::vector values() const { return values_; } std::vector& values() { @@ -89,46 +100,81 @@ public: Array *array_; ArrayRef() : array_(0) { +#ifdef DEBUG_COUNTING + cout << "instantiating empty ArrayRef " << this << "\n"; +#endif } - explicit ArrayRef(int n) : + ArrayRef(size_t n) : array_(0) { +#ifdef DEBUG_COUNTING + cout << "instantiating ArrayRef " << this << "with size " << n << "\n"; +#endif reset(new Array (n)); } - ArrayRef(T *ts, int n) : + ArrayRef(T *ts, size_t n) : array_(0) { +#ifdef DEBUG_COUNTING + cout << "instantiating ArrayRef " << this << "with " << n << " elements at " << (void *)ts << "\n"; +#endif reset(new Array (ts, n)); } ArrayRef(Array *a) : array_(0) { +#ifdef DEBUG_COUNTING + cout << "instantiating ArrayRef " << this << " from pointer:\n"; +#endif reset(a); } + ArrayRef(const Array &a) : + array_(0) { +#ifdef DEBUG_COUNTING + cout << "instantiating ArrayRef " << this << " from reference to Array " << (void *)&a << ":\n"; +#endif + reset(const_cast *>(&a)); + } ArrayRef(const ArrayRef &other) : Counted(), array_(0) { +#ifdef DEBUG_COUNTING + cout << "instantiating ArrayRef " << this << " from ArrayRef " << &other << ":\n"; +#endif reset(other.array_); } template ArrayRef(const ArrayRef &other) : array_(0) { - reset(static_cast *>(other.array_)); +#ifdef DEBUG_COUNTING + cout << "instantiating ArrayRef " << this << " from ArrayRef " << &other << ":\n"; +#endif + reset(static_cast *>(other.array_)); } ~ArrayRef() { +#ifdef DEBUG_COUNTING + cout << "destroying ArrayRef " << this << " with " << (array_ ? typeid(*array_).name() : "NULL") << " " + << array_ << "\n"; +#endif if (array_) { array_->release(); } array_ = 0; } - T const& operator[](int i) const { + T operator[](size_t i) const { return (*array_)[i]; } - - T& operator[](int i) { + T& operator[](size_t i) { return (*array_)[i]; } + size_t size() const { + return array_->size(); + } void reset(Array *a) { +#ifdef DEBUG_COUNTING + cout << "resetting ArrayRef " << this << " from " << (array_ ? typeid(*array_).name() : "NULL") << " " + << array_ << " to " << (a ? typeid(*a).name() : "NULL") << " " << a << "\n"; +#endif if (a) { a->retain(); } @@ -149,20 +195,12 @@ public: return *this; } - Array& operator*() const { + Array& operator*() { return *array_; } - - Array* operator->() const { + Array* operator->() { return array_; } - - operator bool () const { - return array_ != 0; - } - bool operator ! () const { - return array_ == 0; - } }; } // namespace zxing diff --git a/src/qzxing/zxing/common/BitArray.cpp b/src/qzxing/zxing/common/BitArray.cpp new file mode 100644 index 0000000..c1c9cae --- /dev/null +++ b/src/qzxing/zxing/common/BitArray.cpp @@ -0,0 +1,127 @@ +// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- +/* + * Copyright 2010 ZXing authors. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +using namespace std; + +namespace zxing { + + +size_t BitArray::wordsForBits(size_t bits) { + int arraySize = (bits + bitsPerWord_ - 1) >> logBits_; + return arraySize; +} + +BitArray::BitArray(size_t size) : + size_(size), bits_(wordsForBits(size), (const unsigned int)0) { +} + +BitArray::~BitArray() { +} + +size_t BitArray::getSize() { + return size_; +} + +void BitArray::setBulk(size_t i, unsigned int newBits) { + bits_[i >> logBits_] = newBits; +} + +void BitArray::setRange(int start, int end) { + if (end < start) { + throw IllegalArgumentException("invalid call to BitArray::setRange"); + } + if (end == start) { + return; + } + end--; // will be easier to treat this as the last actually set bit -- inclusive + int firstInt = start >> 5; + int lastInt = end >> 5; + for (int i = firstInt; i <= lastInt; i++) { + int firstBit = i > firstInt ? 0 : start & 0x1F; + int lastBit = i < lastInt ? 31 : end & 0x1F; + int mask; + if (firstBit == 0 && lastBit == 31) { + mask = -1; + } else { + mask = 0; + for (int j = firstBit; j <= lastBit; j++) { + mask |= 1 << j; + } + } + bits_[i] |= mask; + } +} + +void BitArray::clear() { + size_t max = bits_.size(); + for (size_t i = 0; i < max; i++) { + bits_[i] = 0; + } +} + +bool BitArray::isRange(size_t start, size_t end, bool value) { + if (end < start) { + throw IllegalArgumentException("end must be after start"); + } + if (end == start) { + return true; + } + // treat the 'end' as inclusive, rather than exclusive + end--; + size_t firstWord = start >> logBits_; + size_t lastWord = end >> logBits_; + for (size_t i = firstWord; i <= lastWord; i++) { + size_t firstBit = i > firstWord ? 0 : start & bitsMask_; + size_t lastBit = i < lastWord ? bitsPerWord_ - 1: end & bitsMask_; + unsigned int mask; + if (firstBit == 0 && lastBit == bitsPerWord_ - 1) { + mask = numeric_limits::max(); + } else { + mask = 0; + for (size_t j = firstBit; j <= lastBit; j++) { + mask |= 1 << j; + } + } + if (value) { + if ((bits_[i] & mask) != mask) { + return false; + } + } else { + if ((bits_[i] & mask) != 0) { + return false; + } + } + } + return true; +} + +vector& BitArray::getBitArray() { + return bits_; +} + +void BitArray::reverse() { + std::vector newBits(bits_.size(),(const unsigned int) 0); + for (size_t i = 0; i < size_; i++) { + if (get(size_ - i - 1)) { + newBits[i >> logBits_] |= 1<< (i & bitsMask_); + } + } + bits_ = newBits; +} +} diff --git a/src/qzxing/zxing/zxing/common/BitArray.h b/src/qzxing/zxing/common/BitArray.h similarity index 51% rename from src/qzxing/zxing/zxing/common/BitArray.h rename to src/qzxing/zxing/common/BitArray.h index 0be9855..2db4e75 100644 --- a/src/qzxing/zxing/zxing/common/BitArray.h +++ b/src/qzxing/zxing/common/BitArray.h @@ -18,64 +18,53 @@ * limitations under the License. */ -#include #include #include -#include #include #include -#include namespace zxing { +#define ZX_LOG_DIGITS(digits) \ + ((digits == 8) ? 3 : \ + ((digits == 16) ? 4 : \ + ((digits == 32) ? 5 : \ + ((digits == 64) ? 6 : \ + ((digits == 128) ? 7 : \ + (-1)))))) + class BitArray : public Counted { -public: - static const int bitsPerWord = std::numeric_limits::digits; - private: - int size; - ArrayRef bits; - static const int logBits = ZX_LOG_DIGITS(bitsPerWord); - static const int bitsMask = (1 << logBits) - 1; + size_t size_; + std::vector bits_; + static const unsigned int bitsPerWord_ = + std::numeric_limits::digits; + static const unsigned int logBits_ = ZX_LOG_DIGITS(bitsPerWord_); + static const unsigned int bitsMask_ = (1 << logBits_) - 1; + static size_t wordsForBits(size_t bits); + explicit BitArray(); public: - BitArray(int size); + BitArray(size_t size); ~BitArray(); - int getSize() const; + size_t getSize(); - bool get(int i) const { - return (bits[i >> logBits] & (1 << (i & bitsMask))) != 0; + bool get(size_t i) { + return (bits_[i >> logBits_] & (1 << (i & bitsMask_))) != 0; } - void set(int i) { - bits[i >> logBits] |= 1 << (i & bitsMask); + void set(size_t i) { + bits_[i >> logBits_] |= 1 << (i & bitsMask_); } - int getNextSet(int from); - int getNextUnset(int from); - - void setBulk(int i, int newBits); + void setBulk(size_t i, unsigned int newBits); void setRange(int start, int end); void clear(); - bool isRange(int start, int end, bool value); - std::vector& getBitArray(); - + bool isRange(size_t start, size_t end, bool value); + std::vector& getBitArray(); void reverse(); - - class Reverse { - private: - Ref array; - public: - Reverse(Ref array); - ~Reverse(); - }; - -private: - static int makeArraySize(int size); }; -std::ostream& operator << (std::ostream&, BitArray const&); - } #endif // __BIT_ARRAY_H__ diff --git a/src/qzxing/zxing/common/BitMatrix.cpp b/src/qzxing/zxing/common/BitMatrix.cpp new file mode 100644 index 0000000..45106d9 --- /dev/null +++ b/src/qzxing/zxing/common/BitMatrix.cpp @@ -0,0 +1,157 @@ +// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- +/* + * Copyright 2010 ZXing authors. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +#include +#include +#include + +using std::ostream; +using std::ostringstream; + +using zxing::BitMatrix; +using zxing::BitArray; +using zxing::Ref; + +namespace { + size_t wordsForSize(size_t width, + size_t height, + unsigned int bitsPerWord, + unsigned int logBits) { + size_t bits = width * height; + int arraySize = (bits + bitsPerWord - 1) >> logBits; + return arraySize; + } +} + +BitMatrix::BitMatrix(size_t dimension) : + width_(dimension), height_(dimension), words_(0), bits_(NULL) { + words_ = wordsForSize(width_, height_, bitsPerWord, logBits); + bits_ = new unsigned int[words_]; + clear(); +} + +BitMatrix::BitMatrix(size_t width, size_t height) : + width_(width), height_(height), words_(0), bits_(NULL) { + words_ = wordsForSize(width_, height_, bitsPerWord, logBits); + bits_ = new unsigned int[words_]; + clear(); +} + +BitMatrix::~BitMatrix() { + delete[] bits_; +} + + +void BitMatrix::flip(size_t x, size_t y) { + size_t offset = x + width_ * y; + bits_[offset >> logBits] ^= 1 << (offset & bitsMask); +} + +void BitMatrix::clear() { + std::fill(bits_, bits_+words_, 0); +} + +void BitMatrix::setRegion(size_t left, size_t top, size_t width, size_t height) { + if ((long)top < 0 || (long)left < 0) { + throw IllegalArgumentException("topI and leftJ must be nonnegative"); + } + if (height < 1 || width < 1) { + throw IllegalArgumentException("height and width must be at least 1"); + } + size_t right = left + width; + size_t bottom = top + height; + if (right > width_ || bottom > height_) { + throw IllegalArgumentException("top + height and left + width must be <= matrix dimension"); + } + for (size_t y = top; y < bottom; y++) { + int yOffset = width_ * y; + for (size_t x = left; x < right; x++) { + size_t offset = x + yOffset; + bits_[offset >> logBits] |= 1 << (offset & bitsMask); + } + } +} + +Ref BitMatrix::getRow(int y, Ref row) { + if (row.empty() || row->getSize() < width_) { + row = new BitArray(width_); + } else { + row->clear(); + } + size_t start = y * width_; + size_t end = start + width_ - 1; // end is inclusive + size_t firstWord = start >> logBits; + size_t lastWord = end >> logBits; + size_t bitOffset = start & bitsMask; + for (size_t i = firstWord; i <= lastWord; i++) { + size_t firstBit = i > firstWord ? 0 : start & bitsMask; + size_t lastBit = i < lastWord ? bitsPerWord - 1 : end & bitsMask; + unsigned int mask; + if (firstBit == 0 && lastBit == logBits) { + mask = std::numeric_limits::max(); + } else { + mask = 0; + for (size_t j = firstBit; j <= lastBit; j++) { + mask |= 1 << j; + } + } + row->setBulk((i - firstWord) << logBits, (bits_[i] & mask) >> bitOffset); + if (firstBit == 0 && bitOffset != 0) { + unsigned int prevBulk = row->getBitArray()[i - firstWord - 1]; + prevBulk |= (bits_[i] & mask) << (bitsPerWord - bitOffset); + row->setBulk((i - firstWord - 1) << logBits, prevBulk); + } + } + return row; +} + +size_t BitMatrix::getWidth() const { + return width_; +} + +size_t BitMatrix::getHeight() const { + return height_; +} + +size_t BitMatrix::getDimension() const { + return width_; +} + +unsigned int* BitMatrix::getBits() const { + return bits_; +} + +namespace zxing { + ostream& operator<<(ostream &out, const BitMatrix &bm) { + for (size_t y = 0; y < bm.height_; y++) { + for (size_t x = 0; x < bm.width_; x++) { + out << (bm.get(x, y) ? "X " : " "); + } + out << "\n"; + } + return out; + } +} + +const char* BitMatrix::description() { + ostringstream out; + out << *this; + return out.str().c_str(); +} diff --git a/src/qzxing/zxing/zxing/common/BitMatrix.h b/src/qzxing/zxing/common/BitMatrix.h similarity index 60% rename from src/qzxing/zxing/zxing/common/BitMatrix.h rename to src/qzxing/zxing/common/BitMatrix.h index 675cb07..e47ebf3 100644 --- a/src/qzxing/zxing/zxing/common/BitMatrix.h +++ b/src/qzxing/zxing/common/BitMatrix.h @@ -23,20 +23,16 @@ #include #include -#include #include namespace zxing { class BitMatrix : public Counted { -public: - static const int bitsPerWord = std::numeric_limits::digits; - private: - int width; - int height; - int rowSize; - ArrayRef bits; + size_t width_; + size_t height_; + size_t words_; + unsigned int* bits_; #define ZX_LOG_DIGITS(digits) \ ((digits == 8) ? 3 : \ @@ -46,42 +42,42 @@ private: ((digits == 128) ? 7 : \ (-1)))))) - static const int logBits = ZX_LOG_DIGITS(bitsPerWord); - static const int bitsMask = (1 << logBits) - 1; + static const unsigned int bitsPerWord = + std::numeric_limits::digits; + static const unsigned int logBits = ZX_LOG_DIGITS(bitsPerWord); + static const unsigned int bitsMask = (1 << logBits) - 1; public: - BitMatrix(int dimension); - BitMatrix(int width, int height); + BitMatrix(size_t dimension); + BitMatrix(size_t width, size_t height); ~BitMatrix(); - bool get(int x, int y) const { - int offset = y * rowSize + (x >> logBits); - return ((((unsigned)bits[offset]) >> (x & bitsMask)) & 1) != 0; + bool get(size_t x, size_t y) const { + size_t offset = x + width_ * y; + return ((bits_[offset >> logBits] >> (offset & bitsMask)) & 0x01) != 0; } - void set(int x, int y) { - int offset = y * rowSize + (x >> logBits); - bits[offset] |= 1 << (x & bitsMask); + void set(size_t x, size_t y) { + size_t offset = x + width_ * y; + bits_[offset >> logBits] |= 1 << (offset & bitsMask); } - void flip(int x, int y); + void flip(size_t x, size_t y); void clear(); - void setRegion(int left, int top, int width, int height); + void setRegion(size_t left, size_t top, size_t width, size_t height); Ref getRow(int y, Ref row); - int getWidth() const; - int getHeight() const; + size_t getDimension() const; + size_t getWidth() const; + size_t getHeight() const; - ArrayRef getTopLeftOnBit() const; - ArrayRef getBottomRightOnBit() const; + unsigned int* getBits() const; friend std::ostream& operator<<(std::ostream &out, const BitMatrix &bm); const char *description(); private: - inline void init(int, int); - BitMatrix(const BitMatrix&); BitMatrix& operator =(const BitMatrix&); }; diff --git a/src/qzxing/zxing/zxing/common/BitSource.cpp b/src/qzxing/zxing/common/BitSource.cpp similarity index 82% rename from src/qzxing/zxing/zxing/common/BitSource.cpp rename to src/qzxing/zxing/common/BitSource.cpp index e78b627..8a8d64b 100644 --- a/src/qzxing/zxing/zxing/common/BitSource.cpp +++ b/src/qzxing/zxing/common/BitSource.cpp @@ -1,4 +1,3 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- /* * BitSource.cpp * zxing @@ -20,16 +19,15 @@ */ #include -#include #include namespace zxing { int BitSource::readBits(int numBits) { - if (numBits < 0 || numBits > 32 || numBits > available()) { - std::ostringstream oss; - oss << numBits; - throw IllegalArgumentException(oss.str().c_str()); + if (numBits < 0 || numBits > 32) { + throw IllegalArgumentException("cannot read <1 or >32 bits"); + } else if (numBits > available()) { + throw IllegalArgumentException("reading more bits than are available"); } int result = 0; @@ -71,6 +69,6 @@ int BitSource::readBits(int numBits) { } int BitSource::available() { - return 8 * (bytes_->size() - byteOffset_) - bitOffset_; + return 8 * (bytes_.size() - byteOffset_) - bitOffset_; } } diff --git a/src/qzxing/zxing/zxing/common/BitSource.h b/src/qzxing/zxing/common/BitSource.h similarity index 92% rename from src/qzxing/zxing/zxing/common/BitSource.h rename to src/qzxing/zxing/common/BitSource.h index 9496c47..0b077c3 100644 --- a/src/qzxing/zxing/zxing/common/BitSource.h +++ b/src/qzxing/zxing/common/BitSource.h @@ -33,7 +33,7 @@ namespace zxing { * @author christian.brunschen@gmail.com (Christian Brunschen) */ class BitSource : public Counted { - typedef char byte; + typedef unsigned char byte; private: ArrayRef bytes_; int byteOffset_; @@ -47,10 +47,6 @@ public: bytes_(bytes), byteOffset_(0), bitOffset_(0) { } - int getBitOffset() { - return bitOffset_; - } - int getByteOffset() { return byteOffset_; } diff --git a/src/qzxing/zxing/zxing/common/CharacterSetECI.cpp b/src/qzxing/zxing/common/CharacterSetECI.cpp similarity index 100% rename from src/qzxing/zxing/zxing/common/CharacterSetECI.cpp rename to src/qzxing/zxing/common/CharacterSetECI.cpp diff --git a/src/qzxing/zxing/zxing/common/CharacterSetECI.h b/src/qzxing/zxing/common/CharacterSetECI.h similarity index 90% rename from src/qzxing/zxing/zxing/common/CharacterSetECI.h rename to src/qzxing/zxing/common/CharacterSetECI.h index 7f3d3be..3cabe60 100644 --- a/src/qzxing/zxing/zxing/common/CharacterSetECI.h +++ b/src/qzxing/zxing/common/CharacterSetECI.h @@ -23,9 +23,12 @@ #include namespace zxing { -namespace common { + namespace common { + class CharacterSetECI; + } +} -class CharacterSetECI { +class zxing::common::CharacterSetECI { private: static std::map VALUE_TO_ECI; static std::map NAME_TO_ECI; @@ -47,7 +50,4 @@ public: static CharacterSetECI* getCharacterSetECIByName(std::string const& name); }; -} -} - #endif diff --git a/src/qzxing/zxing/zxing/common/BitArrayIO.cpp b/src/qzxing/zxing/common/Counted.cpp similarity index 55% rename from src/qzxing/zxing/zxing/common/BitArrayIO.cpp rename to src/qzxing/zxing/common/Counted.cpp index 071baca..61747a2 100644 --- a/src/qzxing/zxing/zxing/common/BitArrayIO.cpp +++ b/src/qzxing/zxing/common/Counted.cpp @@ -1,6 +1,9 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- /* - * Copyright 2010 ZXing authors. All rights reserved. + * Counted.cpp + * zxing + * + * Created by Christian Brunschen on 07/05/2008. + * Copyright 2008 Google UK. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,17 +18,15 @@ * limitations under the License. */ -#include +#include -using zxing::BitArray; -using std::ostream; +namespace zxing { -ostream& zxing::operator << (ostream& os, BitArray const& ba) { - for (int i = 0, size = ba.getSize(); i < size; i++) { - if ((i & 0x07) == 0) { - os << ' '; - } - os << (ba.get(i) ? 'X' : '.'); - } - return os; +using namespace std; + +template +ostream& operator<<(ostream &out, Ref& ref) { + out << "Ref(" << (ref.object_ ? (*ref.object_) : "NULL") << ")"; + return out; +} } diff --git a/src/qzxing/zxing/zxing/common/Counted.h b/src/qzxing/zxing/common/Counted.h similarity index 57% rename from src/qzxing/zxing/zxing/common/Counted.h rename to src/qzxing/zxing/common/Counted.h index 96acf6d..81827a1 100644 --- a/src/qzxing/zxing/zxing/common/Counted.h +++ b/src/qzxing/zxing/common/Counted.h @@ -18,8 +18,14 @@ * limitations under the License. */ +//#define DEBUG_COUNTING + #include +#ifdef DEBUG_COUNTING +#include +#endif + namespace zxing { /* base class for reference-counted objects */ @@ -29,16 +35,43 @@ private: public: Counted() : count_(0) { +#ifdef DEBUG_COUNTING + cout << "instantiating " << typeid(*this).name() << " " << this << + " @ " << count_ << "\n"; +#endif } virtual ~Counted() { } Counted *retain() { +#ifdef DEBUG_COUNTING + cout << "retaining " << typeid(*this).name() << " " << this << + " @ " << count_; +#endif count_++; +#ifdef DEBUG_COUNTING + cout << "->" << count_ << "\n"; +#endif return this; } void release() { +#ifdef DEBUG_COUNTING + cout << "releasing " << typeid(*this).name() << " " << this << + " @ " << count_; +#endif + if (count_ == 0 || count_ == 54321) { +#ifdef DEBUG_COUNTING + cout << "\nOverreleasing already-deleted object " << this << "!!!\n"; +#endif + throw 4711; + } count_--; +#ifdef DEBUG_COUNTING + cout << "->" << count_ << "\n"; +#endif if (count_ == 0) { +#ifdef DEBUG_COUNTING + cout << "deleting " << typeid(*this).name() << " " << this << "\n"; +#endif count_ = 0xDEADF001; delete this; } @@ -58,26 +91,53 @@ public: T *object_; explicit Ref(T *o = 0) : object_(0) { +#ifdef DEBUG_COUNTING + cout << "instantiating Ref " << this << " from pointer" << o << "\n"; +#endif reset(o); } + + explicit Ref(const T &o) : + object_(0) { +#ifdef DEBUG_COUNTING + cout << "instantiating Ref " << this << " from reference\n"; +#endif + reset(const_cast(&o)); + } + Ref(const Ref &other) : object_(0) { +#ifdef DEBUG_COUNTING + cout << "instantiating Ref " << this << " from Ref " << &other << "\n"; +#endif reset(other.object_); } template Ref(const Ref &other) : object_(0) { +#ifdef DEBUG_COUNTING + cout << "instantiating Ref " << this << " from reference\n"; +#endif reset(other.object_); } ~Ref() { +#ifdef DEBUG_COUNTING + cout << "destroying Ref " << this << " with " << + (object_ ? typeid(*object_).name() : "NULL") << " " << object_ << "\n"; +#endif if (object_) { object_->release(); } } void reset(T *o) { +#ifdef DEBUG_COUNTING + cout << "resetting Ref " << this << " from " << + (object_ ? typeid(*object_).name() : "NULL") << " " << object_ << + " to " << (o ? typeid(*o).name() : "NULL") << " " << o << "\n"; +#endif if (o) { o->retain(); } @@ -133,8 +193,10 @@ public: bool empty() const { return object_ == 0; } -}; + template + friend std::ostream& operator<<(std::ostream &out, Ref& ref); +}; } #endif // __COUNTED_H__ diff --git a/src/qzxing/zxing/zxing/common/DecoderResult.cpp b/src/qzxing/zxing/common/DecoderResult.cpp similarity index 80% rename from src/qzxing/zxing/zxing/common/DecoderResult.cpp rename to src/qzxing/zxing/common/DecoderResult.cpp index 923f9e5..af7e5e2 100644 --- a/src/qzxing/zxing/zxing/common/DecoderResult.cpp +++ b/src/qzxing/zxing/common/DecoderResult.cpp @@ -24,20 +24,20 @@ using namespace std; using namespace zxing; -DecoderResult::DecoderResult(ArrayRef rawBytes, +DecoderResult::DecoderResult(ArrayRef rawBytes, Ref text, - ArrayRef< ArrayRef >& byteSegments, + ArrayRef< ArrayRef >& byteSegments, string const& ecLevel) : rawBytes_(rawBytes), text_(text), byteSegments_(byteSegments), ecLevel_(ecLevel) {} -DecoderResult::DecoderResult(ArrayRef rawBytes, +DecoderResult::DecoderResult(ArrayRef rawBytes, Ref text) : rawBytes_(rawBytes), text_(text) {} -ArrayRef DecoderResult::getRawBytes() { +ArrayRef DecoderResult::getRawBytes() { return rawBytes_; } diff --git a/src/qzxing/zxing/zxing/common/DecoderResult.h b/src/qzxing/zxing/common/DecoderResult.h similarity index 74% rename from src/qzxing/zxing/zxing/common/DecoderResult.h rename to src/qzxing/zxing/common/DecoderResult.h index b91530b..5cb8193 100644 --- a/src/qzxing/zxing/zxing/common/DecoderResult.h +++ b/src/qzxing/zxing/common/DecoderResult.h @@ -29,20 +29,20 @@ namespace zxing { class DecoderResult : public Counted { private: - ArrayRef rawBytes_; + ArrayRef rawBytes_; Ref text_; - ArrayRef< ArrayRef > byteSegments_; + ArrayRef< ArrayRef > byteSegments_; std::string ecLevel_; public: - DecoderResult(ArrayRef rawBytes, + DecoderResult(ArrayRef rawBytes, Ref text, - ArrayRef< ArrayRef >& byteSegments, + ArrayRef< ArrayRef >& byteSegments, std::string const& ecLevel); - DecoderResult(ArrayRef rawBytes, Ref text); + DecoderResult(ArrayRef rawBytes, Ref text); - ArrayRef getRawBytes(); + ArrayRef getRawBytes(); Ref getText(); }; diff --git a/src/qzxing/zxing/zxing/common/DetectorResult.cpp b/src/qzxing/zxing/common/DetectorResult.cpp similarity index 78% rename from src/qzxing/zxing/zxing/common/DetectorResult.cpp rename to src/qzxing/zxing/common/DetectorResult.cpp index 9d80353..cf68a98 100644 --- a/src/qzxing/zxing/zxing/common/DetectorResult.cpp +++ b/src/qzxing/zxing/common/DetectorResult.cpp @@ -23,16 +23,15 @@ namespace zxing { -DetectorResult::DetectorResult(Ref bits, - ArrayRef< Ref > points) - : bits_(bits), points_(points) { +DetectorResult::DetectorResult(Ref bits, std::vector > points) : + bits_(bits), points_(points) { } Ref DetectorResult::getBits() { return bits_; } -ArrayRef< Ref > DetectorResult::getPoints() { +std::vector > DetectorResult::getPoints() { return points_; } diff --git a/src/qzxing/zxing/zxing/common/DetectorResult.h b/src/qzxing/zxing/common/DetectorResult.h similarity index 81% rename from src/qzxing/zxing/zxing/common/DetectorResult.h rename to src/qzxing/zxing/common/DetectorResult.h index 10e3348..6ee933f 100644 --- a/src/qzxing/zxing/zxing/common/DetectorResult.h +++ b/src/qzxing/zxing/common/DetectorResult.h @@ -20,6 +20,7 @@ * limitations under the License. */ +#include #include #include #include @@ -30,14 +31,13 @@ namespace zxing { class DetectorResult : public Counted { private: Ref bits_; - ArrayRef< Ref > points_; + std::vector > points_; public: - DetectorResult(Ref bits, ArrayRef< Ref > points); + DetectorResult(Ref bits, std::vector > points); Ref getBits(); - ArrayRef< Ref > getPoints(); + std::vector > getPoints(); }; - } #endif // __DETECTOR_RESULT_H__ diff --git a/src/qzxing/zxing/common/EdgeDetector.cpp b/src/qzxing/zxing/common/EdgeDetector.cpp new file mode 100644 index 0000000..a24fd94 --- /dev/null +++ b/src/qzxing/zxing/common/EdgeDetector.cpp @@ -0,0 +1,191 @@ +/* + * EdgeDetector.cpp + * zxing + * + * Created by Ralf Kistner on 7/12/2009. + * Copyright 2008 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include + +using namespace std; + +namespace zxing { +namespace EdgeDetector { + +void findEdgePoints(std::vector& points, const BitMatrix& image, Point start, Point end, bool invert, int skip, float deviation) { + float xdist = end.x - start.x; + float ydist = end.y - start.y; + float length = sqrt(xdist * xdist + ydist * ydist); + + + int var; + + if (abs(xdist) > abs(ydist)) { + // Horizontal + if (xdist < 0) + skip = -skip; + + var = int(abs(deviation * length / xdist)); + + float dy = ydist / xdist * skip; + bool left = (skip < 0) ^ invert; + int x = int(start.x); + + int steps = int(xdist / skip); + for (int i = 0; i < steps; i++) { + x += skip; + if (x < 0 || x >= (int)image.getWidth()) + continue; // In case we start off the edge + int my = int(start.y + dy * i); + int ey = min(my + var + 1, (int)image.getHeight() - 1); + int sy = max(my - var, 0); + for (int y = sy + 1; y < ey; y++) { + if (left) { + if (image.get(x, y) && !image.get(x, y + 1)) { + points.push_back(Point(x, y + 0.5f)); + } + } else { + if (!image.get(x, y) && image.get(x, y + 1)) { + points.push_back(Point(x, y + 0.5f)); + } + } + } + } + } else { + // Vertical + if (ydist < 0) + skip = -skip; + + var = int(abs(deviation * length / ydist)); + + float dx = xdist / ydist * skip; + bool down = (skip > 0) ^ invert; + int y = int(start.y); + + int steps = int(ydist / skip); + for (int i = 0; i < steps; i++) { + y += skip; + if (y < 0 || y >= (int)image.getHeight()) + continue; // In case we start off the edge + int mx = int(start.x + dx * i); + int ex = min(mx + var + 1, (int)image.getWidth() - 1); + int sx = max(mx - var, 0); + for (int x = sx + 1; x < ex; x++) { + if (down) { + if (image.get(x, y) && !image.get(x + 1, y)) { + points.push_back(Point(x + 0.5f, y)); + } + + } else { + if (!image.get(x, y) && image.get(x + 1, y)) { + points.push_back(Point(x + 0.5f, y)); + } + } + + } + } + + } +} + +Line findLine(const BitMatrix& image, Line estimate, bool invert, int deviation, float threshold, int skip) { + float t = threshold * threshold; + + Point start = estimate.start; + Point end = estimate.end; + + vector edges; + edges.clear(); + findEdgePoints(edges, image, start, end, invert, skip, deviation); + + int n = edges.size(); + + float xdist = end.x - start.x; + float ydist = end.y - start.y; + + bool horizontal = abs(xdist) > abs(ydist); + + float max = 0; + Line bestLine(start, end); // prepopulate with the given line, in case we can't find any line for some reason + + for (int i = -deviation; i < deviation; i++) { + float x1, y1; + if (horizontal) { + y1 = start.y + i; + x1 = start.x - i * ydist / xdist; + } else { + y1 = start.y - i * xdist / ydist; + x1 = start.x + i; + } + + for (int j = -deviation; j < deviation; j++) { + float x2, y2; + if (horizontal) { + y2 = end.y + j; + x2 = end.x - j * ydist / xdist; + } else { + y2 = end.y - j * xdist / ydist; + x2 = end.x + j; + } + + float dx = x1 - x2; + float dy = y1 - y2; + float length = sqrt(dx * dx + dy * dy); + + float score = 0; + + for(int k = 0; k < n; k++) { + const Point& edge = edges[k]; + float dist = ((x1 - edge.x) * dy - (y1 - edge.y) * dx) / length; + // Similar to least squares method + float s = t - dist * dist; + if (s > 0) + score += s; + } + + if (score > max) { + max = score; + bestLine.start = Point(x1, y1); + bestLine.end = Point(x2, y2); + } + } + } + + return bestLine; +} + +Point intersection(Line a, Line b) { + float dxa = a.start.x - a.end.x; + float dxb = b.start.x - b.end.x; + float dya = a.start.y - a.end.y; + float dyb = b.start.y - b.end.y; + + float p = a.start.x * a.end.y - a.start.y * a.end.x; + float q = b.start.x * b.end.y - b.start.y * b.end.x; + float denom = dxa * dyb - dya * dxb; + if(denom == 0) // Lines don't intersect + return Point(INFINITY, INFINITY); + + float x = (p * dxb - dxa * q) / denom; + float y = (p * dyb - dya * q) / denom; + + return Point(x, y); +} + +} // namespace EdgeDetector +} // namespace zxing diff --git a/src/qzxing/zxing/common/EdgeDetector.h b/src/qzxing/zxing/common/EdgeDetector.h new file mode 100644 index 0000000..6b2ee97 --- /dev/null +++ b/src/qzxing/zxing/common/EdgeDetector.h @@ -0,0 +1,38 @@ +#ifndef __EDGEDETECTOR_H__ +#define __EDGEDETECTOR_H__ +/* + * EdgeDetector.h + * zxing + * + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + + +#include +#include +#include + +namespace zxing { +namespace EdgeDetector { + +void findEdgePoints(std::vector& points, const BitMatrix& image, Point start, Point end, bool invert, int skip, float deviation); +Line findLine(const BitMatrix& image, Line estimate, bool invert, int deviation, float threshold, int skip); + +Point intersection(Line a, Line b); + +} +} +#endif /* EDGEDETECTOR_H_ */ diff --git a/src/qzxing/zxing/common/GlobalHistogramBinarizer.cpp b/src/qzxing/zxing/common/GlobalHistogramBinarizer.cpp new file mode 100644 index 0000000..a32fe27 --- /dev/null +++ b/src/qzxing/zxing/common/GlobalHistogramBinarizer.cpp @@ -0,0 +1,209 @@ +// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- +/* + * GlobalHistogramBinarizer.cpp + * zxing + * + * Copyright 2010 ZXing authors. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include + +namespace zxing { +using namespace std; + +const int LUMINANCE_BITS = 5; +const int LUMINANCE_SHIFT = 8 - LUMINANCE_BITS; +const int LUMINANCE_BUCKETS = 1 << LUMINANCE_BITS; + +GlobalHistogramBinarizer::GlobalHistogramBinarizer(Ref source) : + Binarizer(source), cached_matrix_(NULL), cached_row_(NULL), cached_row_num_(-1) { + +} + +GlobalHistogramBinarizer::~GlobalHistogramBinarizer() { +} + + +Ref GlobalHistogramBinarizer::getBlackRow(int y, Ref row) { + if (y == cached_row_num_) { + if (cached_row_ != NULL) { + return cached_row_; + } else { + throw IllegalArgumentException("Too little dynamic range in luminance"); + } + } + + vector histogram(LUMINANCE_BUCKETS, 0); + LuminanceSource& source = *getLuminanceSource(); + int width = source.getWidth(); + if (row == NULL || static_cast(row->getSize()) < width) { + row = new BitArray(width); + } else { + row->clear(); + } + + //TODO(flyashi): cache this instead of allocating and deleting per row + unsigned char* row_pixels = NULL; + try { + row_pixels = new unsigned char[width]; + row_pixels = source.getRow(y, row_pixels); + for (int x = 0; x < width; x++) { + histogram[row_pixels[x] >> LUMINANCE_SHIFT]++; + } + int blackPoint = estimate(histogram); + + BitArray& array = *row; + int left = row_pixels[0]; + int center = row_pixels[1]; + for (int x = 1; x < width - 1; x++) { + int right = row_pixels[x + 1]; + // A simple -1 4 -1 box filter with a weight of 2. + int luminance = ((center << 2) - left - right) >> 1; + if (luminance < blackPoint) { + array.set(x); + } + left = center; + center = right; + } + + cached_row_ = row; + cached_row_num_ = y; + delete [] row_pixels; + return row; + } catch (IllegalArgumentException const& iae) { + // Cache the fact that this row failed. + cached_row_ = NULL; + cached_row_num_ = y; + delete [] row_pixels; + throw iae; + } +} + +Ref GlobalHistogramBinarizer::getBlackMatrix() { + if (cached_matrix_ != NULL) { + return cached_matrix_; + } + + // Faster than working with the reference + LuminanceSource& source = *getLuminanceSource(); + int width = source.getWidth(); + int height = source.getHeight(); + vector histogram(LUMINANCE_BUCKETS, 0); + + // Quickly calculates the histogram by sampling four rows from the image. + // This proved to be more robust on the blackbox tests than sampling a + // diagonal as we used to do. + ArrayRef ref (width); + unsigned char* row = &ref[0]; + for (int y = 1; y < 5; y++) { + int rownum = height * y / 5; + int right = (width << 2) / 5; + row = source.getRow(rownum, row); + for (int x = width / 5; x < right; x++) { + histogram[row[x] >> LUMINANCE_SHIFT]++; + } + } + + int blackPoint = estimate(histogram); + + Ref matrix_ref(new BitMatrix(width, height)); + BitMatrix& matrix = *matrix_ref; + for (int y = 0; y < height; y++) { + row = source.getRow(y, row); + for (int x = 0; x < width; x++) { + if (row[x] < blackPoint) + matrix.set(x, y); + } + } + + cached_matrix_ = matrix_ref; + // delete [] row; + return matrix_ref; +} + +int GlobalHistogramBinarizer::estimate(vector &histogram) { + int numBuckets = histogram.size(); + int maxBucketCount = 0; + + // Find tallest peak in histogram + int firstPeak = 0; + int firstPeakSize = 0; + for (int i = 0; i < numBuckets; i++) { + if (histogram[i] > firstPeakSize) { + firstPeak = i; + firstPeakSize = histogram[i]; + } + if (histogram[i] > maxBucketCount) { + maxBucketCount = histogram[i]; + } + } + + // Find second-tallest peak -- well, another peak that is tall and not + // so close to the first one + int secondPeak = 0; + int secondPeakScore = 0; + for (int i = 0; i < numBuckets; i++) { + int distanceToBiggest = i - firstPeak; + // Encourage more distant second peaks by multiplying by square of distance + int score = histogram[i] * distanceToBiggest * distanceToBiggest; + if (score > secondPeakScore) { + secondPeak = i; + secondPeakScore = score; + } + } + + // Put firstPeak first + if (firstPeak > secondPeak) { + int temp = firstPeak; + firstPeak = secondPeak; + secondPeak = temp; + } + + // Kind of arbitrary; if the two peaks are very close, then we figure there is + // so little dynamic range in the image, that discriminating black and white + // is too error-prone. + // Decoding the image/line is either pointless, or may in some cases lead to + // a false positive for 1D formats, which are relatively lenient. + // We arbitrarily say "close" is + // "<= 1/16 of the total histogram buckets apart" + if (secondPeak - firstPeak <= numBuckets >> 4) { + throw IllegalArgumentException("Too little dynamic range in luminance"); + } + + // Find a valley between them that is low and closer to the white peak + int bestValley = secondPeak - 1; + int bestValleyScore = -1; + for (int i = secondPeak - 1; i > firstPeak; i--) { + int fromFirst = i - firstPeak; + // Favor a "valley" that is not too close to either peak -- especially not + // the black peak -- and that has a low value of course + int score = fromFirst * fromFirst * (secondPeak - i) * + (maxBucketCount - histogram[i]); + if (score > bestValleyScore) { + bestValley = i; + bestValleyScore = score; + } + } + + return bestValley << LUMINANCE_SHIFT; +} + +Ref GlobalHistogramBinarizer::createBinarizer(Ref source) { + return Ref (new GlobalHistogramBinarizer(source)); +} + +} // namespace zxing diff --git a/src/qzxing/zxing/zxing/common/GlobalHistogramBinarizer.h b/src/qzxing/zxing/common/GlobalHistogramBinarizer.h similarity index 58% rename from src/qzxing/zxing/zxing/common/GlobalHistogramBinarizer.h rename to src/qzxing/zxing/common/GlobalHistogramBinarizer.h index 797e885..af27061 100644 --- a/src/qzxing/zxing/zxing/common/GlobalHistogramBinarizer.h +++ b/src/qzxing/zxing/common/GlobalHistogramBinarizer.h @@ -1,4 +1,3 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- #ifndef __GLOBALHISTOGRAMBINARIZER_H__ #define __GLOBALHISTOGRAMBINARIZER_H__ /* @@ -20,29 +19,29 @@ * limitations under the License. */ +#include #include #include #include -#include namespace zxing { -class GlobalHistogramBinarizer : public Binarizer { -private: - ArrayRef luminances; - ArrayRef buckets; -public: - GlobalHistogramBinarizer(Ref source); - virtual ~GlobalHistogramBinarizer(); - - virtual Ref getBlackRow(int y, Ref row); - virtual Ref getBlackMatrix(); - static int estimateBlackPoint(ArrayRef const& buckets); - Ref createBinarizer(Ref source); -private: - void initArrays(int luminanceSize); -}; + class GlobalHistogramBinarizer : public Binarizer { + private: + Ref cached_matrix_; + Ref cached_row_; + int cached_row_num_; -} + public: + GlobalHistogramBinarizer(Ref source); + virtual ~GlobalHistogramBinarizer(); + + virtual Ref getBlackRow(int y, Ref row); + virtual Ref getBlackMatrix(); + static int estimate(std::vector &histogram); + Ref createBinarizer(Ref source); + }; +} + #endif /* GLOBALHISTOGRAMBINARIZER_H_ */ diff --git a/src/qzxing/zxing/common/GreyscaleLuminanceSource.cpp b/src/qzxing/zxing/common/GreyscaleLuminanceSource.cpp new file mode 100644 index 0000000..82dc1c8 --- /dev/null +++ b/src/qzxing/zxing/common/GreyscaleLuminanceSource.cpp @@ -0,0 +1,70 @@ +/* + * GreyscaleLuminanceSource.cpp + * zxing + * + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include + +namespace zxing { + +GreyscaleLuminanceSource::GreyscaleLuminanceSource(unsigned char* greyData, int dataWidth, + int dataHeight, int left, int top, int width, int height) : greyData_(greyData), + dataWidth_(dataWidth), dataHeight_(dataHeight), left_(left), top_(top), width_(width), + height_(height) { + + if (left + width > dataWidth || top + height > dataHeight || top < 0 || left < 0) { + throw IllegalArgumentException("Crop rectangle does not fit within image data."); + } +} + +unsigned char* GreyscaleLuminanceSource::getRow(int y, unsigned char* row) { + if (y < 0 || y >= this->getHeight()) { + throw IllegalArgumentException("Requested row is outside the image."); + } + int width = getWidth(); + // TODO(flyashi): determine if row has enough size. + if (row == NULL) { + row = new unsigned char[width_]; + } + int offset = (y + top_) * dataWidth_ + left_; + memcpy(row, &greyData_[offset], width); + return row; +} + +unsigned char* GreyscaleLuminanceSource::getMatrix() { + int size = width_ * height_; + unsigned char* result = new unsigned char[size]; + if (left_ == 0 && top_ == 0 && dataWidth_ == width_ && dataHeight_ == height_) { + memcpy(result, greyData_, size); + } else { + for (int row = 0; row < height_; row++) { + memcpy(result + row * width_, greyData_ + (top_ + row) * dataWidth_ + left_, width_); + } + } + return result; +} + +Ref GreyscaleLuminanceSource::rotateCounterClockwise() { + // Intentionally flip the left, top, width, and height arguments as needed. dataWidth and + // dataHeight are always kept unrotated. + return Ref (new GreyscaleRotatedLuminanceSource(greyData_, dataWidth_, + dataHeight_, top_, left_, height_, width_)); +} + +} /* namespace */ diff --git a/src/qzxing/zxing/zxing/common/GreyscaleLuminanceSource.h b/src/qzxing/zxing/common/GreyscaleLuminanceSource.h similarity index 62% rename from src/qzxing/zxing/zxing/common/GreyscaleLuminanceSource.h rename to src/qzxing/zxing/common/GreyscaleLuminanceSource.h index bf26482..c819de2 100644 --- a/src/qzxing/zxing/zxing/common/GreyscaleLuminanceSource.h +++ b/src/qzxing/zxing/common/GreyscaleLuminanceSource.h @@ -1,4 +1,3 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- #ifndef __GREYSCALE_LUMINANCE_SOURCE__ #define __GREYSCALE_LUMINANCE_SOURCE__ /* @@ -26,28 +25,38 @@ namespace zxing { class GreyscaleLuminanceSource : public LuminanceSource { -private: - typedef LuminanceSource Super; - ArrayRef greyData_; - const int dataWidth_; - const int dataHeight_; - const int left_; - const int top_; + private: + unsigned char* greyData_; + int dataWidth_; + int dataHeight_; + int left_; + int top_; + int width_; + int height_; -public: - GreyscaleLuminanceSource(ArrayRef greyData, int dataWidth, int dataHeight, int left, - int top, int width, int height); + public: + GreyscaleLuminanceSource(unsigned char* greyData, int dataWidth, int dataHeight, int left, + int top, int width, int height); - ArrayRef getRow(int y, ArrayRef row) const; - ArrayRef getMatrix() const; + unsigned char* getRow(int y, unsigned char* row); + unsigned char* getMatrix(); bool isRotateSupported() const { return true; } - Ref rotateCounterClockwise() const; + int getWidth() const { + return width_; + } + + int getHeight() const { + return height_; + } + + Ref rotateCounterClockwise(); + }; -} +} /* namespace */ #endif diff --git a/src/qzxing/zxing/common/GreyscaleRotatedLuminanceSource.cpp b/src/qzxing/zxing/common/GreyscaleRotatedLuminanceSource.cpp new file mode 100644 index 0000000..f2c0b38 --- /dev/null +++ b/src/qzxing/zxing/common/GreyscaleRotatedLuminanceSource.cpp @@ -0,0 +1,65 @@ +/* + * GreyscaleRotatedLuminanceSource.cpp + * zxing + * + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +#include +#include + +namespace zxing { + +// Note that dataWidth and dataHeight are not reversed, as we need to be able to traverse the +// greyData correctly, which does not get rotated. +GreyscaleRotatedLuminanceSource::GreyscaleRotatedLuminanceSource(unsigned char* greyData, + int dataWidth, int dataHeight, int left, int top, int width, int height) : greyData_(greyData), + dataWidth_(dataWidth), dataHeight_(dataHeight), left_(left), top_(top), width_(width), + height_(height) { + + // Intentionally comparing to the opposite dimension since we're rotated. + if (left + width > dataHeight || top + height > dataWidth) { + throw IllegalArgumentException("Crop rectangle does not fit within image data."); + } +} + +// The API asks for rows, but we're rotated, so we return columns. +unsigned char* GreyscaleRotatedLuminanceSource::getRow(int y, unsigned char* row) { + if (y < 0 || y >= getHeight()) { + throw IllegalArgumentException("Requested row is outside the image."); + } + int width = getWidth(); + if (row == NULL) { + row = new unsigned char[width]; + } + int offset = (left_ * dataWidth_) + (dataWidth_ - (y + top_)); + for (int x = 0; x < width; x++) { + row[x] = greyData_[offset]; + offset += dataWidth_; + } + return row; +} + +unsigned char* GreyscaleRotatedLuminanceSource::getMatrix() { + unsigned char* result = new unsigned char[width_ * height_]; + // This depends on getRow() honoring its second parameter. + for (int y = 0; y < height_; y++) { + getRow(y, &result[y * width_]); + } + return result; +} + +} // namespace diff --git a/src/qzxing/zxing/zxing/common/GreyscaleRotatedLuminanceSource.h b/src/qzxing/zxing/common/GreyscaleRotatedLuminanceSource.h similarity index 66% rename from src/qzxing/zxing/zxing/common/GreyscaleRotatedLuminanceSource.h rename to src/qzxing/zxing/common/GreyscaleRotatedLuminanceSource.h index c49d9c2..cb06e60 100644 --- a/src/qzxing/zxing/zxing/common/GreyscaleRotatedLuminanceSource.h +++ b/src/qzxing/zxing/common/GreyscaleRotatedLuminanceSource.h @@ -1,4 +1,3 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- #ifndef __GREYSCALE_ROTATED_LUMINANCE_SOURCE__ #define __GREYSCALE_ROTATED_LUMINANCE_SOURCE__ /* @@ -27,20 +26,35 @@ namespace zxing { class GreyscaleRotatedLuminanceSource : public LuminanceSource { private: - typedef LuminanceSource Super; - ArrayRef greyData_; - const int dataWidth_; - const int left_; - const int top_; + unsigned char* greyData_; + int dataWidth_; + int dataHeight_; + int left_; + int top_; + int width_; + int height_; public: - GreyscaleRotatedLuminanceSource(ArrayRef greyData, int dataWidth, int dataHeight, + GreyscaleRotatedLuminanceSource(unsigned char* greyData, int dataWidth, int dataHeight, int left, int top, int width, int height); - ArrayRef getRow(int y, ArrayRef row) const; - ArrayRef getMatrix() const; + unsigned char* getRow(int y, unsigned char* row); + unsigned char* getMatrix(); + + bool isRotateSupported() const { + return false; + } + + int getWidth() const { + return width_; + } + + int getHeight() const { + return height_; + } + }; -} +} /* namespace */ #endif diff --git a/src/qzxing/zxing/zxing/common/GridSampler.cpp b/src/qzxing/zxing/common/GridSampler.cpp similarity index 95% rename from src/qzxing/zxing/zxing/common/GridSampler.cpp rename to src/qzxing/zxing/common/GridSampler.cpp index c65b940..3419a96 100644 --- a/src/qzxing/zxing/zxing/common/GridSampler.cpp +++ b/src/qzxing/zxing/common/GridSampler.cpp @@ -105,12 +105,12 @@ void GridSampler::checkAndNudgePoints(Ref image, vector &point if (x == -1) { points[offset] = 0.0f; } else if (x == width) { - points[offset] = float(width - 1); + points[offset] = width - 1; } if (y == -1) { points[offset + 1] = 0.0f; } else if (y == height) { - points[offset + 1] = float(height - 1); + points[offset + 1] = height - 1; } } diff --git a/src/qzxing/zxing/zxing/common/GridSampler.h b/src/qzxing/zxing/common/GridSampler.h similarity index 100% rename from src/qzxing/zxing/zxing/common/GridSampler.h rename to src/qzxing/zxing/common/GridSampler.h diff --git a/src/qzxing/zxing/zxing/common/HybridBinarizer.cpp b/src/qzxing/zxing/common/HybridBinarizer.cpp similarity index 67% rename from src/qzxing/zxing/zxing/common/HybridBinarizer.cpp rename to src/qzxing/zxing/common/HybridBinarizer.cpp index afd6465..6f1bb28 100644 --- a/src/qzxing/zxing/zxing/common/HybridBinarizer.cpp +++ b/src/qzxing/zxing/common/HybridBinarizer.cpp @@ -27,13 +27,13 @@ using namespace zxing; namespace { const int BLOCK_SIZE_POWER = 3; - const int BLOCK_SIZE = 1 << BLOCK_SIZE_POWER; // ...0100...00 - const int BLOCK_SIZE_MASK = BLOCK_SIZE - 1; // ...0011...11 + const int BLOCK_SIZE = 1 << BLOCK_SIZE_POWER; + const int BLOCK_SIZE_MASK = BLOCK_SIZE - 1; const int MINIMUM_DIMENSION = BLOCK_SIZE * 5; } HybridBinarizer::HybridBinarizer(Ref source) : - GlobalHistogramBinarizer(source), matrix_(NULL), cached_row_(NULL) { + GlobalHistogramBinarizer(source), matrix_(NULL), cached_row_(NULL), cached_row_num_(-1) { } HybridBinarizer::~HybridBinarizer() { @@ -45,21 +45,20 @@ HybridBinarizer::createBinarizer(Ref source) { return Ref (new HybridBinarizer(source)); } - -/** - * Calculates the final BitMatrix once for all requests. This could be called once from the - * constructor instead, but there are some advantages to doing it lazily, such as making - * profiling easier, and not doing heavy lifting when callers don't expect it. - */ Ref HybridBinarizer::getBlackMatrix() { + // Calculates the final BitMatrix once for all requests. This could + // be called once from the constructor instead, but there are some + // advantages to doing it lazily, such as making profiling easier, + // and not doing heavy lifting when callers don't expect it. if (matrix_) { return matrix_; } LuminanceSource& source = *getLuminanceSource(); - int width = source.getWidth(); - int height = source.getHeight(); - if (width >= MINIMUM_DIMENSION && height >= MINIMUM_DIMENSION) { - ArrayRef luminances = source.getMatrix(); + if (source.getWidth() >= MINIMUM_DIMENSION && + source.getHeight() >= MINIMUM_DIMENSION) { + unsigned char* luminances = source.getMatrix(); + int width = source.getWidth(); + int height = source.getHeight(); int subWidth = width >> BLOCK_SIZE_POWER; if ((width & BLOCK_SIZE_MASK) != 0) { subWidth++; @@ -68,7 +67,7 @@ Ref HybridBinarizer::getBlackMatrix() { if ((height & BLOCK_SIZE_MASK) != 0) { subHeight++; } - ArrayRef blackPoints = + int* blackPoints = calculateBlackPoints(luminances, subWidth, subHeight, width, height); Ref newMatrix (new BitMatrix(width, height)); @@ -80,6 +79,13 @@ Ref HybridBinarizer::getBlackMatrix() { blackPoints, newMatrix); matrix_ = newMatrix; + + // N.B.: these deletes are inadequate if anything between the new + // and this point can throw. As of this writing, it doesn't look + // like they do. + + delete [] blackPoints; + delete [] luminances; } else { // If the image is too small, fall back to the global histogram approach. matrix_ = GlobalHistogramBinarizer::getBlackMatrix(); @@ -87,34 +93,28 @@ Ref HybridBinarizer::getBlackMatrix() { return matrix_; } -namespace { - inline int cap(int value, int min, int max) { - return value < min ? min : value > max ? max : value; - } -} - void -HybridBinarizer::calculateThresholdForBlock(ArrayRef luminances, +HybridBinarizer::calculateThresholdForBlock(unsigned char* luminances, int subWidth, int subHeight, int width, int height, - ArrayRef blackPoints, + int blackPoints[], Ref const& matrix) { for (int y = 0; y < subHeight; y++) { int yoffset = y << BLOCK_SIZE_POWER; - int maxYOffset = height - BLOCK_SIZE; - if (yoffset > maxYOffset) { - yoffset = maxYOffset; + if (yoffset + BLOCK_SIZE >= height) { + yoffset = height - BLOCK_SIZE; } for (int x = 0; x < subWidth; x++) { int xoffset = x << BLOCK_SIZE_POWER; - int maxXOffset = width - BLOCK_SIZE; - if (xoffset > maxXOffset) { - xoffset = maxXOffset; + if (xoffset + BLOCK_SIZE >= width) { + xoffset = width - BLOCK_SIZE; } - int left = cap(x, 2, subWidth - 3); - int top = cap(y, 2, subHeight - 3); + int left = (x > 1) ? x : 2; + left = (left < subWidth - 2) ? left : subWidth - 3; + int top = (y > 1) ? y : 2; + top = (top < subHeight - 2) ? top : subHeight - 3; int sum = 0; for (int z = -2; z <= 2; z++) { int *blackRow = &blackPoints[(top + z) * subWidth]; @@ -125,17 +125,17 @@ HybridBinarizer::calculateThresholdForBlock(ArrayRef luminances, sum += blackRow[left + 2]; } int average = sum / 25; - thresholdBlock(luminances, xoffset, yoffset, average, width, matrix); + threshold8x8Block(luminances, xoffset, yoffset, average, width, matrix); } } } -void HybridBinarizer::thresholdBlock(ArrayRef luminances, - int xoffset, - int yoffset, - int threshold, - int stride, - Ref const& matrix) { +void HybridBinarizer::threshold8x8Block(unsigned char* luminances, + int xoffset, + int yoffset, + int threshold, + int stride, + Ref const& matrix) { for (int y = 0, offset = yoffset * stride + xoffset; y < BLOCK_SIZE; y++, offset += stride) { @@ -149,7 +149,7 @@ void HybridBinarizer::thresholdBlock(ArrayRef luminances, } namespace { - inline int getBlackPointFromNeighbors(ArrayRef blackPoints, int subWidth, int x, int y) { + inline int getBlackPointFromNeighbors(int* blackPoints, int subWidth, int x, int y) { return (blackPoints[(y-1)*subWidth+x] + 2*blackPoints[y*subWidth+x-1] + blackPoints[(y-1)*subWidth+x-1]) >> 2; @@ -157,25 +157,20 @@ namespace { } -ArrayRef HybridBinarizer::calculateBlackPoints(ArrayRef luminances, - int subWidth, - int subHeight, - int width, - int height) { +int* HybridBinarizer::calculateBlackPoints(unsigned char* luminances, int subWidth, int subHeight, + int width, int height) { const int minDynamicRange = 24; - ArrayRef blackPoints (subHeight * subWidth); + int *blackPoints = new int[subHeight * subWidth]; for (int y = 0; y < subHeight; y++) { int yoffset = y << BLOCK_SIZE_POWER; - int maxYOffset = height - BLOCK_SIZE; - if (yoffset > maxYOffset) { - yoffset = maxYOffset; + if (yoffset + BLOCK_SIZE >= height) { + yoffset = height - BLOCK_SIZE; } for (int x = 0; x < subWidth; x++) { int xoffset = x << BLOCK_SIZE_POWER; - int maxXOffset = width - BLOCK_SIZE; - if (xoffset > maxXOffset) { - xoffset = maxXOffset; + if (xoffset + BLOCK_SIZE >= width) { + xoffset = width - BLOCK_SIZE; } int sum = 0; int min = 0xFF; diff --git a/src/qzxing/zxing/zxing/common/HybridBinarizer.h b/src/qzxing/zxing/common/HybridBinarizer.h similarity index 69% rename from src/qzxing/zxing/zxing/common/HybridBinarizer.h rename to src/qzxing/zxing/common/HybridBinarizer.h index 176663d..6371e13 100644 --- a/src/qzxing/zxing/zxing/common/HybridBinarizer.h +++ b/src/qzxing/zxing/common/HybridBinarizer.h @@ -32,6 +32,7 @@ namespace zxing { private: Ref matrix_; Ref cached_row_; + int cached_row_num_; public: HybridBinarizer(Ref source); @@ -42,24 +43,24 @@ namespace zxing { private: // We'll be using one-D arrays because C++ can't dynamically allocate 2D // arrays - ArrayRef calculateBlackPoints(ArrayRef luminances, - int subWidth, - int subHeight, - int width, - int height); - void calculateThresholdForBlock(ArrayRef luminances, + int* calculateBlackPoints(unsigned char* luminances, + int subWidth, + int subHeight, + int width, + int height); + void calculateThresholdForBlock(unsigned char* luminances, int subWidth, int subHeight, int width, int height, - ArrayRef blackPoints, + int blackPoints[], Ref const& matrix); - void thresholdBlock(ArrayRefluminances, - int xoffset, - int yoffset, - int threshold, - int stride, - Ref const& matrix); + void threshold8x8Block(unsigned char* luminances, + int xoffset, + int yoffset, + int threshold, + int stride, + Ref const& matrix); }; } diff --git a/src/qzxing/zxing/zxing/common/IllegalArgumentException.cpp b/src/qzxing/zxing/common/IllegalArgumentException.cpp similarity index 78% rename from src/qzxing/zxing/zxing/common/IllegalArgumentException.cpp rename to src/qzxing/zxing/common/IllegalArgumentException.cpp index 7018a56..6a582f0 100644 --- a/src/qzxing/zxing/zxing/common/IllegalArgumentException.cpp +++ b/src/qzxing/zxing/common/IllegalArgumentException.cpp @@ -20,8 +20,12 @@ #include -using zxing::IllegalArgumentException; +namespace zxing { -IllegalArgumentException::IllegalArgumentException() : Exception() {} -IllegalArgumentException::IllegalArgumentException(const char *msg) : Exception(msg) {} -IllegalArgumentException::~IllegalArgumentException() throw() {} +IllegalArgumentException::IllegalArgumentException(const char *msg) : + Exception(msg) { +} +IllegalArgumentException::~IllegalArgumentException() throw() { + +} +} diff --git a/src/qzxing/zxing/zxing/common/IllegalArgumentException.h b/src/qzxing/zxing/common/IllegalArgumentException.h similarity index 88% rename from src/qzxing/zxing/zxing/common/IllegalArgumentException.h rename to src/qzxing/zxing/common/IllegalArgumentException.h index 41c3f12..0851c6f 100644 --- a/src/qzxing/zxing/zxing/common/IllegalArgumentException.h +++ b/src/qzxing/zxing/common/IllegalArgumentException.h @@ -23,14 +23,11 @@ #include namespace zxing { - -class IllegalArgumentException : public Exception { +class IllegalArgumentException : public zxing::Exception { public: - IllegalArgumentException(); IllegalArgumentException(const char *msg); ~IllegalArgumentException() throw(); }; - } #endif // __ILLEGAL_ARGUMENT_EXCEPTION_H__ diff --git a/src/qzxing/zxing/zxing/common/PerspectiveTransform.cpp b/src/qzxing/zxing/common/PerspectiveTransform.cpp similarity index 100% rename from src/qzxing/zxing/zxing/common/PerspectiveTransform.cpp rename to src/qzxing/zxing/common/PerspectiveTransform.cpp diff --git a/src/qzxing/zxing/zxing/common/PerspectiveTransform.h b/src/qzxing/zxing/common/PerspectiveTransform.h similarity index 100% rename from src/qzxing/zxing/zxing/common/PerspectiveTransform.h rename to src/qzxing/zxing/common/PerspectiveTransform.h diff --git a/src/qzxing/zxing/zxing/common/Point.h b/src/qzxing/zxing/common/Point.h similarity index 100% rename from src/qzxing/zxing/zxing/common/Point.h rename to src/qzxing/zxing/common/Point.h diff --git a/src/qzxing/zxing/zxing/ResultIO.cpp b/src/qzxing/zxing/common/Str.cpp similarity index 59% rename from src/qzxing/zxing/zxing/ResultIO.cpp rename to src/qzxing/zxing/common/Str.cpp index c812f7f..f2158cd 100644 --- a/src/qzxing/zxing/zxing/ResultIO.cpp +++ b/src/qzxing/zxing/common/Str.cpp @@ -1,9 +1,8 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- /* - * ResultIO.cpp + * String.cpp * zxing * - * Created by Christian Brunschen on 13/05/2008. + * Created by Christian Brunschen on 20/05/2008. * Copyright 2008 ZXing authors All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -19,16 +18,21 @@ * limitations under the License. */ -#include +#include -using zxing::Result; -using std::ostream; +namespace zxing { +using namespace std; -ostream& zxing::operator<<(ostream &out, Result& result) { - if (result.text_ != 0) { - out << result.text_->getText(); - } else { - out << "[" << result.rawBytes_->size() << " bytes]"; - } +String::String(const std::string &text) : + text_(text) { +} +const std::string& String::getText() const { + return text_; +} + +ostream &operator<<(ostream &out, const String &s) { + out << s.text_; return out; } + +} diff --git a/src/qzxing/zxing/zxing/common/Str.h b/src/qzxing/zxing/common/Str.h similarity index 61% rename from src/qzxing/zxing/zxing/common/Str.h rename to src/qzxing/zxing/common/Str.h index 4e7f48d..b758c96 100644 --- a/src/qzxing/zxing/zxing/common/Str.h +++ b/src/qzxing/zxing/common/Str.h @@ -1,4 +1,3 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- #ifndef __STR_H__ #define __STR_H__ @@ -27,23 +26,13 @@ namespace zxing { -class String; -std::ostream& operator << (std::ostream& out, String const& s); - class String : public Counted { private: std::string text_; public: - explicit String(const std::string &text); - explicit String(int); - char charAt(int) const; - Ref substring(int) const; - const std::string& getText() const; - int size() const; - void append(std::string const& tail); - void append(char c); - int length() const; - friend std::ostream& zxing::operator << (std::ostream& out, String const& s); + String(const std::string &text); + const std::string &getText() const; + friend std::ostream &operator<<(std::ostream &out, const String &s); }; } diff --git a/src/qzxing/zxing/zxing/common/StringUtils.cpp b/src/qzxing/zxing/common/StringUtils.cpp similarity index 95% rename from src/qzxing/zxing/zxing/common/StringUtils.cpp rename to src/qzxing/zxing/common/StringUtils.cpp index 7c00099..fd2cf2e 100644 --- a/src/qzxing/zxing/zxing/common/StringUtils.cpp +++ b/src/qzxing/zxing/common/StringUtils.cpp @@ -35,7 +35,7 @@ char const* const StringUtils::ISO88591 = "ISO8859-1"; const bool StringUtils::ASSUME_SHIFT_JIS = false; string -StringUtils::guessEncoding(char* bytes, int length, +StringUtils::guessEncoding(unsigned char* bytes, int length, Hashtable const& hints) { Hashtable::const_iterator i = hints.find(DecodeHints::CHARACTER_SET); if (i != hints.end()) { @@ -64,7 +64,7 @@ StringUtils::guessEncoding(char* bytes, int length, //int isoHighChars = 0; int isoHighOther = 0; - typedef char byte; + typedef unsigned char byte; boolean utf8bom = length > 3 && bytes[0] == (byte) 0xEF && bytes[1] == (byte) 0xBB && diff --git a/src/qzxing/zxing/zxing/common/StringUtils.h b/src/qzxing/zxing/common/StringUtils.h similarity index 84% rename from src/qzxing/zxing/zxing/common/StringUtils.h rename to src/qzxing/zxing/common/StringUtils.h index 2834b28..21385bc 100644 --- a/src/qzxing/zxing/zxing/common/StringUtils.h +++ b/src/qzxing/zxing/common/StringUtils.h @@ -24,9 +24,12 @@ #include namespace zxing { -namespace common { + namespace common { + class StringUtils; + } +} -class StringUtils { +class zxing::common::StringUtils { private: static char const* const PLATFORM_DEFAULT_ENCODING; @@ -43,10 +46,7 @@ public: typedef std::map Hashtable; - static std::string guessEncoding(char* bytes, int length, Hashtable const& hints); + static std::string guessEncoding(unsigned char* bytes, int length, Hashtable const& hints); }; -} -} - #endif diff --git a/src/qzxing/zxing/common/detector/MonochromeRectangleDetector.cpp b/src/qzxing/zxing/common/detector/MonochromeRectangleDetector.cpp new file mode 100644 index 0000000..dbff6eb --- /dev/null +++ b/src/qzxing/zxing/common/detector/MonochromeRectangleDetector.cpp @@ -0,0 +1,171 @@ +/* + * MonochromeRectangleDetector.cpp + * y_wmk + * + * Created by Luiz Silva on 09/02/2010. + * Copyright 2010 y_wmk authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include + +namespace zxing { +using namespace std; + +std::vector > MonochromeRectangleDetector::detect() { + int height = image_->getHeight(); + int width = image_->getWidth(); + int halfHeight = height >> 1; + int halfWidth = width >> 1; + int deltaY = max(1, height / (MAX_MODULES << 3)); + int deltaX = max(1, width / (MAX_MODULES << 3)); + + int top = 0; + int bottom = height; + int left = 0; + int right = width; + Ref pointA(findCornerFromCenter(halfWidth, 0, left, right, + halfHeight, -deltaY, top, bottom, halfWidth >> 1)); + top = (int) pointA->getY() - 1;; + Ref pointB(findCornerFromCenter(halfWidth, -deltaX, left, right, + halfHeight, 0, top, bottom, halfHeight >> 1)); + left = (int) pointB->getX() - 1; + Ref pointC(findCornerFromCenter(halfWidth, deltaX, left, right, + halfHeight, 0, top, bottom, halfHeight >> 1)); + right = (int) pointC->getX() + 1; + Ref pointD(findCornerFromCenter(halfWidth, 0, left, right, + halfHeight, deltaY, top, bottom, halfWidth >> 1)); + bottom = (int) pointD->getY() + 1; + + // Go try to find point A again with better information -- might have been off at first. + pointA.reset(findCornerFromCenter(halfWidth, 0, left, right, + halfHeight, -deltaY, top, bottom, halfWidth >> 2)); + + std::vector > corners(4); + corners[0].reset(pointA); + corners[1].reset(pointB); + corners[2].reset(pointC); + corners[3].reset(pointD); + return corners; + } + +Ref MonochromeRectangleDetector::findCornerFromCenter(int centerX, int deltaX, int left, int right, + int centerY, int deltaY, int top, int bottom, int maxWhiteRun) { + Ref lastRange(NULL); + for (int y = centerY, x = centerX; + y < bottom && y >= top && x < right && x >= left; + y += deltaY, x += deltaX) { + Ref range(NULL); + if (deltaX == 0) { + // horizontal slices, up and down + range = blackWhiteRange(y, maxWhiteRun, left, right, true); + } else { + // vertical slices, left and right + range = blackWhiteRange(x, maxWhiteRun, top, bottom, false); + } + if (range == NULL) { + if (lastRange == NULL) { + throw NotFoundException("Couldn't find corners (lastRange = NULL) "); + } else { + // lastRange was found + if (deltaX == 0) { + int lastY = y - deltaY; + if (lastRange->start < centerX) { + if (lastRange->end > centerX) { + // straddle, choose one or the other based on direction + Ref result(new ResultPoint(deltaY > 0 ? lastRange->start : lastRange->end, lastY)); + return result; + } + Ref result(new ResultPoint(lastRange->start, lastY)); + return result; + } else { + Ref result(new ResultPoint(lastRange->end, lastY)); + return result; + } + } else { + int lastX = x - deltaX; + if (lastRange->start < centerY) { + if (lastRange->end > centerY) { + Ref result(new ResultPoint(lastX, deltaX < 0 ? lastRange->start : lastRange->end)); + return result; + } + Ref result(new ResultPoint(lastX, lastRange->start)); + return result; + } else { + Ref result(new ResultPoint(lastX, lastRange->end)); + return result; + } + } + } + } + lastRange = range; + } + throw NotFoundException("Couldn't find corners"); + } + +Ref MonochromeRectangleDetector::blackWhiteRange(int fixedDimension, int maxWhiteRun, int minDim, int maxDim, + bool horizontal) { + + int center = (minDim + maxDim) >> 1; + + // Scan left/up first + int start = center; + while (start >= minDim) { + if (horizontal ? image_->get(start, fixedDimension) : image_->get(fixedDimension, start)) { + start--; + } else { + int whiteRunStart = start; + do { + start--; + } while (start >= minDim && !(horizontal ? image_->get(start, fixedDimension) : + image_->get(fixedDimension, start))); + int whiteRunSize = whiteRunStart - start; + if (start < minDim || whiteRunSize > maxWhiteRun) { + start = whiteRunStart; + break; + } + } + } + start++; + + // Then try right/down + int end = center; + while (end < maxDim) { + if (horizontal ? image_->get(end, fixedDimension) : image_->get(fixedDimension, end)) { + end++; + } else { + int whiteRunStart = end; + do { + end++; + } while (end < maxDim && !(horizontal ? image_->get(end, fixedDimension) : + image_->get(fixedDimension, end))); + int whiteRunSize = end - whiteRunStart; + if (end >= maxDim || whiteRunSize > maxWhiteRun) { + end = whiteRunStart; + break; + } + } + } + end--; + Ref result(NULL); + if (end > start) { + result = new TwoInts; + result->start = start; + result->end = end; + } + return result; + } +} diff --git a/src/qzxing/zxing/zxing/common/detector/MonochromeRectangleDetector.h b/src/qzxing/zxing/common/detector/MonochromeRectangleDetector.h similarity index 82% rename from src/qzxing/zxing/zxing/common/detector/MonochromeRectangleDetector.h rename to src/qzxing/zxing/common/detector/MonochromeRectangleDetector.h index f32c99d..75d2dd0 100644 --- a/src/qzxing/zxing/zxing/common/detector/MonochromeRectangleDetector.h +++ b/src/qzxing/zxing/common/detector/MonochromeRectangleDetector.h @@ -1,5 +1,3 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- - #ifndef __MONOCHROMERECTANGLEDETECTOR_H__ #define __MONOCHROMERECTANGLEDETECTOR_H__ @@ -30,33 +28,33 @@ #include #include + namespace zxing { struct TwoInts: public Counted { - int start; - int end; + int start; + int end; }; class MonochromeRectangleDetector : public Counted { - private: +private: static const int MAX_MODULES = 32; Ref image_; - public: +public: MonochromeRectangleDetector(Ref image) : image_(image) { }; std::vector > detect(); - private: +private: Ref findCornerFromCenter(int centerX, int deltaX, int left, int right, - int centerY, int deltaY, int top, int bottom, int maxWhiteRun); + int centerY, int deltaY, int top, int bottom, int maxWhiteRun); Ref blackWhiteRange(int fixedDimension, int maxWhiteRun, int minDim, int maxDim, - bool horizontal); + bool horizontal); int max(int a, float b) { return (float) a > b ? a : (int) b;}; }; - } #endif // __MONOCHROMERECTANGLEDETECTOR_H__ diff --git a/src/qzxing/zxing/zxing/common/detector/WhiteRectangleDetector.cpp b/src/qzxing/zxing/common/detector/WhiteRectangleDetector.cpp similarity index 88% rename from src/qzxing/zxing/zxing/common/detector/WhiteRectangleDetector.cpp rename to src/qzxing/zxing/common/detector/WhiteRectangleDetector.cpp index 88e6796..4decd31 100644 --- a/src/qzxing/zxing/zxing/common/detector/WhiteRectangleDetector.cpp +++ b/src/qzxing/zxing/common/detector/WhiteRectangleDetector.cpp @@ -1,4 +1,3 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- /* * WhiteRectangleDetector.cpp * y_wmk @@ -21,21 +20,16 @@ #include #include -#include +#include #include -using std::vector; -using zxing::Ref; -using zxing::ResultPoint; -using zxing::WhiteRectangleDetector; -using zxing::common::detector::MathUtils; - -// VC++ -using zxing::BitMatrix; +namespace zxing { +using namespace std; int WhiteRectangleDetector::INIT_SIZE = 30; int WhiteRectangleDetector::CORR = 1; + WhiteRectangleDetector::WhiteRectangleDetector(Ref image) : image_(image) { width_ = image->getWidth(); height_ = image->getHeight(); @@ -228,18 +222,23 @@ std::vector > WhiteRectangleDetector::detect() { } } -Ref -WhiteRectangleDetector::getBlackPointOnSegment(int aX_, int aY_, int bX_, int bY_) { - float aX = float(aX_), aY = float(aY_), bX = float(bX_), bY = float(bY_); - int dist = MathUtils::round(MathUtils::distance(aX, aY, bX, bY)); +/** + * Ends up being a bit faster than Math.round(). This merely rounds its + * argument to the nearest int, where x.5 rounds up. + */ +int WhiteRectangleDetector::round(float d) { + return (int) (d + 0.5f); +} + +Ref WhiteRectangleDetector::getBlackPointOnSegment(float aX, float aY, float bX, float bY) { + int dist = distanceL2(aX, aY, bX, bY); float xStep = (bX - aX) / dist; float yStep = (bY - aY) / dist; - for (int i = 0; i < dist; i++) { - int x = MathUtils::round(aX + i * xStep); - int y = MathUtils::round(aY + i * yStep); + int x = round(aX + i * xStep); + int y = round(aY + i * yStep); if (image_->get(x, y)) { - Ref point(new ResultPoint(float(x), float(y))); + Ref point(new ResultPoint(x, y)); return point; } } @@ -247,6 +246,12 @@ WhiteRectangleDetector::getBlackPointOnSegment(int aX_, int aY_, int bX_, int bY return point; } +int WhiteRectangleDetector::distanceL2(float aX, float aY, float bX, float bY) { + float xDiff = aX - bX; + float yDiff = aY - bY; + return round((float)sqrt(xDiff * xDiff + yDiff * yDiff)); +} + /** * recenters the points of a constant distance towards the center * @@ -280,7 +285,7 @@ vector > WhiteRectangleDetector::centerEdges(Ref y float tj = t->getY(); std::vector > corners(4); - if (yi < (float)width_/2.0f) { + if (yi < (float)width_/2) { Ref pointA(new ResultPoint(ti - CORR, tj + CORR)); Ref pointB(new ResultPoint(zi + CORR, zj + CORR)); Ref pointC(new ResultPoint(xi - CORR, xj - CORR)); @@ -328,3 +333,4 @@ bool WhiteRectangleDetector::containsBlackPoint(int a, int b, int fixed, bool ho return false; } +} diff --git a/src/qzxing/zxing/zxing/common/detector/WhiteRectangleDetector.h b/src/qzxing/zxing/common/detector/WhiteRectangleDetector.h similarity index 87% rename from src/qzxing/zxing/zxing/common/detector/WhiteRectangleDetector.h rename to src/qzxing/zxing/common/detector/WhiteRectangleDetector.h index 9180806..2a8b8a4 100644 --- a/src/qzxing/zxing/zxing/common/detector/WhiteRectangleDetector.h +++ b/src/qzxing/zxing/common/detector/WhiteRectangleDetector.h @@ -49,7 +49,9 @@ class WhiteRectangleDetector : public Counted { std::vector > detect(); private: - Ref getBlackPointOnSegment(int aX, int aY, int bX, int bY); + int round(float a); + Ref getBlackPointOnSegment(float aX, float aY, float bX, float bY); + int distanceL2(float aX, float aY, float bX, float bY); std::vector > centerEdges(Ref y, Ref z, Ref x, Ref t); bool containsBlackPoint(int a, int b, int fixed, bool horizontal); diff --git a/src/qzxing/zxing/zxing/common/reedsolomon/GenericGF.cpp b/src/qzxing/zxing/common/reedsolomon/GenericGF.cpp similarity index 62% rename from src/qzxing/zxing/zxing/common/reedsolomon/GenericGF.cpp rename to src/qzxing/zxing/common/reedsolomon/GenericGF.cpp index 2ffa1be..7e35cbc 100644 --- a/src/qzxing/zxing/zxing/common/reedsolomon/GenericGF.cpp +++ b/src/qzxing/zxing/common/reedsolomon/GenericGF.cpp @@ -28,67 +28,67 @@ using zxing::GenericGF; using zxing::GenericGFPoly; using zxing::Ref; -Ref GenericGF::AZTEC_DATA_12(new GenericGF(0x1069, 4096, 1)); -Ref GenericGF::AZTEC_DATA_10(new GenericGF(0x409, 1024, 1)); -Ref GenericGF::AZTEC_DATA_6(new GenericGF(0x43, 64, 1)); -Ref GenericGF::AZTEC_PARAM(new GenericGF(0x13, 16, 1)); -Ref GenericGF::QR_CODE_FIELD_256(new GenericGF(0x011D, 256, 0)); -Ref GenericGF::DATA_MATRIX_FIELD_256(new GenericGF(0x012D, 256, 1)); -Ref GenericGF::AZTEC_DATA_8 = DATA_MATRIX_FIELD_256; -Ref GenericGF::MAXICODE_FIELD_64 = AZTEC_DATA_6; +Ref GenericGF::QR_CODE_FIELD_256(new GenericGF(0x011D, 256)); +Ref GenericGF::DATA_MATRIX_FIELD_256(new GenericGF(0x012D, 256)); +Ref GenericGF::AZTEC_PARAM(new GenericGF(0x13, 16)); +Ref GenericGF::AZTEC_DATA_6(new GenericGF(0x43, 64)); +Ref GenericGF::AZTEC_DATA_8(GenericGF::DATA_MATRIX_FIELD_256); +Ref GenericGF::AZTEC_DATA_10(new GenericGF(0x409, 1024)); +Ref GenericGF::AZTEC_DATA_12(new GenericGF(0x1069, 4096)); -namespace { - int INITIALIZATION_THRESHOLD = 0; -} -GenericGF::GenericGF(int primitive_, int size_, int b) - : size(size_), primitive(primitive_), generatorBase(b), initialized(false) { +static int INITIALIZATION_THRESHOLD = 0; + +GenericGF::GenericGF(int primitive, int size) + : size_(size), primitive_(primitive), initialized_(false) { if (size <= INITIALIZATION_THRESHOLD) { initialize(); } } void GenericGF::initialize() { - expTable.resize(size); - logTable.resize(size); + //expTable_ = std::vector(size_, (const int) 0); + //logTable_ = std::vector(size_, (const int) 0); + expTable_.resize(size_); + logTable_.resize(size_); int x = 1; - for (int i = 0; i < size; i++) { - expTable[i] = x; + for (int i = 0; i < size_; i++) { + expTable_[i] = x; x <<= 1; // x = x * 2; we're assuming the generator alpha is 2 - if (x >= size) { - x ^= primitive; - x &= size-1; + if (x >= size_) { + x ^= primitive_; + x &= size_-1; } } - for (int i = 0; i < size-1; i++) { - logTable[expTable[i]] = i; + for (int i = 0; i < size_-1; i++) { + logTable_[expTable_[i]] = i; } - //logTable[0] == 0 but this should never be used - zero = - Ref(new GenericGFPoly(Ref(this), ArrayRef(new Array(1)))); - zero->getCoefficients()[0] = 0; - one = - Ref(new GenericGFPoly(Ref(this), ArrayRef(new Array(1)))); - one->getCoefficients()[0] = 1; - initialized = true; + //logTable_[0] == 0 but this should never be used + + zero_ = Ref(new GenericGFPoly(Ref(this), ArrayRef(new Array(1)))); + zero_->getCoefficients()[0] = 0; + one_ = Ref(new GenericGFPoly(Ref(this), ArrayRef(new Array(1)))); + one_->getCoefficients()[0] = 1; + + initialized_ = true; } void GenericGF::checkInit() { - if (!initialized) { + if (!initialized_) { initialize(); } } Ref GenericGF::getZero() { checkInit(); - return zero; + return zero_; } Ref GenericGF::getOne() { checkInit(); - return one; + return one_; } Ref GenericGF::buildMonomial(int degree, int coefficient) { @@ -98,11 +98,12 @@ Ref GenericGF::buildMonomial(int degree, int coefficient) { throw IllegalArgumentException("Degree must be non-negative"); } if (coefficient == 0) { - return zero; + return zero_; } ArrayRef coefficients(new Array(degree + 1)); coefficients[0] = coefficient; + //return new GenericGFPoly(this, coefficients); return Ref(new GenericGFPoly(Ref(this), coefficients)); } @@ -112,7 +113,7 @@ int GenericGF::addOrSubtract(int a, int b) { int GenericGF::exp(int a) { checkInit(); - return expTable[a]; + return expTable_[a]; } int GenericGF::log(int a) { @@ -120,7 +121,7 @@ int GenericGF::log(int a) { if (a == 0) { throw IllegalArgumentException("cannot give log(0)"); } - return logTable[a]; + return logTable_[a]; } int GenericGF::inverse(int a) { @@ -128,7 +129,7 @@ int GenericGF::inverse(int a) { if (a == 0) { throw IllegalArgumentException("Cannot calculate the inverse of 0"); } - return expTable[size - logTable[a] - 1]; + return expTable_[size_ - logTable_[a] - 1]; } int GenericGF::multiply(int a, int b) { @@ -138,13 +139,9 @@ int GenericGF::multiply(int a, int b) { return 0; } - return expTable[(logTable[a] + logTable[b]) % (size - 1)]; + return expTable_[(logTable_[a] + logTable_[b]) % (size_ - 1)]; } int GenericGF::getSize() { - return size; -} - -int GenericGF::getGeneratorBase() { - return generatorBase; + return size_; } diff --git a/src/qzxing/zxing/zxing/common/reedsolomon/GenericGF.h b/src/qzxing/zxing/common/reedsolomon/GenericGF.h similarity index 76% rename from src/qzxing/zxing/zxing/common/reedsolomon/GenericGF.h rename to src/qzxing/zxing/common/reedsolomon/GenericGF.h index 53d0ec0..0dd7e29 100644 --- a/src/qzxing/zxing/zxing/common/reedsolomon/GenericGF.h +++ b/src/qzxing/zxing/common/reedsolomon/GenericGF.h @@ -31,14 +31,13 @@ namespace zxing { class GenericGF : public Counted { private: - std::vector expTable; - std::vector logTable; - Ref zero; - Ref one; - int size; - int primitive; - int generatorBase; - bool initialized; + std::vector expTable_; + std::vector logTable_; + Ref zero_; + Ref one_; + int size_; + int primitive_; + bool initialized_; void initialize(); void checkInit(); @@ -51,14 +50,12 @@ namespace zxing { static Ref AZTEC_PARAM; static Ref QR_CODE_FIELD_256; static Ref DATA_MATRIX_FIELD_256; - static Ref MAXICODE_FIELD_64; - GenericGF(int primitive, int size, int b); + GenericGF(int primitive, int size); Ref getZero(); Ref getOne(); int getSize(); - int getGeneratorBase(); Ref buildMonomial(int degree, int coefficient); static int addOrSubtract(int a, int b); @@ -66,6 +63,14 @@ namespace zxing { int log(int a); int inverse(int a); int multiply(int a, int b); + + bool operator==(GenericGF other) { + return (other.getSize() == this->size_ && + other.primitive_ == this->primitive_); + } + + //#warning todo: add print method + }; } diff --git a/src/qzxing/zxing/zxing/common/reedsolomon/GenericGFPoly.cpp b/src/qzxing/zxing/common/reedsolomon/GenericGFPoly.cpp similarity index 87% rename from src/qzxing/zxing/zxing/common/reedsolomon/GenericGFPoly.cpp rename to src/qzxing/zxing/common/reedsolomon/GenericGFPoly.cpp index e7523d1..464253d 100644 --- a/src/qzxing/zxing/zxing/common/reedsolomon/GenericGFPoly.cpp +++ b/src/qzxing/zxing/common/reedsolomon/GenericGFPoly.cpp @@ -28,16 +28,13 @@ using zxing::GenericGFPoly; using zxing::ArrayRef; using zxing::Ref; -// VC++ -using zxing::GenericGF; - GenericGFPoly::GenericGFPoly(Ref field, ArrayRef coefficients) : field_(field) { - if (coefficients->size() == 0) { + if (coefficients.size() == 0) { throw IllegalArgumentException("need coefficients"); } - int coefficientsLength = coefficients->size(); + int coefficientsLength = coefficients.size(); if (coefficientsLength > 1 && coefficients[0] == 0) { // Leading term must be non-zero for anything except the constant polynomial "0" int firstNonZero = 1; @@ -48,7 +45,7 @@ GenericGFPoly::GenericGFPoly(Ref field, coefficients_ = field->getZero()->getCoefficients(); } else { coefficients_ = ArrayRef(new Array(coefficientsLength-firstNonZero)); - for (int i = 0; i < (int)coefficients_->size(); i++) { + for (int i = 0; i < (int)coefficients_.size(); i++) { coefficients_[i] = coefficients[i + firstNonZero]; } } @@ -62,7 +59,7 @@ ArrayRef GenericGFPoly::getCoefficients() { } int GenericGFPoly::getDegree() { - return coefficients_->size() - 1; + return coefficients_.size() - 1; } bool GenericGFPoly::isZero() { @@ -70,7 +67,7 @@ bool GenericGFPoly::isZero() { } int GenericGFPoly::getCoefficient(int degree) { - return coefficients_[coefficients_->size() - 1 - degree]; + return coefficients_[coefficients_.size() - 1 - degree]; } int GenericGFPoly::evaluateAt(int a) { @@ -79,7 +76,7 @@ int GenericGFPoly::evaluateAt(int a) { return getCoefficient(0); } - int size = coefficients_->size(); + int size = coefficients_.size(); if (a == 1) { // Just the sum of the coefficients int result = 0; @@ -108,20 +105,20 @@ Ref GenericGFPoly::addOrSubtract(Ref other) ArrayRef smallerCoefficients = coefficients_; ArrayRef largerCoefficients = other->getCoefficients(); - if (smallerCoefficients->size() > largerCoefficients->size()) { + if (smallerCoefficients.size() > largerCoefficients.size()) { ArrayRef temp = smallerCoefficients; smallerCoefficients = largerCoefficients; largerCoefficients = temp; } - ArrayRef sumDiff(new Array(largerCoefficients->size())); - int lengthDiff = largerCoefficients->size() - smallerCoefficients->size(); + ArrayRef sumDiff(new Array(largerCoefficients.size())); + int lengthDiff = largerCoefficients.size() - smallerCoefficients.size(); // Copy high-order terms only found in higher-degree polynomial's coefficients for (int i = 0; i < lengthDiff; i++) { sumDiff[i] = largerCoefficients[i]; } - for (int i = lengthDiff; i < (int)largerCoefficients->size(); i++) { + for (int i = lengthDiff; i < (int)largerCoefficients.size(); i++) { sumDiff[i] = GenericGF::addOrSubtract(smallerCoefficients[i-lengthDiff], largerCoefficients[i]); } @@ -139,10 +136,10 @@ Ref GenericGFPoly::multiply(Ref other) { } ArrayRef aCoefficients = coefficients_; - int aLength = aCoefficients->size(); + int aLength = aCoefficients.size(); ArrayRef bCoefficients = other->getCoefficients(); - int bLength = bCoefficients->size(); + int bLength = bCoefficients.size(); ArrayRef product(new Array(aLength + bLength - 1)); for (int i = 0; i < aLength; i++) { @@ -163,7 +160,7 @@ Ref GenericGFPoly::multiply(int scalar) { if (scalar == 1) { return Ref(this); } - int size = coefficients_->size(); + int size = coefficients_.size(); ArrayRef product(new Array(size)); for (int i = 0; i < size; i++) { product[i] = field_->multiply(coefficients_[i], scalar); @@ -178,7 +175,7 @@ Ref GenericGFPoly::multiplyByMonomial(int degree, int coefficient if (coefficient == 0) { return field_->getZero(); } - int size = coefficients_->size(); + int size = coefficients_.size(); ArrayRef product(new Array(size+degree)); for (int i = 0; i < size; i++) { product[i] = field_->multiply(coefficients_[i], coefficient); diff --git a/src/qzxing/zxing/zxing/common/reedsolomon/GenericGFPoly.h b/src/qzxing/zxing/common/reedsolomon/GenericGFPoly.h similarity index 54% rename from src/qzxing/zxing/zxing/common/reedsolomon/GenericGFPoly.h rename to src/qzxing/zxing/common/reedsolomon/GenericGFPoly.h index a2b9c3f..663a0a4 100644 --- a/src/qzxing/zxing/zxing/common/reedsolomon/GenericGFPoly.h +++ b/src/qzxing/zxing/common/reedsolomon/GenericGFPoly.h @@ -27,30 +27,28 @@ #include namespace zxing { - -class GenericGF; + class GenericGF; -class GenericGFPoly : public Counted { -private: - Ref field_; - ArrayRef coefficients_; + class GenericGFPoly : public Counted { + private: + Ref field_; + ArrayRef coefficients_; -public: - GenericGFPoly(Ref field, ArrayRef coefficients); - ArrayRef getCoefficients(); - int getDegree(); - bool isZero(); - int getCoefficient(int degree); - int evaluateAt(int a); - Ref addOrSubtract(Ref other); - Ref multiply(Ref other); - Ref multiply(int scalar); - Ref multiplyByMonomial(int degree, int coefficient); - std::vector > divide(Ref other); + public: + GenericGFPoly(Ref field, ArrayRef coefficients); + ArrayRef getCoefficients(); + int getDegree(); + bool isZero(); + int getCoefficient(int degree); + int evaluateAt(int a); + Ref addOrSubtract(Ref other); + Ref multiply(Ref other); + Ref multiply(int scalar); + Ref multiplyByMonomial(int degree, int coefficient); + std::vector > divide(Ref other); - -}; - + //#warning todo: add print method + }; } -#endif //GENERICGFPOLY_H +#endif //GENERICGFPOLY_H \ No newline at end of file diff --git a/src/qzxing/zxing/zxing/common/reedsolomon/ReedSolomonDecoder.cpp b/src/qzxing/zxing/common/reedsolomon/ReedSolomonDecoder.cpp similarity index 68% rename from src/qzxing/zxing/zxing/common/reedsolomon/ReedSolomonDecoder.cpp rename to src/qzxing/zxing/common/reedsolomon/ReedSolomonDecoder.cpp index 20b7bff..1868db9 100644 --- a/src/qzxing/zxing/zxing/common/reedsolomon/ReedSolomonDecoder.cpp +++ b/src/qzxing/zxing/common/reedsolomon/ReedSolomonDecoder.cpp @@ -1,5 +1,7 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- /* + * ReedSolomonDecoder.cpp + * zxing + * * Created by Christian Brunschen on 05/05/2008. * Copyright 2008 Google UK. All rights reserved. * @@ -22,29 +24,39 @@ #include #include #include -#include -using std::vector; -using zxing::Ref; -using zxing::ArrayRef; -using zxing::ReedSolomonDecoder; -using zxing::GenericGFPoly; -using zxing::IllegalStateException; +using namespace std; -// VC++ -using zxing::GenericGF; +namespace zxing { -ReedSolomonDecoder::ReedSolomonDecoder(Ref field_) : field(field_) {} +ReedSolomonDecoder::ReedSolomonDecoder(Ref fld) : + field(fld) { +} ReedSolomonDecoder::~ReedSolomonDecoder() { } void ReedSolomonDecoder::decode(ArrayRef received, int twoS) { + Ref poly(new GenericGFPoly(field, received)); - ArrayRef syndromeCoefficients(twoS); + + +#ifdef DEBUG + cout << "decoding with poly " << *poly << "\n"; +#endif + + ArrayRef syndromeCoefficients(new Array (twoS)); + + +#ifdef DEBUG + cout << "syndromeCoefficients array = " << + syndromeCoefficients.array_ << "\n"; +#endif + + bool dataMatrix = (field.object_ == GenericGF::DATA_MATRIX_FIELD_256.object_); bool noError = true; for (int i = 0; i < twoS; i++) { - int eval = poly->evaluateAt(field->exp(i + field->getGeneratorBase())); + int eval = poly->evaluateAt(field->exp(dataMatrix ? i + 1 : i)); syndromeCoefficients[syndromeCoefficients->size() - 1 - i] = eval; if (eval != 0) { noError = false; @@ -53,18 +65,17 @@ void ReedSolomonDecoder::decode(ArrayRef received, int twoS) { if (noError) { return; } + Ref syndrome(new GenericGFPoly(field, syndromeCoefficients)); - vector > sigmaOmega = - runEuclideanAlgorithm(field->buildMonomial(twoS, 1), syndrome, twoS); - Ref sigma = sigmaOmega[0]; - Ref omega = sigmaOmega[1]; - ArrayRef errorLocations = findErrorLocations(sigma); - ArrayRef errorMagitudes = findErrorMagnitudes(omega, errorLocations); - for (int i = 0; i < errorLocations->size(); i++) { + Ref monomial = field->buildMonomial(twoS, 1); + vector > sigmaOmega = runEuclideanAlgorithm(monomial, syndrome, twoS); + ArrayRef errorLocations = findErrorLocations(sigmaOmega[0]); + ArrayRef errorMagitudes = findErrorMagnitudes(sigmaOmega[1], errorLocations, dataMatrix); + for (unsigned i = 0; i < errorLocations->size(); i++) { int position = received->size() - 1 - field->log(errorLocations[i]); - if (position < 0) { - throw ReedSolomonException("Bad error location"); - } + //TODO: check why the position would be invalid + if (position < 0 || (size_t)position >= received.size()) + throw IllegalArgumentException("Invalid position (ReedSolomonDecoder)"); received[position] = GenericGF::addOrSubtract(received[position], errorMagitudes[i]); } } @@ -81,23 +92,29 @@ vector > ReedSolomonDecoder::runEuclideanAlgorithm(Ref rLast(a); Ref r(b); + Ref sLast(field->getOne()); + Ref s(field->getZero()); Ref tLast(field->getZero()); Ref t(field->getOne()); + // Run Euclidean algorithm until r's degree is less than R/2 while (r->getDegree() >= R / 2) { Ref rLastLast(rLast); + Ref sLastLast(sLast); Ref tLastLast(tLast); rLast = r; + sLast = s; tLast = t; + // Divide rLastLast by rLast, with quotient q and remainder r if (rLast->isZero()) { // Oops, Euclidean algorithm already terminated? throw ReedSolomonException("r_{i-1} was zero"); } r = rLastLast; - Ref q = field->getZero(); + Ref q(field->getZero()); int denominatorLeadingTerm = rLast->getCoefficient(rLast->getDegree()); int dltInverse = field->inverse(denominatorLeadingTerm); while (r->getDegree() >= rLast->getDegree() && !r->isZero()) { @@ -107,11 +124,9 @@ vector > ReedSolomonDecoder::runEuclideanAlgorithm(RefaddOrSubtract(rLast->multiplyByMonomial(degreeDiff, scale)); } + s = q->multiply(sLast)->addOrSubtract(sLastLast); t = q->multiply(tLast)->addOrSubtract(tLastLast); - if (r->getDegree() >= rLast->getDegree()) { - throw IllegalStateException("Division algorithm failed to reduce polynomial?"); - } } int sigmaTildeAtZero = t->getCoefficient(0); @@ -122,6 +137,15 @@ vector > ReedSolomonDecoder::runEuclideanAlgorithm(Refinverse(sigmaTildeAtZero); Ref sigma(t->multiply(inverse)); Ref omega(r->multiply(inverse)); + + +#ifdef DEBUG + cout << "t = " << *t << "\n"; + cout << "r = " << *r << "\n"; + cout << "sigma = " << *sigma << "\n"; + cout << "omega = " << *omega << "\n"; +#endif + vector > result(2); result[0] = sigma; result[1] = omega; @@ -139,6 +163,7 @@ ArrayRef ReedSolomonDecoder::findErrorLocations(Ref errorLoc ArrayRef result(new Array(numErrors)); int e = 0; for (int i = 1; i < field->getSize() && e < numErrors; i++) { + // cout << "errorLocator(" << i << ") == " << errorLocator->evaluateAt(i) << "\n"; if (errorLocator->evaluateAt(i) == 0) { result[e] = field->inverse(i); e++; @@ -150,25 +175,25 @@ ArrayRef ReedSolomonDecoder::findErrorLocations(Ref errorLoc return result; } -ArrayRef ReedSolomonDecoder::findErrorMagnitudes(Ref errorEvaluator, ArrayRef errorLocations) { +ArrayRef ReedSolomonDecoder::findErrorMagnitudes(Ref errorEvaluator, ArrayRef errorLocations, bool dataMatrix) { // This is directly applying Forney's Formula - int s = errorLocations->size(); + int s = errorLocations.size(); ArrayRef result(new Array(s)); for (int i = 0; i < s; i++) { int xiInverse = field->inverse(errorLocations[i]); int denominator = 1; for (int j = 0; j < s; j++) { if (i != j) { - int term = field->multiply(errorLocations[j], xiInverse); - int termPlus1 = (term & 0x1) == 0 ? term | 1 : term & ~1; - denominator = field->multiply(denominator, termPlus1); + denominator = field->multiply(denominator, GenericGF::addOrSubtract(1, field->multiply(errorLocations[j], + xiInverse))); } } - result[i] = field->multiply(errorEvaluator->evaluateAt(xiInverse), - field->inverse(denominator)); - if (field->getGeneratorBase() != 0) { + result[i] = field->multiply(errorEvaluator->evaluateAt(xiInverse), field->inverse(denominator)); + + if (dataMatrix) { result[i] = field->multiply(result[i], xiInverse); - } + } } return result; } +} diff --git a/src/qzxing/zxing/zxing/common/reedsolomon/ReedSolomonDecoder.h b/src/qzxing/zxing/common/reedsolomon/ReedSolomonDecoder.h similarity index 93% rename from src/qzxing/zxing/zxing/common/reedsolomon/ReedSolomonDecoder.h rename to src/qzxing/zxing/common/reedsolomon/ReedSolomonDecoder.h index 8e16182..01eb9c0 100644 --- a/src/qzxing/zxing/zxing/common/reedsolomon/ReedSolomonDecoder.h +++ b/src/qzxing/zxing/common/reedsolomon/ReedSolomonDecoder.h @@ -38,11 +38,10 @@ public: ReedSolomonDecoder(Ref fld); ~ReedSolomonDecoder(); void decode(ArrayRef received, int twoS); - std::vector > runEuclideanAlgorithm(Ref a, Ref b, int R); - private: + std::vector > runEuclideanAlgorithm(Ref a, Ref b, int R); ArrayRef findErrorLocations(Ref errorLocator); - ArrayRef findErrorMagnitudes(Ref errorEvaluator, ArrayRef errorLocations); + ArrayRef findErrorMagnitudes(Ref errorEvaluator, ArrayRef errorLocations, bool dataMatrix); }; } diff --git a/src/qzxing/zxing/zxing/common/reedsolomon/ReedSolomonException.cpp b/src/qzxing/zxing/common/reedsolomon/ReedSolomonException.cpp similarity index 100% rename from src/qzxing/zxing/zxing/common/reedsolomon/ReedSolomonException.cpp rename to src/qzxing/zxing/common/reedsolomon/ReedSolomonException.cpp diff --git a/src/qzxing/zxing/zxing/common/reedsolomon/ReedSolomonException.h b/src/qzxing/zxing/common/reedsolomon/ReedSolomonException.h similarity index 100% rename from src/qzxing/zxing/zxing/common/reedsolomon/ReedSolomonException.h rename to src/qzxing/zxing/common/reedsolomon/ReedSolomonException.h diff --git a/src/qzxing/zxing/zxing/datamatrix/DataMatrixReader.cpp b/src/qzxing/zxing/datamatrix/DataMatrixReader.cpp similarity index 58% rename from src/qzxing/zxing/zxing/datamatrix/DataMatrixReader.cpp rename to src/qzxing/zxing/datamatrix/DataMatrixReader.cpp index 4a6ee9d..845253f 100644 --- a/src/qzxing/zxing/zxing/datamatrix/DataMatrixReader.cpp +++ b/src/qzxing/zxing/datamatrix/DataMatrixReader.cpp @@ -34,15 +34,45 @@ DataMatrixReader::DataMatrixReader() : Ref DataMatrixReader::decode(Ref image, DecodeHints hints) { (void)hints; - Detector detector(image->getBlackMatrix()); - Ref detectorResult(detector.detect()); - ArrayRef< Ref > points(detectorResult->getPoints()); +#ifdef DEBUG + cout << "decoding image " << image.object_ << ":\n" << flush; +#endif + Detector detector(image->getBlackMatrix()); + + +#ifdef DEBUG + cout << "(1) created detector " << &detector << "\n" << flush; +#endif + + Ref detectorResult(detector.detect()); +#ifdef DEBUG + cout << "(2) detected, have detectorResult " << detectorResult.object_ << "\n" << flush; +#endif + + std::vector > points(detectorResult->getPoints()); + + +#ifdef DEBUG + cout << "(3) extracted points " << &points << "\n" << flush; + cout << "found " << points.size() << " points:\n"; + for (size_t i = 0; i < points.size(); i++) { + cout << " " << points[i]->getX() << "," << points[i]->getY() << "\n"; + } + cout << "bits:\n"; + cout << *(detectorResult->getBits()) << "\n"; +#endif Ref decoderResult(decoder_.decode(detectorResult->getBits())); +#ifdef DEBUG + cout << "(4) decoded, have decoderResult " << decoderResult.object_ << "\n" << flush; +#endif Ref result( - new Result(decoderResult->getText(), decoderResult->getRawBytes(), points, BarcodeFormat::DATA_MATRIX)); + new Result(decoderResult->getText(), decoderResult->getRawBytes(), points, BarcodeFormat_DATA_MATRIX)); +#ifdef DEBUG + cout << "(5) created result " << result.object_ << ", returning\n" << flush; +#endif return result; } diff --git a/src/qzxing/zxing/zxing/datamatrix/DataMatrixReader.h b/src/qzxing/zxing/datamatrix/DataMatrixReader.h similarity index 100% rename from src/qzxing/zxing/zxing/datamatrix/DataMatrixReader.h rename to src/qzxing/zxing/datamatrix/DataMatrixReader.h diff --git a/src/qzxing/zxing/zxing/datamatrix/DataMatrixVersion.cpp b/src/qzxing/zxing/datamatrix/DataMatrixVersion.cpp similarity index 100% rename from src/qzxing/zxing/zxing/datamatrix/DataMatrixVersion.cpp rename to src/qzxing/zxing/datamatrix/DataMatrixVersion.cpp diff --git a/src/qzxing/zxing/zxing/datamatrix/Version.h b/src/qzxing/zxing/datamatrix/Version.h similarity index 100% rename from src/qzxing/zxing/zxing/datamatrix/Version.h rename to src/qzxing/zxing/datamatrix/Version.h diff --git a/src/qzxing/zxing/zxing/datamatrix/decoder/BitMatrixParser.h b/src/qzxing/zxing/datamatrix/decoder/BitMatrixParser.h similarity index 94% rename from src/qzxing/zxing/zxing/datamatrix/decoder/BitMatrixParser.h rename to src/qzxing/zxing/datamatrix/decoder/BitMatrixParser.h index 58fdd5f..0770da1 100644 --- a/src/qzxing/zxing/zxing/datamatrix/decoder/BitMatrixParser.h +++ b/src/qzxing/zxing/datamatrix/decoder/BitMatrixParser.h @@ -41,7 +41,7 @@ private: public: BitMatrixParser(Ref bitMatrix); Ref readVersion(Ref bitMatrix); - ArrayRef readCodewords(); + ArrayRef readCodewords(); bool readModule(int row, int column, int numRows, int numColumns); private: diff --git a/src/qzxing/zxing/zxing/datamatrix/decoder/DataBlock.h b/src/qzxing/zxing/datamatrix/decoder/DataBlock.h similarity index 77% rename from src/qzxing/zxing/zxing/datamatrix/decoder/DataBlock.h rename to src/qzxing/zxing/datamatrix/decoder/DataBlock.h index f6d8813..ed24549 100644 --- a/src/qzxing/zxing/zxing/datamatrix/decoder/DataBlock.h +++ b/src/qzxing/zxing/datamatrix/decoder/DataBlock.h @@ -32,15 +32,15 @@ namespace datamatrix { class DataBlock : public Counted { private: int numDataCodewords_; - ArrayRef codewords_; + ArrayRef codewords_; - DataBlock(int numDataCodewords, ArrayRef codewords); + DataBlock(int numDataCodewords, ArrayRef codewords); public: - static std::vector > getDataBlocks(ArrayRef rawCodewords, Version *version); + static std::vector > getDataBlocks(ArrayRef rawCodewords, Version *version); int getNumDataCodewords(); - ArrayRef getCodewords(); + ArrayRef getCodewords(); }; } diff --git a/src/qzxing/zxing/zxing/datamatrix/decoder/DataMatrixBitMatrixParser.cpp b/src/qzxing/zxing/datamatrix/decoder/DataMatrixBitMatrixParser.cpp similarity index 90% rename from src/qzxing/zxing/zxing/datamatrix/decoder/DataMatrixBitMatrixParser.cpp rename to src/qzxing/zxing/datamatrix/decoder/DataMatrixBitMatrixParser.cpp index 780e635..67c8de8 100644 --- a/src/qzxing/zxing/zxing/datamatrix/decoder/DataMatrixBitMatrixParser.cpp +++ b/src/qzxing/zxing/datamatrix/decoder/DataMatrixBitMatrixParser.cpp @@ -33,7 +33,7 @@ int BitMatrixParser::copyBit(size_t x, size_t y, int versionBits) { BitMatrixParser::BitMatrixParser(Ref bitMatrix) : bitMatrix_(NULL), parsedVersion_(NULL), readBitMatrix_(NULL) { - size_t dimension = bitMatrix->getHeight(); + size_t dimension = bitMatrix->getDimension(); if (dimension < 8 || dimension > 144 || (dimension & 0x01) != 0) throw ReaderException("Dimension must be even, > 8 < 144"); @@ -47,8 +47,8 @@ Ref BitMatrixParser::readVersion(Ref bitMatrix) { return parsedVersion_; } - int numRows = bitMatrix->getHeight(); - int numColumns = bitMatrix->getWidth(); + int numRows = bitMatrix->getHeight();//getDimension(); + int numColumns = bitMatrix->getWidth();//numRows; Ref version = parsedVersion_->getVersionForDimensions(numRows, numColumns); if (version != 0) { @@ -57,9 +57,9 @@ Ref BitMatrixParser::readVersion(Ref bitMatrix) { throw ReaderException("Couldn't decode version"); } -ArrayRef BitMatrixParser::readCodewords() { - ArrayRef result(parsedVersion_->getTotalCodewords()); - int resultOffset = 0; +ArrayRef BitMatrixParser::readCodewords() { + ArrayRef result(parsedVersion_->getTotalCodewords()); + int resultOffset = 0; int row = 4; int column = 0; @@ -75,22 +75,22 @@ ArrayRef BitMatrixParser::readCodewords() { do { // Check the four corner cases if ((row == numRows) && (column == 0) && !corner1Read) { - result[resultOffset++] = (char) readCorner1(numRows, numColumns); + result[resultOffset++] = (unsigned char) readCorner1(numRows, numColumns); row -= 2; column +=2; corner1Read = true; } else if ((row == numRows-2) && (column == 0) && ((numColumns & 0x03) != 0) && !corner2Read) { - result[resultOffset++] = (char) readCorner2(numRows, numColumns); + result[resultOffset++] = (unsigned char) readCorner2(numRows, numColumns); row -= 2; column +=2; corner2Read = true; } else if ((row == numRows+4) && (column == 2) && ((numColumns & 0x07) == 0) && !corner3Read) { - result[resultOffset++] = (char) readCorner3(numRows, numColumns); + result[resultOffset++] = (unsigned char) readCorner3(numRows, numColumns); row -= 2; column +=2; corner3Read = true; } else if ((row == numRows-2) && (column == 0) && ((numColumns & 0x07) == 4) && !corner4Read) { - result[resultOffset++] = (char) readCorner4(numRows, numColumns); + result[resultOffset++] = (unsigned char) readCorner4(numRows, numColumns); row -= 2; column +=2; corner4Read = true; @@ -98,7 +98,7 @@ ArrayRef BitMatrixParser::readCodewords() { // Sweep upward diagonally to the right do { if ((row < numRows) && (column >= 0) && !readBitMatrix_->get(column, row)) { - result[resultOffset++] = (char) readUtah(row, column, numRows, numColumns); + result[resultOffset++] = (unsigned char) readUtah(row, column, numRows, numColumns); } row -= 2; column +=2; @@ -109,7 +109,7 @@ ArrayRef BitMatrixParser::readCodewords() { // Sweep downward diagonally to the left do { if ((row >= 0) && (column < numColumns) && !readBitMatrix_->get(column, row)) { - result[resultOffset++] = (char) readUtah(row, column, numRows, numColumns); + result[resultOffset++] = (unsigned char) readUtah(row, column, numRows, numColumns); } row += 2; column -=2; diff --git a/src/qzxing/zxing/zxing/datamatrix/decoder/DataMatrixDataBlock.cpp b/src/qzxing/zxing/datamatrix/decoder/DataMatrixDataBlock.cpp similarity index 84% rename from src/qzxing/zxing/zxing/datamatrix/decoder/DataMatrixDataBlock.cpp rename to src/qzxing/zxing/datamatrix/decoder/DataMatrixDataBlock.cpp index d158a94..fee4e25 100644 --- a/src/qzxing/zxing/zxing/datamatrix/decoder/DataMatrixDataBlock.cpp +++ b/src/qzxing/zxing/datamatrix/decoder/DataMatrixDataBlock.cpp @@ -26,7 +26,7 @@ namespace datamatrix { using namespace std; -DataBlock::DataBlock(int numDataCodewords, ArrayRef codewords) : +DataBlock::DataBlock(int numDataCodewords, ArrayRef codewords) : numDataCodewords_(numDataCodewords), codewords_(codewords) { } @@ -34,11 +34,11 @@ int DataBlock::getNumDataCodewords() { return numDataCodewords_; } -ArrayRef DataBlock::getCodewords() { +ArrayRef DataBlock::getCodewords() { return codewords_; } -std::vector > DataBlock::getDataBlocks(ArrayRef rawCodewords, Version *version) { +std::vector > DataBlock::getDataBlocks(ArrayRef rawCodewords, Version *version) { // Figure out the number and size of data blocks used by this version and // error correction level ECBlocks* ecBlocks = version->getECBlocks(); @@ -58,7 +58,7 @@ std::vector > DataBlock::getDataBlocks(ArrayRef rawCodeword for (int i = 0; i < ecBlock->getCount(); i++) { int numDataCodewords = ecBlock->getDataCodewords(); int numBlockCodewords = ecBlocks->getECCodewords() + numDataCodewords; - ArrayRef buffer(numBlockCodewords); + ArrayRef buffer(numBlockCodewords); Ref blockRef(new DataBlock(numDataCodewords, buffer)); result[numResultBlocks++] = blockRef; } @@ -66,10 +66,10 @@ std::vector > DataBlock::getDataBlocks(ArrayRef rawCodeword // All blocks have the same amount of data, except that the last n // (where n may be 0) have 1 more byte. Figure out where these start. - int shorterBlocksTotalCodewords = result[0]->codewords_->size(); + int shorterBlocksTotalCodewords = result[0]->codewords_.size(); int longerBlocksStartAt = result.size() - 1; while (longerBlocksStartAt >= 0) { - int numCodewords = result[longerBlocksStartAt]->codewords_->size(); + int numCodewords = result[longerBlocksStartAt]->codewords_.size(); if (numCodewords == shorterBlocksTotalCodewords) { break; } @@ -94,7 +94,7 @@ std::vector > DataBlock::getDataBlocks(ArrayRef rawCodeword result[j]->codewords_[shorterBlocksNumDataCodewords] = rawCodewords[rawCodewordsOffset++]; } // Now add in error correction blocks - int max = result[0]->codewords_->size(); + int max = result[0]->codewords_.size(); for (int i = shorterBlocksNumDataCodewords; i < max; i++) { for (int j = 0; j < numResultBlocks; j++) { int iOffset = j < longerBlocksStartAt ? i : i + 1; @@ -102,7 +102,7 @@ std::vector > DataBlock::getDataBlocks(ArrayRef rawCodeword } } - if (rawCodewordsOffset != rawCodewords->size()) { + if ((size_t)rawCodewordsOffset != rawCodewords.size()) { throw IllegalArgumentException("rawCodewordsOffset != rawCodewords.length"); } diff --git a/src/qzxing/zxing/zxing/datamatrix/decoder/DataMatrixDecodedBitStreamParser.cpp b/src/qzxing/zxing/datamatrix/decoder/DataMatrixDecodedBitStreamParser.cpp similarity index 90% rename from src/qzxing/zxing/zxing/datamatrix/decoder/DataMatrixDecodedBitStreamParser.cpp rename to src/qzxing/zxing/datamatrix/decoder/DataMatrixDecodedBitStreamParser.cpp index acde469..3be36f2 100644 --- a/src/qzxing/zxing/zxing/datamatrix/decoder/DataMatrixDecodedBitStreamParser.cpp +++ b/src/qzxing/zxing/datamatrix/decoder/DataMatrixDecodedBitStreamParser.cpp @@ -1,4 +1,3 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- /* * DecodedBitStreamParser.cpp * zxing @@ -51,11 +50,11 @@ const char DecodedBitStreamParser::TEXT_SHIFT3_SET_CHARS[] = { 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '{', '|', '}', '~', (char) 127 }; -Ref DecodedBitStreamParser::decode(ArrayRef bytes) { +Ref DecodedBitStreamParser::decode(ArrayRef bytes) { Ref bits(new BitSource(bytes)); ostringstream result; ostringstream resultTrailer; - vector byteSegments; + vector byteSegments; int mode = ASCII_ENCODE; do { if (mode == ASCII_ENCODE) { @@ -87,7 +86,7 @@ Ref DecodedBitStreamParser::decode(ArrayRef bytes) { if (resultTrailer.str().size() > 0) { result << resultTrailer.str(); } - ArrayRef rawBytes(bytes); + ArrayRef rawBytes(bytes); Ref text(new String(result.str())); return Ref(new DecoderResult(rawBytes, text)); } @@ -142,7 +141,9 @@ int DecodedBitStreamParser::decodeAsciiSegment(Ref bits, ostringstrea // Ignore this symbol for now } else if (oneByte >= 242) { // Not to be used in ASCII encodation // ... but work around encoders that end with 254, latch back to ASCII - if (oneByte != 254 || bits->available() != 0) { + if (oneByte == 254 && bits->available() == 0) { + // Ignore + } else { throw FormatException("Not to be used in ASCII encodation"); } } @@ -156,7 +157,7 @@ void DecodedBitStreamParser::decodeC40Segment(Ref bits, ostringstream // TODO(bbrown): The Upper Shift with C40 doesn't work in the 4 value scenario all the time bool upperShift = false; - int cValues[3]; + int* cValues = new int[3]; int shift = 0; do { // If there is only one byte left then it will be encoded as ASCII @@ -233,7 +234,7 @@ void DecodedBitStreamParser::decodeTextSegment(Ref bits, ostringstrea // TODO(bbrown): The Upper Shift with Text doesn't work in the 4 value scenario all the time bool upperShift = false; - int cValues[3]; + int* cValues = new int[3]; int shift = 0; do { // If there is only one byte left then it will be encoded as ASCII @@ -309,7 +310,7 @@ void DecodedBitStreamParser::decodeAnsiX12Segment(Ref bits, ostringst // Three ANSI X12 values are encoded in a 16-bit value as // (1600 * C1) + (40 * C2) + C3 + 1 - int cValues[3]; + int* cValues = new int[3]; do { // If there is only one byte left then it will be encoded as ASCII if (bits->available() == 8) { @@ -343,7 +344,7 @@ void DecodedBitStreamParser::decodeAnsiX12Segment(Ref bits, ostringst } while (bits->available() > 0); } -void DecodedBitStreamParser::parseTwoBytes(int firstByte, int secondByte, int* result) { +void DecodedBitStreamParser::parseTwoBytes(int firstByte, int secondByte, int*& result) { int fullBitValue = (firstByte << 8) + secondByte - 1; int temp = fullBitValue / 1600; result[0] = temp; @@ -354,6 +355,7 @@ void DecodedBitStreamParser::parseTwoBytes(int firstByte, int secondByte, int* r } void DecodedBitStreamParser::decodeEdifactSegment(Ref bits, ostringstream & result) { + bool unlatch = false; do { // If there is only two or less bytes left then it will be encoded as ASCII if (bits->available() <= 16) { @@ -364,24 +366,23 @@ void DecodedBitStreamParser::decodeEdifactSegment(Ref bits, ostringst int edifactValue = bits->readBits(6); // Check for the unlatch character - if (edifactValue == 0x1f) { // 011111 - // Read rest of byte, which should be 0, and stop - int bitsLeft = 8 - bits->getBitOffset(); - if (bitsLeft != 8) { - bits->readBits(bitsLeft); - } - return; + if (edifactValue == 0x2B67) { // 011111 + unlatch = true; + // If we encounter the unlatch code then continue reading because the Codeword triple + // is padded with 0's } - if ((edifactValue & 0x20) == 0) { // no 1 in the leading (6th) bit - edifactValue |= 0x40; // Add a leading 01 to the 6 bit binary value + if (!unlatch) { + if ((edifactValue & 0x20) == 0) { // no 1 in the leading (6th) bit + edifactValue |= 0x40; // Add a leading 01 to the 6 bit binary value + } + result << (char)(edifactValue); } - result << (char)(edifactValue); } - } while (bits->available() > 0); + } while (!unlatch && bits->available() > 0); } -void DecodedBitStreamParser::decodeBase256Segment(Ref bits, ostringstream& result, vector byteSegments) { +void DecodedBitStreamParser::decodeBase256Segment(Ref bits, ostringstream& result, vector byteSegments) { // Figure out how long the Base 256 Segment is. int codewordPosition = 1 + bits->getByteOffset(); // position is 1-indexed int d1 = unrandomize255State(bits->readBits(8), codewordPosition++); @@ -399,7 +400,7 @@ void DecodedBitStreamParser::decodeBase256Segment(Ref bits, ostringst throw FormatException("NegativeArraySizeException"); } - char* bytes = new char[count]; + unsigned char* bytes = new unsigned char[count]; for (int i = 0; i < count; i++) { // Have seen this particular error in the wild, such as at // http://www.bcgen.com/demo/IDAutomationStreamingDataMatrix.aspx?MODE=3&D=Fred&PFMT=3&PT=F&X=0.3&O=0&LM=0.2 diff --git a/src/qzxing/zxing/zxing/datamatrix/decoder/DataMatrixDecoder.cpp b/src/qzxing/zxing/datamatrix/decoder/DataMatrixDecoder.cpp similarity index 78% rename from src/qzxing/zxing/zxing/datamatrix/decoder/DataMatrixDecoder.cpp rename to src/qzxing/zxing/datamatrix/decoder/DataMatrixDecoder.cpp index b7ecb97..34d7a9a 100644 --- a/src/qzxing/zxing/zxing/datamatrix/decoder/DataMatrixDecoder.cpp +++ b/src/qzxing/zxing/datamatrix/decoder/DataMatrixDecoder.cpp @@ -24,20 +24,19 @@ #include #include #include -#include #include -using zxing::Ref; -using zxing::DecoderResult; -using zxing::datamatrix::Decoder; +namespace zxing { +namespace datamatrix { -// VC++ -using zxing::ArrayRef; -using zxing::BitMatrix; +using namespace std; -Decoder::Decoder() : rsDecoder_(GenericGF::DATA_MATRIX_FIELD_256) {} +Decoder::Decoder() : + rsDecoder_(GenericGF::DATA_MATRIX_FIELD_256) { +} -void Decoder::correctErrors(ArrayRef codewordBytes, int numDataCodewords) { + +void Decoder::correctErrors(ArrayRef codewordBytes, int numDataCodewords) { int numCodewords = codewordBytes->size(); ArrayRef codewordInts(numCodewords); for (int i = 0; i < numCodewords; i++) { @@ -46,14 +45,14 @@ void Decoder::correctErrors(ArrayRef codewordBytes, int numDataCodewords) int numECCodewords = numCodewords - numDataCodewords; try { rsDecoder_.decode(codewordInts, numECCodewords); - } catch (ReedSolomonException const& ignored) { - (void)ignored; - throw ChecksumException(); + } catch (ReedSolomonException const& ex) { + ReaderException rex(ex.what()); + throw rex; } // Copy back into array of bytes -- only need to worry about the bytes that were data // We don't care about errors in the error-correction codewords for (int i = 0; i < numDataCodewords; i++) { - codewordBytes[i] = (char)codewordInts[i]; + codewordBytes[i] = (unsigned char)codewordInts[i]; } } @@ -63,7 +62,7 @@ Ref Decoder::decode(Ref bits) { Version *version = parser.readVersion(bits); // Read codewords - ArrayRef codewords(parser.readCodewords()); + ArrayRef codewords(parser.readCodewords()); // Separate into data blocks std::vector > dataBlocks = DataBlock::getDataBlocks(codewords, version); @@ -74,12 +73,12 @@ Ref Decoder::decode(Ref bits) { for (int i = 0; i < dataBlocksCount; i++) { totalBytes += dataBlocks[i]->getNumDataCodewords(); } - ArrayRef resultBytes(totalBytes); + ArrayRef resultBytes(totalBytes); // Error-correct and copy data blocks together into a stream of bytes for (int j = 0; j < dataBlocksCount; j++) { Ref dataBlock(dataBlocks[j]); - ArrayRef codewordBytes = dataBlock->getCodewords(); + ArrayRef codewordBytes = dataBlock->getCodewords(); int numDataCodewords = dataBlock->getNumDataCodewords(); correctErrors(codewordBytes, numDataCodewords); for (int i = 0; i < numDataCodewords; i++) { @@ -91,3 +90,5 @@ Ref Decoder::decode(Ref bits) { DecodedBitStreamParser decodedBSParser; return Ref (decodedBSParser.decode(resultBytes)); } +} +} diff --git a/src/qzxing/zxing/zxing/datamatrix/decoder/DecodedBitStreamParser.h b/src/qzxing/zxing/datamatrix/decoder/DecodedBitStreamParser.h similarity index 83% rename from src/qzxing/zxing/zxing/datamatrix/decoder/DecodedBitStreamParser.h rename to src/qzxing/zxing/datamatrix/decoder/DecodedBitStreamParser.h index 4d87c89..2a1b5f1 100644 --- a/src/qzxing/zxing/zxing/datamatrix/decoder/DecodedBitStreamParser.h +++ b/src/qzxing/zxing/datamatrix/decoder/DecodedBitStreamParser.h @@ -79,23 +79,23 @@ private: /** * See ISO 16022:2006, 5.2.9 and Annex B, B.2 */ - void decodeBase256Segment(Ref bits, std::ostringstream &result, std::vector byteSegments); + void decodeBase256Segment(Ref bits, std::ostringstream &result, std::vector byteSegments); - void parseTwoBytes(int firstByte, int secondByte, int* result); + void parseTwoBytes(int firstByte, int secondByte, int*& result); /** * See ISO 16022:2006, Annex B, B.2 */ - char unrandomize255State(int randomizedBase256Codeword, - int base256CodewordPosition) { + unsigned char unrandomize255State(int randomizedBase256Codeword, + int base256CodewordPosition) { int pseudoRandomNumber = ((149 * base256CodewordPosition) % 255) + 1; int tempVariable = randomizedBase256Codeword - pseudoRandomNumber; - return (char) (tempVariable >= 0 ? tempVariable : (tempVariable + 256)); + return (unsigned char) (tempVariable >= 0 ? tempVariable : (tempVariable + 256)); }; - void append(std::ostream &ost, const char *bufIn, size_t nIn, const char *src); + void append(std::ostream &ost, const unsigned char *bufIn, size_t nIn, const char *src); public: DecodedBitStreamParser() { }; - Ref decode(ArrayRef bytes); + Ref decode(ArrayRef bytes); }; } diff --git a/src/qzxing/zxing/zxing/datamatrix/decoder/Decoder.h b/src/qzxing/zxing/datamatrix/decoder/Decoder.h similarity index 90% rename from src/qzxing/zxing/zxing/datamatrix/decoder/Decoder.h rename to src/qzxing/zxing/datamatrix/decoder/Decoder.h index 501eee9..3569d6b 100644 --- a/src/qzxing/zxing/zxing/datamatrix/decoder/Decoder.h +++ b/src/qzxing/zxing/datamatrix/decoder/Decoder.h @@ -35,7 +35,7 @@ class Decoder { private: ReedSolomonDecoder rsDecoder_; - void correctErrors(ArrayRef bytes, int numDataCodewords); + void correctErrors(ArrayRef bytes, int numDataCodewords); public: Decoder(); diff --git a/src/qzxing/zxing/zxing/datamatrix/detector/CornerPoint.h b/src/qzxing/zxing/datamatrix/detector/CornerPoint.h similarity index 100% rename from src/qzxing/zxing/zxing/datamatrix/detector/CornerPoint.h rename to src/qzxing/zxing/datamatrix/detector/CornerPoint.h diff --git a/src/qzxing/zxing/zxing/datamatrix/detector/DataMatrixCornerPoint.cpp b/src/qzxing/zxing/datamatrix/detector/DataMatrixCornerPoint.cpp similarity index 100% rename from src/qzxing/zxing/zxing/datamatrix/detector/DataMatrixCornerPoint.cpp rename to src/qzxing/zxing/datamatrix/detector/DataMatrixCornerPoint.cpp diff --git a/src/qzxing/zxing/zxing/datamatrix/detector/DataMatrixDetector.cpp b/src/qzxing/zxing/datamatrix/detector/DataMatrixDetector.cpp similarity index 69% rename from src/qzxing/zxing/zxing/datamatrix/detector/DataMatrixDetector.cpp rename to src/qzxing/zxing/datamatrix/detector/DataMatrixDetector.cpp index 097039f..5e9b75e 100644 --- a/src/qzxing/zxing/zxing/datamatrix/detector/DataMatrixDetector.cpp +++ b/src/qzxing/zxing/datamatrix/detector/DataMatrixDetector.cpp @@ -19,33 +19,17 @@ * limitations under the License. */ -#include #include #include #include -#include -#include +#include #include #include -using std::abs; -using zxing::Ref; -using zxing::BitMatrix; -using zxing::ResultPoint; -using zxing::DetectorResult; -using zxing::PerspectiveTransform; -using zxing::NotFoundException; -using zxing::datamatrix::Detector; -using zxing::datamatrix::ResultPointsAndTransitions; -using zxing::common::detector::MathUtils; +namespace zxing { +namespace datamatrix { -namespace { - typedef std::map, int> PointMap; - void increment(PointMap& table, Ref const& key) { - int& value = table[key]; - value += 1; - } -} +using namespace std; ResultPointsAndTransitions::ResultPointsAndTransitions() { Ref ref(new ResultPoint(0, 0)); @@ -55,8 +39,8 @@ ResultPointsAndTransitions::ResultPointsAndTransitions() { } ResultPointsAndTransitions::ResultPointsAndTransitions(Ref from, Ref to, - int transitions) - : to_(to), from_(from), transitions_(transitions) { + int transitions) + : to_(to), from_(from), transitions_(transitions) { } Ref ResultPointsAndTransitions::getFrom() { @@ -72,7 +56,7 @@ int ResultPointsAndTransitions::getTransitions() { } Detector::Detector(Ref image) - : image_(image) { + : image_(image) { } Ref Detector::getImage() { @@ -102,37 +86,35 @@ Ref Detector::detect() { Ref lSideOne(transitions[0]); Ref lSideTwo(transitions[1]); - // Figure out which point is their intersection by tallying up the number of times we see the - // endpoints in the four endpoints. One will show up twice. - typedef std::map, int> PointMap; - PointMap pointCount; - increment(pointCount, lSideOne->getFrom()); - increment(pointCount, lSideOne->getTo()); - increment(pointCount, lSideTwo->getFrom()); - increment(pointCount, lSideTwo->getTo()); - // Figure out which point is their intersection by tallying up the number of times we see the // endpoints in the four endpoints. One will show up twice. Ref maybeTopLeft; Ref bottomLeft; Ref maybeBottomRight; - for (PointMap::const_iterator entry = pointCount.begin(), end = pointCount.end(); entry != end; ++entry) { - Ref const& point = entry->first; - int value = entry->second; - if (value == 2) { - bottomLeft = point; // this is definitely the bottom left, then -- end of two L sides - } else { - // Otherwise it's either top left or bottom right -- just assign the two arbitrarily now - if (maybeTopLeft == 0) { - maybeTopLeft = point; - } else { - maybeBottomRight = point; - } - } - } - - if (maybeTopLeft == 0 || bottomLeft == 0 || maybeBottomRight == 0) { - throw NotFoundException(); + if (lSideOne->getFrom()->equals(lSideOne->getTo())) { + bottomLeft = lSideOne->getFrom(); + maybeTopLeft = lSideTwo->getFrom(); + maybeBottomRight = lSideTwo->getTo(); + } else if (lSideOne->getFrom()->equals(lSideTwo->getFrom())) { + bottomLeft = lSideOne->getFrom(); + maybeTopLeft = lSideOne->getTo(); + maybeBottomRight = lSideTwo->getTo(); + } else if (lSideOne->getFrom()->equals(lSideTwo->getTo())) { + bottomLeft = lSideOne->getFrom(); + maybeTopLeft = lSideOne->getTo(); + maybeBottomRight = lSideTwo->getFrom(); + } else if (lSideOne->getTo()->equals(lSideTwo->getFrom())) { + bottomLeft = lSideOne->getTo(); + maybeTopLeft = lSideOne->getFrom(); + maybeBottomRight = lSideTwo->getTo(); + } else if (lSideOne->getTo()->equals(lSideTwo->getTo())) { + bottomLeft = lSideOne->getTo(); + maybeTopLeft = lSideOne->getFrom(); + maybeBottomRight = lSideTwo->getFrom(); + } else { + bottomLeft = lSideTwo->getFrom(); + maybeTopLeft = lSideOne->getTo(); + maybeBottomRight = lSideOne->getFrom(); } // Bottom left is correct but top left and bottom right might be switched @@ -154,10 +136,10 @@ Ref Detector::detect() { if (!(pointA->equals(bottomRight) || pointA->equals(bottomLeft) || pointA->equals(topLeft))) { topRight = pointA; } else if (!(pointB->equals(bottomRight) || pointB->equals(bottomLeft) - || pointB->equals(topLeft))) { + || pointB->equals(topLeft))) { topRight = pointB; } else if (!(pointC->equals(bottomRight) || pointC->equals(bottomLeft) - || pointC->equals(topLeft))) { + || pointC->equals(topLeft))) { topRight = pointC; } else { topRight = pointD; @@ -200,7 +182,7 @@ Ref Detector::detect() { if (4 * dimensionTop >= 7 * dimensionRight || 4 * dimensionRight >= 7 * dimensionTop) { // The matrix is rectangular correctedTopRight = correctTopRightRectangular(bottomLeft, bottomRight, topLeft, topRight, - dimensionTop, dimensionRight); + dimensionTop, dimensionRight); if (correctedTopRight == NULL) { correctedTopRight = topRight; } @@ -219,7 +201,7 @@ Ref Detector::detect() { } transform = createTransform(topLeft, correctedTopRight, bottomLeft, bottomRight, dimensionTop, - dimensionRight); + dimensionRight); bits = sampleGrid(image_, dimensionTop, dimensionRight, transform); } else { @@ -233,19 +215,19 @@ Ref Detector::detect() { } // Redetermine the dimension using the corrected top right point - int dimensionCorrected = std::max(transitionsBetween(topLeft, correctedTopRight)->getTransitions(), - transitionsBetween(bottomRight, correctedTopRight)->getTransitions()); + int dimensionCorrected = max(transitionsBetween(topLeft, correctedTopRight)->getTransitions(), + transitionsBetween(bottomRight, correctedTopRight)->getTransitions()); dimensionCorrected++; if ((dimensionCorrected & 0x01) == 1) { dimensionCorrected++; } transform = createTransform(topLeft, correctedTopRight, bottomLeft, bottomRight, - dimensionCorrected, dimensionCorrected); + dimensionCorrected, dimensionCorrected); bits = sampleGrid(image_, dimensionCorrected, dimensionCorrected, transform); } - ArrayRef< Ref > points (new Array< Ref >(4)); + std::vector > points(4); points[0].reset(topLeft); points[1].reset(bottomLeft); points[2].reset(correctedTopRight); @@ -259,8 +241,8 @@ Ref Detector::detect() { * for a rectangular matrix */ Ref Detector::correctTopRightRectangular(Ref bottomLeft, - Ref bottomRight, Ref topLeft, Ref topRight, - int dimensionTop, int dimensionRight) { + Ref bottomRight, Ref topLeft, Ref topRight, + int dimensionTop, int dimensionRight) { float corr = distance(bottomLeft, bottomRight) / (float) dimensionTop; int norm = distance(topLeft, topRight); @@ -268,7 +250,7 @@ Ref Detector::correctTopRightRectangular(Ref bottomLef float sin = (topRight->getY() - topLeft->getY()) / norm; Ref c1( - new ResultPoint(topRight->getX() + corr * cos, topRight->getY() + corr * sin)); + new ResultPoint(topRight->getX() + corr * cos, topRight->getY() + corr * sin)); corr = distance(bottomLeft, topLeft) / (float) dimensionRight; norm = distance(bottomRight, topRight); @@ -276,7 +258,7 @@ Ref Detector::correctTopRightRectangular(Ref bottomLef sin = (topRight->getY() - bottomRight->getY()) / norm; Ref c2( - new ResultPoint(topRight->getX() + corr * cos, topRight->getY() + corr * sin)); + new ResultPoint(topRight->getX() + corr * cos, topRight->getY() + corr * sin)); if (!isValid(c1)) { if (isValid(c2)) { @@ -289,9 +271,9 @@ Ref Detector::correctTopRightRectangular(Ref bottomLef } int l1 = abs(dimensionTop - transitionsBetween(topLeft, c1)->getTransitions()) - + abs(dimensionRight - transitionsBetween(bottomRight, c1)->getTransitions()); + + abs(dimensionRight - transitionsBetween(bottomRight, c1)->getTransitions()); int l2 = abs(dimensionTop - transitionsBetween(topLeft, c2)->getTransitions()) - + abs(dimensionRight - transitionsBetween(bottomRight, c2)->getTransitions()); + + abs(dimensionRight - transitionsBetween(bottomRight, c2)->getTransitions()); return l1 <= l2 ? c1 : c2; } @@ -301,8 +283,8 @@ Ref Detector::correctTopRightRectangular(Ref bottomLef * for a square matrix */ Ref Detector::correctTopRight(Ref bottomLeft, - Ref bottomRight, Ref topLeft, Ref topRight, - int dimension) { + Ref bottomRight, Ref topLeft, Ref topRight, + int dimension) { float corr = distance(bottomLeft, bottomRight) / (float) dimension; int norm = distance(topLeft, topRight); @@ -310,15 +292,15 @@ Ref Detector::correctTopRight(Ref bottomLeft, float sin = (topRight->getY() - topLeft->getY()) / norm; Ref c1( - new ResultPoint(topRight->getX() + corr * cos, topRight->getY() + corr * sin)); + new ResultPoint(topRight->getX() + corr * cos, topRight->getY() + corr * sin)); - corr = distance(bottomLeft, topLeft) / (float) dimension; + corr = distance(bottomLeft, bottomRight) / (float) dimension; norm = distance(bottomRight, topRight); cos = (topRight->getX() - bottomRight->getX()) / norm; sin = (topRight->getY() - bottomRight->getY()) / norm; Ref c2( - new ResultPoint(topRight->getX() + corr * cos, topRight->getY() + corr * sin)); + new ResultPoint(topRight->getX() + corr * cos, topRight->getY() + corr * sin)); if (!isValid(c1)) { if (isValid(c2)) { @@ -331,26 +313,30 @@ Ref Detector::correctTopRight(Ref bottomLeft, } int l1 = abs( - transitionsBetween(topLeft, c1)->getTransitions() - - transitionsBetween(bottomRight, c1)->getTransitions()); + transitionsBetween(topLeft, c1)->getTransitions() + - transitionsBetween(bottomRight, c1)->getTransitions()); int l2 = abs( - transitionsBetween(topLeft, c2)->getTransitions() - - transitionsBetween(bottomRight, c2)->getTransitions()); + transitionsBetween(topLeft, c2)->getTransitions() + - transitionsBetween(bottomRight, c2)->getTransitions()); return l1 <= l2 ? c1 : c2; } bool Detector::isValid(Ref p) { return p->getX() >= 0 && p->getX() < image_->getWidth() && p->getY() > 0 - && p->getY() < image_->getHeight(); + && p->getY() < image_->getHeight(); } +// L2 distance int Detector::distance(Ref a, Ref b) { - return MathUtils::round(ResultPoint::distance(a, b)); + return round( + (float) sqrt( + (double) (a->getX() - b->getX()) * (a->getX() - b->getX()) + + (a->getY() - b->getY()) * (a->getY() - b->getY()))); } Ref Detector::transitionsBetween(Ref from, - Ref to) { + Ref to) { // See QR Code Detector, sizeOfBlackWhiteBlackRun() int fromX = (int) from->getX(); int fromY = (int) from->getY(); @@ -393,32 +379,32 @@ Ref Detector::transitionsBetween(Ref fr } Ref Detector::createTransform(Ref topLeft, - Ref topRight, Ref bottomLeft, Ref bottomRight, - int dimensionX, int dimensionY) { + Ref topRight, Ref bottomLeft, Ref bottomRight, + int dimensionX, int dimensionY) { Ref transform( - PerspectiveTransform::quadrilateralToQuadrilateral( - 0.5f, - 0.5f, - dimensionX - 0.5f, - 0.5f, - dimensionX - 0.5f, - dimensionY - 0.5f, - 0.5f, - dimensionY - 0.5f, - topLeft->getX(), - topLeft->getY(), - topRight->getX(), - topRight->getY(), - bottomRight->getX(), - bottomRight->getY(), - bottomLeft->getX(), - bottomLeft->getY())); + PerspectiveTransform::quadrilateralToQuadrilateral( + 0.5f, + 0.5f, + dimensionX - 0.5f, + 0.5f, + dimensionX - 0.5f, + dimensionY - 0.5f, + 0.5f, + dimensionY - 0.5f, + topLeft->getX(), + topLeft->getY(), + topRight->getX(), + topRight->getY(), + bottomRight->getX(), + bottomRight->getY(), + bottomLeft->getX(), + bottomLeft->getY())); return transform; } Ref Detector::sampleGrid(Ref image, int dimensionX, int dimensionY, - Ref transform) { + Ref transform) { GridSampler &sampler = GridSampler::getInstance(); return sampler.sampleGrid(image, dimensionX, dimensionY, transform); } @@ -444,3 +430,5 @@ void Detector::insertionSort(std::vector > &vect int Detector::compare(Ref a, Ref b) { return a->getTransitions() - b->getTransitions(); } +} +} diff --git a/src/qzxing/zxing/zxing/datamatrix/detector/DataMatrixDetectorException.cpp b/src/qzxing/zxing/datamatrix/detector/DataMatrixDetectorException.cpp similarity index 100% rename from src/qzxing/zxing/zxing/datamatrix/detector/DataMatrixDetectorException.cpp rename to src/qzxing/zxing/datamatrix/detector/DataMatrixDetectorException.cpp diff --git a/src/qzxing/zxing/datamatrix/detector/DataMatrixMonochromeRectangleDetector.cpp b/src/qzxing/zxing/datamatrix/detector/DataMatrixMonochromeRectangleDetector.cpp new file mode 100644 index 0000000..67ed572 --- /dev/null +++ b/src/qzxing/zxing/datamatrix/detector/DataMatrixMonochromeRectangleDetector.cpp @@ -0,0 +1,172 @@ +/* + * MonochromeRectangleDetector.cpp + * zxing + * + * Created by Luiz Silva on 09/02/2010. + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include + +namespace zxing { +namespace datamatrix { + +std::vector > MonochromeRectangleDetector::detect() { + int height = image_->getHeight(); + int width = image_->getWidth(); + int halfHeight = height >> 1; + int halfWidth = width >> 1; + int deltaY = max(1, height / (MAX_MODULES << 3)); + int deltaX = max(1, width / (MAX_MODULES << 3)); + + int top = 0; + int bottom = height; + int left = 0; + int right = width; + Ref pointA(findCornerFromCenter(halfWidth, 0, left, right, + halfHeight, -deltaY, top, bottom, halfWidth >> 1)); + top = (int) pointA->getY() - 1; + Ref pointB(findCornerFromCenter(halfWidth, -deltaX, left, right, + halfHeight, 0, top, bottom, halfHeight >> 1)); + left = (int) pointB->getX() - 1; + Ref pointC(findCornerFromCenter(halfWidth, deltaX, left, right, + halfHeight, 0, top, bottom, halfHeight >> 1)); + right = (int) pointC->getX() + 1; + Ref pointD(findCornerFromCenter(halfWidth, 0, left, right, + halfHeight, deltaY, top, bottom, halfWidth >> 1)); + bottom = (int) pointD->getY() + 1; + + // Go try to find point A again with better information -- might have been off at first. + pointA.reset(findCornerFromCenter(halfWidth, 0, left, right, + halfHeight, -deltaY, top, bottom, halfWidth >> 2)); + std::vector > corners(4); + + corners[0].reset(pointA); + corners[1].reset(pointB); + corners[2].reset(pointC); + corners[3].reset(pointD); + return corners; + } + +Ref MonochromeRectangleDetector::findCornerFromCenter(int centerX, int deltaX, int left, int right, + int centerY, int deltaY, int top, int bottom, int maxWhiteRun) { + Ref lastRange(NULL); + for (int y = centerY, x = centerX; + y < bottom && y >= top && x < right && x >= left; + y += deltaY, x += deltaX) { + Ref range(NULL); + if (deltaX == 0) { + // horizontal slices, up and down + range = blackWhiteRange(y, maxWhiteRun, left, right, true); + } else { + // vertical slices, left and right + range = blackWhiteRange(x, maxWhiteRun, top, bottom, false); + } + if (range == NULL) { + if (lastRange == NULL) { + throw ReaderException("Couldn't find corners (lastRange = NULL) "); + } else { + // lastRange was found + if (deltaX == 0) { + int lastY = y - deltaY; + if (lastRange->start < centerX) { + if (lastRange->end > centerX) { + // straddle, choose one or the other based on direction + Ref result(new CornerPoint(deltaY > 0 ? lastRange->start : lastRange->end, lastY)); + return result; + } + Ref result(new CornerPoint(lastRange->start, lastY)); + return result; + } else { + Ref result(new CornerPoint(lastRange->end, lastY)); + return result; + } + } else { + int lastX = x - deltaX; + if (lastRange->start < centerY) { + if (lastRange->end > centerY) { + Ref result(new CornerPoint(lastX, deltaX < 0 ? lastRange->start : lastRange->end)); + return result; + } + Ref result(new CornerPoint(lastX, lastRange->start)); + return result; + } else { + Ref result(new CornerPoint(lastX, lastRange->end)); + return result; + } + } + } + } + lastRange = range; + } + throw ReaderException("Couldn't find corners"); + } + +Ref MonochromeRectangleDetector::blackWhiteRange(int fixedDimension, int maxWhiteRun, int minDim, int maxDim, + bool horizontal) { + + int center = (minDim + maxDim) >> 1; + + // Scan left/up first + int start = center; + while (start >= minDim) { + if (horizontal ? image_->get(start, fixedDimension) : image_->get(fixedDimension, start)) { + start--; + } else { + int whiteRunStart = start; + do { + start--; + } while (start >= minDim && !(horizontal ? image_->get(start, fixedDimension) : + image_->get(fixedDimension, start))); + int whiteRunSize = whiteRunStart - start; + if (start < minDim || whiteRunSize > maxWhiteRun) { + start = whiteRunStart; + break; + } + } + } + start++; + + // Then try right/down + int end = center; + while (end < maxDim) { + if (horizontal ? image_->get(end, fixedDimension) : image_->get(fixedDimension, end)) { + end++; + } else { + int whiteRunStart = end; + do { + end++; + } while (end < maxDim && !(horizontal ? image_->get(end, fixedDimension) : + image_->get(fixedDimension, end))); + int whiteRunSize = end - whiteRunStart; + if (end >= maxDim || whiteRunSize > maxWhiteRun) { + end = whiteRunStart; + break; + } + } + } + end--; + Ref result(NULL); + if (end > start) { + result = new TwoInts; + result->start = start; + result->end = end; + } + return result; + } +} +} diff --git a/src/qzxing/zxing/zxing/datamatrix/detector/Detector.h b/src/qzxing/zxing/datamatrix/detector/Detector.h similarity index 100% rename from src/qzxing/zxing/zxing/datamatrix/detector/Detector.h rename to src/qzxing/zxing/datamatrix/detector/Detector.h diff --git a/src/qzxing/zxing/zxing/datamatrix/detector/DetectorException.h b/src/qzxing/zxing/datamatrix/detector/DetectorException.h similarity index 100% rename from src/qzxing/zxing/zxing/datamatrix/detector/DetectorException.h rename to src/qzxing/zxing/datamatrix/detector/DetectorException.h diff --git a/src/qzxing/zxing/datamatrix/detector/MonochromeRectangleDetector.h b/src/qzxing/zxing/datamatrix/detector/MonochromeRectangleDetector.h new file mode 100644 index 0000000..43efb46 --- /dev/null +++ b/src/qzxing/zxing/datamatrix/detector/MonochromeRectangleDetector.h @@ -0,0 +1,61 @@ +#ifndef __MONOCHROMERECTANGLEDETECTOR_H__ +#define __MONOCHROMERECTANGLEDETECTOR_H__ + +/* + * MonochromeRectangleDetector.h + * zxing + * + * Created by Luiz Silva on 09/02/2010. + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include +#include +#include + +namespace zxing { +namespace datamatrix { + +struct TwoInts: public Counted { + int start; + int end; +}; + +class MonochromeRectangleDetector : public Counted { +private: + static const int MAX_MODULES = 32; + Ref image_; + +public: + MonochromeRectangleDetector(Ref image) : image_(image) { }; + + std::vector > detect(); + +private: + Ref findCornerFromCenter(int centerX, int deltaX, int left, int right, + int centerY, int deltaY, int top, int bottom, int maxWhiteRun); + + Ref blackWhiteRange(int fixedDimension, int maxWhiteRun, int minDim, int maxDim, + bool horizontal); + + int max(int a, float b) { return (float) a > b ? a : (int) b;}; +}; +} +} + +#endif // __MONOCHROMERECTANGLEDETECTOR_H__ diff --git a/src/qzxing/zxing/zxing/multi/ByQuadrantReader.cpp b/src/qzxing/zxing/multi/ByQuadrantReader.cpp similarity index 87% rename from src/qzxing/zxing/zxing/multi/ByQuadrantReader.cpp rename to src/qzxing/zxing/multi/ByQuadrantReader.cpp index db8933c..c031eef 100644 --- a/src/qzxing/zxing/zxing/multi/ByQuadrantReader.cpp +++ b/src/qzxing/zxing/multi/ByQuadrantReader.cpp @@ -36,32 +36,28 @@ Ref ByQuadrantReader::decode(Ref image, DecodeHints hints) Ref topLeft = image->crop(0, 0, halfWidth, halfHeight); try { return delegate_.decode(topLeft, hints); - } catch (ReaderException const& re) { - (void)re; + } catch (ReaderException& re) { // continue } Ref topRight = image->crop(halfWidth, 0, halfWidth, halfHeight); try { return delegate_.decode(topRight, hints); - } catch (ReaderException const& re) { - (void)re; + } catch (ReaderException& re) { // continue } Ref bottomLeft = image->crop(0, halfHeight, halfWidth, halfHeight); try { return delegate_.decode(bottomLeft, hints); - } catch (ReaderException const& re) { - (void)re; + } catch (ReaderException& re) { // continue } Ref bottomRight = image->crop(halfWidth, halfHeight, halfWidth, halfHeight); try { return delegate_.decode(bottomRight, hints); - } catch (ReaderException const& re) { - (void)re; + } catch (ReaderException& re) { // continue } diff --git a/src/qzxing/zxing/zxing/multi/ByQuadrantReader.h b/src/qzxing/zxing/multi/ByQuadrantReader.h similarity index 92% rename from src/qzxing/zxing/zxing/multi/ByQuadrantReader.h rename to src/qzxing/zxing/multi/ByQuadrantReader.h index 8d6fd63..0853a02 100644 --- a/src/qzxing/zxing/zxing/multi/ByQuadrantReader.h +++ b/src/qzxing/zxing/multi/ByQuadrantReader.h @@ -24,7 +24,6 @@ namespace zxing { namespace multi { - class ByQuadrantReader : public Reader { private: Reader& delegate_; @@ -35,8 +34,7 @@ class ByQuadrantReader : public Reader { virtual Ref decode(Ref image); virtual Ref decode(Ref image, DecodeHints hints); }; - -} -} +} // End zxing::multi namespace +} // End zxing namespace #endif // __BY_QUADRANT_READER_H__ diff --git a/src/qzxing/zxing/multi/GenericMultipleBarcodeReader.cpp b/src/qzxing/zxing/multi/GenericMultipleBarcodeReader.cpp new file mode 100644 index 0000000..b723852 --- /dev/null +++ b/src/qzxing/zxing/multi/GenericMultipleBarcodeReader.cpp @@ -0,0 +1,128 @@ +/* + * Copyright 2011 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include + +namespace zxing { +namespace multi { +GenericMultipleBarcodeReader::GenericMultipleBarcodeReader(Reader& delegate) : + delegate_(delegate) +{ +} + +GenericMultipleBarcodeReader::~GenericMultipleBarcodeReader(){} + +std::vector > GenericMultipleBarcodeReader::decodeMultiple( + Ref image, DecodeHints hints) +{ + std::vector > results; + doDecodeMultiple(image, hints, results, 0, 0); + if (results.empty()){ + throw ReaderException("No code detected"); + } + return results; +} + +void GenericMultipleBarcodeReader::doDecodeMultiple(Ref image, + DecodeHints hints, std::vector >& results, int xOffset, int yOffset) +{ + Ref result; + try { + result = delegate_.decode(image, hints); + } catch (ReaderException& re) { + return; + } + bool alreadyFound = false; + for (unsigned int i = 0; i < results.size(); i++) { + Ref existingResult = results[i]; + if (existingResult->getText()->getText() == result->getText()->getText()) { + alreadyFound = true; + break; + } + } + if (alreadyFound) { + return; + } + + results.push_back(translateResultPoints(result, xOffset, yOffset)); + const std::vector > resultPoints = result->getResultPoints(); + if (resultPoints.empty()) { + return; + } + + int width = image->getWidth(); + int height = image->getHeight(); + float minX = width; + float minY = height; + float maxX = 0.0f; + float maxY = 0.0f; + for (unsigned int i = 0; i < resultPoints.size(); i++) { + Ref point = resultPoints[i]; + float x = point->getX(); + float y = point->getY(); + if (x < minX) { + minX = x; + } + if (y < minY) { + minY = y; + } + if (x > maxX) { + maxX = x; + } + if (y > maxY) { + maxY = y; + } + } + + // Decode left of barcode + if (minX > MIN_DIMENSION_TO_RECUR) { + doDecodeMultiple(image->crop(0, 0, (int) minX, height), + hints, results, xOffset, yOffset); + } + // Decode above barcode + if (minY > MIN_DIMENSION_TO_RECUR) { + doDecodeMultiple(image->crop(0, 0, width, (int) minY), + hints, results, xOffset, yOffset); + } + // Decode right of barcode + if (maxX < width - MIN_DIMENSION_TO_RECUR) { + doDecodeMultiple(image->crop((int) maxX, 0, width - (int) maxX, height), + hints, results, xOffset + (int) maxX, yOffset); + } + // Decode below barcode + if (maxY < height - MIN_DIMENSION_TO_RECUR) { + doDecodeMultiple(image->crop(0, (int) maxY, width, height - (int) maxY), + hints, results, xOffset, yOffset + (int) maxY); + } +} + +Ref GenericMultipleBarcodeReader::translateResultPoints(Ref result, int xOffset, int yOffset){ + const std::vector > oldResultPoints = result->getResultPoints(); + if (oldResultPoints.empty()) { + return result; + } + std::vector > newResultPoints; + for (unsigned int i = 0; i < oldResultPoints.size(); i++) { + Ref oldPoint = oldResultPoints[i]; + newResultPoints.push_back(Ref(new ResultPoint(oldPoint->getX() + xOffset, oldPoint->getY() + yOffset))); + } + return Ref(new Result(result->getText(), result->getRawBytes(), newResultPoints, result->getBarcodeFormat())); +} + +} // End zxing::multi namespace +} // End zxing namespace diff --git a/src/qzxing/zxing/zxing/multi/GenericMultipleBarcodeReader.h b/src/qzxing/zxing/multi/GenericMultipleBarcodeReader.h similarity index 51% rename from src/qzxing/zxing/zxing/multi/GenericMultipleBarcodeReader.h rename to src/qzxing/zxing/multi/GenericMultipleBarcodeReader.h index bfdcd05..10defcb 100644 --- a/src/qzxing/zxing/zxing/multi/GenericMultipleBarcodeReader.h +++ b/src/qzxing/zxing/multi/GenericMultipleBarcodeReader.h @@ -1,4 +1,3 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- #ifndef __GENERIC_MULTIPLE_BARCODE_READER_H__ #define __GENERIC_MULTIPLE_BARCODE_READER_H__ @@ -23,29 +22,26 @@ namespace zxing { namespace multi { - class GenericMultipleBarcodeReader : public MultipleBarcodeReader { - private: - static Ref translateResultPoints(Ref result, - int xOffset, - int yOffset); - void doDecodeMultiple(Ref image, - DecodeHints hints, - std::vector >& results, - int xOffset, - int yOffset, - int currentDepth); - Reader& delegate_; - static const int MIN_DIMENSION_TO_RECUR = 100; - static const int MAX_DEPTH = 4; + private: + static Ref translateResultPoints(Ref result, + int xOffset, + int yOffset); + void doDecodeMultiple(Ref image, + DecodeHints hints, + std::vector >& results, + int xOffset, + int yOffset); + Reader& delegate_; + static const int MIN_DIMENSION_TO_RECUR = 100; - public: - GenericMultipleBarcodeReader(Reader& delegate); - virtual ~GenericMultipleBarcodeReader(); - virtual std::vector > decodeMultiple(Ref image, DecodeHints hints); + public: + GenericMultipleBarcodeReader(Reader& delegate); + virtual ~GenericMultipleBarcodeReader(); + virtual std::vector > decodeMultiple(Ref image, + DecodeHints hints); }; - -} -} +} // End zxing::multi namespace +} // End zxing namespace #endif // __GENERIC_MULTIPLE_BARCODE_READER_H__ diff --git a/src/qzxing/zxing/zxing/multi/MultipleBarcodeReader.cpp b/src/qzxing/zxing/multi/MultipleBarcodeReader.cpp similarity index 100% rename from src/qzxing/zxing/zxing/multi/MultipleBarcodeReader.cpp rename to src/qzxing/zxing/multi/MultipleBarcodeReader.cpp diff --git a/src/qzxing/zxing/zxing/multi/MultipleBarcodeReader.h b/src/qzxing/zxing/multi/MultipleBarcodeReader.h similarity index 92% rename from src/qzxing/zxing/zxing/multi/MultipleBarcodeReader.h rename to src/qzxing/zxing/multi/MultipleBarcodeReader.h index a603411..4f54c67 100644 --- a/src/qzxing/zxing/zxing/multi/MultipleBarcodeReader.h +++ b/src/qzxing/zxing/multi/MultipleBarcodeReader.h @@ -25,7 +25,6 @@ namespace zxing { namespace multi { - class MultipleBarcodeReader : public Counted { protected: MultipleBarcodeReader() {} @@ -34,8 +33,7 @@ class MultipleBarcodeReader : public Counted { virtual std::vector > decodeMultiple(Ref image, DecodeHints hints) = 0; virtual ~MultipleBarcodeReader(); }; - -} -} +} // End zxing::multi namespace +} // End zxing namespace #endif // __MULTIPLE_BARCODE_READER_H__ diff --git a/src/qzxing/zxing/zxing/multi/qrcode/QRCodeMultiReader.cpp b/src/qzxing/zxing/multi/qrcode/QRCodeMultiReader.cpp similarity index 88% rename from src/qzxing/zxing/zxing/multi/qrcode/QRCodeMultiReader.cpp rename to src/qzxing/zxing/multi/qrcode/QRCodeMultiReader.cpp index d9c55fe..06d151f 100644 --- a/src/qzxing/zxing/zxing/multi/qrcode/QRCodeMultiReader.cpp +++ b/src/qzxing/zxing/multi/qrcode/QRCodeMultiReader.cpp @@ -36,16 +36,15 @@ std::vector > QRCodeMultiReader::decodeMultiple(Ref im for (unsigned int i = 0; i < detectorResult.size(); i++) { try { Ref decoderResult = getDecoder().decode(detectorResult[i]->getBits()); - ArrayRef< Ref > points = detectorResult[i]->getPoints(); + std::vector > points = detectorResult[i]->getPoints(); Ref result = Ref(new Result(decoderResult->getText(), decoderResult->getRawBytes(), - points, BarcodeFormat::QR_CODE)); + points, BarcodeFormat_QR_CODE)); // result->putMetadata(ResultMetadataType.BYTE_SEGMENTS, decoderResult->getByteSegments()); // result->putMetadata(ResultMetadataType.ERROR_CORRECTION_LEVEL, decoderResult->getECLevel().toString()); results.push_back(result); - } catch (ReaderException const& re) { - (void)re; - // ignore and continue + } catch (ReaderException& re) { + // ignore and continue } } if (results.empty()){ diff --git a/src/qzxing/zxing/zxing/multi/qrcode/QRCodeMultiReader.h b/src/qzxing/zxing/multi/qrcode/QRCodeMultiReader.h similarity index 92% rename from src/qzxing/zxing/zxing/multi/qrcode/QRCodeMultiReader.h rename to src/qzxing/zxing/multi/qrcode/QRCodeMultiReader.h index fd9b01a..050bc1b 100644 --- a/src/qzxing/zxing/zxing/multi/qrcode/QRCodeMultiReader.h +++ b/src/qzxing/zxing/multi/qrcode/QRCodeMultiReader.h @@ -22,15 +22,13 @@ namespace zxing { namespace multi { - class QRCodeMultiReader: public zxing::qrcode::QRCodeReader, public MultipleBarcodeReader { public: QRCodeMultiReader(); virtual ~QRCodeMultiReader(); virtual std::vector > decodeMultiple(Ref image, DecodeHints hints); }; - -} -} +} // End zxing::multi namespace +} // End zxing namespace #endif // __QRCODE_MULTI_READER_H__ diff --git a/src/qzxing/zxing/zxing/multi/qrcode/detector/MultiDetector.cpp b/src/qzxing/zxing/multi/qrcode/detector/MultiDetector.cpp similarity index 93% rename from src/qzxing/zxing/zxing/multi/qrcode/detector/MultiDetector.cpp rename to src/qzxing/zxing/multi/qrcode/detector/MultiDetector.cpp index 2262421..481a106 100644 --- a/src/qzxing/zxing/zxing/multi/qrcode/detector/MultiDetector.cpp +++ b/src/qzxing/zxing/multi/qrcode/detector/MultiDetector.cpp @@ -34,8 +34,7 @@ std::vector > MultiDetector::detectMulti(DecodeHints hints){ for(unsigned int i = 0; i < info.size(); i++){ try{ result.push_back(processFinderPatternInfo(info[i])); - } catch (ReaderException const& e){ - (void)e; + } catch (ReaderException& e){ // ignore } } diff --git a/src/qzxing/zxing/zxing/multi/qrcode/detector/MultiDetector.h b/src/qzxing/zxing/multi/qrcode/detector/MultiDetector.h similarity index 92% rename from src/qzxing/zxing/zxing/multi/qrcode/detector/MultiDetector.h rename to src/qzxing/zxing/multi/qrcode/detector/MultiDetector.h index f3dfc5a..618a1e7 100644 --- a/src/qzxing/zxing/zxing/multi/qrcode/detector/MultiDetector.h +++ b/src/qzxing/zxing/multi/qrcode/detector/MultiDetector.h @@ -23,15 +23,13 @@ namespace zxing { namespace multi { - class MultiDetector : public zxing::qrcode::Detector { public: MultiDetector(Ref image); virtual ~MultiDetector(); virtual std::vector > detectMulti(DecodeHints hints); }; - -} -} +} // End zxing::multi namespace +} // End zxing namespace #endif // __MULTI_DETECTOR_H__ diff --git a/src/qzxing/zxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.cpp b/src/qzxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.cpp similarity index 69% rename from src/qzxing/zxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.cpp rename to src/qzxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.cpp index 4f86e1c..43bc693 100644 --- a/src/qzxing/zxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.cpp +++ b/src/qzxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.cpp @@ -1,4 +1,3 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- /* * Copyright 2011 ZXing authors * @@ -15,52 +14,37 @@ * limitations under the License. */ -#include #include +#include +#include #include #include #include -using std::abs; -using std::min; -using std::sort; -using std::vector; -using zxing::Ref; -using zxing::BitMatrix; -using zxing::ReaderException; -using zxing::qrcode::FinderPattern; -using zxing::qrcode::FinderPatternInfo; -using zxing::multi::MultiFinderPatternFinder; - -// VC++ - -using zxing::BitMatrix; -using zxing::ResultPointCallback; -using zxing::DecodeHints; +namespace zxing{ +namespace multi { +using namespace zxing::qrcode; const float MultiFinderPatternFinder::MAX_MODULE_COUNT_PER_EDGE = 180; const float MultiFinderPatternFinder::MIN_MODULE_COUNT_PER_EDGE = 9; const float MultiFinderPatternFinder::DIFF_MODSIZE_CUTOFF_PERCENT = 0.05f; const float MultiFinderPatternFinder::DIFF_MODSIZE_CUTOFF = 0.5f; -namespace { - bool compareModuleSize(Ref a, Ref b){ - float value = a->getEstimatedModuleSize() - b->getEstimatedModuleSize(); - return value < 0.0; + float value = a->getEstimatedModuleSize() - b->getEstimatedModuleSize(); + return value < 0.0; } -} MultiFinderPatternFinder::MultiFinderPatternFinder(Ref image, - Ref resultPointCallback) - : FinderPatternFinder(image, resultPointCallback) + Ref resultPointCallback) : + FinderPatternFinder(image, resultPointCallback) { } MultiFinderPatternFinder::~MultiFinderPatternFinder(){} -vector > MultiFinderPatternFinder::findMulti(DecodeHints const& hints){ +std::vector > MultiFinderPatternFinder::findMulti(DecodeHints const& hints){ bool tryHarder = hints.getTryHarder(); Ref image = image_; // Protected member int maxI = image->getHeight(); @@ -96,7 +80,14 @@ vector > MultiFinderPatternFinder::findMulti(DecodeHints } else { // White pixel if ((currentState & 1) == 0) { // Counting black pixels if (currentState == 4) { // A winner? - if (foundPatternCross(stateCount) && handlePossibleCenter(stateCount, i, j)) { // Yes + if (foundPatternCross(stateCount)) { // Yes + bool confirmed = handlePossibleCenter(stateCount, i, j); + if (!confirmed) { + do { // Advance to next black pixel + j++; + } while (j < maxJ && !image->get(j, i)); + j--; // back up to that last white pixel + } // Clear state to start looking again currentState = 0; stateCount[0] = 0; @@ -116,7 +107,7 @@ vector > MultiFinderPatternFinder::findMulti(DecodeHints stateCount[++currentState]++; } } else { // Counting white pixels - stateCount[currentState]++; + stateCount[currentState]++; } } } // for j=... @@ -125,18 +116,18 @@ vector > MultiFinderPatternFinder::findMulti(DecodeHints handlePossibleCenter(stateCount, i, maxJ); } // end if foundPatternCross } // for i=iSkip-1 ... - vector > > patternInfo = selectBestPatterns(); - vector > result; + std::vector > > patternInfo = selectBestPatterns(); + std::vector > result; for (unsigned int i = 0; i < patternInfo.size(); i++) { - vector > pattern = patternInfo[i]; - pattern = FinderPatternFinder::orderBestPatterns(pattern); + std::vector > pattern = patternInfo[i]; + FinderPatternFinder::orderBestPatterns(pattern); result.push_back(Ref(new FinderPatternInfo(pattern))); } return result; } -vector > > MultiFinderPatternFinder::selectBestPatterns(){ - vector > possibleCenters = possibleCenters_; +std::vector > > MultiFinderPatternFinder::selectBestPatterns(){ + std::vector > possibleCenters = possibleCenters_; int size = possibleCenters.size(); @@ -145,11 +136,11 @@ vector > > MultiFinderPatternFinder::selectBestPattern throw ReaderException("No code detected"); } - vector > > results; + std::vector > > results; /* - * Begin HE modifications to safely detect multiple codes of equal size - */ + * Begin HE modifications to safely detect multiple codes of equal size + */ if (size == 3) { results.push_back(possibleCenters_); return results; @@ -157,29 +148,29 @@ vector > > MultiFinderPatternFinder::selectBestPattern // Sort by estimated module size to speed up the upcoming checks //TODO do a sort based on module size - sort(possibleCenters.begin(), possibleCenters.end(), compareModuleSize); + std::sort(possibleCenters.begin(), possibleCenters.end(), compareModuleSize); /* - * Now lets start: build a list of tuples of three finder locations that - * - feature similar module sizes - * - are placed in a distance so the estimated module count is within the QR specification - * - have similar distance between upper left/right and left top/bottom finder patterns - * - form a triangle with 90° angle (checked by comparing top right/bottom left distance - * with pythagoras) - * - * Note: we allow each point to be used for more than one code region: this might seem - * counterintuitive at first, but the performance penalty is not that big. At this point, - * we cannot make a good quality decision whether the three finders actually represent - * a QR code, or are just by chance layouted so it looks like there might be a QR code there. - * So, if the layout seems right, lets have the decoder try to decode. - */ + * Now lets start: build a list of tuples of three finder locations that + * - feature similar module sizes + * - are placed in a distance so the estimated module count is within the QR specification + * - have similar distance between upper left/right and left top/bottom finder patterns + * - form a triangle with 90° angle (checked by comparing top right/bottom left distance + * with pythagoras) + * + * Note: we allow each point to be used for more than one code region: this might seem + * counterintuitive at first, but the performance penalty is not that big. At this point, + * we cannot make a good quality decision whether the three finders actually represent + * a QR code, or are just by chance layouted so it looks like there might be a QR code there. + * So, if the layout seems right, lets have the decoder try to decode. + */ for (int i1 = 0; i1 < (size - 2); i1++) { Ref p1 = possibleCenters[i1]; for (int i2 = i1 + 1; i2 < (size - 1); i2++) { Ref p2 = possibleCenters[i2]; // Compare the expected module sizes; if they are really off, skip - float vModSize12 = (p1->getEstimatedModuleSize() - p2->getEstimatedModuleSize()) / min(p1->getEstimatedModuleSize(), p2->getEstimatedModuleSize()); + float vModSize12 = (p1->getEstimatedModuleSize() - p2->getEstimatedModuleSize()) / std::min(p1->getEstimatedModuleSize(), p2->getEstimatedModuleSize()); float vModSize12A = abs(p1->getEstimatedModuleSize() - p2->getEstimatedModuleSize()); if (vModSize12A > DIFF_MODSIZE_CUTOFF && vModSize12 >= DIFF_MODSIZE_CUTOFF_PERCENT) { // break, since elements are ordered by the module size deviation there cannot be @@ -189,18 +180,18 @@ vector > > MultiFinderPatternFinder::selectBestPattern for (int i3 = i2 + 1; i3 < size; i3++) { Ref p3 = possibleCenters[i3]; // Compare the expected module sizes; if they are really off, skip - float vModSize23 = (p2->getEstimatedModuleSize() - p3->getEstimatedModuleSize()) / min(p2->getEstimatedModuleSize(), p3->getEstimatedModuleSize()); + float vModSize23 = (p2->getEstimatedModuleSize() - p3->getEstimatedModuleSize()) / std::min(p2->getEstimatedModuleSize(), p3->getEstimatedModuleSize()); float vModSize23A = abs(p2->getEstimatedModuleSize() - p3->getEstimatedModuleSize()); if (vModSize23A > DIFF_MODSIZE_CUTOFF && vModSize23 >= DIFF_MODSIZE_CUTOFF_PERCENT) { // break, since elements are ordered by the module size deviation there cannot be // any more interesting elements for the given p1. break; } - vector > test; + std::vector > test; test.push_back(p1); test.push_back(p2); test.push_back(p3); - test = FinderPatternFinder::orderBestPatterns(test); + FinderPatternFinder::orderBestPatterns(test); // Calculate the distances: a = topleft-bottomleft, b=topleft-topright, c = diagonal Ref info = Ref(new FinderPatternInfo(test)); float dA = FinderPatternFinder::distance(info->getTopLeft(), info->getBottomLeft()); @@ -212,14 +203,14 @@ vector > > MultiFinderPatternFinder::selectBestPattern continue; } // Calculate the difference of the edge lengths in percent - float vABBC = abs((dA - dB) / min(dA, dB)); + float vABBC = abs((dA - dB) / std::min(dA, dB)); if (vABBC >= 0.1f) { continue; } // Calculate the diagonal length by assuming a 90° angle at topleft float dCpy = (float) sqrt(dA * dA + dB * dB); // Compare to the real distance in % - float vPyC = abs((dC - dCpy) / min(dC, dCpy)); + float vPyC = abs((dC - dCpy) / std::min(dC, dCpy)); if (vPyC >= 0.1f) { continue; } @@ -234,3 +225,6 @@ vector > > MultiFinderPatternFinder::selectBestPattern } return results; } + +} // End zxing::multi namespace +} // End zxing namespace diff --git a/src/qzxing/zxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.h b/src/qzxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.h similarity index 96% rename from src/qzxing/zxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.h rename to src/qzxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.h index 57a64cb..2aeb3f6 100644 --- a/src/qzxing/zxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.h +++ b/src/qzxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.h @@ -23,7 +23,6 @@ namespace zxing { namespace multi { - class MultiFinderPatternFinder : zxing::qrcode::FinderPatternFinder { private: std::vector > > selectBestPatterns(); @@ -40,7 +39,6 @@ class MultiFinderPatternFinder : zxing::qrcode::FinderPatternFinder { }; - } } diff --git a/src/qzxing/zxing/oned/Code128Reader.cpp b/src/qzxing/zxing/oned/Code128Reader.cpp new file mode 100644 index 0000000..171f0e9 --- /dev/null +++ b/src/qzxing/zxing/oned/Code128Reader.cpp @@ -0,0 +1,490 @@ +// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- +/* + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "Code128Reader.h" +#include +#include +#include +#include +#include +#include + +namespace zxing { + namespace oned { + + const int CODE_PATTERNS_LENGTH = 107; + const int countersLength = 6; + static const int CODE_PATTERNS[CODE_PATTERNS_LENGTH][countersLength] = { + {2, 1, 2, 2, 2, 2}, /* 0 */ + {2, 2, 2, 1, 2, 2}, + {2, 2, 2, 2, 2, 1}, + {1, 2, 1, 2, 2, 3}, + {1, 2, 1, 3, 2, 2}, + {1, 3, 1, 2, 2, 2}, /* 5 */ + {1, 2, 2, 2, 1, 3}, + {1, 2, 2, 3, 1, 2}, + {1, 3, 2, 2, 1, 2}, + {2, 2, 1, 2, 1, 3}, + {2, 2, 1, 3, 1, 2}, /* 10 */ + {2, 3, 1, 2, 1, 2}, + {1, 1, 2, 2, 3, 2}, + {1, 2, 2, 1, 3, 2}, + {1, 2, 2, 2, 3, 1}, + {1, 1, 3, 2, 2, 2}, /* 15 */ + {1, 2, 3, 1, 2, 2}, + {1, 2, 3, 2, 2, 1}, + {2, 2, 3, 2, 1, 1}, + {2, 2, 1, 1, 3, 2}, + {2, 2, 1, 2, 3, 1}, /* 20 */ + {2, 1, 3, 2, 1, 2}, + {2, 2, 3, 1, 1, 2}, + {3, 1, 2, 1, 3, 1}, + {3, 1, 1, 2, 2, 2}, + {3, 2, 1, 1, 2, 2}, /* 25 */ + {3, 2, 1, 2, 2, 1}, + {3, 1, 2, 2, 1, 2}, + {3, 2, 2, 1, 1, 2}, + {3, 2, 2, 2, 1, 1}, + {2, 1, 2, 1, 2, 3}, /* 30 */ + {2, 1, 2, 3, 2, 1}, + {2, 3, 2, 1, 2, 1}, + {1, 1, 1, 3, 2, 3}, + {1, 3, 1, 1, 2, 3}, + {1, 3, 1, 3, 2, 1}, /* 35 */ + {1, 1, 2, 3, 1, 3}, + {1, 3, 2, 1, 1, 3}, + {1, 3, 2, 3, 1, 1}, + {2, 1, 1, 3, 1, 3}, + {2, 3, 1, 1, 1, 3}, /* 40 */ + {2, 3, 1, 3, 1, 1}, + {1, 1, 2, 1, 3, 3}, + {1, 1, 2, 3, 3, 1}, + {1, 3, 2, 1, 3, 1}, + {1, 1, 3, 1, 2, 3}, /* 45 */ + {1, 1, 3, 3, 2, 1}, + {1, 3, 3, 1, 2, 1}, + {3, 1, 3, 1, 2, 1}, + {2, 1, 1, 3, 3, 1}, + {2, 3, 1, 1, 3, 1}, /* 50 */ + {2, 1, 3, 1, 1, 3}, + {2, 1, 3, 3, 1, 1}, + {2, 1, 3, 1, 3, 1}, + {3, 1, 1, 1, 2, 3}, + {3, 1, 1, 3, 2, 1}, /* 55 */ + {3, 3, 1, 1, 2, 1}, + {3, 1, 2, 1, 1, 3}, + {3, 1, 2, 3, 1, 1}, + {3, 3, 2, 1, 1, 1}, + {3, 1, 4, 1, 1, 1}, /* 60 */ + {2, 2, 1, 4, 1, 1}, + {4, 3, 1, 1, 1, 1}, + {1, 1, 1, 2, 2, 4}, + {1, 1, 1, 4, 2, 2}, + {1, 2, 1, 1, 2, 4}, /* 65 */ + {1, 2, 1, 4, 2, 1}, + {1, 4, 1, 1, 2, 2}, + {1, 4, 1, 2, 2, 1}, + {1, 1, 2, 2, 1, 4}, + {1, 1, 2, 4, 1, 2}, /* 70 */ + {1, 2, 2, 1, 1, 4}, + {1, 2, 2, 4, 1, 1}, + {1, 4, 2, 1, 1, 2}, + {1, 4, 2, 2, 1, 1}, + {2, 4, 1, 2, 1, 1}, /* 75 */ + {2, 2, 1, 1, 1, 4}, + {4, 1, 3, 1, 1, 1}, + {2, 4, 1, 1, 1, 2}, + {1, 3, 4, 1, 1, 1}, + {1, 1, 1, 2, 4, 2}, /* 80 */ + {1, 2, 1, 1, 4, 2}, + {1, 2, 1, 2, 4, 1}, + {1, 1, 4, 2, 1, 2}, + {1, 2, 4, 1, 1, 2}, + {1, 2, 4, 2, 1, 1}, /* 85 */ + {4, 1, 1, 2, 1, 2}, + {4, 2, 1, 1, 1, 2}, + {4, 2, 1, 2, 1, 1}, + {2, 1, 2, 1, 4, 1}, + {2, 1, 4, 1, 2, 1}, /* 90 */ + {4, 1, 2, 1, 2, 1}, + {1, 1, 1, 1, 4, 3}, + {1, 1, 1, 3, 4, 1}, + {1, 3, 1, 1, 4, 1}, + {1, 1, 4, 1, 1, 3}, /* 95 */ + {1, 1, 4, 3, 1, 1}, + {4, 1, 1, 1, 1, 3}, + {4, 1, 1, 3, 1, 1}, + {1, 1, 3, 1, 4, 1}, + {1, 1, 4, 1, 3, 1}, /* 100 */ + {3, 1, 1, 1, 4, 1}, + {4, 1, 1, 1, 3, 1}, + {2, 1, 1, 4, 1, 2}, + {2, 1, 1, 2, 1, 4}, + {2, 1, 1, 2, 3, 2}, /* 105 */ + {2, 3, 3, 1, 1, 1} + }; + + + Code128Reader::Code128Reader(){ + } + + int* Code128Reader::findStartPattern(Ref row){ + int width = row->getSize(); + int rowOffset = 0; + while (rowOffset < width) { + if (row->get(rowOffset)) { + break; + } + rowOffset++; + } + + int counterPosition = 0; + int counters[countersLength] = {0,0,0,0,0,0}; + int patternStart = rowOffset; + bool isWhite = false; + int patternLength = sizeof(counters) / sizeof(int); + + for (int i = rowOffset; i < width; i++) { + bool pixel = row->get(i); + if (pixel ^ isWhite) { + counters[counterPosition]++; + } else { + if (counterPosition == patternLength - 1) { + unsigned int bestVariance = MAX_AVG_VARIANCE; + int bestMatch = -1; + for (int startCode = CODE_START_A; startCode <= CODE_START_C; startCode++) { + unsigned int variance = patternMatchVariance(counters, sizeof(counters) / sizeof(int), + CODE_PATTERNS[startCode], MAX_INDIVIDUAL_VARIANCE); + if (variance < bestVariance) { + bestVariance = variance; + bestMatch = startCode; + } + } + if (bestMatch >= 0) { + // Look for whitespace before start pattern, >= 50% of width of start pattern + if (row->isRange(std::max(0, patternStart - (i - patternStart) / 2), patternStart, + false)) { + int* resultValue = new int[3]; + resultValue[0] = patternStart; + resultValue[1] = i; + resultValue[2] = bestMatch; + return resultValue; + } + } + patternStart += counters[0] + counters[1]; + for (int y = 2; y < patternLength; y++) { + counters[y - 2] = counters[y]; + } + counters[patternLength - 2] = 0; + counters[patternLength - 1] = 0; + counterPosition--; + } else { + counterPosition++; + } + counters[counterPosition] = 1; + isWhite = !isWhite; + } + } + throw ReaderException(""); + } + + int Code128Reader::decodeCode(Ref row, int counters[], int countersCount, + int rowOffset) { + if (!recordPattern(row, rowOffset, counters, countersCount)) { + throw ReaderException(""); + } + unsigned int bestVariance = MAX_AVG_VARIANCE; // worst variance we'll accept + int bestMatch = -1; + for (int d = 0; d < CODE_PATTERNS_LENGTH; d++) { + int pattern[countersLength]; + + for(int ind = 0; ind< countersLength; ind++){ + pattern[ind] = CODE_PATTERNS[d][ind]; + } +// memcpy(pattern, CODE_PATTERNS[d], countersLength); + unsigned int variance = patternMatchVariance(counters, countersCount, pattern, + MAX_INDIVIDUAL_VARIANCE); + if (variance < bestVariance) { + bestVariance = variance; + bestMatch = d; + } + } + // TODO We're overlooking the fact that the STOP pattern has 7 values, not 6. + if (bestMatch >= 0) { + return bestMatch; + } else { + throw ReaderException(""); + } + } + + Ref Code128Reader::decodeRow(int rowNumber, Ref row) { + int* startPatternInfo = NULL; + try { + startPatternInfo = findStartPattern(row); + int startCode = startPatternInfo[2]; + int codeSet; + switch (startCode) { + case CODE_START_A: + codeSet = CODE_CODE_A; + break; + case CODE_START_B: + codeSet = CODE_CODE_B; + break; + case CODE_START_C: + codeSet = CODE_CODE_C; + break; + default: + throw ReaderException(""); + } + + bool done = false; + bool isNextShifted = false; + + std::string tmpResultString; + std::stringstream tmpResultSStr; // used if its Code 128C + + int lastStart = startPatternInfo[0]; + int nextStart = startPatternInfo[1]; + int counters[countersLength] = {0,0,0,0,0,0}; + + int lastCode = 0; + int code = 0; + int checksumTotal = startCode; + int multiplier = 0; + bool lastCharacterWasPrintable = true; + + while (!done) { + bool unshift = isNextShifted; + isNextShifted = false; + + // Save off last code + lastCode = code; + + // Decode another code from image + try { + code = decodeCode(row, counters, sizeof(counters)/sizeof(int), nextStart); + } catch (ReaderException const& re) { + throw re; + } + + // Remember whether the last code was printable or not (excluding CODE_STOP) + if (code != CODE_STOP) { + lastCharacterWasPrintable = true; + } + + // Add to checksum computation (if not CODE_STOP of course) + if (code != CODE_STOP) { + multiplier++; + checksumTotal += multiplier * code; + } + + // Advance to where the next code will to start + lastStart = nextStart; + int _countersLength = sizeof(counters) / sizeof(int); + for (int i = 0; i < _countersLength; i++) { + nextStart += counters[i]; + } + + // Take care of illegal start codes + switch (code) { + case CODE_START_A: + case CODE_START_B: + case CODE_START_C: + throw ReaderException(""); + } + + switch (codeSet) { + + case CODE_CODE_A: + if (code < 64) { + tmpResultString.append(1, (char) (' ' + code)); + } else if (code < 96) { + tmpResultString.append(1, (char) (code - 64)); + } else { + // Don't let CODE_STOP, which always appears, affect whether whether we think the + // last code was printable or not. + if (code != CODE_STOP) { + lastCharacterWasPrintable = false; + } + switch (code) { + case CODE_FNC_1: + case CODE_FNC_2: + case CODE_FNC_3: + case CODE_FNC_4_A: + // do nothing? + break; + case CODE_SHIFT: + isNextShifted = true; + codeSet = CODE_CODE_B; + break; + case CODE_CODE_B: + codeSet = CODE_CODE_B; + break; + case CODE_CODE_C: + codeSet = CODE_CODE_C; + break; + case CODE_STOP: + done = true; + break; + } + } + break; + case CODE_CODE_B: + if (code < 96) { + tmpResultString.append(1, (char) (' ' + code)); + } else { + if (code != CODE_STOP) { + lastCharacterWasPrintable = false; + } + switch (code) { + case CODE_FNC_1: + case CODE_FNC_2: + case CODE_FNC_3: + case CODE_FNC_4_B: + // do nothing? + break; + case CODE_SHIFT: + isNextShifted = true; + codeSet = CODE_CODE_C; + break; + case CODE_CODE_A: + codeSet = CODE_CODE_A; + break; + case CODE_CODE_C: + codeSet = CODE_CODE_C; + break; + case CODE_STOP: + done = true; + break; + } + } + break; + case CODE_CODE_C: + tmpResultSStr.str(std::string()); + // the code read in this case is the number encoded directly + if (code < 100) { + if (code < 10) { + tmpResultSStr << '0'; + } + tmpResultSStr << code; + tmpResultString.append(tmpResultSStr.str()); + } else { + if (code != CODE_STOP) { + lastCharacterWasPrintable = false; + } + switch (code) { + case CODE_FNC_1: + // do nothing? + break; + case CODE_CODE_A: + codeSet = CODE_CODE_A; + break; + case CODE_CODE_B: + codeSet = CODE_CODE_B; + break; + case CODE_STOP: + done = true; + break; + } + } + break; + } + + // Unshift back to another code set if we were shifted + if (unshift) { + switch (codeSet) { + case CODE_CODE_A: + codeSet = CODE_CODE_C; + break; + case CODE_CODE_B: + codeSet = CODE_CODE_A; + break; + case CODE_CODE_C: + codeSet = CODE_CODE_B; + break; + } + } + + } + + // Check for ample whitespace following pattern, but, to do this we first need to remember that + // we fudged decoding CODE_STOP since it actually has 7 bars, not 6. There is a black bar left + // to read off. Would be slightly better to properly read. Here we just skip it: + int width = row->getSize(); + while (nextStart < width && row->get(nextStart)) { + nextStart++; + } + if (!row->isRange(nextStart, + std::min(width, nextStart + (nextStart - lastStart) / 2), + false)) { + throw ReaderException(""); + } + + // Pull out from sum the value of the penultimate check code + checksumTotal -= multiplier * lastCode; + // lastCode is the checksum then: + if (checksumTotal % 103 != lastCode) { + throw ReaderException(""); + } + + // Need to pull out the check digits from string + int resultLength = tmpResultString.length(); + // Only bother if the result had at least one character, and if the checksum digit happened to + // be a printable character. If it was just interpreted as a control code, nothing to remove. + if (resultLength > 0 && lastCharacterWasPrintable) { + if (codeSet == CODE_CODE_C) { + tmpResultString.erase(resultLength - 2, resultLength); + } else { + tmpResultString.erase(resultLength - 1, resultLength); + } + } + + Ref resultString(new String(tmpResultString)); + if (tmpResultString.length() == 0) { + // Almost surely a false positive + throw ReaderException(""); + } + + float left = (float) (startPatternInfo[1] + startPatternInfo[0]) / 2.0f; + float right = (float) (nextStart + lastStart) / 2.0f; + + std::vector< Ref > resultPoints(2); + Ref resultPoint1(new OneDResultPoint(left, (float) rowNumber)); + Ref resultPoint2(new OneDResultPoint(right, (float) rowNumber)); + resultPoints[0] = resultPoint1; + resultPoints[1] = resultPoint2; + + delete [] startPatternInfo; + ArrayRef resultBytes(1); + return Ref(new Result(resultString, resultBytes, resultPoints, + BarcodeFormat_CODE_128)); + } catch (ReaderException const& re) { + delete [] startPatternInfo; + return Ref(); + } + } + + void Code128Reader::append(char* s, char c){ + int len = strlen(s); + s[len] = c; + s[len + 1] = '\0'; + } + + Code128Reader::~Code128Reader(){ + } + } +} diff --git a/src/qzxing/zxing/oned/Code128Reader.h b/src/qzxing/zxing/oned/Code128Reader.h new file mode 100644 index 0000000..6259717 --- /dev/null +++ b/src/qzxing/zxing/oned/Code128Reader.h @@ -0,0 +1,60 @@ +// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- +#ifndef __CODE_128_READER_H__ +#define __CODE_128_READER_H__ +/* + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include + +namespace zxing { + namespace oned { + class Code128Reader : public OneDReader { + + private: + enum {MAX_AVG_VARIANCE = (unsigned int) (PATTERN_MATCH_RESULT_SCALE_FACTOR * 250/1000)}; + enum {MAX_INDIVIDUAL_VARIANCE = (int) (PATTERN_MATCH_RESULT_SCALE_FACTOR * 700/1000)}; + static const int CODE_SHIFT = 98; + + static const int CODE_CODE_C = 99; + static const int CODE_CODE_B = 100; + static const int CODE_CODE_A = 101; + + static const int CODE_FNC_1 = 102; + static const int CODE_FNC_2 = 97; + static const int CODE_FNC_3 = 96; + static const int CODE_FNC_4_A = 101; + static const int CODE_FNC_4_B = 100; + + static const int CODE_START_A = 103; + static const int CODE_START_B = 104; + static const int CODE_START_C = 105; + static const int CODE_STOP = 106; + + static int* findStartPattern(Ref row); + static int decodeCode(Ref row, int counters[], int countersCount, int rowOffset); + + void append(char* s, char c); + public: + Ref decodeRow(int rowNumber, Ref row); + Code128Reader(); + ~Code128Reader(); + }; + } +} + +#endif diff --git a/src/qzxing/zxing/oned/Code39Reader.cpp b/src/qzxing/zxing/oned/Code39Reader.cpp new file mode 100644 index 0000000..b55dda1 --- /dev/null +++ b/src/qzxing/zxing/oned/Code39Reader.cpp @@ -0,0 +1,348 @@ +// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- +/* + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "Code39Reader.h" +#include +#include +#include +#include +#include + +namespace zxing { +namespace oned { + + static const char* ALPHABET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. *$/+%"; + + + /** + * These represent the encodings of characters, as patterns of wide and narrow + * bars. + * The 9 least-significant bits of each int correspond to the pattern of wide + * and narrow, with 1s representing "wide" and 0s representing narrow. + */ + const int CHARACTER_ENCODINGS_LEN = 44; + static int CHARACTER_ENCODINGS[CHARACTER_ENCODINGS_LEN] = { + 0x034, 0x121, 0x061, 0x160, 0x031, 0x130, 0x070, 0x025, 0x124, 0x064, // 0-9 + 0x109, 0x049, 0x148, 0x019, 0x118, 0x058, 0x00D, 0x10C, 0x04C, 0x01C, // A-J + 0x103, 0x043, 0x142, 0x013, 0x112, 0x052, 0x007, 0x106, 0x046, 0x016, // K-T + 0x181, 0x0C1, 0x1C0, 0x091, 0x190, 0x0D0, 0x085, 0x184, 0x0C4, 0x094, // U-* + 0x0A8, 0x0A2, 0x08A, 0x02A // $-% + }; + + static int ASTERISK_ENCODING = 0x094; + static const char* ALPHABET_STRING = + "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. *$/+%"; + + + /** + * Creates a reader that assumes all encoded data is data, and does not treat + * the final character as a check digit. It will not decoded "extended + * Code 39" sequences. + */ + Code39Reader::Code39Reader() : alphabet_string(ALPHABET_STRING), + usingCheckDigit(false), + extendedMode(false) { + } + + /** + * Creates a reader that can be configured to check the last character as a + * check digit. It will not decoded "extended Code 39" sequences. + * + * @param usingCheckDigit if true, treat the last data character as a check + * digit, not data, and verify that the checksum passes. + */ + Code39Reader::Code39Reader(bool usingCheckDigit_) : + alphabet_string(ALPHABET_STRING), + usingCheckDigit(usingCheckDigit_), + extendedMode(false) { + } + + + Code39Reader::Code39Reader(bool usingCheckDigit_, bool extendedMode_) : + alphabet_string(ALPHABET_STRING), + usingCheckDigit(usingCheckDigit_), + extendedMode(extendedMode_) { + } + + Ref Code39Reader::decodeRow(int rowNumber, Ref row) { + int* start = NULL; + try { + start = findAsteriskPattern(row); + int nextStart = start[1]; + int end = row->getSize(); + + // Read off white space + while (nextStart < end && !row->get(nextStart)) { + nextStart++; + } + + std::string tmpResultString; + + const int countersLen = 9; + int counters[countersLen]; + for (int i = 0; i < countersLen; i++) { + counters[i] = 0; + } + char decodedChar; + int lastStart; + do { + if (!recordPattern(row, nextStart, counters, countersLen)) { + throw ReaderException(""); + } + int pattern = toNarrowWidePattern(counters, countersLen); + if (pattern < 0) { + throw ReaderException("pattern < 0"); + } + decodedChar = patternToChar(pattern); + tmpResultString.append(1, decodedChar); + lastStart = nextStart; + for (int i = 0; i < countersLen; i++) { + nextStart += counters[i]; + } + // Read off white space + while (nextStart < end && !row->get(nextStart)) { + nextStart++; + } + } while (decodedChar != '*'); + tmpResultString.erase(tmpResultString.length()-1, 1);// remove asterisk + + // Look for whitespace after pattern: + int lastPatternSize = 0; + for (int i = 0; i < countersLen; i++) { + lastPatternSize += counters[i]; + } + int whiteSpaceAfterEnd = nextStart - lastStart - lastPatternSize; + // If 50% of last pattern size, following last pattern, is not whitespace, + // fail (but if it's whitespace to the very end of the image, that's OK) + if (nextStart != end && whiteSpaceAfterEnd / 2 < lastPatternSize) { + throw ReaderException("too short end white space"); + } + + if (usingCheckDigit) { + int max = tmpResultString.length() - 1; + unsigned int total = 0; + for (int i = 0; i < max; i++) { + total += alphabet_string.find_first_of(tmpResultString[i], 0); + } + if (total % 43 != alphabet_string.find_first_of(tmpResultString[max], 0)) { + throw ReaderException(""); + } + tmpResultString.erase(max, 1); + } + + Ref resultString(new String(tmpResultString)); + if (extendedMode) { + resultString = decodeExtended(tmpResultString); + } + + if (tmpResultString.length() == 0) { + // Almost surely a false positive + throw ReaderException(""); + } + + float left = (float) (start[1] + start[0]) / 2.0f; + float right = (float) (nextStart + lastStart) / 2.0f; + + std::vector< Ref > resultPoints(2); + Ref resultPoint1( + new OneDResultPoint(left, (float) rowNumber)); + Ref resultPoint2( + new OneDResultPoint(right, (float) rowNumber)); + resultPoints[0] = resultPoint1; + resultPoints[1] = resultPoint2; + + ArrayRef resultBytes(1); + + Ref res(new Result( + resultString, resultBytes, resultPoints, BarcodeFormat_CODE_39)); + + delete [] start; + return res; + } catch (ReaderException const& re) { + delete [] start; + return Ref(); + } + } + + int* Code39Reader::findAsteriskPattern(Ref row){ + int width = row->getSize(); + int rowOffset = 0; + while (rowOffset < width) { + if (row->get(rowOffset)) { + break; + } + rowOffset++; + } + + int counterPosition = 0; + const int countersLen = 9; + int counters[countersLen]; + for (int i = 0; i < countersLen; i++) { + counters[i] = 0; + } + int patternStart = rowOffset; + bool isWhite = false; + int patternLength = countersLen; + + for (int i = rowOffset; i < width; i++) { + bool pixel = row->get(i); + if (pixel ^ isWhite) { + counters[counterPosition]++; + } else { + if (counterPosition == patternLength - 1) { + if (toNarrowWidePattern(counters, countersLen) == ASTERISK_ENCODING) { + // Look for whitespace before start pattern, >= 50% of width of + // start pattern. + if (row->isRange(std::max(0, patternStart - ((i - patternStart) >> 1)), patternStart, false)) { + int* resultValue = new int[2]; + resultValue[0] = patternStart; + resultValue[1] = i; + return resultValue; + } + } + patternStart += counters[0] + counters[1]; + for (int y = 2; y < patternLength; y++) { + counters[y - 2] = counters[y]; + } + counters[patternLength - 2] = 0; + counters[patternLength - 1] = 0; + counterPosition--; + } else { + counterPosition++; + } + counters[counterPosition] = 1; + isWhite = !isWhite; + } + } + throw ReaderException(""); + } + + // For efficiency, returns -1 on failure. Not throwing here saved as many as + // 700 exceptions per image when using some of our blackbox images. + int Code39Reader::toNarrowWidePattern(int counters[], int countersLen){ + int numCounters = countersLen; + int maxNarrowCounter = 0; + int wideCounters; + do { + int minCounter = INT_MAX; + for (int i = 0; i < numCounters; i++) { + int counter = counters[i]; + if (counter < minCounter && counter > maxNarrowCounter) { + minCounter = counter; + } + } + maxNarrowCounter = minCounter; + wideCounters = 0; + int totalWideCountersWidth = 0; + int pattern = 0; + for (int i = 0; i < numCounters; i++) { + int counter = counters[i]; + if (counters[i] > maxNarrowCounter) { + pattern |= 1 << (numCounters - 1 - i); + wideCounters++; + totalWideCountersWidth += counter; + } + } + if (wideCounters == 3) { + // Found 3 wide counters, but are they close enough in width? + // We can perform a cheap, conservative check to see if any individual + // counter is more than 1.5 times the average: + for (int i = 0; i < numCounters && wideCounters > 0; i++) { + int counter = counters[i]; + if (counters[i] > maxNarrowCounter) { + wideCounters--; + // totalWideCountersWidth = 3 * average, so this checks if + // counter >= 3/2 * average. + if ((counter << 1) >= totalWideCountersWidth) { + return -1; + } + } + } + return pattern; + } + } while (wideCounters > 3); + return -1; + } + + char Code39Reader::patternToChar(int pattern){ + for (int i = 0; i < CHARACTER_ENCODINGS_LEN; i++) { + if (CHARACTER_ENCODINGS[i] == pattern) { + return ALPHABET[i]; + } + } + throw ReaderException(""); + } + + Ref Code39Reader::decodeExtended(std::string encoded){ + int length = encoded.length(); + std::string tmpDecoded; + for (int i = 0; i < length; i++) { + char c = encoded[i]; + if (c == '+' || c == '$' || c == '%' || c == '/') { + char next = encoded[i + 1]; + char decodedChar = '\0'; + switch (c) { + case '+': + // +A to +Z map to a to z + if (next >= 'A' && next <= 'Z') { + decodedChar = (char) (next + 32); + } else { + throw ReaderException(""); + } + break; + case '$': + // $A to $Z map to control codes SH to SB + if (next >= 'A' && next <= 'Z') { + decodedChar = (char) (next - 64); + } else { + throw ReaderException(""); + } + break; + case '%': + // %A to %E map to control codes ESC to US + if (next >= 'A' && next <= 'E') { + decodedChar = (char) (next - 38); + } else if (next >= 'F' && next <= 'W') { + decodedChar = (char) (next - 11); + } else { + throw ReaderException(""); + } + break; + case '/': + // /A to /O map to ! to , and /Z maps to : + if (next >= 'A' && next <= 'O') { + decodedChar = (char) (next - 32); + } else if (next == 'Z') { + decodedChar = ':'; + } else { + throw ReaderException(""); + } + break; + } + tmpDecoded.append(1, decodedChar); + // bump up i again since we read two characters + i++; + } else { + tmpDecoded.append(1, c); + } + } + Ref decoded(new String(tmpDecoded)); + return decoded; + } +} // namespace oned +} // namespace zxing + diff --git a/src/qzxing/zxing/oned/Code39Reader.h b/src/qzxing/zxing/oned/Code39Reader.h new file mode 100644 index 0000000..cc69137 --- /dev/null +++ b/src/qzxing/zxing/oned/Code39Reader.h @@ -0,0 +1,58 @@ +#ifndef __CODE_39_READER_H__ +#define __CODE_39_READER_H__ +/* + * Code39Reader.h + * ZXing + * + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include + +namespace zxing { + namespace oned { + + /** + *

Decodes Code 39 barcodes. This does not support "Full ASCII Code 39" yet.

+ * Ported form Java (author Sean Owen) + * @author Lukasz Warchol + */ + class Code39Reader : public OneDReader { + + private: + std::string alphabet_string; + + bool usingCheckDigit; + bool extendedMode; + + static int* findAsteriskPattern(Ref row); //throws ReaderException + static int toNarrowWidePattern(int counters[], int countersLen); + static char patternToChar(int pattern); //throws ReaderException + static Ref decodeExtended(std::string encoded); //throws ReaderException + + void append(char* s, char c); + public: + Code39Reader(); + Code39Reader(bool usingCheckDigit_); + Code39Reader(bool usingCheckDigit_, bool extendedMode_); + + Ref decodeRow(int rowNumber, Ref row); + }; + } +} + +#endif diff --git a/src/qzxing/zxing/oned/EAN13Reader.cpp b/src/qzxing/zxing/oned/EAN13Reader.cpp new file mode 100644 index 0000000..0e1be9a --- /dev/null +++ b/src/qzxing/zxing/oned/EAN13Reader.cpp @@ -0,0 +1,99 @@ +// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- +/* + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "EAN13Reader.h" +#include +#include + +namespace zxing { +namespace oned { + +static const int FIRST_DIGIT_ENCODINGS[10] = { + 0x00, 0x0B, 0x0D, 0xE, 0x13, 0x19, 0x1C, 0x15, 0x16, 0x1A +}; + +EAN13Reader::EAN13Reader() { } + +int EAN13Reader::decodeMiddle(Ref row, int startGuardBegin, int startGuardEnd, + std::string& resultString) { + (void)startGuardBegin; + const int countersLen = 4; + int counters[countersLen] = { 0, 0, 0, 0 }; + + int end = row->getSize(); + int rowOffset = startGuardEnd; + int lgPatternFound = 0; + + for (int x = 0; x < 6 && rowOffset < end; x++) { + int bestMatch = decodeDigit(row, counters, countersLen, rowOffset, + UPC_EAN_PATTERNS_L_AND_G_PATTERNS); + if (bestMatch < 0) { + return -1; + } + resultString.append(1, (char) ('0' + bestMatch % 10)); + for (int i = 0; i < countersLen; i++) { + rowOffset += counters[i]; + } + if (bestMatch >= 10) { + lgPatternFound |= 1 << (5 - x); + } + } + + if (!determineFirstDigit(resultString, lgPatternFound)) { + return -1; + } + + int middleRangeStart; + int middleRangeEnd; + if (findGuardPattern(row, rowOffset, true, (int*)getMIDDLE_PATTERN(), + getMIDDLE_PATTERN_LEN(), &middleRangeStart, &middleRangeEnd)) { + rowOffset = middleRangeEnd; + for (int x = 0; x < 6 && rowOffset < end; x++) { + int bestMatch = decodeDigit(row, counters, countersLen, rowOffset, + UPC_EAN_PATTERNS_L_PATTERNS); + if (bestMatch < 0) { + return -1; + } + resultString.append(1, (char) ('0' + bestMatch)); + for (int i = 0; i < countersLen; i++) { + rowOffset += counters[i]; + } + } + return rowOffset; + } + return -1; +} + +bool EAN13Reader::determineFirstDigit(std::string& resultString, int lgPatternFound) { + for (int d = 0; d < 10; d++) { + if (lgPatternFound == FIRST_DIGIT_ENCODINGS[d]) { +#if defined(Q_OS_SYMBIAN) + resultString.insert((char*)0, 1, (char) ('0' + d)); +#else + resultString.insert(/*(char*)*/0, 1, (char) ('0' + d)); +#endif + return true; + } + } + return false; +} + +BarcodeFormat EAN13Reader::getBarcodeFormat(){ + return BarcodeFormat_EAN_13; +} +} +} diff --git a/src/qzxing/zxing/zxing/oned/EAN13Reader.h b/src/qzxing/zxing/oned/EAN13Reader.h similarity index 59% rename from src/qzxing/zxing/zxing/oned/EAN13Reader.h rename to src/qzxing/zxing/oned/EAN13Reader.h index bb61390..e53320c 100644 --- a/src/qzxing/zxing/zxing/oned/EAN13Reader.h +++ b/src/qzxing/zxing/oned/EAN13Reader.h @@ -1,4 +1,3 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- #ifndef __EAN_13_READER_H__ #define __EAN_13_READER_H__ @@ -25,25 +24,21 @@ #include namespace zxing { -namespace oned { + namespace oned { + class EAN13Reader : public UPCEANReader { -class EAN13Reader : public UPCEANReader { -private: - std::vector decodeMiddleCounters; - static void determineFirstDigit(std::string& resultString, - int lgPatternFound); + private: + static bool determineFirstDigit(std::string& resultString, int lgPatternFound); -public: - EAN13Reader(); + public: + EAN13Reader(); - int decodeMiddle(Ref row, - Range const& startRange, - std::string& resultString); + int decodeMiddle(Ref row, int startGuardBegin, int startGuardEnd, + std::string& resultString); - BarcodeFormat getBarcodeFormat(); -}; - -} + BarcodeFormat getBarcodeFormat(); + }; + } } #endif diff --git a/src/qzxing/zxing/oned/EAN8Reader.cpp b/src/qzxing/zxing/oned/EAN8Reader.cpp new file mode 100644 index 0000000..95aa7f6 --- /dev/null +++ b/src/qzxing/zxing/oned/EAN8Reader.cpp @@ -0,0 +1,72 @@ +// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- +/* + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "EAN8Reader.h" +#include + +namespace zxing { + namespace oned { + + EAN8Reader::EAN8Reader(){ } + + int EAN8Reader::decodeMiddle(Ref row, int startGuardBegin, int startGuardEnd, + std::string& resultString){ + (void)startGuardBegin; + const int countersLen = 4; + int counters[countersLen] = { 0, 0, 0, 0 }; + + int end = row->getSize(); + int rowOffset = startGuardEnd; + + for (int x = 0; x < 4 && rowOffset < end; x++) { + int bestMatch = decodeDigit(row, counters, countersLen, rowOffset, + UPC_EAN_PATTERNS_L_PATTERNS); + if (bestMatch < 0) { + return -1; + } + resultString.append(1, (char) ('0' + bestMatch)); + for (int i = 0; i < countersLen; i++) { + rowOffset += counters[i]; + } + } + + int middleRangeStart; + int middleRangeEnd; + if (findGuardPattern(row, rowOffset, true, (int*)getMIDDLE_PATTERN(), + getMIDDLE_PATTERN_LEN(), &middleRangeStart, &middleRangeEnd)) { + rowOffset = middleRangeEnd; + for (int x = 0; x < 4 && rowOffset < end; x++) { + int bestMatch = decodeDigit(row, counters, countersLen, rowOffset, + UPC_EAN_PATTERNS_L_PATTERNS); + if (bestMatch < 0) { + return -1; + } + resultString.append(1, (char) ('0' + bestMatch)); + for (int i = 0; i < countersLen; i++) { + rowOffset += counters[i]; + } + } + return rowOffset; + } + return -1; + } + + BarcodeFormat EAN8Reader::getBarcodeFormat(){ + return BarcodeFormat_EAN_8; + } + } +} diff --git a/src/qzxing/zxing/zxing/oned/EAN8Reader.h b/src/qzxing/zxing/oned/EAN8Reader.h similarity index 65% rename from src/qzxing/zxing/zxing/oned/EAN8Reader.h rename to src/qzxing/zxing/oned/EAN8Reader.h index c5004d1..478a73d 100644 --- a/src/qzxing/zxing/zxing/oned/EAN8Reader.h +++ b/src/qzxing/zxing/oned/EAN8Reader.h @@ -1,4 +1,3 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- #ifndef __EAN_8_READER_H__ #define __EAN_8_READER_H__ @@ -25,23 +24,18 @@ #include namespace zxing { -namespace oned { + namespace oned { + class EAN8Reader : public UPCEANReader { -class EAN8Reader : public UPCEANReader { - private: - std::vector decodeMiddleCounters; + public: + EAN8Reader(); - public: - EAN8Reader(); + int decodeMiddle(Ref row, int startGuardBegin, int startGuardEnd, + std::string& resultString); - int decodeMiddle(Ref row, - Range const& startRange, - std::string& resultString); - - BarcodeFormat getBarcodeFormat(); -}; - -} + BarcodeFormat getBarcodeFormat(); + }; + } } #endif diff --git a/src/qzxing/zxing/oned/ITFReader.cpp b/src/qzxing/zxing/oned/ITFReader.cpp new file mode 100644 index 0000000..0b92550 --- /dev/null +++ b/src/qzxing/zxing/oned/ITFReader.cpp @@ -0,0 +1,367 @@ +// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- +/* + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "ITFReader.h" +#include +#include +#include +#include + +namespace zxing { + namespace oned { + + static const int W = 3; // Pixel width of a wide line + static const int N = 1; // Pixed width of a narrow line + + const int DEFAULT_ALLOWED_LENGTHS_LEN = 10; + const int DEFAULT_ALLOWED_LENGTHS[DEFAULT_ALLOWED_LENGTHS_LEN] = { 44, 24, 20, 18, 16, 14, 12, 10, 8, 6 }; + + /** + * Start/end guard pattern. + * + * Note: The end pattern is reversed because the row is reversed before + * searching for the END_PATTERN + */ + static const int START_PATTERN_LEN = 4; + static const int START_PATTERN[START_PATTERN_LEN] = {N, N, N, N}; + + static const int END_PATTERN_REVERSED_LEN = 3; + static const int END_PATTERN_REVERSED[END_PATTERN_REVERSED_LEN] = {N, N, W}; + + /** + * Patterns of Wide / Narrow lines to indicate each digit + */ + static const int PATTERNS_LEN = 10; + static const int PATTERNS[PATTERNS_LEN][5] = { + {N, N, W, W, N}, // 0 + {W, N, N, N, W}, // 1 + {N, W, N, N, W}, // 2 + {W, W, N, N, N}, // 3 + {N, N, W, N, W}, // 4 + {W, N, W, N, N}, // 5 + {N, W, W, N, N}, // 6 + {N, N, N, W, W}, // 7 + {W, N, N, W, N}, // 8 + {N, W, N, W, N} // 9 + }; + + + ITFReader::ITFReader() : narrowLineWidth(-1) { + } + + + Ref ITFReader::decodeRow(int rowNumber, Ref row) { + int* startRange = 0; + int* endRange = 0; + try { + // Find out where the Middle section (payload) starts & ends + startRange = decodeStart(row); + endRange = decodeEnd(row); + + std::string tmpResult; + decodeMiddle(row, startRange[1], endRange[0], tmpResult); + + // To avoid false positives with 2D barcodes (and other patterns), make + // an assumption that the decoded string must be a known length + int length = tmpResult.length(); + bool lengthOK = false; + for (int i = 0; i < DEFAULT_ALLOWED_LENGTHS_LEN; i++) { + if (length == DEFAULT_ALLOWED_LENGTHS[i]) { + lengthOK = true; + break; + } + } + if (!lengthOK) { + throw ReaderException("not enough characters count"); + } + + Ref resultString(new String(tmpResult)); + + std::vector< Ref > resultPoints(2); + Ref resultPoint1(new OneDResultPoint(startRange[1], (float) rowNumber)); + Ref resultPoint2(new OneDResultPoint(endRange[0], (float) rowNumber)); + resultPoints[0] = resultPoint1; + resultPoints[1] = resultPoint2; + + delete [] startRange; + delete [] endRange; + ArrayRef resultBytes(1); + return Ref(new Result(resultString, resultBytes, resultPoints, BarcodeFormat_ITF)); + } catch (ReaderException const& re) { + delete [] startRange; + delete [] endRange; + return Ref(); + } + } + + /** + * @param row row of black/white values to search + * @param payloadStart offset of start pattern + * @param resultString {@link StringBuffer} to append decoded chars to + * @throws ReaderException if decoding could not complete successfully + */ + void ITFReader::decodeMiddle(Ref row, int payloadStart, int payloadEnd, + std::string& resultString) { + // Digits are interleaved in pairs - 5 black lines for one digit, and the + // 5 + // interleaved white lines for the second digit. + // Therefore, need to scan 10 lines and then + // split these into two arrays + int counterDigitPairLen = 10; + int counterDigitPair[counterDigitPairLen]; + for (int i=0; i row) { + int endStart = skipWhiteSpace(row); + int* startPattern = 0; + try { + startPattern = findGuardPattern(row, endStart, START_PATTERN, START_PATTERN_LEN); + + // Determine the width of a narrow line in pixels. We can do this by + // getting the width of the start pattern and dividing by 4 because its + // made up of 4 narrow lines. + narrowLineWidth = (startPattern[1] - startPattern[0]) >> 2; + validateQuietZone(row, startPattern[0]); + return startPattern; + } catch (ReaderException const& re) { + delete [] startPattern; + throw re; + } + } + + /** + * Identify where the end of the middle / payload section ends. + * + * @param row row of black/white values to search + * @return Array, containing index of start of 'end block' and end of 'end + * block' + * @throws ReaderException + */ + + int* ITFReader::decodeEnd(Ref row) { + // For convenience, reverse the row and then + // search from 'the start' for the end block + row->reverse(); + int* endPattern = 0; + try { + int endStart = skipWhiteSpace(row); + endPattern = findGuardPattern(row, endStart, END_PATTERN_REVERSED, END_PATTERN_REVERSED_LEN); + + // The start & end patterns must be pre/post fixed by a quiet zone. This + // zone must be at least 10 times the width of a narrow line. + // ref: http://www.barcode-1.net/i25code.html + validateQuietZone(row, endPattern[0]); + + // Now recalculate the indices of where the 'endblock' starts & stops to + // accommodate + // the reversed nature of the search + int temp = endPattern[0]; + endPattern[0] = row->getSize() - endPattern[1]; + endPattern[1] = row->getSize() - temp; + + row->reverse(); + return endPattern; + } catch (ReaderException const& re) { + delete [] endPattern; + row->reverse(); + throw re; + } + } + + /** + * The start & end patterns must be pre/post fixed by a quiet zone. This + * zone must be at least 10 times the width of a narrow line. Scan back until + * we either get to the start of the barcode or match the necessary number of + * quiet zone pixels. + * + * Note: Its assumed the row is reversed when using this method to find + * quiet zone after the end pattern. + * + * ref: http://www.barcode-1.net/i25code.html + * + * @param row bit array representing the scanned barcode. + * @param startPattern index into row of the start or end pattern. + * @throws ReaderException if the quiet zone cannot be found, a ReaderException is thrown. + */ + void ITFReader::validateQuietZone(Ref row, int startPattern) { + (void)row; + (void)startPattern; +//#pragma mark needs some corrections +// int quietCount = narrowLineWidth * 10; // expect to find this many pixels of quiet zone +// +// for (int i = startPattern - 1; quietCount > 0 && i >= 0; i--) { +// if (row->get(i)) { +// break; +// } +// quietCount--; +// } +// if (quietCount != 0) { +// // Unable to find the necessary number of quiet zone pixels. +// throw ReaderException("Unable to find the necessary number of quiet zone pixels"); +// } + } + + /** + * Skip all whitespace until we get to the first black line. + * + * @param row row of black/white values to search + * @return index of the first black line. + * @throws ReaderException Throws exception if no black lines are found in the row + */ + int ITFReader::skipWhiteSpace(Ref row) { + int width = row->getSize(); + int endStart = 0; + while (endStart < width) { + if (row->get(endStart)) { + break; + } + endStart++; + } + if (endStart == width) { + throw ReaderException(""); + } + return endStart; + } + + /** + * @param row row of black/white values to search + * @param rowOffset position to start search + * @param pattern pattern of counts of number of black and white pixels that are + * being searched for as a pattern + * @return start/end horizontal offset of guard pattern, as an array of two + * ints + * @throws ReaderException if pattern is not found + */ + int* ITFReader::findGuardPattern(Ref row, int rowOffset, const int pattern[], + int patternLen) { + // TODO: This is very similar to implementation in UPCEANReader. Consider if they can be + // merged to a single method. + int patternLength = patternLen; + int counters[patternLength]; + for (int i=0; igetSize(); + bool isWhite = false; + + int counterPosition = 0; + int patternStart = rowOffset; + for (int x = rowOffset; x < width; x++) { + bool pixel = row->get(x); + if (pixel ^ isWhite) { + counters[counterPosition]++; + } else { + if (counterPosition == patternLength - 1) { + if (patternMatchVariance(counters, patternLength, pattern, + MAX_INDIVIDUAL_VARIANCE) < MAX_AVG_VARIANCE) { + int* resultValue = new int[2]; + resultValue[0] = patternStart; + resultValue[1] = x; + return resultValue; + } + patternStart += counters[0] + counters[1]; + for (int y = 2; y < patternLength; y++) { + counters[y - 2] = counters[y]; + } + counters[patternLength - 2] = 0; + counters[patternLength - 1] = 0; + counterPosition--; + } else { + counterPosition++; + } + counters[counterPosition] = 1; + isWhite = !isWhite; + } + } + throw ReaderException(""); + } + + /** + * Attempts to decode a sequence of ITF black/white lines into single + * digit. + * + * @param counters the counts of runs of observed black/white/black/... values + * @return The decoded digit + * @throws ReaderException if digit cannot be decoded + */ + int ITFReader::decodeDigit(int counters[], int countersLen){ + unsigned int bestVariance = MAX_AVG_VARIANCE; // worst variance we'll accept + int bestMatch = -1; + int max = PATTERNS_LEN; + for (int i = 0; i < max; i++) { + int pattern[countersLen]; + for(int ind = 0; ind= 0) { + return bestMatch; + } else { + throw ReaderException("digit didint found"); + } + } + + ITFReader::~ITFReader(){ + } + } +} diff --git a/src/qzxing/zxing/oned/ITFReader.h b/src/qzxing/zxing/oned/ITFReader.h new file mode 100644 index 0000000..ccba0c5 --- /dev/null +++ b/src/qzxing/zxing/oned/ITFReader.h @@ -0,0 +1,53 @@ +// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- +#ifndef __ITF_READER_H__ +#define __ITF_READER_H__ + +/* + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include + +namespace zxing { + namespace oned { + class ITFReader : public OneDReader { + + private: + enum {MAX_AVG_VARIANCE = (unsigned int) (PATTERN_MATCH_RESULT_SCALE_FACTOR * 420/1000)}; + enum {MAX_INDIVIDUAL_VARIANCE = (int) (PATTERN_MATCH_RESULT_SCALE_FACTOR * 800/1000)}; + // Stores the actual narrow line width of the image being decoded. + int narrowLineWidth; + + int* decodeStart(Ref row); //throws ReaderException + int* decodeEnd(Ref row); //throws ReaderException + static void decodeMiddle(Ref row, int payloadStart, int payloadEnd, std::string& resultString); //throws ReaderException + void validateQuietZone(Ref row, int startPattern); //throws ReaderException + static int skipWhiteSpace(Ref row); //throws ReaderException + + static int* findGuardPattern(Ref row, int rowOffset, const int pattern[], int patternLen); //throws ReaderException + static int decodeDigit(int counters[], int countersLen); //throws ReaderException + + void append(char* s, char c); + public: + Ref decodeRow(int rowNumber, Ref row); ///throws ReaderException + ITFReader(); + ~ITFReader(); + }; + } +} + +#endif diff --git a/src/qzxing/zxing/oned/MultiFormatOneDReader.cpp b/src/qzxing/zxing/oned/MultiFormatOneDReader.cpp new file mode 100644 index 0000000..8560a87 --- /dev/null +++ b/src/qzxing/zxing/oned/MultiFormatOneDReader.cpp @@ -0,0 +1,66 @@ +/* + * MultiFormatOneDReader.cpp + * ZXing + * + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "MultiFormatOneDReader.h" + +#include +#include +#include +#include +#include + +namespace zxing { + namespace oned { + MultiFormatOneDReader::MultiFormatOneDReader(DecodeHints hints) : readers() { + if (hints.containsFormat(BarcodeFormat_EAN_13) || + hints.containsFormat(BarcodeFormat_EAN_8) || + hints.containsFormat(BarcodeFormat_UPC_A) || + hints.containsFormat(BarcodeFormat_UPC_E)) { + readers.push_back(Ref(new MultiFormatUPCEANReader(hints))); + } + if (hints.containsFormat(BarcodeFormat_CODE_39)) { + readers.push_back(Ref(new Code39Reader())); + } + if (hints.containsFormat(BarcodeFormat_CODE_128)) { + readers.push_back(Ref(new Code128Reader())); + } + if (hints.containsFormat(BarcodeFormat_ITF)) { + readers.push_back(Ref(new ITFReader())); + } + if (readers.size() == 0) { + readers.push_back(Ref(new MultiFormatUPCEANReader(hints))); + readers.push_back(Ref(new Code39Reader())); + readers.push_back(Ref(new Code128Reader())); + readers.push_back(Ref(new ITFReader())); + } + } + + Ref MultiFormatOneDReader::decodeRow(int rowNumber, Ref row) { + int size = readers.size(); + for (int i = 0; i < size; i++) { + OneDReader* reader = readers[i]; + Ref result = reader->decodeRow(rowNumber, row); + if (!result.empty()) { + return result; + } + } + return Ref(); + } + } +} diff --git a/src/qzxing/zxing/zxing/oned/MultiFormatOneDReader.h b/src/qzxing/zxing/oned/MultiFormatOneDReader.h similarity index 100% rename from src/qzxing/zxing/zxing/oned/MultiFormatOneDReader.h rename to src/qzxing/zxing/oned/MultiFormatOneDReader.h diff --git a/src/qzxing/zxing/oned/MultiFormatUPCEANReader.cpp b/src/qzxing/zxing/oned/MultiFormatUPCEANReader.cpp new file mode 100644 index 0000000..de42024 --- /dev/null +++ b/src/qzxing/zxing/oned/MultiFormatUPCEANReader.cpp @@ -0,0 +1,87 @@ +/* + * MultiFormatUPCEANReader.cpp + * ZXing + * + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include "MultiFormatUPCEANReader.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +namespace zxing { + namespace oned { + + MultiFormatUPCEANReader::MultiFormatUPCEANReader(DecodeHints hints) : readers() { + if (hints.containsFormat(BarcodeFormat_EAN_13)) { + readers.push_back(Ref(new EAN13Reader())); + } else if (hints.containsFormat(BarcodeFormat_UPC_A)) { + readers.push_back(Ref(new UPCAReader())); + } + if (hints.containsFormat(BarcodeFormat_EAN_8)) { + readers.push_back(Ref(new EAN8Reader())); + } + if (hints.containsFormat(BarcodeFormat_UPC_E)) { + readers.push_back(Ref(new UPCEReader())); + } + if (readers.size() == 0) { + readers.push_back(Ref(new EAN13Reader())); + // UPC-A is covered by EAN-13 + readers.push_back(Ref(new EAN8Reader())); + readers.push_back(Ref(new UPCEReader())); + } + } + + Ref MultiFormatUPCEANReader::decodeRow(int rowNumber, Ref row) { + // Compute this location once and reuse it on multiple implementations + int size = readers.size(); + for (int i = 0; i < size; i++) { + Ref reader = readers[i]; + Ref result = reader->decodeRow(rowNumber, row); + if (result.empty()) { + continue; + } + + // Special case: a 12-digit code encoded in UPC-A is identical to a "0" + // followed by those 12 digits encoded as EAN-13. Each will recognize such a code, + // UPC-A as a 12-digit string and EAN-13 as a 13-digit string starting with "0". + // Individually these are correct and their readers will both read such a code + // and correctly call it EAN-13, or UPC-A, respectively. + // + // In this case, if we've been looking for both types, we'd like to call it + // a UPC-A code. But for efficiency we only run the EAN-13 decoder to also read + // UPC-A. So we special case it here, and convert an EAN-13 result to a UPC-A + // result if appropriate. + if (result->getBarcodeFormat() == BarcodeFormat_EAN_13) { + const std::string& text = (result->getText())->getText(); + if (text[0] == '0') { + Ref resultString(new String(text.substr(1))); + Ref res(new Result(resultString, result->getRawBytes(), + result->getResultPoints(), BarcodeFormat_UPC_A)); + return res; + } + } + return result; + } + return Ref(); + } + } +} diff --git a/src/qzxing/zxing/zxing/oned/MultiFormatUPCEANReader.h b/src/qzxing/zxing/oned/MultiFormatUPCEANReader.h similarity index 68% rename from src/qzxing/zxing/zxing/oned/MultiFormatUPCEANReader.h rename to src/qzxing/zxing/oned/MultiFormatUPCEANReader.h index ea7d5da..8e89ff4 100644 --- a/src/qzxing/zxing/zxing/oned/MultiFormatUPCEANReader.h +++ b/src/qzxing/zxing/oned/MultiFormatUPCEANReader.h @@ -1,4 +1,3 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- #ifndef __MULTI_FORMAT_UPC_EAN_READER_H__ #define __MULTI_FORMAT_UPC_EAN_READER_H__ /* @@ -23,19 +22,17 @@ #include namespace zxing { -namespace oned { + namespace oned { + class MultiFormatUPCEANReader : public OneDReader { -class UPCEANReader; + private: + std::vector > readers; + public: + MultiFormatUPCEANReader(DecodeHints hints); -class MultiFormatUPCEANReader : public OneDReader { -private: - std::vector< Ref > readers; -public: - MultiFormatUPCEANReader(DecodeHints hints); - Ref decodeRow(int rowNumber, Ref row); -}; - -} + Ref decodeRow(int rowNumber, Ref row); + }; + } } #endif diff --git a/src/qzxing/zxing/oned/OneDReader.cpp b/src/qzxing/zxing/oned/OneDReader.cpp new file mode 100644 index 0000000..dbe73f4 --- /dev/null +++ b/src/qzxing/zxing/oned/OneDReader.cpp @@ -0,0 +1,207 @@ +// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- +/* + * OneDReader.cpp + * ZXing + * + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "OneDReader.h" +#include +#include +#include +#include + +namespace zxing { + namespace oned { + using namespace std; + + OneDReader::OneDReader() { + } + + Ref OneDReader::decode(Ref image, DecodeHints hints) { + Ref result = doDecode(image, hints); + if (result.empty() && hints.getTryHarder() && image->isRotateSupported()) { + Ref rotatedImage(image->rotateCounterClockwise()); + result = doDecode(rotatedImage, hints); + if (!result.empty()) { + /* + // Record that we found it rotated 90 degrees CCW / 270 degrees CW + Hashtable metadata = result.getResultMetadata(); + int orientation = 270; + if (metadata != null && metadata.containsKey(ResultMetadataType.ORIENTATION)) { + // But if we found it reversed in doDecode(), add in that result here: + orientation = (orientation + + ((Integer) metadata.get(ResultMetadataType.ORIENTATION)).intValue()) % 360; + } + result.putMetadata(ResultMetadataType.ORIENTATION, new Integer(orientation)); + */ + // Update result points + std::vector >& points (result->getResultPoints()); + int height = rotatedImage->getHeight(); + for (size_t i = 0; i < points.size(); i++) { + points[i].reset(new OneDResultPoint(height - points[i]->getY() - 1, points[i]->getX())); + } + } + } + if (result.empty()) { + throw ReaderException(""); + } + return result; + } + + Ref OneDReader::doDecode(Ref image, DecodeHints hints) { + int width = image->getWidth(); + int height = image->getHeight(); + Ref row(new BitArray(width)); + int middle = height >> 1; + bool tryHarder = hints.getTryHarder(); + int rowStep = (int)fmax(1, height >> (tryHarder ? 8 : 5)); + int maxLines; + if (tryHarder) { + maxLines = height; // Look at the whole image, not just the center + } else { + maxLines = 15; // 15 rows spaced 1/32 apart is roughly the middle half of the image + } + + for (int x = 0; x < maxLines; x++) { + // Scanning from the middle out. Determine which row we're looking at next: + int rowStepsAboveOrBelow = (x + 1) >> 1; + bool isAbove = (x & 0x01) == 0; // i.e. is x even? + int rowNumber = middle + rowStep * (isAbove ? rowStepsAboveOrBelow : -rowStepsAboveOrBelow); + if (rowNumber < 0 || rowNumber >= height) { + // Oops, if we run off the top or bottom, stop + break; + } + + // Estimate black point for this row and load it: + try { + row = image->getBlackRow(rowNumber, row); + } catch (ReaderException const& re) { + continue; + } catch (IllegalArgumentException const& re) { + continue; + } + + // While we have the image data in a BitArray, it's fairly cheap to reverse it in place to + // handle decoding upside down barcodes. + for (int attempt = 0; attempt < 2; attempt++) { + if (attempt == 1) { + row->reverse(); // reverse the row and continue + } + + // Look for a barcode + Ref result = decodeRow(rowNumber, row); + // We found our barcode + if (!result.empty()) { + if (attempt == 1) { + // But it was upside down, so note that + // result.putMetadata(ResultMetadataType.ORIENTATION, new Integer(180)); + // And remember to flip the result points horizontally. + std::vector > points(result->getResultPoints()); + // if there's exactly two points (which there should be), flip the x coordinate + // if there's not exactly 2, I don't know what do do with it + if (points.size() == 2) { + Ref pointZero(new OneDResultPoint(width - points[0]->getX() - 1, + points[0]->getY())); + points[0] = pointZero; + + Ref pointOne(new OneDResultPoint(width - points[1]->getX() - 1, + points[1]->getY())); + points[1] = pointOne; + + result.reset(new Result(result->getText(), result->getRawBytes(), points, + result->getBarcodeFormat())); + } + } + return result; + } + } + } + return Ref(); + } + + unsigned int OneDReader::patternMatchVariance(int counters[], int countersSize, + const int pattern[], int maxIndividualVariance) { + int numCounters = countersSize; + unsigned int total = 0; + unsigned int patternLength = 0; + for (int i = 0; i < numCounters; i++) { + total += counters[i]; + patternLength += pattern[i]; + } + if (total < patternLength) { + // If we don't even have one pixel per unit of bar width, assume this is too small + // to reliably match, so fail: + return INT_MAX; + } + // We're going to fake floating-point math in integers. We just need to use more bits. + // Scale up patternLength so that intermediate values below like scaledCounter will have + // more "significant digits" + unsigned int unitBarWidth = (total << INTEGER_MATH_SHIFT) / patternLength; + maxIndividualVariance = (maxIndividualVariance * unitBarWidth) >> INTEGER_MATH_SHIFT; + + unsigned int totalVariance = 0; + for (int x = 0; x < numCounters; x++) { + int counter = counters[x] << INTEGER_MATH_SHIFT; + int scaledPattern = pattern[x] * unitBarWidth; + int variance = counter > scaledPattern ? counter - scaledPattern : scaledPattern - counter; + if (variance > maxIndividualVariance) { + return INT_MAX; + } + totalVariance += variance; + } + return totalVariance / total; + } + + bool OneDReader::recordPattern(Ref row, int start, int counters[], int countersCount) { + int numCounters = countersCount;//sizeof(counters) / sizeof(int); + for (int i = 0; i < numCounters; i++) { + counters[i] = 0; + } + int end = row->getSize(); + if (start >= end) { + return false; + } + bool isWhite = !row->get(start); + int counterPosition = 0; + int i = start; + while (i < end) { + bool pixel = row->get(i); + if (pixel ^ isWhite) { // that is, exactly one is true + counters[counterPosition]++; + } else { + counterPosition++; + if (counterPosition == numCounters) { + break; + } else { + counters[counterPosition] = 1; + isWhite ^= true; // isWhite = !isWhite; + } + } + i++; + } + // If we read fully the last section of pixels and filled up our counters -- or filled + // the last counter but ran off the side of the image, OK. Otherwise, a problem. + if (!(counterPosition == numCounters || (counterPosition == numCounters - 1 && i == end))) { + return false; + } + return true; + } + + OneDReader::~OneDReader() { + } + } +} diff --git a/src/qzxing/zxing/oned/OneDReader.h b/src/qzxing/zxing/oned/OneDReader.h new file mode 100644 index 0000000..a93de07 --- /dev/null +++ b/src/qzxing/zxing/oned/OneDReader.h @@ -0,0 +1,50 @@ +#ifndef __ONED_READER_H__ +#define __ONED_READER_H__ + +/* + * OneDReader.h + * ZXing + * + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +namespace zxing { + namespace oned { + class OneDReader : public Reader { + private: + static const int INTEGER_MATH_SHIFT = 8; + + Ref doDecode(Ref image, DecodeHints hints); + public: + static const int PATTERN_MATCH_RESULT_SCALE_FACTOR = 1 << INTEGER_MATH_SHIFT; + + OneDReader(); + virtual Ref decode(Ref image, DecodeHints hints); + + // Implementations must not throw any exceptions. If a barcode is not found on this row, + // a empty ref should be returned e.g. return Ref(); + virtual Ref decodeRow(int rowNumber, Ref row) = 0; + + static unsigned int patternMatchVariance(int counters[], int countersSize, + const int pattern[], int maxIndividualVariance); + static bool recordPattern(Ref row, int start, int counters[], int countersCount); + virtual ~OneDReader(); + }; + } +} + +#endif diff --git a/src/qzxing/zxing/zxing/oned/OneDResultPoint.cpp b/src/qzxing/zxing/oned/OneDResultPoint.cpp similarity index 100% rename from src/qzxing/zxing/zxing/oned/OneDResultPoint.cpp rename to src/qzxing/zxing/oned/OneDResultPoint.cpp diff --git a/src/qzxing/zxing/zxing/oned/OneDResultPoint.h b/src/qzxing/zxing/oned/OneDResultPoint.h similarity index 100% rename from src/qzxing/zxing/zxing/oned/OneDResultPoint.h rename to src/qzxing/zxing/oned/OneDResultPoint.h diff --git a/src/qzxing/zxing/oned/UPCAReader.cpp b/src/qzxing/zxing/oned/UPCAReader.cpp new file mode 100644 index 0000000..d7ae0cd --- /dev/null +++ b/src/qzxing/zxing/oned/UPCAReader.cpp @@ -0,0 +1,65 @@ +/* + * UPCAReader.cpp + * ZXing + * + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "UPCAReader.h" +#include + +namespace zxing { + namespace oned { + UPCAReader::UPCAReader() : ean13Reader() { + } + + Ref UPCAReader::decodeRow(int rowNumber, Ref row) { + return maybeReturnResult(ean13Reader.decodeRow(rowNumber, row)); + } + + Ref UPCAReader::decodeRow(int rowNumber, Ref row, int startGuardBegin, + int startGuardEnd) { + return maybeReturnResult(ean13Reader.decodeRow(rowNumber, row, startGuardBegin, + startGuardEnd)); + } + + Ref UPCAReader::decode(Ref image, DecodeHints hints) { + return maybeReturnResult(ean13Reader.decode(image, hints)); + } + + int UPCAReader::decodeMiddle(Ref row, int startGuardBegin, int startGuardEnd, + std::string& resultString) { + return ean13Reader.decodeMiddle(row, startGuardBegin, startGuardEnd, resultString); + } + + Ref UPCAReader::maybeReturnResult(Ref result) { + if (result.empty()) { + return result; + } + const std::string& text = (result->getText())->getText(); + if (text[0] == '0') { + Ref resultString(new String(text.substr(1))); + Ref res(new Result(resultString, result->getRawBytes(), result->getResultPoints(), + BarcodeFormat_UPC_A)); + return res; + } + return Ref(); + } + + BarcodeFormat UPCAReader::getBarcodeFormat(){ + return BarcodeFormat_UPC_A; + } + } +} diff --git a/src/qzxing/zxing/zxing/oned/UPCAReader.h b/src/qzxing/zxing/oned/UPCAReader.h similarity index 54% rename from src/qzxing/zxing/zxing/oned/UPCAReader.h rename to src/qzxing/zxing/oned/UPCAReader.h index 5de1a67..e4c2a17 100644 --- a/src/qzxing/zxing/zxing/oned/UPCAReader.h +++ b/src/qzxing/zxing/oned/UPCAReader.h @@ -1,4 +1,3 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- #ifndef __UPCA_READER_H__ #define __UPCA_READER_H__ /* @@ -24,27 +23,27 @@ #include namespace zxing { -namespace oned { + namespace oned { + class UPCAReader : public UPCEANReader { -class UPCAReader : public UPCEANReader { + private: + EAN13Reader ean13Reader; + static Ref maybeReturnResult(Ref result); -private: - EAN13Reader ean13Reader; - static Ref maybeReturnResult(Ref result); + public: + UPCAReader(); -public: - UPCAReader(); + int decodeMiddle(Ref row, int startGuardBegin, int startGuardEnd, + std::string& resultString); - int decodeMiddle(Ref row, Range const& startRange, std::string& resultString); + Ref decodeRow(int rowNumber, Ref row); + Ref decodeRow(int rowNumber, Ref row, int startGuardBegin, + int startGuardEnd); + Ref decode(Ref image, DecodeHints hints); - Ref decodeRow(int rowNumber, Ref row); - Ref decodeRow(int rowNumber, Ref row, Range const& startGuardRange); - Ref decode(Ref image, DecodeHints hints); - - BarcodeFormat getBarcodeFormat(); -}; - -} + BarcodeFormat getBarcodeFormat(); + }; + } } #endif diff --git a/src/qzxing/zxing/oned/UPCEANReader.cpp b/src/qzxing/zxing/oned/UPCEANReader.cpp new file mode 100644 index 0000000..49cf332 --- /dev/null +++ b/src/qzxing/zxing/oned/UPCEANReader.cpp @@ -0,0 +1,311 @@ +/* + * UPCEANReader.cpp + * ZXing + * + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "UPCEANReader.h" +#include +#include + +namespace zxing { + namespace oned { + + /** + * Start/end guard pattern. + */ + static const int START_END_PATTERN[3] = {1, 1, 1}; + + /** + * Pattern marking the middle of a UPC/EAN pattern, separating the two halves. + */ + static const int MIDDLE_PATTERN_LEN = 5; + static const int MIDDLE_PATTERN[MIDDLE_PATTERN_LEN] = {1, 1, 1, 1, 1}; + + /** + * "Odd", or "L" patterns used to encode UPC/EAN digits. + */ + const int L_PATTERNS_LEN = 10; + const int L_PATTERNS_SUB_LEN = 4; + const int L_PATTERNS[L_PATTERNS_LEN][L_PATTERNS_SUB_LEN] = { + {3, 2, 1, 1}, // 0 + {2, 2, 2, 1}, // 1 + {2, 1, 2, 2}, // 2 + {1, 4, 1, 1}, // 3 + {1, 1, 3, 2}, // 4 + {1, 2, 3, 1}, // 5 + {1, 1, 1, 4}, // 6 + {1, 3, 1, 2}, // 7 + {1, 2, 1, 3}, // 8 + {3, 1, 1, 2} // 9 + }; + + /** + * As above but also including the "even", or "G" patterns used to encode UPC/EAN digits. + */ + const int L_AND_G_PATTERNS_LEN = 20; + const int L_AND_G_PATTERNS_SUB_LEN = 4; + const int L_AND_G_PATTERNS[L_AND_G_PATTERNS_LEN][L_AND_G_PATTERNS_SUB_LEN] = { + {3, 2, 1, 1}, // 0 + {2, 2, 2, 1}, // 1 + {2, 1, 2, 2}, // 2 + {1, 4, 1, 1}, // 3 + {1, 1, 3, 2}, // 4 + {1, 2, 3, 1}, // 5 + {1, 1, 1, 4}, // 6 + {1, 3, 1, 2}, // 7 + {1, 2, 1, 3}, // 8 + {3, 1, 1, 2}, // 9 + {1, 1, 2, 3}, // 10 reversed 0 + {1, 2, 2, 2}, // 11 reversed 1 + {2, 2, 1, 2}, // 12 reversed 2 + {1, 1, 4, 1}, // 13 reversed 3 + {2, 3, 1, 1}, // 14 reversed 4 + {1, 3, 2, 1}, // 15 reversed 5 + {4, 1, 1, 1}, // 16 reversed 6 + {2, 1, 3, 1}, // 17 reversed 7 + {3, 1, 2, 1}, // 18 reversed 8 + {2, 1, 1, 3} // 19 reversed 9 + }; + + + int UPCEANReader::getMIDDLE_PATTERN_LEN() { + return MIDDLE_PATTERN_LEN; + } + + const int* UPCEANReader::getMIDDLE_PATTERN() { + return MIDDLE_PATTERN; + } + + UPCEANReader::UPCEANReader() { + } + + + Ref UPCEANReader::decodeRow(int rowNumber, Ref row) { + int rangeStart; + int rangeEnd; + if (findStartGuardPattern(row, &rangeStart, &rangeEnd)) { + try { + return decodeRow(rowNumber, row, rangeStart, rangeEnd); + } catch (ReaderException const& re) { + } + } + return Ref(); + } + + Ref UPCEANReader::decodeRow(int rowNumber, Ref row, int startGuardBegin, + int startGuardEnd) { + std::string tmpResultString; + std::string& tmpResultStringRef = tmpResultString; + int endStart = decodeMiddle(row, startGuardBegin, startGuardEnd, tmpResultStringRef); + if (endStart < 0) { + return Ref(); + } + + int endGuardBegin; + int endGuardEnd; + if (!decodeEnd(row, endStart, &endGuardBegin, &endGuardEnd)) { + return Ref(); + } + + // Make sure there is a quiet zone at least as big as the end pattern after the barcode. + // The spec might want more whitespace, but in practice this is the maximum we can count on. + size_t quietEnd = endGuardEnd + (endGuardEnd - endGuardBegin); + if (quietEnd >= row->getSize() || !row->isRange(endGuardEnd, quietEnd, false)) { + return Ref(); + } + + if (!checkChecksum(tmpResultString)) { + return Ref(); + } + + Ref resultString(new String(tmpResultString)); + float left = (float) (startGuardBegin + startGuardEnd) / 2.0f; + float right = (float) (endGuardBegin + endGuardEnd) / 2.0f; + + std::vector< Ref > resultPoints(2); + Ref resultPoint1(new OneDResultPoint(left, (float) rowNumber)); + Ref resultPoint2(new OneDResultPoint(right, (float) rowNumber)); + resultPoints[0] = resultPoint1; + resultPoints[1] = resultPoint2; + + ArrayRef resultBytes(1); + return Ref(new Result(resultString, resultBytes, resultPoints, getBarcodeFormat())); + } + + bool UPCEANReader::findStartGuardPattern(Ref row, int* rangeStart, int* rangeEnd) { + int nextStart = 0; + while (findGuardPattern(row, nextStart, false, START_END_PATTERN, + sizeof(START_END_PATTERN) / sizeof(int), rangeStart, rangeEnd)) { + int start = *rangeStart; + nextStart = *rangeEnd; + // Make sure there is a quiet zone at least as big as the start pattern before the barcode. + // If this check would run off the left edge of the image, do not accept this barcode, + // as it is very likely to be a false positive. + int quietStart = start - (nextStart - start); + if (quietStart >= 0 && row->isRange(quietStart, start, false)) { + return true; + } + } + return false; + } + + bool UPCEANReader::findGuardPattern(Ref row, int rowOffset, bool whiteFirst, + const int pattern[], int patternLen, int* start, int* end) { + int patternLength = patternLen; + int counters[patternLength]; + int countersCount = sizeof(counters) / sizeof(int); + for (int i = 0; i < countersCount; i++) { + counters[i] = 0; + } + int width = row->getSize(); + bool isWhite = false; + while (rowOffset < width) { + isWhite = !row->get(rowOffset); + if (whiteFirst == isWhite) { + break; + } + rowOffset++; + } + + int counterPosition = 0; + int patternStart = rowOffset; + for (int x = rowOffset; x < width; x++) { + bool pixel = row->get(x); + if (pixel ^ isWhite) { + counters[counterPosition]++; + } else { + if (counterPosition == patternLength - 1) { + if (patternMatchVariance(counters, countersCount, pattern, + MAX_INDIVIDUAL_VARIANCE) < MAX_AVG_VARIANCE) { + *start = patternStart; + *end = x; + return true; + } + patternStart += counters[0] + counters[1]; + for (int y = 2; y < patternLength; y++) { + counters[y - 2] = counters[y]; + } + counters[patternLength - 2] = 0; + counters[patternLength - 1] = 0; + counterPosition--; + } else { + counterPosition++; + } + counters[counterPosition] = 1; + isWhite = !isWhite; + } + } + return false; + } + + bool UPCEANReader::decodeEnd(Ref row, int endStart, int* endGuardBegin, + int* endGuardEnd) { + return findGuardPattern(row, endStart, false, START_END_PATTERN, + sizeof(START_END_PATTERN) / sizeof(int), endGuardBegin, endGuardEnd); + } + + int UPCEANReader::decodeDigit(Ref row, int counters[], int countersLen, int rowOffset, + UPC_EAN_PATTERNS patternType) { + if (!recordPattern(row, rowOffset, counters, countersLen)) { + return -1; + } + unsigned int bestVariance = MAX_AVG_VARIANCE; // worst variance we'll accept + int bestMatch = -1; + + int max = 0; + switch (patternType) { + case UPC_EAN_PATTERNS_L_PATTERNS: + max = L_PATTERNS_LEN; + for (int i = 0; i < max; i++) { + int pattern[countersLen]; + for(int j = 0; j< countersLen; j++){ + pattern[j] = L_PATTERNS[i][j]; + } + + unsigned int variance = patternMatchVariance(counters, countersLen, pattern, + MAX_INDIVIDUAL_VARIANCE); + if (variance < bestVariance) { + bestVariance = variance; + bestMatch = i; + } + } + break; + case UPC_EAN_PATTERNS_L_AND_G_PATTERNS: + max = L_AND_G_PATTERNS_LEN; + for (int i = 0; i < max; i++) { + int pattern[countersLen]; + for(int j = 0; j< countersLen; j++){ + pattern[j] = L_AND_G_PATTERNS[i][j]; + } + + unsigned int variance = patternMatchVariance(counters, countersLen, pattern, + MAX_INDIVIDUAL_VARIANCE); + if (variance < bestVariance) { + bestVariance = variance; + bestMatch = i; + } + } + break; + default: + break; + } + return bestMatch; + } + + /** + * @return {@link #checkStandardUPCEANChecksum(String)} + */ + bool UPCEANReader::checkChecksum(std::string s) { + return checkStandardUPCEANChecksum(s); + } + + /** + * Computes the UPC/EAN checksum on a string of digits, and reports + * whether the checksum is correct or not. + * + * @param s string of digits to check + * @return true iff string of digits passes the UPC/EAN checksum algorithm + */ + bool UPCEANReader::checkStandardUPCEANChecksum(std::string s) { + int length = s.length(); + if (length == 0) { + return false; + } + + int sum = 0; + for (int i = length - 2; i >= 0; i -= 2) { + int digit = (int) s[i] - (int) '0'; + if (digit < 0 || digit > 9) { + return false; + } + sum += digit; + } + sum *= 3; + for (int i = length - 1; i >= 0; i -= 2) { + int digit = (int) s[i] - (int) '0'; + if (digit < 0 || digit > 9) { + return false; + } + sum += digit; + } + return sum % 10 == 0; + } + + UPCEANReader::~UPCEANReader() { + } + } +} diff --git a/src/qzxing/zxing/oned/UPCEANReader.h b/src/qzxing/zxing/oned/UPCEANReader.h new file mode 100644 index 0000000..7de4034 --- /dev/null +++ b/src/qzxing/zxing/oned/UPCEANReader.h @@ -0,0 +1,75 @@ +// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- +#ifndef __UPC_EAN_READER_H__ +#define __UPC_EAN_READER_H__ + +/* + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include + +typedef enum UPC_EAN_PATTERNS { + UPC_EAN_PATTERNS_L_PATTERNS = 0, + UPC_EAN_PATTERNS_L_AND_G_PATTERNS +} UPC_EAN_PATTERNS; + +namespace zxing { + namespace oned { + class UPCEANReader : public OneDReader { + + private: + enum {MAX_AVG_VARIANCE = (unsigned int) (PATTERN_MATCH_RESULT_SCALE_FACTOR * 420/1000)}; + enum {MAX_INDIVIDUAL_VARIANCE = (int) (PATTERN_MATCH_RESULT_SCALE_FACTOR * 700/1000)}; + + static bool findStartGuardPattern(Ref row, int* rangeStart, int* rangeEnd); + + virtual bool decodeEnd(Ref row, int endStart, int* endGuardBegin, int* endGuardEnd); + + static bool checkStandardUPCEANChecksum(std::string s); + protected: + static bool findGuardPattern(Ref row, int rowOffset, bool whiteFirst, + const int pattern[], int patternLen, int* start, int* end); + + virtual int getMIDDLE_PATTERN_LEN(); + virtual const int* getMIDDLE_PATTERN(); + + public: + UPCEANReader(); + + // Returns < 0 on failure, >= 0 on success. + virtual int decodeMiddle(Ref row, int startGuardBegin, int startGuardEnd, + std::string& resultString) = 0; + + Ref decodeRow(int rowNumber, Ref row); + + // TODO(dswitkin): Should this be virtual so that UPCAReader can override it? + Ref decodeRow(int rowNumber, Ref row, int startGuardBegin, + int startGuardEnd); + + // Returns < 0 on failure, >= 0 on success. + static int decodeDigit(Ref row, int counters[], int countersLen, int rowOffset, + UPC_EAN_PATTERNS patternType); + + virtual bool checkChecksum(std::string s); + + virtual BarcodeFormat getBarcodeFormat() = 0; + virtual ~UPCEANReader(); + }; + } +} + +#endif diff --git a/src/qzxing/zxing/oned/UPCEReader.cpp b/src/qzxing/zxing/oned/UPCEReader.cpp new file mode 100644 index 0000000..d9e98fb --- /dev/null +++ b/src/qzxing/zxing/oned/UPCEReader.cpp @@ -0,0 +1,147 @@ +// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- +/* + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "UPCEReader.h" +#include +#include + +namespace zxing { + namespace oned { + + /** + * The pattern that marks the middle, and end, of a UPC-E pattern. + * There is no "second half" to a UPC-E barcode. + */ + static const int MIDDLE_END_PATTERN[6] = {1, 1, 1, 1, 1, 1}; + + /** + * See {@link #L_AND_G_PATTERNS}; these values similarly represent patterns of + * even-odd parity encodings of digits that imply both the number system (0 or 1) + * used, and the check digit. + */ + static const int NUMSYS_AND_CHECK_DIGIT_PATTERNS[2][10] = { + {0x38, 0x34, 0x32, 0x31, 0x2C, 0x26, 0x23, 0x2A, 0x29, 0x25}, + {0x07, 0x0B, 0x0D, 0x0E, 0x13, 0x19, 0x1C, 0x15, 0x16, 0x1A} + }; + + UPCEReader::UPCEReader() { + } + + int UPCEReader::decodeMiddle(Ref row, int startGuardBegin, int startGuardEnd, + std::string& resultString) { + (void)startGuardBegin; + const int countersLen = 4; + int counters[countersLen] = { 0, 0, 0, 0 }; + + int end = row->getSize(); + int rowOffset = startGuardEnd; + int lgPatternFound = 0; + + for (int x = 0; x < 6 && rowOffset < end; x++) { + int bestMatch = decodeDigit(row, counters, countersLen, rowOffset, + UPC_EAN_PATTERNS_L_AND_G_PATTERNS); + if (bestMatch < 0) { + return -1; + } + resultString.append(1, (char) ('0' + bestMatch % 10)); + for (int i = 0; i < countersLen; i++) { + rowOffset += counters[i]; + } + if (bestMatch >= 10) { + lgPatternFound |= 1 << (5 - x); + } + } + + if (!determineNumSysAndCheckDigit(resultString, lgPatternFound)) { + return -1; + } + return rowOffset; + } + + bool UPCEReader::decodeEnd(Ref row, int endStart, int* endGuardBegin, + int* endGuardEnd) { + return findGuardPattern(row, endStart, true, MIDDLE_END_PATTERN, + sizeof(MIDDLE_END_PATTERN) / sizeof(int), endGuardBegin, endGuardEnd); + } + + bool UPCEReader::checkChecksum(std::string s){ + return UPCEANReader::checkChecksum(convertUPCEtoUPCA(s)); + } + + + bool UPCEReader::determineNumSysAndCheckDigit(std::string& resultString, int lgPatternFound) { + for (int numSys = 0; numSys <= 1; numSys++) { + for (int d = 0; d < 10; d++) { + if (lgPatternFound == NUMSYS_AND_CHECK_DIGIT_PATTERNS[numSys][d]) { +#if defined(Q_OS_SYMBIAN) + resultString.insert((char*)0, 1, (char) ((int)'0' + numSys)); +#else + resultString.insert(/*(char*)*/0, 1, (char) ((int)'0' + numSys)); +#endif + resultString.append(1, (char) ('0' + d)); + return true; + } + } + } + return false; + } + + /** + * Expands a UPC-E value back into its full, equivalent UPC-A code value. + * + * @param upce UPC-E code as string of digits + * @return equivalent UPC-A code as string of digits + */ + std::string UPCEReader::convertUPCEtoUPCA(std::string upce) { + std::string result; + result.append(1, upce[0]); + char lastChar = upce[6]; + switch (lastChar) { + case '0': + case '1': + case '2': + result.append(upce.substr(1,2)); + result.append(1, lastChar); + result.append("0000"); + result.append(upce.substr(3,3)); + break; + case '3': + result.append(upce.substr(1,3)); + result.append("00000"); + result.append(upce.substr(4,2)); + break; + case '4': + result.append(upce.substr(1,4)); + result.append("00000"); + result.append(1, upce[5]); + break; + default: + result.append(upce.substr(1,5)); + result.append("0000"); + result.append(1, lastChar); + break; + } + result.append(1, upce[7]); + return result; + } + + + BarcodeFormat UPCEReader::getBarcodeFormat() { + return BarcodeFormat_UPC_E; + } + } +} diff --git a/src/qzxing/zxing/zxing/oned/UPCEReader.h b/src/qzxing/zxing/oned/UPCEReader.h similarity index 54% rename from src/qzxing/zxing/zxing/oned/UPCEReader.h rename to src/qzxing/zxing/oned/UPCEReader.h index 78f38a3..e46ac64 100644 --- a/src/qzxing/zxing/zxing/oned/UPCEReader.h +++ b/src/qzxing/zxing/oned/UPCEReader.h @@ -1,4 +1,3 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- #ifndef __UPC_E_READER_H__ #define __UPC_E_READER_H__ @@ -22,26 +21,24 @@ #include namespace zxing { -namespace oned { + namespace oned { + class UPCEReader : public UPCEANReader { -class UPCEReader : public UPCEANReader { -private: - std::vector decodeMiddleCounters; - static bool determineNumSysAndCheckDigit(std::string& resultString, int lgPatternFound); + private: + static bool determineNumSysAndCheckDigit(std::string& resultString, int lgPatternFound); + protected: + bool decodeEnd(Ref row, int endStart, int* endGuardBegin, int* endGuardEnd); + bool checkChecksum(std::string s); + public: + UPCEReader(); -protected: - Range decodeEnd(Ref row, int endStart); - bool checkChecksum(Ref const& s); -public: - UPCEReader(); + int decodeMiddle(Ref row, int startGuardBegin, int startGuardEnd, + std::string& resultString); + static std::string convertUPCEtoUPCA(std::string upce); - int decodeMiddle(Ref row, Range const& startRange, std::string& resultString); - static Ref convertUPCEtoUPCA(Ref const& upce); - - BarcodeFormat getBarcodeFormat(); -}; - -} + BarcodeFormat getBarcodeFormat(); + }; + } } #endif diff --git a/src/qzxing/zxing/zxing/qrcode/ErrorCorrectionLevel.h b/src/qzxing/zxing/qrcode/ErrorCorrectionLevel.h similarity index 100% rename from src/qzxing/zxing/zxing/qrcode/ErrorCorrectionLevel.h rename to src/qzxing/zxing/qrcode/ErrorCorrectionLevel.h diff --git a/src/qzxing/zxing/zxing/qrcode/FormatInformation.h b/src/qzxing/zxing/qrcode/FormatInformation.h similarity index 90% rename from src/qzxing/zxing/zxing/qrcode/FormatInformation.h rename to src/qzxing/zxing/qrcode/FormatInformation.h index 39e9abd..ed85603 100644 --- a/src/qzxing/zxing/zxing/qrcode/FormatInformation.h +++ b/src/qzxing/zxing/qrcode/FormatInformation.h @@ -35,16 +35,16 @@ private: static int BITS_SET_IN_HALF_BYTE[]; ErrorCorrectionLevel &errorCorrectionLevel_; - char dataMask_; + unsigned char dataMask_; FormatInformation(int formatInfo); public: - static int numBitsDiffering(int a, int b); + static int numBitsDiffering(unsigned int a, unsigned int b); static Ref decodeFormatInformation(int maskedFormatInfo1, int maskedFormatInfo2); static Ref doDecodeFormatInformation(int maskedFormatInfo1, int maskedFormatInfo2); ErrorCorrectionLevel &getErrorCorrectionLevel(); - char getDataMask(); + unsigned char getDataMask(); friend bool operator==(const FormatInformation &a, const FormatInformation &b); friend std::ostream& operator<<(std::ostream& out, const FormatInformation& fi); }; diff --git a/src/qzxing/zxing/zxing/qrcode/QRCodeReader.cpp b/src/qzxing/zxing/qrcode/QRCodeReader.cpp similarity index 59% rename from src/qzxing/zxing/zxing/qrcode/QRCodeReader.cpp rename to src/qzxing/zxing/qrcode/QRCodeReader.cpp index bee9660..227be47 100644 --- a/src/qzxing/zxing/zxing/qrcode/QRCodeReader.cpp +++ b/src/qzxing/zxing/qrcode/QRCodeReader.cpp @@ -33,12 +33,46 @@ namespace zxing { } //TODO: see if any of the other files in the qrcode tree need tryHarder Ref QRCodeReader::decode(Ref image, DecodeHints hints) { +#ifdef DEBUG + cout << "decoding image " << image.object_ << ":\n" << flush; +#endif + Detector detector(image->getBlackMatrix()); + + +#ifdef DEBUG + cout << "(1) created detector " << &detector << "\n" << flush; +#endif + Ref detectorResult(detector.detect(hints)); - ArrayRef< Ref > points (detectorResult->getPoints()); +#ifdef DEBUG + cout << "(2) detected, have detectorResult " << detectorResult.object_ << "\n" << flush; +#endif + + std::vector > points(detectorResult->getPoints()); + + +#ifdef DEBUG + cout << "(3) extracted points " << &points << "\n" << flush; + cout << "found " << points.size() << " points:\n"; + for (size_t i = 0; i < points.size(); i++) { + cout << " " << points[i]->getX() << "," << points[i]->getY() << "\n"; + } + cout << "bits:\n"; + cout << *(detectorResult->getBits()) << "\n"; +#endif + Ref decoderResult(decoder_.decode(detectorResult->getBits())); +#ifdef DEBUG + cout << "(4) decoded, have decoderResult " << decoderResult.object_ << "\n" << flush; +#endif + Ref result( - new Result(decoderResult->getText(), decoderResult->getRawBytes(), points, BarcodeFormat::QR_CODE)); + new Result(decoderResult->getText(), decoderResult->getRawBytes(), points, BarcodeFormat_QR_CODE)); +#ifdef DEBUG + cout << "(5) created result " << result.object_ << ", returning\n" << flush; +#endif + return result; } diff --git a/src/qzxing/zxing/zxing/qrcode/QRCodeReader.h b/src/qzxing/zxing/qrcode/QRCodeReader.h similarity index 74% rename from src/qzxing/zxing/zxing/qrcode/QRCodeReader.h rename to src/qzxing/zxing/qrcode/QRCodeReader.h index 474045a..991cc18 100644 --- a/src/qzxing/zxing/zxing/qrcode/QRCodeReader.h +++ b/src/qzxing/zxing/qrcode/QRCodeReader.h @@ -26,23 +26,22 @@ #include namespace zxing { -namespace qrcode { + namespace qrcode { -class QRCodeReader : public Reader { - private: - Decoder decoder_; + class QRCodeReader : public Reader { + private: + Decoder decoder_; - protected: - Decoder& getDecoder(); + protected: + Decoder& getDecoder(); - public: - QRCodeReader(); - virtual ~QRCodeReader(); + public: + QRCodeReader(); + virtual Ref decode(Ref image, DecodeHints hints); + virtual ~QRCodeReader(); - Ref decode(Ref image, DecodeHints hints); -}; - -} + }; + } } #endif // __QR_CODE_READER_H__ diff --git a/src/qzxing/zxing/zxing/qrcode/QRErrorCorrectionLevel.cpp b/src/qzxing/zxing/qrcode/QRErrorCorrectionLevel.cpp similarity index 100% rename from src/qzxing/zxing/zxing/qrcode/QRErrorCorrectionLevel.cpp rename to src/qzxing/zxing/qrcode/QRErrorCorrectionLevel.cpp diff --git a/src/qzxing/zxing/zxing/qrcode/QRFormatInformation.cpp b/src/qzxing/zxing/qrcode/QRFormatInformation.cpp similarity index 93% rename from src/qzxing/zxing/zxing/qrcode/QRFormatInformation.cpp rename to src/qzxing/zxing/qrcode/QRFormatInformation.cpp index f411631..7ae0d80 100644 --- a/src/qzxing/zxing/zxing/qrcode/QRFormatInformation.cpp +++ b/src/qzxing/zxing/qrcode/QRFormatInformation.cpp @@ -39,18 +39,19 @@ int FormatInformation::N_FORMAT_INFO_DECODE_LOOKUPS = 32; int FormatInformation::BITS_SET_IN_HALF_BYTE[] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4 }; FormatInformation::FormatInformation(int formatInfo) : - errorCorrectionLevel_(ErrorCorrectionLevel::forBits((formatInfo >> 3) & 0x03)), dataMask_((char)(formatInfo & 0x07)) { + errorCorrectionLevel_(ErrorCorrectionLevel::forBits((formatInfo >> 3) & 0x03)), dataMask_( + (unsigned char)(formatInfo & 0x07)) { } ErrorCorrectionLevel& FormatInformation::getErrorCorrectionLevel() { return errorCorrectionLevel_; } -char FormatInformation::getDataMask() { +unsigned char FormatInformation::getDataMask() { return dataMask_; } -int FormatInformation::numBitsDiffering(int a, int b) { +int FormatInformation::numBitsDiffering(unsigned int a, unsigned int b) { a ^= b; return BITS_SET_IN_HALF_BYTE[a & 0x0F] + BITS_SET_IN_HALF_BYTE[(a >> 4 & 0x0F)] + BITS_SET_IN_HALF_BYTE[(a >> 8 & 0x0F)] + BITS_SET_IN_HALF_BYTE[(a >> 12 & 0x0F)] + BITS_SET_IN_HALF_BYTE[(a >> 16 & 0x0F)] diff --git a/src/qzxing/zxing/zxing/qrcode/QRVersion.cpp b/src/qzxing/zxing/qrcode/QRVersion.cpp similarity index 97% rename from src/qzxing/zxing/zxing/qrcode/QRVersion.cpp rename to src/qzxing/zxing/qrcode/QRVersion.cpp index 7e35b92..37b186b 100644 --- a/src/qzxing/zxing/zxing/qrcode/QRVersion.cpp +++ b/src/qzxing/zxing/qrcode/QRVersion.cpp @@ -20,16 +20,13 @@ #include #include -#include #include #include #include -using std::vector; -using std::numeric_limits; - namespace zxing { namespace qrcode { +using namespace std; ECB::ECB(int count, int dataCodewords) : count_(count), dataCodewords_(dataCodewords) { @@ -97,14 +94,9 @@ ECBlocks& Version::getECBlocksForLevel(ErrorCorrectionLevel &ecLevel) { Version *Version::getProvisionalVersionForDimension(int dimension) { if (dimension % 4 != 1) { - throw FormatException(); - } - try { - return Version::getVersionForNumber((dimension - 17) >> 2); - } catch (IllegalArgumentException const& ignored) { - (void)ignored; - throw FormatException(); + throw ReaderException("Dimension must be 1 mod 4"); } + return Version::getVersionForNumber((dimension - 17) >> 2); } Version *Version::getVersionForNumber(int versionNumber) { @@ -204,6 +196,12 @@ Ref Version::buildFunctionPattern() { functionPattern->setRegion(0, dimension - 11, 6, 3); } + + //#ifdef DEBUG + // cout << "version " << versionNumber_ << " built function pattern:\n"; + // cout << *functionPattern; + //#endif + return functionPattern; } @@ -555,6 +553,5 @@ int Version::buildVersions() { new ECB(61, 16))))); return VERSIONS.size(); } - } } diff --git a/src/qzxing/zxing/zxing/qrcode/Version.h b/src/qzxing/zxing/qrcode/Version.h similarity index 100% rename from src/qzxing/zxing/zxing/qrcode/Version.h rename to src/qzxing/zxing/qrcode/Version.h diff --git a/src/qzxing/zxing/zxing/qrcode/decoder/BitMatrixParser.h b/src/qzxing/zxing/qrcode/decoder/BitMatrixParser.h similarity index 93% rename from src/qzxing/zxing/zxing/qrcode/decoder/BitMatrixParser.h rename to src/qzxing/zxing/qrcode/decoder/BitMatrixParser.h index 2157eb5..8813dce 100644 --- a/src/qzxing/zxing/zxing/qrcode/decoder/BitMatrixParser.h +++ b/src/qzxing/zxing/qrcode/decoder/BitMatrixParser.h @@ -42,7 +42,7 @@ public: BitMatrixParser(Ref bitMatrix); Ref readFormatInformation(); Version *readVersion(); - ArrayRef readCodewords(); + ArrayRef readCodewords(); private: BitMatrixParser(const BitMatrixParser&); diff --git a/src/qzxing/zxing/zxing/qrcode/decoder/DataBlock.h b/src/qzxing/zxing/qrcode/decoder/DataBlock.h similarity index 78% rename from src/qzxing/zxing/zxing/qrcode/decoder/DataBlock.h rename to src/qzxing/zxing/qrcode/decoder/DataBlock.h index e7c12f1..3f0c6cf 100644 --- a/src/qzxing/zxing/zxing/qrcode/decoder/DataBlock.h +++ b/src/qzxing/zxing/qrcode/decoder/DataBlock.h @@ -32,16 +32,16 @@ namespace qrcode { class DataBlock : public Counted { private: int numDataCodewords_; - ArrayRef codewords_; + ArrayRef codewords_; - DataBlock(int numDataCodewords, ArrayRef codewords); + DataBlock(int numDataCodewords, ArrayRef codewords); public: static std::vector > - getDataBlocks(ArrayRef rawCodewords, Version *version, ErrorCorrectionLevel &ecLevel); + getDataBlocks(ArrayRef rawCodewords, Version *version, ErrorCorrectionLevel &ecLevel); int getNumDataCodewords(); - ArrayRef getCodewords(); + ArrayRef getCodewords(); }; } diff --git a/src/qzxing/zxing/zxing/qrcode/decoder/DataMask.h b/src/qzxing/zxing/qrcode/decoder/DataMask.h similarity index 100% rename from src/qzxing/zxing/zxing/qrcode/decoder/DataMask.h rename to src/qzxing/zxing/qrcode/decoder/DataMask.h diff --git a/src/qzxing/zxing/zxing/qrcode/decoder/DecodedBitStreamParser.h b/src/qzxing/zxing/qrcode/decoder/DecodedBitStreamParser.h similarity index 88% rename from src/qzxing/zxing/zxing/qrcode/decoder/DecodedBitStreamParser.h rename to src/qzxing/zxing/qrcode/decoder/DecodedBitStreamParser.h index 6c0845d..1170214 100644 --- a/src/qzxing/zxing/zxing/qrcode/decoder/DecodedBitStreamParser.h +++ b/src/qzxing/zxing/qrcode/decoder/DecodedBitStreamParser.h @@ -51,16 +51,16 @@ private: std::string& result, int count, zxing::common::CharacterSetECI* currentCharacterSetECI, - ArrayRef< ArrayRef >& byteSegments, + ArrayRef< ArrayRef >& byteSegments, Hashtable const& hints); static void decodeAlphanumericSegment(Ref bits, std::string &result, int count, bool fc1InEffect); static void decodeNumericSegment(Ref bits, std::string &result, int count); - static void append(std::string &ost, const char *bufIn, size_t nIn, const char *src); + static void append(std::string &ost, const unsigned char *bufIn, size_t nIn, const char *src); static void append(std::string &ost, std::string const& in, const char *src); public: - static Ref decode(ArrayRef bytes, + static Ref decode(ArrayRef bytes, Version *version, ErrorCorrectionLevel const& ecLevel, Hashtable const& hints); diff --git a/src/qzxing/zxing/zxing/qrcode/decoder/Decoder.h b/src/qzxing/zxing/qrcode/decoder/Decoder.h similarity index 90% rename from src/qzxing/zxing/zxing/qrcode/decoder/Decoder.h rename to src/qzxing/zxing/qrcode/decoder/Decoder.h index e805063..c6312e0 100644 --- a/src/qzxing/zxing/zxing/qrcode/decoder/Decoder.h +++ b/src/qzxing/zxing/qrcode/decoder/Decoder.h @@ -33,7 +33,7 @@ class Decoder { private: ReedSolomonDecoder rsDecoder_; - void correctErrors(ArrayRef bytes, int numDataCodewords); + void correctErrors(ArrayRef bytes, int numDataCodewords); public: Decoder(); diff --git a/src/qzxing/zxing/zxing/qrcode/decoder/Mode.h b/src/qzxing/zxing/qrcode/decoder/Mode.h similarity index 95% rename from src/qzxing/zxing/zxing/qrcode/decoder/Mode.h rename to src/qzxing/zxing/qrcode/decoder/Mode.h index 120b033..424f9d2 100644 --- a/src/qzxing/zxing/zxing/qrcode/decoder/Mode.h +++ b/src/qzxing/zxing/qrcode/decoder/Mode.h @@ -32,6 +32,7 @@ private: int characterCountBitsForVersions0To9_; int characterCountBitsForVersions10To26_; int characterCountBitsForVersions27AndHigher_; + int bits_; std::string name_; Mode(int cbv0_9, int cbv10_26, int cbv27, int bits, char const* name); diff --git a/src/qzxing/zxing/zxing/qrcode/decoder/QRBitMatrixParser.cpp b/src/qzxing/zxing/qrcode/decoder/QRBitMatrixParser.cpp similarity index 89% rename from src/qzxing/zxing/zxing/qrcode/decoder/QRBitMatrixParser.cpp rename to src/qzxing/zxing/qrcode/decoder/QRBitMatrixParser.cpp index e0a0d45..07324b1 100644 --- a/src/qzxing/zxing/zxing/qrcode/decoder/QRBitMatrixParser.cpp +++ b/src/qzxing/zxing/qrcode/decoder/QRBitMatrixParser.cpp @@ -31,7 +31,7 @@ int BitMatrixParser::copyBit(size_t x, size_t y, int versionBits) { BitMatrixParser::BitMatrixParser(Ref bitMatrix) : bitMatrix_(bitMatrix), parsedVersion_(0), parsedFormatInfo_() { - size_t dimension = bitMatrix->getHeight(); + size_t dimension = bitMatrix->getDimension(); if ((dimension < 21) || (dimension & 0x03) != 1) { throw ReaderException("Dimension must be 1 mod 4 and >= 21"); } @@ -57,7 +57,7 @@ Ref BitMatrixParser::readFormatInformation() { } // Read the top-right/bottom-left pattern - int dimension = bitMatrix_->getHeight(); + int dimension = bitMatrix_->getDimension(); int formatInfoBits2 = 0; int jMin = dimension - 7; for (int j = dimension - 1; j >= jMin; j--) { @@ -79,7 +79,7 @@ Version *BitMatrixParser::readVersion() { return parsedVersion_; } - int dimension = bitMatrix_->getHeight(); + int dimension = bitMatrix_->getDimension(); int provisionalVersion = (dimension - 17) >> 2; if (provisionalVersion <= 6) { @@ -116,16 +116,19 @@ Version *BitMatrixParser::readVersion() { throw ReaderException("Could not decode version"); } -ArrayRef BitMatrixParser::readCodewords() { +ArrayRef BitMatrixParser::readCodewords() { Ref formatInfo = readFormatInformation(); Version *version = readVersion(); + // cerr << *bitMatrix_ << endl; + // cerr << bitMatrix_->getDimension() << endl; + // Get the data mask for the format used in this QR Code. This will exclude // some bits from reading as we wind through the bit matrix. DataMask &dataMask = DataMask::forReference((int)formatInfo->getDataMask()); // cout << (int)formatInfo->getDataMask() << endl; - int dimension = bitMatrix_->getHeight(); + int dimension = bitMatrix_->getDimension(); dataMask.unmaskBitMatrix(*bitMatrix_, dimension); @@ -138,7 +141,7 @@ ArrayRef BitMatrixParser::readCodewords() { // cout << *functionPattern << endl; bool readingUp = true; - ArrayRef result(version->getTotalCodewords()); + ArrayRef result(version->getTotalCodewords()); int resultOffset = 0; int currentByte = 0; int bitsRead = 0; @@ -163,7 +166,7 @@ ArrayRef BitMatrixParser::readCodewords() { } // If we've made a whole byte, save it off if (bitsRead == 8) { - result[resultOffset++] = (char)currentByte; + result[resultOffset++] = (unsigned char)currentByte; bitsRead = 0; currentByte = 0; } diff --git a/src/qzxing/zxing/zxing/qrcode/decoder/QRDataBlock.cpp b/src/qzxing/zxing/qrcode/decoder/QRDataBlock.cpp similarity index 84% rename from src/qzxing/zxing/zxing/qrcode/decoder/QRDataBlock.cpp rename to src/qzxing/zxing/qrcode/decoder/QRDataBlock.cpp index 8c831f7..0ac8031 100644 --- a/src/qzxing/zxing/zxing/qrcode/decoder/QRDataBlock.cpp +++ b/src/qzxing/zxing/qrcode/decoder/QRDataBlock.cpp @@ -26,7 +26,7 @@ namespace qrcode { using namespace std; -DataBlock::DataBlock(int numDataCodewords, ArrayRef codewords) : +DataBlock::DataBlock(int numDataCodewords, ArrayRef codewords) : numDataCodewords_(numDataCodewords), codewords_(codewords) { } @@ -34,12 +34,12 @@ int DataBlock::getNumDataCodewords() { return numDataCodewords_; } -ArrayRef DataBlock::getCodewords() { +ArrayRef DataBlock::getCodewords() { return codewords_; } -std::vector > DataBlock::getDataBlocks(ArrayRef rawCodewords, Version *version, +std::vector > DataBlock::getDataBlocks(ArrayRef rawCodewords, Version *version, ErrorCorrectionLevel &ecLevel) { @@ -63,7 +63,7 @@ std::vector > DataBlock::getDataBlocks(ArrayRef rawCodeword for (int i = 0; i < ecBlock->getCount(); i++) { int numDataCodewords = ecBlock->getDataCodewords(); int numBlockCodewords = ecBlocks.getECCodewords() + numDataCodewords; - ArrayRef buffer(numBlockCodewords); + ArrayRef buffer(numBlockCodewords); Ref blockRef(new DataBlock(numDataCodewords, buffer)); result[numResultBlocks++] = blockRef; } @@ -71,10 +71,10 @@ std::vector > DataBlock::getDataBlocks(ArrayRef rawCodeword // All blocks have the same amount of data, except that the last n // (where n may be 0) have 1 more byte. Figure out where these start. - int shorterBlocksTotalCodewords = result[0]->codewords_->size(); + int shorterBlocksTotalCodewords = result[0]->codewords_.size(); int longerBlocksStartAt = result.size() - 1; while (longerBlocksStartAt >= 0) { - int numCodewords = result[longerBlocksStartAt]->codewords_->size(); + int numCodewords = result[longerBlocksStartAt]->codewords_.size(); if (numCodewords == shorterBlocksTotalCodewords) { break; } @@ -99,7 +99,7 @@ std::vector > DataBlock::getDataBlocks(ArrayRef rawCodeword result[j]->codewords_[shorterBlocksNumDataCodewords] = rawCodewords[rawCodewordsOffset++]; } // Now add in error correction blocks - int max = result[0]->codewords_->size(); + int max = result[0]->codewords_.size(); for (int i = shorterBlocksNumDataCodewords; i < max; i++) { for (int j = 0; j < numResultBlocks; j++) { int iOffset = j < longerBlocksStartAt ? i : i + 1; @@ -107,7 +107,7 @@ std::vector > DataBlock::getDataBlocks(ArrayRef rawCodeword } } - if (rawCodewordsOffset != rawCodewords->size()) { + if ((size_t)rawCodewordsOffset != rawCodewords.size()) { throw IllegalArgumentException("rawCodewordsOffset != rawCodewords.length"); } diff --git a/src/qzxing/zxing/zxing/qrcode/decoder/QRDataMask.cpp b/src/qzxing/zxing/qrcode/decoder/QRDataMask.cpp similarity index 100% rename from src/qzxing/zxing/zxing/qrcode/decoder/QRDataMask.cpp rename to src/qzxing/zxing/qrcode/decoder/QRDataMask.cpp diff --git a/src/qzxing/zxing/qrcode/decoder/QRDecodedBitStreamParser.cpp b/src/qzxing/zxing/qrcode/decoder/QRDecodedBitStreamParser.cpp new file mode 100644 index 0000000..3b119ff --- /dev/null +++ b/src/qzxing/zxing/qrcode/decoder/QRDecodedBitStreamParser.cpp @@ -0,0 +1,416 @@ +// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- +/* + * DecodedBitStreamParser.cpp + * zxing + * + * Created by Christian Brunschen on 20/05/2008. + * Copyright 2008 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include +#include + +#include + +#ifndef NO_ICONV +#include +#endif + +// Required for compatibility. TODO: test on Symbian +#ifdef ZXING_ICONV_CONST +#undef ICONV_CONST +#define ICONV_CONST const +#endif + +#ifndef ICONV_CONST +#define ICONV_CONST /**/ +#endif + +using namespace std; +using namespace zxing; +using namespace zxing::qrcode; +using namespace zxing::common; + +const char DecodedBitStreamParser::ALPHANUMERIC_CHARS[] = +{ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', + 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', + 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', + 'Y', 'Z', ' ', '$', '%', '*', '+', '-', '.', '/', ':' +}; + +namespace {int GB2312_SUBSET = 1;} + +void DecodedBitStreamParser::append(std::string &result, + string const& in, + const char *src) { + append(result, (unsigned char const*)in.c_str(), in.length(), src); +} + +void DecodedBitStreamParser::append(std::string &result, + const unsigned char *bufIn, + size_t nIn, + const char *src) { +#ifndef NO_ICONV + if (nIn == 0) { + return; + } + + iconv_t cd = iconv_open(StringUtils::UTF8, src); + if (cd == (iconv_t)-1) { + result.append((const char *)bufIn, nIn); + return; + } + + const int maxOut = 4 * nIn + 1; + unsigned char* bufOut = new unsigned char[maxOut]; + + /*ICONV_CONST*/ char *fromPtr = (/*ICONV_CONST*/ char *)bufIn; + size_t nFrom = nIn; + char *toPtr = (char *)bufOut; + size_t nTo = maxOut; + + while (nFrom > 0) { +#if defined(Q_OS_SYMBIAN) + size_t oneway = iconv(cd, (const char**)&fromPtr, &nFrom, &toPtr, &nTo); // for Symbian and Mingw +#else + size_t oneway = iconv(cd, (char**)&fromPtr, &nFrom, &toPtr, &nTo); // for Harmattan +#endif + + if (oneway == (size_t)(-1)) { + iconv_close(cd); + delete[] bufOut; + throw ReaderException("error converting characters"); + } + } + iconv_close(cd); + + int nResult = maxOut - nTo; + bufOut[nResult] = '\0'; + result.append((const char *)bufOut); + delete[] bufOut; +#else + result.append((const char *)bufIn, nIn); +#endif +} + +void DecodedBitStreamParser::decodeHanziSegment(Ref bits_, + string& result, + int count) { + BitSource& bits (*bits_); + // Don't crash trying to read more bits than we have available. + if (count * 13 > bits.available()) { + throw FormatException(); + } + + // Each character will require 2 bytes. Read the characters as 2-byte pairs + // and decode as GB2312 afterwards + size_t nBytes = 2 * count; + unsigned char* buffer = new unsigned char[nBytes]; + int offset = 0; + while (count > 0) { + // Each 13 bits encodes a 2-byte character + int twoBytes = bits.readBits(13); + int assembledTwoBytes = ((twoBytes / 0x060) << 8) | (twoBytes % 0x060); + if (assembledTwoBytes < 0x003BF) { + // In the 0xA1A1 to 0xAAFE range + assembledTwoBytes += 0x0A1A1; + } else { + // In the 0xB0A1 to 0xFAFE range + assembledTwoBytes += 0x0A6A1; + } + buffer[offset] = (unsigned char) ((assembledTwoBytes >> 8) & 0xFF); + buffer[offset + 1] = (unsigned char) (assembledTwoBytes & 0xFF); + offset += 2; + count--; + } + + try { + append(result, buffer, nBytes, StringUtils::GB2312); + } catch (ReaderException const& re) { + delete [] buffer; + throw FormatException(); + } + + delete [] buffer; +} + +void DecodedBitStreamParser::decodeKanjiSegment(Ref bits, std::string &result, int count) { + // Each character will require 2 bytes. Read the characters as 2-byte pairs + // and decode as Shift_JIS afterwards + size_t nBytes = 2 * count; + unsigned char* buffer = new unsigned char[nBytes]; + int offset = 0; + while (count > 0) { + // Each 13 bits encodes a 2-byte character + + int twoBytes = bits->readBits(13); + int assembledTwoBytes = ((twoBytes / 0x0C0) << 8) | (twoBytes % 0x0C0); + if (assembledTwoBytes < 0x01F00) { + // In the 0x8140 to 0x9FFC range + assembledTwoBytes += 0x08140; + } else { + // In the 0xE040 to 0xEBBF range + assembledTwoBytes += 0x0C140; + } + buffer[offset] = (unsigned char)(assembledTwoBytes >> 8); + buffer[offset + 1] = (unsigned char)assembledTwoBytes; + offset += 2; + count--; + } + + append(result, buffer, nBytes, StringUtils::SHIFT_JIS); + delete[] buffer; +} + +void DecodedBitStreamParser::decodeByteSegment(Ref bits_, + string& result, + int count, + CharacterSetECI* currentCharacterSetECI, + ArrayRef< ArrayRef >& byteSegments, + Hashtable const& hints) { + int nBytes = count; + BitSource& bits (*bits_); + // Don't crash trying to read more bits than we have available. + if (count << 3 > bits.available()) { + throw FormatException(); + } + + ArrayRef bytes_ (count); + unsigned char* readBytes = &(*bytes_)[0]; + for (int i = 0; i < count; i++) { + readBytes[i] = (unsigned char) bits.readBits(8); + } + string encoding; + if (currentCharacterSetECI == 0) { + // The spec isn't clear on this mode; see + // section 6.4.5: t does not say which encoding to assuming + // upon decoding. I have seen ISO-8859-1 used as well as + // Shift_JIS -- without anything like an ECI designator to + // give a hint. + encoding = StringUtils::guessEncoding(readBytes, count, hints); + } else { + encoding = currentCharacterSetECI->name(); + } + try { + append(result, readBytes, nBytes, encoding.c_str()); + } catch (ReaderException const& re) { + throw FormatException(); + } + byteSegments->values().push_back(bytes_); +} + +void DecodedBitStreamParser::decodeNumericSegment(Ref bits, std::string &result, int count) { + int nBytes = count; + unsigned char* bytes = new unsigned char[nBytes]; + int i = 0; + // Read three digits at a time + while (count >= 3) { + // Each 10 bits encodes three digits + if (bits->available() < 10) { + throw ReaderException("format exception"); + } + int threeDigitsBits = bits->readBits(10); + if (threeDigitsBits >= 1000) { + ostringstream s; + s << "Illegal value for 3-digit unit: " << threeDigitsBits; + delete[] bytes; + throw ReaderException(s.str().c_str()); + } + bytes[i++] = ALPHANUMERIC_CHARS[threeDigitsBits / 100]; + bytes[i++] = ALPHANUMERIC_CHARS[(threeDigitsBits / 10) % 10]; + bytes[i++] = ALPHANUMERIC_CHARS[threeDigitsBits % 10]; + count -= 3; + } + if (count == 2) { + if (bits->available() < 7) { + throw ReaderException("format exception"); + } + // Two digits left over to read, encoded in 7 bits + int twoDigitsBits = bits->readBits(7); + if (twoDigitsBits >= 100) { + ostringstream s; + s << "Illegal value for 2-digit unit: " << twoDigitsBits; + delete[] bytes; + throw ReaderException(s.str().c_str()); + } + bytes[i++] = ALPHANUMERIC_CHARS[twoDigitsBits / 10]; + bytes[i++] = ALPHANUMERIC_CHARS[twoDigitsBits % 10]; + } else if (count == 1) { + if (bits->available() < 4) { + throw ReaderException("format exception"); + } + // One digit left over to read + int digitBits = bits->readBits(4); + if (digitBits >= 10) { + ostringstream s; + s << "Illegal value for digit unit: " << digitBits; + delete[] bytes; + throw ReaderException(s.str().c_str()); + } + bytes[i++] = ALPHANUMERIC_CHARS[digitBits]; + } + append(result, bytes, nBytes, StringUtils::ASCII); + delete[] bytes; +} + +char DecodedBitStreamParser::toAlphaNumericChar(size_t value) { + if (value >= sizeof(DecodedBitStreamParser::ALPHANUMERIC_CHARS)) { + throw FormatException(); + } + return ALPHANUMERIC_CHARS[value]; +} + +void DecodedBitStreamParser::decodeAlphanumericSegment(Ref bits_, + string& result, + int count, + bool fc1InEffect) { + BitSource& bits (*bits_); + ostringstream bytes; + // Read two characters at a time + while (count > 1) { + if (bits.available() < 11) { + throw FormatException(); + } + int nextTwoCharsBits = bits.readBits(11); + bytes << toAlphaNumericChar(nextTwoCharsBits / 45); + bytes << toAlphaNumericChar(nextTwoCharsBits % 45); + count -= 2; + } + if (count == 1) { + // special case: one character left + if (bits.available() < 6) { + throw FormatException(); + } + bytes << toAlphaNumericChar(bits.readBits(6)); + } + // See section 6.4.8.1, 6.4.8.2 + string s = bytes.str(); + if (fc1InEffect) { + // We need to massage the result a bit if in an FNC1 mode: + ostringstream r; + for (size_t i = 0; i < s.length(); i++) { + if (s[i] != '%') { + r << s[i]; + } else { + if (i < s.length() - 1 && s[i + 1] == '%') { + // %% is rendered as % + r << s[i++]; + } else { + // In alpha mode, % should be converted to FNC1 separator 0x1D + r << (char)0x1D; + } + } + } + s = r.str(); + } + append(result, s, StringUtils::ASCII); +} + +namespace { +int parseECIValue(BitSource bits) { + int firstByte = bits.readBits(8); + if ((firstByte & 0x80) == 0) { + // just one byte + return firstByte & 0x7F; + } + if ((firstByte & 0xC0) == 0x80) { + // two bytes + int secondByte = bits.readBits(8); + return ((firstByte & 0x3F) << 8) | secondByte; + } + if ((firstByte & 0xE0) == 0xC0) { + // three bytes + int secondThirdBytes = bits.readBits(16); + return ((firstByte & 0x1F) << 16) | secondThirdBytes; + } + throw FormatException(); +} +} + +Ref +DecodedBitStreamParser::decode(ArrayRef bytes, + Version* version, + ErrorCorrectionLevel const& ecLevel, + Hashtable const& hints) { + Ref bits_ (new BitSource(bytes)); + BitSource& bits (*bits_); + string result; + CharacterSetECI* currentCharacterSetECI = 0; + bool fc1InEffect = false; + ArrayRef< ArrayRef > byteSegments (size_t(0)); + Mode* mode = 0; + do { + // While still another segment to read... + if (bits.available() < 4) { + // OK, assume we're done. Really, a TERMINATOR mode should have been recorded here + mode = &Mode::TERMINATOR; + } else { + try { + mode = &Mode::forBits(bits.readBits(4)); // mode is encoded by 4 bits + } catch (IllegalArgumentException const& iae) { + throw iae; + // throw FormatException.getFormatInstance(); + } + } + if (mode != &Mode::TERMINATOR) { + if ((mode == &Mode::FNC1_FIRST_POSITION) || (mode == &Mode::FNC1_SECOND_POSITION)) { + // We do little with FNC1 except alter the parsed result a bit according to the spec + fc1InEffect = true; + } else if (mode == &Mode::STRUCTURED_APPEND) { + // not really supported; all we do is ignore it + // Read next 8 bits (symbol sequence #) and 8 bits (parity data), then continue + bits.readBits(16); + } else if (mode == &Mode::ECI) { + // Count doesn't apply to ECI + int value = parseECIValue(bits); + currentCharacterSetECI = CharacterSetECI::getCharacterSetECIByValue(value); + if (currentCharacterSetECI == 0) { + throw FormatException(); + } + } else { + // First handle Hanzi mode which does not start with character count + if (mode == &Mode::HANZI) { + //chinese mode contains a sub set indicator right after mode indicator + int subset = bits.readBits(4); + int countHanzi = bits.readBits(mode->getCharacterCountBits(version)); + if (subset == GB2312_SUBSET) { + decodeHanziSegment(bits_, result, countHanzi); + } + } else { + // "Normal" QR code modes: + // How many characters will follow, encoded in this mode? + int count = bits.readBits(mode->getCharacterCountBits(version)); + if (mode == &Mode::NUMERIC) { + decodeNumericSegment(bits_, result, count); + } else if (mode == &Mode::ALPHANUMERIC) { + decodeAlphanumericSegment(bits_, result, count, fc1InEffect); + } else if (mode == &Mode::BYTE) { + decodeByteSegment(bits_, result, count, currentCharacterSetECI, byteSegments, hints); + } else if (mode == &Mode::KANJI) { + decodeKanjiSegment(bits_, result, count); + } else { + throw FormatException(); + } + } + } + } + } while (mode != &Mode::TERMINATOR); + + return Ref(new DecoderResult(bytes, Ref(new String(result)), byteSegments, (string)ecLevel)); +} + diff --git a/src/qzxing/zxing/zxing/qrcode/decoder/QRDecoder.cpp b/src/qzxing/zxing/qrcode/decoder/QRDecoder.cpp similarity index 76% rename from src/qzxing/zxing/zxing/qrcode/decoder/QRDecoder.cpp rename to src/qzxing/zxing/qrcode/decoder/QRDecoder.cpp index 33a0cd4..0f1e338 100644 --- a/src/qzxing/zxing/zxing/qrcode/decoder/QRDecoder.cpp +++ b/src/qzxing/zxing/qrcode/decoder/QRDecoder.cpp @@ -1,4 +1,3 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- /* * Decoder.cpp * zxing @@ -26,22 +25,18 @@ #include #include #include -#include #include -using zxing::qrcode::Decoder; -using zxing::DecoderResult; -using zxing::Ref; +namespace zxing { +namespace qrcode { -// VC++ -using zxing::ArrayRef; -using zxing::BitMatrix; +using namespace std; Decoder::Decoder() : - rsDecoder_(GenericGF::QR_CODE_FIELD_256) { + rsDecoder_(GenericGF::QR_CODE_FIELD_256) { } -void Decoder::correctErrors(ArrayRef codewordBytes, int numDataCodewords) { +void Decoder::correctErrors(ArrayRef codewordBytes, int numDataCodewords) { int numCodewords = codewordBytes->size(); ArrayRef codewordInts(numCodewords); for (int i = 0; i < numCodewords; i++) { @@ -51,13 +46,13 @@ void Decoder::correctErrors(ArrayRef codewordBytes, int numDataCodewords) try { rsDecoder_.decode(codewordInts, numECCodewords); - } catch (ReedSolomonException const& ignored) { - (void)ignored; - throw ChecksumException(); + } catch (ReedSolomonException const& ex) { + ReaderException rex(ex.what()); + throw rex; } for (int i = 0; i < numDataCodewords; i++) { - codewordBytes[i] = (char)codewordInts[i]; + codewordBytes[i] = (unsigned char)codewordInts[i]; } } @@ -65,14 +60,12 @@ Ref Decoder::decode(Ref bits) { // Construct a parser and read version, error-correction level BitMatrixParser parser(bits); - // std::cerr << *bits << std::endl; - Version *version = parser.readVersion(); ErrorCorrectionLevel &ecLevel = parser.readFormatInformation()->getErrorCorrectionLevel(); // Read codewords - ArrayRef codewords(parser.readCodewords()); + ArrayRef codewords(parser.readCodewords()); // Separate into data blocks @@ -84,14 +77,14 @@ Ref Decoder::decode(Ref bits) { for (size_t i = 0; i < dataBlocks.size(); i++) { totalBytes += dataBlocks[i]->getNumDataCodewords(); } - ArrayRef resultBytes(totalBytes); + ArrayRef resultBytes(totalBytes); int resultOffset = 0; // Error-correct and copy data blocks together into a stream of bytes for (size_t j = 0; j < dataBlocks.size(); j++) { Ref dataBlock(dataBlocks[j]); - ArrayRef codewordBytes = dataBlock->getCodewords(); + ArrayRef codewordBytes = dataBlock->getCodewords(); int numDataCodewords = dataBlock->getNumDataCodewords(); correctErrors(codewordBytes, numDataCodewords); for (int i = 0; i < numDataCodewords; i++) { @@ -105,3 +98,5 @@ Ref Decoder::decode(Ref bits) { DecodedBitStreamParser::Hashtable()); } +} +} diff --git a/src/qzxing/zxing/zxing/qrcode/decoder/QRMode.cpp b/src/qzxing/zxing/qrcode/decoder/QRMode.cpp similarity index 65% rename from src/qzxing/zxing/zxing/qrcode/decoder/QRMode.cpp rename to src/qzxing/zxing/qrcode/decoder/QRMode.cpp index f2ee16c..ce55de3 100644 --- a/src/qzxing/zxing/zxing/qrcode/decoder/QRMode.cpp +++ b/src/qzxing/zxing/qrcode/decoder/QRMode.cpp @@ -19,7 +19,6 @@ * limitations under the License. */ -#include #include #include #include @@ -29,9 +28,6 @@ using zxing::qrcode::Mode; using std::ostringstream; -// VC++ -using zxing::qrcode::Version; - Mode Mode::TERMINATOR(0, 0, 0, 0x00, "TERMINATOR"); Mode Mode::NUMERIC(10, 12, 14, 0x01, "NUMERIC"); Mode Mode::ALPHANUMERIC(9, 11, 13, 0x02, "ALPHANUMERIC"); @@ -43,39 +39,39 @@ Mode Mode::FNC1_FIRST_POSITION(0, 0, 0, 0x05, "FNC1_FIRST_POSITION"); Mode Mode::FNC1_SECOND_POSITION(0, 0, 0, 0x09, "FNC1_SECOND_POSITION"); Mode Mode::HANZI(8, 10, 12, 0x0D, "HANZI"); -Mode::Mode(int cbv0_9, int cbv10_26, int cbv27, int /* bits */, char const* name) : - characterCountBitsForVersions0To9_(cbv0_9), characterCountBitsForVersions10To26_(cbv10_26), - characterCountBitsForVersions27AndHigher_(cbv27), name_(name) { +Mode::Mode(int cbv0_9, int cbv10_26, int cbv27, int bits, char const* name) : + characterCountBitsForVersions0To9_(cbv0_9), characterCountBitsForVersions10To26_(cbv10_26), + characterCountBitsForVersions27AndHigher_(cbv27), bits_(bits), name_(name) { } Mode& Mode::forBits(int bits) { - switch (bits) { - case 0x0: - return TERMINATOR; - case 0x1: - return NUMERIC; - case 0x2: - return ALPHANUMERIC; - case 0x3: - return STRUCTURED_APPEND; - case 0x4: - return BYTE; - case 0x5: - return FNC1_FIRST_POSITION; - case 0x7: - return ECI; - case 0x8: - return KANJI; - case 0x9: - return FNC1_SECOND_POSITION; - case 0xD: - // 0xD is defined in GBT 18284-2000, may not be supported in foreign country - return HANZI; - default: - ostringstream s; - s << "Illegal mode bits: " << bits; - throw ReaderException(s.str().c_str()); - } + switch (bits) { + case 0x0: + return TERMINATOR; + case 0x1: + return NUMERIC; + case 0x2: + return ALPHANUMERIC; + case 0x3: + return STRUCTURED_APPEND; + case 0x4: + return BYTE; + case 0x5: + return FNC1_FIRST_POSITION; + case 0x7: + return ECI; + case 0x8: + return KANJI; + case 0x9: + return FNC1_SECOND_POSITION; + case 0xD: + // 0xD is defined in GBT 18284-2000, may not be supported in foreign country + return HANZI; + default: + ostringstream s; + s << "Illegal mode bits: " << bits; + throw ReaderException(s.str().c_str()); + } } int Mode::getCharacterCountBits(Version *version) { diff --git a/src/qzxing/zxing/zxing/qrcode/detector/AlignmentPattern.h b/src/qzxing/zxing/qrcode/detector/AlignmentPattern.h similarity index 100% rename from src/qzxing/zxing/zxing/qrcode/detector/AlignmentPattern.h rename to src/qzxing/zxing/qrcode/detector/AlignmentPattern.h diff --git a/src/qzxing/zxing/zxing/qrcode/detector/AlignmentPatternFinder.h b/src/qzxing/zxing/qrcode/detector/AlignmentPatternFinder.h similarity index 82% rename from src/qzxing/zxing/zxing/qrcode/detector/AlignmentPatternFinder.h rename to src/qzxing/zxing/qrcode/detector/AlignmentPatternFinder.h index cbfb45e..e5e1f42 100644 --- a/src/qzxing/zxing/zxing/qrcode/detector/AlignmentPatternFinder.h +++ b/src/qzxing/zxing/qrcode/detector/AlignmentPatternFinder.h @@ -37,21 +37,21 @@ private: Ref image_; std::vector *possibleCenters_; - int startX_; - int startY_; - int width_; - int height_; + size_t startX_; + size_t startY_; + size_t width_; + size_t height_; float moduleSize_; static float centerFromEnd(std::vector &stateCount, int end); bool foundPatternCross(std::vector &stateCount); - float crossCheckVertical(int startI, int centerJ, int maxCount, int originalStateCountTotal); + float crossCheckVertical(size_t startI, size_t centerJ, int maxCount, int originalStateCountTotal); - Ref handlePossibleCenter(std::vector &stateCount, int i, int j); + Ref handlePossibleCenter(std::vector &stateCount, size_t i, size_t j); public: - AlignmentPatternFinder(Ref image, int startX, int startY, int width, int height, + AlignmentPatternFinder(Ref image, size_t startX, size_t startY, size_t width, size_t height, float moduleSize, Refconst& callback); ~AlignmentPatternFinder(); Ref find(); diff --git a/src/qzxing/zxing/zxing/qrcode/detector/Detector.h b/src/qzxing/zxing/qrcode/detector/Detector.h similarity index 89% rename from src/qzxing/zxing/zxing/qrcode/detector/Detector.h rename to src/qzxing/zxing/qrcode/detector/Detector.h index 383d5c2..62e5c86 100644 --- a/src/qzxing/zxing/zxing/qrcode/detector/Detector.h +++ b/src/qzxing/zxing/qrcode/detector/Detector.h @@ -1,4 +1,3 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- #ifndef __DETECTOR_H__ #define __DETECTOR_H__ @@ -41,8 +40,7 @@ private: Ref callback_; protected: - Ref getImage() const; - Ref getResultPointCallback() const; + Ref getImage(); static Ref sampleGrid(Ref image, int dimension, Ref); static int computeDimension(Ref topLeft, Ref topRight, Ref bottomLeft, @@ -55,15 +53,14 @@ protected: float allowanceFactor); Ref processFinderPatternInfo(Ref info); public: + virtual Ref createTransform(Ref topLeft, Ref topRight, Ref < ResultPoint > bottomLeft, Ref alignmentPattern, int dimension); Detector(Ref image); Ref detect(DecodeHints const& hints); - - }; } } -#endif // __DETECTOR_H__ +#endif // __DETECTOR_H__ \ No newline at end of file diff --git a/src/qzxing/zxing/zxing/qrcode/detector/FinderPattern.h b/src/qzxing/zxing/qrcode/detector/FinderPattern.h similarity index 96% rename from src/qzxing/zxing/zxing/qrcode/detector/FinderPattern.h rename to src/qzxing/zxing/qrcode/detector/FinderPattern.h index 89b499a..0e4f35e 100644 --- a/src/qzxing/zxing/zxing/qrcode/detector/FinderPattern.h +++ b/src/qzxing/zxing/qrcode/detector/FinderPattern.h @@ -32,10 +32,9 @@ namespace zxing { float estimatedModuleSize_; int count_; - FinderPattern(float posX, float posY, float estimatedModuleSize, int count); - public: FinderPattern(float posX, float posY, float estimatedModuleSize); + FinderPattern(float posX, float posY, float estimatedModuleSize, int count); int getCount() const; float getEstimatedModuleSize() const; void incrementCount(); diff --git a/src/qzxing/zxing/zxing/qrcode/detector/FinderPatternFinder.h b/src/qzxing/zxing/qrcode/detector/FinderPatternFinder.h similarity index 90% rename from src/qzxing/zxing/zxing/qrcode/detector/FinderPatternFinder.h rename to src/qzxing/zxing/qrcode/detector/FinderPatternFinder.h index 62956bf..07e78c0 100644 --- a/src/qzxing/zxing/zxing/qrcode/detector/FinderPatternFinder.h +++ b/src/qzxing/zxing/qrcode/detector/FinderPatternFinder.h @@ -1,4 +1,3 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- #ifndef __FINDER_PATTERN_FINDER_H__ #define __FINDER_PATTERN_FINDER_H__ @@ -61,10 +60,6 @@ protected: bool haveMultiplyConfirmedCenters(); std::vector > selectBestPatterns(); static std::vector > orderBestPatterns(std::vector > patterns); - - Ref getImage(); - std::vector >& getPossibleCenters(); - public: static float distance(Ref p1, Ref p2); FinderPatternFinder(Ref image, Refconst&); diff --git a/src/qzxing/zxing/zxing/qrcode/detector/FinderPatternInfo.h b/src/qzxing/zxing/qrcode/detector/FinderPatternInfo.h similarity index 100% rename from src/qzxing/zxing/zxing/qrcode/detector/FinderPatternInfo.h rename to src/qzxing/zxing/qrcode/detector/FinderPatternInfo.h diff --git a/src/qzxing/zxing/zxing/qrcode/detector/QRAlignmentPattern.cpp b/src/qzxing/zxing/qrcode/detector/QRAlignmentPattern.cpp similarity index 89% rename from src/qzxing/zxing/zxing/qrcode/detector/QRAlignmentPattern.cpp rename to src/qzxing/zxing/qrcode/detector/QRAlignmentPattern.cpp index c9d9179..0675f93 100644 --- a/src/qzxing/zxing/zxing/qrcode/detector/QRAlignmentPattern.cpp +++ b/src/qzxing/zxing/qrcode/detector/QRAlignmentPattern.cpp @@ -21,9 +21,10 @@ #include -using std::abs; -using zxing::Ref; -using zxing::qrcode::AlignmentPattern; +namespace zxing { +namespace qrcode { + +using namespace std; AlignmentPattern::AlignmentPattern(float posX, float posY, float estimatedModuleSize) : ResultPoint(posX,posY), estimatedModuleSize_(estimatedModuleSize) { @@ -42,6 +43,9 @@ Ref AlignmentPattern::combineEstimate(float i, float j, float float combinedY = (getY() + i) / 2.0f; float combinedModuleSize = (estimatedModuleSize_ + newModuleSize) / 2.0f; Ref result - (new AlignmentPattern(combinedX, combinedY, combinedModuleSize)); + (new AlignmentPattern(combinedX, combinedY, combinedModuleSize)); return result; } + +} +} diff --git a/src/qzxing/zxing/zxing/qrcode/detector/QRAlignmentPatternFinder.cpp b/src/qzxing/zxing/qrcode/detector/QRAlignmentPatternFinder.cpp similarity index 81% rename from src/qzxing/zxing/zxing/qrcode/detector/QRAlignmentPatternFinder.cpp rename to src/qzxing/zxing/qrcode/detector/QRAlignmentPatternFinder.cpp index 7eab209..ef82197 100644 --- a/src/qzxing/zxing/zxing/qrcode/detector/QRAlignmentPatternFinder.cpp +++ b/src/qzxing/zxing/qrcode/detector/QRAlignmentPatternFinder.cpp @@ -1,5 +1,9 @@ // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- /* + * AlignmentPatternFinder.cpp + * zxing + * + * Created by Christian Brunschen on 14/05/2008. * Copyright 2008 ZXing authors All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,31 +19,25 @@ * limitations under the License. */ -#include +#include "AlignmentPatternFinder.h" #include #include #include #include #include -using std::abs; -using std::vector; -using zxing::Ref; -using zxing::qrcode::AlignmentPatternFinder; -using zxing::qrcode::AlignmentPattern; +namespace zxing { +namespace qrcode { -// VC++ +using namespace std; -using zxing::BitMatrix; -using zxing::ResultPointCallback; - -float AlignmentPatternFinder::centerFromEnd(vector& stateCount, int end) { +float AlignmentPatternFinder::centerFromEnd(vector &stateCount, int end) { return (float)(end - stateCount[2]) - stateCount[1] / 2.0f; } bool AlignmentPatternFinder::foundPatternCross(vector &stateCount) { float maxVariance = moduleSize_ / 2.0f; - for (int i = 0; i < 3; i++) { + for (size_t i = 0; i < 3; i++) { if (abs(moduleSize_ - stateCount[i]) >= maxVariance) { return false; } @@ -47,8 +45,8 @@ bool AlignmentPatternFinder::foundPatternCross(vector &stateCount) { return true; } -float AlignmentPatternFinder::crossCheckVertical(int startI, int centerJ, int maxCount, - int originalStateCountTotal) { +float AlignmentPatternFinder::crossCheckVertical(size_t startI, size_t centerJ, int maxCount, + int originalStateCountTotal) { int maxI = image_->getHeight(); vector stateCount(3, 0); @@ -61,14 +59,14 @@ float AlignmentPatternFinder::crossCheckVertical(int startI, int centerJ, int ma } // If already too many modules in this state or ran off the edge: if (i < 0 || stateCount[1] > maxCount) { - return nan(); + return NAN; } while (i >= 0 && !image_->get(centerJ, i) && stateCount[0] <= maxCount) { stateCount[0]++; i--; } if (stateCount[0] > maxCount) { - return nan(); + return NAN; } // Now also count down from center @@ -78,29 +76,29 @@ float AlignmentPatternFinder::crossCheckVertical(int startI, int centerJ, int ma i++; } if (i == maxI || stateCount[1] > maxCount) { - return nan(); + return NAN; } while (i < maxI && !image_->get(centerJ, i) && stateCount[2] <= maxCount) { stateCount[2]++; i++; } if (stateCount[2] > maxCount) { - return nan(); + return NAN; } int stateCountTotal = stateCount[0] + stateCount[1] + stateCount[2]; if (5 * abs(stateCountTotal - originalStateCountTotal) >= 2 * originalStateCountTotal) { - return nan(); + return NAN; } - return foundPatternCross(stateCount) ? centerFromEnd(stateCount, i) : nan(); + return foundPatternCross(stateCount) ? centerFromEnd(stateCount, i) : NAN; } -Ref AlignmentPatternFinder::handlePossibleCenter(vector &stateCount, int i, int j) { +Ref AlignmentPatternFinder::handlePossibleCenter(vector &stateCount, size_t i, size_t j) { int stateCountTotal = stateCount[0] + stateCount[1] + stateCount[2]; float centerJ = centerFromEnd(stateCount, j); float centerI = crossCheckVertical(i, (int)centerJ, 2 * stateCount[1], stateCountTotal); - if (!zxing::isnan_z(centerI)) { + if (!isnan(centerI)) { float estimatedModuleSize = (float)(stateCount[0] + stateCount[1] + stateCount[2]) / 3.0f; int max = possibleCenters_->size(); for (int index = 0; index < max; index++) { @@ -122,15 +120,15 @@ Ref AlignmentPatternFinder::handlePossibleCenter(vector & return result; } -AlignmentPatternFinder::AlignmentPatternFinder(Ref image, int startX, int startY, int width, - int height, float moduleSize, +AlignmentPatternFinder::AlignmentPatternFinder(Ref image, size_t startX, size_t startY, size_t width, + size_t height, float moduleSize, Refconst& callback) : image_(image), possibleCenters_(new vector ()), startX_(startX), startY_(startY), width_(width), height_(height), moduleSize_(moduleSize), callback_(callback) { } AlignmentPatternFinder::~AlignmentPatternFinder() { - for (int i = 0; i < int(possibleCenters_->size()); i++) { + for (size_t i = 0; i < possibleCenters_->size(); i++) { (*possibleCenters_)[i]->release(); (*possibleCenters_)[i] = 0; } @@ -138,20 +136,20 @@ AlignmentPatternFinder::~AlignmentPatternFinder() { } Ref AlignmentPatternFinder::find() { - int maxJ = startX_ + width_; - int middleI = startY_ + (height_ >> 1); + size_t maxJ = startX_ + width_; + size_t middleI = startY_ + (height_ >> 1); // Ref luminanceRow(new BitArray(width_)); // We are looking for black/white/black modules in 1:1:1 ratio; // this tracks the number of black/white/black modules seen so far vector stateCount(3, 0); - for (int iGen = 0; iGen < height_; iGen++) { + for (size_t iGen = 0; iGen < height_; iGen++) { // Search from middle outwards - int i = middleI + ((iGen & 0x01) == 0 ? ((iGen + 1) >> 1) : -((iGen + 1) >> 1)); + size_t i = middleI + ((iGen & 0x01) == 0 ? ((iGen + 1) >> 1) : -((iGen + 1) >> 1)); // image_->getBlackRow(i, luminanceRow, startX_, width_); stateCount[0] = 0; stateCount[1] = 0; stateCount[2] = 0; - int j = startX_; + size_t j = startX_; // Burn off leading white pixels before anything else; if we start in the middle of // a white run, it doesn't make sense to count its length, since we don't know if the // white run continued to the left of the start point @@ -206,3 +204,6 @@ Ref AlignmentPatternFinder::find() { throw zxing::ReaderException("Could not find alignment pattern"); } + +} +} diff --git a/src/qzxing/zxing/zxing/qrcode/detector/QRDetector.cpp b/src/qzxing/zxing/qrcode/detector/QRDetector.cpp similarity index 58% rename from src/qzxing/zxing/zxing/qrcode/detector/QRDetector.cpp rename to src/qzxing/zxing/qrcode/detector/QRDetector.cpp index 0cf4bb0..4a30fce 100644 --- a/src/qzxing/zxing/zxing/qrcode/detector/QRDetector.cpp +++ b/src/qzxing/zxing/qrcode/detector/QRDetector.cpp @@ -27,39 +27,21 @@ #include #include #include -#include +#include #include #include -using std::ostringstream; -using std::abs; -using std::min; -using std::max; -using zxing::qrcode::Detector; -using zxing::Ref; -using zxing::BitMatrix; -using zxing::ResultPointCallback; -using zxing::DetectorResult; -using zxing::PerspectiveTransform; -using zxing::qrcode::AlignmentPattern; -using zxing::common::detector::MathUtils; +namespace zxing { +namespace qrcode { -// VC++ -using zxing::DecodeHints; -using zxing::qrcode::FinderPatternFinder; -using zxing::qrcode::FinderPatternInfo; -using zxing::ResultPoint; +using namespace std; Detector::Detector(Ref image) : - image_(image) { + image_(image) { } -Ref Detector::getImage() const { - return image_; -} - -Ref Detector::getResultPointCallback() const { - return callback_; +Ref Detector::getImage() { + return image_; } Ref Detector::detect(DecodeHints const& hints) { @@ -105,7 +87,6 @@ Ref Detector::processFinderPatternInfo(Ref in alignmentPattern = findAlignmentInRegion(moduleSize, estAlignmentX, estAlignmentY, (float)i); break; } catch (zxing::ReaderException const& re) { - (void)re; // try next round } } @@ -117,7 +98,7 @@ Ref Detector::processFinderPatternInfo(Ref in Ref transform = createTransform(topLeft, topRight, bottomLeft, alignmentPattern, dimension); Ref bits(sampleGrid(image_, dimension, transform)); - ArrayRef< Ref > points(new Array< Ref >(alignmentPattern == 0 ? 3 : 4)); + std::vector > points(alignmentPattern == 0 ? 3 : 4); points[0].reset(bottomLeft); points[1].reset(topLeft); points[2].reset(topRight); @@ -125,12 +106,12 @@ Ref Detector::processFinderPatternInfo(Ref in points[3].reset(alignmentPattern); } - Ref result(new DetectorResult(bits, points)); + Ref result(new DetectorResult(bits, points)); return result; } Ref Detector::createTransform(Ref topLeft, Ref topRight, Ref < - ResultPoint > bottomLeft, Ref alignmentPattern, int dimension) { + ResultPoint > bottomLeft, Ref alignmentPattern, int dimension) { float dimMinusThree = (float)dimension - 3.5f; float bottomRightX; @@ -140,19 +121,17 @@ Ref Detector::createTransform(Ref topLeft, Re if (alignmentPattern != 0) { bottomRightX = alignmentPattern->getX(); bottomRightY = alignmentPattern->getY(); - sourceBottomRightX = dimMinusThree - 3.0f; - sourceBottomRightY = sourceBottomRightX; + sourceBottomRightX = sourceBottomRightY = dimMinusThree - 3.0f; } else { // Don't have an alignment pattern, just make up the bottom-right point bottomRightX = (topRight->getX() - topLeft->getX()) + bottomLeft->getX(); bottomRightY = (topRight->getY() - topLeft->getY()) + bottomLeft->getY(); - sourceBottomRightX = dimMinusThree; - sourceBottomRightY = dimMinusThree; + sourceBottomRightX = sourceBottomRightY = dimMinusThree; } Ref transform(PerspectiveTransform::quadrilateralToQuadrilateral(3.5f, 3.5f, dimMinusThree, 3.5f, sourceBottomRightX, - sourceBottomRightY, 3.5f, dimMinusThree, topLeft->getX(), topLeft->getY(), topRight->getX(), - topRight->getY(), bottomRightX, bottomRightY, bottomLeft->getX(), bottomLeft->getY())); + sourceBottomRightY, 3.5f, dimMinusThree, topLeft->getX(), topLeft->getY(), topRight->getX(), + topRight->getY(), bottomRightX, bottomRightY, bottomLeft->getX(), bottomLeft->getY())); return transform; } @@ -164,10 +143,8 @@ Ref Detector::sampleGrid(Ref image, int dimension, Ref topLeft, Ref topRight, Ref bottomLeft, float moduleSize) { - int tltrCentersDimension = - MathUtils::round(ResultPoint::distance(topLeft, topRight) / moduleSize); - int tlblCentersDimension = - MathUtils::round(ResultPoint::distance(topLeft, bottomLeft) / moduleSize); + int tltrCentersDimension = int(FinderPatternFinder::distance(topLeft, topRight) / moduleSize + 0.5f); + int tlblCentersDimension = int(FinderPatternFinder::distance(topLeft, bottomLeft) / moduleSize + 0.5f); int dimension = ((tltrCentersDimension + tlblCentersDimension) >> 1) + 7; switch (dimension & 0x03) { // mod 4 case 0: @@ -192,13 +169,13 @@ float Detector::calculateModuleSize(Ref topLeft, Ref t float Detector::calculateModuleSizeOneWay(Ref pattern, Ref otherPattern) { float moduleSizeEst1 = sizeOfBlackWhiteBlackRunBothWays((int)pattern->getX(), (int)pattern->getY(), - (int)otherPattern->getX(), (int)otherPattern->getY()); + (int)otherPattern->getX(), (int)otherPattern->getY()); float moduleSizeEst2 = sizeOfBlackWhiteBlackRunBothWays((int)otherPattern->getX(), (int)otherPattern->getY(), - (int)pattern->getX(), (int)pattern->getY()); - if (zxing::isnan_z(moduleSizeEst1)) { + (int)pattern->getX(), (int)pattern->getY()); + if (isnan(moduleSizeEst1)) { return moduleSizeEst2; } - if (zxing::isnan_z(moduleSizeEst2)) { + if (isnan(moduleSizeEst2)) { return moduleSizeEst1; } // Average them, and divide by 7 since we've counted the width of 3 black modules, @@ -208,107 +185,114 @@ float Detector::calculateModuleSizeOneWay(Ref pattern, Ref= (int)image_->getWidth()) { - scale = (float) (image_->getWidth() - 1 - fromX) / (float) (otherToX - fromX); - otherToX = image_->getWidth() - 1; - } - int otherToY = (int) (fromY - (toY - fromY) * scale); + // Now count other way -- don't run off image though of course + float scale = 1.0f; + int otherToX = fromX - (toX - fromX); + if (otherToX < 0) { + scale = (float) fromX / (float) (fromX - otherToX); + otherToX = 0; + } else if (otherToX >= (int)image_->getWidth()) { + scale = (float) (image_->getWidth() - 1 - fromX) / (float) (otherToX - fromX); + otherToX = image_->getWidth() - 1; + } + int otherToY = (int) (fromY - (toY - fromY) * scale); - scale = 1.0f; - if (otherToY < 0) { - scale = (float) fromY / (float) (fromY - otherToY); - otherToY = 0; - } else if (otherToY >= (int)image_->getHeight()) { - scale = (float) (image_->getHeight() - 1 - fromY) / (float) (otherToY - fromY); - otherToY = image_->getHeight() - 1; - } - otherToX = (int) (fromX + (otherToX - fromX) * scale); + scale = 1.0f; + if (otherToY < 0) { + scale = (float) fromY / (float) (fromY - otherToY); + otherToY = 0; + } else if (otherToY >= (int)image_->getHeight()) { + scale = (float) (image_->getHeight() - 1 - fromY) / (float) (otherToY - fromY); + otherToY = image_->getHeight() - 1; + } + otherToX = (int) (fromX + (otherToX - fromX) * scale); - result += sizeOfBlackWhiteBlackRun(fromX, fromY, otherToX, otherToY); + result += sizeOfBlackWhiteBlackRun(fromX, fromY, otherToX, otherToY); - // Middle pixel is double-counted this way; subtract 1 - return result - 1.0f; + // Middle pixel is double-counted this way; subtract 1 + return result - 1.0f; } float Detector::sizeOfBlackWhiteBlackRun(int fromX, int fromY, int toX, int toY) { - // Mild variant of Bresenham's algorithm; - // see http://en.wikipedia.org/wiki/Bresenham's_line_algorithm - bool steep = abs(toY - fromY) > abs(toX - fromX); - if (steep) { - int temp = fromX; - fromX = fromY; - fromY = temp; - temp = toX; - toX = toY; - toY = temp; - } - - int dx = abs(toX - fromX); - int dy = abs(toY - fromY); - int error = -dx >> 1; - int xstep = fromX < toX ? 1 : -1; - int ystep = fromY < toY ? 1 : -1; - - // In black pixels, looking for white, first or second time. - int state = 0; - // Loop up until x == toX, but not beyond - int xLimit = toX + xstep; - for (int x = fromX, y = fromY; x != xLimit; x += xstep) { - int realX = steep ? y : x; - int realY = steep ? x : y; - - // Does current pixel mean we have moved white to black or vice versa? - if (!((state == 1) ^ image_->get(realX, realY))) { - if (state == 2) { - return MathUtils::distance(x, y, fromX, fromY); - } - state++; + // Mild variant of Bresenham's algorithm; + // see http://en.wikipedia.org/wiki/Bresenham's_line_algorithm + bool steep = abs(toY - fromY) > abs(toX - fromX); + if (steep) { + int temp = fromX; + fromX = fromY; + fromY = temp; + temp = toX; + toX = toY; + toY = temp; } - error += dy; - if (error > 0) { - if (y == toY) { - break; + int dx = abs(toX - fromX); + int dy = abs(toY - fromY); + int error = -dx >> 1; + int xstep = fromX < toX ? 1 : -1; + int ystep = fromY < toY ? 1 : -1; + + // In black pixels, looking for white, first or second time. + int state = 0; + // Loop up until x == toX, but not beyond + int xLimit = toX + xstep; + for (int x = fromX, y = fromY; x != xLimit; x += xstep) { + int realX = steep ? y : x; + int realY = steep ? x : y; + + // Does current pixel mean we have moved white to black or vice versa? + if (!((state == 1) ^ image_->get(realX, realY))) { + if (state == 2) { + int diffX = x - fromX; + int diffY = y - fromY; + return (float) sqrt((double) (diffX * diffX + diffY * diffY)); + } + state++; + } + + error += dy; + if (error > 0) { + if (y == toY) { + break; + } + y += ystep; + error -= dx; } - y += ystep; - error -= dx; } - } - // Found black-white-black; give the benefit of the doubt that the next pixel outside the image - // is "white" so this last point at (toX+xStep,toY) is the right ending. This is really a - // small approximation; (toX+xStep,toY+yStep) might be really correct. Ignore this. - if (state == 2) { - return MathUtils::distance(toX + xstep, toY, fromX, fromY); - } - // else we didn't find even black-white-black; no estimate is really possible - return nan(); + // Found black-white-black; give the benefit of the doubt that the next pixel outside the image + // is "white" so this last point at (toX+xStep,toY) is the right ending. This is really a + // small approximation; (toX+xStep,toY+yStep) might be really correct. Ignore this. + if (state == 2) { + int diffX = toX + xstep - fromX; + int diffY = toY - fromY; + return (float) sqrt((double) (diffX * diffX + diffY * diffY)); + } + // else we didn't find even black-white-black; no estimate is really possible + return NAN; } Ref Detector::findAlignmentInRegion(float overallEstModuleSize, int estAlignmentX, int estAlignmentY, - float allowanceFactor) { + float allowanceFactor) { // Look for an alignment pattern (3 modules in size) around where it // should be int allowance = (int)(allowanceFactor * overallEstModuleSize); int alignmentAreaLeftX = max(0, estAlignmentX - allowance); int alignmentAreaRightX = min((int)(image_->getWidth() - 1), estAlignmentX + allowance); if (alignmentAreaRightX - alignmentAreaLeftX < overallEstModuleSize * 3) { - throw zxing::ReaderException("region too small to hold alignment pattern"); + throw zxing::ReaderException("region too small to hold alignment pattern"); } int alignmentAreaTopY = max(0, estAlignmentY - allowance); int alignmentAreaBottomY = min((int)(image_->getHeight() - 1), estAlignmentY + allowance); if (alignmentAreaBottomY - alignmentAreaTopY < overallEstModuleSize * 3) { - throw zxing::ReaderException("region too small to hold alignment pattern"); + throw zxing::ReaderException("region too small to hold alignment pattern"); } AlignmentPatternFinder alignmentFinder(image_, alignmentAreaLeftX, alignmentAreaTopY, alignmentAreaRightX - alignmentAreaLeftX, alignmentAreaBottomY - alignmentAreaTopY, overallEstModuleSize, callback_); return alignmentFinder.find(); } + +} +} diff --git a/src/qzxing/zxing/qrcode/detector/QREdgeDetector.cpp b/src/qzxing/zxing/qrcode/detector/QREdgeDetector.cpp new file mode 100644 index 0000000..211f5da --- /dev/null +++ b/src/qzxing/zxing/qrcode/detector/QREdgeDetector.cpp @@ -0,0 +1,168 @@ +// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- +/* + * Created by Ralf Kistner on 7/12/2009. + * Copyright 2008 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include + +using namespace std; + +namespace zxing { +namespace qrcode { + +static const float patternEdgeThreshold = 2; +static const int patternEdgeWidth = 3; +static const float patternEdgeSearchRatio = 1.1; +static const int patternEdgeSkip = 2; + +static const float accurateEdgeThreshold = 3.3; +static const int accurateEdgeWidth = 7; +static const int accurateEdgeSkip = 2; + +static Point guessLastPattern(Point topLeft, Point topRight, Point bottomLeft) { + return Point(topRight.x - topLeft.x + bottomLeft.x, topRight.y - topLeft.y + bottomLeft.y); +} + +static Point rp(Ref rp) { + return Point(rp->getX(), rp->getY()); +} + +QREdgeDetector::QREdgeDetector(Ref image) : Detector(image) { } + +Ref QREdgeDetector::createTransform(Ref topLeft, Ref topRight, Ref < + ResultPoint > bottomLeft, Ref alignmentPattern, int dimension) { + + if(alignmentPattern == NULL) { + Point corner = findCorner(*Detector::getImage(), rp(topLeft), rp(topRight), rp(bottomLeft), dimension); + return get1CornerTransform(rp(topLeft), rp(topRight), rp(bottomLeft), corner, dimension); + } else { + return Detector::createTransform(topLeft, topRight, bottomLeft, alignmentPattern, dimension); + } +} + + + + +Point QREdgeDetector::findCorner(const BitMatrix& image, Point topLeft, Point topRight, Point bottomLeft, int dimension) { + (void)dimension; + Point bottomRight = guessLastPattern(topLeft, topRight, bottomLeft); + + Line bottomEst = findPatternEdge(image, bottomLeft, topLeft, bottomRight, false); + Line rightEst = findPatternEdge(image, topRight, topLeft, bottomRight, true); + + //return EdgeDetector::intersection(bottomEst, rightEst); + + Line bottom = EdgeDetector::findLine(image, bottomEst, false, accurateEdgeWidth, accurateEdgeThreshold, accurateEdgeSkip); + Line right = EdgeDetector::findLine(image, rightEst, true, accurateEdgeWidth, accurateEdgeThreshold, accurateEdgeSkip); + + + return EdgeDetector::intersection(bottom, right); +} + +Line QREdgeDetector::findPatternEdge(const BitMatrix& image, Point pattern, Point opposite, Point direction, bool invert) { + Point start = endOfReverseBlackWhiteBlackRun(image, pattern, opposite); + + float dx = pattern.x - start.x; + float dy = pattern.y - start.y; + float dist = sqrt(dx*dx + dy*dy); + + float dirX = direction.x - pattern.x; + float dirY = direction.y - pattern.y; + float dirSize = sqrt(dirX*dirX + dirY*dirY); + + float nx = dirX/dirSize; + float ny = dirY/dirSize; + + float search = dist * patternEdgeSearchRatio; + Point a(start.x + nx*search, start.y + ny*search); + Point b(start.x - nx*search, start.y - ny*search); + + return EdgeDetector::findLine(image, Line(a, b), invert, patternEdgeWidth, patternEdgeThreshold, patternEdgeSkip); +} + + +Ref QREdgeDetector::get1CornerTransform(Point topLeft, Point topRight, Point bottomLeft, Point corner, int dimension) { + float dimMinusThree = (float) dimension - 3.5f; + + Ref transform(PerspectiveTransform::quadrilateralToQuadrilateral(3.5f, 3.5f, dimMinusThree, 3.5f, dimension, + dimension, 3.5f, dimMinusThree, topLeft.x, topLeft.y, topRight.x, + topRight.y, corner.x, corner.y, bottomLeft.x, bottomLeft.y)); + + return transform; +} + +// Adapted from "sizeOfBlackWhiteBlackRun" in zxing::qrcode::Detector +Point QREdgeDetector::endOfReverseBlackWhiteBlackRun(const BitMatrix& image, Point from, Point to) { + int fromX = (int)from.x; + int fromY = (int)from.y; + int toX = (int)to.x; + int toY = (int)to.y; + + bool steep = abs(toY - fromY) > abs(toX - fromX); + if (steep) { + int temp = fromX; + fromX = fromY; + fromY = temp; + temp = toX; + toX = toY; + toY = temp; + } + + int dx = abs(toX - fromX); + int dy = abs(toY - fromY); + int error = -dx >> 1; + int ystep = fromY < toY ? -1 : 1; + int xstep = fromX < toX ? -1 : 1; + int state = 0; // In black pixels, looking for white, first or second time + + // In case there are no points, prepopulate to from + int realX = fromX; + int realY = fromY; + for (int x = fromX, y = fromY; x != toX; x += xstep) { + realX = steep ? y : x; + realY = steep ? x : y; + + if(realX < 0 || realY < 0 || realX >= (int)image.getWidth() || realY >= (int)image.getHeight()) + break; + + if (state == 1) { // In white pixels, looking for black + if (image.get(realX, realY)) { + state++; + } + } else { + if (!image.get(realX, realY)) { + state++; + } + } + + if (state == 3) { // Found black, white, black, and stumbled back onto white; done + return Point(realX, realY); + } + error += dy; + if (error > 0) { + y += ystep; + error -= dx; + } + } + + // B-W-B run not found, return the last point visited. + return Point(realX, realY); +} + +} // namespace qrcode +} // namespace zxing diff --git a/src/qzxing/zxing/qrcode/detector/QREdgeDetector.h b/src/qzxing/zxing/qrcode/detector/QREdgeDetector.h new file mode 100644 index 0000000..026545f --- /dev/null +++ b/src/qzxing/zxing/qrcode/detector/QREdgeDetector.h @@ -0,0 +1,48 @@ +#ifndef __QREDGEDETECTOR_H__ +#define __QREDGEDETECTOR_H__ +/* + * QREdgeDetector.h + * zxing + * + * Copyright 2010 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + + +#include +#include + +namespace zxing { +namespace qrcode { + +class QREdgeDetector : public Detector { +public: + QREdgeDetector(Ref image); + + virtual Ref createTransform(Ref topLeft, Ref topRight, Ref < + ResultPoint > bottomLeft, Ref alignmentPattern, int dimension); + +private: + Point findCorner(const BitMatrix& image, Point topLeft, Point topRight, Point bottomLeft, int dimension); + Line findPatternEdge(const BitMatrix& image, Point pattern, Point opposite, Point direction, bool invert); + + Point endOfReverseBlackWhiteBlackRun(const BitMatrix& image, Point from, Point to); + + Ref get1CornerTransform(Point topLeft, Point topRight, Point bottomLeft, Point corner, int dimension); +}; + +} +} +#endif // QREDGEDETECTOR_H_ diff --git a/src/qzxing/zxing/qrcode/detector/QRFinderPattern.cpp b/src/qzxing/zxing/qrcode/detector/QRFinderPattern.cpp new file mode 100644 index 0000000..89eee23 --- /dev/null +++ b/src/qzxing/zxing/qrcode/detector/QRFinderPattern.cpp @@ -0,0 +1,71 @@ +// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- +/* + * FinderPattern.cpp + * zxing + * + * Created by Christian Brunschen on 13/05/2008. + * Copyright 2008 ZXing authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +namespace zxing { + namespace qrcode { + + using namespace std; + + FinderPattern::FinderPattern(float posX, float posY, float estimatedModuleSize) : + ResultPoint(posX,posY), estimatedModuleSize_(estimatedModuleSize), count_(1) { + } + + FinderPattern::FinderPattern(float posX, float posY, float estimatedModuleSize, int count) : + ResultPoint(posX,posY), estimatedModuleSize_(estimatedModuleSize), count_(count) { + } + + int FinderPattern::getCount() const { + return count_; + } + + float FinderPattern::getEstimatedModuleSize() const { + return estimatedModuleSize_; + } + + void FinderPattern::incrementCount() { + count_++; + } + +/* + bool FinderPattern::aboutEquals(float moduleSize, float i, float j) const { + return abs(i - posY_) <= moduleSize && abs(j - posX_) <= moduleSize && (abs(moduleSize - estimatedModuleSize_) + <= 1.0f || abs(moduleSize - estimatedModuleSize_) / estimatedModuleSize_ <= 0.1f); + } +*/ + bool FinderPattern::aboutEquals(float moduleSize, float i, float j) const { + if (abs(i - getY()) <= moduleSize && abs(j - getX()) <= moduleSize) { + float moduleSizeDiff = abs(moduleSize - estimatedModuleSize_); + return moduleSizeDiff <= 1.0f || moduleSizeDiff <= estimatedModuleSize_; + } + return false; + } + + Ref FinderPattern::combineEstimate(float i, float j, float newModuleSize) const { + int combinedCount = count_ + 1; + float combinedX = (count_ * getX() + j) / combinedCount; + float combinedY = (count_ * getY() + i) / combinedCount; + float combinedModuleSize = (count_ * getEstimatedModuleSize() + newModuleSize) / combinedCount; + return Ref(new FinderPattern(combinedX, combinedY, combinedModuleSize, combinedCount)); + } + } +} diff --git a/src/qzxing/zxing/zxing/qrcode/detector/QRFinderPatternFinder.cpp b/src/qzxing/zxing/qrcode/detector/QRFinderPatternFinder.cpp similarity index 92% rename from src/qzxing/zxing/zxing/qrcode/detector/QRFinderPatternFinder.cpp rename to src/qzxing/zxing/qrcode/detector/QRFinderPatternFinder.cpp index ae43a6c..c14e0fd 100644 --- a/src/qzxing/zxing/zxing/qrcode/detector/QRFinderPatternFinder.cpp +++ b/src/qzxing/zxing/qrcode/detector/QRFinderPatternFinder.cpp @@ -19,28 +19,18 @@ * limitations under the License. */ -#include #include #include #include +#include +#include +#include +#include -using std::sort; -using std::max; -using std::abs; -using std::vector; -using zxing::Ref; -using zxing::qrcode::FinderPatternFinder; -using zxing::qrcode::FinderPattern; -using zxing::qrcode::FinderPatternInfo; +namespace zxing { +namespace qrcode { -// VC++ - -using zxing::BitMatrix; -using zxing::ResultPointCallback; -using zxing::ResultPoint; -using zxing::DecodeHints; - -namespace { +using namespace std; class FurthestFromAverageComparator { private: @@ -74,8 +64,6 @@ public: } }; -} - int FinderPatternFinder::CENTER_QUORUM = 2; int FinderPatternFinder::MIN_SKIP = 3; int FinderPatternFinder::MAX_MODULES = 57; @@ -118,7 +106,7 @@ float FinderPatternFinder::crossCheckVertical(size_t startI, size_t centerJ, int i--; } if (i < 0) { - return nan(); + return NAN; } while (i >= 0 && !image_->get(centerJ, i) && stateCount[1] <= maxCount) { stateCount[1]++; @@ -126,14 +114,14 @@ float FinderPatternFinder::crossCheckVertical(size_t startI, size_t centerJ, int } // If already too many modules in this state or ran off the edge: if (i < 0 || stateCount[1] > maxCount) { - return nan(); + return NAN; } while (i >= 0 && image_->get(centerJ, i) && stateCount[0] <= maxCount) { stateCount[0]++; i--; } if (stateCount[0] > maxCount) { - return nan(); + return NAN; } // Now also count down from center @@ -143,31 +131,31 @@ float FinderPatternFinder::crossCheckVertical(size_t startI, size_t centerJ, int i++; } if (i == maxI) { - return nan(); + return NAN; } while (i < maxI && !image_->get(centerJ, i) && stateCount[3] < maxCount) { stateCount[3]++; i++; } if (i == maxI || stateCount[3] >= maxCount) { - return nan(); + return NAN; } while (i < maxI && image_->get(centerJ, i) && stateCount[4] < maxCount) { stateCount[4]++; i++; } if (stateCount[4] >= maxCount) { - return nan(); + return NAN; } // If we found a finder-pattern-like section, but its size is more than 40% different than // the original, assume it's a false positive int stateCountTotal = stateCount[0] + stateCount[1] + stateCount[2] + stateCount[3] + stateCount[4]; if (5 * abs(stateCountTotal - originalStateCountTotal) >= 2 * originalStateCountTotal) { - return nan(); + return NAN; } - return foundPatternCross(stateCount) ? centerFromEnd(stateCount, i) : nan(); + return foundPatternCross(stateCount) ? centerFromEnd(stateCount, i) : NAN; } float FinderPatternFinder::crossCheckHorizontal(size_t startJ, size_t centerI, int maxCount, @@ -184,21 +172,21 @@ float FinderPatternFinder::crossCheckHorizontal(size_t startJ, size_t centerI, i j--; } if (j < 0) { - return nan(); + return NAN; } while (j >= 0 && !image_->get(j, centerI) && stateCount[1] <= maxCount) { stateCount[1]++; j--; } if (j < 0 || stateCount[1] > maxCount) { - return nan(); + return NAN; } while (j >= 0 && image_->get(j, centerI) && stateCount[0] <= maxCount) { stateCount[0]++; j--; } if (stateCount[0] > maxCount) { - return nan(); + return NAN; } j = startJ + 1; @@ -207,41 +195,41 @@ float FinderPatternFinder::crossCheckHorizontal(size_t startJ, size_t centerI, i j++; } if (j == maxJ) { - return nan(); + return NAN; } while (j < maxJ && !image_->get(j, centerI) && stateCount[3] < maxCount) { stateCount[3]++; j++; } if (j == maxJ || stateCount[3] >= maxCount) { - return nan(); + return NAN; } while (j < maxJ && image_->get(j, centerI) && stateCount[4] < maxCount) { stateCount[4]++; j++; } if (stateCount[4] >= maxCount) { - return nan(); + return NAN; } // If we found a finder-pattern-like section, but its size is significantly different than // the original, assume it's a false positive int stateCountTotal = stateCount[0] + stateCount[1] + stateCount[2] + stateCount[3] + stateCount[4]; if (5 * abs(stateCountTotal - originalStateCountTotal) >= originalStateCountTotal) { - return nan(); + return NAN; } - return foundPatternCross(stateCount) ? centerFromEnd(stateCount, j) : nan(); + return foundPatternCross(stateCount) ? centerFromEnd(stateCount, j) : NAN; } bool FinderPatternFinder::handlePossibleCenter(int* stateCount, size_t i, size_t j) { int stateCountTotal = stateCount[0] + stateCount[1] + stateCount[2] + stateCount[3] + stateCount[4]; float centerJ = centerFromEnd(stateCount, j); float centerI = crossCheckVertical(i, (size_t)centerJ, stateCount[2], stateCountTotal); - if (!zxing::isnan_z(centerI)) { + if (!isnan(centerI)) { // Re-cross check centerJ = crossCheckHorizontal((size_t)centerJ, (size_t)centerI, stateCount[2], stateCountTotal); - if (!zxing::isnan_z(centerJ)) { + if (!isnan(centerJ)) { float estimatedModuleSize = (float)stateCountTotal / 7.0f; bool found = false; size_t max = possibleCenters_.size(); @@ -320,7 +308,7 @@ bool FinderPatternFinder::haveMultiplyConfirmedCenters() { return totalDeviation <= 0.05f * totalModuleSize; } -vector< Ref > FinderPatternFinder::selectBestPatterns() { +vector > FinderPatternFinder::selectBestPatterns() { size_t startSize = possibleCenters_.size(); if (startSize < 3) { @@ -549,11 +537,5 @@ Ref FinderPatternFinder::find(DecodeHints const& hints) { Ref result(new FinderPatternInfo(patternInfo)); return result; } - -Ref FinderPatternFinder::getImage() { - return image_; } - -vector >& FinderPatternFinder::getPossibleCenters() { - return possibleCenters_; } diff --git a/src/qzxing/zxing/zxing/qrcode/detector/QRFinderPatternInfo.cpp b/src/qzxing/zxing/qrcode/detector/QRFinderPatternInfo.cpp similarity index 100% rename from src/qzxing/zxing/zxing/qrcode/detector/QRFinderPatternInfo.cpp rename to src/qzxing/zxing/qrcode/detector/QRFinderPatternInfo.cpp diff --git a/src/qzxing/zxing/win32/zxing/iconv.h b/src/qzxing/zxing/win32/zxing/iconv.h deleted file mode 100644 index 351d30d..0000000 --- a/src/qzxing/zxing/win32/zxing/iconv.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef _LIBICONV_H -#define _LIBICONV_H -#include -#ifdef __cplusplus -extern "C" { -#endif -typedef void* iconv_t; -iconv_t iconv_open(const char *tocode, const char *fromcode); -int iconv_close(iconv_t cd); -size_t iconv(iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft); -#ifdef __cplusplus -} -#endif -#endif//_LIBICONV_H \ No newline at end of file diff --git a/src/qzxing/zxing/win32/zxing/stdint/stdint.h b/src/qzxing/zxing/win32/zxing/stdint/stdint.h deleted file mode 100644 index 59d0673..0000000 --- a/src/qzxing/zxing/win32/zxing/stdint/stdint.h +++ /dev/null @@ -1,247 +0,0 @@ -// ISO C9x compliant stdint.h for Microsoft Visual Studio -// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 -// -// Copyright (c) 2006-2008 Alexander Chemeris -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// 3. The name of the author may be used to endorse or promote products -// derived from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _MSC_VER // [ -#error "Use this header only with Microsoft Visual C++ compilers!" -#endif // _MSC_VER ] - -#ifndef _MSC_STDINT_H_ // [ -#define _MSC_STDINT_H_ - -#if _MSC_VER > 1000 -#pragma once -#endif - -#include - -// For Visual Studio 6 in C++ mode and for many Visual Studio versions when -// compiling for ARM we should wrap include with 'extern "C++" {}' -// or compiler give many errors like this: -// error C2733: second C linkage of overloaded function 'wmemchr' not allowed -#ifdef __cplusplus -extern "C" { -#endif -# include -#ifdef __cplusplus -} -#endif - -// Define _W64 macros to mark types changing their size, like intptr_t. -#ifndef _W64 -# if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300 -# define _W64 __w64 -# else -# define _W64 -# endif -#endif - - -// 7.18.1 Integer types - -// 7.18.1.1 Exact-width integer types - -// Visual Studio 6 and Embedded Visual C++ 4 doesn't -// realize that, e.g. char has the same size as __int8 -// so we give up on __intX for them. -#if (_MSC_VER < 1300) - typedef signed char int8_t; - typedef signed short int16_t; - typedef signed int int32_t; - typedef unsigned char uint8_t; - typedef unsigned short uint16_t; - typedef unsigned int uint32_t; -#else - typedef signed __int8 int8_t; - typedef signed __int16 int16_t; - typedef signed __int32 int32_t; - typedef unsigned __int8 uint8_t; - typedef unsigned __int16 uint16_t; - typedef unsigned __int32 uint32_t; -#endif -typedef signed __int64 int64_t; -typedef unsigned __int64 uint64_t; - - -// 7.18.1.2 Minimum-width integer types -typedef int8_t int_least8_t; -typedef int16_t int_least16_t; -typedef int32_t int_least32_t; -typedef int64_t int_least64_t; -typedef uint8_t uint_least8_t; -typedef uint16_t uint_least16_t; -typedef uint32_t uint_least32_t; -typedef uint64_t uint_least64_t; - -// 7.18.1.3 Fastest minimum-width integer types -typedef int8_t int_fast8_t; -typedef int16_t int_fast16_t; -typedef int32_t int_fast32_t; -typedef int64_t int_fast64_t; -typedef uint8_t uint_fast8_t; -typedef uint16_t uint_fast16_t; -typedef uint32_t uint_fast32_t; -typedef uint64_t uint_fast64_t; - -// 7.18.1.4 Integer types capable of holding object pointers -#ifdef _WIN64 // [ - typedef signed __int64 intptr_t; - typedef unsigned __int64 uintptr_t; -#else // _WIN64 ][ - typedef _W64 signed int intptr_t; - typedef _W64 unsigned int uintptr_t; -#endif // _WIN64 ] - -// 7.18.1.5 Greatest-width integer types -typedef int64_t intmax_t; -typedef uint64_t uintmax_t; - - -// 7.18.2 Limits of specified-width integer types - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [ See footnote 220 at page 257 and footnote 221 at page 259 - -// 7.18.2.1 Limits of exact-width integer types -#define INT8_MIN ((int8_t)_I8_MIN) -#define INT8_MAX _I8_MAX -#define INT16_MIN ((int16_t)_I16_MIN) -#define INT16_MAX _I16_MAX -#define INT32_MIN ((int32_t)_I32_MIN) -#define INT32_MAX _I32_MAX -#define INT64_MIN ((int64_t)_I64_MIN) -#define INT64_MAX _I64_MAX -#define UINT8_MAX _UI8_MAX -#define UINT16_MAX _UI16_MAX -#define UINT32_MAX _UI32_MAX -#define UINT64_MAX _UI64_MAX - -// 7.18.2.2 Limits of minimum-width integer types -#define INT_LEAST8_MIN INT8_MIN -#define INT_LEAST8_MAX INT8_MAX -#define INT_LEAST16_MIN INT16_MIN -#define INT_LEAST16_MAX INT16_MAX -#define INT_LEAST32_MIN INT32_MIN -#define INT_LEAST32_MAX INT32_MAX -#define INT_LEAST64_MIN INT64_MIN -#define INT_LEAST64_MAX INT64_MAX -#define UINT_LEAST8_MAX UINT8_MAX -#define UINT_LEAST16_MAX UINT16_MAX -#define UINT_LEAST32_MAX UINT32_MAX -#define UINT_LEAST64_MAX UINT64_MAX - -// 7.18.2.3 Limits of fastest minimum-width integer types -#define INT_FAST8_MIN INT8_MIN -#define INT_FAST8_MAX INT8_MAX -#define INT_FAST16_MIN INT16_MIN -#define INT_FAST16_MAX INT16_MAX -#define INT_FAST32_MIN INT32_MIN -#define INT_FAST32_MAX INT32_MAX -#define INT_FAST64_MIN INT64_MIN -#define INT_FAST64_MAX INT64_MAX -#define UINT_FAST8_MAX UINT8_MAX -#define UINT_FAST16_MAX UINT16_MAX -#define UINT_FAST32_MAX UINT32_MAX -#define UINT_FAST64_MAX UINT64_MAX - -// 7.18.2.4 Limits of integer types capable of holding object pointers -#ifdef _WIN64 // [ -# define INTPTR_MIN INT64_MIN -# define INTPTR_MAX INT64_MAX -# define UINTPTR_MAX UINT64_MAX -#else // _WIN64 ][ -# define INTPTR_MIN INT32_MIN -# define INTPTR_MAX INT32_MAX -# define UINTPTR_MAX UINT32_MAX -#endif // _WIN64 ] - -// 7.18.2.5 Limits of greatest-width integer types -#define INTMAX_MIN INT64_MIN -#define INTMAX_MAX INT64_MAX -#define UINTMAX_MAX UINT64_MAX - -// 7.18.3 Limits of other integer types - -#ifdef _WIN64 // [ -# define PTRDIFF_MIN _I64_MIN -# define PTRDIFF_MAX _I64_MAX -#else // _WIN64 ][ -# define PTRDIFF_MIN _I32_MIN -# define PTRDIFF_MAX _I32_MAX -#endif // _WIN64 ] - -#define SIG_ATOMIC_MIN INT_MIN -#define SIG_ATOMIC_MAX INT_MAX - -#ifndef SIZE_MAX // [ -# ifdef _WIN64 // [ -# define SIZE_MAX _UI64_MAX -# else // _WIN64 ][ -# define SIZE_MAX _UI32_MAX -# endif // _WIN64 ] -#endif // SIZE_MAX ] - -// WCHAR_MIN and WCHAR_MAX are also defined in -#ifndef WCHAR_MIN // [ -# define WCHAR_MIN 0 -#endif // WCHAR_MIN ] -#ifndef WCHAR_MAX // [ -# define WCHAR_MAX _UI16_MAX -#endif // WCHAR_MAX ] - -#define WINT_MIN 0 -#define WINT_MAX _UI16_MAX - -#endif // __STDC_LIMIT_MACROS ] - - -// 7.18.4 Limits of other integer types - -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [ See footnote 224 at page 260 - -// 7.18.4.1 Macros for minimum-width integer constants - -#define INT8_C(val) val##i8 -#define INT16_C(val) val##i16 -#define INT32_C(val) val##i32 -#define INT64_C(val) val##i64 - -#define UINT8_C(val) val##ui8 -#define UINT16_C(val) val##ui16 -#define UINT32_C(val) val##ui32 -#define UINT64_C(val) val##ui64 - -// 7.18.4.2 Macros for greatest-width integer constants -#define INTMAX_C INT64_C -#define UINTMAX_C UINT64_C - -#endif // __STDC_CONSTANT_MACROS ] - - -#endif // _MSC_STDINT_H_ ] diff --git a/src/qzxing/zxing/win32/zxing/win_iconv.c b/src/qzxing/zxing/win32/zxing/win_iconv.c deleted file mode 100644 index 5c703c9..0000000 --- a/src/qzxing/zxing/win32/zxing/win_iconv.c +++ /dev/null @@ -1,2035 +0,0 @@ -/* - * iconv implementation using Win32 API to convert. - * - * This file is placed in the public domain. - */ - -/* for WC_NO_BEST_FIT_CHARS */ -#ifndef WINVER -# define WINVER 0x0500 -#endif - -#define STRICT -#include -#include -#include -#include - -/* WORKAROUND: */ -#ifndef UNDER_CE -#define GetProcAddressA GetProcAddress -#endif - -#if 0 -# define MAKE_EXE -# define MAKE_DLL -# define USE_LIBICONV_DLL -#endif - -#if !defined(DEFAULT_LIBICONV_DLL) -# define DEFAULT_LIBICONV_DLL "" -#endif - -#define MB_CHAR_MAX 16 - -#define UNICODE_MODE_BOM_DONE 1 -#define UNICODE_MODE_SWAPPED 2 - -#define FLAG_USE_BOM 1 -#define FLAG_TRANSLIT 2 /* //TRANSLIT */ -#define FLAG_IGNORE 4 /* //IGNORE */ - -typedef unsigned char uchar; -typedef unsigned short ushort; -typedef unsigned int uint; - -typedef void* iconv_t; - -iconv_t iconv_open(const char *tocode, const char *fromcode); -int iconv_close(iconv_t cd); -size_t iconv(iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft); - -/* libiconv interface for vim */ -#if defined(MAKE_DLL) -int -iconvctl (iconv_t cd, int request, void* argument) -{ - /* not supported */ - return 0; -} -#endif - -typedef struct compat_t compat_t; -typedef struct csconv_t csconv_t; -typedef struct rec_iconv_t rec_iconv_t; - -typedef iconv_t (*f_iconv_open)(const char *tocode, const char *fromcode); -typedef int (*f_iconv_close)(iconv_t cd); -typedef size_t (*f_iconv)(iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft); -typedef int* (*f_errno)(void); -typedef int (*f_mbtowc)(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize); -typedef int (*f_wctomb)(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize); -typedef int (*f_mblen)(csconv_t *cv, const uchar *buf, int bufsize); -typedef int (*f_flush)(csconv_t *cv, uchar *buf, int bufsize); - -#define COMPAT_IN 1 -#define COMPAT_OUT 2 - -/* unicode mapping for compatibility with other conversion table. */ -struct compat_t { - uint in; - uint out; - uint flag; -}; - -struct csconv_t { - int codepage; - int flags; - f_mbtowc mbtowc; - f_wctomb wctomb; - f_mblen mblen; - f_flush flush; - DWORD mode; - compat_t *compat; -}; - -struct rec_iconv_t { - iconv_t cd; - f_iconv_close iconv_close; - f_iconv iconv; - f_errno _errno; - csconv_t from; - csconv_t to; -#if defined(USE_LIBICONV_DLL) - HMODULE hlibiconv; -#endif -}; - -static int win_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode); -static int win_iconv_close(iconv_t cd); -static size_t win_iconv(iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft); - -static int load_mlang(); -static int make_csconv(const char *name, csconv_t *cv); -static int name_to_codepage(const char *name); -static uint utf16_to_ucs4(const ushort *wbuf); -static void ucs4_to_utf16(uint wc, ushort *wbuf, int *wbufsize); -static int mbtowc_flags(int codepage); -static int must_use_null_useddefaultchar(int codepage); -static char *strrstr(const char *str, const char *token); -static char *xstrndup(const char *s, size_t n); -static int seterror(int err); - -#if defined(USE_LIBICONV_DLL) -static int libiconv_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode); -static PVOID MyImageDirectoryEntryToData(LPVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size); -static HMODULE find_imported_module_by_funcname(HMODULE hModule, const char *funcname); - -static HMODULE hwiniconv; -#endif - -static int sbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize); -static int dbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize); -static int mbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize); -static int utf8_mblen(csconv_t *cv, const uchar *buf, int bufsize); -static int eucjp_mblen(csconv_t *cv, const uchar *buf, int bufsize); - -static int kernel_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize); -static int kernel_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize); -static int mlang_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize); -static int mlang_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize); -static int utf16_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize); -static int utf16_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize); -static int utf32_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize); -static int utf32_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize); -static int iso2022jp_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize); -static int iso2022jp_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize); -static int iso2022jp_flush(csconv_t *cv, uchar *buf, int bufsize); - -static struct { - int codepage; - const char *name; -} codepage_alias[] = { - {65001, "CP65001"}, - {65001, "UTF8"}, - {65001, "UTF-8"}, - - {1200, "CP1200"}, - {1200, "UTF16LE"}, - {1200, "UTF-16LE"}, - {1200, "UCS2LE"}, - {1200, "UCS-2LE"}, - - {1201, "CP1201"}, - {1201, "UTF16BE"}, - {1201, "UTF-16BE"}, - {1201, "UCS2BE"}, - {1201, "UCS-2BE"}, - {1201, "unicodeFFFE"}, - - {12000, "CP12000"}, - {12000, "UTF32LE"}, - {12000, "UTF-32LE"}, - {12000, "UCS4LE"}, - {12000, "UCS-4LE"}, - - {12001, "CP12001"}, - {12001, "UTF32BE"}, - {12001, "UTF-32BE"}, - {12001, "UCS4BE"}, - {12001, "UCS-4BE"}, - -#ifndef GLIB_COMPILATION - /* - * Default is big endian. - * See rfc2781 4.3 Interpreting text labelled as UTF-16. - */ - {1201, "UTF16"}, - {1201, "UTF-16"}, - {1201, "UCS2"}, - {1201, "UCS-2"}, - {12001, "UTF32"}, - {12001, "UTF-32"}, - {12001, "UCS-4"}, - {12001, "UCS4"}, -#else - /* Default is little endian, because the platform is */ - {1200, "UTF16"}, - {1200, "UTF-16"}, - {1200, "UCS2"}, - {1200, "UCS-2"}, - {12000, "UTF32"}, - {12000, "UTF-32"}, - {12000, "UCS4"}, - {12000, "UCS-4"}, -#endif - - /* copy from libiconv `iconv -l` */ - /* !IsValidCodePage(367) */ - {20127, "ANSI_X3.4-1968"}, - {20127, "ANSI_X3.4-1986"}, - {20127, "ASCII"}, - {20127, "CP367"}, - {20127, "IBM367"}, - {20127, "ISO-IR-6"}, - {20127, "ISO646-US"}, - {20127, "ISO_646.IRV:1991"}, - {20127, "US"}, - {20127, "US-ASCII"}, - {20127, "CSASCII"}, - - /* !IsValidCodePage(819) */ - {1252, "CP819"}, - {1252, "IBM819"}, - {28591, "ISO-8859-1"}, - {28591, "ISO-IR-100"}, - {28591, "ISO8859-1"}, - {28591, "ISO_8859-1"}, - {28591, "ISO_8859-1:1987"}, - {28591, "L1"}, - {28591, "LATIN1"}, - {28591, "CSISOLATIN1"}, - - {1250, "CP1250"}, - {1250, "MS-EE"}, - {1250, "WINDOWS-1250"}, - - {1251, "CP1251"}, - {1251, "MS-CYRL"}, - {1251, "WINDOWS-1251"}, - - {1252, "CP1252"}, - {1252, "MS-ANSI"}, - {1252, "WINDOWS-1252"}, - - {1253, "CP1253"}, - {1253, "MS-GREEK"}, - {1253, "WINDOWS-1253"}, - - {1254, "CP1254"}, - {1254, "MS-TURK"}, - {1254, "WINDOWS-1254"}, - - {1255, "CP1255"}, - {1255, "MS-HEBR"}, - {1255, "WINDOWS-1255"}, - - {1256, "CP1256"}, - {1256, "MS-ARAB"}, - {1256, "WINDOWS-1256"}, - - {1257, "CP1257"}, - {1257, "WINBALTRIM"}, - {1257, "WINDOWS-1257"}, - - {1258, "CP1258"}, - {1258, "WINDOWS-1258"}, - - {850, "850"}, - {850, "CP850"}, - {850, "IBM850"}, - {850, "CSPC850MULTILINGUAL"}, - - /* !IsValidCodePage(862) */ - {862, "862"}, - {862, "CP862"}, - {862, "IBM862"}, - {862, "CSPC862LATINHEBREW"}, - - {866, "866"}, - {866, "CP866"}, - {866, "IBM866"}, - {866, "CSIBM866"}, - - /* !IsValidCodePage(154) */ - {154, "CP154"}, - {154, "CYRILLIC-ASIAN"}, - {154, "PT154"}, - {154, "PTCP154"}, - {154, "CSPTCP154"}, - - /* !IsValidCodePage(1133) */ - {1133, "CP1133"}, - {1133, "IBM-CP1133"}, - - {874, "CP874"}, - {874, "WINDOWS-874"}, - - /* !IsValidCodePage(51932) */ - {51932, "CP51932"}, - {51932, "MS51932"}, - {51932, "WINDOWS-51932"}, - {51932, "EUC-JP"}, - - {932, "CP932"}, - {932, "MS932"}, - {932, "SHIFFT_JIS"}, - {932, "SHIFFT_JIS-MS"}, - {932, "SJIS"}, - {932, "SJIS-MS"}, - {932, "SJIS-OPEN"}, - {932, "SJIS-WIN"}, - {932, "WINDOWS-31J"}, - {932, "WINDOWS-932"}, - {932, "CSWINDOWS31J"}, - - {50221, "CP50221"}, - {50221, "ISO-2022-JP"}, - {50221, "ISO-2022-JP-MS"}, - {50221, "ISO2022-JP"}, - {50221, "ISO2022-JP-MS"}, - {50221, "MS50221"}, - {50221, "WINDOWS-50221"}, - - {936, "CP936"}, - {936, "GBK"}, - {936, "MS936"}, - {936, "WINDOWS-936"}, - - {950, "CP950"}, - {950, "BIG5"}, - {950, "BIG5HKSCS"}, - {950, "BIG5-HKSCS"}, - - {949, "CP949"}, - {949, "UHC"}, - {949, "EUC-KR"}, - - {1361, "CP1361"}, - {1361, "JOHAB"}, - - {437, "437"}, - {437, "CP437"}, - {437, "IBM437"}, - {437, "CSPC8CODEPAGE437"}, - - {737, "CP737"}, - - {775, "CP775"}, - {775, "IBM775"}, - {775, "CSPC775BALTIC"}, - - {852, "852"}, - {852, "CP852"}, - {852, "IBM852"}, - {852, "CSPCP852"}, - - /* !IsValidCodePage(853) */ - {853, "CP853"}, - - {855, "855"}, - {855, "CP855"}, - {855, "IBM855"}, - {855, "CSIBM855"}, - - {857, "857"}, - {857, "CP857"}, - {857, "IBM857"}, - {857, "CSIBM857"}, - - /* !IsValidCodePage(858) */ - {858, "CP858"}, - - {860, "860"}, - {860, "CP860"}, - {860, "IBM860"}, - {860, "CSIBM860"}, - - {861, "861"}, - {861, "CP-IS"}, - {861, "CP861"}, - {861, "IBM861"}, - {861, "CSIBM861"}, - - {863, "863"}, - {863, "CP863"}, - {863, "IBM863"}, - {863, "CSIBM863"}, - - {864, "CP864"}, - {864, "IBM864"}, - {864, "CSIBM864"}, - - {865, "865"}, - {865, "CP865"}, - {865, "IBM865"}, - {865, "CSIBM865"}, - - {869, "869"}, - {869, "CP-GR"}, - {869, "CP869"}, - {869, "IBM869"}, - {869, "CSIBM869"}, - - /* !IsValidCodePage(1152) */ - {1125, "CP1125"}, - - /* - * Code Page Identifiers - * http://msdn2.microsoft.com/en-us/library/ms776446.aspx - */ - {37, "IBM037"}, /* IBM EBCDIC US-Canada */ - {437, "IBM437"}, /* OEM United States */ - {500, "IBM500"}, /* IBM EBCDIC International */ - {708, "ASMO-708"}, /* Arabic (ASMO 708) */ - /* 709 Arabic (ASMO-449+, BCON V4) */ - /* 710 Arabic - Transparent Arabic */ - {720, "DOS-720"}, /* Arabic (Transparent ASMO); Arabic (DOS) */ - {737, "ibm737"}, /* OEM Greek (formerly 437G); Greek (DOS) */ - {775, "ibm775"}, /* OEM Baltic; Baltic (DOS) */ - {850, "ibm850"}, /* OEM Multilingual Latin 1; Western European (DOS) */ - {852, "ibm852"}, /* OEM Latin 2; Central European (DOS) */ - {855, "IBM855"}, /* OEM Cyrillic (primarily Russian) */ - {857, "ibm857"}, /* OEM Turkish; Turkish (DOS) */ - {858, "IBM00858"}, /* OEM Multilingual Latin 1 + Euro symbol */ - {860, "IBM860"}, /* OEM Portuguese; Portuguese (DOS) */ - {861, "ibm861"}, /* OEM Icelandic; Icelandic (DOS) */ - {862, "DOS-862"}, /* OEM Hebrew; Hebrew (DOS) */ - {863, "IBM863"}, /* OEM French Canadian; French Canadian (DOS) */ - {864, "IBM864"}, /* OEM Arabic; Arabic (864) */ - {865, "IBM865"}, /* OEM Nordic; Nordic (DOS) */ - {866, "cp866"}, /* OEM Russian; Cyrillic (DOS) */ - {869, "ibm869"}, /* OEM Modern Greek; Greek, Modern (DOS) */ - {870, "IBM870"}, /* IBM EBCDIC Multilingual/ROECE (Latin 2); IBM EBCDIC Multilingual Latin 2 */ - {874, "windows-874"}, /* ANSI/OEM Thai (same as 28605, ISO 8859-15); Thai (Windows) */ - {875, "cp875"}, /* IBM EBCDIC Greek Modern */ - {932, "shift_jis"}, /* ANSI/OEM Japanese; Japanese (Shift-JIS) */ - {932, "shift-jis"}, /* alternative name for it */ - {936, "gb2312"}, /* ANSI/OEM Simplified Chinese (PRC, Singapore); Chinese Simplified (GB2312) */ - {949, "ks_c_5601-1987"}, /* ANSI/OEM Korean (Unified Hangul Code) */ - {950, "big5"}, /* ANSI/OEM Traditional Chinese (Taiwan; Hong Kong SAR, PRC); Chinese Traditional (Big5) */ - {950, "big5hkscs"}, /* ANSI/OEM Traditional Chinese (Hong Kong SAR); Chinese Traditional (Big5-HKSCS) */ - {950, "big5-hkscs"}, /* alternative name for it */ - {1026, "IBM1026"}, /* IBM EBCDIC Turkish (Latin 5) */ - {1047, "IBM01047"}, /* IBM EBCDIC Latin 1/Open System */ - {1140, "IBM01140"}, /* IBM EBCDIC US-Canada (037 + Euro symbol); IBM EBCDIC (US-Canada-Euro) */ - {1141, "IBM01141"}, /* IBM EBCDIC Germany (20273 + Euro symbol); IBM EBCDIC (Germany-Euro) */ - {1142, "IBM01142"}, /* IBM EBCDIC Denmark-Norway (20277 + Euro symbol); IBM EBCDIC (Denmark-Norway-Euro) */ - {1143, "IBM01143"}, /* IBM EBCDIC Finland-Sweden (20278 + Euro symbol); IBM EBCDIC (Finland-Sweden-Euro) */ - {1144, "IBM01144"}, /* IBM EBCDIC Italy (20280 + Euro symbol); IBM EBCDIC (Italy-Euro) */ - {1145, "IBM01145"}, /* IBM EBCDIC Latin America-Spain (20284 + Euro symbol); IBM EBCDIC (Spain-Euro) */ - {1146, "IBM01146"}, /* IBM EBCDIC United Kingdom (20285 + Euro symbol); IBM EBCDIC (UK-Euro) */ - {1147, "IBM01147"}, /* IBM EBCDIC France (20297 + Euro symbol); IBM EBCDIC (France-Euro) */ - {1148, "IBM01148"}, /* IBM EBCDIC International (500 + Euro symbol); IBM EBCDIC (International-Euro) */ - {1149, "IBM01149"}, /* IBM EBCDIC Icelandic (20871 + Euro symbol); IBM EBCDIC (Icelandic-Euro) */ - {1250, "windows-1250"}, /* ANSI Central European; Central European (Windows) */ - {1251, "windows-1251"}, /* ANSI Cyrillic; Cyrillic (Windows) */ - {1252, "windows-1252"}, /* ANSI Latin 1; Western European (Windows) */ - {1253, "windows-1253"}, /* ANSI Greek; Greek (Windows) */ - {1254, "windows-1254"}, /* ANSI Turkish; Turkish (Windows) */ - {1255, "windows-1255"}, /* ANSI Hebrew; Hebrew (Windows) */ - {1256, "windows-1256"}, /* ANSI Arabic; Arabic (Windows) */ - {1257, "windows-1257"}, /* ANSI Baltic; Baltic (Windows) */ - {1258, "windows-1258"}, /* ANSI/OEM Vietnamese; Vietnamese (Windows) */ - {1361, "Johab"}, /* Korean (Johab) */ - {10000, "macintosh"}, /* MAC Roman; Western European (Mac) */ - {10001, "x-mac-japanese"}, /* Japanese (Mac) */ - {10002, "x-mac-chinesetrad"}, /* MAC Traditional Chinese (Big5); Chinese Traditional (Mac) */ - {10003, "x-mac-korean"}, /* Korean (Mac) */ - {10004, "x-mac-arabic"}, /* Arabic (Mac) */ - {10005, "x-mac-hebrew"}, /* Hebrew (Mac) */ - {10006, "x-mac-greek"}, /* Greek (Mac) */ - {10007, "x-mac-cyrillic"}, /* Cyrillic (Mac) */ - {10008, "x-mac-chinesesimp"}, /* MAC Simplified Chinese (GB 2312); Chinese Simplified (Mac) */ - {10010, "x-mac-romanian"}, /* Romanian (Mac) */ - {10017, "x-mac-ukrainian"}, /* Ukrainian (Mac) */ - {10021, "x-mac-thai"}, /* Thai (Mac) */ - {10029, "x-mac-ce"}, /* MAC Latin 2; Central European (Mac) */ - {10079, "x-mac-icelandic"}, /* Icelandic (Mac) */ - {10081, "x-mac-turkish"}, /* Turkish (Mac) */ - {10082, "x-mac-croatian"}, /* Croatian (Mac) */ - {20000, "x-Chinese_CNS"}, /* CNS Taiwan; Chinese Traditional (CNS) */ - {20001, "x-cp20001"}, /* TCA Taiwan */ - {20002, "x_Chinese-Eten"}, /* Eten Taiwan; Chinese Traditional (Eten) */ - {20003, "x-cp20003"}, /* IBM5550 Taiwan */ - {20004, "x-cp20004"}, /* TeleText Taiwan */ - {20005, "x-cp20005"}, /* Wang Taiwan */ - {20105, "x-IA5"}, /* IA5 (IRV International Alphabet No. 5, 7-bit); Western European (IA5) */ - {20106, "x-IA5-German"}, /* IA5 German (7-bit) */ - {20107, "x-IA5-Swedish"}, /* IA5 Swedish (7-bit) */ - {20108, "x-IA5-Norwegian"}, /* IA5 Norwegian (7-bit) */ - {20127, "us-ascii"}, /* US-ASCII (7-bit) */ - {20261, "x-cp20261"}, /* T.61 */ - {20269, "x-cp20269"}, /* ISO 6937 Non-Spacing Accent */ - {20273, "IBM273"}, /* IBM EBCDIC Germany */ - {20277, "IBM277"}, /* IBM EBCDIC Denmark-Norway */ - {20278, "IBM278"}, /* IBM EBCDIC Finland-Sweden */ - {20280, "IBM280"}, /* IBM EBCDIC Italy */ - {20284, "IBM284"}, /* IBM EBCDIC Latin America-Spain */ - {20285, "IBM285"}, /* IBM EBCDIC United Kingdom */ - {20290, "IBM290"}, /* IBM EBCDIC Japanese Katakana Extended */ - {20297, "IBM297"}, /* IBM EBCDIC France */ - {20420, "IBM420"}, /* IBM EBCDIC Arabic */ - {20423, "IBM423"}, /* IBM EBCDIC Greek */ - {20424, "IBM424"}, /* IBM EBCDIC Hebrew */ - {20833, "x-EBCDIC-KoreanExtended"}, /* IBM EBCDIC Korean Extended */ - {20838, "IBM-Thai"}, /* IBM EBCDIC Thai */ - {20866, "koi8-r"}, /* Russian (KOI8-R); Cyrillic (KOI8-R) */ - {20871, "IBM871"}, /* IBM EBCDIC Icelandic */ - {20880, "IBM880"}, /* IBM EBCDIC Cyrillic Russian */ - {20905, "IBM905"}, /* IBM EBCDIC Turkish */ - {20924, "IBM00924"}, /* IBM EBCDIC Latin 1/Open System (1047 + Euro symbol) */ - {20932, "EUC-JP"}, /* Japanese (JIS 0208-1990 and 0121-1990) */ - {20936, "x-cp20936"}, /* Simplified Chinese (GB2312); Chinese Simplified (GB2312-80) */ - {20949, "x-cp20949"}, /* Korean Wansung */ - {21025, "cp1025"}, /* IBM EBCDIC Cyrillic Serbian-Bulgarian */ - /* 21027 (deprecated) */ - {21866, "koi8-u"}, /* Ukrainian (KOI8-U); Cyrillic (KOI8-U) */ - {28591, "iso-8859-1"}, /* ISO 8859-1 Latin 1; Western European (ISO) */ - {28591, "iso8859-1"}, /* ISO 8859-1 Latin 1; Western European (ISO) */ - {28592, "iso-8859-2"}, /* ISO 8859-2 Central European; Central European (ISO) */ - {28592, "iso8859-2"}, /* ISO 8859-2 Central European; Central European (ISO) */ - {28593, "iso-8859-3"}, /* ISO 8859-3 Latin 3 */ - {28593, "iso8859-3"}, /* ISO 8859-3 Latin 3 */ - {28594, "iso-8859-4"}, /* ISO 8859-4 Baltic */ - {28594, "iso8859-4"}, /* ISO 8859-4 Baltic */ - {28595, "iso-8859-5"}, /* ISO 8859-5 Cyrillic */ - {28595, "iso8859-5"}, /* ISO 8859-5 Cyrillic */ - {28596, "iso-8859-6"}, /* ISO 8859-6 Arabic */ - {28596, "iso8859-6"}, /* ISO 8859-6 Arabic */ - {28597, "iso-8859-7"}, /* ISO 8859-7 Greek */ - {28597, "iso8859-7"}, /* ISO 8859-7 Greek */ - {28598, "iso-8859-8"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Visual) */ - {28598, "iso8859-8"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Visual) */ - {28599, "iso-8859-9"}, /* ISO 8859-9 Turkish */ - {28599, "iso8859-9"}, /* ISO 8859-9 Turkish */ - {28603, "iso-8859-13"}, /* ISO 8859-13 Estonian */ - {28603, "iso8859-13"}, /* ISO 8859-13 Estonian */ - {28605, "iso-8859-15"}, /* ISO 8859-15 Latin 9 */ - {28605, "iso8859-15"}, /* ISO 8859-15 Latin 9 */ - {29001, "x-Europa"}, /* Europa 3 */ - {38598, "iso-8859-8-i"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Logical) */ - {38598, "iso8859-8-i"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Logical) */ - {50220, "iso-2022-jp"}, /* ISO 2022 Japanese with no halfwidth Katakana; Japanese (JIS) */ - {50221, "csISO2022JP"}, /* ISO 2022 Japanese with halfwidth Katakana; Japanese (JIS-Allow 1 byte Kana) */ - {50222, "iso-2022-jp"}, /* ISO 2022 Japanese JIS X 0201-1989; Japanese (JIS-Allow 1 byte Kana - SO/SI) */ - {50225, "iso-2022-kr"}, /* ISO 2022 Korean */ - {50225, "iso2022-kr"}, /* ISO 2022 Korean */ - {50227, "x-cp50227"}, /* ISO 2022 Simplified Chinese; Chinese Simplified (ISO 2022) */ - /* 50229 ISO 2022 Traditional Chinese */ - /* 50930 EBCDIC Japanese (Katakana) Extended */ - /* 50931 EBCDIC US-Canada and Japanese */ - /* 50933 EBCDIC Korean Extended and Korean */ - /* 50935 EBCDIC Simplified Chinese Extended and Simplified Chinese */ - /* 50936 EBCDIC Simplified Chinese */ - /* 50937 EBCDIC US-Canada and Traditional Chinese */ - /* 50939 EBCDIC Japanese (Latin) Extended and Japanese */ - {51932, "euc-jp"}, /* EUC Japanese */ - {51936, "EUC-CN"}, /* EUC Simplified Chinese; Chinese Simplified (EUC) */ - {51949, "euc-kr"}, /* EUC Korean */ - /* 51950 EUC Traditional Chinese */ - {52936, "hz-gb-2312"}, /* HZ-GB2312 Simplified Chinese; Chinese Simplified (HZ) */ - {54936, "GB18030"}, /* Windows XP and later: GB18030 Simplified Chinese (4 byte); Chinese Simplified (GB18030) */ - {57002, "x-iscii-de"}, /* ISCII Devanagari */ - {57003, "x-iscii-be"}, /* ISCII Bengali */ - {57004, "x-iscii-ta"}, /* ISCII Tamil */ - {57005, "x-iscii-te"}, /* ISCII Telugu */ - {57006, "x-iscii-as"}, /* ISCII Assamese */ - {57007, "x-iscii-or"}, /* ISCII Oriya */ - {57008, "x-iscii-ka"}, /* ISCII Kannada */ - {57009, "x-iscii-ma"}, /* ISCII Malayalam */ - {57010, "x-iscii-gu"}, /* ISCII Gujarati */ - {57011, "x-iscii-pa"}, /* ISCII Punjabi */ - - {0, NULL} -}; - -/* - * SJIS SHIFTJIS table CP932 table - * ---- --------------------------- -------------------------------- - * 5C U+00A5 YEN SIGN U+005C REVERSE SOLIDUS - * 7E U+203E OVERLINE U+007E TILDE - * 815C U+2014 EM DASH U+2015 HORIZONTAL BAR - * 815F U+005C REVERSE SOLIDUS U+FF3C FULLWIDTH REVERSE SOLIDUS - * 8160 U+301C WAVE DASH U+FF5E FULLWIDTH TILDE - * 8161 U+2016 DOUBLE VERTICAL LINE U+2225 PARALLEL TO - * 817C U+2212 MINUS SIGN U+FF0D FULLWIDTH HYPHEN-MINUS - * 8191 U+00A2 CENT SIGN U+FFE0 FULLWIDTH CENT SIGN - * 8192 U+00A3 POUND SIGN U+FFE1 FULLWIDTH POUND SIGN - * 81CA U+00AC NOT SIGN U+FFE2 FULLWIDTH NOT SIGN - * - * EUC-JP and ISO-2022-JP should be compatible with CP932. - * - * Kernel and MLang have different Unicode mapping table. Make sure - * which API is used. - */ -static compat_t cp932_compat[] = { - {0x00A5, 0x005C, COMPAT_OUT}, - {0x203E, 0x007E, COMPAT_OUT}, - {0x2014, 0x2015, COMPAT_OUT}, - {0x301C, 0xFF5E, COMPAT_OUT}, - {0x2016, 0x2225, COMPAT_OUT}, - {0x2212, 0xFF0D, COMPAT_OUT}, - {0x00A2, 0xFFE0, COMPAT_OUT}, - {0x00A3, 0xFFE1, COMPAT_OUT}, - {0x00AC, 0xFFE2, COMPAT_OUT}, - {0, 0, 0} -}; - -static compat_t cp20932_compat[] = { - {0x00A5, 0x005C, COMPAT_OUT}, - {0x203E, 0x007E, COMPAT_OUT}, - {0x2014, 0x2015, COMPAT_OUT}, - {0xFF5E, 0x301C, COMPAT_OUT|COMPAT_IN}, - {0x2225, 0x2016, COMPAT_OUT|COMPAT_IN}, - {0xFF0D, 0x2212, COMPAT_OUT|COMPAT_IN}, - {0xFFE0, 0x00A2, COMPAT_OUT|COMPAT_IN}, - {0xFFE1, 0x00A3, COMPAT_OUT|COMPAT_IN}, - {0xFFE2, 0x00AC, COMPAT_OUT|COMPAT_IN}, - {0, 0, 0} -}; - -static compat_t *cp51932_compat = cp932_compat; - -/* cp20932_compat for kernel. cp932_compat for mlang. */ -static compat_t *cp5022x_compat = cp932_compat; - -typedef HRESULT (WINAPI *CONVERTINETSTRING)( - LPDWORD lpdwMode, - DWORD dwSrcEncoding, - DWORD dwDstEncoding, - LPCSTR lpSrcStr, - LPINT lpnSrcSize, - LPBYTE lpDstStr, - LPINT lpnDstSize -); -typedef HRESULT (WINAPI *CONVERTINETMULTIBYTETOUNICODE)( - LPDWORD lpdwMode, - DWORD dwSrcEncoding, - LPCSTR lpSrcStr, - LPINT lpnMultiCharCount, - LPWSTR lpDstStr, - LPINT lpnWideCharCount -); -typedef HRESULT (WINAPI *CONVERTINETUNICODETOMULTIBYTE)( - LPDWORD lpdwMode, - DWORD dwEncoding, - LPCWSTR lpSrcStr, - LPINT lpnWideCharCount, - LPSTR lpDstStr, - LPINT lpnMultiCharCount -); -typedef HRESULT (WINAPI *ISCONVERTINETSTRINGAVAILABLE)( - DWORD dwSrcEncoding, - DWORD dwDstEncoding -); -typedef HRESULT (WINAPI *LCIDTORFC1766A)( - LCID Locale, - LPSTR pszRfc1766, - int nChar -); -typedef HRESULT (WINAPI *LCIDTORFC1766W)( - LCID Locale, - LPWSTR pszRfc1766, - int nChar -); -typedef HRESULT (WINAPI *RFC1766TOLCIDA)( - LCID *pLocale, - LPSTR pszRfc1766 -); -typedef HRESULT (WINAPI *RFC1766TOLCIDW)( - LCID *pLocale, - LPWSTR pszRfc1766 -); -static CONVERTINETSTRING ConvertINetString; -static CONVERTINETMULTIBYTETOUNICODE ConvertINetMultiByteToUnicode; -static CONVERTINETUNICODETOMULTIBYTE ConvertINetUnicodeToMultiByte; -static ISCONVERTINETSTRINGAVAILABLE IsConvertINetStringAvailable; -static LCIDTORFC1766A LcidToRfc1766A; -static RFC1766TOLCIDA Rfc1766ToLcidA; - -static int -load_mlang() -{ - HMODULE h; - if (ConvertINetString != NULL) - return TRUE; - h = LoadLibrary(TEXT("mlang.dll")); - if (!h) - return FALSE; - ConvertINetString = (CONVERTINETSTRING)GetProcAddressA(h, "ConvertINetString"); - ConvertINetMultiByteToUnicode = (CONVERTINETMULTIBYTETOUNICODE)GetProcAddressA(h, "ConvertINetMultiByteToUnicode"); - ConvertINetUnicodeToMultiByte = (CONVERTINETUNICODETOMULTIBYTE)GetProcAddressA(h, "ConvertINetUnicodeToMultiByte"); - IsConvertINetStringAvailable = (ISCONVERTINETSTRINGAVAILABLE)GetProcAddressA(h, "IsConvertINetStringAvailable"); - LcidToRfc1766A = (LCIDTORFC1766A)GetProcAddressA(h, "LcidToRfc1766A"); - Rfc1766ToLcidA = (RFC1766TOLCIDA)GetProcAddressA(h, "Rfc1766ToLcidA"); - return TRUE; -} - -iconv_t -iconv_open(const char *tocode, const char *fromcode) -{ - rec_iconv_t *cd; - - cd = (rec_iconv_t *)calloc(1, sizeof(rec_iconv_t)); - if (cd == NULL) - return (iconv_t)(-1); - -#if defined(USE_LIBICONV_DLL) - errno = 0; - if (libiconv_iconv_open(cd, tocode, fromcode)) - return (iconv_t)cd; -#endif - - /* reset the errno to prevent reporting wrong error code. - * 0 for unsorted error. */ - errno = 0; - if (win_iconv_open(cd, tocode, fromcode)) - return (iconv_t)cd; - - free(cd); - - return (iconv_t)(-1); -} - -int -iconv_close(iconv_t _cd) -{ - rec_iconv_t *cd = (rec_iconv_t *)_cd; - int r = cd->iconv_close(cd->cd); - int e = *(cd->_errno()); -#if defined(USE_LIBICONV_DLL) - if (cd->hlibiconv != NULL) - FreeLibrary(cd->hlibiconv); -#endif - free(cd); - errno = e; - return r; -} - -size_t -iconv(iconv_t _cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft) -{ - rec_iconv_t *cd = (rec_iconv_t *)_cd; - size_t r = cd->iconv(cd->cd, inbuf, inbytesleft, outbuf, outbytesleft); - errno = *(cd->_errno()); - return r; -} - -static int -win_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode) -{ - if (!make_csconv(fromcode, &cd->from) || !make_csconv(tocode, &cd->to)) - return FALSE; - cd->iconv_close = win_iconv_close; - cd->iconv = win_iconv; - cd->_errno = _errno; - cd->cd = (iconv_t)cd; - return TRUE; -} - -static int -win_iconv_close(iconv_t cd) -{ - return 0; -} - -static size_t -win_iconv(iconv_t _cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft) -{ - rec_iconv_t *cd = (rec_iconv_t *)_cd; - ushort wbuf[MB_CHAR_MAX]; /* enough room for one character */ - int insize; - int outsize; - int wsize; - DWORD frommode; - DWORD tomode; - uint wc; - compat_t *cp; - int i; - - if (inbuf == NULL || *inbuf == NULL) - { - if (outbuf != NULL && *outbuf != NULL && cd->to.flush != NULL) - { - tomode = cd->to.mode; - outsize = cd->to.flush(&cd->to, (uchar *)*outbuf, *outbytesleft); - if (outsize == -1) - { - if ((cd->to.flags & FLAG_IGNORE) && errno != E2BIG) - { - outsize = 0; - } - else - { - cd->to.mode = tomode; - return (size_t)(-1); - } - } - *outbuf += outsize; - *outbytesleft -= outsize; - } - cd->from.mode = 0; - cd->to.mode = 0; - return 0; - } - - while (*inbytesleft != 0) - { - frommode = cd->from.mode; - tomode = cd->to.mode; - wsize = MB_CHAR_MAX; - - insize = cd->from.mbtowc(&cd->from, (const uchar *)*inbuf, *inbytesleft, wbuf, &wsize); - if (insize == -1) - { - if (cd->to.flags & FLAG_IGNORE) - { - cd->from.mode = frommode; - insize = 1; - wsize = 0; - } - else - { - cd->from.mode = frommode; - return (size_t)(-1); - } - } - - if (wsize == 0) - { - *inbuf += insize; - *inbytesleft -= insize; - continue; - } - - if (cd->from.compat != NULL) - { - wc = utf16_to_ucs4(wbuf); - cp = cd->from.compat; - for (i = 0; cp[i].in != 0; ++i) - { - if ((cp[i].flag & COMPAT_IN) && cp[i].out == wc) - { - ucs4_to_utf16(cp[i].in, wbuf, &wsize); - break; - } - } - } - - if (cd->to.compat != NULL) - { - wc = utf16_to_ucs4(wbuf); - cp = cd->to.compat; - for (i = 0; cp[i].in != 0; ++i) - { - if ((cp[i].flag & COMPAT_OUT) && cp[i].in == wc) - { - ucs4_to_utf16(cp[i].out, wbuf, &wsize); - break; - } - } - } - - outsize = cd->to.wctomb(&cd->to, wbuf, wsize, (uchar *)*outbuf, *outbytesleft); - if (outsize == -1) - { - if ((cd->to.flags & FLAG_IGNORE) && errno != E2BIG) - { - cd->to.mode = tomode; - outsize = 0; - } - else - { - cd->from.mode = frommode; - cd->to.mode = tomode; - return (size_t)(-1); - } - } - - *inbuf += insize; - *outbuf += outsize; - *inbytesleft -= insize; - *outbytesleft -= outsize; - } - - return 0; -} - -static int -make_csconv(const char *_name, csconv_t *cv) -{ - CPINFO cpinfo; - int use_compat = TRUE; - int flag = 0; - char *name; - char *p; - - name = xstrndup(_name, strlen(_name)); - if (name == NULL) - return FALSE; - - /* check for option "enc_name//opt1//opt2" */ - while ((p = strrstr(name, "//")) != NULL) - { - if (_stricmp(p + 2, "nocompat") == 0) - use_compat = FALSE; - else if (_stricmp(p + 2, "translit") == 0) - flag |= FLAG_TRANSLIT; - else if (_stricmp(p + 2, "ignore") == 0) - flag |= FLAG_IGNORE; - *p = 0; - } - - cv->mode = 0; - cv->flags = flag; - cv->mblen = NULL; - cv->flush = NULL; - cv->compat = NULL; - cv->codepage = name_to_codepage(name); - if (cv->codepage == 1200 || cv->codepage == 1201) - { - cv->mbtowc = utf16_mbtowc; - cv->wctomb = utf16_wctomb; - if (_stricmp(name, "UTF-16") == 0 || _stricmp(name, "UTF16") == 0 || - _stricmp(name, "UCS-2") == 0 || _stricmp(name, "UCS2") == 0) - cv->flags |= FLAG_USE_BOM; - } - else if (cv->codepage == 12000 || cv->codepage == 12001) - { - cv->mbtowc = utf32_mbtowc; - cv->wctomb = utf32_wctomb; - if (_stricmp(name, "UTF-32") == 0 || _stricmp(name, "UTF32") == 0 || - _stricmp(name, "UCS-4") == 0 || _stricmp(name, "UCS4") == 0) - cv->flags |= FLAG_USE_BOM; - } - else if (cv->codepage == 65001) - { - cv->mbtowc = kernel_mbtowc; - cv->wctomb = kernel_wctomb; - cv->mblen = utf8_mblen; - } - else if ((cv->codepage == 50220 || cv->codepage == 50221 || cv->codepage == 50222) && load_mlang()) - { - cv->mbtowc = iso2022jp_mbtowc; - cv->wctomb = iso2022jp_wctomb; - cv->flush = iso2022jp_flush; - } - else if (cv->codepage == 51932 && load_mlang()) - { - cv->mbtowc = mlang_mbtowc; - cv->wctomb = mlang_wctomb; - cv->mblen = eucjp_mblen; - } - else if (IsValidCodePage(cv->codepage) - && GetCPInfo(cv->codepage, &cpinfo) != 0) - { - cv->mbtowc = kernel_mbtowc; - cv->wctomb = kernel_wctomb; - if (cpinfo.MaxCharSize == 1) - cv->mblen = sbcs_mblen; - else if (cpinfo.MaxCharSize == 2) - cv->mblen = dbcs_mblen; - else - cv->mblen = mbcs_mblen; - } - else - { - /* not supported */ - free(name); - errno = EINVAL; - return FALSE; - } - - if (use_compat) - { - switch (cv->codepage) - { - case 932: cv->compat = cp932_compat; break; - case 20932: cv->compat = cp20932_compat; break; - case 51932: cv->compat = cp51932_compat; break; - case 50220: case 50221: case 50222: cv->compat = cp5022x_compat; break; - } - } - - free(name); - - return TRUE; -} - -static int -name_to_codepage(const char *name) -{ - int i; - - if (*name == '\0' || - strcmp(name, "char") == 0) - return GetACP(); - else if (strcmp(name, "wchar_t") == 0) - return 1200; - else if (_strnicmp(name, "cp", 2) == 0) - return atoi(name + 2); /* CP123 */ - else if ('0' <= name[0] && name[0] <= '9') - return atoi(name); /* 123 */ - else if (_strnicmp(name, "xx", 2) == 0) - return atoi(name + 2); /* XX123 for debug */ - - for (i = 0; codepage_alias[i].name != NULL; ++i) - if (_stricmp(name, codepage_alias[i].name) == 0) - return codepage_alias[i].codepage; - return -1; -} - -/* - * http://www.faqs.org/rfcs/rfc2781.html - */ -static uint -utf16_to_ucs4(const ushort *wbuf) -{ - uint wc = wbuf[0]; - if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF) - wc = ((wbuf[0] & 0x3FF) << 10) + (wbuf[1] & 0x3FF) + 0x10000; - return wc; -} - -static void -ucs4_to_utf16(uint wc, ushort *wbuf, int *wbufsize) -{ - if (wc < 0x10000) - { - wbuf[0] = wc; - *wbufsize = 1; - } - else - { - wc -= 0x10000; - wbuf[0] = 0xD800 | ((wc >> 10) & 0x3FF); - wbuf[1] = 0xDC00 | (wc & 0x3FF); - *wbufsize = 2; - } -} - -/* - * Check if codepage is one of those for which the dwFlags parameter - * to MultiByteToWideChar() must be zero. Return zero or - * MB_ERR_INVALID_CHARS. The docs in Platform SDK for for Windows - * Server 2003 R2 claims that also codepage 65001 is one of these, but - * that doesn't seem to be the case. The MSDN docs for MSVS2008 leave - * out 65001 (UTF-8), and that indeed seems to be the case on XP, it - * works fine to pass MB_ERR_INVALID_CHARS in dwFlags when converting - * from UTF-8. - */ -static int -mbtowc_flags(int codepage) -{ - return (codepage == 50220 || codepage == 50221 || - codepage == 50222 || codepage == 50225 || - codepage == 50227 || codepage == 50229 || - codepage == 52936 || codepage == 54936 || - (codepage >= 57002 && codepage <= 57011) || - codepage == 65000 || codepage == 42) ? 0 : MB_ERR_INVALID_CHARS; -} - -/* - * Check if codepage is one those for which the lpUsedDefaultChar - * parameter to WideCharToMultiByte() must be NULL. The docs in - * Platform SDK for for Windows Server 2003 R2 claims that this is the - * list below, while the MSDN docs for MSVS2008 claim that it is only - * for 65000 (UTF-7) and 65001 (UTF-8). This time the earlier Platform - * SDK seems to be correct, at least for XP. - */ -static int -must_use_null_useddefaultchar(int codepage) -{ - return (codepage == 65000 || codepage == 65001 || - codepage == 50220 || codepage == 50221 || - codepage == 50222 || codepage == 50225 || - codepage == 50227 || codepage == 50229 || - codepage == 52936 || codepage == 54936 || - (codepage >= 57002 && codepage <= 57011) || - codepage == 42); -} - -static char * -strrstr(const char *str, const char *token) -{ - int len = strlen(token); - const char *p = str + strlen(str); - - while (str <= --p) - if (p[0] == token[0] && strncmp(p, token, len) == 0) - return (char *)p; - return NULL; -} - -static char * -xstrndup(const char *s, size_t n) -{ - char *p; - - p = (char *)malloc(n + 1); - if (p == NULL) - return NULL; - memcpy(p, s, n); - p[n] = '\0'; - return p; -} - -static int -seterror(int err) -{ - errno = err; - return -1; -} - -#if defined(USE_LIBICONV_DLL) -static int -libiconv_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode) -{ - HMODULE hlibiconv = NULL; - HMODULE hmsvcrt = NULL; - char *dllname; - const char *p; - const char *e; - f_iconv_open _iconv_open; - - /* - * always try to load dll, so that we can switch dll in runtime. - */ - - /* XXX: getenv() can't get variable set by SetEnvironmentVariable() */ - p = getenv("WINICONV_LIBICONV_DLL"); - if (p == NULL) - p = DEFAULT_LIBICONV_DLL; - /* parse comma separated value */ - for ( ; *p != 0; p = (*e == ',') ? e + 1 : e) - { - e = strchr(p, ','); - if (p == e) - continue; - else if (e == NULL) - e = p + strlen(p); - dllname = xstrndup(p, e - p); - if (dllname == NULL) - return FALSE; - hlibiconv = LoadLibraryA(dllname); - free(dllname); - if (hlibiconv != NULL) - { - if (hlibiconv == hwiniconv) - { - FreeLibrary(hlibiconv); - hlibiconv = NULL; - continue; - } - break; - } - } - - if (hlibiconv == NULL) - goto failed; - - hmsvcrt = find_imported_module_by_funcname(hlibiconv, "_errno"); - if (hmsvcrt == NULL) - goto failed; - - _iconv_open = (f_iconv_open)GetProcAddressA(hlibiconv, "libiconv_open"); - if (_iconv_open == NULL) - _iconv_open = (f_iconv_open)GetProcAddressA(hlibiconv, "iconv_open"); - cd->iconv_close = (f_iconv_close)GetProcAddressA(hlibiconv, "libiconv_close"); - if (cd->iconv_close == NULL) - cd->iconv_close = (f_iconv_close)GetProcAddressA(hlibiconv, "iconv_close"); - cd->iconv = (f_iconv)GetProcAddressA(hlibiconv, "libiconv"); - if (cd->iconv == NULL) - cd->iconv = (f_iconv)GetProcAddressA(hlibiconv, "iconv"); - cd->_errno = (f_errno)GetProcAddressA(hmsvcrt, "_errno"); - if (_iconv_open == NULL || cd->iconv_close == NULL - || cd->iconv == NULL || cd->_errno == NULL) - goto failed; - - cd->cd = _iconv_open(tocode, fromcode); - if (cd->cd == (iconv_t)(-1)) - goto failed; - - cd->hlibiconv = hlibiconv; - return TRUE; - -failed: - if (hlibiconv != NULL) - FreeLibrary(hlibiconv); - /* do not free hmsvcrt which is obtained by GetModuleHandle() */ - return FALSE; -} - -/* - * Reference: - * http://forums.belution.com/ja/vc/000/234/78s.shtml - * http://nienie.com/~masapico/api_ImageDirectoryEntryToData.html - * - * The formal way is - * imagehlp.h or dbghelp.h - * imagehlp.lib or dbghelp.lib - * ImageDirectoryEntryToData() - */ -#define TO_DOS_HEADER(base) ((PIMAGE_DOS_HEADER)(base)) -#define TO_NT_HEADERS(base) ((PIMAGE_NT_HEADERS)((LPBYTE)(base) + TO_DOS_HEADER(base)->e_lfanew)) -static PVOID -MyImageDirectoryEntryToData(LPVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size) -{ - /* TODO: MappedAsImage? */ - PIMAGE_DATA_DIRECTORY p; - p = TO_NT_HEADERS(Base)->OptionalHeader.DataDirectory + DirectoryEntry; - if (p->VirtualAddress == 0) { - *Size = 0; - return NULL; - } - *Size = p->Size; - return (PVOID)((LPBYTE)Base + p->VirtualAddress); -} - -static HMODULE -find_imported_module_by_funcname(HMODULE hModule, const char *funcname) -{ - DWORD_PTR Base; - ULONG Size; - PIMAGE_IMPORT_DESCRIPTOR Imp; - PIMAGE_THUNK_DATA Name; /* Import Name Table */ - PIMAGE_IMPORT_BY_NAME ImpName; - - Base = (DWORD_PTR)hModule; - Imp = (PIMAGE_IMPORT_DESCRIPTOR)MyImageDirectoryEntryToData( - (LPVOID)Base, - TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, - &Size); - if (Imp == NULL) - return NULL; - for ( ; Imp->OriginalFirstThunk != 0; ++Imp) - { - Name = (PIMAGE_THUNK_DATA)(Base + Imp->OriginalFirstThunk); - for ( ; Name->u1.Ordinal != 0; ++Name) - { - if (!IMAGE_SNAP_BY_ORDINAL(Name->u1.Ordinal)) - { - ImpName = (PIMAGE_IMPORT_BY_NAME) - (Base + (DWORD_PTR)Name->u1.AddressOfData); - if (strcmp((char *)ImpName->Name, funcname) == 0) - return GetModuleHandleA((char *)(Base + Imp->Name)); - } - } - } - return NULL; -} -#endif - -static int -sbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize) -{ - return 1; -} - -static int -dbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize) -{ - int len = IsDBCSLeadByteEx(cv->codepage, buf[0]) ? 2 : 1; - if (bufsize < len) - return seterror(EINVAL); - return len; -} - -static int -mbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize) -{ - int len = 0; - - if (cv->codepage == 54936) { - if (buf[0] <= 0x7F) len = 1; - else if (buf[0] >= 0x81 && buf[0] <= 0xFE && - bufsize >= 2 && - ((buf[1] >= 0x40 && buf[1] <= 0x7E) || - (buf[1] >= 0x80 && buf[1] <= 0xFE))) len = 2; - else if (buf[0] >= 0x81 && buf[0] <= 0xFE && - bufsize >= 4 && - buf[1] >= 0x30 && buf[1] <= 0x39) len = 4; - else - return seterror(EINVAL); - return len; - } - else - return seterror(EINVAL); -} - -static int -utf8_mblen(csconv_t *cv, const uchar *buf, int bufsize) -{ - int len = 0; - - if (buf[0] < 0x80) len = 1; - else if ((buf[0] & 0xE0) == 0xC0) len = 2; - else if ((buf[0] & 0xF0) == 0xE0) len = 3; - else if ((buf[0] & 0xF8) == 0xF0) len = 4; - else if ((buf[0] & 0xFC) == 0xF8) len = 5; - else if ((buf[0] & 0xFE) == 0xFC) len = 6; - - if (len == 0) - return seterror(EILSEQ); - else if (bufsize < len) - return seterror(EINVAL); - return len; -} - -static int -eucjp_mblen(csconv_t *cv, const uchar *buf, int bufsize) -{ - if (buf[0] < 0x80) /* ASCII */ - return 1; - else if (buf[0] == 0x8E) /* JIS X 0201 */ - { - if (bufsize < 2) - return seterror(EINVAL); - else if (!(0xA1 <= buf[1] && buf[1] <= 0xDF)) - return seterror(EILSEQ); - return 2; - } - else if (buf[0] == 0x8F) /* JIS X 0212 */ - { - if (bufsize < 3) - return seterror(EINVAL); - else if (!(0xA1 <= buf[1] && buf[1] <= 0xFE) - || !(0xA1 <= buf[2] && buf[2] <= 0xFE)) - return seterror(EILSEQ); - return 3; - } - else /* JIS X 0208 */ - { - if (bufsize < 2) - return seterror(EINVAL); - else if (!(0xA1 <= buf[0] && buf[0] <= 0xFE) - || !(0xA1 <= buf[1] && buf[1] <= 0xFE)) - return seterror(EILSEQ); - return 2; - } -} - -static int -kernel_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize) -{ - int len; - - len = cv->mblen(cv, buf, bufsize); - if (len == -1) - return -1; - *wbufsize = MultiByteToWideChar(cv->codepage, mbtowc_flags (cv->codepage), - (const char *)buf, len, (wchar_t *)wbuf, *wbufsize); - if (*wbufsize == 0) - return seterror(EILSEQ); - return len; -} - -static int -kernel_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize) -{ - BOOL usedDefaultChar = 0; - BOOL *p = NULL; - int flags = 0; - int len; - - if (bufsize == 0) - return seterror(E2BIG); - if (!must_use_null_useddefaultchar(cv->codepage)) - { - p = &usedDefaultChar; -#ifdef WC_NO_BEST_FIT_CHARS - if (!(cv->flags & FLAG_TRANSLIT)) - flags |= WC_NO_BEST_FIT_CHARS; -#endif - } - len = WideCharToMultiByte(cv->codepage, flags, - (const wchar_t *)wbuf, wbufsize, (char *)buf, bufsize, NULL, p); - if (len == 0) - { - if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) - return seterror(E2BIG); - return seterror(EILSEQ); - } - else if (usedDefaultChar && !(cv->flags & FLAG_TRANSLIT)) - return seterror(EILSEQ); - else if (cv->mblen(cv, buf, len) != len) /* validate result */ - return seterror(EILSEQ); - return len; -} - -/* - * It seems that the mode (cv->mode) is fixnum. - * For example, when converting iso-2022-jp(cp50221) to unicode: - * in ascii sequence: mode=0xC42C0000 - * in jisx0208 sequence: mode=0xC42C0001 - * "C42C" is same for each convert session. - * It should be: ((codepage-1)<<16)|state - */ -static int -mlang_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize) -{ - int len; - int insize; - HRESULT hr; - - len = cv->mblen(cv, buf, bufsize); - if (len == -1) - return -1; - insize = len; - hr = ConvertINetMultiByteToUnicode(&cv->mode, cv->codepage, - (const char *)buf, &insize, (wchar_t *)wbuf, wbufsize); - if (hr != S_OK || insize != len) - return seterror(EILSEQ); - return len; -} - -static int -mlang_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize) -{ - char tmpbuf[MB_CHAR_MAX]; /* enough room for one character */ - int tmpsize = MB_CHAR_MAX; - int insize = wbufsize; - HRESULT hr; - - hr = ConvertINetUnicodeToMultiByte(&cv->mode, cv->codepage, - (const wchar_t *)wbuf, &wbufsize, tmpbuf, &tmpsize); - if (hr != S_OK || insize != wbufsize) - return seterror(EILSEQ); - else if (bufsize < tmpsize) - return seterror(E2BIG); - else if (cv->mblen(cv, (uchar *)tmpbuf, tmpsize) != tmpsize) - return seterror(EILSEQ); - memcpy(buf, tmpbuf, tmpsize); - return tmpsize; -} - -static int -utf16_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize) -{ - int codepage = cv->codepage; - - /* swap endian: 1200 <-> 1201 */ - if (cv->mode & UNICODE_MODE_SWAPPED) - codepage ^= 1; - - if (bufsize < 2) - return seterror(EINVAL); - if (codepage == 1200) /* little endian */ - wbuf[0] = (buf[1] << 8) | buf[0]; - else if (codepage == 1201) /* big endian */ - wbuf[0] = (buf[0] << 8) | buf[1]; - - if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE)) - { - cv->mode |= UNICODE_MODE_BOM_DONE; - if (wbuf[0] == 0xFFFE) - { - cv->mode |= UNICODE_MODE_SWAPPED; - *wbufsize = 0; - return 2; - } - else if (wbuf[0] == 0xFEFF) - { - *wbufsize = 0; - return 2; - } - } - - if (0xDC00 <= wbuf[0] && wbuf[0] <= 0xDFFF) - return seterror(EILSEQ); - if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF) - { - if (bufsize < 4) - return seterror(EINVAL); - if (codepage == 1200) /* little endian */ - wbuf[1] = (buf[3] << 8) | buf[2]; - else if (codepage == 1201) /* big endian */ - wbuf[1] = (buf[2] << 8) | buf[3]; - if (!(0xDC00 <= wbuf[1] && wbuf[1] <= 0xDFFF)) - return seterror(EILSEQ); - *wbufsize = 2; - return 4; - } - *wbufsize = 1; - return 2; -} - -static int -utf16_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize) -{ - if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE)) - { - int r; - - cv->mode |= UNICODE_MODE_BOM_DONE; - if (bufsize < 2) - return seterror(E2BIG); - if (cv->codepage == 1200) /* little endian */ - memcpy(buf, "\xFF\xFE", 2); - else if (cv->codepage == 1201) /* big endian */ - memcpy(buf, "\xFE\xFF", 2); - - r = utf16_wctomb(cv, wbuf, wbufsize, buf + 2, bufsize - 2); - if (r == -1) - return -1; - return r + 2; - } - - if (bufsize < 2) - return seterror(E2BIG); - if (cv->codepage == 1200) /* little endian */ - { - buf[0] = (wbuf[0] & 0x00FF); - buf[1] = (wbuf[0] & 0xFF00) >> 8; - } - else if (cv->codepage == 1201) /* big endian */ - { - buf[0] = (wbuf[0] & 0xFF00) >> 8; - buf[1] = (wbuf[0] & 0x00FF); - } - if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF) - { - if (bufsize < 4) - return seterror(E2BIG); - if (cv->codepage == 1200) /* little endian */ - { - buf[2] = (wbuf[1] & 0x00FF); - buf[3] = (wbuf[1] & 0xFF00) >> 8; - } - else if (cv->codepage == 1201) /* big endian */ - { - buf[2] = (wbuf[1] & 0xFF00) >> 8; - buf[3] = (wbuf[1] & 0x00FF); - } - return 4; - } - return 2; -} - -static int -utf32_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize) -{ - int codepage = cv->codepage; - uint wc; - - /* swap endian: 12000 <-> 12001 */ - if (cv->mode & UNICODE_MODE_SWAPPED) - codepage ^= 1; - - if (bufsize < 4) - return seterror(EINVAL); - if (codepage == 12000) /* little endian */ - wc = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; - else if (codepage == 12001) /* big endian */ - wc = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]; - - if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE)) - { - cv->mode |= UNICODE_MODE_BOM_DONE; - if (wc == 0xFFFE0000) - { - cv->mode |= UNICODE_MODE_SWAPPED; - *wbufsize = 0; - return 4; - } - else if (wc == 0x0000FEFF) - { - *wbufsize = 0; - return 4; - } - } - - if ((0xD800 <= wc && wc <= 0xDFFF) || 0x10FFFF < wc) - return seterror(EILSEQ); - ucs4_to_utf16(wc, wbuf, wbufsize); - return 4; -} - -static int -utf32_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize) -{ - uint wc; - - if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE)) - { - int r; - - cv->mode |= UNICODE_MODE_BOM_DONE; - if (bufsize < 4) - return seterror(E2BIG); - if (cv->codepage == 12000) /* little endian */ - memcpy(buf, "\xFF\xFE\x00\x00", 4); - else if (cv->codepage == 12001) /* big endian */ - memcpy(buf, "\x00\x00\xFE\xFF", 4); - - r = utf32_wctomb(cv, wbuf, wbufsize, buf + 4, bufsize - 4); - if (r == -1) - return -1; - return r + 4; - } - - if (bufsize < 4) - return seterror(E2BIG); - wc = utf16_to_ucs4(wbuf); - if (cv->codepage == 12000) /* little endian */ - { - buf[0] = wc & 0x000000FF; - buf[1] = (wc & 0x0000FF00) >> 8; - buf[2] = (wc & 0x00FF0000) >> 16; - buf[3] = (wc & 0xFF000000) >> 24; - } - else if (cv->codepage == 12001) /* big endian */ - { - buf[0] = (wc & 0xFF000000) >> 24; - buf[1] = (wc & 0x00FF0000) >> 16; - buf[2] = (wc & 0x0000FF00) >> 8; - buf[3] = wc & 0x000000FF; - } - return 4; -} - -/* - * 50220: ISO 2022 Japanese with no halfwidth Katakana; Japanese (JIS) - * 50221: ISO 2022 Japanese with halfwidth Katakana; Japanese (JIS-Allow - * 1 byte Kana) - * 50222: ISO 2022 Japanese JIS X 0201-1989; Japanese (JIS-Allow 1 byte - * Kana - SO/SI) - * - * MultiByteToWideChar() and WideCharToMultiByte() behave differently - * depending on Windows version. On XP, WideCharToMultiByte() doesn't - * terminate result sequence with ascii escape. But Vista does. - * Use MLang instead. - */ - -#define ISO2022_MODE(cs, shift) (((cs) << 8) | (shift)) -#define ISO2022_MODE_CS(mode) (((mode) >> 8) & 0xFF) -#define ISO2022_MODE_SHIFT(mode) ((mode) & 0xFF) - -#define ISO2022_SI 0 -#define ISO2022_SO 1 - -/* shift in */ -static const char iso2022_SI_seq[] = "\x0F"; -/* shift out */ -static const char iso2022_SO_seq[] = "\x0E"; - -typedef struct iso2022_esc_t iso2022_esc_t; -struct iso2022_esc_t { - const char *esc; - int esc_len; - int len; - int cs; -}; - -#define ISO2022JP_CS_ASCII 0 -#define ISO2022JP_CS_JISX0201_ROMAN 1 -#define ISO2022JP_CS_JISX0201_KANA 2 -#define ISO2022JP_CS_JISX0208_1978 3 -#define ISO2022JP_CS_JISX0208_1983 4 -#define ISO2022JP_CS_JISX0212 5 - -static iso2022_esc_t iso2022jp_esc[] = { - {"\x1B\x28\x42", 3, 1, ISO2022JP_CS_ASCII}, - {"\x1B\x28\x4A", 3, 1, ISO2022JP_CS_JISX0201_ROMAN}, - {"\x1B\x28\x49", 3, 1, ISO2022JP_CS_JISX0201_KANA}, - {"\x1B\x24\x40", 3, 2, ISO2022JP_CS_JISX0208_1983}, /* unify 1978 with 1983 */ - {"\x1B\x24\x42", 3, 2, ISO2022JP_CS_JISX0208_1983}, - {"\x1B\x24\x28\x44", 4, 2, ISO2022JP_CS_JISX0212}, - {NULL, 0, 0, 0} -}; - -static int -iso2022jp_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize) -{ - iso2022_esc_t *iesc = iso2022jp_esc; - char tmp[MB_CHAR_MAX]; - int insize; - HRESULT hr; - DWORD dummy = 0; - int len; - int esc_len; - int cs; - int shift; - int i; - - if (buf[0] == 0x1B) - { - for (i = 0; iesc[i].esc != NULL; ++i) - { - esc_len = iesc[i].esc_len; - if (bufsize < esc_len) - { - if (strncmp((char *)buf, iesc[i].esc, bufsize) == 0) - return seterror(EINVAL); - } - else - { - if (strncmp((char *)buf, iesc[i].esc, esc_len) == 0) - { - cv->mode = ISO2022_MODE(iesc[i].cs, ISO2022_SI); - *wbufsize = 0; - return esc_len; - } - } - } - /* not supported escape sequence */ - return seterror(EILSEQ); - } - else if (buf[0] == iso2022_SO_seq[0]) - { - cv->mode = ISO2022_MODE(ISO2022_MODE_CS(cv->mode), ISO2022_SO); - *wbufsize = 0; - return 1; - } - else if (buf[0] == iso2022_SI_seq[0]) - { - cv->mode = ISO2022_MODE(ISO2022_MODE_CS(cv->mode), ISO2022_SI); - *wbufsize = 0; - return 1; - } - - cs = ISO2022_MODE_CS(cv->mode); - shift = ISO2022_MODE_SHIFT(cv->mode); - - /* reset the mode for informal sequence */ - if (buf[0] < 0x20) - { - cs = ISO2022JP_CS_ASCII; - shift = ISO2022_SI; - } - - len = iesc[cs].len; - if (bufsize < len) - return seterror(EINVAL); - for (i = 0; i < len; ++i) - if (!(buf[i] < 0x80)) - return seterror(EILSEQ); - esc_len = iesc[cs].esc_len; - memcpy(tmp, iesc[cs].esc, esc_len); - if (shift == ISO2022_SO) - { - memcpy(tmp + esc_len, iso2022_SO_seq, 1); - esc_len += 1; - } - memcpy(tmp + esc_len, buf, len); - - if ((cv->codepage == 50220 || cv->codepage == 50221 - || cv->codepage == 50222) && shift == ISO2022_SO) - { - /* XXX: shift-out cannot be used for mbtowc (both kernel and - * mlang) */ - esc_len = iesc[ISO2022JP_CS_JISX0201_KANA].esc_len; - memcpy(tmp, iesc[ISO2022JP_CS_JISX0201_KANA].esc, esc_len); - memcpy(tmp + esc_len, buf, len); - } - - insize = len + esc_len; - hr = ConvertINetMultiByteToUnicode(&dummy, cv->codepage, - (const char *)tmp, &insize, (wchar_t *)wbuf, wbufsize); - if (hr != S_OK || insize != len + esc_len) - return seterror(EILSEQ); - - /* Check for conversion error. Assuming defaultChar is 0x3F. */ - /* ascii should be converted from ascii */ - if (wbuf[0] == buf[0] - && cv->mode != ISO2022_MODE(ISO2022JP_CS_ASCII, ISO2022_SI)) - return seterror(EILSEQ); - - /* reset the mode for informal sequence */ - if (cv->mode != ISO2022_MODE(cs, shift)) - cv->mode = ISO2022_MODE(cs, shift); - - return len; -} - -static int -iso2022jp_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize) -{ - iso2022_esc_t *iesc = iso2022jp_esc; - char tmp[MB_CHAR_MAX]; - int tmpsize = MB_CHAR_MAX; - int insize = wbufsize; - HRESULT hr; - DWORD dummy = 0; - int len; - int esc_len; - int cs; - int shift; - int i; - - /* - * MultiByte = [escape sequence] + character + [escape sequence] - * - * Whether trailing escape sequence is added depends on which API is - * used (kernel or MLang, and its version). - */ - hr = ConvertINetUnicodeToMultiByte(&dummy, cv->codepage, - (const wchar_t *)wbuf, &wbufsize, tmp, &tmpsize); - if (hr != S_OK || insize != wbufsize) - return seterror(EILSEQ); - else if (bufsize < tmpsize) - return seterror(E2BIG); - - if (tmpsize == 1) - { - cs = ISO2022JP_CS_ASCII; - esc_len = 0; - } - else - { - for (i = 1; iesc[i].esc != NULL; ++i) - { - esc_len = iesc[i].esc_len; - if (strncmp(tmp, iesc[i].esc, esc_len) == 0) - { - cs = iesc[i].cs; - break; - } - } - if (iesc[i].esc == NULL) - /* not supported escape sequence */ - return seterror(EILSEQ); - } - - shift = ISO2022_SI; - if (tmp[esc_len] == iso2022_SO_seq[0]) - { - shift = ISO2022_SO; - esc_len += 1; - } - - len = iesc[cs].len; - - /* Check for converting error. Assuming defaultChar is 0x3F. */ - /* ascii should be converted from ascii */ - if (cs == ISO2022JP_CS_ASCII && !(wbuf[0] < 0x80)) - return seterror(EILSEQ); - else if (tmpsize < esc_len + len) - return seterror(EILSEQ); - - if (cv->mode == ISO2022_MODE(cs, shift)) - { - /* remove escape sequence */ - if (esc_len != 0) - memmove(tmp, tmp + esc_len, len); - esc_len = 0; - } - else - { - if (cs == ISO2022JP_CS_ASCII) - { - esc_len = iesc[ISO2022JP_CS_ASCII].esc_len; - memmove(tmp + esc_len, tmp, len); - memcpy(tmp, iesc[ISO2022JP_CS_ASCII].esc, esc_len); - } - if (ISO2022_MODE_SHIFT(cv->mode) == ISO2022_SO) - { - /* shift-in before changing to other mode */ - memmove(tmp + 1, tmp, len + esc_len); - memcpy(tmp, iso2022_SI_seq, 1); - esc_len += 1; - } - } - - if (bufsize < len + esc_len) - return seterror(E2BIG); - memcpy(buf, tmp, len + esc_len); - cv->mode = ISO2022_MODE(cs, shift); - return len + esc_len; -} - -static int -iso2022jp_flush(csconv_t *cv, uchar *buf, int bufsize) -{ - iso2022_esc_t *iesc = iso2022jp_esc; - int esc_len; - - if (cv->mode != ISO2022_MODE(ISO2022JP_CS_ASCII, ISO2022_SI)) - { - esc_len = 0; - if (ISO2022_MODE_SHIFT(cv->mode) != ISO2022_SI) - esc_len += 1; - if (ISO2022_MODE_CS(cv->mode) != ISO2022JP_CS_ASCII) - esc_len += iesc[ISO2022JP_CS_ASCII].esc_len; - if (bufsize < esc_len) - return seterror(E2BIG); - - esc_len = 0; - if (ISO2022_MODE_SHIFT(cv->mode) != ISO2022_SI) - { - memcpy(buf, iso2022_SI_seq, 1); - esc_len += 1; - } - if (ISO2022_MODE_CS(cv->mode) != ISO2022JP_CS_ASCII) - { - memcpy(buf + esc_len, iesc[ISO2022JP_CS_ASCII].esc, - iesc[ISO2022JP_CS_ASCII].esc_len); - esc_len += iesc[ISO2022JP_CS_ASCII].esc_len; - } - return esc_len; - } - return 0; -} - -#if defined(MAKE_DLL) && defined(USE_LIBICONV_DLL) -BOOL WINAPI -DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) -{ - switch( fdwReason ) - { - case DLL_PROCESS_ATTACH: - hwiniconv = (HMODULE)hinstDLL; - break; - case DLL_THREAD_ATTACH: - case DLL_THREAD_DETACH: - case DLL_PROCESS_DETACH: - break; - } - return TRUE; -} -#endif - -#if defined(MAKE_EXE) -#include -#include -#include -int -main(int argc, char **argv) -{ - char *fromcode = NULL; - char *tocode = NULL; - int i; - char inbuf[BUFSIZ]; - char outbuf[BUFSIZ]; - char *pin; - char *pout; - size_t inbytesleft; - size_t outbytesleft; - size_t rest = 0; - iconv_t cd; - size_t r; - FILE *in = stdin; - int ignore = 0; - char *p; - - _setmode(_fileno(stdin), _O_BINARY); - _setmode(_fileno(stdout), _O_BINARY); - - for (i = 1; i < argc; ++i) - { - if (strcmp(argv[i], "-l") == 0) - { - for (i = 0; codepage_alias[i].name != NULL; ++i) - printf("%s\n", codepage_alias[i].name); - return 0; - } - - if (strcmp(argv[i], "-f") == 0) - fromcode = argv[++i]; - else if (strcmp(argv[i], "-t") == 0) - tocode = argv[++i]; - else if (strcmp(argv[i], "-c") == 0) - ignore = 1; - else - { - in = fopen(argv[i], "rb"); - if (in == NULL) - { - fprintf(stderr, "cannot open %s\n", argv[i]); - return 1; - } - break; - } - } - - if (fromcode == NULL || tocode == NULL) - { - printf("usage: %s [-c] -f from-enc -t to-enc [file]\n", argv[0]); - return 0; - } - - if (ignore) - { - p = tocode; - tocode = (char *)malloc(strlen(p) + strlen("//IGNORE") + 1); - if (tocode == NULL) - { - perror("fatal error"); - return 1; - } - strcpy(tocode, p); - strcat(tocode, "//IGNORE"); - } - - cd = iconv_open(tocode, fromcode); - if (cd == (iconv_t)(-1)) - { - perror("iconv_open error"); - return 1; - } - - while ((inbytesleft = fread(inbuf + rest, 1, sizeof(inbuf) - rest, in)) != 0 - || rest != 0) - { - inbytesleft += rest; - pin = inbuf; - pout = outbuf; - outbytesleft = sizeof(outbuf); - r = iconv(cd, &pin, &inbytesleft, &pout, &outbytesleft); - fwrite(outbuf, 1, sizeof(outbuf) - outbytesleft, stdout); - if (r == (size_t)(-1) && errno != E2BIG && (errno != EINVAL || feof(in))) - { - perror("conversion error"); - return 1; - } - memmove(inbuf, pin, inbytesleft); - rest = inbytesleft; - } - pout = outbuf; - outbytesleft = sizeof(outbuf); - r = iconv(cd, NULL, NULL, &pout, &outbytesleft); - fwrite(outbuf, 1, sizeof(outbuf) - outbytesleft, stdout); - if (r == (size_t)(-1)) - { - perror("conversion error"); - return 1; - } - - iconv_close(cd); - - return 0; -} -#endif - diff --git a/src/qzxing/zxing/zxing/BinaryBitmap.cpp b/src/qzxing/zxing/zxing/BinaryBitmap.cpp deleted file mode 100644 index 2b50776..0000000 --- a/src/qzxing/zxing/zxing/BinaryBitmap.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -using zxing::Ref; -using zxing::BitArray; -using zxing::BitMatrix; -using zxing::LuminanceSource; -using zxing::BinaryBitmap; - -// VC++ -using zxing::Binarizer; - -BinaryBitmap::BinaryBitmap(Ref binarizer) : binarizer_(binarizer) { -} - -BinaryBitmap::~BinaryBitmap() { -} - -Ref BinaryBitmap::getBlackRow(int y, Ref row) { - return binarizer_->getBlackRow(y, row); -} - -Ref BinaryBitmap::getBlackMatrix() { - return binarizer_->getBlackMatrix(); -} - -int BinaryBitmap::getWidth() const { - return getLuminanceSource()->getWidth(); -} - -int BinaryBitmap::getHeight() const { - return getLuminanceSource()->getHeight(); -} - -Ref BinaryBitmap::getLuminanceSource() const { - return binarizer_->getLuminanceSource(); -} - - -bool BinaryBitmap::isCropSupported() const { - return getLuminanceSource()->isCropSupported(); -} - -Ref BinaryBitmap::crop(int left, int top, int width, int height) { - return Ref (new BinaryBitmap(binarizer_->createBinarizer(getLuminanceSource()->crop(left, top, width, height)))); -} - -bool BinaryBitmap::isRotateSupported() const { - return getLuminanceSource()->isRotateSupported(); -} - -Ref BinaryBitmap::rotateCounterClockwise() { - return Ref (new BinaryBitmap(binarizer_->createBinarizer(getLuminanceSource()->rotateCounterClockwise()))); -} diff --git a/src/qzxing/zxing/zxing/DecodeHints.cpp b/src/qzxing/zxing/zxing/DecodeHints.cpp deleted file mode 100644 index 122b099..0000000 --- a/src/qzxing/zxing/zxing/DecodeHints.cpp +++ /dev/null @@ -1,144 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * DecodeHintType.cpp - * zxing - * - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include - -using zxing::Ref; -using zxing::ResultPointCallback; -using zxing::DecodeHintType; -using zxing::DecodeHints; - -// VC++ -using zxing::BarcodeFormat; - -#ifndef _MSC_VER -const DecodeHintType DecodeHints::CHARACTER_SET; -#endif - -const DecodeHints DecodeHints::PRODUCT_HINT( - UPC_A_HINT | - UPC_E_HINT | - EAN_13_HINT | - EAN_8_HINT | - RSS_14_HINT - ); - -const DecodeHints DecodeHints::ONED_HINT( - CODE_39_HINT | - CODE_93_HINT | - CODE_128_HINT | - ITF_HINT | - CODABAR_HINT | - DecodeHints::PRODUCT_HINT - ); - -const DecodeHints DecodeHints::DEFAULT_HINT( - ONED_HINT | - QR_CODE_HINT | - DATA_MATRIX_HINT | - AZTEC_HINT | - PDF_417_HINT - ); - -DecodeHints::DecodeHints() { - hints = 0; -} - -DecodeHints::DecodeHints(DecodeHintType init) { - hints = init; -} - -void DecodeHints::addFormat(BarcodeFormat toadd) { - switch (toadd) { - case BarcodeFormat::AZTEC: hints |= AZTEC_HINT; break; - case BarcodeFormat::CODABAR: hints |= CODABAR_HINT; break; - case BarcodeFormat::CODE_39: hints |= CODE_39_HINT; break; - case BarcodeFormat::CODE_93: hints |= CODE_93_HINT; break; - case BarcodeFormat::CODE_128: hints |= CODE_128_HINT; break; - case BarcodeFormat::DATA_MATRIX: hints |= DATA_MATRIX_HINT; break; - case BarcodeFormat::EAN_8: hints |= EAN_8_HINT; break; - case BarcodeFormat::EAN_13: hints |= EAN_13_HINT; break; - case BarcodeFormat::ITF: hints |= ITF_HINT; break; - case BarcodeFormat::MAXICODE: hints |= MAXICODE_HINT; break; - case BarcodeFormat::PDF_417: hints |= PDF_417_HINT; break; - case BarcodeFormat::QR_CODE: hints |= QR_CODE_HINT; break; - case BarcodeFormat::RSS_14: hints |= RSS_14_HINT; break; - case BarcodeFormat::RSS_EXPANDED: hints |= RSS_EXPANDED_HINT; break; - case BarcodeFormat::UPC_A: hints |= UPC_A_HINT; break; - case BarcodeFormat::UPC_E: hints |= UPC_E_HINT; break; - case BarcodeFormat::UPC_EAN_EXTENSION: hints |= UPC_EAN_EXTENSION_HINT; break; - default: throw IllegalArgumentException("Unrecognizd barcode format"); - } -} - -bool DecodeHints::containsFormat(BarcodeFormat tocheck) const { - DecodeHintType checkAgainst = 0; - switch (tocheck) { - case BarcodeFormat::AZTEC: checkAgainst |= AZTEC_HINT; break; - case BarcodeFormat::CODABAR: checkAgainst |= CODABAR_HINT; break; - case BarcodeFormat::CODE_39: checkAgainst |= CODE_39_HINT; break; - case BarcodeFormat::CODE_93: checkAgainst |= CODE_93_HINT; break; - case BarcodeFormat::CODE_128: checkAgainst |= CODE_128_HINT; break; - case BarcodeFormat::DATA_MATRIX: checkAgainst |= DATA_MATRIX_HINT; break; - case BarcodeFormat::EAN_8: checkAgainst |= EAN_8_HINT; break; - case BarcodeFormat::EAN_13: checkAgainst |= EAN_13_HINT; break; - case BarcodeFormat::ITF: checkAgainst |= ITF_HINT; break; - case BarcodeFormat::MAXICODE: checkAgainst |= MAXICODE_HINT; break; - case BarcodeFormat::PDF_417: checkAgainst |= PDF_417_HINT; break; - case BarcodeFormat::QR_CODE: checkAgainst |= QR_CODE_HINT; break; - case BarcodeFormat::RSS_14: checkAgainst |= RSS_14_HINT; break; - case BarcodeFormat::RSS_EXPANDED: checkAgainst |= RSS_EXPANDED_HINT; break; - case BarcodeFormat::UPC_A: checkAgainst |= UPC_A_HINT; break; - case BarcodeFormat::UPC_E: checkAgainst |= UPC_E_HINT; break; - case BarcodeFormat::UPC_EAN_EXTENSION: checkAgainst |= UPC_EAN_EXTENSION_HINT; break; - default: throw IllegalArgumentException("Unrecognizd barcode format"); - } - return (hints & checkAgainst) != 0; -} - -void DecodeHints::setTryHarder(bool toset) { - if (toset) { - hints |= TRYHARDER_HINT; - } else { - hints &= ~TRYHARDER_HINT; - } -} - -bool DecodeHints::getTryHarder() const { - return (hints & TRYHARDER_HINT) != 0; -} - -void DecodeHints::setResultPointCallback(Ref const& _callback) { - callback = _callback; -} - -Ref DecodeHints::getResultPointCallback() const { - return callback; -} - -DecodeHints zxing::operator | (DecodeHints const& l, DecodeHints const& r) { - DecodeHints result (l); - result.hints |= r.hints; - if (!result.callback) { - result.callback = r.callback; - } - return result; -} diff --git a/src/qzxing/zxing/zxing/DecodeHints.h b/src/qzxing/zxing/zxing/DecodeHints.h deleted file mode 100644 index c1fbfa4..0000000 --- a/src/qzxing/zxing/zxing/DecodeHints.h +++ /dev/null @@ -1,85 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -#ifndef __DECODEHINTS_H_ -#define __DECODEHINTS_H_ -/* - * DecodeHintType.h - * zxing - * - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include - -namespace zxing { - -typedef unsigned int DecodeHintType; -class DecodeHints; -DecodeHints operator | (DecodeHints const&, DecodeHints const&); - -class DecodeHints { - private: - DecodeHintType hints; - Ref callback; - - public: - static const DecodeHintType AZTEC_HINT = 1 << BarcodeFormat::AZTEC; - static const DecodeHintType CODABAR_HINT = 1 << BarcodeFormat::CODABAR; - static const DecodeHintType CODE_39_HINT = 1 << BarcodeFormat::CODE_39; - static const DecodeHintType CODE_93_HINT = 1 << BarcodeFormat::CODE_93; - static const DecodeHintType CODE_128_HINT = 1 << BarcodeFormat::CODE_128; - static const DecodeHintType DATA_MATRIX_HINT = 1 << BarcodeFormat::DATA_MATRIX; - static const DecodeHintType EAN_8_HINT = 1 << BarcodeFormat::EAN_8; - static const DecodeHintType EAN_13_HINT = 1 << BarcodeFormat::EAN_13; - static const DecodeHintType ITF_HINT = 1 << BarcodeFormat::ITF; - static const DecodeHintType MAXICODE_HINT = 1 << BarcodeFormat::MAXICODE; - static const DecodeHintType PDF_417_HINT = 1 << BarcodeFormat::PDF_417; - static const DecodeHintType QR_CODE_HINT = 1 << BarcodeFormat::QR_CODE; - static const DecodeHintType RSS_14_HINT = 1 << BarcodeFormat::RSS_14; - static const DecodeHintType RSS_EXPANDED_HINT = 1 << BarcodeFormat::RSS_EXPANDED; - static const DecodeHintType UPC_A_HINT = 1 << BarcodeFormat::UPC_A; - static const DecodeHintType UPC_E_HINT = 1 << BarcodeFormat::UPC_E; - static const DecodeHintType UPC_EAN_EXTENSION_HINT = 1 << BarcodeFormat::UPC_EAN_EXTENSION; - - static const DecodeHintType TRYHARDER_HINT = 1 << 31; - static const DecodeHintType CHARACTER_SET = 1 << 30; - // static const DecodeHintType ALLOWED_LENGTHS = 1 << 29; - // static const DecodeHintType ASSUME_CODE_39_CHECK_DIGIT = 1 << 28; - static const DecodeHintType ASSUME_GS1 = 1 << 27; - // static const DecodeHintType NEED_RESULT_POINT_CALLBACK = 1 << 26; - - static const DecodeHints PRODUCT_HINT; - static const DecodeHints ONED_HINT; - static const DecodeHints DEFAULT_HINT; - - DecodeHints(); - DecodeHints(DecodeHintType init); - - void addFormat(BarcodeFormat toadd); - bool containsFormat(BarcodeFormat tocheck) const; - bool isEmpty() const {return (hints==0);} - void clear() {hints=0;} - void setTryHarder(bool toset); - bool getTryHarder() const; - - void setResultPointCallback(Ref const&); - Ref getResultPointCallback() const; - - friend DecodeHints operator | (DecodeHints const&, DecodeHints const&); -}; - -} - -#endif diff --git a/src/qzxing/zxing/zxing/IllegalStateException.h b/src/qzxing/zxing/zxing/IllegalStateException.h deleted file mode 100644 index 403b703..0000000 --- a/src/qzxing/zxing/zxing/IllegalStateException.h +++ /dev/null @@ -1,35 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- - -#ifndef __ILLEGAL_STATE_EXCEPTION_H__ -#define __ILLEGAL_STATE_EXCEPTION_H__ - -/* - * Copyright 20011 ZXing authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may illegal use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -namespace zxing { - -class IllegalStateException : public ReaderException { -public: - IllegalStateException() throw() {} - IllegalStateException(const char *msg) throw() : ReaderException(msg) {} - ~IllegalStateException() throw() {} -}; - -} - -#endif // __ILLEGAL_STATE_EXCEPTION_H__ diff --git a/src/qzxing/zxing/zxing/InvertedLuminanceSource.cpp b/src/qzxing/zxing/zxing/InvertedLuminanceSource.cpp deleted file mode 100644 index 0a01953..0000000 --- a/src/qzxing/zxing/zxing/InvertedLuminanceSource.cpp +++ /dev/null @@ -1,68 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2013 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include - -using zxing::boolean; -using zxing::Ref; -using zxing::ArrayRef; -using zxing::LuminanceSource; -using zxing::InvertedLuminanceSource; - -InvertedLuminanceSource::InvertedLuminanceSource(Ref const& delegate_) - : Super(delegate_->getWidth(), delegate_->getHeight()), delegate(delegate_) {} - -ArrayRef InvertedLuminanceSource::getRow(int y, ArrayRef row) const { - row = delegate->getRow(y, row); - int width = getWidth(); - for (int i = 0; i < width; i++) { - row[i] = (byte) (255 - (row[i] & 0xFF)); - } - return row; -} - -ArrayRef InvertedLuminanceSource::getMatrix() const { - ArrayRef matrix = delegate->getMatrix(); - int length = getWidth() * getHeight(); - ArrayRef invertedMatrix(length); - for (int i = 0; i < length; i++) { - invertedMatrix[i] = (byte) (255 - (matrix[i] & 0xFF)); - } - return invertedMatrix; -} - -zxing::boolean InvertedLuminanceSource::isCropSupported() const { - return delegate->isCropSupported(); -} - -Ref InvertedLuminanceSource::crop(int left, int top, int width, int height) const { - return Ref(new InvertedLuminanceSource(delegate->crop(left, top, width, height))); -} - -boolean InvertedLuminanceSource::isRotateSupported() const { - return delegate->isRotateSupported(); -} - -Ref InvertedLuminanceSource::invert() const { - return delegate; -} - -Ref InvertedLuminanceSource::rotateCounterClockwise() const { - return Ref(new InvertedLuminanceSource(delegate->rotateCounterClockwise())); -} - diff --git a/src/qzxing/zxing/zxing/InvertedLuminanceSource.h b/src/qzxing/zxing/zxing/InvertedLuminanceSource.h deleted file mode 100644 index 168acbf..0000000 --- a/src/qzxing/zxing/zxing/InvertedLuminanceSource.h +++ /dev/null @@ -1,48 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -#ifndef __INVERTEDLUMINANCESOURCE_H__ -#define __INVERTEDLUMINANCESOURCE_H__ -/* - * Copyright 2013 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include - -namespace zxing { - -class InvertedLuminanceSource : public LuminanceSource { -private: - typedef LuminanceSource Super; - const Ref delegate; - -public: - InvertedLuminanceSource(Ref const&); - - ArrayRef getRow(int y, ArrayRef row) const; - ArrayRef getMatrix() const; - - boolean isCropSupported() const; - Ref crop(int left, int top, int width, int height) const; - - boolean isRotateSupported() const; - - virtual Ref invert() const; - - Ref rotateCounterClockwise() const; -}; - -} - -#endif /* INVERTEDLUMINANCESOURCE_H_ */ diff --git a/src/qzxing/zxing/zxing/MultiFormatReader.cpp b/src/qzxing/zxing/zxing/MultiFormatReader.cpp deleted file mode 100644 index 259eee7..0000000 --- a/src/qzxing/zxing/zxing/MultiFormatReader.cpp +++ /dev/null @@ -1,124 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using zxing::Ref; -using zxing::Result; -using zxing::MultiFormatReader; - -// VC++ -using zxing::DecodeHints; -using zxing::BinaryBitmap; - -MultiFormatReader::MultiFormatReader() {} - -Ref MultiFormatReader::decode(Ref image) { - setHints(DecodeHints::DEFAULT_HINT); - return decodeInternal(image); -} - -Ref MultiFormatReader::decode(Ref image, DecodeHints hints) { - setHints(hints); - return decodeInternal(image); -} - -Ref MultiFormatReader::decodeWithState(Ref image) { - // Make sure to set up the default state so we don't crash - if (readers_.size() == 0) { - setHints(DecodeHints::DEFAULT_HINT); - } - return decodeInternal(image); -} - -void MultiFormatReader::setHints(DecodeHints hints) { - hints_ = hints; - readers_.clear(); - bool tryHarder = hints.getTryHarder(); - - bool addOneDReader = hints.containsFormat(BarcodeFormat::UPC_E) || - hints.containsFormat(BarcodeFormat::UPC_A) || - hints.containsFormat(BarcodeFormat::UPC_E) || - hints.containsFormat(BarcodeFormat::EAN_13) || - hints.containsFormat(BarcodeFormat::EAN_8) || - hints.containsFormat(BarcodeFormat::CODABAR) || - hints.containsFormat(BarcodeFormat::CODE_39) || - hints.containsFormat(BarcodeFormat::CODE_93) || - hints.containsFormat(BarcodeFormat::CODE_128) || - hints.containsFormat(BarcodeFormat::ITF) || - hints.containsFormat(BarcodeFormat::RSS_14) || - hints.containsFormat(BarcodeFormat::RSS_EXPANDED); - if (addOneDReader && !tryHarder) { - readers_.push_back(Ref(new zxing::oned::MultiFormatOneDReader(hints))); - } - if (hints.containsFormat(BarcodeFormat::QR_CODE)) { - readers_.push_back(Ref(new zxing::qrcode::QRCodeReader())); - } - if (hints.containsFormat(BarcodeFormat::DATA_MATRIX)) { - readers_.push_back(Ref(new zxing::datamatrix::DataMatrixReader())); - } - if (hints.containsFormat(BarcodeFormat::AZTEC)) { - readers_.push_back(Ref(new zxing::aztec::AztecReader())); - } - if (hints.containsFormat(BarcodeFormat::PDF_417)) { - readers_.push_back(Ref(new zxing::pdf417::PDF417Reader())); - } - /* - if (hints.contains(BarcodeFormat.MAXICODE)) { - readers.add(new MaxiCodeReader()); - } - */ - if (addOneDReader && tryHarder) { - readers_.push_back(Ref(new zxing::oned::MultiFormatOneDReader(hints))); - } - if (readers_.size() == 0) { - if (!tryHarder) { - readers_.push_back(Ref(new zxing::oned::MultiFormatOneDReader(hints))); - } - readers_.push_back(Ref(new zxing::qrcode::QRCodeReader())); - readers_.push_back(Ref(new zxing::datamatrix::DataMatrixReader())); - readers_.push_back(Ref(new zxing::aztec::AztecReader())); - readers_.push_back(Ref(new zxing::pdf417::PDF417Reader())); - // readers.add(new MaxiCodeReader()); - - if (tryHarder) { - readers_.push_back(Ref(new zxing::oned::MultiFormatOneDReader(hints))); - } - } -} - -Ref MultiFormatReader::decodeInternal(Ref image) { - for (unsigned int i = 0; i < readers_.size(); i++) { - try { - return readers_[i]->decode(image, hints_); - } catch (ReaderException const& re) { - (void)re; - // continue - } - } - throw ReaderException("No code detected"); -} - -MultiFormatReader::~MultiFormatReader() {} diff --git a/src/qzxing/zxing/zxing/ZXing.h b/src/qzxing/zxing/zxing/ZXing.h deleted file mode 100644 index 55495d2..0000000 --- a/src/qzxing/zxing/zxing/ZXing.h +++ /dev/null @@ -1,147 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2013 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#ifndef __ZXING_H_ -#define __ZXING_H_ - -#define ZXING_ARRAY_LEN(v) ((int)(sizeof(v)/sizeof(v[0]))) -#define ZX_LOG_DIGITS(digits) \ - ((digits == 8) ? 3 : \ - ((digits == 16) ? 4 : \ - ((digits == 32) ? 5 : \ - ((digits == 64) ? 6 : \ - ((digits == 128) ? 7 : \ - (-1)))))) - -#ifndef ZXING_DEBUG -#define ZXING_DEBUG 0 -#endif - -namespace zxing { -typedef char byte; -typedef bool boolean; -} - -#include - -#if defined(_WIN32) || defined(_WIN64) - -#include -#include - -// It is needed to undef the isnan, because the Mingw contains the C99 macro -#undef isnan - -namespace zxing { -inline bool isnan_z(float v) {return _isnan(v) != 0;} -inline bool isnan_z(double v) {return _isnan(v) != 0;} -inline float nan() {return std::numeric_limits::quiet_NaN();} -} - -#else - -#include - -using namespace std; - -namespace zxing { -inline bool isnan_z(float v) { - return /*std::*/isnan(v); -} -inline bool isnan_z(double v) { - return /*std::*/isnan(v); -} - -//#undef isfinite -//#undef signbit - -inline float nan() {return std::numeric_limits::quiet_NaN();} -} - -#endif - -#if ZXING_DEBUG - -#include -#include - -using std::cout; -using std::cerr; -using std::endl; -using std::flush; -using std::string; -using std::ostream; - -#if ZXING_DEBUG_TIMER - -#include - -namespace zxing { - -class DebugTimer { -public: - DebugTimer(char const* string_) : chars(string_) { - gettimeofday(&start, 0); - } - - DebugTimer(std::string const& string_) : chars(0), string(string_) { - gettimeofday(&start, 0); - } - - void mark(char const* string) { - struct timeval end; - gettimeofday(&end, 0); - int diff = - (end.tv_sec - start.tv_sec)*1000*1000+(end.tv_usec - start.tv_usec); - - cerr << diff << " " << string << '\n'; - } - - void mark(std::string string) { - mark(string.c_str()); - } - - ~DebugTimer() { - if (chars) { - mark(chars); - } else { - mark(string.c_str()); - } - } - -private: - char const* const chars; - std::string string; - struct timeval start; -}; - -} - -#define ZXING_TIME(string) DebugTimer __timer__ (string) -#define ZXING_TIME_MARK(string) __timer__.mark(string) - -#endif - -#endif // ZXING_DEBUG - -#ifndef ZXING_TIME -#define ZXING_TIME(string) (void)0 -#endif -#ifndef ZXING_TIME_MARK -#define ZXING_TIME_MARK(string) (void)0 -#endif - -#endif diff --git a/src/qzxing/zxing/zxing/aztec/AztecReader.cpp b/src/qzxing/zxing/zxing/aztec/AztecReader.cpp deleted file mode 100644 index ada9fed..0000000 --- a/src/qzxing/zxing/zxing/aztec/AztecReader.cpp +++ /dev/null @@ -1,68 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * AztecReader.cpp - * zxing - * - * Created by Lukas Stabe on 08/02/2012. - * Copyright 2012 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include - -using zxing::Ref; -using zxing::ArrayRef; -using zxing::Result; -using zxing::aztec::AztecReader; - -// VC++ -using zxing::BinaryBitmap; -using zxing::DecodeHints; - -AztecReader::AztecReader() : decoder_() { - // nothing -} - -Ref AztecReader::decode(Ref image) { - Detector detector(image->getBlackMatrix()); - - Ref detectorResult(detector.detect()); - - ArrayRef< Ref > points(detectorResult->getPoints()); - - Ref decoderResult(decoder_.decode(detectorResult)); - - Ref result(new Result(decoderResult->getText(), - decoderResult->getRawBytes(), - points, - BarcodeFormat::AZTEC)); - - return result; -} - -Ref AztecReader::decode(Ref image, DecodeHints) { - //cout << "decoding with hints not supported for aztec" << "\n" << flush; - return this->decode(image); -} - -AztecReader::~AztecReader() { - // nothing -} - -zxing::aztec::Decoder& AztecReader::getDecoder() { - return decoder_; -} diff --git a/src/qzxing/zxing/zxing/aztec/decoder/AztecDecoder.cpp b/src/qzxing/zxing/zxing/aztec/decoder/AztecDecoder.cpp deleted file mode 100644 index 4f93858..0000000 --- a/src/qzxing/zxing/zxing/aztec/decoder/AztecDecoder.cpp +++ /dev/null @@ -1,499 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Decoder.cpp - * zxing - * - * Created by Lukas Stabe on 08/02/2012. - * Copyright 2012 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#ifndef NO_ICONV -#include -#endif -#include -#include -#include -#include -#include -#include - -#include - -#include - -using zxing::aztec::Decoder; -using zxing::DecoderResult; -using zxing::String; -using zxing::BitArray; -using zxing::BitMatrix; -using zxing::Ref; - -using std::string; - -namespace { -void add(string& result, unsigned char character) { -#ifndef NO_ICONV - char s[] = { character & 0xff }; - char* ss = s; - size_t sl = sizeof(s); - char d[4]; - char* ds = d; - size_t dl = sizeof(d); - iconv_t ic = iconv_open("UTF-8", "ISO-8859-1"); - - -#if defined(Q_OS_SYMBIAN) - iconv(ic, (const char**)&ss, &sl, &ds, &dl); // for Symbian and Mingw -#else - iconv(ic, (char**)&ss, &sl, &ds, &dl); // for Harmattan -#endif - iconv_close(ic); - d[sizeof(d)-dl] = 0; - result.append(d); -#else - result.push_back(character); -#endif -} - -const int NB_BITS_COMPACT[] = { - 0, 104, 240, 408, 608 -}; - -const int NB_BITS[] = { - 0, 128, 288, 480, 704, 960, 1248, 1568, 1920, 2304, 2720, 3168, 3648, 4160, 4704, 5280, 5888, 6528, - 7200, 7904, 8640, 9408, 10208, 11040, 11904, 12800, 13728, 14688, 15680, 16704, 17760, 18848, 19968 -}; - -const int NB_DATABLOCK_COMPACT[] = { - 0, 17, 40, 51, 76 -}; - -const int NB_DATABLOCK[] = { - 0, 21, 48, 60, 88, 120, 156, 196, 240, 230, 272, 316, 364, 416, 470, 528, 588, 652, 720, 790, 864, - 940, 1020, 920, 992, 1066, 1144, 1224, 1306, 1392, 1480, 1570, 1664 -}; - -const char* UPPER_TABLE[] = { - "CTRL_PS", " ", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", - "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "CTRL_LL", "CTRL_ML", "CTRL_DL", "CTRL_BS" -}; - -const char* LOWER_TABLE[] = { - "CTRL_PS", " ", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", - "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "CTRL_US", "CTRL_ML", "CTRL_DL", "CTRL_BS" -}; - -const char* MIXED_TABLE[] = { - "CTRL_PS", " ", "\1", "\2", "\3", "\4", "\5", "\6", "\7", "\b", "\t", "\n", - "\13", "\f", "\r", "\33", "\34", "\35", "\36", "\37", "@", "\\", "^", "_", - "`", "|", "~", "\177", "CTRL_LL", "CTRL_UL", "CTRL_PL", "CTRL_BS" -}; - -const char* PUNCT_TABLE[] = { - "", "\r", "\r\n", ". ", ", ", ": ", "!", "\"", "#", "$", "%", "&", "'", "(", ")", - "*", "+", ",", "-", ".", "/", ":", ";", "<", "=", ">", "?", "[", "]", "{", "}", "CTRL_UL" -}; - -const char* DIGIT_TABLE[] = { - "CTRL_PS", " ", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ",", ".", "CTRL_UL", "CTRL_US" -}; -} - -Decoder::Table Decoder::getTable(char t) { - switch (t) { - case 'L': - return LOWER; - case 'P': - return PUNCT; - case 'M': - return MIXED; - case 'D': - return DIGIT; - case 'B': - return BINARY; - case 'U': - default: - return UPPER; - } -} - -const char* Decoder::getCharacter(zxing::aztec::Decoder::Table table, int code) { - switch (table) { - case UPPER: - return UPPER_TABLE[code]; - case LOWER: - return LOWER_TABLE[code]; - case MIXED: - return MIXED_TABLE[code]; - case PUNCT: - return PUNCT_TABLE[code]; - case DIGIT: - return DIGIT_TABLE[code]; - default: - return ""; - } -} - -Decoder::Decoder() { - // nothing -} - -Ref Decoder::decode(Ref detectorResult) { - ddata_ = detectorResult; - - // std::printf("getting bits\n"); - - Ref matrix = detectorResult->getBits(); - - if (!ddata_->isCompact()) { - // std::printf("removing lines\n"); - matrix = removeDashedLines(ddata_->getBits()); - } - - // std::printf("extracting bits\n"); - Ref rawbits = extractBits(matrix); - - // std::printf("correcting bits\n"); - Ref aCorrectedBits = correctBits(rawbits); - - // std::printf("decoding bits\n"); - Ref result = getEncodedData(aCorrectedBits); - - // std::printf("constructing array\n"); - //-------ArrayRef arrayOut(aCorrectedBits->getSize()); - ArrayRef arrayOut(aCorrectedBits->getSize()); - for (int i = 0; i < aCorrectedBits->count(); i++) { - arrayOut[i] = (unsigned char)aCorrectedBits->get(i); - } - - // std::printf("returning\n"); - - return Ref(new DecoderResult(arrayOut, result)); -} - -Ref Decoder::getEncodedData(Ref correctedBits) { - int endIndex = codewordSize_ * ddata_->getNBDatablocks() - invertedBitCount_; - if (endIndex > (int)correctedBits->getSize()) { - // std::printf("invalid input\n"); - throw FormatException("invalid input data"); - } - - Table lastTable = UPPER; - Table table = UPPER; - int startIndex = 0; - std::string result; - bool end = false; - bool shift = false; - bool switchShift = false; - bool binaryShift = false; - - while (!end) { - // std::printf("decoooooding\n"); - - if (shift) { - switchShift = true; - } else { - lastTable = table; - } - - int code; - if (binaryShift) { - if (endIndex - startIndex < 5) { - break; - } - - int length = readCode(correctedBits, startIndex, 5); - startIndex += 5; - if (length == 0) { - if (endIndex - startIndex < 11) { - break; - } - - length = readCode(correctedBits, startIndex, 11) + 31; - startIndex += 11; - } - for (int charCount = 0; charCount < length; charCount++) { - if (endIndex - startIndex < 8) { - end = true; - break; - } - - code = readCode(correctedBits, startIndex, 8); - add(result, code); - startIndex += 8; - } - binaryShift = false; - } else { - if (table == BINARY) { - if (endIndex - startIndex < 8) { - end = true; - break; - } - code = readCode(correctedBits, startIndex, 8); - startIndex += 8; - - add(result, code); - } else { - int size = 5; - - if (table == DIGIT) { - size = 4; - } - - if (endIndex - startIndex < size) { - end = true; - break; - } - - code = readCode(correctedBits, startIndex, size); - startIndex += size; - - const char *str = getCharacter(table, code); - std::string string(str); - if ((int)string.find("CTRL_") != -1) { - table = getTable(str[5]); - - if (str[6] == 'S') { - shift = true; - if (str[5] == 'B') { - binaryShift = true; - } - } - } else { - result.append(string); - } - - } - } - - if (switchShift) { - table = lastTable; - shift = false; - switchShift = false; - } - - - } - - return Ref(new String(result)); - -} - -Ref Decoder::correctBits(Ref rawbits) { - //return rawbits; - // std::printf("decoding stuff:%d datablocks in %d layers\n", ddata_->getNBDatablocks(), ddata_->getNBLayers()); - - Ref gf = GenericGF::AZTEC_DATA_6; - - if (ddata_->getNBLayers() <= 2) { - codewordSize_ = 6; - gf = GenericGF::AZTEC_DATA_6; - } else if (ddata_->getNBLayers() <= 8) { - codewordSize_ = 8; - gf = GenericGF::AZTEC_DATA_8; - } else if (ddata_->getNBLayers() <= 22) { - codewordSize_ = 10; - gf = GenericGF::AZTEC_DATA_10; - } else { - codewordSize_ = 12; - gf = GenericGF::AZTEC_DATA_12; - } - - int numDataCodewords = ddata_->getNBDatablocks(); - int numECCodewords; - int offset; - - if (ddata_->isCompact()) { - offset = NB_BITS_COMPACT[ddata_->getNBLayers()] - numCodewords_ * codewordSize_; - numECCodewords = NB_DATABLOCK_COMPACT[ddata_->getNBLayers()] - numDataCodewords; - } else { - offset = NB_BITS[ddata_->getNBLayers()] - numCodewords_ * codewordSize_; - numECCodewords = NB_DATABLOCK[ddata_->getNBLayers()] - numDataCodewords; - } - - ArrayRef dataWords(numCodewords_); - - for (int i = 0; i < numCodewords_; i++) { - int flag = 1; - for (int j = 1; j <= codewordSize_; j++) { - if (rawbits->get(codewordSize_ * i + codewordSize_ - j + offset)) { - dataWords[i] += flag; - } - flag <<= 1; - } - - // - // - // - } - - try { - // std::printf("trying reed solomon, numECCodewords:%d\n", numECCodewords); - ReedSolomonDecoder rsDecoder(gf); - rsDecoder.decode(dataWords, numECCodewords); - } catch (ReedSolomonException& rse) { - // std::printf("got reed solomon exception:%s, throwing formatexception\n", rse.what()); - throw FormatException("rs decoding failed"); - } catch (IllegalArgumentException& iae) { - // std::printf("illegal argument exception: %s", iae.what()); - } - - offset = 0; - invertedBitCount_ = 0; - - Ref correctedBits(new BitArray(numDataCodewords * codewordSize_)); - for (int i = 0; i < numDataCodewords; i++) { - - bool seriesColor = false; - int seriesCount = 0; - int flag = 1 << (codewordSize_ - 1); - - for (int j = 0; j < codewordSize_; j++) { - - bool color = (dataWords[i] & flag) == flag; - - if (seriesCount == codewordSize_ - 1) { - - if (color == seriesColor) { - throw FormatException("bit was not inverted"); - } - - seriesColor = false; - seriesCount = 0; - offset++; - invertedBitCount_++; - - } else { - - if (seriesColor == color) { - seriesCount++; - } else { - seriesCount = 1; - seriesColor = color; - } - - if (color) correctedBits->set(i * codewordSize_ + j - offset); - - } - - flag = (unsigned int)flag >> 1; - - } - } - - return correctedBits; -} - -Ref Decoder::extractBits(Ref matrix) { - std::vector rawbits; - - if (ddata_->isCompact()) { - if (ddata_->getNBLayers() > 5) { //NB_BITS_COMPACT length - throw FormatException("data is too long"); - } - rawbits = std::vector(NB_BITS_COMPACT[ddata_->getNBLayers()]); - numCodewords_ = NB_DATABLOCK_COMPACT[ddata_->getNBLayers()]; - } else { - if (ddata_->getNBLayers() > 33) { //NB_BITS length - throw FormatException("data is too long"); - } - rawbits = std::vector(NB_BITS[ddata_->getNBLayers()]); - numCodewords_ = NB_DATABLOCK[ddata_->getNBLayers()]; - } - - int layer = ddata_->getNBLayers(); - int size = matrix->getHeight(); - int rawbitsOffset = 0; - int matrixOffset = 0; - - - while (layer != 0) { - - int flip = 0; - for (int i = 0; i < 2 * size - 4; i++) { - rawbits[rawbitsOffset + i] = matrix->get(matrixOffset + flip, matrixOffset + i / 2); - rawbits[rawbitsOffset + 2 * size - 4 + i] = matrix->get(matrixOffset + i / 2, matrixOffset + size - 1 - flip); - flip = (flip + 1) % 2; - } - - flip = 0; - for (int i = 2 * size + 1; i > 5; i--) { - rawbits[rawbitsOffset + 4 * size - 8 + (2 * size - i) + 1] = - matrix->get(matrixOffset + size - 1 - flip, matrixOffset + i / 2 - 1); - rawbits[rawbitsOffset + 6 * size - 12 + (2 * size - i) + 1] = - matrix->get(matrixOffset + i / 2 - 1, matrixOffset + flip); - flip = (flip + 1) % 2; - } - - matrixOffset += 2; - rawbitsOffset += 8 * size - 16; - layer--; - size -= 4; - - } - - Ref returnValue(new BitArray(rawbits.size())); - for (int i = 0; i < (int)rawbits.size(); i++) { - if (rawbits[i]) returnValue->set(i); - } - - return returnValue; - -} - -Ref Decoder::removeDashedLines(Ref matrix) { - int nbDashed = 1 + 2 * ((matrix->getWidth() - 1) / 2 / 16); - Ref newMatrix(new BitMatrix(matrix->getWidth() - nbDashed, matrix->getHeight() - nbDashed)); - - int nx = 0; - - for (int x = 0; x < (int)matrix->getWidth(); x++) { - - if ((matrix->getWidth() / 2 - x) % 16 == 0) { - continue; - } - - int ny = 0; - for (int y = 0; y < (int)matrix->getHeight(); y++) { - - if ((matrix->getWidth() / 2 - y) % 16 == 0) { - continue; - } - - if (matrix->get(x, y)) { - newMatrix->set(nx, ny); - } - ny++; - - } - nx++; - - } - return newMatrix; -} - -int Decoder::readCode(Ref rawbits, int startIndex, int length) { - int res = 0; - - for (int i = startIndex; i < startIndex + length; i++) { - res <<= 1; - if (rawbits->get(i)) { - res ++; - } - } - - return res; -} diff --git a/src/qzxing/zxing/zxing/aztec/decoder/Decoder.h b/src/qzxing/zxing/zxing/aztec/decoder/Decoder.h deleted file mode 100644 index 2a1b4ef..0000000 --- a/src/qzxing/zxing/zxing/aztec/decoder/Decoder.h +++ /dev/null @@ -1,69 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Decoder.h - * zxing - * - * Created by Lukas Stabe on 08/02/2012. - * Copyright 2012 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef __ZXING_AZTEC_DECODER_DECODER_H__ -#define __ZXING_AZTEC_DECODER_DECODER_H__ - -#include -#include -#include - -namespace zxing { - -class DecoderResult; - -namespace aztec { - -class Decoder : public Counted { - private: - enum Table { - UPPER, - LOWER, - MIXED, - DIGIT, - PUNCT, - BINARY - }; - - static Table getTable(char t); - static const char* getCharacter(Table table, int code); - - int numCodewords_; - int codewordSize_; - Ref ddata_; - int invertedBitCount_; - - Ref getEncodedData(Ref correctedBits); - Ref correctBits(Ref rawbits); - Ref extractBits(Ref matrix); - static Ref removeDashedLines(Ref matrix); - static int readCode(Ref rawbits, int startIndex, int length); - - - public: - Decoder(); - Ref decode(Ref detectorResult); -}; - -} -} - -#endif diff --git a/src/qzxing/zxing/zxing/aztec/detector/Detector.h b/src/qzxing/zxing/zxing/aztec/detector/Detector.h deleted file mode 100644 index e7653ef..0000000 --- a/src/qzxing/zxing/zxing/aztec/detector/Detector.h +++ /dev/null @@ -1,92 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Detector.h - * zxing - * - * Created by Lukas Stabe on 08/02/2012. - * Copyright 2012 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef __ZXING_AZTEC_DETECTOR_DETECTOR_H__ -#define __ZXING_AZTEC_DETECTOR_DETECTOR_H__ - -#include - -#include -#include -#include -#include -#include - -namespace zxing { -namespace aztec { - -class Point : public Counted { - private: - const int x; - const int y; - - public: - Ref toResultPoint() { - return Ref(new ResultPoint(float(x), float(y))); - } - - Point(int ax, int ay) : x(ax), y(ay) {} - - int getX() const { return x; } - int getY() const { return y; } -}; - -class Detector : public Counted { - - private: - Ref image_; - - bool compact_; - int nbLayers_; - int nbDataBlocks_; - int nbCenterLayers_; - int shift_; - - void extractParameters(std::vector > bullEyeCornerPoints); - ArrayRef< Ref > getMatrixCornerPoints(std::vector > bullEyeCornerPoints); - static void correctParameterData(Ref parameterData, bool compact); - std::vector > getBullEyeCornerPoints(Ref pCenter); - Ref getMatrixCenter(); - Ref sampleGrid(Ref image, - Ref topLeft, - Ref bottomLeft, - Ref bottomRight, - Ref topRight); - void getParameters(Ref parameterData); - Ref sampleLine(Ref p1, Ref p2, int size); - bool isWhiteOrBlackRectangle(Ref p1, - Ref p2, - Ref p3, - Ref p4); - int getColor(Ref p1, Ref p2); - Ref getFirstDifferent(Ref init, bool color, int dx, int dy); - bool isValid(int x, int y); - static float distance(Ref a, Ref b); - - public: - Detector(Ref image); - Ref detect(); -}; - -} -} - -#endif diff --git a/src/qzxing/zxing/zxing/common/BitArray.cpp b/src/qzxing/zxing/zxing/common/BitArray.cpp deleted file mode 100644 index 0c560bb..0000000 --- a/src/qzxing/zxing/zxing/common/BitArray.cpp +++ /dev/null @@ -1,155 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2010 ZXing authors. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -using std::vector; -using zxing::BitArray; - -// VC++ -using zxing::Ref; - -int BitArray::makeArraySize(int size) { - return (size + bitsPerWord-1) >> logBits; -} - -BitArray::BitArray(int size_) - : size(size_), bits(makeArraySize(size)) {} - -BitArray::~BitArray() { -} - -int BitArray::getSize() const { - return size; -} - -void BitArray::setBulk(int i, int newBits) { - bits[i >> logBits] = newBits; -} - -void BitArray::clear() { - int max = bits->size(); - for (int i = 0; i < max; i++) { - bits[i] = 0; - } -} - -bool BitArray::isRange(int start, int end, bool value) { - if (end < start) { - throw IllegalArgumentException(); - } - if (end == start) { - return true; // empty range matches - } - end--; // will be easier to treat this as the last actually set bit -- inclusive - int firstInt = start >> logBits; - int lastInt = end >> logBits; - for (int i = firstInt; i <= lastInt; i++) { - int firstBit = i > firstInt ? 0 : start & bitsMask; - int lastBit = i < lastInt ? (bitsPerWord-1) : end & bitsMask; - int mask; - if (firstBit == 0 && lastBit == (bitsPerWord-1)) { - mask = -1; - } else { - mask = 0; - for (int j = firstBit; j <= lastBit; j++) { - mask |= 1 << j; - } - } - - // Return false if we're looking for 1s and the masked bits[i] isn't all 1s (that is, - // equals the mask, or we're looking for 0s and the masked portion is not all 0s - if ((bits[i] & mask) != (value ? mask : 0)) { - return false; - } - } - return true; -} - -vector& BitArray::getBitArray() { - return bits->values(); -} - -void BitArray::reverse() { - ArrayRef newBits(bits->size()); - int size = this->size; - for (int i = 0; i < size; i++) { - if (get(size - i - 1)) { - newBits[i >> logBits] |= 1 << (i & bitsMask); - } - } - bits = newBits; -} - -BitArray::Reverse::Reverse(Ref array_) : array(array_) { - array->reverse(); -} - -BitArray::Reverse::~Reverse() { - array->reverse(); -} - -namespace { - // N.B.: This only works for 32 bit ints ... - int numberOfTrailingZeros(int i) { - // HD, Figure 5-14 - int y; - if (i == 0) return 32; - int n = 31; - y = i <<16; if (y != 0) { n = n -16; i = y; } - y = i << 8; if (y != 0) { n = n - 8; i = y; } - y = i << 4; if (y != 0) { n = n - 4; i = y; } - y = i << 2; if (y != 0) { n = n - 2; i = y; } - return n - (((unsigned int)(i << 1)) >> 31); - } -} - -int BitArray::getNextSet(int from) { - if (from >= size) { - return size; - } - int bitsOffset = from >> logBits; - int currentBits = bits[bitsOffset]; - // mask off lesser bits first - currentBits &= ~((1 << (from & bitsMask)) - 1); - while (currentBits == 0) { - if (++bitsOffset == (int)bits->size()) { - return size; - } - currentBits = bits[bitsOffset]; - } - int result = (bitsOffset << logBits) + numberOfTrailingZeros(currentBits); - return result > size ? size : result; -} - -int BitArray::getNextUnset(int from) { - if (from >= size) { - return size; - } - int bitsOffset = from >> logBits; - int currentBits = ~bits[bitsOffset]; - // mask off lesser bits first - currentBits &= ~((1 << (from & bitsMask)) - 1); - while (currentBits == 0) { - if (++bitsOffset == (int)bits->size()) { - return size; - } - currentBits = ~bits[bitsOffset]; - } - int result = (bitsOffset << logBits) + numberOfTrailingZeros(currentBits); - return result > size ? size : result; -} diff --git a/src/qzxing/zxing/zxing/common/BitMatrix.cpp b/src/qzxing/zxing/zxing/common/BitMatrix.cpp deleted file mode 100644 index 74106a7..0000000 --- a/src/qzxing/zxing/zxing/common/BitMatrix.cpp +++ /dev/null @@ -1,143 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2010 ZXing authors. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include - -#include -#include -#include - -using std::ostream; -using std::ostringstream; - -using zxing::BitMatrix; -using zxing::BitArray; -using zxing::ArrayRef; -using zxing::Ref; - -void BitMatrix::init(int width, int height) { - if (width < 1 || height < 1) { - throw IllegalArgumentException("Both dimensions must be greater than 0"); - } - this->width = width; - this->height = height; - this->rowSize = (width + bitsPerWord - 1) >> logBits; - bits = ArrayRef(rowSize * height); -} - -BitMatrix::BitMatrix(int dimension) { - init(dimension, dimension); -} - -BitMatrix::BitMatrix(int width, int height) { - init(width, height); -} - -BitMatrix::~BitMatrix() {} - -void BitMatrix::flip(int x, int y) { - int offset = y * rowSize + (x >> logBits); - bits[offset] ^= 1 << (x & bitsMask); -} - -void BitMatrix::setRegion(int left, int top, int width, int height) { - if (top < 0 || left < 0) { - throw IllegalArgumentException("Left and top must be nonnegative"); - } - if (height < 1 || width < 1) { - throw IllegalArgumentException("Height and width must be at least 1"); - } - int right = left + width; - int bottom = top + height; - if (bottom > this->height || right > this->width) { - throw IllegalArgumentException("The region must fit inside the matrix"); - } - for (int y = top; y < bottom; y++) { - int offset = y * rowSize; - for (int x = left; x < right; x++) { - bits[offset + (x >> logBits)] |= 1 << (x & bitsMask); - } - } -} - -Ref BitMatrix::getRow(int y, Ref row) { - if (row.empty() || row->getSize() < width) { - row = new BitArray(width); - } - int offset = y * rowSize; - for (int x = 0; x < rowSize; x++) { - row->setBulk(x << logBits, bits[offset + x]); - } - return row; -} - -int BitMatrix::getWidth() const { - return width; -} - -int BitMatrix::getHeight() const { - return height; -} - -ArrayRef BitMatrix::getTopLeftOnBit() const { - int bitsOffset = 0; - while (bitsOffset < bits->size() && bits[bitsOffset] == 0) { - bitsOffset++; - } - if (bitsOffset == bits->size()) { - return ArrayRef(); - } - int y = bitsOffset / rowSize; - int x = (bitsOffset % rowSize) << 5; - - int theBits = bits[bitsOffset]; - int bit = 0; - while ((theBits << (31-bit)) == 0) { - bit++; - } - x += bit; - ArrayRef res (2); - res[0]=x; - res[1]=y; - return res; -} - -ArrayRef BitMatrix::getBottomRightOnBit() const { - int bitsOffset = bits->size() - 1; - while (bitsOffset >= 0 && bits[bitsOffset] == 0) { - bitsOffset--; - } - if (bitsOffset < 0) { - return ArrayRef(); - } - - int y = bitsOffset / rowSize; - int x = (bitsOffset % rowSize) << 5; - - int theBits = bits[bitsOffset]; - int bit = 31; - while ((theBits >> bit) == 0) { - bit--; - } - x += bit; - - ArrayRef res (2); - res[0]=x; - res[1]=y; - return res; -} diff --git a/src/qzxing/zxing/zxing/common/GlobalHistogramBinarizer.cpp b/src/qzxing/zxing/zxing/common/GlobalHistogramBinarizer.cpp deleted file mode 100644 index 53b3050..0000000 --- a/src/qzxing/zxing/zxing/common/GlobalHistogramBinarizer.cpp +++ /dev/null @@ -1,212 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * GlobalHistogramBinarizer.cpp - * zxing - * - * Copyright 2010 ZXing authors. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include - -using zxing::GlobalHistogramBinarizer; -using zxing::Binarizer; -using zxing::ArrayRef; -using zxing::Ref; -using zxing::BitArray; -using zxing::BitMatrix; - -// VC++ -using zxing::LuminanceSource; - -namespace { - const int LUMINANCE_BITS = 5; - const int LUMINANCE_SHIFT = 8 - LUMINANCE_BITS; - const int LUMINANCE_BUCKETS = 1 << LUMINANCE_BITS; - const ArrayRef EMPTY (0); -} - -GlobalHistogramBinarizer::GlobalHistogramBinarizer(Ref source) - : Binarizer(source), luminances(EMPTY), buckets(LUMINANCE_BUCKETS) {} - -GlobalHistogramBinarizer::~GlobalHistogramBinarizer() {} - -void GlobalHistogramBinarizer::initArrays(int luminanceSize) { - if (luminances->size() < luminanceSize) { - luminances = ArrayRef(luminanceSize); - } - for (int x = 0; x < LUMINANCE_BUCKETS; x++) { - buckets[x] = 0; - } -} - -Ref GlobalHistogramBinarizer::getBlackRow(int y, Ref row) { - // std::cerr << "gbr " << y << std::endl; - LuminanceSource& source = *getLuminanceSource(); - int width = source.getWidth(); - if (row == NULL || static_cast(row->getSize()) < width) { - row = new BitArray(width); - } else { - row->clear(); - } - - initArrays(width); - ArrayRef localLuminances = source.getRow(y, luminances); - if (false) { - std::cerr << "gbr " << y << " r "; - for(int i=0, e=localLuminances->size(); i < e; ++i) { - std::cerr << 0+localLuminances[i] << " "; - } - std::cerr << std::endl; - } - ArrayRef localBuckets = buckets; - for (int x = 0; x < width; x++) { - int pixel = localLuminances[x] & 0xff; - localBuckets[pixel >> LUMINANCE_SHIFT]++; - } - int blackPoint = estimateBlackPoint(localBuckets); - // std::cerr << "gbr bp " << y << " " << blackPoint << std::endl; - - int left = localLuminances[0] & 0xff; - int center = localLuminances[1] & 0xff; - for (int x = 1; x < width - 1; x++) { - int right = localLuminances[x + 1] & 0xff; - // A simple -1 4 -1 box filter with a weight of 2. - int luminance = ((center << 2) - left - right) >> 1; - if (luminance < blackPoint) { - row->set(x); - } - left = center; - center = right; - } - return row; -} - -Ref GlobalHistogramBinarizer::getBlackMatrix() { - LuminanceSource& source = *getLuminanceSource(); - int width = source.getWidth(); - int height = source.getHeight(); - Ref matrix(new BitMatrix(width, height)); - - // Quickly calculates the histogram by sampling four rows from the image. - // This proved to be more robust on the blackbox tests than sampling a - // diagonal as we used to do. - initArrays(width); - ArrayRef localBuckets = buckets; - for (int y = 1; y < 5; y++) { - int row = height * y / 5; - ArrayRef localLuminances = source.getRow(row, luminances); - int right = (width << 2) / 5; - for (int x = width / 5; x < right; x++) { - int pixel = localLuminances[x] & 0xff; - localBuckets[pixel >> LUMINANCE_SHIFT]++; - } - } - - int blackPoint = estimateBlackPoint(localBuckets); - - ArrayRef localLuminances = source.getMatrix(); - for (int y = 0; y < height; y++) { - int offset = y * width; - for (int x = 0; x < width; x++) { - int pixel = localLuminances[offset + x] & 0xff; - if (pixel < blackPoint) { - matrix->set(x, y); - } - } - } - - return matrix; -} - -using namespace std; - -int GlobalHistogramBinarizer::estimateBlackPoint(ArrayRef const& buckets) { - // Find tallest peak in histogram - int numBuckets = buckets->size(); - int maxBucketCount = 0; - int firstPeak = 0; - int firstPeakSize = 0; - if (false) { - for (int x = 0; x < numBuckets; x++) { - cerr << buckets[x] << " "; - } - cerr << endl; - } - for (int x = 0; x < numBuckets; x++) { - if (buckets[x] > firstPeakSize) { - firstPeak = x; - firstPeakSize = buckets[x]; - } - if (buckets[x] > maxBucketCount) { - maxBucketCount = buckets[x]; - } - } - - // Find second-tallest peak -- well, another peak that is tall and not - // so close to the first one - int secondPeak = 0; - int secondPeakScore = 0; - for (int x = 0; x < numBuckets; x++) { - int distanceToBiggest = x - firstPeak; - // Encourage more distant second peaks by multiplying by square of distance - int score = buckets[x] * distanceToBiggest * distanceToBiggest; - if (score > secondPeakScore) { - secondPeak = x; - secondPeakScore = score; - } - } - - if (firstPeak > secondPeak) { - int temp = firstPeak; - firstPeak = secondPeak; - secondPeak = temp; - } - - // Kind of arbitrary; if the two peaks are very close, then we figure there is - // so little dynamic range in the image, that discriminating black and white - // is too error-prone. - // Decoding the image/line is either pointless, or may in some cases lead to - // a false positive for 1D formats, which are relatively lenient. - // We arbitrarily say "close" is - // "<= 1/16 of the total histogram buckets apart" - // std::cerr << "! " << secondPeak << " " << firstPeak << " " << numBuckets << std::endl; - if (secondPeak - firstPeak <= numBuckets >> 4) { - throw NotFoundException(); - } - - // Find a valley between them that is low and closer to the white peak - int bestValley = secondPeak - 1; - int bestValleyScore = -1; - for (int x = secondPeak - 1; x > firstPeak; x--) { - int fromFirst = x - firstPeak; - // Favor a "valley" that is not too close to either peak -- especially not - // the black peak -- and that has a low value of course - int score = fromFirst * fromFirst * (secondPeak - x) * - (maxBucketCount - buckets[x]); - if (score > bestValleyScore) { - bestValley = x; - bestValleyScore = score; - } - } - - // std::cerr << "bps " << (bestValley << LUMINANCE_SHIFT) << std::endl; - return bestValley << LUMINANCE_SHIFT; -} - -Ref GlobalHistogramBinarizer::createBinarizer(Ref source) { - return Ref (new GlobalHistogramBinarizer(source)); -} diff --git a/src/qzxing/zxing/zxing/common/GreyscaleLuminanceSource.cpp b/src/qzxing/zxing/zxing/common/GreyscaleLuminanceSource.cpp deleted file mode 100644 index 6ca40de..0000000 --- a/src/qzxing/zxing/zxing/common/GreyscaleLuminanceSource.cpp +++ /dev/null @@ -1,80 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * GreyscaleLuminanceSource.cpp - * zxing - * - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include - -using zxing::Ref; -using zxing::ArrayRef; -using zxing::LuminanceSource; -using zxing::GreyscaleLuminanceSource; - -GreyscaleLuminanceSource:: -GreyscaleLuminanceSource(ArrayRef greyData, - int dataWidth, int dataHeight, - int left, int top, - int width, int height) - : Super(width, height), - greyData_(greyData), - dataWidth_(dataWidth), dataHeight_(dataHeight), - left_(left), top_(top) { - - if (left + width > dataWidth || top + height > dataHeight || top < 0 || left < 0) { - throw IllegalArgumentException("Crop rectangle does not fit within image data."); - } -} - -ArrayRef GreyscaleLuminanceSource::getRow(int y, ArrayRef row) const { - if (y < 0 || y >= this->getHeight()) { - throw IllegalArgumentException("Requested row is outside the image."); - } - int width = getWidth(); - if (!row || row->size() < width) { - ArrayRef temp (width); - row = temp; - } - int offset = (y + top_) * dataWidth_ + left_; - memcpy(&row[0], &greyData_[offset], width); - return row; -} - -ArrayRef GreyscaleLuminanceSource::getMatrix() const { - int size = getWidth() * getHeight(); - ArrayRef result (size); - if (left_ == 0 && top_ == 0 && dataWidth_ == getWidth() && dataHeight_ == getHeight()) { - memcpy(&result[0], &greyData_[0], size); - } else { - for (int row = 0; row < getHeight(); row++) { - memcpy(&result[row * getWidth()], &greyData_[(top_ + row) * dataWidth_ + left_], getWidth()); - } - } - return result; -} - -Ref GreyscaleLuminanceSource::rotateCounterClockwise() const { - // Intentionally flip the left, top, width, and height arguments as - // needed. dataWidth and dataHeight are always kept unrotated. - Ref result ( - new GreyscaleRotatedLuminanceSource(greyData_, - dataWidth_, dataHeight_, - top_, left_, getHeight(), getWidth())); - return result; -} diff --git a/src/qzxing/zxing/zxing/common/GreyscaleRotatedLuminanceSource.cpp b/src/qzxing/zxing/zxing/common/GreyscaleRotatedLuminanceSource.cpp deleted file mode 100644 index eddd85b..0000000 --- a/src/qzxing/zxing/zxing/common/GreyscaleRotatedLuminanceSource.cpp +++ /dev/null @@ -1,81 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * GreyscaleRotatedLuminanceSource.cpp - * zxing - * - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -#include -#include - -using zxing::ArrayRef; -using zxing::GreyscaleRotatedLuminanceSource; - -// Note that dataWidth and dataHeight are not reversed, as we need to -// be able to traverse the greyData correctly, which does not get -// rotated. -GreyscaleRotatedLuminanceSource:: -GreyscaleRotatedLuminanceSource(ArrayRef greyData, - int dataWidth, int dataHeight, - int left, int top, - int width, int height) - : Super(width, height), - greyData_(greyData), - dataWidth_(dataWidth), - left_(left), top_(top) { - // Intentionally comparing to the opposite dimension since we're rotated. - if (left + width > dataHeight || top + height > dataWidth) { - throw IllegalArgumentException("Crop rectangle does not fit within image data."); - } -} - -// The API asks for rows, but we're rotated, so we return columns. -ArrayRef -GreyscaleRotatedLuminanceSource::getRow(int y, ArrayRef row) const { - if (y < 0 || y >= getHeight()) { - throw IllegalArgumentException("Requested row is outside the image."); - } - if (!row || row->size() < getWidth()) { - row = ArrayRef(getWidth()); - } - int offset = (left_ * dataWidth_) + (dataWidth_ - 1 - (y + top_)); - using namespace std; - if (false) { - cerr << offset << " = " - << top_ << " " << left_ << " " - << getHeight() << " " << getWidth() << " " - << y << endl; - } - for (int x = 0; x < getWidth(); x++) { - row[x] = greyData_[offset]; - offset += dataWidth_; - } - return row; -} - -ArrayRef GreyscaleRotatedLuminanceSource::getMatrix() const { - ArrayRef result (getWidth() * getHeight()); - for (int y = 0; y < getHeight(); y++) { - char* row = &result[y * getWidth()]; - int offset = (left_ * dataWidth_) + (dataWidth_ - 1 - (y + top_)); - for (int x = 0; x < getWidth(); x++) { - row[x] = greyData_[offset]; - offset += dataWidth_; - } - } - return result; -} diff --git a/src/qzxing/zxing/zxing/common/Str.cpp b/src/qzxing/zxing/zxing/common/Str.cpp deleted file mode 100644 index 3322431..0000000 --- a/src/qzxing/zxing/zxing/common/Str.cpp +++ /dev/null @@ -1,61 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * String.cpp - * zxing - * - * Created by Christian Brunschen on 20/05/2008. - * Copyright 2008 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -using std::string; -using zxing::String; -using zxing::Ref; - -String::String(const std::string &text) : - text_(text) { -} - -String::String(int capacity) { - text_.reserve(capacity); -} - -const std::string& String::getText() const { - return text_; -} - -char String::charAt(int i) const { return text_[i]; } - -int String::size() const { return text_.size(); } - -int String::length() const { return text_.size(); } - -Ref String::substring(int i) const { - return Ref(new String(text_.substr(i))); -} - -void String::append(const std::string &tail) { - text_.append(tail); -} - -void String::append(char c) { - text_.append(1,c); -} - -std::ostream& zxing::operator << (std::ostream& out, String const& s) { - out << s.text_; - return out; -} diff --git a/src/qzxing/zxing/zxing/common/detector/MathUtils.h b/src/qzxing/zxing/zxing/common/detector/MathUtils.h deleted file mode 100644 index 5884566..0000000 --- a/src/qzxing/zxing/zxing/common/detector/MathUtils.h +++ /dev/null @@ -1,57 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -#ifndef __ZXING_COMMON_DETECTOR_MATHUTILS_H__ -#define __ZXING_COMMON_DETECTOR_MATHUTILS_H__ -/* - * Copyright 2012 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -namespace zxing { -namespace common { -namespace detector { - -class MathUtils { - private: - MathUtils(); - ~MathUtils(); - public: - - /** - * Ends up being a bit faster than {@link Math#round(float)}. This merely rounds its - * argument to the nearest int, where x.5 rounds up to x+1. - */ - static inline int round(float d) { - return (int) (d + 0.5f); - } - - static inline float distance(float aX, float aY, float bX, float bY) { - float xDiff = aX - bX; - float yDiff = aY - bY; - return sqrt(xDiff * xDiff + yDiff * yDiff); - } - - static inline float distance(int aX, int aY, int bX, int bY) { - int xDiff = aX - bX; - int yDiff = aY - bY; - return sqrt(float(xDiff * xDiff + yDiff * yDiff)); - } -}; - -} -} -} - -#endif diff --git a/src/qzxing/zxing/zxing/common/detector/MonochromeRectangleDetector.cpp b/src/qzxing/zxing/zxing/common/detector/MonochromeRectangleDetector.cpp deleted file mode 100644 index 3ed9df9..0000000 --- a/src/qzxing/zxing/zxing/common/detector/MonochromeRectangleDetector.cpp +++ /dev/null @@ -1,174 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * MonochromeRectangleDetector.cpp - * y_wmk - * - * Created by Luiz Silva on 09/02/2010. - * Copyright 2010 y_wmk authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include - -using std::vector; -using zxing::Ref; -using zxing::ResultPoint; -using zxing::TwoInts; -using zxing::MonochromeRectangleDetector; - -vector > MonochromeRectangleDetector::detect() { - int height = image_->getHeight(); - int width = image_->getWidth(); - int halfHeight = height >> 1; - int halfWidth = width >> 1; - int deltaY = std::max(1, height / (MAX_MODULES << 3)); - int deltaX = std::max(1, width / (MAX_MODULES << 3)); - - int top = 0; - int bottom = height; - int left = 0; - int right = width; - Ref pointA(findCornerFromCenter(halfWidth, 0, left, right, - halfHeight, -deltaY, top, bottom, halfWidth >> 1)); - top = (int) pointA->getY() - 1;; - Ref pointB(findCornerFromCenter(halfWidth, -deltaX, left, right, - halfHeight, 0, top, bottom, halfHeight >> 1)); - left = (int) pointB->getX() - 1; - Ref pointC(findCornerFromCenter(halfWidth, deltaX, left, right, - halfHeight, 0, top, bottom, halfHeight >> 1)); - right = (int) pointC->getX() + 1; - Ref pointD(findCornerFromCenter(halfWidth, 0, left, right, - halfHeight, deltaY, top, bottom, halfWidth >> 1)); - bottom = (int) pointD->getY() + 1; - - // Go try to find point A again with better information -- might have been off at first. - pointA.reset(findCornerFromCenter(halfWidth, 0, left, right, - halfHeight, -deltaY, top, bottom, halfWidth >> 2)); - - vector > corners(4); - corners[0].reset(pointA); - corners[1].reset(pointB); - corners[2].reset(pointC); - corners[3].reset(pointD); - return corners; -} - -Ref MonochromeRectangleDetector::findCornerFromCenter(int centerX, int deltaX, int left, int right, - int centerY, int deltaY, int top, int bottom, int maxWhiteRun) { - Ref lastRange(NULL); - for (int y = centerY, x = centerX; - y < bottom && y >= top && x < right && x >= left; - y += deltaY, x += deltaX) { - Ref range(NULL); - if (deltaX == 0) { - // horizontal slices, up and down - range = blackWhiteRange(y, maxWhiteRun, left, right, true); - } else { - // vertical slices, left and right - range = blackWhiteRange(x, maxWhiteRun, top, bottom, false); - } - if (range == NULL) { - if (lastRange == NULL) { - throw NotFoundException("Couldn't find corners (lastRange = NULL) "); - } else { - // lastRange was found - if (deltaX == 0) { - int lastY = y - deltaY; - if (lastRange->start < centerX) { - if (lastRange->end > centerX) { - // straddle, choose one or the other based on direction - Ref result(new ResultPoint(deltaY > 0 ? lastRange->start : lastRange->end, lastY)); - return result; - } - Ref result(new ResultPoint(lastRange->start, lastY)); - return result; - } else { - Ref result(new ResultPoint(lastRange->end, lastY)); - return result; - } - } else { - int lastX = x - deltaX; - if (lastRange->start < centerY) { - if (lastRange->end > centerY) { - Ref result(new ResultPoint(lastX, deltaX < 0 ? lastRange->start : lastRange->end)); - return result; - } - Ref result(new ResultPoint(lastX, lastRange->start)); - return result; - } else { - Ref result(new ResultPoint(lastX, lastRange->end)); - return result; - } - } - } - } - lastRange = range; - } - throw NotFoundException("Couldn't find corners"); -} - -Ref MonochromeRectangleDetector::blackWhiteRange(int fixedDimension, int maxWhiteRun, int minDim, int maxDim, - bool horizontal) { - - int center = (minDim + maxDim) >> 1; - - // Scan left/up first - int start = center; - while (start >= minDim) { - if (horizontal ? image_->get(start, fixedDimension) : image_->get(fixedDimension, start)) { - start--; - } else { - int whiteRunStart = start; - do { - start--; - } while (start >= minDim && !(horizontal ? image_->get(start, fixedDimension) : - image_->get(fixedDimension, start))); - int whiteRunSize = whiteRunStart - start; - if (start < minDim || whiteRunSize > maxWhiteRun) { - start = whiteRunStart; - break; - } - } - } - start++; - - // Then try right/down - int end = center; - while (end < maxDim) { - if (horizontal ? image_->get(end, fixedDimension) : image_->get(fixedDimension, end)) { - end++; - } else { - int whiteRunStart = end; - do { - end++; - } while (end < maxDim && !(horizontal ? image_->get(end, fixedDimension) : - image_->get(fixedDimension, end))); - int whiteRunSize = end - whiteRunStart; - if (end >= maxDim || whiteRunSize > maxWhiteRun) { - end = whiteRunStart; - break; - } - } - } - end--; - Ref result(NULL); - if (end > start) { - result = new TwoInts; - result->start = start; - result->end = end; - } - return result; -} diff --git a/src/qzxing/zxing/zxing/multi/GenericMultipleBarcodeReader.cpp b/src/qzxing/zxing/zxing/multi/GenericMultipleBarcodeReader.cpp deleted file mode 100644 index 0248428..0000000 --- a/src/qzxing/zxing/zxing/multi/GenericMultipleBarcodeReader.cpp +++ /dev/null @@ -1,137 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2011 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include - -using std::vector; -using zxing::Ref; -using zxing::Result; -using zxing::multi::GenericMultipleBarcodeReader; - -// VC++ -using zxing::Reader; -using zxing::BinaryBitmap; -using zxing::DecodeHints; - -GenericMultipleBarcodeReader::GenericMultipleBarcodeReader(Reader& delegate) - : delegate_(delegate) {} - -GenericMultipleBarcodeReader::~GenericMultipleBarcodeReader(){} - -vector > GenericMultipleBarcodeReader::decodeMultiple(Ref image, - DecodeHints hints) { - vector > results; - doDecodeMultiple(image, hints, results, 0, 0, 0); - if (results.empty()){ - throw ReaderException("No code detected"); - } - return results; -} - -void GenericMultipleBarcodeReader::doDecodeMultiple(Ref image, - DecodeHints hints, - vector >& results, - int xOffset, - int yOffset, - int currentDepth) { - if (currentDepth > MAX_DEPTH) { - return; - } - Ref result; - try { - result = delegate_.decode(image, hints); - } catch (ReaderException const& ignored) { - (void)ignored; - return; - } - bool alreadyFound = false; - for (unsigned int i = 0; i < results.size(); i++) { - Ref existingResult = results[i]; - if (existingResult->getText()->getText() == result->getText()->getText()) { - alreadyFound = true; - break; - } - } - if (!alreadyFound) { - results.push_back(translateResultPoints(result, xOffset, yOffset)); - } - - ArrayRef< Ref > resultPoints = result->getResultPoints(); - if (resultPoints->empty()) { - return; - } - - int width = image->getWidth(); - int height = image->getHeight(); - float minX = float(width); - float minY = float(height); - float maxX = 0.0f; - float maxY = 0.0f; - for (int i = 0; i < resultPoints->size(); i++) { - Ref point = resultPoints[i]; - float x = point->getX(); - float y = point->getY(); - if (x < minX) { - minX = x; - } - if (y < minY) { - minY = y; - } - if (x > maxX) { - maxX = x; - } - if (y > maxY) { - maxY = y; - } - } - - // Decode left of barcode - if (minX > MIN_DIMENSION_TO_RECUR) { - doDecodeMultiple(image->crop(0, 0, (int) minX, height), - hints, results, xOffset, yOffset, currentDepth+1); - } - // Decode above barcode - if (minY > MIN_DIMENSION_TO_RECUR) { - doDecodeMultiple(image->crop(0, 0, width, (int) minY), - hints, results, xOffset, yOffset, currentDepth+1); - } - // Decode right of barcode - if (maxX < width - MIN_DIMENSION_TO_RECUR) { - doDecodeMultiple(image->crop((int) maxX, 0, width - (int) maxX, height), - hints, results, xOffset + (int) maxX, yOffset, currentDepth+1); - } - // Decode below barcode - if (maxY < height - MIN_DIMENSION_TO_RECUR) { - doDecodeMultiple(image->crop(0, (int) maxY, width, height - (int) maxY), - hints, results, xOffset, yOffset + (int) maxY, currentDepth+1); - } -} - -Ref GenericMultipleBarcodeReader::translateResultPoints(Ref result, int xOffset, int yOffset){ - ArrayRef< Ref > oldResultPoints = result->getResultPoints(); - if (oldResultPoints->empty()) { - return result; - } - ArrayRef< Ref > newResultPoints; - for (int i = 0; i < oldResultPoints->size(); i++) { - Ref oldPoint = oldResultPoints[i]; - newResultPoints->values().push_back(Ref(new ResultPoint(oldPoint->getX() + xOffset, oldPoint->getY() + yOffset))); - } - return Ref(new Result(result->getText(), result->getRawBytes(), newResultPoints, result->getBarcodeFormat())); -} diff --git a/src/qzxing/zxing/zxing/oned/CodaBarReader.cpp b/src/qzxing/zxing/zxing/oned/CodaBarReader.cpp deleted file mode 100644 index 5cb06b3..0000000 --- a/src/qzxing/zxing/zxing/oned/CodaBarReader.cpp +++ /dev/null @@ -1,340 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using std::vector; -using std::string; -using zxing::NotFoundException; -using zxing::FormatException; -using zxing::ChecksumException; -using zxing::Ref; -using zxing::Result; -using zxing::oned::CodaBarReader; - -// VC++ -using zxing::BitArray; - -namespace { - char const ALPHABET_STRING[] = "0123456789-$:/.+ABCD"; - char const* const ALPHABET = ALPHABET_STRING; - - /** - * These represent the encodings of characters, as patterns of wide and narrow bars. The 7 least-significant bits of - * each int correspond to the pattern of wide and narrow, with 1s representing "wide" and 0s representing narrow. - */ - const int CHARACTER_ENCODINGS[] = { - 0x003, 0x006, 0x009, 0x060, 0x012, 0x042, 0x021, 0x024, 0x030, 0x048, // 0-9 - 0x00c, 0x018, 0x045, 0x051, 0x054, 0x015, 0x01A, 0x029, 0x00B, 0x00E, // -$:/.+ABCD - }; - - // minimal number of characters that should be present (inclusing start and stop characters) - // under normal circumstances this should be set to 3, but can be set higher - // as a last-ditch attempt to reduce false positives. - const int MIN_CHARACTER_LENGTH = 3; - - // official start and end patterns - const char STARTEND_ENCODING[] = {'A', 'B', 'C', 'D', 0}; - // some codabar generator allow the codabar string to be closed by every - // character. This will cause lots of false positives! - - // some industries use a checksum standard but this is not part of the original codabar standard - // for more information see : http://www.mecsw.com/specs/codabar.html -} - -// These values are critical for determining how permissive the decoding -// will be. All stripe sizes must be within the window these define, as -// compared to the average stripe size. -const int CodaBarReader::MAX_ACCEPTABLE = - (int) (PATTERN_MATCH_RESULT_SCALE_FACTOR * 2.0f); -const int CodaBarReader::PADDING = - (int) (PATTERN_MATCH_RESULT_SCALE_FACTOR * 1.5f); - -CodaBarReader::CodaBarReader() - : counters(80, 0), counterLength(0) {} - -Ref CodaBarReader::decodeRow(int rowNumber, Ref row) { - - { // Arrays.fill(counters, 0); - int size = counters.size(); - counters.resize(0); - counters.resize(size); } - - setCounters(row); - int startOffset = findStartPattern(); - int nextStart = startOffset; - - decodeRowResult.clear(); - do { - int charOffset = toNarrowWidePattern(nextStart); - if (charOffset == -1) { - throw NotFoundException(); - } - // Hack: We store the position in the alphabet table into a - // StringBuilder, so that we can access the decoded patterns in - // validatePattern. We'll translate to the actual characters later. - decodeRowResult.append(1, (char)charOffset); - nextStart += 8; - // Stop as soon as we see the end character. - if (decodeRowResult.length() > 1 && - arrayContains(STARTEND_ENCODING, ALPHABET[charOffset])) { - break; - } - } while (nextStart < counterLength); // no fixed end pattern so keep on reading while data is available - - // Look for whitespace after pattern: - int trailingWhitespace = counters[nextStart - 1]; - int lastPatternSize = 0; - for (int i = -8; i < -1; i++) { - lastPatternSize += counters[nextStart + i]; - } - - // We need to see whitespace equal to 50% of the last pattern size, - // otherwise this is probably a false positive. The exception is if we are - // at the end of the row. (I.e. the barcode barely fits.) - if (nextStart < counterLength && trailingWhitespace < lastPatternSize / 2) { - throw NotFoundException(); - } - - validatePattern(startOffset); - - // Translate character table offsets to actual characters. - for (int i = 0; i < (int)decodeRowResult.length(); i++) { - decodeRowResult[i] = ALPHABET[(int)decodeRowResult[i]]; - } - // Ensure a valid start and end character - char startchar = decodeRowResult[0]; - if (!arrayContains(STARTEND_ENCODING, startchar)) { - throw NotFoundException(); - } - char endchar = decodeRowResult[decodeRowResult.length() - 1]; - if (!arrayContains(STARTEND_ENCODING, endchar)) { - throw NotFoundException(); - } - - // remove stop/start characters character and check if a long enough string is contained - if ((int)decodeRowResult.length() <= MIN_CHARACTER_LENGTH) { - // Almost surely a false positive ( start + stop + at least 1 character) - throw NotFoundException(); - } - - decodeRowResult.erase(decodeRowResult.length() - 1, 1); - decodeRowResult.erase(0, 1); - - int runningCount = 0; - for (int i = 0; i < startOffset; i++) { - runningCount += counters[i]; - } - float left = (float) runningCount; - for (int i = startOffset; i < nextStart - 1; i++) { - runningCount += counters[i]; - } - float right = (float) runningCount; - - ArrayRef< Ref > resultPoints(2); - resultPoints[0] = - Ref(new OneDResultPoint(left, (float) rowNumber)); - resultPoints[1] = - Ref(new OneDResultPoint(right, (float) rowNumber)); - - return Ref(new Result(Ref(new String(decodeRowResult)), - ArrayRef(), - resultPoints, - BarcodeFormat::CODABAR)); -} - -void CodaBarReader::validatePattern(int start) { - // First, sum up the total size of our four categories of stripe sizes; - vector sizes (4, 0); - vector counts (4, 0); - int end = decodeRowResult.length() - 1; - - // We break out of this loop in the middle, in order to handle - // inter-character spaces properly. - int pos = start; - for (int i = 0; true; i++) { - int pattern = CHARACTER_ENCODINGS[(int)decodeRowResult[i]]; - for (int j = 6; j >= 0; j--) { - // Even j = bars, while odd j = spaces. Categories 2 and 3 are for - // long stripes, while 0 and 1 are for short stripes. - int category = (j & 1) + (pattern & 1) * 2; - sizes[category] += counters[pos + j]; - counts[category]++; - pattern >>= 1; - } - if (i >= end) { - break; - } - // We ignore the inter-character space - it could be of any size. - pos += 8; - } - - // Calculate our allowable size thresholds using fixed-point math. - vector maxes (4, 0); - vector mins (4, 0); - // Define the threshold of acceptability to be the midpoint between the - // average small stripe and the average large stripe. No stripe lengths - // should be on the "wrong" side of that line. - for (int i = 0; i < 2; i++) { - mins[i] = 0; // Accept arbitrarily small "short" stripes. - mins[i + 2] = ((sizes[i] << INTEGER_MATH_SHIFT) / counts[i] + - (sizes[i + 2] << INTEGER_MATH_SHIFT) / counts[i + 2]) >> 1; - maxes[i] = mins[i + 2]; - maxes[i + 2] = (sizes[i + 2] * MAX_ACCEPTABLE + PADDING) / counts[i + 2]; - } - - // Now verify that all of the stripes are within the thresholds. - pos = start; - for (int i = 0; true; i++) { - int pattern = CHARACTER_ENCODINGS[(int)decodeRowResult[i]]; - for (int j = 6; j >= 0; j--) { - // Even j = bars, while odd j = spaces. Categories 2 and 3 are for - // long stripes, while 0 and 1 are for short stripes. - int category = (j & 1) + (pattern & 1) * 2; - int size = counters[pos + j] << INTEGER_MATH_SHIFT; - if (size < mins[category] || size > maxes[category]) { - throw NotFoundException(); - } - pattern >>= 1; - } - if (i >= end) { - break; - } - pos += 8; - } -} - -/** - * Records the size of all runs of white and black pixels, starting with white. - * This is just like recordPattern, except it records all the counters, and - * uses our builtin "counters" member for storage. - * @param row row to count from - */ -void CodaBarReader::setCounters(Ref row) { - counterLength = 0; - // Start from the first white bit. - int i = row->getNextUnset(0); - int end = row->getSize(); - if (i >= end) { - throw NotFoundException(); - } - bool isWhite = true; - int count = 0; - for (; i < end; i++) { - if (row->get(i) ^ isWhite) { // that is, exactly one is true - count++; - } else { - counterAppend(count); - count = 1; - isWhite = !isWhite; - } - } - counterAppend(count); -} - -void CodaBarReader::counterAppend(int e) { - if (counterLength < (int)counters.size()) { - counters[counterLength] = e; - } else { - counters.push_back(e); - } - counterLength++; -} - -int CodaBarReader::findStartPattern() { - for (int i = 1; i < counterLength; i += 2) { - int charOffset = toNarrowWidePattern(i); - if (charOffset != -1 && arrayContains(STARTEND_ENCODING, ALPHABET[charOffset])) { - // Look for whitespace before start pattern, >= 50% of width of start pattern - // We make an exception if the whitespace is the first element. - int patternSize = 0; - for (int j = i; j < i + 7; j++) { - patternSize += counters[j]; - } - if (i == 1 || counters[i-1] >= patternSize / 2) { - return i; - } - } - } - throw NotFoundException(); -} - -bool CodaBarReader::arrayContains(char const array[], char key) { - return strchr(array, key) != 0; -} - - -int CodaBarReader::toNarrowWidePattern(int position) { - int end = position + 7; - if (end >= counterLength) { - return -1; - } - - vector& theCounters = counters; - - int maxBar = 0; - int minBar = std::numeric_limits::max(); - for (int j = position; j < end; j += 2) { - int currentCounter = theCounters[j]; - if (currentCounter < minBar) { - minBar = currentCounter; - } - if (currentCounter > maxBar) { - maxBar = currentCounter; - } - } - int thresholdBar = (minBar + maxBar) / 2; - - int maxSpace = 0; - int minSpace = std::numeric_limits::max(); - for (int j = position + 1; j < end; j += 2) { - int currentCounter = theCounters[j]; - if (currentCounter < minSpace) { - minSpace = currentCounter; - } - if (currentCounter > maxSpace) { - maxSpace = currentCounter; - } - } - int thresholdSpace = (minSpace + maxSpace) / 2; - - int bitmask = 1 << 7; - int pattern = 0; - for (int i = 0; i < 7; i++) { - int threshold = (i & 1) == 0 ? thresholdBar : thresholdSpace; - bitmask >>= 1; - if (theCounters[position + i] > threshold) { - pattern |= bitmask; - } - } - - for (int i = 0; i < ZXING_ARRAY_LEN(CHARACTER_ENCODINGS); i++) { - if (CHARACTER_ENCODINGS[i] == pattern) { - return i; - } - } - return -1; -} diff --git a/src/qzxing/zxing/zxing/oned/CodaBarReader.h b/src/qzxing/zxing/zxing/oned/CodaBarReader.h deleted file mode 100644 index 3ab49d7..0000000 --- a/src/qzxing/zxing/zxing/oned/CodaBarReader.h +++ /dev/null @@ -1,57 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -#ifndef __CODA_BAR_READER_H__ -#define __CODA_BAR_READER_H__ -/* - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include - -namespace zxing { -namespace oned { - -class CodaBarReader : public OneDReader { -private: - static const int MAX_ACCEPTABLE; - static const int PADDING; - - // Keep some instance variables to avoid reallocations - std::string decodeRowResult; - std::vector counters; - int counterLength; - -public: - CodaBarReader(); - - Ref decodeRow(int rowNumber, Ref row); - - void validatePattern(int start); - -private: - void setCounters(Ref row); - void counterAppend(int e); - int findStartPattern(); - - static bool arrayContains(char const array[], char key); - - int toNarrowWidePattern(int position); -}; - -} -} - -#endif diff --git a/src/qzxing/zxing/zxing/oned/Code128Reader.cpp b/src/qzxing/zxing/zxing/oned/Code128Reader.cpp deleted file mode 100644 index cc5c300..0000000 --- a/src/qzxing/zxing/zxing/oned/Code128Reader.cpp +++ /dev/null @@ -1,494 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using std::vector; -using std::string; -using zxing::NotFoundException; -using zxing::FormatException; -using zxing::ChecksumException; -using zxing::Ref; -using zxing::Result; -using zxing::oned::Code128Reader; - -// VC++ -using zxing::BitArray; - -const int Code128Reader::MAX_AVG_VARIANCE = int(PATTERN_MATCH_RESULT_SCALE_FACTOR * 250/1000); -const int Code128Reader::MAX_INDIVIDUAL_VARIANCE = int(PATTERN_MATCH_RESULT_SCALE_FACTOR * 700/1000); - -namespace { - -const int CODE_SHIFT = 98; - -const int CODE_CODE_C = 99; -const int CODE_CODE_B = 100; -const int CODE_CODE_A = 101; - -const int CODE_FNC_1 = 102; -const int CODE_FNC_2 = 97; -const int CODE_FNC_3 = 96; -const int CODE_FNC_4_A = 101; -const int CODE_FNC_4_B = 100; - -const int CODE_START_A = 103; -const int CODE_START_B = 104; -const int CODE_START_C = 105; -const int CODE_STOP = 106; - -const int CODE_PATTERNS_LENGTH = 107; -const int CODE_PATTERNS[CODE_PATTERNS_LENGTH][6] = { - {2, 1, 2, 2, 2, 2}, /* 0 */ - {2, 2, 2, 1, 2, 2}, - {2, 2, 2, 2, 2, 1}, - {1, 2, 1, 2, 2, 3}, - {1, 2, 1, 3, 2, 2}, - {1, 3, 1, 2, 2, 2}, /* 5 */ - {1, 2, 2, 2, 1, 3}, - {1, 2, 2, 3, 1, 2}, - {1, 3, 2, 2, 1, 2}, - {2, 2, 1, 2, 1, 3}, - {2, 2, 1, 3, 1, 2}, /* 10 */ - {2, 3, 1, 2, 1, 2}, - {1, 1, 2, 2, 3, 2}, - {1, 2, 2, 1, 3, 2}, - {1, 2, 2, 2, 3, 1}, - {1, 1, 3, 2, 2, 2}, /* 15 */ - {1, 2, 3, 1, 2, 2}, - {1, 2, 3, 2, 2, 1}, - {2, 2, 3, 2, 1, 1}, - {2, 2, 1, 1, 3, 2}, - {2, 2, 1, 2, 3, 1}, /* 20 */ - {2, 1, 3, 2, 1, 2}, - {2, 2, 3, 1, 1, 2}, - {3, 1, 2, 1, 3, 1}, - {3, 1, 1, 2, 2, 2}, - {3, 2, 1, 1, 2, 2}, /* 25 */ - {3, 2, 1, 2, 2, 1}, - {3, 1, 2, 2, 1, 2}, - {3, 2, 2, 1, 1, 2}, - {3, 2, 2, 2, 1, 1}, - {2, 1, 2, 1, 2, 3}, /* 30 */ - {2, 1, 2, 3, 2, 1}, - {2, 3, 2, 1, 2, 1}, - {1, 1, 1, 3, 2, 3}, - {1, 3, 1, 1, 2, 3}, - {1, 3, 1, 3, 2, 1}, /* 35 */ - {1, 1, 2, 3, 1, 3}, - {1, 3, 2, 1, 1, 3}, - {1, 3, 2, 3, 1, 1}, - {2, 1, 1, 3, 1, 3}, - {2, 3, 1, 1, 1, 3}, /* 40 */ - {2, 3, 1, 3, 1, 1}, - {1, 1, 2, 1, 3, 3}, - {1, 1, 2, 3, 3, 1}, - {1, 3, 2, 1, 3, 1}, - {1, 1, 3, 1, 2, 3}, /* 45 */ - {1, 1, 3, 3, 2, 1}, - {1, 3, 3, 1, 2, 1}, - {3, 1, 3, 1, 2, 1}, - {2, 1, 1, 3, 3, 1}, - {2, 3, 1, 1, 3, 1}, /* 50 */ - {2, 1, 3, 1, 1, 3}, - {2, 1, 3, 3, 1, 1}, - {2, 1, 3, 1, 3, 1}, - {3, 1, 1, 1, 2, 3}, - {3, 1, 1, 3, 2, 1}, /* 55 */ - {3, 3, 1, 1, 2, 1}, - {3, 1, 2, 1, 1, 3}, - {3, 1, 2, 3, 1, 1}, - {3, 3, 2, 1, 1, 1}, - {3, 1, 4, 1, 1, 1}, /* 60 */ - {2, 2, 1, 4, 1, 1}, - {4, 3, 1, 1, 1, 1}, - {1, 1, 1, 2, 2, 4}, - {1, 1, 1, 4, 2, 2}, - {1, 2, 1, 1, 2, 4}, /* 65 */ - {1, 2, 1, 4, 2, 1}, - {1, 4, 1, 1, 2, 2}, - {1, 4, 1, 2, 2, 1}, - {1, 1, 2, 2, 1, 4}, - {1, 1, 2, 4, 1, 2}, /* 70 */ - {1, 2, 2, 1, 1, 4}, - {1, 2, 2, 4, 1, 1}, - {1, 4, 2, 1, 1, 2}, - {1, 4, 2, 2, 1, 1}, - {2, 4, 1, 2, 1, 1}, /* 75 */ - {2, 2, 1, 1, 1, 4}, - {4, 1, 3, 1, 1, 1}, - {2, 4, 1, 1, 1, 2}, - {1, 3, 4, 1, 1, 1}, - {1, 1, 1, 2, 4, 2}, /* 80 */ - {1, 2, 1, 1, 4, 2}, - {1, 2, 1, 2, 4, 1}, - {1, 1, 4, 2, 1, 2}, - {1, 2, 4, 1, 1, 2}, - {1, 2, 4, 2, 1, 1}, /* 85 */ - {4, 1, 1, 2, 1, 2}, - {4, 2, 1, 1, 1, 2}, - {4, 2, 1, 2, 1, 1}, - {2, 1, 2, 1, 4, 1}, - {2, 1, 4, 1, 2, 1}, /* 90 */ - {4, 1, 2, 1, 2, 1}, - {1, 1, 1, 1, 4, 3}, - {1, 1, 1, 3, 4, 1}, - {1, 3, 1, 1, 4, 1}, - {1, 1, 4, 1, 1, 3}, /* 95 */ - {1, 1, 4, 3, 1, 1}, - {4, 1, 1, 1, 1, 3}, - {4, 1, 1, 3, 1, 1}, - {1, 1, 3, 1, 4, 1}, - {1, 1, 4, 1, 3, 1}, /* 100 */ - {3, 1, 1, 1, 4, 1}, - {4, 1, 1, 1, 3, 1}, - {2, 1, 1, 4, 1, 2}, - {2, 1, 1, 2, 1, 4}, - {2, 1, 1, 2, 3, 2}, /* 105 */ - {2, 3, 3, 1, 1, 1} -}; - -} - -Code128Reader::Code128Reader(){} - -vector Code128Reader::findStartPattern(Ref row){ - int width = row->getSize(); - int rowOffset = row->getNextSet(0); - - int counterPosition = 0; - vector counters (6, 0); - int patternStart = rowOffset; - bool isWhite = false; - int patternLength = counters.size(); - - for (int i = rowOffset; i < width; i++) { - if (row->get(i) ^ isWhite) { - counters[counterPosition]++; - } else { - if (counterPosition == patternLength - 1) { - int bestVariance = MAX_AVG_VARIANCE; - int bestMatch = -1; - for (int startCode = CODE_START_A; startCode <= CODE_START_C; startCode++) { - int variance = patternMatchVariance(counters, CODE_PATTERNS[startCode], MAX_INDIVIDUAL_VARIANCE); - if (variance < bestVariance) { - bestVariance = variance; - bestMatch = startCode; - } - } - // Look for whitespace before start pattern, >= 50% of width of start pattern - if (bestMatch >= 0 && - row->isRange(std::max(0, patternStart - (i - patternStart) / 2), patternStart, false)) { - vector resultValue (3, 0); - resultValue[0] = patternStart; - resultValue[1] = i; - resultValue[2] = bestMatch; - return resultValue; - } - patternStart += counters[0] + counters[1]; - for (int y = 2; y < patternLength; y++) { - counters[y - 2] = counters[y]; - } - counters[patternLength - 2] = 0; - counters[patternLength - 1] = 0; - counterPosition--; - } else { - counterPosition++; - } - counters[counterPosition] = 1; - isWhite = !isWhite; - } - } - throw NotFoundException(); -} - -int Code128Reader::decodeCode(Ref row, vector& counters, int rowOffset) { - recordPattern(row, rowOffset, counters); - int bestVariance = MAX_AVG_VARIANCE; // worst variance we'll accept - int bestMatch = -1; - for (int d = 0; d < CODE_PATTERNS_LENGTH; d++) { - int const* const pattern = CODE_PATTERNS[d]; - int variance = patternMatchVariance(counters, pattern, MAX_INDIVIDUAL_VARIANCE); - if (variance < bestVariance) { - bestVariance = variance; - bestMatch = d; - } - } - // TODO We're overlooking the fact that the STOP pattern has 7 values, not 6. - if (bestMatch >= 0) { - return bestMatch; - } else { - throw NotFoundException(); - } -} - -Ref Code128Reader::decodeRow(int rowNumber, Ref row) { - // boolean convertFNC1 = hints != null && hints.containsKey(DecodeHintType.ASSUME_GS1); - boolean convertFNC1 = false; - vector startPatternInfo (findStartPattern(row)); - int startCode = startPatternInfo[2]; - int codeSet; - switch (startCode) { - case CODE_START_A: - codeSet = CODE_CODE_A; - break; - case CODE_START_B: - codeSet = CODE_CODE_B; - break; - case CODE_START_C: - codeSet = CODE_CODE_C; - break; - default: - throw FormatException(); - } - - bool done = false; - bool isNextShifted = false; - - string result; - vector rawCodes(20, 0); - - int lastStart = startPatternInfo[0]; - int nextStart = startPatternInfo[1]; - vector counters (6, 0); - - int lastCode = 0; - int code = 0; - int checksumTotal = startCode; - int multiplier = 0; - bool lastCharacterWasPrintable = true; - - std::ostringstream oss; - - while (!done) { - - bool unshift = isNextShifted; - isNextShifted = false; - - // Save off last code - lastCode = code; - - code = decodeCode(row, counters, nextStart); - - // Remember whether the last code was printable or not (excluding CODE_STOP) - if (code != CODE_STOP) { - lastCharacterWasPrintable = true; - } - - // Add to checksum computation (if not CODE_STOP of course) - if (code != CODE_STOP) { - multiplier++; - checksumTotal += multiplier * code; - } - - // Advance to where the next code will to start - lastStart = nextStart; - for (int i = 0, e = counters.size(); i < e; i++) { - nextStart += counters[i]; - } - - // Take care of illegal start codes - switch (code) { - case CODE_START_A: - case CODE_START_B: - case CODE_START_C: - throw FormatException(); - } - - switch (codeSet) { - - case CODE_CODE_A: - if (code < 64) { - result.append(1, (char) (' ' + code)); - } else if (code < 96) { - result.append(1, (char) (code - 64)); - } else { - // Don't let CODE_STOP, which always appears, affect whether whether we think the - // last code was printable or not. - if (code != CODE_STOP) { - lastCharacterWasPrintable = false; - } - switch (code) { - case CODE_FNC_1: - if (convertFNC1) { - if (result.length() == 0){ - // GS1 specification 5.4.3.7. and 5.4.6.4. If the first char after the start code - // is FNC1 then this is GS1-128. We add the symbology identifier. - result.append("]C1"); - } else { - // GS1 specification 5.4.7.5. Every subsequent FNC1 is returned as ASCII 29 (GS) - result.append(1, (char) 29); - } - } - break; - case CODE_FNC_2: - case CODE_FNC_3: - case CODE_FNC_4_A: - // do nothing? - break; - case CODE_SHIFT: - isNextShifted = true; - codeSet = CODE_CODE_B; - break; - case CODE_CODE_B: - codeSet = CODE_CODE_B; - break; - case CODE_CODE_C: - codeSet = CODE_CODE_C; - break; - case CODE_STOP: - done = true; - break; - } - } - break; - case CODE_CODE_B: - if (code < 96) { - result.append(1, (char) (' ' + code)); - } else { - if (code != CODE_STOP) { - lastCharacterWasPrintable = false; - } - switch (code) { - case CODE_FNC_1: - case CODE_FNC_2: - case CODE_FNC_3: - case CODE_FNC_4_B: - // do nothing? - break; - case CODE_SHIFT: - isNextShifted = true; - codeSet = CODE_CODE_A; - break; - case CODE_CODE_A: - codeSet = CODE_CODE_A; - break; - case CODE_CODE_C: - codeSet = CODE_CODE_C; - break; - case CODE_STOP: - done = true; - break; - } - } - break; - case CODE_CODE_C: - if (code < 100) { - if (code < 10) { - result.append(1, '0'); - } - oss.clear(); - oss.str(""); - oss << code; - result.append(oss.str()); - } else { - if (code != CODE_STOP) { - lastCharacterWasPrintable = false; - } - switch (code) { - case CODE_FNC_1: - // do nothing? - break; - case CODE_CODE_A: - codeSet = CODE_CODE_A; - break; - case CODE_CODE_B: - codeSet = CODE_CODE_B; - break; - case CODE_STOP: - done = true; - break; - } - } - break; - } - - // Unshift back to another code set if we were shifted - if (unshift) { - codeSet = codeSet == CODE_CODE_A ? CODE_CODE_B : CODE_CODE_A; - } - - } - - // Check for ample whitespace following pattern, but, to do this we first need to remember that - // we fudged decoding CODE_STOP since it actually has 7 bars, not 6. There is a black bar left - // to read off. Would be slightly better to properly read. Here we just skip it: - nextStart = row->getNextUnset(nextStart); - if (!row->isRange(nextStart, - std::min(row->getSize(), nextStart + (nextStart - lastStart) / 2), - false)) { - throw NotFoundException(); - } - - // Pull out from sum the value of the penultimate check code - checksumTotal -= multiplier * lastCode; - // lastCode is the checksum then: - if (checksumTotal % 103 != lastCode) { - throw ChecksumException(); - } - - // Need to pull out the check digits from string - int resultLength = result.length(); - if (resultLength == 0) { - // false positive - throw NotFoundException(); - } - - // Only bother if the result had at least one character, and if the checksum digit happened to - // be a printable character. If it was just interpreted as a control code, nothing to remove. - if (resultLength > 0 && lastCharacterWasPrintable) { - if (codeSet == CODE_CODE_C) { - result.erase(resultLength - 2, resultLength); - } else { - result.erase(resultLength - 1, resultLength); - } - } - - float left = (float) (startPatternInfo[1] + startPatternInfo[0]) / 2.0f; - float right = (float) (nextStart + lastStart) / 2.0f; - - int rawCodesSize = rawCodes.size(); - ArrayRef rawBytes (rawCodesSize); - for (int i = 0; i < rawCodesSize; i++) { - rawBytes[i] = rawCodes[i]; - } - - ArrayRef< Ref > resultPoints(2); - resultPoints[0] = - Ref(new OneDResultPoint(left, (float) rowNumber)); - resultPoints[1] = - Ref(new OneDResultPoint(right, (float) rowNumber)); - - return Ref(new Result(Ref(new String(result)), rawBytes, resultPoints, - BarcodeFormat::CODE_128)); -} - -Code128Reader::~Code128Reader(){} - -zxing::BarcodeFormat Code128Reader::getBarcodeFormat(){ - return BarcodeFormat::CODE_128; -} diff --git a/src/qzxing/zxing/zxing/oned/Code128Reader.h b/src/qzxing/zxing/zxing/oned/Code128Reader.h deleted file mode 100644 index c4ca83e..0000000 --- a/src/qzxing/zxing/zxing/oned/Code128Reader.h +++ /dev/null @@ -1,48 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -#ifndef __CODE_128_READER_H__ -#define __CODE_128_READER_H__ -/* - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include - -namespace zxing { -namespace oned { - -class Code128Reader : public OneDReader { -private: - static const int MAX_AVG_VARIANCE; - static const int MAX_INDIVIDUAL_VARIANCE; - - static std::vector findStartPattern(Ref row); - static int decodeCode(Ref row, - std::vector& counters, - int rowOffset); - -public: - Ref decodeRow(int rowNumber, Ref row); - Code128Reader(); - ~Code128Reader(); - - BarcodeFormat getBarcodeFormat(); -}; - -} -} - -#endif diff --git a/src/qzxing/zxing/zxing/oned/Code39Reader.cpp b/src/qzxing/zxing/zxing/oned/Code39Reader.cpp deleted file mode 100644 index 6544f2f..0000000 --- a/src/qzxing/zxing/zxing/oned/Code39Reader.cpp +++ /dev/null @@ -1,328 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "Code39Reader.h" -#include -#include -#include -#include -#include -#include -#include - -using std::vector; -using zxing::Ref; -using zxing::Result; -using zxing::String; -using zxing::NotFoundException; -using zxing::ChecksumException; -using zxing::oned::Code39Reader; - -// VC++ -using zxing::BitArray; - -namespace { - const char* ALPHABET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. *$/+%"; - - /** - * These represent the encodings of characters, as patterns of wide and narrow - * bars. - * The 9 least-significant bits of each int correspond to the pattern of wide - * and narrow, with 1s representing "wide" and 0s representing narrow. - */ - const int CHARACTER_ENCODINGS_LEN = 44; - int CHARACTER_ENCODINGS[CHARACTER_ENCODINGS_LEN] = { - 0x034, 0x121, 0x061, 0x160, 0x031, 0x130, 0x070, 0x025, 0x124, 0x064, // 0-9 - 0x109, 0x049, 0x148, 0x019, 0x118, 0x058, 0x00D, 0x10C, 0x04C, 0x01C, // A-J - 0x103, 0x043, 0x142, 0x013, 0x112, 0x052, 0x007, 0x106, 0x046, 0x016, // K-T - 0x181, 0x0C1, 0x1C0, 0x091, 0x190, 0x0D0, 0x085, 0x184, 0x0C4, 0x094, // U-* - 0x0A8, 0x0A2, 0x08A, 0x02A // $-% - }; - - int ASTERISK_ENCODING = 0x094; - const char* ALPHABET_STRING = - "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. *$/+%"; - - std::string alphabet_string (ALPHABET_STRING); -} - -void Code39Reader::init(bool usingCheckDigit_, bool extendedMode_) { - usingCheckDigit = usingCheckDigit_; - extendedMode = extendedMode_; - decodeRowResult.reserve(20); - counters.resize(9); -} - -/** - * Creates a reader that assumes all encoded data is data, and does not treat - * the final character as a check digit. It will not decoded "extended - * Code 39" sequences. - */ -Code39Reader::Code39Reader() { - init(); -} - -/** - * Creates a reader that can be configured to check the last character as a - * check digit. It will not decoded "extended Code 39" sequences. - * - * @param usingCheckDigit if true, treat the last data character as a check - * digit, not data, and verify that the checksum passes. - */ -Code39Reader::Code39Reader(bool usingCheckDigit_) { - init(usingCheckDigit_); -} - -Code39Reader::Code39Reader(bool usingCheckDigit_, bool extendedMode_) { - init(usingCheckDigit_, extendedMode_); -} - -Ref Code39Reader::decodeRow(int rowNumber, Ref row) { - std::vector& theCounters (counters); - { // Arrays.fill(counters, 0); - int size = theCounters.size(); - theCounters.resize(0); - theCounters.resize(size); } - std::string& result (decodeRowResult); - result.clear(); - - vector start (findAsteriskPattern(row, theCounters)); - // Read off white space - int nextStart = row->getNextSet(start[1]); - int end = row->getSize(); - - char decodedChar; - int lastStart; - do { - recordPattern(row, nextStart, theCounters); - int pattern = toNarrowWidePattern(theCounters); - if (pattern < 0) { - throw NotFoundException();; - } - decodedChar = patternToChar(pattern); - result.append(1, decodedChar); - lastStart = nextStart; - for (int i = 0, end=theCounters.size(); i < end; i++) { - nextStart += theCounters[i]; - } - // Read off white space - nextStart = row->getNextSet(nextStart); - } while (decodedChar != '*'); - result.resize(decodeRowResult.length()-1);// remove asterisk - - // Look for whitespace after pattern: - int lastPatternSize = 0; - for (int i = 0, e = theCounters.size(); i < e; i++) { - lastPatternSize += theCounters[i]; - } - int whiteSpaceAfterEnd = nextStart - lastStart - lastPatternSize; - // If 50% of last pattern size, following last pattern, is not whitespace, - // fail (but if it's whitespace to the very end of the image, that's OK) - if (nextStart != end && (whiteSpaceAfterEnd >> 1) < lastPatternSize) { - throw NotFoundException(); - } - - if (usingCheckDigit) { - int max = result.length() - 1; - int total = 0; - for (int i = 0; i < max; i++) { - total += alphabet_string.find_first_of(decodeRowResult[i], 0); - } - if (result[max] != ALPHABET[total % 43]) { - throw ChecksumException(); - } - result.resize(max); - } - - if (result.length() == 0) { - // Almost false positive - throw NotFoundException(); - } - - Ref resultString; - if (extendedMode) { - resultString = decodeExtended(result); - } else { - resultString = Ref(new String(result)); - } - - float left = (float) (start[1] + start[0]) / 2.0f; - float right = (float) (nextStart + lastStart) / 2.0f; - - ArrayRef< Ref > resultPoints (2); - resultPoints[0] = - Ref(new OneDResultPoint(left, (float) rowNumber)); - resultPoints[1] = - Ref(new OneDResultPoint(right, (float) rowNumber)); - - return Ref( - new Result(resultString, ArrayRef(), resultPoints, BarcodeFormat::CODE_39) - ); -} - -vector Code39Reader::findAsteriskPattern(Ref row, vector& counters){ - int width = row->getSize(); - int rowOffset = row->getNextSet(0); - - int counterPosition = 0; - int patternStart = rowOffset; - bool isWhite = false; - int patternLength = counters.size(); - - for (int i = rowOffset; i < width; i++) { - if (row->get(i) ^ isWhite) { - counters[counterPosition]++; - } else { - if (counterPosition == patternLength - 1) { - // Look for whitespace before start pattern, >= 50% of width of - // start pattern. - if (toNarrowWidePattern(counters) == ASTERISK_ENCODING && - row->isRange(std::max(0, patternStart - ((i - patternStart) >> 1)), patternStart, false)) { - vector resultValue (2, 0); - resultValue[0] = patternStart; - resultValue[1] = i; - return resultValue; - } - patternStart += counters[0] + counters[1]; - for (int y = 2; y < patternLength; y++) { - counters[y - 2] = counters[y]; - } - counters[patternLength - 2] = 0; - counters[patternLength - 1] = 0; - counterPosition--; - } else { - counterPosition++; - } - counters[counterPosition] = 1; - isWhite = !isWhite; - } - } - throw NotFoundException(); -} - -// For efficiency, returns -1 on failure. Not throwing here saved as many as -// 700 exceptions per image when using some of our blackbox images. -int Code39Reader::toNarrowWidePattern(vector& counters){ - int numCounters = counters.size(); - int maxNarrowCounter = 0; - int wideCounters; - do { - int minCounter = INT_MAX; - for (int i = 0; i < numCounters; i++) { - int counter = counters[i]; - if (counter < minCounter && counter > maxNarrowCounter) { - minCounter = counter; - } - } - maxNarrowCounter = minCounter; - wideCounters = 0; - int totalWideCountersWidth = 0; - int pattern = 0; - for (int i = 0; i < numCounters; i++) { - int counter = counters[i]; - if (counters[i] > maxNarrowCounter) { - pattern |= 1 << (numCounters - 1 - i); - wideCounters++; - totalWideCountersWidth += counter; - } - } - if (wideCounters == 3) { - // Found 3 wide counters, but are they close enough in width? - // We can perform a cheap, conservative check to see if any individual - // counter is more than 1.5 times the average: - for (int i = 0; i < numCounters && wideCounters > 0; i++) { - int counter = counters[i]; - if (counters[i] > maxNarrowCounter) { - wideCounters--; - // totalWideCountersWidth = 3 * average, so this checks if - // counter >= 3/2 * average. - if ((counter << 1) >= totalWideCountersWidth) { - return -1; - } - } - } - return pattern; - } - } while (wideCounters > 3); - return -1; -} - -char Code39Reader::patternToChar(int pattern){ - for (int i = 0; i < CHARACTER_ENCODINGS_LEN; i++) { - if (CHARACTER_ENCODINGS[i] == pattern) { - return ALPHABET[i]; - } - } - throw ReaderException(""); -} - -Ref Code39Reader::decodeExtended(std::string encoded){ - int length = encoded.length(); - std::string tmpDecoded; - for (int i = 0; i < length; i++) { - char c = encoded[i]; - if (c == '+' || c == '$' || c == '%' || c == '/') { - char next = encoded[i + 1]; - char decodedChar = '\0'; - switch (c) { - case '+': - // +A to +Z map to a to z - if (next >= 'A' && next <= 'Z') { - decodedChar = (char) (next + 32); - } else { - throw ReaderException(""); - } - break; - case '$': - // $A to $Z map to control codes SH to SB - if (next >= 'A' && next <= 'Z') { - decodedChar = (char) (next - 64); - } else { - throw ReaderException(""); - } - break; - case '%': - // %A to %E map to control codes ESC to US - if (next >= 'A' && next <= 'E') { - decodedChar = (char) (next - 38); - } else if (next >= 'F' && next <= 'W') { - decodedChar = (char) (next - 11); - } else { - throw ReaderException(""); - } - break; - case '/': - // /A to /O map to ! to , and /Z maps to : - if (next >= 'A' && next <= 'O') { - decodedChar = (char) (next - 32); - } else if (next == 'Z') { - decodedChar = ':'; - } else { - throw ReaderException(""); - } - break; - } - tmpDecoded.append(1, decodedChar); - // bump up i again since we read two characters - i++; - } else { - tmpDecoded.append(1, c); - } - } - Ref decoded(new String(tmpDecoded)); - return decoded; -} diff --git a/src/qzxing/zxing/zxing/oned/Code39Reader.h b/src/qzxing/zxing/zxing/oned/Code39Reader.h deleted file mode 100644 index 36985de..0000000 --- a/src/qzxing/zxing/zxing/oned/Code39Reader.h +++ /dev/null @@ -1,63 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -#ifndef __CODE_39_READER_H__ -#define __CODE_39_READER_H__ -/* - * Code39Reader.h - * ZXing - * - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include - -namespace zxing { -namespace oned { - -/** - *

Decodes Code 39 barcodes. This does not support "Full ASCII Code 39" yet.

- * Ported form Java (author Sean Owen) - * @author Lukasz Warchol - */ -class Code39Reader : public OneDReader { -private: - bool usingCheckDigit; - bool extendedMode; - std::string decodeRowResult; - std::vector counters; - - void init(bool usingCheckDigit = false, bool extendedMode = false); - - static std::vector findAsteriskPattern(Ref row, - std::vector& counters); - static int toNarrowWidePattern(std::vector& counters); - static char patternToChar(int pattern); - static Ref decodeExtended(std::string encoded); - - void append(char* s, char c); - -public: - Code39Reader(); - Code39Reader(bool usingCheckDigit_); - Code39Reader(bool usingCheckDigit_, bool extendedMode_); - - Ref decodeRow(int rowNumber, Ref row); -}; - -} -} - -#endif diff --git a/src/qzxing/zxing/zxing/oned/Code93Reader.cpp b/src/qzxing/zxing/zxing/oned/Code93Reader.cpp deleted file mode 100644 index 39d7683..0000000 --- a/src/qzxing/zxing/zxing/oned/Code93Reader.cpp +++ /dev/null @@ -1,287 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "Code93Reader.h" -#include -#include -#include -#include -#include -#include -#include -#include - -using std::vector; -using std::string; -using zxing::Ref; -using zxing::Result; -using zxing::String; -using zxing::NotFoundException; -using zxing::ChecksumException; -using zxing::oned::Code93Reader; - -// VC++ -using zxing::BitArray; - -namespace { - char const ALPHABET[] = - "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%abcd*"; - string ALPHABET_STRING (ALPHABET); - - /** - * These represent the encodings of characters, as patterns of wide and narrow bars. - * The 9 least-significant bits of each int correspond to the pattern of wide and narrow. - */ - int const CHARACTER_ENCODINGS[] = { - 0x114, 0x148, 0x144, 0x142, 0x128, 0x124, 0x122, 0x150, 0x112, 0x10A, // 0-9 - 0x1A8, 0x1A4, 0x1A2, 0x194, 0x192, 0x18A, 0x168, 0x164, 0x162, 0x134, // A-J - 0x11A, 0x158, 0x14C, 0x146, 0x12C, 0x116, 0x1B4, 0x1B2, 0x1AC, 0x1A6, // K-T - 0x196, 0x19A, 0x16C, 0x166, 0x136, 0x13A, // U-Z - 0x12E, 0x1D4, 0x1D2, 0x1CA, 0x16E, 0x176, 0x1AE, // - - % - 0x126, 0x1DA, 0x1D6, 0x132, 0x15E, // Control chars? $-* - }; - int const CHARACTER_ENCODINGS_LENGTH = - (int)sizeof(CHARACTER_ENCODINGS)/sizeof(CHARACTER_ENCODINGS[0]); - const int ASTERISK_ENCODING = CHARACTER_ENCODINGS[47]; -} - -Code93Reader::Code93Reader() { - decodeRowResult.reserve(20); - counters.resize(6); -} - -Ref Code93Reader::decodeRow(int rowNumber, Ref row) { - Range start (findAsteriskPattern(row)); - // Read off white space - int nextStart = row->getNextSet(start[1]); - int end = row->getSize(); - - vector& theCounters (counters); - { // Arrays.fill(counters, 0); - int size = theCounters.size(); - theCounters.resize(0); - theCounters.resize(size); } - string& result (decodeRowResult); - result.clear(); - - char decodedChar; - int lastStart; - do { - recordPattern(row, nextStart, theCounters); - int pattern = toPattern(theCounters); - if (pattern < 0) { - throw NotFoundException(); - } - decodedChar = patternToChar(pattern); - result.append(1, decodedChar); - lastStart = nextStart; - for(int i=0, e=theCounters.size(); i < e; ++i) { - nextStart += theCounters[i]; - } - // Read off white space - nextStart = row->getNextSet(nextStart); - } while (decodedChar != '*'); - result.resize(result.length() - 1); // remove asterisk - - // Should be at least one more black module - if (nextStart == end || !row->get(nextStart)) { - throw NotFoundException(); - } - - if (result.length() < 2) { - // false positive -- need at least 2 checksum digits - throw NotFoundException(); - } - - checkChecksums(result); - // Remove checksum digits - result.resize(result.length() - 2); - - Ref resultString = decodeExtended(result); - - float left = (float) (start[1] + start[0]) / 2.0f; - float right = (float) (nextStart + lastStart) / 2.0f; - - ArrayRef< Ref > resultPoints (2); - resultPoints[0] = - Ref(new OneDResultPoint(left, (float) rowNumber)); - resultPoints[1] = - Ref(new OneDResultPoint(right, (float) rowNumber)); - - return Ref(new Result( - resultString, - ArrayRef(), - resultPoints, - BarcodeFormat::CODE_93)); -} - -Code93Reader::Range Code93Reader::findAsteriskPattern(Ref row) { - int width = row->getSize(); - int rowOffset = row->getNextSet(0); - - { // Arrays.fill(counters, 0); - int size = counters.size(); - counters.resize(0); - counters.resize(size); } - vector& theCounters (counters); - - int patternStart = rowOffset; - bool isWhite = false; - int patternLength = theCounters.size(); - - int counterPosition = 0; - for (int i = rowOffset; i < width; i++) { - if (row->get(i) ^ isWhite) { - theCounters[counterPosition]++; - } else { - if (counterPosition == patternLength - 1) { - if (toPattern(theCounters) == ASTERISK_ENCODING) { - return Range(patternStart, i); - } - patternStart += theCounters[0] + theCounters[1]; - for (int y = 2; y < patternLength; y++) { - theCounters[y - 2] = theCounters[y]; - } - theCounters[patternLength - 2] = 0; - theCounters[patternLength - 1] = 0; - counterPosition--; - } else { - counterPosition++; - } - theCounters[counterPosition] = 1; - isWhite = !isWhite; - } - } - throw NotFoundException(); -} - -int Code93Reader::toPattern(vector& counters) { - int max = counters.size(); - int sum = 0; - for(int i=0, e=counters.size(); i> INTEGER_MATH_SHIFT; - if ((scaledShifted & 0xFF) > 0x7F) { - scaledUnshifted++; - } - if (scaledUnshifted < 1 || scaledUnshifted > 4) { - return -1; - } - if ((i & 0x01) == 0) { - for (int j = 0; j < scaledUnshifted; j++) { - pattern = (pattern << 1) | 0x01; - } - } else { - pattern <<= scaledUnshifted; - } - } - return pattern; -} - -char Code93Reader::patternToChar(int pattern) { - for (int i = 0; i < CHARACTER_ENCODINGS_LENGTH; i++) { - if (CHARACTER_ENCODINGS[i] == pattern) { - return ALPHABET[i]; - } - } - throw NotFoundException(); -} - -Ref Code93Reader::decodeExtended(string const& encoded) { - int length = encoded.length(); - string decoded; - for (int i = 0; i < length; i++) { - char c = encoded[i]; - if (c >= 'a' && c <= 'd') { - if (i >= length - 1) { - throw FormatException::getFormatInstance(); - } - char next = encoded[i + 1]; - char decodedChar = '\0'; - switch (c) { - case 'd': - // +A to +Z map to a to z - if (next >= 'A' && next <= 'Z') { - decodedChar = (char) (next + 32); - } else { - throw FormatException::getFormatInstance(); - } - break; - case 'a': - // $A to $Z map to control codes SH to SB - if (next >= 'A' && next <= 'Z') { - decodedChar = (char) (next - 64); - } else { - throw FormatException::getFormatInstance(); - } - break; - case 'b': - // %A to %E map to control codes ESC to US - if (next >= 'A' && next <= 'E') { - decodedChar = (char) (next - 38); - } else if (next >= 'F' && next <= 'W') { - decodedChar = (char) (next - 11); - } else { - throw FormatException::getFormatInstance(); - } - break; - case 'c': - // /A to /O map to ! to , and /Z maps to : - if (next >= 'A' && next <= 'O') { - decodedChar = (char) (next - 32); - } else if (next == 'Z') { - decodedChar = ':'; - } else { - throw FormatException::getFormatInstance(); - } - break; - } - decoded.append(1, decodedChar); - // bump up i again since we read two characters - i++; - } else { - decoded.append(1, c); - } - } - return Ref(new String(decoded)); -} - -void Code93Reader::checkChecksums(string const& result) { - int length = result.length(); - checkOneChecksum(result, length - 2, 20); - checkOneChecksum(result, length - 1, 15); -} - -void Code93Reader::checkOneChecksum(string const& result, - int checkPosition, - int weightMax) { - int weight = 1; - int total = 0; - for (int i = checkPosition - 1; i >= 0; i--) { - total += weight * ALPHABET_STRING.find_first_of(result[i]); - if (++weight > weightMax) { - weight = 1; - } - } - if (result[checkPosition] != ALPHABET[total % 47]) { - throw ChecksumException(); - } -} diff --git a/src/qzxing/zxing/zxing/oned/Code93Reader.h b/src/qzxing/zxing/zxing/oned/Code93Reader.h deleted file mode 100644 index a8b4724..0000000 --- a/src/qzxing/zxing/zxing/oned/Code93Reader.h +++ /dev/null @@ -1,58 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -#ifndef __CODE_93_READER_H__ -#define __CODE_93_READER_H__ -/* - * Code93Reader.h - * ZXing - * - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include - -namespace zxing { -namespace oned { - -/** - *

Decodes Code 93 barcodes. This does not support "Full ASCII Code 93" yet.

- * Ported form Java (author Sean Owen) - * @author Lukasz Warchol - */ -class Code93Reader : public OneDReader { -public: - Code93Reader(); - Ref decodeRow(int rowNumber, Ref row); - -private: - std::string decodeRowResult; - std::vector counters; - - Range findAsteriskPattern(Ref row); - - static int toPattern(std::vector& counters); - static char patternToChar(int pattern); - static Ref decodeExtended(std::string const& encoded); - static void checkChecksums(std::string const& result); - static void checkOneChecksum(std::string const& result, - int checkPosition, - int weightMax); -}; - -} -} - -#endif diff --git a/src/qzxing/zxing/zxing/oned/EAN13Reader.cpp b/src/qzxing/zxing/zxing/oned/EAN13Reader.cpp deleted file mode 100644 index ef723a3..0000000 --- a/src/qzxing/zxing/zxing/oned/EAN13Reader.cpp +++ /dev/null @@ -1,85 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "EAN13Reader.h" -#include - -using std::vector; -using zxing::Ref; -using zxing::BitArray; -using zxing::oned::EAN13Reader; - -namespace { - const int FIRST_DIGIT_ENCODINGS[10] = { - 0x00, 0x0B, 0x0D, 0xE, 0x13, 0x19, 0x1C, 0x15, 0x16, 0x1A - }; -} - -EAN13Reader::EAN13Reader() : decodeMiddleCounters(4, 0) { } - -int EAN13Reader::decodeMiddle(Ref row, - Range const& startRange, - std::string& resultString) { - vector& counters (decodeMiddleCounters); - counters.clear(); - counters.resize(4); - int end = row->getSize(); - int rowOffset = startRange[1]; - - int lgPatternFound = 0; - - for (int x = 0; x < 6 && rowOffset < end; x++) { - int bestMatch = decodeDigit(row, counters, rowOffset, L_AND_G_PATTERNS); - resultString.append(1, (char) ('0' + bestMatch % 10)); - for (int i = 0, end = counters.size(); i = 10) { - lgPatternFound |= 1 << (5 - x); - } - } - - determineFirstDigit(resultString, lgPatternFound); - - Range middleRange = findGuardPattern(row, rowOffset, true, MIDDLE_PATTERN) ; - rowOffset = middleRange[1]; - - for (int x = 0; x < 6 && rowOffset < end; x++) { - int bestMatch = - decodeDigit(row, counters, rowOffset, L_PATTERNS); - resultString.append(1, (char) ('0' + bestMatch)); - for (int i = 0, end = counters.size(); i < end; i++) { - rowOffset += counters[i]; - } - } - return rowOffset; -} - -void EAN13Reader::determineFirstDigit(std::string& resultString, int lgPatternFound) { - // std::cerr << "K " << resultString << " " << lgPatternFound << " " < - -using std::vector; -using zxing::oned::EAN8Reader; - -// VC++ -using zxing::Ref; -using zxing::BitArray; - -EAN8Reader::EAN8Reader() : decodeMiddleCounters(4, 0) {} - -int EAN8Reader::decodeMiddle(Ref row, - Range const& startRange, - std::string& result){ - vector& counters (decodeMiddleCounters); - counters[0] = 0; - counters[1] = 0; - counters[2] = 0; - counters[3] = 0; - - int end = row->getSize(); - int rowOffset = startRange[1]; - - for (int x = 0; x < 4 && rowOffset < end; x++) { - int bestMatch = decodeDigit(row, counters, rowOffset, L_PATTERNS); - result.append(1, (char) ('0' + bestMatch)); - for (int i = 0, end = counters.size(); i < end; i++) { - rowOffset += counters[i]; - } - } - - Range middleRange = - findGuardPattern(row, rowOffset, true, MIDDLE_PATTERN); - rowOffset = middleRange[1]; - for (int x = 0; x < 4 && rowOffset < end; x++) { - int bestMatch = decodeDigit(row, counters, rowOffset, L_PATTERNS); - result.append(1, (char) ('0' + bestMatch)); - for (int i = 0, end = counters.size(); i < end; i++) { - rowOffset += counters[i]; - } - } - return rowOffset; -} - -zxing::BarcodeFormat EAN8Reader::getBarcodeFormat(){ - return BarcodeFormat::EAN_8; -} diff --git a/src/qzxing/zxing/zxing/oned/ITFReader.cpp b/src/qzxing/zxing/zxing/oned/ITFReader.cpp deleted file mode 100644 index 301dddb..0000000 --- a/src/qzxing/zxing/zxing/oned/ITFReader.cpp +++ /dev/null @@ -1,337 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -using std::vector; -using zxing::Ref; -using zxing::ArrayRef; -using zxing::Array; -using zxing::Result; -using zxing::FormatException; -using zxing::NotFoundException; -using zxing::oned::ITFReader; - -// VC++ -using zxing::BitArray; - -#define VECTOR_INIT(v) v, v + sizeof(v)/sizeof(v[0]) - -namespace { - -const int W = 3; // Pixel width of a wide line -const int N = 1; // Pixed width of a narrow line - -const int DEFAULT_ALLOWED_LENGTHS_[] = -{ 48, 44, 24, 20, 18, 16, 14, 12, 10, 8, 6 }; -const ArrayRef DEFAULT_ALLOWED_LENGTHS (new Array(VECTOR_INIT(DEFAULT_ALLOWED_LENGTHS_))); - -/** - * Start/end guard pattern. - * - * Note: The end pattern is reversed because the row is reversed before - * searching for the END_PATTERN - */ -const int START_PATTERN_[] = {N, N, N, N}; -const vector START_PATTERN (VECTOR_INIT(START_PATTERN_)); - -const int END_PATTERN_REVERSED_[] = {N, N, W}; -const vector END_PATTERN_REVERSED (VECTOR_INIT(END_PATTERN_REVERSED_)); - -/** - * Patterns of Wide / Narrow lines to indicate each digit - */ -const int PATTERNS[][5] = { - {N, N, W, W, N}, // 0 - {W, N, N, N, W}, // 1 - {N, W, N, N, W}, // 2 - {W, W, N, N, N}, // 3 - {N, N, W, N, W}, // 4 - {W, N, W, N, N}, // 5 - {N, W, W, N, N}, // 6 - {N, N, N, W, W}, // 7 - {W, N, N, W, N}, // 8 - {N, W, N, W, N} // 9 -}; - -} - -ITFReader::ITFReader() : narrowLineWidth(-1) { -} - - -Ref ITFReader::decodeRow(int rowNumber, Ref row) { - // Find out where the Middle section (payload) starts & ends - - Range startRange = decodeStart(row); - Range endRange = decodeEnd(row); - - std::string result; - decodeMiddle(row, startRange[1], endRange[0], result); - Ref resultString(new String(result)); - - ArrayRef allowedLengths; - // Java hints stuff missing - if (!allowedLengths) { - allowedLengths = DEFAULT_ALLOWED_LENGTHS; - } - - // To avoid false positives with 2D barcodes (and other patterns), make - // an assumption that the decoded string must be 6, 10 or 14 digits. - int length = resultString->size(); - bool lengthOK = false; - for (int i = 0, e = allowedLengths->size(); i < e; i++) { - if (length == allowedLengths[i]) { - lengthOK = true; - break; - } - } - - if (!lengthOK) { - throw FormatException(); - } - - ArrayRef< Ref > resultPoints(2); - resultPoints[0] = - Ref(new OneDResultPoint(float(startRange[1]), float(rowNumber))); - resultPoints[1] = - Ref(new OneDResultPoint(float(endRange[0]), float(rowNumber))); - return Ref(new Result(resultString, ArrayRef(), resultPoints, BarcodeFormat::ITF)); -} - -/** - * @param row row of black/white values to search - * @param payloadStart offset of start pattern - * @param resultString {@link StringBuffer} to append decoded chars to - * @throws ReaderException if decoding could not complete successfully - */ -void ITFReader::decodeMiddle(Ref row, - int payloadStart, - int payloadEnd, - std::string& resultString) { - // Digits are interleaved in pairs - 5 black lines for one digit, and the - // 5 - // interleaved white lines for the second digit. - // Therefore, need to scan 10 lines and then - // split these into two arrays - vector counterDigitPair(10, 0); - vector counterBlack(5, 0); - vector counterWhite(5, 0); - - while (payloadStart < payloadEnd) { - - // Get 10 runs of black/white. - recordPattern(row, payloadStart, counterDigitPair); - // Split them into each array - for (int k = 0; k < 5; k++) { - int twoK = k << 1; - counterBlack[k] = counterDigitPair[twoK]; - counterWhite[k] = counterDigitPair[twoK + 1]; - } - - int bestMatch = decodeDigit(counterBlack); - resultString.append(1, (char) ('0' + bestMatch)); - bestMatch = decodeDigit(counterWhite); - resultString.append(1, (char) ('0' + bestMatch)); - - for (int i = 0, e = counterDigitPair.size(); i < e; i++) { - payloadStart += counterDigitPair[i]; - } - } -} - -/** - * Identify where the start of the middle / payload section starts. - * - * @param row row of black/white values to search - * @return Array, containing index of start of 'start block' and end of - * 'start block' - * @throws ReaderException - */ -ITFReader::Range ITFReader::decodeStart(Ref row) { - int endStart = skipWhiteSpace(row); - Range startPattern = findGuardPattern(row, endStart, START_PATTERN); - - // Determine the width of a narrow line in pixels. We can do this by - // getting the width of the start pattern and dividing by 4 because its - // made up of 4 narrow lines. - narrowLineWidth = (startPattern[1] - startPattern[0]) >> 2; - - validateQuietZone(row, startPattern[0]); - return startPattern; -} - -/** - * Identify where the end of the middle / payload section ends. - * - * @param row row of black/white values to search - * @return Array, containing index of start of 'end block' and end of 'end - * block' - * @throws ReaderException - */ - -ITFReader::Range ITFReader::decodeEnd(Ref row) { - // For convenience, reverse the row and then - // search from 'the start' for the end block - BitArray::Reverse r (row); - - int endStart = skipWhiteSpace(row); - Range endPattern = findGuardPattern(row, endStart, END_PATTERN_REVERSED); - - // The start & end patterns must be pre/post fixed by a quiet zone. This - // zone must be at least 10 times the width of a narrow line. - // ref: http://www.barcode-1.net/i25code.html - validateQuietZone(row, endPattern[0]); - - // Now recalculate the indices of where the 'endblock' starts & stops to - // accommodate - // the reversed nature of the search - int temp = endPattern[0]; - endPattern[0] = row->getSize() - endPattern[1]; - endPattern[1] = row->getSize() - temp; - - return endPattern; -} - -/** - * The start & end patterns must be pre/post fixed by a quiet zone. This - * zone must be at least 10 times the width of a narrow line. Scan back until - * we either get to the start of the barcode or match the necessary number of - * quiet zone pixels. - * - * Note: Its assumed the row is reversed when using this method to find - * quiet zone after the end pattern. - * - * ref: http://www.barcode-1.net/i25code.html - * - * @param row bit array representing the scanned barcode. - * @param startPattern index into row of the start or end pattern. - * @throws ReaderException if the quiet zone cannot be found, a ReaderException is thrown. - */ -void ITFReader::validateQuietZone(Ref row, int startPattern) { - int quietCount = this->narrowLineWidth * 10; // expect to find this many pixels of quiet zone - - for (int i = startPattern - 1; quietCount > 0 && i >= 0; i--) { - if (row->get(i)) { - break; - } - quietCount--; - } - if (quietCount != 0) { - // Unable to find the necessary number of quiet zone pixels. - throw NotFoundException(); - } -} - -/** - * Skip all whitespace until we get to the first black line. - * - * @param row row of black/white values to search - * @return index of the first black line. - * @throws ReaderException Throws exception if no black lines are found in the row - */ -int ITFReader::skipWhiteSpace(Ref row) { - int width = row->getSize(); - int endStart = row->getNextSet(0); - if (endStart == width) { - throw NotFoundException(); - } - return endStart; -} - -/** - * @param row row of black/white values to search - * @param rowOffset position to start search - * @param pattern pattern of counts of number of black and white pixels that are - * being searched for as a pattern - * @return start/end horizontal offset of guard pattern, as an array of two - * ints - * @throws ReaderException if pattern is not found - */ -ITFReader::Range ITFReader::findGuardPattern(Ref row, - int rowOffset, - vector const& pattern) { - // TODO: This is very similar to implementation in UPCEANReader. Consider if they can be - // merged to a single method. - int patternLength = pattern.size(); - vector counters(patternLength); - int width = row->getSize(); - bool isWhite = false; - - int counterPosition = 0; - int patternStart = rowOffset; - for (int x = rowOffset; x < width; x++) { - if (row->get(x) ^ isWhite) { - counters[counterPosition]++; - } else { - if (counterPosition == patternLength - 1) { - if (patternMatchVariance(counters, &pattern[0], MAX_INDIVIDUAL_VARIANCE) < MAX_AVG_VARIANCE) { - return Range(patternStart, x); - } - patternStart += counters[0] + counters[1]; - for (int y = 2; y < patternLength; y++) { - counters[y - 2] = counters[y]; - } - counters[patternLength - 2] = 0; - counters[patternLength - 1] = 0; - counterPosition--; - } else { - counterPosition++; - } - counters[counterPosition] = 1; - isWhite = !isWhite; - } - } - throw NotFoundException(); -} - -/** - * Attempts to decode a sequence of ITF black/white lines into single - * digit. - * - * @param counters the counts of runs of observed black/white/black/... values - * @return The decoded digit - * @throws ReaderException if digit cannot be decoded - */ -int ITFReader::decodeDigit(vector& counters){ - - int bestVariance = MAX_AVG_VARIANCE; // worst variance we'll accept - int bestMatch = -1; - int max = sizeof(PATTERNS)/sizeof(PATTERNS[0]); - for (int i = 0; i < max; i++) { - int const* pattern = PATTERNS[i]; - int variance = patternMatchVariance(counters, pattern, MAX_INDIVIDUAL_VARIANCE); - if (variance < bestVariance) { - bestVariance = variance; - bestMatch = i; - } - } - if (bestMatch >= 0) { - return bestMatch; - } else { - throw NotFoundException(); - } -} - -ITFReader::~ITFReader(){} diff --git a/src/qzxing/zxing/zxing/oned/ITFReader.h b/src/qzxing/zxing/zxing/oned/ITFReader.h deleted file mode 100644 index 58ccda8..0000000 --- a/src/qzxing/zxing/zxing/oned/ITFReader.h +++ /dev/null @@ -1,54 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -#ifndef __ITF_READER_H__ -#define __ITF_READER_H__ - -/* - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include - -namespace zxing { -namespace oned { - -class ITFReader : public OneDReader { -private: - enum {MAX_AVG_VARIANCE = (unsigned int) (PATTERN_MATCH_RESULT_SCALE_FACTOR * 420/1000)}; - enum {MAX_INDIVIDUAL_VARIANCE = (int) (PATTERN_MATCH_RESULT_SCALE_FACTOR * 800/1000)}; - // Stores the actual narrow line width of the image being decoded. - int narrowLineWidth; - - Range decodeStart(Ref row); - Range decodeEnd(Ref row); - static void decodeMiddle(Ref row, int payloadStart, int payloadEnd, std::string& resultString); - void validateQuietZone(Ref row, int startPattern); - static int skipWhiteSpace(Ref row); - - static Range findGuardPattern(Ref row, int rowOffset, std::vector const& pattern); - static int decodeDigit(std::vector& counters); - - void append(char* s, char c); -public: - Ref decodeRow(int rowNumber, Ref row); - ITFReader(); - ~ITFReader(); -}; - -} -} - -#endif diff --git a/src/qzxing/zxing/zxing/oned/MultiFormatOneDReader.cpp b/src/qzxing/zxing/zxing/oned/MultiFormatOneDReader.cpp deleted file mode 100644 index 96830c4..0000000 --- a/src/qzxing/zxing/zxing/oned/MultiFormatOneDReader.cpp +++ /dev/null @@ -1,96 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using zxing::Ref; -using zxing::Result; -using zxing::oned::MultiFormatOneDReader; - -// VC++ -using zxing::DecodeHints; -using zxing::BitArray; - -MultiFormatOneDReader::MultiFormatOneDReader(DecodeHints hints) : readers() { - if (hints.containsFormat(BarcodeFormat::EAN_13) || - hints.containsFormat(BarcodeFormat::EAN_8) || - hints.containsFormat(BarcodeFormat::UPC_A) || - hints.containsFormat(BarcodeFormat::UPC_E)) { - readers.push_back(Ref(new MultiFormatUPCEANReader(hints))); - } - if (hints.containsFormat(BarcodeFormat::CODE_39)) { - readers.push_back(Ref(new Code39Reader())); - } - if (hints.containsFormat(BarcodeFormat::CODE_93)) { - readers.push_back(Ref(new Code93Reader())); - } - if (hints.containsFormat(BarcodeFormat::CODE_128)) { - readers.push_back(Ref(new Code128Reader())); - } - if (hints.containsFormat(BarcodeFormat::ITF)) { - readers.push_back(Ref(new ITFReader())); - } - if (hints.containsFormat(BarcodeFormat::CODABAR)) { - readers.push_back(Ref(new CodaBarReader())); - } -/* - if (hints.containsFormat(BarcodeFormat::RSS_14)) { - readers.push_back(Ref(new RSS14Reader())); - } -*/ -/* - if (hints.containsFormat(BarcodeFormat::RSS_EXPANDED)) { - readers.push_back(Ref(new RSS14ExpandedReader())); - } -*/ - if (readers.size() == 0) { - readers.push_back(Ref(new MultiFormatUPCEANReader(hints))); - readers.push_back(Ref(new Code39Reader())); - readers.push_back(Ref(new CodaBarReader())); - readers.push_back(Ref(new Code93Reader())); - readers.push_back(Ref(new Code128Reader())); - readers.push_back(Ref(new ITFReader())); - // readers.push_back(Ref(new RSS14Reader())); - // readers.push_back(Ref(new RSS14ExpandedReader())); - } -} - -#include - -Ref MultiFormatOneDReader::decodeRow(int rowNumber, Ref row) { - int size = readers.size(); - for (int i = 0; i < size; i++) { - OneDReader* reader = readers[i]; - try { - Ref result = reader->decodeRow(rowNumber, row); - return result; - } catch (ReaderException const& re) { - (void)re; - // continue - } - } - throw NotFoundException(); -} diff --git a/src/qzxing/zxing/zxing/oned/MultiFormatUPCEANReader.cpp b/src/qzxing/zxing/zxing/oned/MultiFormatUPCEANReader.cpp deleted file mode 100644 index 0af1665..0000000 --- a/src/qzxing/zxing/zxing/oned/MultiFormatUPCEANReader.cpp +++ /dev/null @@ -1,110 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * MultiFormatUPCEANReader.cpp - * ZXing - * - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using zxing::NotFoundException; -using zxing::Ref; -using zxing::Result; -using zxing::oned::MultiFormatUPCEANReader; - -// VC++ -using zxing::DecodeHints; -using zxing::BitArray; - -MultiFormatUPCEANReader::MultiFormatUPCEANReader(DecodeHints hints) : readers() { - if (hints.containsFormat(BarcodeFormat::EAN_13)) { - readers.push_back(Ref(new EAN13Reader())); - } else if (hints.containsFormat(BarcodeFormat::UPC_A)) { - readers.push_back(Ref(new UPCAReader())); - } - if (hints.containsFormat(BarcodeFormat::EAN_8)) { - readers.push_back(Ref(new EAN8Reader())); - } - if (hints.containsFormat(BarcodeFormat::UPC_E)) { - readers.push_back(Ref(new UPCEReader())); - } - if (readers.size() == 0) { - readers.push_back(Ref(new EAN13Reader())); - // UPC-A is covered by EAN-13 - readers.push_back(Ref(new EAN8Reader())); - readers.push_back(Ref(new UPCEReader())); - } -} - -#include - -Ref MultiFormatUPCEANReader::decodeRow(int rowNumber, Ref row) { - // Compute this location once and reuse it on multiple implementations - UPCEANReader::Range startGuardPattern = UPCEANReader::findStartGuardPattern(row); - for (int i = 0, e = readers.size(); i < e; i++) { - Ref reader = readers[i]; - Ref result; - try { - result = reader->decodeRow(rowNumber, row, startGuardPattern); - } catch (ReaderException const& ignored) { - (void)ignored; - continue; - } - - // Special case: a 12-digit code encoded in UPC-A is identical - // to a "0" followed by those 12 digits encoded as EAN-13. Each - // will recognize such a code, UPC-A as a 12-digit string and - // EAN-13 as a 13-digit string starting with "0". Individually - // these are correct and their readers will both read such a - // code and correctly call it EAN-13, or UPC-A, respectively. - // - // In this case, if we've been looking for both types, we'd like - // to call it a UPC-A code. But for efficiency we only run the - // EAN-13 decoder to also read UPC-A. So we special case it - // here, and convert an EAN-13 result to a UPC-A result if - // appropriate. - bool ean13MayBeUPCA = - result->getBarcodeFormat() == BarcodeFormat::EAN_13 && - result->getText()->charAt(0) == '0'; - - // Note: doesn't match Java which uses hints - - bool canReturnUPCA = true; - - if (ean13MayBeUPCA && canReturnUPCA) { - // Transfer the metdata across - Ref resultUPCA (new Result(result->getText()->substring(1), - result->getRawBytes(), - result->getResultPoints(), - BarcodeFormat::UPC_A)); - // needs java metadata stuff - return resultUPCA; - } - return result; - } - - throw NotFoundException(); -} diff --git a/src/qzxing/zxing/zxing/oned/OneDReader.cpp b/src/qzxing/zxing/zxing/oned/OneDReader.cpp deleted file mode 100644 index 0d4429e..0000000 --- a/src/qzxing/zxing/zxing/oned/OneDReader.cpp +++ /dev/null @@ -1,227 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include -#include -#include - -using std::vector; -using zxing::Ref; -using zxing::Result; -using zxing::NotFoundException; -using zxing::oned::OneDReader; - -// VC++ -using zxing::BinaryBitmap; -using zxing::BitArray; -using zxing::DecodeHints; - -OneDReader::OneDReader() {} - -Ref OneDReader::decode(Ref image, DecodeHints hints) { - try { - return doDecode(image, hints); - } catch (NotFoundException const& nfe) { - // std::cerr << "trying harder" << std::endl; - bool tryHarder = hints.getTryHarder(); - if (tryHarder && image->isRotateSupported()) { - // std::cerr << "v rotate" << std::endl; - Ref rotatedImage(image->rotateCounterClockwise()); - // std::cerr << "^ rotate" << std::endl; - Ref result = doDecode(rotatedImage, hints); - // Doesn't have java metadata stuff - ArrayRef< Ref >& points (result->getResultPoints()); - if (points && !points->empty()) { - int height = rotatedImage->getHeight(); - for (int i = 0; i < points->size(); i++) { - points[i].reset(new OneDResultPoint(height - points[i]->getY() - 1, points[i]->getX())); - } - } - // std::cerr << "tried harder" << std::endl; - return result; - } else { - // std::cerr << "tried harder nfe" << std::endl; - throw nfe; - } - } -} - -#include - -Ref OneDReader::doDecode(Ref image, DecodeHints hints) { - int width = image->getWidth(); - int height = image->getHeight(); - Ref row(new BitArray(width)); - - int middle = height >> 1; - bool tryHarder = hints.getTryHarder(); - int rowStep = std::max(1, height >> (tryHarder ? 8 : 5)); - using namespace std; - // cerr << "rS " << rowStep << " " << height << " " << tryHarder << endl; - int maxLines; - if (tryHarder) { - maxLines = height; // Look at the whole image, not just the center - } else { - maxLines = 15; // 15 rows spaced 1/32 apart is roughly the middle half of the image - } - - for (int x = 0; x < maxLines; x++) { - - // Scanning from the middle out. Determine which row we're looking at next: - int rowStepsAboveOrBelow = (x + 1) >> 1; - bool isAbove = (x & 0x01) == 0; // i.e. is x even? - int rowNumber = middle + rowStep * (isAbove ? rowStepsAboveOrBelow : -rowStepsAboveOrBelow); - if (false) { - std::cerr << "rN " - << rowNumber << " " - << height << " " - << middle << " " - << rowStep << " " - << isAbove << " " - << rowStepsAboveOrBelow - << std::endl; - } - if (rowNumber < 0 || rowNumber >= height) { - // Oops, if we run off the top or bottom, stop - break; - } - - // Estimate black point for this row and load it: - try { - row = image->getBlackRow(rowNumber, row); - } catch (NotFoundException const& ignored) { - (void)ignored; - continue; - } - - // While we have the image data in a BitArray, it's fairly cheap to reverse it in place to - // handle decoding upside down barcodes. - for (int attempt = 0; attempt < 2; attempt++) { - if (attempt == 1) { - row->reverse(); // reverse the row and continue - } - - // Java hints stuff missing - - try { - // Look for a barcode - // std::cerr << "rn " << rowNumber << " " << typeid(*this).name() << std::endl; - Ref result = decodeRow(rowNumber, row); - // We found our barcode - if (attempt == 1) { - // But it was upside down, so note that - // result.putMetadata(ResultMetadataType.ORIENTATION, new Integer(180)); - // And remember to flip the result points horizontally. - ArrayRef< Ref > points(result->getResultPoints()); - if (points) { - points[0] = Ref(new OneDResultPoint(width - points[0]->getX() - 1, - points[0]->getY())); - points[1] = Ref(new OneDResultPoint(width - points[1]->getX() - 1, - points[1]->getY())); - - } - } - return result; - } catch (ReaderException const& re) { - (void)re; - continue; - } - } - } - throw NotFoundException(); -} - -int OneDReader::patternMatchVariance(vector& counters, - vector const& pattern, - int maxIndividualVariance) { - return patternMatchVariance(counters, &pattern[0], maxIndividualVariance); -} - -int OneDReader::patternMatchVariance(vector& counters, - int const pattern[], - int maxIndividualVariance) { - int numCounters = counters.size(); - unsigned int total = 0; - unsigned int patternLength = 0; - for (int i = 0; i < numCounters; i++) { - total += counters[i]; - patternLength += pattern[i]; - } - if (total < patternLength) { - // If we don't even have one pixel per unit of bar width, assume this is too small - // to reliably match, so fail: - return INT_MAX; - } - // We're going to fake floating-point math in integers. We just need to use more bits. - // Scale up patternLength so that intermediate values below like scaledCounter will have - // more "significant digits" - int unitBarWidth = (total << INTEGER_MATH_SHIFT) / patternLength; - maxIndividualVariance = (maxIndividualVariance * unitBarWidth) >> INTEGER_MATH_SHIFT; - - int totalVariance = 0; - for (int x = 0; x < numCounters; x++) { - int counter = counters[x] << INTEGER_MATH_SHIFT; - int scaledPattern = pattern[x] * unitBarWidth; - int variance = counter > scaledPattern ? counter - scaledPattern : scaledPattern - counter; - if (variance > maxIndividualVariance) { - return INT_MAX; - } - totalVariance += variance; - } - return totalVariance / total; -} - -void OneDReader::recordPattern(Ref row, - int start, - vector& counters) { - int numCounters = counters.size(); - for (int i = 0; i < numCounters; i++) { - counters[i] = 0; - } - int end = row->getSize(); - if (start >= end) { - throw NotFoundException(); - } - bool isWhite = !row->get(start); - int counterPosition = 0; - int i = start; - while (i < end) { - if (row->get(i) ^ isWhite) { // that is, exactly one is true - counters[counterPosition]++; - } else { - counterPosition++; - if (counterPosition == numCounters) { - break; - } else { - counters[counterPosition] = 1; - isWhite = !isWhite; - } - } - i++; - } - // If we read fully the last section of pixels and filled up our counters -- or filled - // the last counter but ran off the side of the image, OK. Otherwise, a problem. - if (!(counterPosition == numCounters || (counterPosition == numCounters - 1 && i == end))) { - throw NotFoundException(); - } -} - -OneDReader::~OneDReader() {} diff --git a/src/qzxing/zxing/zxing/oned/OneDReader.h b/src/qzxing/zxing/zxing/oned/OneDReader.h deleted file mode 100644 index f524c75..0000000 --- a/src/qzxing/zxing/zxing/oned/OneDReader.h +++ /dev/null @@ -1,81 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -#ifndef __ONED_READER_H__ -#define __ONED_READER_H__ - -/* - * OneDReader.h - * ZXing - * - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -namespace zxing { -namespace oned { - -class OneDReader : public Reader { -private: - Ref doDecode(Ref image, DecodeHints hints); - -protected: - static const int INTEGER_MATH_SHIFT = 8; - - struct Range { - private: - int data[2]; - public: - Range() {} - Range(int zero, int one) { - data[0] = zero; - data[1] = one; - } - int& operator [] (int index) { - return data[index]; - } - int const& operator [] (int index) const { - return data[index]; - } - }; - - static int patternMatchVariance(std::vector& counters, - std::vector const& pattern, - int maxIndividualVariance); - static int patternMatchVariance(std::vector& counters, - int const pattern[], - int maxIndividualVariance); - -protected: - static const int PATTERN_MATCH_RESULT_SCALE_FACTOR = 1 << INTEGER_MATH_SHIFT; - -public: - - OneDReader(); - virtual Ref decode(Ref image, DecodeHints hints); - - // Implementations must not throw any exceptions. If a barcode is not found on this row, - // a empty ref should be returned e.g. return Ref(); - virtual Ref decodeRow(int rowNumber, Ref row) = 0; - - static void recordPattern(Ref row, - int start, - std::vector& counters); - virtual ~OneDReader(); -}; - -} -} - -#endif diff --git a/src/qzxing/zxing/zxing/oned/UPCAReader.cpp b/src/qzxing/zxing/zxing/oned/UPCAReader.cpp deleted file mode 100644 index 8fb3c4d..0000000 --- a/src/qzxing/zxing/zxing/oned/UPCAReader.cpp +++ /dev/null @@ -1,71 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * UPCAReader.cpp - * ZXing - * - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "UPCAReader.h" -#include - -using zxing::oned::UPCAReader; -using zxing::Ref; -using zxing::Result; - -// VC++ -using zxing::BitArray; -using zxing::BinaryBitmap; -using zxing::DecodeHints; - -UPCAReader::UPCAReader() : ean13Reader() {} - -Ref UPCAReader::decodeRow(int rowNumber, Ref row) { - return maybeReturnResult(ean13Reader.decodeRow(rowNumber, row)); -} - -Ref UPCAReader::decodeRow(int rowNumber, - Ref row, - Range const& startGuardRange) { - return maybeReturnResult(ean13Reader.decodeRow(rowNumber, row, startGuardRange)); -} - -Ref UPCAReader::decode(Ref image, DecodeHints hints) { - return maybeReturnResult(ean13Reader.decode(image, hints)); -} - -int UPCAReader::decodeMiddle(Ref row, - Range const& startRange, - std::string& resultString) { - return ean13Reader.decodeMiddle(row, startRange, resultString); -} - -Ref UPCAReader::maybeReturnResult(Ref result) { - if (result.empty()) { - return result; - } - const std::string& text = (result->getText())->getText(); - if (text[0] == '0') { - Ref resultString(new String(text.substr(1))); - Ref res(new Result(resultString, result->getRawBytes(), result->getResultPoints(), - BarcodeFormat::UPC_A)); - return res; - } - return Ref(); -} - -zxing::BarcodeFormat UPCAReader::getBarcodeFormat(){ - return BarcodeFormat::UPC_A; -} diff --git a/src/qzxing/zxing/zxing/oned/UPCEANReader.cpp b/src/qzxing/zxing/zxing/oned/UPCEANReader.cpp deleted file mode 100644 index d23a6cc..0000000 --- a/src/qzxing/zxing/zxing/oned/UPCEANReader.cpp +++ /dev/null @@ -1,302 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * UPCEANReader.cpp - * ZXing - * - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include -#include - -using std::vector; -using std::string; - -using zxing::Ref; -using zxing::Result; -using zxing::NotFoundException; -using zxing::ChecksumException; -using zxing::oned::UPCEANReader; - -// VC++ -using zxing::BitArray; -using zxing::String; - -#define LEN(v) ((int)(sizeof(v)/sizeof(v[0]))) - -namespace { - - /** - * Start/end guard pattern. - */ - const int START_END_PATTERN_[] = {1, 1, 1}; - const int START_END_PATTERN_LEN = LEN(START_END_PATTERN_); - - /** - * Pattern marking the middle of a UPC/EAN pattern, separating the two halves. - */ - const int MIDDLE_PATTERN_[] = {1, 1, 1, 1, 1}; - const int MIDDLE_PATTERN_LEN = LEN(MIDDLE_PATTERN_); - - /** - * "Odd", or "L" patterns used to encode UPC/EAN digits. - */ - const int L_PATTERNS_[][4] = { - {3, 2, 1, 1}, // 0 - {2, 2, 2, 1}, // 1 - {2, 1, 2, 2}, // 2 - {1, 4, 1, 1}, // 3 - {1, 1, 3, 2}, // 4 - {1, 2, 3, 1}, // 5 - {1, 1, 1, 4}, // 6 - {1, 3, 1, 2}, // 7 - {1, 2, 1, 3}, // 8 - {3, 1, 1, 2} // 9 - }; - const int L_PATTERNS_LEN = LEN(L_PATTERNS_); - - /** - * As above but also including the "even", or "G" patterns used to encode UPC/EAN digits. - */ - const int L_AND_G_PATTERNS_[][4] = { - {3, 2, 1, 1}, // 0 - {2, 2, 2, 1}, // 1 - {2, 1, 2, 2}, // 2 - {1, 4, 1, 1}, // 3 - {1, 1, 3, 2}, // 4 - {1, 2, 3, 1}, // 5 - {1, 1, 1, 4}, // 6 - {1, 3, 1, 2}, // 7 - {1, 2, 1, 3}, // 8 - {3, 1, 1, 2}, // 9 - {1, 1, 2, 3}, // 10 reversed 0 - {1, 2, 2, 2}, // 11 reversed 1 - {2, 2, 1, 2}, // 12 reversed 2 - {1, 1, 4, 1}, // 13 reversed 3 - {2, 3, 1, 1}, // 14 reversed 4 - {1, 3, 2, 1}, // 15 reversed 5 - {4, 1, 1, 1}, // 16 reversed 6 - {2, 1, 3, 1}, // 17 reversed 7 - {3, 1, 2, 1}, // 18 reversed 8 - {2, 1, 1, 3} // 19 reversed 9 - }; - const int L_AND_G_PATTERNS_LEN = LEN(L_AND_G_PATTERNS_); -} - -const int UPCEANReader::MAX_AVG_VARIANCE = (int)(PATTERN_MATCH_RESULT_SCALE_FACTOR * 0.48f); -const int UPCEANReader::MAX_INDIVIDUAL_VARIANCE = (int)(PATTERN_MATCH_RESULT_SCALE_FACTOR * 0.7f); - -#define VECTOR_INIT(v) v, v + sizeof(v)/sizeof(v[0]) - -const vector -UPCEANReader::START_END_PATTERN (VECTOR_INIT(START_END_PATTERN_)); - -const vector -UPCEANReader::MIDDLE_PATTERN (VECTOR_INIT(MIDDLE_PATTERN_)); -const vector -UPCEANReader::L_PATTERNS (VECTOR_INIT(L_PATTERNS_)); -const vector -UPCEANReader::L_AND_G_PATTERNS (VECTOR_INIT(L_AND_G_PATTERNS_)); - -UPCEANReader::UPCEANReader() {} - -Ref UPCEANReader::decodeRow(int rowNumber, Ref row) { - return decodeRow(rowNumber, row, findStartGuardPattern(row)); -} - -Ref UPCEANReader::decodeRow(int rowNumber, - Ref row, - Range const& startGuardRange) { - string& result = decodeRowStringBuffer; - result.clear(); - int endStart = decodeMiddle(row, startGuardRange, result); - - Range endRange = decodeEnd(row, endStart); - - // Make sure there is a quiet zone at least as big as the end pattern after the barcode. - // The spec might want more whitespace, but in practice this is the maximum we can count on. - - int end = endRange[1]; - int quietEnd = end + (end - endRange[0]); - if (quietEnd >= row->getSize() || !row->isRange(end, quietEnd, false)) { - throw NotFoundException(); - } - - Ref resultString (new String(result)); - if (!checkChecksum(resultString)) { - throw ChecksumException(); - } - - float left = (float) (startGuardRange[1] + startGuardRange[0]) / 2.0f; - float right = (float) (endRange[1] + endRange[0]) / 2.0f; - BarcodeFormat format = getBarcodeFormat(); - ArrayRef< Ref > resultPoints(2); - resultPoints[0] = Ref(new OneDResultPoint(left, (float) rowNumber)); - resultPoints[1] = Ref(new OneDResultPoint(right, (float) rowNumber)); - Ref decodeResult (new Result(resultString, ArrayRef(), resultPoints, format)); - // Java extension and man stuff - return decodeResult; -} - -UPCEANReader::Range UPCEANReader::findStartGuardPattern(Ref row) { - bool foundStart = false; - Range startRange; - int nextStart = 0; - vector counters(START_END_PATTERN.size(), 0); - // std::cerr << "fsgp " << *row << std::endl; - while (!foundStart) { - for(int i=0; i < (int)START_END_PATTERN.size(); ++i) { - counters[i] = 0; - } - startRange = findGuardPattern(row, nextStart, false, START_END_PATTERN, counters); - // std::cerr << "sr " << startRange[0] << " " << startRange[1] << std::endl; - int start = startRange[0]; - nextStart = startRange[1]; - // Make sure there is a quiet zone at least as big as the start pattern before the barcode. - // If this check would run off the left edge of the image, do not accept this barcode, - // as it is very likely to be a false positive. - int quietStart = start - (nextStart - start); - if (quietStart >= 0) { - foundStart = row->isRange(quietStart, start, false); - } - } - return startRange; -} - -UPCEANReader::Range UPCEANReader::findGuardPattern(Ref row, - int rowOffset, - bool whiteFirst, - vector const& pattern) { - vector counters (pattern.size(), 0); - return findGuardPattern(row, rowOffset, whiteFirst, pattern, counters); -} - -UPCEANReader::Range UPCEANReader::findGuardPattern(Ref row, - int rowOffset, - bool whiteFirst, - vector const& pattern, - vector& counters) { - // cerr << "fGP " << rowOffset << " " << whiteFirst << endl; - if (false) { - for(int i=0; i < (int)pattern.size(); ++i) { - std::cerr << pattern[i]; - } - std::cerr << std::endl; - } - int patternLength = pattern.size(); - int width = row->getSize(); - bool isWhite = whiteFirst; - rowOffset = whiteFirst ? row->getNextUnset(rowOffset) : row->getNextSet(rowOffset); - int counterPosition = 0; - int patternStart = rowOffset; - for (int x = rowOffset; x < width; x++) { - // std::cerr << "rg " << x << " " << row->get(x) << std::endl; - if (row->get(x) ^ isWhite) { - counters[counterPosition]++; - } else { - if (counterPosition == patternLength - 1) { - if (patternMatchVariance(counters, pattern, MAX_INDIVIDUAL_VARIANCE) < MAX_AVG_VARIANCE) { - return Range(patternStart, x); - } - patternStart += counters[0] + counters[1]; - for (int y = 2; y < patternLength; y++) { - counters[y - 2] = counters[y]; - } - counters[patternLength - 2] = 0; - counters[patternLength - 1] = 0; - counterPosition--; - } else { - counterPosition++; - } - counters[counterPosition] = 1; - isWhite = !isWhite; - } - } - throw NotFoundException(); -} - -UPCEANReader::Range UPCEANReader::decodeEnd(Ref row, int endStart) { - return findGuardPattern(row, endStart, false, START_END_PATTERN); -} - -int UPCEANReader::decodeDigit(Ref row, - vector & counters, - int rowOffset, - vector const& patterns) { - recordPattern(row, rowOffset, counters); - int bestVariance = MAX_AVG_VARIANCE; // worst variance we'll accept - int bestMatch = -1; - int max = patterns.size(); - for (int i = 0; i < max; i++) { - int const* pattern (patterns[i]); - int variance = patternMatchVariance(counters, pattern, MAX_INDIVIDUAL_VARIANCE); - if (variance < bestVariance) { - bestVariance = variance; - bestMatch = i; - } - } - if (bestMatch >= 0) { - return bestMatch; - } else { - throw NotFoundException(); - } -} - -/** - * @return {@link #checkStandardUPCEANChecksum(String)} - */ -bool UPCEANReader::checkChecksum(Ref const& s) { - return checkStandardUPCEANChecksum(s); -} - -/** - * Computes the UPC/EAN checksum on a string of digits, and reports - * whether the checksum is correct or not. - * - * @param s string of digits to check - * @return true iff string of digits passes the UPC/EAN checksum algorithm - */ -bool UPCEANReader::checkStandardUPCEANChecksum(Ref const& s_) { - std::string const& s (s_->getText()); - int length = s.length(); - if (length == 0) { - return false; - } - - int sum = 0; - for (int i = length - 2; i >= 0; i -= 2) { - int digit = (int) s[i] - (int) '0'; - if (digit < 0 || digit > 9) { - return false; - } - sum += digit; - } - sum *= 3; - for (int i = length - 1; i >= 0; i -= 2) { - int digit = (int) s[i] - (int) '0'; - if (digit < 0 || digit > 9) { - return false; - } - sum += digit; - } - return sum % 10 == 0; -} - -UPCEANReader::~UPCEANReader() { -} diff --git a/src/qzxing/zxing/zxing/oned/UPCEANReader.h b/src/qzxing/zxing/zxing/oned/UPCEANReader.h deleted file mode 100644 index 4f70b8d..0000000 --- a/src/qzxing/zxing/zxing/oned/UPCEANReader.h +++ /dev/null @@ -1,88 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -#ifndef __UPC_EAN_READER_H__ -#define __UPC_EAN_READER_H__ - -/* - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include - -namespace zxing { -namespace oned { - -class UPCEANReader : public OneDReader { - private: - std::string decodeRowStringBuffer; - // UPCEANExtensionSupport extensionReader; - // EANManufacturerOrgSupport eanManSupport; - - static const int MAX_AVG_VARIANCE; - static const int MAX_INDIVIDUAL_VARIANCE; - - static Range findStartGuardPattern(Ref row); - - virtual Range decodeEnd(Ref row, int endStart); - - static bool checkStandardUPCEANChecksum(Ref const& s); - - static Range findGuardPattern(Ref row, - int rowOffset, - bool whiteFirst, - std::vector const& pattern, - std::vector& counters); - - -protected: - static const std::vector START_END_PATTERN; - static const std::vector MIDDLE_PATTERN; - - static const std::vector L_PATTERNS; - static const std::vector L_AND_G_PATTERNS; - - static Range findGuardPattern(Ref row, - int rowOffset, - bool whiteFirst, - std::vector const& pattern); - -public: - UPCEANReader(); - - virtual int decodeMiddle(Ref row, - Range const& startRange, - std::string& resultString) = 0; - - virtual Ref decodeRow(int rowNumber, Ref row); - virtual Ref decodeRow(int rowNumber, Ref row, Range const& range); - - static int decodeDigit(Ref row, - std::vector& counters, - int rowOffset, - std::vector const& patterns); - - virtual bool checkChecksum(Ref const& s); - - virtual BarcodeFormat getBarcodeFormat() = 0; - virtual ~UPCEANReader(); - - friend class MultiFormatUPCEANReader; -}; - -} -} - -#endif diff --git a/src/qzxing/zxing/zxing/oned/UPCEReader.cpp b/src/qzxing/zxing/zxing/oned/UPCEReader.cpp deleted file mode 100644 index c9fb0d5..0000000 --- a/src/qzxing/zxing/zxing/oned/UPCEReader.cpp +++ /dev/null @@ -1,148 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include - -using std::string; -using std::vector; -using zxing::Ref; -using zxing::String; -using zxing::oned::UPCEReader; - -// VC++ -using zxing::BitArray; - -#define VECTOR_INIT(v) v, v + sizeof(v)/sizeof(v[0]) - -namespace { - /** - * The pattern that marks the middle, and end, of a UPC-E pattern. - * There is no "second half" to a UPC-E barcode. - */ - const int MIDDLE_END_PATTERN_[6] = {1, 1, 1, 1, 1, 1}; - const vector MIDDLE_END_PATTERN (VECTOR_INIT(MIDDLE_END_PATTERN_)); - - - /** - * See {@link #L_AND_G_PATTERNS}; these values similarly represent patterns of - * even-odd parity encodings of digits that imply both the number system (0 or 1) - * used, and the check digit. - */ - const int NUMSYS_AND_CHECK_DIGIT_PATTERNS[2][10] = { - {0x38, 0x34, 0x32, 0x31, 0x2C, 0x26, 0x23, 0x2A, 0x29, 0x25}, - {0x07, 0x0B, 0x0D, 0x0E, 0x13, 0x19, 0x1C, 0x15, 0x16, 0x1A} - }; -} - -UPCEReader::UPCEReader() { -} - -int UPCEReader::decodeMiddle(Ref row, Range const& startRange, string& result) { - vector& counters (decodeMiddleCounters); - counters.clear(); - counters.resize(4); - int end = row->getSize(); - int rowOffset = startRange[1]; - - int lgPatternFound = 0; - - for (int x = 0; x < 6 && rowOffset < end; x++) { - int bestMatch = decodeDigit(row, counters, rowOffset, L_AND_G_PATTERNS); - result.append(1, (char) ('0' + bestMatch % 10)); - for (int i = 0, e = counters.size(); i < e; i++) { - rowOffset += counters[i]; - } - if (bestMatch >= 10) { - lgPatternFound |= 1 << (5 - x); - } - } - - determineNumSysAndCheckDigit(result, lgPatternFound); - - return rowOffset; -} - -UPCEReader::Range UPCEReader::decodeEnd(Ref row, int endStart) { - return findGuardPattern(row, endStart, true, MIDDLE_END_PATTERN); -} - -bool UPCEReader::checkChecksum(Ref const& s){ - return UPCEANReader::checkChecksum(convertUPCEtoUPCA(s)); -} - - -bool UPCEReader::determineNumSysAndCheckDigit(std::string& resultString, int lgPatternFound) { - for (int numSys = 0; numSys <= 1; numSys++) { - for (int d = 0; d < 10; d++) { - if (lgPatternFound == NUMSYS_AND_CHECK_DIGIT_PATTERNS[numSys][d]) { - resultString.insert((size_t)0, (size_t)1, (char) ('0' + numSys)); - resultString.append(1, (char) ('0' + d)); - return true; - } - } - } - return false; -} - -/** - * Expands a UPC-E value back into its full, equivalent UPC-A code value. - * - * @param upce UPC-E code as string of digits - * @return equivalent UPC-A code as string of digits - */ -Ref UPCEReader::convertUPCEtoUPCA(Ref const& upce_) { - string const& upce(upce_->getText()); - string result; - result.append(1, upce[0]); - char lastChar = upce[6]; - switch (lastChar) { - case '0': - case '1': - case '2': - result.append(upce.substr(1,2)); - result.append(1, lastChar); - result.append("0000"); - result.append(upce.substr(3,3)); - break; - case '3': - result.append(upce.substr(1,3)); - result.append("00000"); - result.append(upce.substr(4,2)); - break; - case '4': - result.append(upce.substr(1,4)); - result.append("00000"); - result.append(1, upce[5]); - break; - default: - result.append(upce.substr(1,5)); - result.append("0000"); - result.append(1, lastChar); - break; - } - //result.append(1, upce[7]); - char c = (char)(*(upce.data()+7));//upce[upce.size()]; - result.append(1, c); - return Ref(new String(result)); -} - - -zxing::BarcodeFormat UPCEReader::getBarcodeFormat() { - return BarcodeFormat::UPC_E; -} diff --git a/src/qzxing/zxing/zxing/pdf417/PDF417Reader.cpp b/src/qzxing/zxing/zxing/pdf417/PDF417Reader.cpp deleted file mode 100644 index a5f09ba..0000000 --- a/src/qzxing/zxing/zxing/pdf417/PDF417Reader.cpp +++ /dev/null @@ -1,170 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include - -using zxing::Ref; -using zxing::Result; -using zxing::BitMatrix; -using zxing::pdf417::PDF417Reader; -using zxing::pdf417::detector::Detector; - -// VC++ -using zxing::ArrayRef; -using zxing::BinaryBitmap; -using zxing::DecodeHints; - -Ref PDF417Reader::decode(Ref image, DecodeHints hints) { - Ref decoderResult; - /* 2012-05-30 hfn C++ DecodeHintType does not yet know a type "PURE_BARCODE", */ - /* therefore skip this for now, todo: may be add this type later */ - /* - if (!hints.isEmpty() && hints.containsKey(DecodeHintType.PURE_BARCODE)) { - BitMatrix bits = extractPureBits(image.getBlackMatrix()); - decoderResult = decoder.decode(bits); - points = NO_POINTS; - } else { - */ - Detector detector(image); - Ref detectorResult = detector.detect(hints); /* 2012-09-17 hints ("try_harder") */ - ArrayRef< Ref > points(detectorResult->getPoints()); - - if (!hints.isEmpty()) { - Ref rpcb = hints.getResultPointCallback(); - /* .get(DecodeHintType.NEED_RESULT_POINT_CALLBACK); */ - if (rpcb != NULL) { - for (int i = 0; i < points->size(); i++) { - rpcb->foundPossibleResultPoint(*points[i]); - } - } - } - decoderResult = decoder.decode(detectorResult->getBits(),hints); - /* - } - */ - Ref r(new Result(decoderResult->getText(), decoderResult->getRawBytes(), points, - BarcodeFormat::PDF_417)); - return r; -} - -void PDF417Reader::reset() { - // do nothing -} - -Ref PDF417Reader::extractPureBits(Ref image) { - ArrayRef leftTopBlack = image->getTopLeftOnBit(); - ArrayRef rightBottomBlack = image->getBottomRightOnBit(); - /* see BitMatrix::getTopLeftOnBit etc.: - if (leftTopBlack == null || rightBottomBlack == null) { - throw NotFoundException.getNotFoundInstance(); - } */ - - int nModuleSize = moduleSize(leftTopBlack, image); - - int top = leftTopBlack[1]; - int bottom = rightBottomBlack[1]; - int left = findPatternStart(leftTopBlack[0], top, image); - int right = findPatternEnd(leftTopBlack[0], top, image); - - int matrixWidth = (right - left + 1) / nModuleSize; - int matrixHeight = (bottom - top + 1) / nModuleSize; - if (matrixWidth <= 0 || matrixHeight <= 0) { - throw NotFoundException("PDF417Reader::extractPureBits: no matrix found!"); - } - - // Push in the "border" by half the module width so that we start - // sampling in the middle of the module. Just in case the image is a - // little off, this will help recover. - int nudge = nModuleSize >> 1; - top += nudge; - left += nudge; - - // Now just read off the bits - Ref bits(new BitMatrix(matrixWidth, matrixHeight)); - for (int y = 0; y < matrixHeight; y++) { - int iOffset = top + y * nModuleSize; - for (int x = 0; x < matrixWidth; x++) { - if (image->get(left + x * nModuleSize, iOffset)) { - bits->set(x, y); - } - } - } - return bits; -} - -int PDF417Reader::moduleSize(ArrayRef leftTopBlack, Ref image) { - int x = leftTopBlack[0]; - int y = leftTopBlack[1]; - int width = image->getWidth(); - while (x < width && image->get(x, y)) { - x++; - } - if (x == width) { - throw NotFoundException("PDF417Reader::moduleSize: not found!"); - } - - int moduleSize = (int)(((unsigned)(x - leftTopBlack[0])) >> 3); // We've crossed left first bar, which is 8x - if (moduleSize == 0) { - throw NotFoundException("PDF417Reader::moduleSize: is zero!"); - } - - return moduleSize; -} - -int PDF417Reader::findPatternStart(int x, int y, Ref image) { - int width = image->getWidth(); - int start = x; - // start should be on black - int transitions = 0; - bool black = true; - while (start < width - 1 && transitions < 8) { - start++; - bool newBlack = image->get(start, y); - if (black != newBlack) { - transitions++; - } - black = newBlack; - } - if (start == width - 1) { - throw NotFoundException("PDF417Reader::findPatternStart: no pattern start found!"); - } - return start; -} - -int PDF417Reader::findPatternEnd(int x, int y, Ref image) { - int width = image->getWidth(); - int end = width - 1; - // end should be on black - while (end > x && !image->get(end, y)) { - end--; - } - int transitions = 0; - bool black = true; - while (end > x && transitions < 9) { - end--; - bool newBlack = image->get(end, y); - if (black != newBlack) { - transitions++; - } - black = newBlack; - } - if (end == x) { - throw NotFoundException("PDF417Reader::findPatternEnd: no pattern end found!"); - } - return end; -} diff --git a/src/qzxing/zxing/zxing/pdf417/PDF417Reader.h b/src/qzxing/zxing/zxing/pdf417/PDF417Reader.h deleted file mode 100644 index 77433c8..0000000 --- a/src/qzxing/zxing/zxing/pdf417/PDF417Reader.h +++ /dev/null @@ -1,49 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -#ifndef __PDF417_READER_H__ -#define __PDF417_READER_H__ - -/* - * PDF417Reader.h - * zxing - * - * Copyright 2010,2012 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include - -namespace zxing { -namespace pdf417 { - - -class PDF417Reader : public Reader { - private: - decoder::Decoder decoder; - - static Ref extractPureBits(Ref image); - static int moduleSize(ArrayRef leftTopBlack, Ref image); - static int findPatternStart(int x, int y, Ref image); - static int findPatternEnd(int x, int y, Ref image); - - public: - Ref decode(Ref image, DecodeHints hints); - void reset(); -}; - -} -} - -#endif // __PDF417_READER_H__ diff --git a/src/qzxing/zxing/zxing/pdf417/decoder/BitMatrixParser.h b/src/qzxing/zxing/zxing/pdf417/decoder/BitMatrixParser.h deleted file mode 100644 index 8e74fe7..0000000 --- a/src/qzxing/zxing/zxing/pdf417/decoder/BitMatrixParser.h +++ /dev/null @@ -1,84 +0,0 @@ -#ifndef __BIT_MATRIX_PARSER__PDF_H__ -#define __BIT_MATRIX_PARSER__PDF_H__ - -/* - * BitMatrixParser.h / PDF417 - * zxing - * - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include -#include - -namespace zxing { -namespace pdf417 { -namespace decoder { - -class BitMatrixParser : public Counted { -private: - static const int MAX_ROWS; - // Maximum Codewords (Data + Error) - static const int MAX_CW_CAPACITY; - static const int MODULES_IN_SYMBOL; - - Ref bitMatrix_; - int rows_; /* = 0 */ - int leftColumnECData_; /* = 0 */ - int rightColumnECData_; /* = 0 */ - /* added 2012-06-22 HFN */ - int aLeftColumnTriple_[3]; - int aRightColumnTriple_[3]; - int eraseCount_; /* = 0 */ - ArrayRef erasures_; - int ecLevel_; /* = -1 */ - -public: - static const int SYMBOL_TABLE[]; - static const int SYMBOL_TABLE_LENGTH; - static const int CODEWORD_TABLE[]; - -public: - BitMatrixParser(Ref bitMatrix); - ArrayRef getErasures() const {return erasures_;} - int getECLevel() const {return ecLevel_;} - int getEraseCount() const {return eraseCount_;} - ArrayRef readCodewords(); /* throw(FormatException) */ - static int getCodeword(int64_t symbol, int *pi = NULL); - -private: - bool VerifyOuterColumns(int rownumber); - static ArrayRef trimArray(ArrayRef array, int size); - static int findCodewordIndex(int64_t symbol); - - - int processRow(int rowNumber, - ArrayRef codewords, int next); - - int processRow(ArrayRef rowCounters, int rowNumber, int rowHeight, - ArrayRef codewords, int next); /* throw(FormatException) */ -protected: - bool IsEqual(int &a, int &b, int rownumber); -}; - -} -} -} - -#endif // __BIT_MATRIX_PARSER__PDF_H__ diff --git a/src/qzxing/zxing/zxing/pdf417/decoder/DecodedBitStreamParser.h b/src/qzxing/zxing/zxing/pdf417/decoder/DecodedBitStreamParser.h deleted file mode 100644 index 8dbc790..0000000 --- a/src/qzxing/zxing/zxing/pdf417/decoder/DecodedBitStreamParser.h +++ /dev/null @@ -1,84 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -#ifndef __DECODED_BIT_STREAM_PARSER_PD_H__ -#define __DECODED_BIT_STREAM_PARSER_PD_H__ - -/* - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include - -namespace zxing { -namespace pdf417 { - -class DecodedBitStreamParser { - protected: - enum Mode { - ALPHA, - LOWER, - MIXED, - PUNCT, - ALPHA_SHIFT, - PUNCT_SHIFT - }; - - private: - - static const int TEXT_COMPACTION_MODE_LATCH; - static const int BYTE_COMPACTION_MODE_LATCH; - static const int NUMERIC_COMPACTION_MODE_LATCH; - static const int BYTE_COMPACTION_MODE_LATCH_6; - static const int BEGIN_MACRO_PDF417_CONTROL_BLOCK; - static const int BEGIN_MACRO_PDF417_OPTIONAL_FIELD; - static const int MACRO_PDF417_TERMINATOR; - static const int MODE_SHIFT_TO_BYTE_COMPACTION_MODE; - static const int MAX_NUMERIC_CODEWORDS; - - static const int PL; - static const int LL; - static const int AS; - static const int ML; - static const int AL; - static const int PS; - static const int PAL; - static const int EXP900_SIZE; - - static const char PUNCT_CHARS[]; - static const char MIXED_CHARS[]; - - static ArrayRef EXP900; - static ArrayRef initEXP900(); - - static int textCompaction(ArrayRef codewords, int codeIndex, Ref result); - static void decodeTextCompaction(ArrayRef textCompactionData, - ArrayRef byteCompactionData, - int length, - Ref result); - static int byteCompaction(int mode, ArrayRef codewords, int codeIndex, Ref result); - static int numericCompaction(ArrayRef codewords, int codeIndex, Ref result); - static Ref decodeBase900toBase10(ArrayRef codewords, int count); - - public: - DecodedBitStreamParser(); - static Ref decode(ArrayRef codewords); -}; - -} /* namespace pdf417 */ -} /* namespace zxing */ - -#endif // __DECODED_BIT_STREAM_PARSER_PD_H__ diff --git a/src/qzxing/zxing/zxing/pdf417/decoder/Decoder.h b/src/qzxing/zxing/zxing/pdf417/decoder/Decoder.h deleted file mode 100644 index 1d8bfb4..0000000 --- a/src/qzxing/zxing/zxing/pdf417/decoder/Decoder.h +++ /dev/null @@ -1,62 +0,0 @@ -#ifndef __DECOCER_PDF_H__ -#define __DECOCER_PDF_H__ - -/* - * Decoder.h - * zxing - * - * Created by Hartmut Neubauer, 2012-05-25 - * Copyright 2010,2012 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include -#include - - -namespace zxing { -namespace pdf417 { -namespace decoder { - -/** - *

The main class which implements PDF417 Code decoding -- as - * opposed to locating and extracting the PDF417 Code from an image.

- * - *

2012-06-27 HFN Reed-Solomon error correction activated, see class PDF417RSDecoder.

- *

2012-09-19 HFN Reed-Solomon error correction via ErrorCorrection/ModulusGF/ModulusPoly.

- */ - -class Decoder { -private: - static const int MAX_ERRORS; - static const int MAX_EC_CODEWORDS; - - void correctErrors(ArrayRef codewords, - ArrayRef erasures, int numECCodewords); - static void verifyCodewordCount(ArrayRef codewords, int numECCodewords); - -public: - - Ref decode(Ref bits, DecodeHints const &hints); -}; - -} -} -} - -#endif // __DECOCER_PDF_H__ diff --git a/src/qzxing/zxing/zxing/pdf417/decoder/PDF417BitMatrixParser.cpp b/src/qzxing/zxing/zxing/pdf417/decoder/PDF417BitMatrixParser.cpp deleted file mode 100644 index cbc1e8a..0000000 --- a/src/qzxing/zxing/zxing/pdf417/decoder/PDF417BitMatrixParser.cpp +++ /dev/null @@ -1,997 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2008-2012 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Modified by Hartmut Neubauer (HFN) - * - * 2012-06-27 HFN plausibility checks of outer columns and modulus-3 conditions - * of rows added. - * 2012-09-?? HFN because the Detector now counts the rows, there is no more - * need to check the equality of consecutive rows. All rows are - * parsed now. - */ - -#include - -using zxing::pdf417::decoder::BitMatrixParser; -using zxing::ArrayRef; - -// VC++ - -using zxing::Ref; -using zxing::BitMatrix; - -const int BitMatrixParser::MAX_ROWS = 90; -// Maximum Codewords (Data + Error) -const int BitMatrixParser::MAX_CW_CAPACITY = 929; -const int BitMatrixParser::MODULES_IN_SYMBOL = 17; - -BitMatrixParser::BitMatrixParser(Ref bitMatrix) - : bitMatrix_(bitMatrix) -{ - rows_ = 0; - leftColumnECData_ = 0; - rightColumnECData_ = 0; - for (int i = 0; i < 3; i++) { - aLeftColumnTriple_[i]=0; - aRightColumnTriple_[i]=0; - } - eraseCount_ = 0; - ecLevel_ = -1; -} - -/** - * To ensure separability of rows, codewords of consecutive rows belong to - * different subsets of all possible codewords. This routine scans the - * symbols in the barcode. When it finds a number of consecutive rows which - * are the same, it assumes that this is a row of codewords and processes - * them into a codeword array. - * - * 2012-09-12 HFN: Because now, at an earlier stage, the Detector has counted - * the rows, now it is no more necessary to check the equality of consecutive - * rows. We now have to check every row. - * - * @return an array of codewords. - * @throw FormatException for example if number of rows is too big or something - * with row processing is bad - */ -ArrayRef BitMatrixParser::readCodewords() -{ - //int width = bitMatrix_->getWidth(); - int height = bitMatrix_->getHeight(); - - erasures_ = new Array(MAX_CW_CAPACITY); - - ArrayRef codewords (new Array(MAX_CW_CAPACITY)); - int next = 0; - int rowNumber = 0; - for (int i = 0; i < height; i++) { - if (rowNumber >= MAX_ROWS) { - // Something is wrong, since we have exceeded - // the maximum rows in the specification. - throw FormatException("BitMatrixParser::readCodewords(PDF): Too many rows!"); - } - // Process Row - next = processRow(rowNumber, codewords, next); - rowNumber++; - } - erasures_ = trimArray(erasures_, eraseCount_); - return trimArray(codewords, next); -} - -/** - * Convert the symbols in the row to codewords. - * Each PDF417 symbol character consists of four bar elements and four space - * elements, each of which can be one to six modules wide. The four bar and - * four space elements shall measure 17 modules in total. - * - * @param rowNumber the current row number of codewords. - * @param codewords the codeword array to save codewords into. - * @param next the next available index into the codewords array. - * @return the next available index into the codeword array after processing - * this row. - */ -int BitMatrixParser::processRow(int rowNumber, ArrayRef codewords, int next) { - int width = bitMatrix_->getWidth(); - int columnNumber = 0; - int cwClusterNumber = -1; - int64_t symbol = 0; - for (int i = 0; i < width; i += MODULES_IN_SYMBOL) { - for (int mask = MODULES_IN_SYMBOL - 1; mask >= 0; mask--) { - if (bitMatrix_->get(i + (MODULES_IN_SYMBOL - 1 - mask), rowNumber)) { - symbol |= int64_t(1) << mask; - } - } - if (columnNumber > 0) { - cwClusterNumber = -1; - int cw = getCodeword(symbol,&cwClusterNumber); - - // 2012-06-27 HFN: cwClusterNumber should be the modulus of the row number by 3; otherwise, - // handle the codeword as erasure: - if ((cwClusterNumber >= 0) && (cwClusterNumber != rowNumber % 3)) { - cw = -1; - } - - if (cw < 0 && i < width - MODULES_IN_SYMBOL) { - // Skip errors on the Right row indicator column - if (eraseCount_ >= (int)erasures_->size()) { - throw FormatException("BitMatrixParser::processRow(PDF417): eraseCount too big!"); - } - erasures_[eraseCount_] = next; - next++; - eraseCount_++; - } else { - if (next >= codewords->size()) { - throw FormatException("BitMatrixParser::processRow(PDF417): codewords index out of bound."); - } - codewords[next++] = cw; - } - } else { - // Left row indicator column - cwClusterNumber = -1; - int cw = getCodeword(symbol,&cwClusterNumber); - aLeftColumnTriple_[rowNumber % 3] = cw; /* added 2012-06-22 hfn */ - if (ecLevel_ < 0 && rowNumber % 3 == 1) { - leftColumnECData_ = cw; - } - } - symbol = 0; - columnNumber++; - } - if (columnNumber > 1) { - // Right row indicator column is in codeword[next] - // Overwrite the last codeword i.e. Right Row Indicator - --next; - aRightColumnTriple_[rowNumber % 3] = codewords[next]; /* added 2012-06-22 hfn */ - if (rowNumber % 3 == 2) { - if (ecLevel_ < 0) { - rightColumnECData_ = codewords[next]; - if (rightColumnECData_ == leftColumnECData_ && (int)leftColumnECData_ > 0) { /* leftColumnECData_ != 0 */ - ecLevel_ = ((rightColumnECData_ % 30) - rows_ % 3) / 3; - } - } - // 2012-06-22 hfn: verify whether outer columns are still okay: - if (!VerifyOuterColumns(rowNumber)) { - throw FormatException("BitMatrixParser::processRow(PDF417): outer columns corrupted!"); - } - } - codewords[next] = 0; - } - return next; -} - -/* Static methods. */ - -/** - * Trim the array to the required size. - * - * @param array the array - * @param size the size to trim it to - * @return the new trimmed array - */ -ArrayRef BitMatrixParser::trimArray(ArrayRef array, int size) -{ - if (size < 0) { - throw IllegalArgumentException("BitMatrixParser::trimArray: negative size!"); - } - // 2012-10-12 hfn don't throw "NoErrorException" when size == 0 - ArrayRef a = new Array(size); - for (int i = 0; i < size; i++) { - a[i] = array[i]; - } - return a; -} - -/** - * Translate the symbol into a codeword. - * - * @param symbol - * @return the codeword corresponding to the symbol. - */ - -/** - * 2012-06-27 hfn With the second argument, it is possible to verify in which of the three - * "blocks" of the codeword table the codeword has been found: 0, 1 or 2. - */ -int BitMatrixParser::getCodeword(int64_t symbol, int *pi) -{ - int64_t sym = symbol & 0x3FFFF; - int i = findCodewordIndex(sym); - if (i == -1) { - return -1; - } else { - int cw = CODEWORD_TABLE[i] - 1; - if (pi!= NULL) { - *pi = cw / 929; - } - cw %= 929; - return cw; - } -} - -/** - * Use a binary search to find the index of the codeword corresponding to - * this symbol. - * - * @param symbol the symbol from the barcode. - * @return the index into the codeword table. - */ -int BitMatrixParser::findCodewordIndex(int64_t symbol) -{ - int first = 0; - int upto = SYMBOL_TABLE_LENGTH; - while (first < upto) { - int mid = ((unsigned int)(first + upto)) >> 1; // Compute mid point. - if (symbol < SYMBOL_TABLE[mid]) { - upto = mid; // repeat search in bottom half. - } else if (symbol > SYMBOL_TABLE[mid]) { - first = mid + 1; // Repeat search in top half. - } else { - return mid; // Found it. return position - } - } - return -1; -} - -/* - * 2012-06-22 hfn additional verification of outer columns - */ -bool BitMatrixParser::VerifyOuterColumns(int rownumber) -{ - return IsEqual(aLeftColumnTriple_[0], aRightColumnTriple_[1], rownumber) - && IsEqual(aLeftColumnTriple_[1], aRightColumnTriple_[2], rownumber) - && IsEqual(aLeftColumnTriple_[2], aRightColumnTriple_[0], rownumber); -} - -/* - * Verifies whether two codewords are equal or at least one of the codewords has not - * been recognized. - */ -bool BitMatrixParser::IsEqual(int &a, int &b, int rownumber) -{ - int ret = (a == b) || (a == -1) || (b == -1); - if (!ret) { - int row3 = rownumber / 3; - int row30 = row3 * 30; - int row59 = row30 + 29; - if (a < row30 || a > row59) { - a = -1; - } - if (b < row30 || b > row59) { - b = -1; - } - } - return true; -} - -const int BitMatrixParser::SYMBOL_TABLE[] = -{ - 0x1025e, 0x1027a, 0x1029e, - 0x102bc, 0x102f2, 0x102f4, 0x1032e, 0x1034e, 0x1035c, 0x10396, - 0x103a6, 0x103ac, 0x10422, 0x10428, 0x10436, 0x10442, 0x10444, - 0x10448, 0x10450, 0x1045e, 0x10466, 0x1046c, 0x1047a, 0x10482, - 0x1049e, 0x104a0, 0x104bc, 0x104c6, 0x104d8, 0x104ee, 0x104f2, - 0x104f4, 0x10504, 0x10508, 0x10510, 0x1051e, 0x10520, 0x1053c, - 0x10540, 0x10578, 0x10586, 0x1058c, 0x10598, 0x105b0, 0x105be, - 0x105ce, 0x105dc, 0x105e2, 0x105e4, 0x105e8, 0x105f6, 0x1062e, - 0x1064e, 0x1065c, 0x1068e, 0x1069c, 0x106b8, 0x106de, 0x106fa, - 0x10716, 0x10726, 0x1072c, 0x10746, 0x1074c, 0x10758, 0x1076e, - 0x10792, 0x10794, 0x107a2, 0x107a4, 0x107a8, 0x107b6, 0x10822, - 0x10828, 0x10842, 0x10848, 0x10850, 0x1085e, 0x10866, 0x1086c, - 0x1087a, 0x10882, 0x10884, 0x10890, 0x1089e, 0x108a0, 0x108bc, - 0x108c6, 0x108cc, 0x108d8, 0x108ee, 0x108f2, 0x108f4, 0x10902, - 0x10908, 0x1091e, 0x10920, 0x1093c, 0x10940, 0x10978, 0x10986, - 0x10998, 0x109b0, 0x109be, 0x109ce, 0x109dc, 0x109e2, 0x109e4, - 0x109e8, 0x109f6, 0x10a08, 0x10a10, 0x10a1e, 0x10a20, 0x10a3c, - 0x10a40, 0x10a78, 0x10af0, 0x10b06, 0x10b0c, 0x10b18, 0x10b30, - 0x10b3e, 0x10b60, 0x10b7c, 0x10b8e, 0x10b9c, 0x10bb8, 0x10bc2, - 0x10bc4, 0x10bc8, 0x10bd0, 0x10bde, 0x10be6, 0x10bec, 0x10c2e, - 0x10c4e, 0x10c5c, 0x10c62, 0x10c64, 0x10c68, 0x10c76, 0x10c8e, - 0x10c9c, 0x10cb8, 0x10cc2, 0x10cc4, 0x10cc8, 0x10cd0, 0x10cde, - 0x10ce6, 0x10cec, 0x10cfa, 0x10d0e, 0x10d1c, 0x10d38, 0x10d70, - 0x10d7e, 0x10d82, 0x10d84, 0x10d88, 0x10d90, 0x10d9e, 0x10da0, - 0x10dbc, 0x10dc6, 0x10dcc, 0x10dd8, 0x10dee, 0x10df2, 0x10df4, - 0x10e16, 0x10e26, 0x10e2c, 0x10e46, 0x10e58, 0x10e6e, 0x10e86, - 0x10e8c, 0x10e98, 0x10eb0, 0x10ebe, 0x10ece, 0x10edc, 0x10f0a, - 0x10f12, 0x10f14, 0x10f22, 0x10f28, 0x10f36, 0x10f42, 0x10f44, - 0x10f48, 0x10f50, 0x10f5e, 0x10f66, 0x10f6c, 0x10fb2, 0x10fb4, - 0x11022, 0x11028, 0x11042, 0x11048, 0x11050, 0x1105e, 0x1107a, - 0x11082, 0x11084, 0x11090, 0x1109e, 0x110a0, 0x110bc, 0x110c6, - 0x110cc, 0x110d8, 0x110ee, 0x110f2, 0x110f4, 0x11102, 0x1111e, - 0x11120, 0x1113c, 0x11140, 0x11178, 0x11186, 0x11198, 0x111b0, - 0x111be, 0x111ce, 0x111dc, 0x111e2, 0x111e4, 0x111e8, 0x111f6, - 0x11208, 0x1121e, 0x11220, 0x11278, 0x112f0, 0x1130c, 0x11330, - 0x1133e, 0x11360, 0x1137c, 0x1138e, 0x1139c, 0x113b8, 0x113c2, - 0x113c8, 0x113d0, 0x113de, 0x113e6, 0x113ec, 0x11408, 0x11410, - 0x1141e, 0x11420, 0x1143c, 0x11440, 0x11478, 0x114f0, 0x115e0, - 0x1160c, 0x11618, 0x11630, 0x1163e, 0x11660, 0x1167c, 0x116c0, - 0x116f8, 0x1171c, 0x11738, 0x11770, 0x1177e, 0x11782, 0x11784, - 0x11788, 0x11790, 0x1179e, 0x117a0, 0x117bc, 0x117c6, 0x117cc, - 0x117d8, 0x117ee, 0x1182e, 0x11834, 0x1184e, 0x1185c, 0x11862, - 0x11864, 0x11868, 0x11876, 0x1188e, 0x1189c, 0x118b8, 0x118c2, - 0x118c8, 0x118d0, 0x118de, 0x118e6, 0x118ec, 0x118fa, 0x1190e, - 0x1191c, 0x11938, 0x11970, 0x1197e, 0x11982, 0x11984, 0x11990, - 0x1199e, 0x119a0, 0x119bc, 0x119c6, 0x119cc, 0x119d8, 0x119ee, - 0x119f2, 0x119f4, 0x11a0e, 0x11a1c, 0x11a38, 0x11a70, 0x11a7e, - 0x11ae0, 0x11afc, 0x11b08, 0x11b10, 0x11b1e, 0x11b20, 0x11b3c, - 0x11b40, 0x11b78, 0x11b8c, 0x11b98, 0x11bb0, 0x11bbe, 0x11bce, - 0x11bdc, 0x11be2, 0x11be4, 0x11be8, 0x11bf6, 0x11c16, 0x11c26, - 0x11c2c, 0x11c46, 0x11c4c, 0x11c58, 0x11c6e, 0x11c86, 0x11c98, - 0x11cb0, 0x11cbe, 0x11cce, 0x11cdc, 0x11ce2, 0x11ce4, 0x11ce8, - 0x11cf6, 0x11d06, 0x11d0c, 0x11d18, 0x11d30, 0x11d3e, 0x11d60, - 0x11d7c, 0x11d8e, 0x11d9c, 0x11db8, 0x11dc4, 0x11dc8, 0x11dd0, - 0x11dde, 0x11de6, 0x11dec, 0x11dfa, 0x11e0a, 0x11e12, 0x11e14, - 0x11e22, 0x11e24, 0x11e28, 0x11e36, 0x11e42, 0x11e44, 0x11e50, - 0x11e5e, 0x11e66, 0x11e6c, 0x11e82, 0x11e84, 0x11e88, 0x11e90, - 0x11e9e, 0x11ea0, 0x11ebc, 0x11ec6, 0x11ecc, 0x11ed8, 0x11eee, - 0x11f1a, 0x11f2e, 0x11f32, 0x11f34, 0x11f4e, 0x11f5c, 0x11f62, - 0x11f64, 0x11f68, 0x11f76, 0x12048, 0x1205e, 0x12082, 0x12084, - 0x12090, 0x1209e, 0x120a0, 0x120bc, 0x120d8, 0x120f2, 0x120f4, - 0x12108, 0x1211e, 0x12120, 0x1213c, 0x12140, 0x12178, 0x12186, - 0x12198, 0x121b0, 0x121be, 0x121e2, 0x121e4, 0x121e8, 0x121f6, - 0x12204, 0x12210, 0x1221e, 0x12220, 0x12278, 0x122f0, 0x12306, - 0x1230c, 0x12330, 0x1233e, 0x12360, 0x1237c, 0x1238e, 0x1239c, - 0x123b8, 0x123c2, 0x123c8, 0x123d0, 0x123e6, 0x123ec, 0x1241e, - 0x12420, 0x1243c, 0x124f0, 0x125e0, 0x12618, 0x1263e, 0x12660, - 0x1267c, 0x126c0, 0x126f8, 0x12738, 0x12770, 0x1277e, 0x12782, - 0x12784, 0x12790, 0x1279e, 0x127a0, 0x127bc, 0x127c6, 0x127cc, - 0x127d8, 0x127ee, 0x12820, 0x1283c, 0x12840, 0x12878, 0x128f0, - 0x129e0, 0x12bc0, 0x12c18, 0x12c30, 0x12c3e, 0x12c60, 0x12c7c, - 0x12cc0, 0x12cf8, 0x12df0, 0x12e1c, 0x12e38, 0x12e70, 0x12e7e, - 0x12ee0, 0x12efc, 0x12f04, 0x12f08, 0x12f10, 0x12f20, 0x12f3c, - 0x12f40, 0x12f78, 0x12f86, 0x12f8c, 0x12f98, 0x12fb0, 0x12fbe, - 0x12fce, 0x12fdc, 0x1302e, 0x1304e, 0x1305c, 0x13062, 0x13068, - 0x1308e, 0x1309c, 0x130b8, 0x130c2, 0x130c8, 0x130d0, 0x130de, - 0x130ec, 0x130fa, 0x1310e, 0x13138, 0x13170, 0x1317e, 0x13182, - 0x13184, 0x13190, 0x1319e, 0x131a0, 0x131bc, 0x131c6, 0x131cc, - 0x131d8, 0x131f2, 0x131f4, 0x1320e, 0x1321c, 0x13270, 0x1327e, - 0x132e0, 0x132fc, 0x13308, 0x1331e, 0x13320, 0x1333c, 0x13340, - 0x13378, 0x13386, 0x13398, 0x133b0, 0x133be, 0x133ce, 0x133dc, - 0x133e2, 0x133e4, 0x133e8, 0x133f6, 0x1340e, 0x1341c, 0x13438, - 0x13470, 0x1347e, 0x134e0, 0x134fc, 0x135c0, 0x135f8, 0x13608, - 0x13610, 0x1361e, 0x13620, 0x1363c, 0x13640, 0x13678, 0x136f0, - 0x1370c, 0x13718, 0x13730, 0x1373e, 0x13760, 0x1377c, 0x1379c, - 0x137b8, 0x137c2, 0x137c4, 0x137c8, 0x137d0, 0x137de, 0x137e6, - 0x137ec, 0x13816, 0x13826, 0x1382c, 0x13846, 0x1384c, 0x13858, - 0x1386e, 0x13874, 0x13886, 0x13898, 0x138b0, 0x138be, 0x138ce, - 0x138dc, 0x138e2, 0x138e4, 0x138e8, 0x13906, 0x1390c, 0x13930, - 0x1393e, 0x13960, 0x1397c, 0x1398e, 0x1399c, 0x139b8, 0x139c8, - 0x139d0, 0x139de, 0x139e6, 0x139ec, 0x139fa, 0x13a06, 0x13a0c, - 0x13a18, 0x13a30, 0x13a3e, 0x13a60, 0x13a7c, 0x13ac0, 0x13af8, - 0x13b0e, 0x13b1c, 0x13b38, 0x13b70, 0x13b7e, 0x13b88, 0x13b90, - 0x13b9e, 0x13ba0, 0x13bbc, 0x13bcc, 0x13bd8, 0x13bee, 0x13bf2, - 0x13bf4, 0x13c12, 0x13c14, 0x13c22, 0x13c24, 0x13c28, 0x13c36, - 0x13c42, 0x13c48, 0x13c50, 0x13c5e, 0x13c66, 0x13c6c, 0x13c82, - 0x13c84, 0x13c90, 0x13c9e, 0x13ca0, 0x13cbc, 0x13cc6, 0x13ccc, - 0x13cd8, 0x13cee, 0x13d02, 0x13d04, 0x13d08, 0x13d10, 0x13d1e, - 0x13d20, 0x13d3c, 0x13d40, 0x13d78, 0x13d86, 0x13d8c, 0x13d98, - 0x13db0, 0x13dbe, 0x13dce, 0x13ddc, 0x13de4, 0x13de8, 0x13df6, - 0x13e1a, 0x13e2e, 0x13e32, 0x13e34, 0x13e4e, 0x13e5c, 0x13e62, - 0x13e64, 0x13e68, 0x13e76, 0x13e8e, 0x13e9c, 0x13eb8, 0x13ec2, - 0x13ec4, 0x13ec8, 0x13ed0, 0x13ede, 0x13ee6, 0x13eec, 0x13f26, - 0x13f2c, 0x13f3a, 0x13f46, 0x13f4c, 0x13f58, 0x13f6e, 0x13f72, - 0x13f74, 0x14082, 0x1409e, 0x140a0, 0x140bc, 0x14104, 0x14108, - 0x14110, 0x1411e, 0x14120, 0x1413c, 0x14140, 0x14178, 0x1418c, - 0x14198, 0x141b0, 0x141be, 0x141e2, 0x141e4, 0x141e8, 0x14208, - 0x14210, 0x1421e, 0x14220, 0x1423c, 0x14240, 0x14278, 0x142f0, - 0x14306, 0x1430c, 0x14318, 0x14330, 0x1433e, 0x14360, 0x1437c, - 0x1438e, 0x143c2, 0x143c4, 0x143c8, 0x143d0, 0x143e6, 0x143ec, - 0x14408, 0x14410, 0x1441e, 0x14420, 0x1443c, 0x14440, 0x14478, - 0x144f0, 0x145e0, 0x1460c, 0x14618, 0x14630, 0x1463e, 0x14660, - 0x1467c, 0x146c0, 0x146f8, 0x1471c, 0x14738, 0x14770, 0x1477e, - 0x14782, 0x14784, 0x14788, 0x14790, 0x147a0, 0x147bc, 0x147c6, - 0x147cc, 0x147d8, 0x147ee, 0x14810, 0x14820, 0x1483c, 0x14840, - 0x14878, 0x148f0, 0x149e0, 0x14bc0, 0x14c30, 0x14c3e, 0x14c60, - 0x14c7c, 0x14cc0, 0x14cf8, 0x14df0, 0x14e38, 0x14e70, 0x14e7e, - 0x14ee0, 0x14efc, 0x14f04, 0x14f08, 0x14f10, 0x14f1e, 0x14f20, - 0x14f3c, 0x14f40, 0x14f78, 0x14f86, 0x14f8c, 0x14f98, 0x14fb0, - 0x14fce, 0x14fdc, 0x15020, 0x15040, 0x15078, 0x150f0, 0x151e0, - 0x153c0, 0x15860, 0x1587c, 0x158c0, 0x158f8, 0x159f0, 0x15be0, - 0x15c70, 0x15c7e, 0x15ce0, 0x15cfc, 0x15dc0, 0x15df8, 0x15e08, - 0x15e10, 0x15e20, 0x15e40, 0x15e78, 0x15ef0, 0x15f0c, 0x15f18, - 0x15f30, 0x15f60, 0x15f7c, 0x15f8e, 0x15f9c, 0x15fb8, 0x1604e, - 0x1605c, 0x1608e, 0x1609c, 0x160b8, 0x160c2, 0x160c4, 0x160c8, - 0x160de, 0x1610e, 0x1611c, 0x16138, 0x16170, 0x1617e, 0x16184, - 0x16188, 0x16190, 0x1619e, 0x161a0, 0x161bc, 0x161c6, 0x161cc, - 0x161d8, 0x161f2, 0x161f4, 0x1620e, 0x1621c, 0x16238, 0x16270, - 0x1627e, 0x162e0, 0x162fc, 0x16304, 0x16308, 0x16310, 0x1631e, - 0x16320, 0x1633c, 0x16340, 0x16378, 0x16386, 0x1638c, 0x16398, - 0x163b0, 0x163be, 0x163ce, 0x163dc, 0x163e2, 0x163e4, 0x163e8, - 0x163f6, 0x1640e, 0x1641c, 0x16438, 0x16470, 0x1647e, 0x164e0, - 0x164fc, 0x165c0, 0x165f8, 0x16610, 0x1661e, 0x16620, 0x1663c, - 0x16640, 0x16678, 0x166f0, 0x16718, 0x16730, 0x1673e, 0x16760, - 0x1677c, 0x1678e, 0x1679c, 0x167b8, 0x167c2, 0x167c4, 0x167c8, - 0x167d0, 0x167de, 0x167e6, 0x167ec, 0x1681c, 0x16838, 0x16870, - 0x168e0, 0x168fc, 0x169c0, 0x169f8, 0x16bf0, 0x16c10, 0x16c1e, - 0x16c20, 0x16c3c, 0x16c40, 0x16c78, 0x16cf0, 0x16de0, 0x16e18, - 0x16e30, 0x16e3e, 0x16e60, 0x16e7c, 0x16ec0, 0x16ef8, 0x16f1c, - 0x16f38, 0x16f70, 0x16f7e, 0x16f84, 0x16f88, 0x16f90, 0x16f9e, - 0x16fa0, 0x16fbc, 0x16fc6, 0x16fcc, 0x16fd8, 0x17026, 0x1702c, - 0x17046, 0x1704c, 0x17058, 0x1706e, 0x17086, 0x1708c, 0x17098, - 0x170b0, 0x170be, 0x170ce, 0x170dc, 0x170e8, 0x17106, 0x1710c, - 0x17118, 0x17130, 0x1713e, 0x17160, 0x1717c, 0x1718e, 0x1719c, - 0x171b8, 0x171c2, 0x171c4, 0x171c8, 0x171d0, 0x171de, 0x171e6, - 0x171ec, 0x171fa, 0x17206, 0x1720c, 0x17218, 0x17230, 0x1723e, - 0x17260, 0x1727c, 0x172c0, 0x172f8, 0x1730e, 0x1731c, 0x17338, - 0x17370, 0x1737e, 0x17388, 0x17390, 0x1739e, 0x173a0, 0x173bc, - 0x173cc, 0x173d8, 0x173ee, 0x173f2, 0x173f4, 0x1740c, 0x17418, - 0x17430, 0x1743e, 0x17460, 0x1747c, 0x174c0, 0x174f8, 0x175f0, - 0x1760e, 0x1761c, 0x17638, 0x17670, 0x1767e, 0x176e0, 0x176fc, - 0x17708, 0x17710, 0x1771e, 0x17720, 0x1773c, 0x17740, 0x17778, - 0x17798, 0x177b0, 0x177be, 0x177dc, 0x177e2, 0x177e4, 0x177e8, - 0x17822, 0x17824, 0x17828, 0x17836, 0x17842, 0x17844, 0x17848, - 0x17850, 0x1785e, 0x17866, 0x1786c, 0x17882, 0x17884, 0x17888, - 0x17890, 0x1789e, 0x178a0, 0x178bc, 0x178c6, 0x178cc, 0x178d8, - 0x178ee, 0x178f2, 0x178f4, 0x17902, 0x17904, 0x17908, 0x17910, - 0x1791e, 0x17920, 0x1793c, 0x17940, 0x17978, 0x17986, 0x1798c, - 0x17998, 0x179b0, 0x179be, 0x179ce, 0x179dc, 0x179e2, 0x179e4, - 0x179e8, 0x179f6, 0x17a04, 0x17a08, 0x17a10, 0x17a1e, 0x17a20, - 0x17a3c, 0x17a40, 0x17a78, 0x17af0, 0x17b06, 0x17b0c, 0x17b18, - 0x17b30, 0x17b3e, 0x17b60, 0x17b7c, 0x17b8e, 0x17b9c, 0x17bb8, - 0x17bc4, 0x17bc8, 0x17bd0, 0x17bde, 0x17be6, 0x17bec, 0x17c2e, - 0x17c32, 0x17c34, 0x17c4e, 0x17c5c, 0x17c62, 0x17c64, 0x17c68, - 0x17c76, 0x17c8e, 0x17c9c, 0x17cb8, 0x17cc2, 0x17cc4, 0x17cc8, - 0x17cd0, 0x17cde, 0x17ce6, 0x17cec, 0x17d0e, 0x17d1c, 0x17d38, - 0x17d70, 0x17d82, 0x17d84, 0x17d88, 0x17d90, 0x17d9e, 0x17da0, - 0x17dbc, 0x17dc6, 0x17dcc, 0x17dd8, 0x17dee, 0x17e26, 0x17e2c, - 0x17e3a, 0x17e46, 0x17e4c, 0x17e58, 0x17e6e, 0x17e72, 0x17e74, - 0x17e86, 0x17e8c, 0x17e98, 0x17eb0, 0x17ece, 0x17edc, 0x17ee2, - 0x17ee4, 0x17ee8, 0x17ef6, 0x1813a, 0x18172, 0x18174, 0x18216, - 0x18226, 0x1823a, 0x1824c, 0x18258, 0x1826e, 0x18272, 0x18274, - 0x18298, 0x182be, 0x182e2, 0x182e4, 0x182e8, 0x182f6, 0x1835e, - 0x1837a, 0x183ae, 0x183d6, 0x18416, 0x18426, 0x1842c, 0x1843a, - 0x18446, 0x18458, 0x1846e, 0x18472, 0x18474, 0x18486, 0x184b0, - 0x184be, 0x184ce, 0x184dc, 0x184e2, 0x184e4, 0x184e8, 0x184f6, - 0x18506, 0x1850c, 0x18518, 0x18530, 0x1853e, 0x18560, 0x1857c, - 0x1858e, 0x1859c, 0x185b8, 0x185c2, 0x185c4, 0x185c8, 0x185d0, - 0x185de, 0x185e6, 0x185ec, 0x185fa, 0x18612, 0x18614, 0x18622, - 0x18628, 0x18636, 0x18642, 0x18650, 0x1865e, 0x1867a, 0x18682, - 0x18684, 0x18688, 0x18690, 0x1869e, 0x186a0, 0x186bc, 0x186c6, - 0x186cc, 0x186d8, 0x186ee, 0x186f2, 0x186f4, 0x1872e, 0x1874e, - 0x1875c, 0x18796, 0x187a6, 0x187ac, 0x187d2, 0x187d4, 0x18826, - 0x1882c, 0x1883a, 0x18846, 0x1884c, 0x18858, 0x1886e, 0x18872, - 0x18874, 0x18886, 0x18898, 0x188b0, 0x188be, 0x188ce, 0x188dc, - 0x188e2, 0x188e4, 0x188e8, 0x188f6, 0x1890c, 0x18930, 0x1893e, - 0x18960, 0x1897c, 0x1898e, 0x189b8, 0x189c2, 0x189c8, 0x189d0, - 0x189de, 0x189e6, 0x189ec, 0x189fa, 0x18a18, 0x18a30, 0x18a3e, - 0x18a60, 0x18a7c, 0x18ac0, 0x18af8, 0x18b1c, 0x18b38, 0x18b70, - 0x18b7e, 0x18b82, 0x18b84, 0x18b88, 0x18b90, 0x18b9e, 0x18ba0, - 0x18bbc, 0x18bc6, 0x18bcc, 0x18bd8, 0x18bee, 0x18bf2, 0x18bf4, - 0x18c22, 0x18c24, 0x18c28, 0x18c36, 0x18c42, 0x18c48, 0x18c50, - 0x18c5e, 0x18c66, 0x18c7a, 0x18c82, 0x18c84, 0x18c90, 0x18c9e, - 0x18ca0, 0x18cbc, 0x18ccc, 0x18cf2, 0x18cf4, 0x18d04, 0x18d08, - 0x18d10, 0x18d1e, 0x18d20, 0x18d3c, 0x18d40, 0x18d78, 0x18d86, - 0x18d98, 0x18dce, 0x18de2, 0x18de4, 0x18de8, 0x18e2e, 0x18e32, - 0x18e34, 0x18e4e, 0x18e5c, 0x18e62, 0x18e64, 0x18e68, 0x18e8e, - 0x18e9c, 0x18eb8, 0x18ec2, 0x18ec4, 0x18ec8, 0x18ed0, 0x18efa, - 0x18f16, 0x18f26, 0x18f2c, 0x18f46, 0x18f4c, 0x18f58, 0x18f6e, - 0x18f8a, 0x18f92, 0x18f94, 0x18fa2, 0x18fa4, 0x18fa8, 0x18fb6, - 0x1902c, 0x1903a, 0x19046, 0x1904c, 0x19058, 0x19072, 0x19074, - 0x19086, 0x19098, 0x190b0, 0x190be, 0x190ce, 0x190dc, 0x190e2, - 0x190e8, 0x190f6, 0x19106, 0x1910c, 0x19130, 0x1913e, 0x19160, - 0x1917c, 0x1918e, 0x1919c, 0x191b8, 0x191c2, 0x191c8, 0x191d0, - 0x191de, 0x191e6, 0x191ec, 0x191fa, 0x19218, 0x1923e, 0x19260, - 0x1927c, 0x192c0, 0x192f8, 0x19338, 0x19370, 0x1937e, 0x19382, - 0x19384, 0x19390, 0x1939e, 0x193a0, 0x193bc, 0x193c6, 0x193cc, - 0x193d8, 0x193ee, 0x193f2, 0x193f4, 0x19430, 0x1943e, 0x19460, - 0x1947c, 0x194c0, 0x194f8, 0x195f0, 0x19638, 0x19670, 0x1967e, - 0x196e0, 0x196fc, 0x19702, 0x19704, 0x19708, 0x19710, 0x19720, - 0x1973c, 0x19740, 0x19778, 0x19786, 0x1978c, 0x19798, 0x197b0, - 0x197be, 0x197ce, 0x197dc, 0x197e2, 0x197e4, 0x197e8, 0x19822, - 0x19824, 0x19842, 0x19848, 0x19850, 0x1985e, 0x19866, 0x1987a, - 0x19882, 0x19884, 0x19890, 0x1989e, 0x198a0, 0x198bc, 0x198cc, - 0x198f2, 0x198f4, 0x19902, 0x19908, 0x1991e, 0x19920, 0x1993c, - 0x19940, 0x19978, 0x19986, 0x19998, 0x199ce, 0x199e2, 0x199e4, - 0x199e8, 0x19a08, 0x19a10, 0x19a1e, 0x19a20, 0x19a3c, 0x19a40, - 0x19a78, 0x19af0, 0x19b18, 0x19b3e, 0x19b60, 0x19b9c, 0x19bc2, - 0x19bc4, 0x19bc8, 0x19bd0, 0x19be6, 0x19c2e, 0x19c34, 0x19c4e, - 0x19c5c, 0x19c62, 0x19c64, 0x19c68, 0x19c8e, 0x19c9c, 0x19cb8, - 0x19cc2, 0x19cc8, 0x19cd0, 0x19ce6, 0x19cfa, 0x19d0e, 0x19d1c, - 0x19d38, 0x19d70, 0x19d7e, 0x19d82, 0x19d84, 0x19d88, 0x19d90, - 0x19da0, 0x19dcc, 0x19df2, 0x19df4, 0x19e16, 0x19e26, 0x19e2c, - 0x19e46, 0x19e4c, 0x19e58, 0x19e74, 0x19e86, 0x19e8c, 0x19e98, - 0x19eb0, 0x19ebe, 0x19ece, 0x19ee2, 0x19ee4, 0x19ee8, 0x19f0a, - 0x19f12, 0x19f14, 0x19f22, 0x19f24, 0x19f28, 0x19f42, 0x19f44, - 0x19f48, 0x19f50, 0x19f5e, 0x19f6c, 0x19f9a, 0x19fae, 0x19fb2, - 0x19fb4, 0x1a046, 0x1a04c, 0x1a072, 0x1a074, 0x1a086, 0x1a08c, - 0x1a098, 0x1a0b0, 0x1a0be, 0x1a0e2, 0x1a0e4, 0x1a0e8, 0x1a0f6, - 0x1a106, 0x1a10c, 0x1a118, 0x1a130, 0x1a13e, 0x1a160, 0x1a17c, - 0x1a18e, 0x1a19c, 0x1a1b8, 0x1a1c2, 0x1a1c4, 0x1a1c8, 0x1a1d0, - 0x1a1de, 0x1a1e6, 0x1a1ec, 0x1a218, 0x1a230, 0x1a23e, 0x1a260, - 0x1a27c, 0x1a2c0, 0x1a2f8, 0x1a31c, 0x1a338, 0x1a370, 0x1a37e, - 0x1a382, 0x1a384, 0x1a388, 0x1a390, 0x1a39e, 0x1a3a0, 0x1a3bc, - 0x1a3c6, 0x1a3cc, 0x1a3d8, 0x1a3ee, 0x1a3f2, 0x1a3f4, 0x1a418, - 0x1a430, 0x1a43e, 0x1a460, 0x1a47c, 0x1a4c0, 0x1a4f8, 0x1a5f0, - 0x1a61c, 0x1a638, 0x1a670, 0x1a67e, 0x1a6e0, 0x1a6fc, 0x1a702, - 0x1a704, 0x1a708, 0x1a710, 0x1a71e, 0x1a720, 0x1a73c, 0x1a740, - 0x1a778, 0x1a786, 0x1a78c, 0x1a798, 0x1a7b0, 0x1a7be, 0x1a7ce, - 0x1a7dc, 0x1a7e2, 0x1a7e4, 0x1a7e8, 0x1a830, 0x1a860, 0x1a87c, - 0x1a8c0, 0x1a8f8, 0x1a9f0, 0x1abe0, 0x1ac70, 0x1ac7e, 0x1ace0, - 0x1acfc, 0x1adc0, 0x1adf8, 0x1ae04, 0x1ae08, 0x1ae10, 0x1ae20, - 0x1ae3c, 0x1ae40, 0x1ae78, 0x1aef0, 0x1af06, 0x1af0c, 0x1af18, - 0x1af30, 0x1af3e, 0x1af60, 0x1af7c, 0x1af8e, 0x1af9c, 0x1afb8, - 0x1afc4, 0x1afc8, 0x1afd0, 0x1afde, 0x1b042, 0x1b05e, 0x1b07a, - 0x1b082, 0x1b084, 0x1b088, 0x1b090, 0x1b09e, 0x1b0a0, 0x1b0bc, - 0x1b0cc, 0x1b0f2, 0x1b0f4, 0x1b102, 0x1b104, 0x1b108, 0x1b110, - 0x1b11e, 0x1b120, 0x1b13c, 0x1b140, 0x1b178, 0x1b186, 0x1b198, - 0x1b1ce, 0x1b1e2, 0x1b1e4, 0x1b1e8, 0x1b204, 0x1b208, 0x1b210, - 0x1b21e, 0x1b220, 0x1b23c, 0x1b240, 0x1b278, 0x1b2f0, 0x1b30c, - 0x1b33e, 0x1b360, 0x1b39c, 0x1b3c2, 0x1b3c4, 0x1b3c8, 0x1b3d0, - 0x1b3e6, 0x1b410, 0x1b41e, 0x1b420, 0x1b43c, 0x1b440, 0x1b478, - 0x1b4f0, 0x1b5e0, 0x1b618, 0x1b660, 0x1b67c, 0x1b6c0, 0x1b738, - 0x1b782, 0x1b784, 0x1b788, 0x1b790, 0x1b79e, 0x1b7a0, 0x1b7cc, - 0x1b82e, 0x1b84e, 0x1b85c, 0x1b88e, 0x1b89c, 0x1b8b8, 0x1b8c2, - 0x1b8c4, 0x1b8c8, 0x1b8d0, 0x1b8e6, 0x1b8fa, 0x1b90e, 0x1b91c, - 0x1b938, 0x1b970, 0x1b97e, 0x1b982, 0x1b984, 0x1b988, 0x1b990, - 0x1b99e, 0x1b9a0, 0x1b9cc, 0x1b9f2, 0x1b9f4, 0x1ba0e, 0x1ba1c, - 0x1ba38, 0x1ba70, 0x1ba7e, 0x1bae0, 0x1bafc, 0x1bb08, 0x1bb10, - 0x1bb20, 0x1bb3c, 0x1bb40, 0x1bb98, 0x1bbce, 0x1bbe2, 0x1bbe4, - 0x1bbe8, 0x1bc16, 0x1bc26, 0x1bc2c, 0x1bc46, 0x1bc4c, 0x1bc58, - 0x1bc72, 0x1bc74, 0x1bc86, 0x1bc8c, 0x1bc98, 0x1bcb0, 0x1bcbe, - 0x1bcce, 0x1bce2, 0x1bce4, 0x1bce8, 0x1bd06, 0x1bd0c, 0x1bd18, - 0x1bd30, 0x1bd3e, 0x1bd60, 0x1bd7c, 0x1bd9c, 0x1bdc2, 0x1bdc4, - 0x1bdc8, 0x1bdd0, 0x1bde6, 0x1bdfa, 0x1be12, 0x1be14, 0x1be22, - 0x1be24, 0x1be28, 0x1be42, 0x1be44, 0x1be48, 0x1be50, 0x1be5e, - 0x1be66, 0x1be82, 0x1be84, 0x1be88, 0x1be90, 0x1be9e, 0x1bea0, - 0x1bebc, 0x1becc, 0x1bef4, 0x1bf1a, 0x1bf2e, 0x1bf32, 0x1bf34, - 0x1bf4e, 0x1bf5c, 0x1bf62, 0x1bf64, 0x1bf68, 0x1c09a, 0x1c0b2, - 0x1c0b4, 0x1c11a, 0x1c132, 0x1c134, 0x1c162, 0x1c164, 0x1c168, - 0x1c176, 0x1c1ba, 0x1c21a, 0x1c232, 0x1c234, 0x1c24e, 0x1c25c, - 0x1c262, 0x1c264, 0x1c268, 0x1c276, 0x1c28e, 0x1c2c2, 0x1c2c4, - 0x1c2c8, 0x1c2d0, 0x1c2de, 0x1c2e6, 0x1c2ec, 0x1c2fa, 0x1c316, - 0x1c326, 0x1c33a, 0x1c346, 0x1c34c, 0x1c372, 0x1c374, 0x1c41a, - 0x1c42e, 0x1c432, 0x1c434, 0x1c44e, 0x1c45c, 0x1c462, 0x1c464, - 0x1c468, 0x1c476, 0x1c48e, 0x1c49c, 0x1c4b8, 0x1c4c2, 0x1c4c8, - 0x1c4d0, 0x1c4de, 0x1c4e6, 0x1c4ec, 0x1c4fa, 0x1c51c, 0x1c538, - 0x1c570, 0x1c57e, 0x1c582, 0x1c584, 0x1c588, 0x1c590, 0x1c59e, - 0x1c5a0, 0x1c5bc, 0x1c5c6, 0x1c5cc, 0x1c5d8, 0x1c5ee, 0x1c5f2, - 0x1c5f4, 0x1c616, 0x1c626, 0x1c62c, 0x1c63a, 0x1c646, 0x1c64c, - 0x1c658, 0x1c66e, 0x1c672, 0x1c674, 0x1c686, 0x1c68c, 0x1c698, - 0x1c6b0, 0x1c6be, 0x1c6ce, 0x1c6dc, 0x1c6e2, 0x1c6e4, 0x1c6e8, - 0x1c712, 0x1c714, 0x1c722, 0x1c728, 0x1c736, 0x1c742, 0x1c744, - 0x1c748, 0x1c750, 0x1c75e, 0x1c766, 0x1c76c, 0x1c77a, 0x1c7ae, - 0x1c7d6, 0x1c7ea, 0x1c81a, 0x1c82e, 0x1c832, 0x1c834, 0x1c84e, - 0x1c85c, 0x1c862, 0x1c864, 0x1c868, 0x1c876, 0x1c88e, 0x1c89c, - 0x1c8b8, 0x1c8c2, 0x1c8c8, 0x1c8d0, 0x1c8de, 0x1c8e6, 0x1c8ec, - 0x1c8fa, 0x1c90e, 0x1c938, 0x1c970, 0x1c97e, 0x1c982, 0x1c984, - 0x1c990, 0x1c99e, 0x1c9a0, 0x1c9bc, 0x1c9c6, 0x1c9cc, 0x1c9d8, - 0x1c9ee, 0x1c9f2, 0x1c9f4, 0x1ca38, 0x1ca70, 0x1ca7e, 0x1cae0, - 0x1cafc, 0x1cb02, 0x1cb04, 0x1cb08, 0x1cb10, 0x1cb20, 0x1cb3c, - 0x1cb40, 0x1cb78, 0x1cb86, 0x1cb8c, 0x1cb98, 0x1cbb0, 0x1cbbe, - 0x1cbce, 0x1cbdc, 0x1cbe2, 0x1cbe4, 0x1cbe8, 0x1cbf6, 0x1cc16, - 0x1cc26, 0x1cc2c, 0x1cc3a, 0x1cc46, 0x1cc58, 0x1cc72, 0x1cc74, - 0x1cc86, 0x1ccb0, 0x1ccbe, 0x1ccce, 0x1cce2, 0x1cce4, 0x1cce8, - 0x1cd06, 0x1cd0c, 0x1cd18, 0x1cd30, 0x1cd3e, 0x1cd60, 0x1cd7c, - 0x1cd9c, 0x1cdc2, 0x1cdc4, 0x1cdc8, 0x1cdd0, 0x1cdde, 0x1cde6, - 0x1cdfa, 0x1ce22, 0x1ce28, 0x1ce42, 0x1ce50, 0x1ce5e, 0x1ce66, - 0x1ce7a, 0x1ce82, 0x1ce84, 0x1ce88, 0x1ce90, 0x1ce9e, 0x1cea0, - 0x1cebc, 0x1cecc, 0x1cef2, 0x1cef4, 0x1cf2e, 0x1cf32, 0x1cf34, - 0x1cf4e, 0x1cf5c, 0x1cf62, 0x1cf64, 0x1cf68, 0x1cf96, 0x1cfa6, - 0x1cfac, 0x1cfca, 0x1cfd2, 0x1cfd4, 0x1d02e, 0x1d032, 0x1d034, - 0x1d04e, 0x1d05c, 0x1d062, 0x1d064, 0x1d068, 0x1d076, 0x1d08e, - 0x1d09c, 0x1d0b8, 0x1d0c2, 0x1d0c4, 0x1d0c8, 0x1d0d0, 0x1d0de, - 0x1d0e6, 0x1d0ec, 0x1d0fa, 0x1d11c, 0x1d138, 0x1d170, 0x1d17e, - 0x1d182, 0x1d184, 0x1d188, 0x1d190, 0x1d19e, 0x1d1a0, 0x1d1bc, - 0x1d1c6, 0x1d1cc, 0x1d1d8, 0x1d1ee, 0x1d1f2, 0x1d1f4, 0x1d21c, - 0x1d238, 0x1d270, 0x1d27e, 0x1d2e0, 0x1d2fc, 0x1d302, 0x1d304, - 0x1d308, 0x1d310, 0x1d31e, 0x1d320, 0x1d33c, 0x1d340, 0x1d378, - 0x1d386, 0x1d38c, 0x1d398, 0x1d3b0, 0x1d3be, 0x1d3ce, 0x1d3dc, - 0x1d3e2, 0x1d3e4, 0x1d3e8, 0x1d3f6, 0x1d470, 0x1d47e, 0x1d4e0, - 0x1d4fc, 0x1d5c0, 0x1d5f8, 0x1d604, 0x1d608, 0x1d610, 0x1d620, - 0x1d640, 0x1d678, 0x1d6f0, 0x1d706, 0x1d70c, 0x1d718, 0x1d730, - 0x1d73e, 0x1d760, 0x1d77c, 0x1d78e, 0x1d79c, 0x1d7b8, 0x1d7c2, - 0x1d7c4, 0x1d7c8, 0x1d7d0, 0x1d7de, 0x1d7e6, 0x1d7ec, 0x1d826, - 0x1d82c, 0x1d83a, 0x1d846, 0x1d84c, 0x1d858, 0x1d872, 0x1d874, - 0x1d886, 0x1d88c, 0x1d898, 0x1d8b0, 0x1d8be, 0x1d8ce, 0x1d8e2, - 0x1d8e4, 0x1d8e8, 0x1d8f6, 0x1d90c, 0x1d918, 0x1d930, 0x1d93e, - 0x1d960, 0x1d97c, 0x1d99c, 0x1d9c2, 0x1d9c4, 0x1d9c8, 0x1d9d0, - 0x1d9e6, 0x1d9fa, 0x1da0c, 0x1da18, 0x1da30, 0x1da3e, 0x1da60, - 0x1da7c, 0x1dac0, 0x1daf8, 0x1db38, 0x1db82, 0x1db84, 0x1db88, - 0x1db90, 0x1db9e, 0x1dba0, 0x1dbcc, 0x1dbf2, 0x1dbf4, 0x1dc22, - 0x1dc42, 0x1dc44, 0x1dc48, 0x1dc50, 0x1dc5e, 0x1dc66, 0x1dc7a, - 0x1dc82, 0x1dc84, 0x1dc88, 0x1dc90, 0x1dc9e, 0x1dca0, 0x1dcbc, - 0x1dccc, 0x1dcf2, 0x1dcf4, 0x1dd04, 0x1dd08, 0x1dd10, 0x1dd1e, - 0x1dd20, 0x1dd3c, 0x1dd40, 0x1dd78, 0x1dd86, 0x1dd98, 0x1ddce, - 0x1dde2, 0x1dde4, 0x1dde8, 0x1de2e, 0x1de32, 0x1de34, 0x1de4e, - 0x1de5c, 0x1de62, 0x1de64, 0x1de68, 0x1de8e, 0x1de9c, 0x1deb8, - 0x1dec2, 0x1dec4, 0x1dec8, 0x1ded0, 0x1dee6, 0x1defa, 0x1df16, - 0x1df26, 0x1df2c, 0x1df46, 0x1df4c, 0x1df58, 0x1df72, 0x1df74, - 0x1df8a, 0x1df92, 0x1df94, 0x1dfa2, 0x1dfa4, 0x1dfa8, 0x1e08a, - 0x1e092, 0x1e094, 0x1e0a2, 0x1e0a4, 0x1e0a8, 0x1e0b6, 0x1e0da, - 0x1e10a, 0x1e112, 0x1e114, 0x1e122, 0x1e124, 0x1e128, 0x1e136, - 0x1e142, 0x1e144, 0x1e148, 0x1e150, 0x1e166, 0x1e16c, 0x1e17a, - 0x1e19a, 0x1e1b2, 0x1e1b4, 0x1e20a, 0x1e212, 0x1e214, 0x1e222, - 0x1e224, 0x1e228, 0x1e236, 0x1e242, 0x1e248, 0x1e250, 0x1e25e, - 0x1e266, 0x1e26c, 0x1e27a, 0x1e282, 0x1e284, 0x1e288, 0x1e290, - 0x1e2a0, 0x1e2bc, 0x1e2c6, 0x1e2cc, 0x1e2d8, 0x1e2ee, 0x1e2f2, - 0x1e2f4, 0x1e31a, 0x1e332, 0x1e334, 0x1e35c, 0x1e362, 0x1e364, - 0x1e368, 0x1e3ba, 0x1e40a, 0x1e412, 0x1e414, 0x1e422, 0x1e428, - 0x1e436, 0x1e442, 0x1e448, 0x1e450, 0x1e45e, 0x1e466, 0x1e46c, - 0x1e47a, 0x1e482, 0x1e484, 0x1e490, 0x1e49e, 0x1e4a0, 0x1e4bc, - 0x1e4c6, 0x1e4cc, 0x1e4d8, 0x1e4ee, 0x1e4f2, 0x1e4f4, 0x1e502, - 0x1e504, 0x1e508, 0x1e510, 0x1e51e, 0x1e520, 0x1e53c, 0x1e540, - 0x1e578, 0x1e586, 0x1e58c, 0x1e598, 0x1e5b0, 0x1e5be, 0x1e5ce, - 0x1e5dc, 0x1e5e2, 0x1e5e4, 0x1e5e8, 0x1e5f6, 0x1e61a, 0x1e62e, - 0x1e632, 0x1e634, 0x1e64e, 0x1e65c, 0x1e662, 0x1e668, 0x1e68e, - 0x1e69c, 0x1e6b8, 0x1e6c2, 0x1e6c4, 0x1e6c8, 0x1e6d0, 0x1e6e6, - 0x1e6fa, 0x1e716, 0x1e726, 0x1e72c, 0x1e73a, 0x1e746, 0x1e74c, - 0x1e758, 0x1e772, 0x1e774, 0x1e792, 0x1e794, 0x1e7a2, 0x1e7a4, - 0x1e7a8, 0x1e7b6, 0x1e812, 0x1e814, 0x1e822, 0x1e824, 0x1e828, - 0x1e836, 0x1e842, 0x1e844, 0x1e848, 0x1e850, 0x1e85e, 0x1e866, - 0x1e86c, 0x1e87a, 0x1e882, 0x1e884, 0x1e888, 0x1e890, 0x1e89e, - 0x1e8a0, 0x1e8bc, 0x1e8c6, 0x1e8cc, 0x1e8d8, 0x1e8ee, 0x1e8f2, - 0x1e8f4, 0x1e902, 0x1e904, 0x1e908, 0x1e910, 0x1e920, 0x1e93c, - 0x1e940, 0x1e978, 0x1e986, 0x1e98c, 0x1e998, 0x1e9b0, 0x1e9be, - 0x1e9ce, 0x1e9dc, 0x1e9e2, 0x1e9e4, 0x1e9e8, 0x1e9f6, 0x1ea04, - 0x1ea08, 0x1ea10, 0x1ea20, 0x1ea40, 0x1ea78, 0x1eaf0, 0x1eb06, - 0x1eb0c, 0x1eb18, 0x1eb30, 0x1eb3e, 0x1eb60, 0x1eb7c, 0x1eb8e, - 0x1eb9c, 0x1ebb8, 0x1ebc2, 0x1ebc4, 0x1ebc8, 0x1ebd0, 0x1ebde, - 0x1ebe6, 0x1ebec, 0x1ec1a, 0x1ec2e, 0x1ec32, 0x1ec34, 0x1ec4e, - 0x1ec5c, 0x1ec62, 0x1ec64, 0x1ec68, 0x1ec8e, 0x1ec9c, 0x1ecb8, - 0x1ecc2, 0x1ecc4, 0x1ecc8, 0x1ecd0, 0x1ece6, 0x1ecfa, 0x1ed0e, - 0x1ed1c, 0x1ed38, 0x1ed70, 0x1ed7e, 0x1ed82, 0x1ed84, 0x1ed88, - 0x1ed90, 0x1ed9e, 0x1eda0, 0x1edcc, 0x1edf2, 0x1edf4, 0x1ee16, - 0x1ee26, 0x1ee2c, 0x1ee3a, 0x1ee46, 0x1ee4c, 0x1ee58, 0x1ee6e, - 0x1ee72, 0x1ee74, 0x1ee86, 0x1ee8c, 0x1ee98, 0x1eeb0, 0x1eebe, - 0x1eece, 0x1eedc, 0x1eee2, 0x1eee4, 0x1eee8, 0x1ef12, 0x1ef22, - 0x1ef24, 0x1ef28, 0x1ef36, 0x1ef42, 0x1ef44, 0x1ef48, 0x1ef50, - 0x1ef5e, 0x1ef66, 0x1ef6c, 0x1ef7a, 0x1efae, 0x1efb2, 0x1efb4, - 0x1efd6, 0x1f096, 0x1f0a6, 0x1f0ac, 0x1f0ba, 0x1f0ca, 0x1f0d2, - 0x1f0d4, 0x1f116, 0x1f126, 0x1f12c, 0x1f13a, 0x1f146, 0x1f14c, - 0x1f158, 0x1f16e, 0x1f172, 0x1f174, 0x1f18a, 0x1f192, 0x1f194, - 0x1f1a2, 0x1f1a4, 0x1f1a8, 0x1f1da, 0x1f216, 0x1f226, 0x1f22c, - 0x1f23a, 0x1f246, 0x1f258, 0x1f26e, 0x1f272, 0x1f274, 0x1f286, - 0x1f28c, 0x1f298, 0x1f2b0, 0x1f2be, 0x1f2ce, 0x1f2dc, 0x1f2e2, - 0x1f2e4, 0x1f2e8, 0x1f2f6, 0x1f30a, 0x1f312, 0x1f314, 0x1f322, - 0x1f328, 0x1f342, 0x1f344, 0x1f348, 0x1f350, 0x1f35e, 0x1f366, - 0x1f37a, 0x1f39a, 0x1f3ae, 0x1f3b2, 0x1f3b4, 0x1f416, 0x1f426, - 0x1f42c, 0x1f43a, 0x1f446, 0x1f44c, 0x1f458, 0x1f46e, 0x1f472, - 0x1f474, 0x1f486, 0x1f48c, 0x1f498, 0x1f4b0, 0x1f4be, 0x1f4ce, - 0x1f4dc, 0x1f4e2, 0x1f4e4, 0x1f4e8, 0x1f4f6, 0x1f506, 0x1f50c, - 0x1f518, 0x1f530, 0x1f53e, 0x1f560, 0x1f57c, 0x1f58e, 0x1f59c, - 0x1f5b8, 0x1f5c2, 0x1f5c4, 0x1f5c8, 0x1f5d0, 0x1f5de, 0x1f5e6, - 0x1f5ec, 0x1f5fa, 0x1f60a, 0x1f612, 0x1f614, 0x1f622, 0x1f624, - 0x1f628, 0x1f636, 0x1f642, 0x1f644, 0x1f648, 0x1f650, 0x1f65e, - 0x1f666, 0x1f67a, 0x1f682, 0x1f684, 0x1f688, 0x1f690, 0x1f69e, - 0x1f6a0, 0x1f6bc, 0x1f6cc, 0x1f6f2, 0x1f6f4, 0x1f71a, 0x1f72e, - 0x1f732, 0x1f734, 0x1f74e, 0x1f75c, 0x1f762, 0x1f764, 0x1f768, - 0x1f776, 0x1f796, 0x1f7a6, 0x1f7ac, 0x1f7ba, 0x1f7d2, 0x1f7d4, - 0x1f89a, 0x1f8ae, 0x1f8b2, 0x1f8b4, 0x1f8d6, 0x1f8ea, 0x1f91a, - 0x1f92e, 0x1f932, 0x1f934, 0x1f94e, 0x1f95c, 0x1f962, 0x1f964, - 0x1f968, 0x1f976, 0x1f996, 0x1f9a6, 0x1f9ac, 0x1f9ba, 0x1f9ca, - 0x1f9d2, 0x1f9d4, 0x1fa1a, 0x1fa2e, 0x1fa32, 0x1fa34, 0x1fa4e, - 0x1fa5c, 0x1fa62, 0x1fa64, 0x1fa68, 0x1fa76, 0x1fa8e, 0x1fa9c, - 0x1fab8, 0x1fac2, 0x1fac4, 0x1fac8, 0x1fad0, 0x1fade, 0x1fae6, - 0x1faec, 0x1fb16, 0x1fb26, 0x1fb2c, 0x1fb3a, 0x1fb46, 0x1fb4c, - 0x1fb58, 0x1fb6e, 0x1fb72, 0x1fb74, 0x1fb8a, 0x1fb92, 0x1fb94, - 0x1fba2, 0x1fba4, 0x1fba8, 0x1fbb6, 0x1fbda -}; - -const int BitMatrixParser::CODEWORD_TABLE[] = -{ - 2627, 1819, 2622, 2621, 1813, 1812, 2729, 2724, 2723, - 2779, 2774, 2773, 902, 896, 908, 868, 865, 861, - 859, 2511, 873, 871, 1780, 835, 2493, 825, 2491, - 842, 837, 844, 1764, 1762, 811, 810, 809, 2483, - 807, 2482, 806, 2480, 815, 814, 813, 812, 2484, - 817, 816, 1745, 1744, 1742, 1746, 2655, 2637, 2635, - 2626, 2625, 2623, 2628, 1820, 2752, 2739, 2737, 2728, - 2727, 2725, 2730, 2785, 2783, 2778, 2777, 2775, 2780, - 787, 781, 747, 739, 736, 2413, 754, 752, 1719, - 692, 689, 681, 2371, 678, 2369, 700, 697, 694, - 703, 1688, 1686, 642, 638, 2343, 631, 2341, 627, - 2338, 651, 646, 643, 2345, 654, 652, 1652, 1650, - 1647, 1654, 601, 599, 2322, 596, 2321, 594, 2319, - 2317, 611, 610, 608, 606, 2324, 603, 2323, 615, - 614, 612, 1617, 1616, 1614, 1612, 616, 1619, 1618, - 2575, 2538, 2536, 905, 901, 898, 909, 2509, 2507, - 2504, 870, 867, 864, 860, 2512, 875, 872, 1781, - 2490, 2489, 2487, 2485, 1748, 836, 834, 832, 830, - 2494, 827, 2492, 843, 841, 839, 845, 1765, 1763, - 2701, 2676, 2674, 2653, 2648, 2656, 2634, 2633, 2631, - 2629, 1821, 2638, 2636, 2770, 2763, 2761, 2750, 2745, - 2753, 2736, 2735, 2733, 2731, 1848, 2740, 2738, 2786, - 2784, 591, 588, 576, 569, 566, 2296, 1590, 537, - 534, 526, 2276, 522, 2274, 545, 542, 539, 548, - 1572, 1570, 481, 2245, 466, 2242, 462, 2239, 492, - 485, 482, 2249, 496, 494, 1534, 1531, 1528, 1538, - 413, 2196, 406, 2191, 2188, 425, 419, 2202, 415, - 2199, 432, 430, 427, 1472, 1467, 1464, 433, 1476, - 1474, 368, 367, 2160, 365, 2159, 362, 2157, 2155, - 2152, 378, 377, 375, 2166, 372, 2165, 369, 2162, - 383, 381, 379, 2168, 1419, 1418, 1416, 1414, 385, - 1411, 384, 1423, 1422, 1420, 1424, 2461, 802, 2441, - 2439, 790, 786, 783, 794, 2409, 2406, 2403, 750, - 742, 738, 2414, 756, 753, 1720, 2367, 2365, 2362, - 2359, 1663, 693, 691, 684, 2373, 680, 2370, 702, - 699, 696, 704, 1690, 1687, 2337, 2336, 2334, 2332, - 1624, 2329, 1622, 640, 637, 2344, 634, 2342, 630, - 2340, 650, 648, 645, 2346, 655, 653, 1653, 1651, - 1649, 1655, 2612, 2597, 2595, 2571, 2568, 2565, 2576, - 2534, 2529, 2526, 1787, 2540, 2537, 907, 904, 900, - 910, 2503, 2502, 2500, 2498, 1768, 2495, 1767, 2510, - 2508, 2506, 869, 866, 863, 2513, 876, 874, 1782, - 2720, 2713, 2711, 2697, 2694, 2691, 2702, 2672, 2670, - 2664, 1828, 2678, 2675, 2647, 2646, 2644, 2642, 1823, - 2639, 1822, 2654, 2652, 2650, 2657, 2771, 1855, 2765, - 2762, 1850, 1849, 2751, 2749, 2747, 2754, 353, 2148, - 344, 342, 336, 2142, 332, 2140, 345, 1375, 1373, - 306, 2130, 299, 2128, 295, 2125, 319, 314, 311, - 2132, 1354, 1352, 1349, 1356, 262, 257, 2101, 253, - 2096, 2093, 274, 273, 267, 2107, 263, 2104, 280, - 278, 275, 1316, 1311, 1308, 1320, 1318, 2052, 202, - 2050, 2044, 2040, 219, 2063, 212, 2060, 208, 2055, - 224, 221, 2066, 1260, 1258, 1252, 231, 1248, 229, - 1266, 1264, 1261, 1268, 155, 1998, 153, 1996, 1994, - 1991, 1988, 165, 164, 2007, 162, 2006, 159, 2003, - 2000, 172, 171, 169, 2012, 166, 2010, 1186, 1184, - 1182, 1179, 175, 1176, 173, 1192, 1191, 1189, 1187, - 176, 1194, 1193, 2313, 2307, 2305, 592, 589, 2294, - 2292, 2289, 578, 572, 568, 2297, 580, 1591, 2272, - 2267, 2264, 1547, 538, 536, 529, 2278, 525, 2275, - 547, 544, 541, 1574, 1571, 2237, 2235, 2229, 1493, - 2225, 1489, 478, 2247, 470, 2244, 465, 2241, 493, - 488, 484, 2250, 498, 495, 1536, 1533, 1530, 1539, - 2187, 2186, 2184, 2182, 1432, 2179, 1430, 2176, 1427, - 414, 412, 2197, 409, 2195, 405, 2193, 2190, 426, - 424, 421, 2203, 418, 2201, 431, 429, 1473, 1471, - 1469, 1466, 434, 1477, 1475, 2478, 2472, 2470, 2459, - 2457, 2454, 2462, 803, 2437, 2432, 2429, 1726, 2443, - 2440, 792, 789, 785, 2401, 2399, 2393, 1702, 2389, - 1699, 2411, 2408, 2405, 745, 741, 2415, 758, 755, - 1721, 2358, 2357, 2355, 2353, 1661, 2350, 1660, 2347, - 1657, 2368, 2366, 2364, 2361, 1666, 690, 687, 2374, - 683, 2372, 701, 698, 705, 1691, 1689, 2619, 2617, - 2610, 2608, 2605, 2613, 2593, 2588, 2585, 1803, 2599, - 2596, 2563, 2561, 2555, 1797, 2551, 1795, 2573, 2570, - 2567, 2577, 2525, 2524, 2522, 2520, 1786, 2517, 1785, - 2514, 1783, 2535, 2533, 2531, 2528, 1788, 2541, 2539, - 906, 903, 911, 2721, 1844, 2715, 2712, 1838, 1836, - 2699, 2696, 2693, 2703, 1827, 1826, 1824, 2673, 2671, - 2669, 2666, 1829, 2679, 2677, 1858, 1857, 2772, 1854, - 1853, 1851, 1856, 2766, 2764, 143, 1987, 139, 1986, - 135, 133, 131, 1984, 128, 1983, 125, 1981, 138, - 137, 136, 1985, 1133, 1132, 1130, 112, 110, 1974, - 107, 1973, 104, 1971, 1969, 122, 121, 119, 117, - 1977, 114, 1976, 124, 1115, 1114, 1112, 1110, 1117, - 1116, 84, 83, 1953, 81, 1952, 78, 1950, 1948, - 1945, 94, 93, 91, 1959, 88, 1958, 85, 1955, - 99, 97, 95, 1961, 1086, 1085, 1083, 1081, 1078, - 100, 1090, 1089, 1087, 1091, 49, 47, 1917, 44, - 1915, 1913, 1910, 1907, 59, 1926, 56, 1925, 53, - 1922, 1919, 66, 64, 1931, 61, 1929, 1042, 1040, - 1038, 71, 1035, 70, 1032, 68, 1048, 1047, 1045, - 1043, 1050, 1049, 12, 10, 1869, 1867, 1864, 1861, - 21, 1880, 19, 1877, 1874, 1871, 28, 1888, 25, - 1886, 22, 1883, 982, 980, 977, 974, 32, 30, - 991, 989, 987, 984, 34, 995, 994, 992, 2151, - 2150, 2147, 2146, 2144, 356, 355, 354, 2149, 2139, - 2138, 2136, 2134, 1359, 343, 341, 338, 2143, 335, - 2141, 348, 347, 346, 1376, 1374, 2124, 2123, 2121, - 2119, 1326, 2116, 1324, 310, 308, 305, 2131, 302, - 2129, 298, 2127, 320, 318, 316, 313, 2133, 322, - 321, 1355, 1353, 1351, 1357, 2092, 2091, 2089, 2087, - 1276, 2084, 1274, 2081, 1271, 259, 2102, 256, 2100, - 252, 2098, 2095, 272, 269, 2108, 266, 2106, 281, - 279, 277, 1317, 1315, 1313, 1310, 282, 1321, 1319, - 2039, 2037, 2035, 2032, 1203, 2029, 1200, 1197, 207, - 2053, 205, 2051, 201, 2049, 2046, 2043, 220, 218, - 2064, 215, 2062, 211, 2059, 228, 226, 223, 2069, - 1259, 1257, 1254, 232, 1251, 230, 1267, 1265, 1263, - 2316, 2315, 2312, 2311, 2309, 2314, 2304, 2303, 2301, - 2299, 1593, 2308, 2306, 590, 2288, 2287, 2285, 2283, - 1578, 2280, 1577, 2295, 2293, 2291, 579, 577, 574, - 571, 2298, 582, 581, 1592, 2263, 2262, 2260, 2258, - 1545, 2255, 1544, 2252, 1541, 2273, 2271, 2269, 2266, - 1550, 535, 532, 2279, 528, 2277, 546, 543, 549, - 1575, 1573, 2224, 2222, 2220, 1486, 2217, 1485, 2214, - 1482, 1479, 2238, 2236, 2234, 2231, 1496, 2228, 1492, - 480, 477, 2248, 473, 2246, 469, 2243, 490, 487, - 2251, 497, 1537, 1535, 1532, 2477, 2476, 2474, 2479, - 2469, 2468, 2466, 2464, 1730, 2473, 2471, 2453, 2452, - 2450, 2448, 1729, 2445, 1728, 2460, 2458, 2456, 2463, - 805, 804, 2428, 2427, 2425, 2423, 1725, 2420, 1724, - 2417, 1722, 2438, 2436, 2434, 2431, 1727, 2444, 2442, - 793, 791, 788, 795, 2388, 2386, 2384, 1697, 2381, - 1696, 2378, 1694, 1692, 2402, 2400, 2398, 2395, 1703, - 2392, 1701, 2412, 2410, 2407, 751, 748, 744, 2416, - 759, 757, 1807, 2620, 2618, 1806, 1805, 2611, 2609, - 2607, 2614, 1802, 1801, 1799, 2594, 2592, 2590, 2587, - 1804, 2600, 2598, 1794, 1793, 1791, 1789, 2564, 2562, - 2560, 2557, 1798, 2554, 1796, 2574, 2572, 2569, 2578, - 1847, 1846, 2722, 1843, 1842, 1840, 1845, 2716, 2714, - 1835, 1834, 1832, 1830, 1839, 1837, 2700, 2698, 2695, - 2704, 1817, 1811, 1810, 897, 862, 1777, 829, 826, - 838, 1760, 1758, 808, 2481, 1741, 1740, 1738, 1743, - 2624, 1818, 2726, 2776, 782, 740, 737, 1715, 686, - 679, 695, 1682, 1680, 639, 628, 2339, 647, 644, - 1645, 1643, 1640, 1648, 602, 600, 597, 595, 2320, - 593, 2318, 609, 607, 604, 1611, 1610, 1608, 1606, - 613, 1615, 1613, 2328, 926, 924, 892, 886, 899, - 857, 850, 2505, 1778, 824, 823, 821, 819, 2488, - 818, 2486, 833, 831, 828, 840, 1761, 1759, 2649, - 2632, 2630, 2746, 2734, 2732, 2782, 2781, 570, 567, - 1587, 531, 527, 523, 540, 1566, 1564, 476, 467, - 463, 2240, 486, 483, 1524, 1521, 1518, 1529, 411, - 403, 2192, 399, 2189, 423, 416, 1462, 1457, 1454, - 428, 1468, 1465, 2210, 366, 363, 2158, 360, 2156, - 357, 2153, 376, 373, 370, 2163, 1410, 1409, 1407, - 1405, 382, 1402, 380, 1417, 1415, 1412, 1421, 2175, - 2174, 777, 774, 771, 784, 732, 725, 722, 2404, - 743, 1716, 676, 674, 668, 2363, 665, 2360, 685, - 1684, 1681, 626, 624, 622, 2335, 620, 2333, 617, - 2330, 641, 635, 649, 1646, 1644, 1642, 2566, 928, - 925, 2530, 2527, 894, 891, 888, 2501, 2499, 2496, - 858, 856, 854, 851, 1779, 2692, 2668, 2665, 2645, - 2643, 2640, 2651, 2768, 2759, 2757, 2744, 2743, 2741, - 2748, 352, 1382, 340, 337, 333, 1371, 1369, 307, - 300, 296, 2126, 315, 312, 1347, 1342, 1350, 261, - 258, 250, 2097, 246, 2094, 271, 268, 264, 1306, - 1301, 1298, 276, 1312, 1309, 2115, 203, 2048, 195, - 2045, 191, 2041, 213, 209, 2056, 1246, 1244, 1238, - 225, 1234, 222, 1256, 1253, 1249, 1262, 2080, 2079, - 154, 1997, 150, 1995, 147, 1992, 1989, 163, 160, - 2004, 156, 2001, 1175, 1174, 1172, 1170, 1167, 170, - 1164, 167, 1185, 1183, 1180, 1177, 174, 1190, 1188, - 2025, 2024, 2022, 587, 586, 564, 559, 556, 2290, - 573, 1588, 520, 518, 512, 2268, 508, 2265, 530, - 1568, 1565, 461, 457, 2233, 450, 2230, 446, 2226, - 479, 471, 489, 1526, 1523, 1520, 397, 395, 2185, - 392, 2183, 389, 2180, 2177, 410, 2194, 402, 422, - 1463, 1461, 1459, 1456, 1470, 2455, 799, 2433, 2430, - 779, 776, 773, 2397, 2394, 2390, 734, 728, 724, - 746, 1717, 2356, 2354, 2351, 2348, 1658, 677, 675, - 673, 670, 667, 688, 1685, 1683, 2606, 2589, 2586, - 2559, 2556, 2552, 927, 2523, 2521, 2518, 2515, 1784, - 2532, 895, 893, 890, 2718, 2709, 2707, 2689, 2687, - 2684, 2663, 2662, 2660, 2658, 1825, 2667, 2769, 1852, - 2760, 2758, 142, 141, 1139, 1138, 134, 132, 129, - 126, 1982, 1129, 1128, 1126, 1131, 113, 111, 108, - 105, 1972, 101, 1970, 120, 118, 115, 1109, 1108, - 1106, 1104, 123, 1113, 1111, 82, 79, 1951, 75, - 1949, 72, 1946, 92, 89, 86, 1956, 1077, 1076, - 1074, 1072, 98, 1069, 96, 1084, 1082, 1079, 1088, - 1968, 1967, 48, 45, 1916, 42, 1914, 39, 1911, - 1908, 60, 57, 54, 1923, 50, 1920, 1031, 1030, - 1028, 1026, 67, 1023, 65, 1020, 62, 1041, 1039, - 1036, 1033, 69, 1046, 1044, 1944, 1943, 1941, 11, - 9, 1868, 7, 1865, 1862, 1859, 20, 1878, 16, - 1875, 13, 1872, 970, 968, 966, 963, 29, 960, - 26, 23, 983, 981, 978, 975, 33, 971, 31, - 990, 988, 985, 1906, 1904, 1902, 993, 351, 2145, - 1383, 331, 330, 328, 326, 2137, 323, 2135, 339, - 1372, 1370, 294, 293, 291, 289, 2122, 286, 2120, - 283, 2117, 309, 303, 317, 1348, 1346, 1344, 245, - 244, 242, 2090, 239, 2088, 236, 2085, 2082, 260, - 2099, 249, 270, 1307, 1305, 1303, 1300, 1314, 189, - 2038, 186, 2036, 183, 2033, 2030, 2026, 206, 198, - 2047, 194, 216, 1247, 1245, 1243, 1240, 227, 1237, - 1255, 2310, 2302, 2300, 2286, 2284, 2281, 565, 563, - 561, 558, 575, 1589, 2261, 2259, 2256, 2253, 1542, - 521, 519, 517, 514, 2270, 511, 533, 1569, 1567, - 2223, 2221, 2218, 2215, 1483, 2211, 1480, 459, 456, - 453, 2232, 449, 474, 491, 1527, 1525, 1522, 2475, - 2467, 2465, 2451, 2449, 2446, 801, 800, 2426, 2424, - 2421, 2418, 1723, 2435, 780, 778, 775, 2387, 2385, - 2382, 2379, 1695, 2375, 1693, 2396, 735, 733, 730, - 727, 749, 1718, 2616, 2615, 2604, 2603, 2601, 2584, - 2583, 2581, 2579, 1800, 2591, 2550, 2549, 2547, 2545, - 1792, 2542, 1790, 2558, 929, 2719, 1841, 2710, 2708, - 1833, 1831, 2690, 2688, 2686, 1815, 1809, 1808, 1774, - 1756, 1754, 1737, 1736, 1734, 1739, 1816, 1711, 1676, - 1674, 633, 629, 1638, 1636, 1633, 1641, 598, 1605, - 1604, 1602, 1600, 605, 1609, 1607, 2327, 887, 853, - 1775, 822, 820, 1757, 1755, 1584, 524, 1560, 1558, - 468, 464, 1514, 1511, 1508, 1519, 408, 404, 400, - 1452, 1447, 1444, 417, 1458, 1455, 2208, 364, 361, - 358, 2154, 1401, 1400, 1398, 1396, 374, 1393, 371, - 1408, 1406, 1403, 1413, 2173, 2172, 772, 726, 723, - 1712, 672, 669, 666, 682, 1678, 1675, 625, 623, - 621, 618, 2331, 636, 632, 1639, 1637, 1635, 920, - 918, 884, 880, 889, 849, 848, 847, 846, 2497, - 855, 852, 1776, 2641, 2742, 2787, 1380, 334, 1367, - 1365, 301, 297, 1340, 1338, 1335, 1343, 255, 251, - 247, 1296, 1291, 1288, 265, 1302, 1299, 2113, 204, - 196, 192, 2042, 1232, 1230, 1224, 214, 1220, 210, - 1242, 1239, 1235, 1250, 2077, 2075, 151, 148, 1993, - 144, 1990, 1163, 1162, 1160, 1158, 1155, 161, 1152, - 157, 1173, 1171, 1168, 1165, 168, 1181, 1178, 2021, - 2020, 2018, 2023, 585, 560, 557, 1585, 516, 509, - 1562, 1559, 458, 447, 2227, 472, 1516, 1513, 1510, - 398, 396, 393, 390, 2181, 386, 2178, 407, 1453, - 1451, 1449, 1446, 420, 1460, 2209, 769, 764, 720, - 712, 2391, 729, 1713, 664, 663, 661, 659, 2352, - 656, 2349, 671, 1679, 1677, 2553, 922, 919, 2519, - 2516, 885, 883, 881, 2685, 2661, 2659, 2767, 2756, - 2755, 140, 1137, 1136, 130, 127, 1125, 1124, 1122, - 1127, 109, 106, 102, 1103, 1102, 1100, 1098, 116, - 1107, 1105, 1980, 80, 76, 73, 1947, 1068, 1067, - 1065, 1063, 90, 1060, 87, 1075, 1073, 1070, 1080, - 1966, 1965, 46, 43, 40, 1912, 36, 1909, 1019, - 1018, 1016, 1014, 58, 1011, 55, 1008, 51, 1029, - 1027, 1024, 1021, 63, 1037, 1034, 1940, 1939, 1937, - 1942, 8, 1866, 4, 1863, 1, 1860, 956, 954, - 952, 949, 946, 17, 14, 969, 967, 964, 961, - 27, 957, 24, 979, 976, 972, 1901, 1900, 1898, - 1896, 986, 1905, 1903, 350, 349, 1381, 329, 327, - 324, 1368, 1366, 292, 290, 287, 284, 2118, 304, - 1341, 1339, 1337, 1345, 243, 240, 237, 2086, 233, - 2083, 254, 1297, 1295, 1293, 1290, 1304, 2114, 190, - 187, 184, 2034, 180, 2031, 177, 2027, 199, 1233, - 1231, 1229, 1226, 217, 1223, 1241, 2078, 2076, 584, - 555, 554, 552, 550, 2282, 562, 1586, 507, 506, - 504, 502, 2257, 499, 2254, 515, 1563, 1561, 445, - 443, 441, 2219, 438, 2216, 435, 2212, 460, 454, - 475, 1517, 1515, 1512, 2447, 798, 797, 2422, 2419, - 770, 768, 766, 2383, 2380, 2376, 721, 719, 717, - 714, 731, 1714, 2602, 2582, 2580, 2548, 2546, 2543, - 923, 921, 2717, 2706, 2705, 2683, 2682, 2680, 1771, - 1752, 1750, 1733, 1732, 1731, 1735, 1814, 1707, 1670, - 1668, 1631, 1629, 1626, 1634, 1599, 1598, 1596, 1594, - 1603, 1601, 2326, 1772, 1753, 1751, 1581, 1554, 1552, - 1504, 1501, 1498, 1509, 1442, 1437, 1434, 401, 1448, - 1445, 2206, 1392, 1391, 1389, 1387, 1384, 359, 1399, - 1397, 1394, 1404, 2171, 2170, 1708, 1672, 1669, 619, - 1632, 1630, 1628, 1773, 1378, 1363, 1361, 1333, 1328, - 1336, 1286, 1281, 1278, 248, 1292, 1289, 2111, 1218, - 1216, 1210, 197, 1206, 193, 1228, 1225, 1221, 1236, - 2073, 2071, 1151, 1150, 1148, 1146, 152, 1143, 149, - 1140, 145, 1161, 1159, 1156, 1153, 158, 1169, 1166, - 2017, 2016, 2014, 2019, 1582, 510, 1556, 1553, 452, - 448, 1506, 1500, 394, 391, 387, 1443, 1441, 1439, - 1436, 1450, 2207, 765, 716, 713, 1709, 662, 660, - 657, 1673, 1671, 916, 914, 879, 878, 877, 882, - 1135, 1134, 1121, 1120, 1118, 1123, 1097, 1096, 1094, - 1092, 103, 1101, 1099, 1979, 1059, 1058, 1056, 1054, - 77, 1051, 74, 1066, 1064, 1061, 1071, 1964, 1963, - 1007, 1006, 1004, 1002, 999, 41, 996, 37, 1017, - 1015, 1012, 1009, 52, 1025, 1022, 1936, 1935, 1933, - 1938, 942, 940, 938, 935, 932, 5, 2, 955, - 953, 950, 947, 18, 943, 15, 965, 962, 958, - 1895, 1894, 1892, 1890, 973, 1899, 1897, 1379, 325, - 1364, 1362, 288, 285, 1334, 1332, 1330, 241, 238, - 234, 1287, 1285, 1283, 1280, 1294, 2112, 188, 185, - 181, 178, 2028, 1219, 1217, 1215, 1212, 200, 1209, - 1227, 2074, 2072, 583, 553, 551, 1583, 505, 503, - 500, 513, 1557, 1555, 444, 442, 439, 436, 2213, - 455, 451, 1507, 1505, 1502, 796, 763, 762, 760, - 767, 711, 710, 708, 706, 2377, 718, 715, 1710, - 2544, 917, 915, 2681, 1627, 1597, 1595, 2325, 1769, - 1749, 1747, 1499, 1438, 1435, 2204, 1390, 1388, 1385, - 1395, 2169, 2167, 1704, 1665, 1662, 1625, 1623, 1620, - 1770, 1329, 1282, 1279, 2109, 1214, 1207, 1222, 2068, - 2065, 1149, 1147, 1144, 1141, 146, 1157, 1154, 2013, - 2011, 2008, 2015, 1579, 1549, 1546, 1495, 1487, 1433, - 1431, 1428, 1425, 388, 1440, 2205, 1705, 658, 1667, - 1664, 1119, 1095, 1093, 1978, 1057, 1055, 1052, 1062, - 1962, 1960, 1005, 1003, 1000, 997, 38, 1013, 1010, - 1932, 1930, 1927, 1934, 941, 939, 936, 933, 6, - 930, 3, 951, 948, 944, 1889, 1887, 1884, 1881, - 959, 1893, 1891, 35, 1377, 1360, 1358, 1327, 1325, - 1322, 1331, 1277, 1275, 1272, 1269, 235, 1284, 2110, - 1205, 1204, 1201, 1198, 182, 1195, 179, 1213, 2070, - 2067, 1580, 501, 1551, 1548, 440, 437, 1497, 1494, - 1490, 1503, 761, 709, 707, 1706, 913, 912, 2198, - 1386, 2164, 2161, 1621, 1766, 2103, 1208, 2058, 2054, - 1145, 1142, 2005, 2002, 1999, 2009, 1488, 1429, 1426, - 2200, 1698, 1659, 1656, 1975, 1053, 1957, 1954, 1001, - 998, 1924, 1921, 1918, 1928, 937, 934, 931, 1879, - 1876, 1873, 1870, 945, 1885, 1882, 1323, 1273, 1270, - 2105, 1202, 1199, 1196, 1211, 2061, 2057, 1576, 1543, - 1540, 1484, 1481, 1478, 1491, 1700 -}; - -const int BitMatrixParser::SYMBOL_TABLE_LENGTH = - sizeof(BitMatrixParser::SYMBOL_TABLE) / sizeof(int); diff --git a/src/qzxing/zxing/zxing/pdf417/decoder/PDF417DecodedBitStreamParser.cpp b/src/qzxing/zxing/zxing/pdf417/decoder/PDF417DecodedBitStreamParser.cpp deleted file mode 100644 index 699537c..0000000 --- a/src/qzxing/zxing/zxing/pdf417/decoder/PDF417DecodedBitStreamParser.cpp +++ /dev/null @@ -1,563 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2010, 2012 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include - -using std::string; -using zxing::pdf417::DecodedBitStreamParser; -using zxing::ArrayRef; -using zxing::Ref; -using zxing::DecoderResult; -using zxing::String; - -const int DecodedBitStreamParser::TEXT_COMPACTION_MODE_LATCH = 900; -const int DecodedBitStreamParser::BYTE_COMPACTION_MODE_LATCH = 901; -const int DecodedBitStreamParser::NUMERIC_COMPACTION_MODE_LATCH = 902; -const int DecodedBitStreamParser::BYTE_COMPACTION_MODE_LATCH_6 = 924; -const int DecodedBitStreamParser::BEGIN_MACRO_PDF417_CONTROL_BLOCK = 928; -const int DecodedBitStreamParser::BEGIN_MACRO_PDF417_OPTIONAL_FIELD = 923; -const int DecodedBitStreamParser::MACRO_PDF417_TERMINATOR = 922; -const int DecodedBitStreamParser::MODE_SHIFT_TO_BYTE_COMPACTION_MODE = 913; -const int DecodedBitStreamParser::MAX_NUMERIC_CODEWORDS = 15; - -const int DecodedBitStreamParser::PL = 25; -const int DecodedBitStreamParser::LL = 27; -const int DecodedBitStreamParser::AS = 27; -const int DecodedBitStreamParser::ML = 28; -const int DecodedBitStreamParser::AL = 28; -const int DecodedBitStreamParser::PS = 29; -const int DecodedBitStreamParser::PAL = 29; - -const int DecodedBitStreamParser::EXP900_SIZE = 16; - -const char DecodedBitStreamParser::PUNCT_CHARS[] = { - ';', '<', '>', '@', '[', '\\', '}', '_', '`', '~', '!', - '\r', '\t', ',', ':', '\n', '-', '.', '$', '/', '"', '|', '*', - '(', ')', '?', '{', '}', '\''}; - -const char DecodedBitStreamParser::MIXED_CHARS[] = { - '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '&', - '\r', '\t', ',', ':', '#', '-', '.', '$', '/', '+', '%', '*', - '=', '^'}; - -ArrayRef DecodedBitStreamParser::initEXP900() { - ArrayRef EXP900 (16); - EXP900[0] = BigInteger(1); - BigInteger nineHundred (900); - EXP900[1] = nineHundred; - for (int i = 2; i < EXP900->size(); i++) { - EXP900[i] = EXP900[i - 1] * nineHundred; - } - return EXP900; -} - -ArrayRef DecodedBitStreamParser::EXP900 = initEXP900(); - -DecodedBitStreamParser::DecodedBitStreamParser(){} - -/** - * PDF417 main decoder. - **/ -Ref DecodedBitStreamParser::decode(ArrayRef codewords) -{ - Ref result (new String(100)); - // Get compaction mode - int codeIndex = 1; - int code = codewords[codeIndex++]; - while (codeIndex < codewords[0]) { - switch (code) { - case TEXT_COMPACTION_MODE_LATCH: - codeIndex = textCompaction(codewords, codeIndex, result); - break; - case BYTE_COMPACTION_MODE_LATCH: - codeIndex = byteCompaction(code, codewords, codeIndex, result); - break; - case NUMERIC_COMPACTION_MODE_LATCH: - codeIndex = numericCompaction(codewords, codeIndex, result); - break; - case MODE_SHIFT_TO_BYTE_COMPACTION_MODE: - codeIndex = byteCompaction(code, codewords, codeIndex, result); - break; - case BYTE_COMPACTION_MODE_LATCH_6: - codeIndex = byteCompaction(code, codewords, codeIndex, result); - break; - default: - // Default to text compaction. During testing numerous barcodes - // appeared to be missing the starting mode. In these cases defaulting - // to text compaction seems to work. - codeIndex--; - codeIndex = textCompaction(codewords, codeIndex, result); - break; - } - if (codeIndex < codewords->size()) { - code = codewords[codeIndex++]; - } else { - throw FormatException(); - } - } - return Ref(new DecoderResult(ArrayRef(), result)); -} - -/** - * Text Compaction mode (see 5.4.1.5) permits all printable ASCII characters to be - * encoded, i.e. values 32 - 126 inclusive in accordance with ISO/IEC 646 (IRV), as - * well as selected control characters. - * - * @param codewords The array of codewords (data + error) - * @param codeIndex The current index into the codeword array. - * @param result The decoded data is appended to the result. - * @return The next index into the codeword array. - */ -int DecodedBitStreamParser::textCompaction(ArrayRef codewords, - int codeIndex, - Ref result) { - // 2 character per codeword - ArrayRef textCompactionData (codewords[0] << 1); - // Used to hold the byte compaction value if there is a mode shift - ArrayRef byteCompactionData (codewords[0] << 1); - - int index = 0; - bool end = false; - while ((codeIndex < codewords[0]) && !end) { - int code = codewords[codeIndex++]; - if (code < TEXT_COMPACTION_MODE_LATCH) { - textCompactionData[index] = code / 30; - textCompactionData[index + 1] = code % 30; - index += 2; - } else { - switch (code) { - case TEXT_COMPACTION_MODE_LATCH: - textCompactionData[index++] = TEXT_COMPACTION_MODE_LATCH; - break; - case BYTE_COMPACTION_MODE_LATCH: - codeIndex--; - end = true; - break; - case NUMERIC_COMPACTION_MODE_LATCH: - codeIndex--; - end = true; - break; - case MODE_SHIFT_TO_BYTE_COMPACTION_MODE: - // The Mode Shift codeword 913 shall cause a temporary - // switch from Text Compaction mode to Byte Compaction mode. - // This switch shall be in effect for only the next codeword, - // after which the mode shall revert to the prevailing sub-mode - // of the Text Compaction mode. Codeword 913 is only available - // in Text Compaction mode; its use is described in 5.4.2.4. - textCompactionData[index] = MODE_SHIFT_TO_BYTE_COMPACTION_MODE; - code = codewords[codeIndex++]; - byteCompactionData[index] = code; //Integer.toHexString(code); - index++; - break; - case BYTE_COMPACTION_MODE_LATCH_6: - codeIndex--; - end = true; - break; - } - } - } - decodeTextCompaction(textCompactionData, byteCompactionData, index, result); - return codeIndex; -} - -/** - * The Text Compaction mode includes all the printable ASCII characters - * (i.e. values from 32 to 126) and three ASCII control characters: HT or tab - * (ASCII value 9), LF or line feed (ASCII value 10), and CR or carriage - * return (ASCII value 13). The Text Compaction mode also includes various latch - * and shift characters which are used exclusively within the mode. The Text - * Compaction mode encodes up to 2 characters per codeword. The compaction rules - * for converting data into PDF417 codewords are defined in 5.4.2.2. The sub-mode - * switches are defined in 5.4.2.3. - * - * @param textCompactionData The text compaction data. - * @param byteCompactionData The byte compaction data if there - * was a mode shift. - * @param length The size of the text compaction and byte compaction data. - * @param result The decoded data is appended to the result. - */ -void DecodedBitStreamParser::decodeTextCompaction(ArrayRef textCompactionData, - ArrayRef byteCompactionData, - int length, - Ref result) -{ - // Beginning from an initial state of the Alpha sub-mode - // The default compaction mode for PDF417 in effect at the start of each symbol shall always be Text - // Compaction mode Alpha sub-mode (uppercase alphabetic). A latch codeword from another mode to the Text - // Compaction mode shall always switch to the Text Compaction Alpha sub-mode. - Mode subMode = ALPHA; - Mode priorToShiftMode = ALPHA; - int i = 0; - while (i < length) { - int subModeCh = textCompactionData[i]; - char ch = 0; - switch (subMode) { - case ALPHA: - // Alpha (uppercase alphabetic) - if (subModeCh < 26) { - // Upper case Alpha Character - ch = (char) ('A' + subModeCh); - } else { - if (subModeCh == 26) { - ch = ' '; - } else if (subModeCh == LL) { - subMode = LOWER; - } else if (subModeCh == ML) { - subMode = MIXED; - } else if (subModeCh == PS) { - // Shift to punctuation - priorToShiftMode = subMode; - subMode = PUNCT_SHIFT; - } else if (subModeCh == MODE_SHIFT_TO_BYTE_COMPACTION_MODE) { - result->append((char) byteCompactionData[i]); - } else if (subModeCh == TEXT_COMPACTION_MODE_LATCH) { - subMode = ALPHA; - } - } - break; - - case LOWER: - // Lower (lowercase alphabetic) - if (subModeCh < 26) { - ch = (char) ('a' + subModeCh); - } else { - if (subModeCh == 26) { - ch = ' '; - } else if (subModeCh == AS) { - // Shift to alpha - priorToShiftMode = subMode; - subMode = ALPHA_SHIFT; - } else if (subModeCh == ML) { - subMode = MIXED; - } else if (subModeCh == PS) { - // Shift to punctuation - priorToShiftMode = subMode; - subMode = PUNCT_SHIFT; - } else if (subModeCh == MODE_SHIFT_TO_BYTE_COMPACTION_MODE) { - result->append((char) byteCompactionData[i]); - } else if (subModeCh == TEXT_COMPACTION_MODE_LATCH) { - subMode = ALPHA; - } - } - break; - - case MIXED: - // Mixed (numeric and some punctuation) - if (subModeCh < PL) { - ch = MIXED_CHARS[subModeCh]; - } else { - if (subModeCh == PL) { - subMode = PUNCT; - } else if (subModeCh == 26) { - ch = ' '; - } else if (subModeCh == LL) { - subMode = LOWER; - } else if (subModeCh == AL) { - subMode = ALPHA; - } else if (subModeCh == PS) { - // Shift to punctuation - priorToShiftMode = subMode; - subMode = PUNCT_SHIFT; - } else if (subModeCh == MODE_SHIFT_TO_BYTE_COMPACTION_MODE) { - result->append((char) byteCompactionData[i]); - } else if (subModeCh == TEXT_COMPACTION_MODE_LATCH) { - subMode = ALPHA; - } - } - break; - - case PUNCT: - // Punctuation - if (subModeCh < PAL) { - ch = PUNCT_CHARS[subModeCh]; - } else { - if (subModeCh == PAL) { - subMode = ALPHA; - } else if (subModeCh == MODE_SHIFT_TO_BYTE_COMPACTION_MODE) { - result->append((char) byteCompactionData[i]); - } else if (subModeCh == TEXT_COMPACTION_MODE_LATCH) { - subMode = ALPHA; - } - } - break; - - case ALPHA_SHIFT: - // Restore sub-mode - subMode = priorToShiftMode; - if (subModeCh < 26) { - ch = (char) ('A' + subModeCh); - } else { - if (subModeCh == 26) { - ch = ' '; - } else { - if (subModeCh == 26) { - ch = ' '; - } else if (subModeCh == TEXT_COMPACTION_MODE_LATCH) { - subMode = ALPHA; - } - } - } - break; - - case PUNCT_SHIFT: - // Restore sub-mode - subMode = priorToShiftMode; - if (subModeCh < PAL) { - ch = PUNCT_CHARS[subModeCh]; - } else { - if (subModeCh == PAL) { - subMode = ALPHA; - // 2012-11-27 added from recent java code: - } else if (subModeCh == MODE_SHIFT_TO_BYTE_COMPACTION_MODE) { - // PS before Shift-to-Byte is used as a padding character, - // see 5.4.2.4 of the specification - result->append((char) byteCompactionData[i]); - } else if (subModeCh == TEXT_COMPACTION_MODE_LATCH) { - subMode = ALPHA; - } - } - break; - } - if (ch != 0) { - // Append decoded character to result - result->append(ch); - } - i++; - } -} - -/** - * Byte Compaction mode (see 5.4.3) permits all 256 possible 8-bit byte values to be encoded. - * This includes all ASCII characters value 0 to 127 inclusive and provides for international - * character set support. - * - * @param mode The byte compaction mode i.e. 901 or 924 - * @param codewords The array of codewords (data + error) - * @param codeIndex The current index into the codeword array. - * @param result The decoded data is appended to the result. - * @return The next index into the codeword array. - */ -int DecodedBitStreamParser::byteCompaction(int mode, - ArrayRef codewords, - int codeIndex, Ref result) { - if (mode == BYTE_COMPACTION_MODE_LATCH) { - // Total number of Byte Compaction characters to be encoded - // is not a multiple of 6 - int count = 0; - int64_t value = 0; - ArrayRef decodedData = new Array(6); - ArrayRef byteCompactedCodewords = new Array(6); - bool end = false; - int nextCode = codewords[codeIndex++]; - while ((codeIndex < codewords[0]) && !end) { - byteCompactedCodewords[count++] = nextCode; - // Base 900 - value = 900 * value + nextCode; - nextCode = codewords[codeIndex++]; - // perhaps it should be ok to check only nextCode >= TEXT_COMPACTION_MODE_LATCH - if (nextCode == TEXT_COMPACTION_MODE_LATCH || - nextCode == BYTE_COMPACTION_MODE_LATCH || - nextCode == NUMERIC_COMPACTION_MODE_LATCH || - nextCode == BYTE_COMPACTION_MODE_LATCH_6 || - nextCode == BEGIN_MACRO_PDF417_CONTROL_BLOCK || - nextCode == BEGIN_MACRO_PDF417_OPTIONAL_FIELD || - nextCode == MACRO_PDF417_TERMINATOR) - { - end = true; - } - else - { - if ((count%5 == 0) && (count > 0)) - { - // Decode every 5 codewords - // Convert to Base 256 - for (int j = 0; j < 6; ++j) - { - decodedData[5 - j] = (char) (value%256); - value >>= 8; - } - result->append(string(&(decodedData->values()[0]), decodedData->values().size())); - count = 0; - } - } - } - - // if the end of all codewords is reached the last codeword needs to be added - if (codeIndex == codewords[0] && nextCode < TEXT_COMPACTION_MODE_LATCH) - byteCompactedCodewords[count++] = nextCode; - - // If Byte Compaction mode is invoked with codeword 901, - // the last group of codewords is interpreted directly - // as one byte per codeword, without compaction. - for (int i = 0; i < count; i++) - { - result->append((char)byteCompactedCodewords[i]); - } - - } else if (mode == BYTE_COMPACTION_MODE_LATCH_6) { - // Total number of Byte Compaction characters to be encoded - // is an integer multiple of 6 - int count = 0; - int64_t value = 0; - bool end = false; - while (codeIndex < codewords[0] && !end) { - int code = codewords[codeIndex++]; - if (code < TEXT_COMPACTION_MODE_LATCH) { - count++; - // Base 900 - value = 900 * value + code; - } else { - if (code == TEXT_COMPACTION_MODE_LATCH || - code == BYTE_COMPACTION_MODE_LATCH || - code == NUMERIC_COMPACTION_MODE_LATCH || - code == BYTE_COMPACTION_MODE_LATCH_6 || - code == BEGIN_MACRO_PDF417_CONTROL_BLOCK || - code == BEGIN_MACRO_PDF417_OPTIONAL_FIELD || - code == MACRO_PDF417_TERMINATOR) { - codeIndex--; - end = true; - } - } - if ((count % 5 == 0) && (count > 0)) { - // Decode every 5 codewords - // Convert to Base 256 - ArrayRef decodedData = new Array(6); - for (int j = 0; j < 6; ++j) { - decodedData[5 - j] = (char) (value & 0xFF); - value >>= 8; - } - result->append(string(&decodedData[0],6)); - // 2012-11-27 hfn after recent java code/fix by srowen - count = 0; - } - } - } - return codeIndex; -} - -/** - * Numeric Compaction mode (see 5.4.4) permits efficient encoding of numeric data strings. - * - * @param codewords The array of codewords (data + error) - * @param codeIndex The current index into the codeword array. - * @param result The decoded data is appended to the result. - * @return The next index into the codeword array. - */ -int DecodedBitStreamParser::numericCompaction(ArrayRef codewords, - int codeIndex, - Ref result) { - int count = 0; - bool end = false; - - ArrayRef numericCodewords = new Array(MAX_NUMERIC_CODEWORDS); - - while (codeIndex < codewords[0] && !end) { - int code = codewords[codeIndex++]; - if (codeIndex == codewords[0]) { - end = true; - } - if (code < TEXT_COMPACTION_MODE_LATCH) { - numericCodewords[count] = code; - count++; - } else { - if (code == TEXT_COMPACTION_MODE_LATCH || - code == BYTE_COMPACTION_MODE_LATCH || - code == BYTE_COMPACTION_MODE_LATCH_6 || - code == BEGIN_MACRO_PDF417_CONTROL_BLOCK || - code == BEGIN_MACRO_PDF417_OPTIONAL_FIELD || - code == MACRO_PDF417_TERMINATOR) { - codeIndex--; - end = true; - } - } - if (count % MAX_NUMERIC_CODEWORDS == 0 || - code == NUMERIC_COMPACTION_MODE_LATCH || - end) { - // Re-invoking Numeric Compaction mode (by using codeword 902 - // while in Numeric Compaction mode) serves to terminate the - // current Numeric Compaction mode grouping as described in 5.4.4.2, - // and then to start a new one grouping. - Ref s = decodeBase900toBase10(numericCodewords, count); - result->append(s->getText()); - count = 0; - } - } - return codeIndex; -} - -/** - * Convert a list of Numeric Compacted codewords from Base 900 to Base 10. - * - * @param codewords The array of codewords - * @param count The number of codewords - * @return The decoded string representing the Numeric data. - */ -/* - EXAMPLE - Encode the fifteen digit numeric string 000213298174000 - Prefix the numeric string with a 1 and set the initial value of - t = 1 000 213 298 174 000 - Calculate codeword 0 - d0 = 1 000 213 298 174 000 mod 900 = 200 - - t = 1 000 213 298 174 000 div 900 = 1 111 348 109 082 - Calculate codeword 1 - d1 = 1 111 348 109 082 mod 900 = 282 - - t = 1 111 348 109 082 div 900 = 1 234 831 232 - Calculate codeword 2 - d2 = 1 234 831 232 mod 900 = 632 - - t = 1 234 831 232 div 900 = 1 372 034 - Calculate codeword 3 - d3 = 1 372 034 mod 900 = 434 - - t = 1 372 034 div 900 = 1 524 - Calculate codeword 4 - d4 = 1 524 mod 900 = 624 - - t = 1 524 div 900 = 1 - Calculate codeword 5 - d5 = 1 mod 900 = 1 - t = 1 div 900 = 0 - Codeword sequence is: 1, 624, 434, 632, 282, 200 - - Decode the above codewords involves - 1 x 900 power of 5 + 624 x 900 power of 4 + 434 x 900 power of 3 + - 632 x 900 power of 2 + 282 x 900 power of 1 + 200 x 900 power of 0 = 1000213298174000 - - Remove leading 1 => Result is 000213298174000 -*/ -Ref DecodedBitStreamParser::decodeBase900toBase10(ArrayRef codewords, int count) -{ - BigInteger result = BigInteger(0); - for (int i = 0; i < count; i++) { - result = result + (EXP900[count - i - 1] * BigInteger(codewords[i])); - } - string resultString = bigIntegerToString(result); - if (resultString[0] != '1') { - throw FormatException("DecodedBitStreamParser::decodeBase900toBase10: String does not begin with 1"); - } - string resultString2; - resultString2.assign(resultString.begin()+1,resultString.end()); - Ref res (new String(resultString2)); - return res; -} diff --git a/src/qzxing/zxing/zxing/pdf417/decoder/PDF417Decoder.cpp b/src/qzxing/zxing/zxing/pdf417/decoder/PDF417Decoder.cpp deleted file mode 100644 index 65509d0..0000000 --- a/src/qzxing/zxing/zxing/pdf417/decoder/PDF417Decoder.cpp +++ /dev/null @@ -1,118 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2010, 2012 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * 2012-06-27 hfn: PDF417 Reed-Solomon error correction, using following Java - * source code: - * http://code.google.com/p/zxing/issues/attachmentText?id=817&aid=8170033000&name=pdf417-java-reed-solomon-error-correction-2.patch&token=0819f5d7446ae2814fd91385eeec6a11 - */ - -#include -#include -#include -#include -#include -#include - -using zxing::pdf417::decoder::Decoder; -using zxing::pdf417::decoder::ec::ErrorCorrection; -using zxing::Ref; -using zxing::DecoderResult; - -// VC++ - -using zxing::BitMatrix; -using zxing::DecodeHints; -using zxing::ArrayRef; - -const int Decoder::MAX_ERRORS = 3; -const int Decoder::MAX_EC_CODEWORDS = 512; - -Ref Decoder::decode(Ref bits, DecodeHints const& hints) { - (void)hints; - // Construct a parser to read the data codewords and error-correction level - BitMatrixParser parser(bits); - ArrayRef codewords(parser.readCodewords()); - if (codewords->size() == 0) { - throw FormatException("PDF:Decoder:decode: cannot read codewords"); - } - - int ecLevel = parser.getECLevel(); - int numECCodewords = 1 << (ecLevel + 1); - ArrayRef erasures = parser.getErasures(); - - correctErrors(codewords, erasures, numECCodewords); - verifyCodewordCount(codewords, numECCodewords); - - // Decode the codewords - return DecodedBitStreamParser::decode(codewords); -} - -/** - * Verify that all is OK with the codeword array. - * - * @param codewords - * @return an index to the first data codeword. - * @throws FormatException - */ -void Decoder::verifyCodewordCount(ArrayRef codewords, int numECCodewords) { - int cwsize = codewords->size(); - if (cwsize < 4) { - // Codeword array size should be at least 4 allowing for - // Count CW, At least one Data CW, Error Correction CW, Error Correction CW - throw FormatException("PDF:Decoder:verifyCodewordCount: codeword array too small!"); - } - // The first codeword, the Symbol Length Descriptor, shall always encode the total number of data - // codewords in the symbol, including the Symbol Length Descriptor itself, data codewords and pad - // codewords, but excluding the number of error correction codewords. - int numberOfCodewords = codewords[0]; - if (numberOfCodewords > cwsize) { - throw FormatException("PDF:Decoder:verifyCodewordCount: bad codeword number descriptor!"); - } - if (numberOfCodewords == 0) { - // Reset to the length of the array - 8 (Allow for at least level 3 Error Correction (8 Error Codewords) - if (numECCodewords < cwsize) { - codewords[0] = cwsize - numECCodewords; - } else { - throw FormatException("PDF:Decoder:verifyCodewordCount: bad error correction cw number!"); - } - } -} - -/** - * Correct errors whenever it is possible using Reed-Solomom algorithm - * - * @param codewords, erasures, numECCodewords - * @return 0. - * @throws FormatException - */ -void Decoder::correctErrors(ArrayRef codewords, - ArrayRef erasures, int numECCodewords) { - if (erasures->size() > numECCodewords / 2 + MAX_ERRORS || - numECCodewords < 0 || numECCodewords > MAX_EC_CODEWORDS) { - throw FormatException("PDF:Decoder:correctErrors: Too many errors or EC Codewords corrupted"); - } - - Ref errorCorrection(new ErrorCorrection); - errorCorrection->decode(codewords, numECCodewords, erasures); - - // 2012-06-27 HFN if, despite of error correction, there are still codewords with invalid - // value, throw an exception here: - for (int i = 0; i < codewords->size(); i++) { - if (codewords[i]<0) { - throw FormatException("PDF:Decoder:correctErrors: Error correction did not succeed!"); - } - } -} diff --git a/src/qzxing/zxing/zxing/pdf417/decoder/ec/ErrorCorrection.cpp b/src/qzxing/zxing/zxing/pdf417/decoder/ec/ErrorCorrection.cpp deleted file mode 100644 index ab5ceeb..0000000 --- a/src/qzxing/zxing/zxing/pdf417/decoder/ec/ErrorCorrection.cpp +++ /dev/null @@ -1,214 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2012 ZXing authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * 2012-09-19 HFN translation from Java into C++ - */ - -#include -#include -#include - -using std::vector; -using zxing::Ref; -using zxing::ArrayRef; -using zxing::pdf417::decoder::ec::ErrorCorrection; -using zxing::pdf417::decoder::ec::ModulusPoly; -using zxing::pdf417::decoder::ec::ModulusGF; - -/** - *

PDF417 error correction implementation.

- * - *

This example - * is quite useful in understanding the algorithm.

- * - * @author Sean Owen - * @see com.google.zxing.common.reedsolomon.ReedSolomonDecoder - */ - - -ErrorCorrection::ErrorCorrection() - : field_(ModulusGF::PDF417_GF) -{ -} - -void ErrorCorrection::decode(ArrayRef received, - int numECCodewords, - ArrayRef erasures) -{ - Ref poly (new ModulusPoly(field_, received)); - ArrayRef S( new Array(numECCodewords)); - bool error = false; - for (int i = numECCodewords; i > 0; i--) { - int eval = poly->evaluateAt(field_.exp(i)); - S[numECCodewords - i] = eval; - if (eval != 0) { - error = true; - } - } - - if (error) { - - Ref knownErrors = field_.getOne(); - for (int i=0;isize();i++) { - int b = field_.exp(received->size() - 1 - erasures[i]); - // Add (1 - bx) term: - ArrayRef one_minus_b_x(new Array(2)); - one_minus_b_x[1]=field_.subtract(0,b); - one_minus_b_x[0]=1; - Ref term (new ModulusPoly(field_,one_minus_b_x)); - knownErrors = knownErrors->multiply(term); - } - - Ref syndrome (new ModulusPoly(field_, S)); - //syndrome = syndrome.multiply(knownErrors); - - vector > sigmaOmega ( - runEuclideanAlgorithm(field_.buildMonomial(numECCodewords, 1), syndrome, numECCodewords)); - Ref sigma = sigmaOmega[0]; - Ref omega = sigmaOmega[1]; - - //sigma = sigma.multiply(knownErrors); - - ArrayRef errorLocations = findErrorLocations(sigma); - ArrayRef errorMagnitudes = findErrorMagnitudes(omega, sigma, errorLocations); - - for (int i = 0; i < errorLocations->size(); i++) { - int position = received->size() - 1 - field_.log(errorLocations[i]); - if (position < 0) { - throw ReedSolomonException("Bad error location!"); - } - received[position] = field_.subtract(received[position], errorMagnitudes[i]); -#if (defined (DEBUG) && defined _WIN32) - { - WCHAR szmsg[256]; - swprintf(szmsg,L"ErrorCorrection::decode: fix @ %d, new value = %d\n", - position, received[position]); - OutputDebugString(szmsg); - } -#endif - } - } -} - -vector > ErrorCorrection::runEuclideanAlgorithm(Ref a, Ref b, int R) -{ - // Assume a's degree is >= b's - if (a->getDegree() < b->getDegree()) { - Ref temp = a; - a = b; - b = temp; - } - - Ref rLast ( a); - Ref r ( b); - Ref tLast ( field_.getZero()); - Ref t ( field_.getOne()); - - // Run Euclidean algorithm until r's degree is less than R/2 - while (r->getDegree() >= R / 2) { - Ref rLastLast (rLast); - Ref tLastLast (tLast); - rLast = r; - tLast = t; - - // Divide rLastLast by rLast, with quotient in q and remainder in r - if (rLast->isZero()) { - // Oops, Euclidean algorithm already terminated? - throw ReedSolomonException("Euclidean algorithm already terminated?"); - } - r = rLastLast; - Ref q (field_.getZero()); - int denominatorLeadingTerm = rLast->getCoefficient(rLast->getDegree()); - int dltInverse = field_.inverse(denominatorLeadingTerm); - while (r->getDegree() >= rLast->getDegree() && !r->isZero()) { - int degreeDiff = r->getDegree() - rLast->getDegree(); - int scale = field_.multiply(r->getCoefficient(r->getDegree()), dltInverse); - q = q->add(field_.buildMonomial(degreeDiff, scale)); - r = r->subtract(rLast->multiplyByMonomial(degreeDiff, scale)); - } - - t = q->multiply(tLast)->subtract(tLastLast)->negative(); - } - - int sigmaTildeAtZero = t->getCoefficient(0); - if (sigmaTildeAtZero == 0) { - throw ReedSolomonException("sigmaTilde = 0!"); - } - - int inverse = field_.inverse(sigmaTildeAtZero); - Ref sigma (t->multiply(inverse)); - Ref omega (r->multiply(inverse)); - vector > v(2); - v[0] = sigma; - v[1] = omega; - return v; -} - -ArrayRef ErrorCorrection::findErrorLocations(Ref errorLocator) { - // This is a direct application of Chien's search - int numErrors = errorLocator->getDegree(); - ArrayRef result( new Array(numErrors)); - int e = 0; - for (int i = 1; i < field_.getSize() && e < numErrors; i++) { - if (errorLocator->evaluateAt(i) == 0) { - result[e] = field_.inverse(i); - e++; - } - } - if (e != numErrors) { -#if (defined (DEBUG) && defined _WIN32) - char sz[128]; - sprintf(sz,"Error number inconsistency, %d/%d!",e,numErrors); - throw ReedSolomonException(sz); -#else - throw ReedSolomonException("Error number inconsistency!"); -#endif - } -#if (defined (DEBUG) && defined _WIN32) - { - WCHAR szmsg[256]; - swprintf(szmsg,L"ErrorCorrection::findErrorLocations: found %d errors.\n", - e); - OutputDebugString(szmsg); - } -#endif - return result; -} - -ArrayRef ErrorCorrection::findErrorMagnitudes(Ref errorEvaluator, - Ref errorLocator, - ArrayRef errorLocations) { - int i; - int errorLocatorDegree = errorLocator->getDegree(); - ArrayRef formalDerivativeCoefficients (new Array(errorLocatorDegree)); - for (i = 1; i <= errorLocatorDegree; i++) { - formalDerivativeCoefficients[errorLocatorDegree - i] = - field_.multiply(i, errorLocator->getCoefficient(i)); - } - Ref formalDerivative (new ModulusPoly(field_, formalDerivativeCoefficients)); - - // This is directly applying Forney's Formula - int s = errorLocations->size(); - ArrayRef result ( new Array(s)); - for (i = 0; i < s; i++) { - int xiInverse = field_.inverse(errorLocations[i]); - int numerator = field_.subtract(0, errorEvaluator->evaluateAt(xiInverse)); - int denominator = field_.inverse(formalDerivative->evaluateAt(xiInverse)); - result[i] = field_.multiply(numerator, denominator); - } - return result; -} - diff --git a/src/qzxing/zxing/zxing/pdf417/decoder/ec/ErrorCorrection.h b/src/qzxing/zxing/zxing/pdf417/decoder/ec/ErrorCorrection.h deleted file mode 100644 index fee365c..0000000 --- a/src/qzxing/zxing/zxing/pdf417/decoder/ec/ErrorCorrection.h +++ /dev/null @@ -1,71 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- - -#ifndef __ERROR_CORRECTION_PDF_H__ -#define __ERROR_CORRECTION_PDF_H__ -/* - * Copyright 2012 ZXing authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * 2012-09-17 HFN translation from Java into C++ - */ - -#include -#include -#include -#include -#include -#include -#include - -namespace zxing { -namespace pdf417 { -namespace decoder { -namespace ec { - - -/** - *

PDF417 error correction implementation.

- * - *

This example - * is quite useful in understanding the algorithm.

- * - * @author Sean Owen - * @see com.google.zxing.common.reedsolomon.ReedSolomonDecoder - */ -class ErrorCorrection: public Counted { - - private: - ModulusGF &field_; - - public: - ErrorCorrection(); - void decode(ArrayRef received, - int numECCodewords, - ArrayRef erasures); - - private: - std::vector > runEuclideanAlgorithm(Ref a, Ref b, int R); - - ArrayRef findErrorLocations(Ref errorLocator); - ArrayRef findErrorMagnitudes(Ref errorEvaluator, - Ref errorLocator, - ArrayRef errorLocations); -}; - -} -} -} -} - -#endif /* __ERROR_CORRECTION_PDF_H__ */ diff --git a/src/qzxing/zxing/zxing/pdf417/decoder/ec/ModulusGF.cpp b/src/qzxing/zxing/zxing/pdf417/decoder/ec/ModulusGF.cpp deleted file mode 100644 index 5cb159e..0000000 --- a/src/qzxing/zxing/zxing/pdf417/decoder/ec/ModulusGF.cpp +++ /dev/null @@ -1,120 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2012 ZXing authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * 2012-09-19 HFN translation from Java into C++ - */ - -#include -#include - -using zxing::Ref; -using zxing::pdf417::decoder::ec::ModulusGF; -using zxing::pdf417::decoder::ec::ModulusPoly; - -/** - * The central Modulus Galois Field for PDF417 with prime number 929 - * and generator 3. - */ -ModulusGF ModulusGF::PDF417_GF(929,3); - - -/** - *

A field based on powers of a generator integer, modulo some modulus.

- * - * @author Sean Owen - * @see com.google.zxing.common.reedsolomon.GenericGF - */ - -ModulusGF::ModulusGF(int modulus, int generator) - : modulus_(modulus) { - expTable_ = new Array(modulus_); - logTable_ = new Array(modulus_); - int x = 1,i; - for (i = 0; i < modulus_; i++) { - expTable_[i] = x; - x = (x * generator) % modulus_; - } - for (i = 0; i < modulus_-1; i++) { - logTable_[expTable_[i]] = i; - } - // logTable[0] == 0 but this should never be used - ArrayRefaZero(new Array(1)),aOne(new Array(1)); - aZero[0]=0;aOne[0]=1; - zero_ = new ModulusPoly(*this, aZero); - one_ = new ModulusPoly(*this, aOne); -} - -Ref ModulusGF::getZero() { - return zero_; -} - -Ref ModulusGF::getOne() { - return one_; -} - -Ref ModulusGF::buildMonomial(int degree, int coefficient) -{ - if (degree < 0) { - throw IllegalArgumentException("monomial: degree < 0!"); - } - if (coefficient == 0) { - return zero_; - } - int nCoefficients = degree + 1; - ArrayRef coefficients (new Array(nCoefficients)); - coefficients[0] = coefficient; - Ref result(new ModulusPoly(*this,coefficients)); - return result; -} - - - -int ModulusGF::add(int a, int b) { - return (a + b) % modulus_; -} - -int ModulusGF::subtract(int a, int b) { - return (modulus_ + a - b) % modulus_; -} - -int ModulusGF::exp(int a) { - return expTable_[a]; -} - -int ModulusGF::log(int a) { - if (a == 0) { - throw IllegalArgumentException("log of zero!"); - } - return logTable_[a]; -} - -int ModulusGF::inverse(int a) { - if (a == 0) { - throw IllegalArgumentException("inverse of zero!");; - } - return expTable_[modulus_ - logTable_[a] - 1]; -} - -int ModulusGF::multiply(int a, int b) { - if (a == 0 || b == 0) { - return 0; - } - return expTable_[(logTable_[a] + logTable_[b]) % (modulus_ - 1)]; -} - -int ModulusGF::getSize() { - return modulus_; -} diff --git a/src/qzxing/zxing/zxing/pdf417/decoder/ec/ModulusGF.h b/src/qzxing/zxing/zxing/pdf417/decoder/ec/ModulusGF.h deleted file mode 100644 index 2022694..0000000 --- a/src/qzxing/zxing/zxing/pdf417/decoder/ec/ModulusGF.h +++ /dev/null @@ -1,72 +0,0 @@ -#ifndef __MODULUS_GF_PDF_H__ -#define __MODULUS_GF_PDF_H__ -/* - * Copyright 2012 ZXing authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * 2012-09-17 HFN translation from Java into C++ - */ - -#include -#include -#include -#include - -namespace zxing { -namespace pdf417 { -namespace decoder { -namespace ec { - -class ModulusPoly; - -/** - *

A field based on powers of a generator integer, modulo some modulus.

- * - * @author Sean Owen - * @see com.google.zxing.common.reedsolomon.GenericGF - */ -class ModulusGF { - - public: - static ModulusGF PDF417_GF; - - private: - ArrayRef expTable_; - ArrayRef logTable_; - Ref zero_; - Ref one_; - int modulus_; - - public: - ModulusGF(int modulus, int generator); - Ref getZero(); - Ref getOne(); - Ref buildMonomial(int degree, int coefficient); - - int add(int a, int b); - int subtract(int a, int b); - int exp(int a); - int log(int a); - int inverse(int a); - int multiply(int a, int b); - int getSize(); - -}; - -} -} -} -} - -#endif /* __MODULUS_GF_PDF_H__ */ diff --git a/src/qzxing/zxing/zxing/pdf417/decoder/ec/ModulusPoly.cpp b/src/qzxing/zxing/zxing/pdf417/decoder/ec/ModulusPoly.cpp deleted file mode 100644 index 208260e..0000000 --- a/src/qzxing/zxing/zxing/pdf417/decoder/ec/ModulusPoly.cpp +++ /dev/null @@ -1,284 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2012 ZXing authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * 2012-09-19 HFN translation from Java into C++ - */ - -#include -#include - -using zxing::Ref; -using zxing::ArrayRef; -using zxing::pdf417::decoder::ec::ModulusGF; -using zxing::pdf417::decoder::ec::ModulusPoly; - -/** - * @author Sean Owen - * @see com.google.zxing.common.reedsolomon.GenericGFPoly - */ - -ModulusPoly::ModulusPoly(ModulusGF& field, ArrayRef coefficients) - : field_(field) -{ - if (coefficients->size() == 0) { - throw IllegalArgumentException("no coefficients!"); - } - int coefficientsLength = coefficients->size(); - if (coefficientsLength > 1 && coefficients[0] == 0) { - // Leading term must be non-zero for anything except the constant polynomial "0" - int firstNonZero = 1; - while (firstNonZero < coefficientsLength && coefficients[firstNonZero] == 0) { - firstNonZero++; - } - if (firstNonZero == coefficientsLength) { - coefficientsLength = field_.getZero()->getCoefficients()->size(); - coefficients_.reset(new Array (coefficientsLength)); - *coefficients_ = *(field_.getZero()->getCoefficients()); - } else { - ArrayRef c(coefficients); - coefficientsLength -= firstNonZero; - coefficients_.reset(new Array (coefficientsLength)); - for (int i = 0; i < coefficientsLength; i++) { - coefficients_[i] = c[i + firstNonZero]; - } - /* - coefficientsLength -= firstNonZero; - coefficients_.reset(new Array(coefficientsLength - firstNonZero)); - for (int i = 0; i < coefficientsLength; i++) { - coefficients_[i] = coefficients[i + firstNonZero]; - } - */ - } - } else { - coefficients_ = coefficients; - } -} - -ArrayRef ModulusPoly::getCoefficients() { - return coefficients_; -} - -/** - * @return degree of this polynomial - */ -int ModulusPoly::getDegree() { - return coefficients_->size() - 1; -} - -/** - * @return true iff this polynomial is the monomial "0" - */ -bool ModulusPoly::isZero() { - return coefficients_[0] == 0; -} - -/** - * @return coefficient of x^degree term in this polynomial - */ -int ModulusPoly::getCoefficient(int degree) { - return coefficients_[coefficients_->size() - 1 - degree]; -} - -/** - * @return evaluation of this polynomial at a given point - */ -int ModulusPoly::evaluateAt(int a) { - int i; - if (a == 0) { - // Just return the x^0 coefficient - return getCoefficient(0); - } - int size = coefficients_->size(); - if (a == 1) { - // Just the sum of the coefficients - int result = 0; - for (i = 0; i < size; i++) { - result = field_.add(result, coefficients_[i]); - } - return result; - } - int result = coefficients_[0]; - for (i = 1; i < size; i++) { - result = field_.add(field_.multiply(a, result), coefficients_[i]); - } - return result; -} - -Ref ModulusPoly::add(Ref other) { - if (&field_ != &other->field_) { - throw IllegalArgumentException("ModulusPolys do not have same ModulusGF field"); - } - if (isZero()) { - return other; - } - if (other->isZero()) { - return Ref(this); - } - - ArrayRef smallerCoefficients = coefficients_; - ArrayRef largerCoefficients = other->coefficients_; - if (smallerCoefficients->size() > largerCoefficients->size()) { - ArrayRef temp(smallerCoefficients); - smallerCoefficients = largerCoefficients; - largerCoefficients = temp; - } - ArrayRef sumDiff (new Array(largerCoefficients->size())); - int lengthDiff = largerCoefficients->size() - smallerCoefficients->size(); - // Copy high-order terms only found in higher-degree polynomial's coefficients - for (int i = 0; i < lengthDiff; i++) { - sumDiff[i] = largerCoefficients[i]; - } - - for (int i = lengthDiff; i < largerCoefficients->size(); i++) { - sumDiff[i] = field_.add(smallerCoefficients[i - lengthDiff], largerCoefficients[i]); - } - - return Ref(new ModulusPoly(field_, sumDiff)); -} - -Ref ModulusPoly::subtract(Ref other) { - if (&field_ != &other->field_) { - throw new IllegalArgumentException("ModulusPolys do not have same ModulusGF field"); - } - if (other->isZero()) { - return Ref(this); - } - return add(other->negative()); -} - -Ref ModulusPoly::multiply(Ref other) { - if (&field_ != &other->field_) { - throw new IllegalArgumentException("ModulusPolys do not have same ModulusGF field"); - } - if (isZero() || other->isZero()) { - return field_.getZero(); - } - int i,j; - ArrayRef aCoefficients = coefficients_; - int aLength = aCoefficients->size(); - ArrayRef bCoefficients = other->coefficients_; - int bLength = bCoefficients->size(); - ArrayRef product (new Array(aLength + bLength - 1)); - for (i = 0; i < aLength; i++) { - int aCoeff = aCoefficients[i]; - for (j = 0; j < bLength; j++) { - product[i + j] = field_.add(product[i + j], field_.multiply(aCoeff, bCoefficients[j])); - } - } - return Ref(new ModulusPoly(field_, product)); -} - -Ref ModulusPoly::negative() { - int size = coefficients_->size(); - ArrayRef negativeCoefficients (new Array(size)); - for (int i = 0; i < size; i++) { - negativeCoefficients[i] = field_.subtract(0, coefficients_[i]); - } - return Ref(new ModulusPoly(field_, negativeCoefficients)); -} - -Ref ModulusPoly::multiply(int scalar) { - if (scalar == 0) { - return field_.getZero(); - } - if (scalar == 1) { - return Ref(this); - } - int size = coefficients_->size(); - ArrayRef product( new Array(size)); - for (int i = 0; i < size; i++) { - product[i] = field_.multiply(coefficients_[i], scalar); - } - return Ref(new ModulusPoly(field_, product)); -} - -Ref ModulusPoly::multiplyByMonomial(int degree, int coefficient) { - if (degree < 0) { - throw new IllegalArgumentException("negative degree!"); - } - if (coefficient == 0) { - return field_.getZero(); - } - int size = coefficients_->size(); - ArrayRef product (new Array(size + degree)); - for (int i = 0; i < size; i++) { - product[i] = field_.multiply(coefficients_[i], coefficient); - } - return Ref(new ModulusPoly(field_, product)); -} - -std::vector > ModulusPoly::divide(Ref other) { - if (&field_ != &other->field_) { - throw new IllegalArgumentException("ModulusPolys do not have same ModulusGF field"); - } - if (other->isZero()) { - throw new IllegalArgumentException("Divide by 0"); - } - - Ref quotient (field_.getZero()); - Ref remainder (this); - - int denominatorLeadingTerm = other->getCoefficient(other->getDegree()); - int inverseDenominatorLeadingTerm = field_.inverse(denominatorLeadingTerm); - - while (remainder->getDegree() >= other->getDegree() && !remainder->isZero()) { - int degreeDifference = remainder->getDegree() - other->getDegree(); - int scale = field_.multiply(remainder->getCoefficient(remainder->getDegree()), inverseDenominatorLeadingTerm); - Ref term (other->multiplyByMonomial(degreeDifference, scale)); - Ref iterationQuotient (field_.buildMonomial(degreeDifference, scale)); - quotient = quotient->add(iterationQuotient); - remainder = remainder->subtract(term); - } - - std::vector > result(2); - result[0] = quotient; - result[1] = remainder; - return result; -} - -#if 0 -@Override -public String toString() { - StringBuilder result = new StringBuilder(8 * getDegree()); - for (int degree = getDegree(); degree >= 0; degree--) { - int coefficient = getCoefficient(degree); - if (coefficient != 0) { - if (coefficient < 0) { - result.append(" - "); - coefficient = -coefficient; - } else { - if (result.length() > 0) { - result.append(" + "); - } - } - if (degree == 0 || coefficient != 1) { - result.append(coefficient); - } - if (degree != 0) { - if (degree == 1) { - result.append('x'); - } else { - result.append("x^"); - result.append(degree); - } - } - } - } - return result.toString(); -} -#endif - -ModulusPoly::~ModulusPoly() {} diff --git a/src/qzxing/zxing/zxing/pdf417/decoder/ec/ModulusPoly.h b/src/qzxing/zxing/zxing/pdf417/decoder/ec/ModulusPoly.h deleted file mode 100644 index 6602cef..0000000 --- a/src/qzxing/zxing/zxing/pdf417/decoder/ec/ModulusPoly.h +++ /dev/null @@ -1,68 +0,0 @@ -#ifndef __MODULUS_GFPOLY_PDF_H__ -#define __MODULUS_GFPOLY_PDF_H__ - -/* - * Copyright 2012 ZXing authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * 2012-09-17 HFN translation from Java into C++ - */ - -#include -#include -#include -#include - -namespace zxing { -namespace pdf417 { -namespace decoder { -namespace ec { - -class ModulusGF; - -/** - * @author Sean Owen - * @see com.google.zxing.common.reedsolomon.GenericGFPoly - */ -class ModulusPoly: public Counted { - - private: - ModulusGF &field_; - ArrayRef coefficients_; - public: - ModulusPoly(ModulusGF& field, ArrayRef coefficients); - ~ModulusPoly(); - ArrayRef getCoefficients(); - int getDegree(); - bool isZero(); - int getCoefficient(int degree); - int evaluateAt(int a); - Ref add(Ref other); - Ref subtract(Ref other); - Ref multiply(Ref other); - Ref negative(); - Ref multiply(int scalar); - Ref multiplyByMonomial(int degree, int coefficient); - std::vector > divide(Ref other); - #if 0 - public String toString(); - #endif -}; - -} -} -} -} - -#endif /* __MODULUS_GFPOLY_PDF_H__ */ diff --git a/src/qzxing/zxing/zxing/pdf417/detector/Detector.h b/src/qzxing/zxing/zxing/pdf417/detector/Detector.h deleted file mode 100644 index 866e8cd..0000000 --- a/src/qzxing/zxing/zxing/pdf417/detector/Detector.h +++ /dev/null @@ -1,106 +0,0 @@ -#ifndef __DETECTOR_H__ -#define __DETECTOR_H__ - -/* - * Detector.h - * zxing - * - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include - -namespace zxing { -namespace pdf417 { -namespace detector { - -class Detector { -private: - static const int INTEGER_MATH_SHIFT = 8; - static const int PATTERN_MATCH_RESULT_SCALE_FACTOR = 1 << INTEGER_MATH_SHIFT; - static const int MAX_AVG_VARIANCE; - static const int MAX_INDIVIDUAL_VARIANCE; - - static const int START_PATTERN[]; - static const int START_PATTERN_LENGTH; - static const int START_PATTERN_REVERSE[]; - static const int START_PATTERN_REVERSE_LENGTH; - static const int STOP_PATTERN[]; - static const int STOP_PATTERN_LENGTH; - static const int STOP_PATTERN_REVERSE[]; - static const int STOP_PATTERN_REVERSE_LENGTH; - - Ref image_; - - static ArrayRef< Ref > findVertices(Ref matrix, int rowStep); - static ArrayRef< Ref > findVertices180(Ref matrix, int rowStep); - - static ArrayRef findGuardPattern(Ref matrix, - int column, - int row, - int width, - bool whiteFirst, - const int pattern[], - int patternSize, - ArrayRef& counters); - static int patternMatchVariance(ArrayRef& counters, const int pattern[], - int maxIndividualVariance); - - static void correctVertices(Ref matrix, - ArrayRef< Ref >& vertices, - bool upsideDown); - static void findWideBarTopBottom(Ref matrix, - ArrayRef< Ref >& vertices, - int offsetVertice, - int startWideBar, - int lenWideBar, - int lenPattern, - int nIncrement); - static void findCrossingPoint(ArrayRef< Ref >& vertices, - int idxResult, - int idxLineA1,int idxLineA2, - int idxLineB1,int idxLineB2, - Ref& matrix); - static Point intersection(Line a, Line b); - static float computeModuleWidth(ArrayRef< Ref >& vertices); - static int computeDimension(Ref const& topLeft, - Ref const& topRight, - Ref const& bottomLeft, - Ref const& bottomRight, - float moduleWidth); - int computeYDimension(Ref const& topLeft, - Ref const& topRight, - Ref const& bottomLeft, - Ref const& bottomRight, - float moduleWidth); - - Ref sampleLines(ArrayRef< Ref > const& vertices, int dimensionY, int dimension); - -public: - Detector(Ref image); - Ref getImage(); - Ref detect(); - Ref detect(DecodeHints const& hints); -}; - -} -} -} - -#endif // __DETECTOR_H__ diff --git a/src/qzxing/zxing/zxing/pdf417/detector/LinesSampler.cpp b/src/qzxing/zxing/zxing/pdf417/detector/LinesSampler.cpp deleted file mode 100644 index 1cf295f..0000000 --- a/src/qzxing/zxing/zxing/pdf417/detector/LinesSampler.cpp +++ /dev/null @@ -1,713 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2010, 2012 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include -#include - -using std::map; -using std::vector; -using std::min; -using std::abs; -using zxing::pdf417::detector::LinesSampler; -using zxing::pdf417::decoder::BitMatrixParser; -using zxing::Ref; -using zxing::BitMatrix; -using zxing::NotFoundException; -using zxing::Point; - -// VC++ -using zxing::Line; - -#ifndef _MSC_VER -const int LinesSampler::MODULES_IN_SYMBOL; -const int LinesSampler::BARS_IN_SYMBOL; -const int LinesSampler::POSSIBLE_SYMBOLS; -const int LinesSampler::BARCODE_START_OFFSET; -#endif - -namespace { - -class VoteResult { - private: - bool indecisive; - int vote; - public: - VoteResult() : indecisive(false), vote(0) {} - bool isIndecisive() { - return indecisive; - } - void setIndecisive(bool indecisive) { - this->indecisive = indecisive; - } - int getVote() { - return vote; - } - void setVote(int vote) { - this->vote = vote; - } -}; - -VoteResult getValueWithMaxVotes(map& votes) { - VoteResult result; - int maxVotes = 0; - for (map::iterator i = votes.begin(); i != votes.end(); i++) { - if (i->second > maxVotes) { - maxVotes = i->second; - result.setVote(i->first); - result.setIndecisive(false); - } else if (i->second == maxVotes) { - result.setIndecisive(true); - } - } - return result; -} - -} - -vector LinesSampler::init_ratios_table() { - // Pre-computes and outputs the symbol ratio table. - vector > table (BitMatrixParser::SYMBOL_TABLE_LENGTH); - for(int i=0; i < (int)table.size(); ++i) { - table[i].resize(LinesSampler::BARS_IN_SYMBOL); - } - vector RATIOS_TABLE (BitMatrixParser::SYMBOL_TABLE_LENGTH * LinesSampler::BARS_IN_SYMBOL); - int x = 0; - for (int i = 0; i < BitMatrixParser::SYMBOL_TABLE_LENGTH; i++) { - int currentSymbol = BitMatrixParser::SYMBOL_TABLE[i]; - int currentBit = currentSymbol & 0x1; - for (int j = 0; j < BARS_IN_SYMBOL; j++) { - float size = 0.0f; - while ((currentSymbol & 0x1) == currentBit) { - size += 1.0f; - currentSymbol >>= 1; - } - currentBit = currentSymbol & 0x1; - table[i][BARS_IN_SYMBOL - j - 1] = size / MODULES_IN_SYMBOL; - } - for (int j = 0; j < BARS_IN_SYMBOL; j++) { - RATIOS_TABLE[x] = table[i][j]; - x++; - } - } - return RATIOS_TABLE; -} - -const vector LinesSampler::RATIOS_TABLE = init_ratios_table(); - -LinesSampler::LinesSampler(Ref linesMatrix, int dimension) - : linesMatrix_(linesMatrix), dimension_(dimension) {} - -/** - * Samples a grid from a lines matrix. - * - * @return the potentially decodable bit matrix. - */ -Ref LinesSampler::sample() { - const int symbolsPerLine = dimension_ / MODULES_IN_SYMBOL; - - // XXX - vector symbolWidths; - computeSymbolWidths(symbolWidths, symbolsPerLine, linesMatrix_); - - // XXX - vector > codewords(linesMatrix_->getHeight()); - vector > clusterNumbers(linesMatrix_->getHeight()); - linesMatrixToCodewords(clusterNumbers, symbolsPerLine, symbolWidths, linesMatrix_, codewords); - - // XXX - vector > > votes = - distributeVotes(symbolsPerLine, codewords, clusterNumbers); - - // XXX - vector > detectedCodeWords(votes.size()); - for (int i = 0; i < (int)votes.size(); i++) { - detectedCodeWords[i].resize(votes[i].size(), 0); - for (int j = 0; j < (int)votes[i].size(); j++) { - if (!votes[i][j].empty()) { - detectedCodeWords[i][j] = getValueWithMaxVotes(votes[i][j]).getVote(); - } - } - } - - // XXX - vector insertLinesAt = findMissingLines(symbolsPerLine, detectedCodeWords); - - // XXX - int rowCount = decodeRowCount(symbolsPerLine, detectedCodeWords, insertLinesAt); - detectedCodeWords.resize(rowCount); - - // XXX - Ref grid(new BitMatrix(dimension_, detectedCodeWords.size())); - codewordsToBitMatrix(detectedCodeWords, grid); - - return grid; -} - -/** - * @brief LinesSampler::codewordsToBitMatrix - * @param codewords - * @param matrix - */ -void LinesSampler::codewordsToBitMatrix(vector > &codewords, Ref &matrix) { - for (int i = 0; i < (int)codewords.size(); i++) { - for (int j = 0; j < (int)codewords[i].size(); j++) { - int moduleOffset = j * MODULES_IN_SYMBOL; - for (int k = 0; k < MODULES_IN_SYMBOL; k++) { - if ((codewords[i][j] & (1 << (MODULES_IN_SYMBOL - k - 1))) > 0) { - matrix->set(moduleOffset + k, i); - } - } - } - } -} - -/** - * @brief LinesSampler::calculateClusterNumber - * @param codeword - * @return - */ -int LinesSampler::calculateClusterNumber(int codeword) { - if (codeword == 0) { - return -1; - } - int barNumber = 0; - bool blackBar = true; - int clusterNumber = 0; - for (int i = 0; i < MODULES_IN_SYMBOL; i++) { - if ((codeword & (1 << i)) > 0) { - if (!blackBar) { - blackBar = true; - barNumber++; - } - if (barNumber % 2 == 0) { - clusterNumber++; - } else { - clusterNumber--; - } - } else { - if (blackBar) { - blackBar = false; - } - } - } - return (clusterNumber + 9) % 9; -} - -//#define OUTPUT_SYMBOL_WIDTH 1 -//#define OUTPUT_BAR_WIDTH 1 -//#define OUTPUT_CW_STARTS 1 -//#define OUTPUT_CLUSTER_NUMBERS 1 -//#define OUTPUT_EC_LEVEL 1 - -void LinesSampler::computeSymbolWidths(vector &symbolWidths, const int symbolsPerLine, Ref linesMatrix) -{ - int symbolStart = 0; - bool lastWasSymbolStart = true; - const float symbolWidth = symbolsPerLine > 0 ? (float)linesMatrix->getWidth() / (float)symbolsPerLine : (float)linesMatrix->getWidth(); - - // Use the following property of PDF417 barcodes to detect symbols: - // Every symbol starts with a black module and every symbol is 17 modules wide, - // therefore there have to be columns in the line matrix that are completely composed of black pixels. - vector blackCount(linesMatrix->getWidth(), 0); - for (int x = BARCODE_START_OFFSET; x < linesMatrix->getWidth(); x++) { - for (int y = 0; y < linesMatrix->getHeight(); y++) { - if (linesMatrix->get(x, y)) { - blackCount[x]++; - } - } - if (blackCount[x] == linesMatrix->getHeight()) { - if (!lastWasSymbolStart) { - float currentWidth = (float)(x - symbolStart); - // Make sure we really found a symbol by asserting a minimal size of 75% of the expected symbol width. - // This might break highly distorted barcodes, but fixes an issue with barcodes where there is a - // full black column from top to bottom within a symbol. - if (currentWidth > 0.75 * symbolWidth) { - // The actual symbol width might be slightly bigger than the expected symbol width, - // but if we are more than half an expected symbol width bigger, we assume that - // we missed one or more symbols and assume that they were the expected symbol width. - while (currentWidth > 1.5 * symbolWidth) { - symbolWidths.push_back(symbolWidth); - currentWidth -= symbolWidth; - } - symbolWidths.push_back(currentWidth); - lastWasSymbolStart = true; - symbolStart = x; - } - } - } else { - if (lastWasSymbolStart) { - lastWasSymbolStart = false; - } - } - } - - // The last symbol ends at the right edge of the matrix, where there usually is no black bar. - float currentWidth = (float)(linesMatrix->getWidth() - symbolStart); - while (currentWidth > 1.5 * symbolWidth) { - symbolWidths.push_back(symbolWidth); - currentWidth -= symbolWidth; - } - symbolWidths.push_back(currentWidth); - - -#if PDF417_DIAG && OUTPUT_SYMBOL_WIDTH - { - cout << "symbols per line: " << symbolsPerLine << endl; - cout << "symbol width (" << symbolWidths.size() << "): "; - for (int i = 0; i < symbolWidths.size(); i++) { - cout << symbolWidths[i] << ", "; - } - cout << endl; - } -#endif -} - -void LinesSampler::linesMatrixToCodewords(vector >& clusterNumbers, - const int symbolsPerLine, - const vector& symbolWidths, - Ref linesMatrix, - vector >& codewords) -{ - for (int y = 0; y < linesMatrix->getHeight(); y++) { - // Not sure if this is the right way to handle this but avoids an error: - if (symbolsPerLine > (int)symbolWidths.size()) { - throw NotFoundException("Inconsistent number of symbols in this line."); - } - - // TODO: use symbolWidths.size() instead of symbolsPerLine to at least decode some codewords - - codewords[y].resize(symbolsPerLine, 0); - clusterNumbers[y].resize(symbolsPerLine, -1); - int line = y; - vector barWidths(1, 0); - int barCount = 0; - // Runlength encode the bars in the scanned linesMatrix. - // We assume that the first bar is black, as determined by the PDF417 standard. - bool isSetBar = true; - // Filter small white bars at the beginning of the barcode. - // Small white bars may occur due to small deviations in scan line sampling. - barWidths[0] += BARCODE_START_OFFSET; - for (int x = BARCODE_START_OFFSET; x < linesMatrix->getWidth(); x++) { - if (linesMatrix->get(x, line)) { - if (!isSetBar) { - isSetBar = true; - barCount++; - barWidths.resize(barWidths.size() + 1); - } - } else { - if (isSetBar) { - isSetBar = false; - barCount++; - barWidths.resize(barWidths.size() + 1); - } - - } - barWidths[barCount]++; - } - // Don't forget the last bar. - barCount++; - barWidths.resize(barWidths.size() + 1); - -#if PDF417_DIAG && OUTPUT_BAR_WIDTH - { - for (int i = 0; i < barWidths.size(); i++) { - cout << barWidths[i] << ", "; - } - cout << endl; - } -#endif - - ////////////////////////////////////////////////// - - // Find the symbols in the line by counting bar lengths until we reach symbolWidth. - // We make sure, that the last bar of a symbol is always white, as determined by the PDF417 standard. - // This helps to reduce the amount of errors done during the symbol recognition. - // The symbolWidth usually is not constant over the width of the barcode. - int cwWidth = 0; - int cwCount = 0; - vector cwStarts(symbolsPerLine, 0); - cwStarts[0] = 0; - cwCount++; - for (int i = 0; i < barCount && cwCount < symbolsPerLine; i++) { - cwWidth += barWidths[i]; - if ((float)cwWidth > symbolWidths[cwCount - 1]) { - if ((i % 2) == 1) { // check if bar is white - i++; - } - cwWidth = barWidths[i]; - cwStarts[cwCount] = i; - cwCount++; - } - } - -#if PDF417_DIAG && OUTPUT_CW_STARTS - { - for (int i = 0; i < cwStarts.size(); i++) { - cout << cwStarts[i] << ", "; - } - cout << endl; - } -#endif - - /////////////////////////////////////////// - - vector > cwRatios(symbolsPerLine); - // Distribute bar widths to modules of a codeword. - for (int i = 0; i < symbolsPerLine; i++) { - cwRatios[i].resize(BARS_IN_SYMBOL, 0.0f); - const int cwStart = cwStarts[i]; - const int cwEnd = (i == symbolsPerLine - 1) ? barCount : cwStarts[i + 1]; - const int cwLength = cwEnd - cwStart; - - if (cwLength < 7 || cwLength > 9) { - // We try to recover smybols with 7 or 9 bars and spaces with heuristics, but everything else is beyond repair. - continue; - } - - float cwWidth = 0; - - // For symbols with 9 bar length simply ignore the last bar. - for (int j = 0; j < min(BARS_IN_SYMBOL, cwLength); ++j) { - cwWidth += (float)barWidths[cwStart + j]; - } - - // If there were only 7 bars and spaces detected use the following heuristic: - // Assume the length of the symbol is symbolWidth and the last (unrecognized) bar uses all remaining space. - if (cwLength == 7) { - for (int j = 0; j < cwLength; ++j) { - cwRatios[i][j] = (float)barWidths[cwStart + j] / symbolWidths[i]; - } - cwRatios[i][7] = (symbolWidths[i] - cwWidth) / symbolWidths[i]; - } else { - for (int j = 0; j < (int)cwRatios[i].size(); ++j) { - cwRatios[i][j] = (float)barWidths[cwStart + j] / cwWidth; - } - } - - float bestMatchError = std::numeric_limits::max(); - int bestMatch = 0; - - // Search for the most possible codeword by comparing the ratios of bar size to symbol width. - // The sum of the squared differences is used as similarity metric. - // (Picture it as the square euclidian distance in the space of eight tuples where a tuple represents the bar ratios.) - for (int j = 0; j < POSSIBLE_SYMBOLS; j++) { - float error = 0.0f; - for (int k = 0; k < BARS_IN_SYMBOL; k++) { - error += pow(RATIOS_TABLE[j * BARS_IN_SYMBOL + k] - cwRatios[i][k], 2); - } - if (error < bestMatchError) { - bestMatchError = error; - bestMatch = BitMatrixParser::SYMBOL_TABLE[j]; - } - } - codewords[y][i] = bestMatch; - clusterNumbers[y][i] = calculateClusterNumber(bestMatch); - } - } - - -#if PDF417_DIAG && OUTPUT_CLUSTER_NUMBERS - { - for (int i = 0; i < clusterNumbers.size(); i++) { - for (int j = 0; j < clusterNumbers[i].size(); j++) { - cout << clusterNumbers[i][j] << ", "; - } - cout << endl; - } - } -#endif - - -#if PDF417_DIAG - { - Ref bits(new BitMatrix(symbolsPerLine * MODULES_IN_SYMBOL, codewords.size())); - codewordsToBitMatrix(codewords, bits); - static int __cnt__ = 0; - stringstream ss; - ss << "pdf417-detectedRaw" << __cnt__++ << ".png"; - bits->writePng(ss.str().c_str(), 8, 16); - } -#endif -} - -vector > > -LinesSampler::distributeVotes(const int symbolsPerLine, - const vector >& codewords, - const vector >& clusterNumbers) -{ - // Matrix of votes for codewords which are possible at this position. - vector > > votes(1); - votes[0].resize(symbolsPerLine); - - int currentRow = 0; - map clusterNumberVotes; - int lastLineClusterNumber = -1; - - for (int y = 0; y < (int)codewords.size(); y++) { - // Vote for the most probable cluster number for this row. - clusterNumberVotes.clear(); - for (int i = 0; i < (int)codewords[y].size(); i++) { - if (clusterNumbers[y][i] != -1) { - clusterNumberVotes[clusterNumbers[y][i]] = clusterNumberVotes[clusterNumbers[y][i]] + 1; - } - } - - // Ignore lines where no codeword could be read. - if (!clusterNumberVotes.empty()) { - VoteResult voteResult = getValueWithMaxVotes(clusterNumberVotes); - bool lineClusterNumberIsIndecisive = voteResult.isIndecisive(); - int lineClusterNumber = voteResult.getVote(); - - // If there are to few votes on the lines cluster number, we keep the old one. - // This avoids switching lines because of damaged inter line readings, but - // may cause problems for barcodes with four or less rows. - if (lineClusterNumberIsIndecisive) { - lineClusterNumber = lastLineClusterNumber; - } - - if ((lineClusterNumber != ((lastLineClusterNumber + 3) % 9)) && (lastLineClusterNumber != -1)) { - lineClusterNumber = lastLineClusterNumber; - } - - // Ignore broken lines at the beginning of the barcode. - if ((lineClusterNumber == 0 && lastLineClusterNumber == -1) || (lastLineClusterNumber != -1)) { - if ((lineClusterNumber == ((lastLineClusterNumber + 3) % 9)) && (lastLineClusterNumber != -1)) { - currentRow++; - if ((int)votes.size() < currentRow + 1) { - votes.resize(currentRow + 1); - votes[currentRow].resize(symbolsPerLine); - } - } - - if ((lineClusterNumber == ((lastLineClusterNumber + 6) % 9)) && (lastLineClusterNumber != -1)) { - currentRow += 2; - if ((int)votes.size() < currentRow + 1) { - votes.resize(currentRow + 1); - votes[currentRow].resize(symbolsPerLine); - } - } - - for (int i = 0; i < (int)codewords[y].size(); i++) { - if (clusterNumbers[y][i] != -1) { - if (clusterNumbers[y][i] == lineClusterNumber) { - votes[currentRow][i][codewords[y][i]] = votes[currentRow][i][codewords[y][i]] + 1; - } else if (clusterNumbers[y][i] == ((lineClusterNumber + 3) % 9)) { - if ((int)votes.size() < currentRow + 2) { - votes.resize(currentRow + 2); - votes[currentRow + 1].resize(symbolsPerLine); - } - votes[currentRow + 1][i][codewords[y][i]] = votes[currentRow + 1][i][codewords[y][i]] + 1; - } else if ((clusterNumbers[y][i] == ((lineClusterNumber + 6) % 9)) && (currentRow > 0)) { - votes[currentRow - 1][i][codewords[y][i]] = votes[currentRow - 1][i][codewords[y][i]] + 1; - } - } - } - lastLineClusterNumber = lineClusterNumber; - } - } - } - - return votes; -} - - -vector -LinesSampler::findMissingLines(const int symbolsPerLine, vector > &detectedCodeWords) { - vector insertLinesAt; - if (detectedCodeWords.size() > 1) { - for (int i = 0; i < (int)detectedCodeWords.size() - 1; i++) { - int clusterNumberRow = -1; - for (int j = 0; j < (int)detectedCodeWords[i].size() && clusterNumberRow == -1; j++) { - int clusterNumber = calculateClusterNumber(detectedCodeWords[i][j]); - if (clusterNumber != -1) { - clusterNumberRow = clusterNumber; - } - } - if (i == 0) { - // The first line must have the cluster number 0. Insert empty lines to match this. - if (clusterNumberRow > 0) { - insertLinesAt.push_back(0); - if (clusterNumberRow > 3) { - insertLinesAt.push_back(0); - } - } - } - int clusterNumberNextRow = -1; - for (int j = 0; j < (int)detectedCodeWords[i + 1].size() && clusterNumberNextRow == -1; j++) { - int clusterNumber = calculateClusterNumber(detectedCodeWords[i + 1][j]); - if (clusterNumber != -1) { - clusterNumberNextRow = clusterNumber; - } - } - if ((clusterNumberRow + 3) % 9 != clusterNumberNextRow - && clusterNumberRow != -1 - && clusterNumberNextRow != -1) { - // The cluster numbers are not consecutive. Insert an empty line between them. - insertLinesAt.push_back(i + 1); - if (clusterNumberRow == clusterNumberNextRow) { - // There may be two lines missing. This is detected when two consecutive lines have the same cluster number. - insertLinesAt.push_back(i + 1); - } - } - } - } - - for (int i = 0; i < (int)insertLinesAt.size(); i++) { - detectedCodeWords.insert(detectedCodeWords.begin() + insertLinesAt[i] + i, vector(symbolsPerLine, 0)); - } - - return insertLinesAt; -} - -int LinesSampler::decodeRowCount(const int symbolsPerLine, vector > &detectedCodeWords, vector &insertLinesAt) -{ - // Use the information in the first and last column to determin the number of rows and find more missing rows. - // For missing rows insert blank space, so the error correction can try to fill them in. - - map rowCountVotes; - map ecLevelVotes; - map rowNumberVotes; - int lastRowNumber = -1; - insertLinesAt.clear(); - - for (int i = 0; i + 2 < (int)detectedCodeWords.size(); i += 3) { - rowNumberVotes.clear(); - int firstCodewordDecodedLeft = -1; - int secondCodewordDecodedLeft = -1; - int thirdCodewordDecodedLeft = -1; - int firstCodewordDecodedRight = -1; - int secondCodewordDecodedRight = -1; - int thirdCodewordDecodedRight = -1; - - if (detectedCodeWords[i][0] != 0) { - firstCodewordDecodedLeft = BitMatrixParser::getCodeword(detectedCodeWords[i][0]); - } - if (detectedCodeWords[i + 1][0] != 0) { - secondCodewordDecodedLeft = BitMatrixParser::getCodeword(detectedCodeWords[i + 1][0]); - } - if (detectedCodeWords[i + 2][0] != 0) { - thirdCodewordDecodedLeft = BitMatrixParser::getCodeword(detectedCodeWords[i + 2][0]); - } - - if (detectedCodeWords[i][detectedCodeWords[i].size() - 1] != 0) { - firstCodewordDecodedRight = BitMatrixParser::getCodeword(detectedCodeWords[i][detectedCodeWords[i].size() - 1]); - } - if (detectedCodeWords[i + 1][detectedCodeWords[i + 1].size() - 1] != 0) { - secondCodewordDecodedRight = BitMatrixParser::getCodeword(detectedCodeWords[i + 1][detectedCodeWords[i + 1].size() - 1]); - } - if (detectedCodeWords[i + 2][detectedCodeWords[i + 2].size() - 1] != 0) { - thirdCodewordDecodedRight = BitMatrixParser::getCodeword(detectedCodeWords[i + 2][detectedCodeWords[i + 2].size() - 1]); - } - - if (firstCodewordDecodedLeft != -1 && secondCodewordDecodedLeft != -1) { - int leftRowCount = ((firstCodewordDecodedLeft % 30) * 3) + ((secondCodewordDecodedLeft % 30) % 3); - int leftECLevel = (secondCodewordDecodedLeft % 30) / 3; - - rowCountVotes[leftRowCount] = rowCountVotes[leftRowCount] + 1; - ecLevelVotes[leftECLevel] = ecLevelVotes[leftECLevel] + 1; - } - - if (secondCodewordDecodedRight != -1 && thirdCodewordDecodedRight != -1) { - int rightRowCount = ((secondCodewordDecodedRight % 30) * 3) + ((thirdCodewordDecodedRight % 30) % 3); - int rightECLevel = (thirdCodewordDecodedRight % 30) / 3; - - rowCountVotes[rightRowCount] = rowCountVotes[rightRowCount] + 1; - ecLevelVotes[rightECLevel] = ecLevelVotes[rightECLevel] + 1; - } - - if (firstCodewordDecodedLeft != -1) { - int rowNumber = firstCodewordDecodedLeft / 30; - rowNumberVotes[rowNumber] = rowNumberVotes[rowNumber] + 1; - } - if (secondCodewordDecodedLeft != -1) { - int rowNumber = secondCodewordDecodedLeft / 30; - rowNumberVotes[rowNumber] = rowNumberVotes[rowNumber] + 1; - } - if (thirdCodewordDecodedLeft != -1) { - int rowNumber = thirdCodewordDecodedLeft / 30; - rowNumberVotes[rowNumber] = rowNumberVotes[rowNumber] + 1; - } - if (firstCodewordDecodedRight != -1) { - int rowNumber = firstCodewordDecodedRight / 30; - rowNumberVotes[rowNumber] = rowNumberVotes[rowNumber] + 1; - } - if (secondCodewordDecodedRight != -1) { - int rowNumber = secondCodewordDecodedRight / 30; - rowNumberVotes[rowNumber] = rowNumberVotes[rowNumber] + 1; - } - if (thirdCodewordDecodedRight != -1) { - int rowNumber = thirdCodewordDecodedRight / 30; - rowNumberVotes[rowNumber] = rowNumberVotes[rowNumber] + 1; - } - int rowNumber = getValueWithMaxVotes(rowNumberVotes).getVote(); - if (lastRowNumber + 1 < rowNumber) { - for (int j = lastRowNumber + 1; j < rowNumber; j++) { - insertLinesAt.push_back(i); - insertLinesAt.push_back(i); - insertLinesAt.push_back(i); - } - } - lastRowNumber = rowNumber; - } - - for (int i = 0; i < (int)insertLinesAt.size(); i++) { - detectedCodeWords.insert(detectedCodeWords.begin() + insertLinesAt[i] + i, vector(symbolsPerLine, 0)); - } - - int rowCount = getValueWithMaxVotes(rowCountVotes).getVote(); - // int ecLevel = getValueWithMaxVotes(ecLevelVotes); - -#if PDF417_DIAG && OUTPUT_EC_LEVEL - { - cout << "EC Level: " << ecLevel << " (" << ((1 << (ecLevel + 1)) - 2) << " EC Codewords)" << endl; - } -#endif - rowCount += 1; - return rowCount; -} - -/** - * Ends up being a bit faster than Math.round(). This merely rounds its - * argument to the nearest int, where x.5 rounds up. - */ -int LinesSampler::round(float d) -{ - return (int)(d + 0.5f); -} - -Point LinesSampler::intersection(Line a, Line b) { - float dxa = a.start.x - a.end.x; - float dxb = b.start.x - b.end.x; - float dya = a.start.y - a.end.y; - float dyb = b.start.y - b.end.y; - - float p = a.start.x * a.end.y - a.start.y * a.end.x; - float q = b.start.x * b.end.y - b.start.y * b.end.x; - float denom = dxa * dyb - dya * dxb; - if(abs(denom) < 1e-12) // Lines don't intersect (replaces "denom == 0") - return Point(std::numeric_limits::infinity(), - std::numeric_limits::infinity()); - - float x = (p * dxb - dxa * q) / denom; - float y = (p * dyb - dya * q) / denom; - - return Point(x, y); -} diff --git a/src/qzxing/zxing/zxing/pdf417/detector/LinesSampler.h b/src/qzxing/zxing/zxing/pdf417/detector/LinesSampler.h deleted file mode 100644 index a769bf8..0000000 --- a/src/qzxing/zxing/zxing/pdf417/detector/LinesSampler.h +++ /dev/null @@ -1,122 +0,0 @@ -#ifndef __LINESSAMPLER_H__ -#define __LINESSAMPLER_H__ - -/* - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include - -namespace zxing { -namespace pdf417 { -namespace detector { - -class LinesSampler { -private: - static const int MODULES_IN_SYMBOL = 17; - static const int BARS_IN_SYMBOL = 8; - static const int POSSIBLE_SYMBOLS = 2787; - static const std::vector RATIOS_TABLE; - static std::vector init_ratios_table(); - static const int BARCODE_START_OFFSET = 2; - - Ref linesMatrix_; - int symbolsPerLine_; - int dimension_; - - static std::vector > findVertices(Ref matrix, int rowStep); - static std::vector > findVertices180(Ref matrix, int rowStep); - - static ArrayRef findGuardPattern(Ref matrix, - int column, - int row, - int width, - bool whiteFirst, - const int pattern[], - int patternSize, - ArrayRef counters); - static int patternMatchVariance(ArrayRef counters, const int pattern[], - int maxIndividualVariance); - - static void correctVertices(Ref matrix, - std::vector > &vertices, - bool upsideDown); - static void findWideBarTopBottom(Ref matrix, - std::vector > &vertices, - int offsetVertice, - int startWideBar, - int lenWideBar, - int lenPattern, - int nIncrement); - static void findCrossingPoint(std::vector > &vertices, - int idxResult, - int idxLineA1,int idxLineA2, - int idxLineB1,int idxLineB2, - Ref matrix); - static float computeModuleWidth(std::vector > &vertices); - static int computeDimension(Ref topLeft, - Ref topRight, - Ref bottomLeft, - Ref bottomRight, - float moduleWidth); - int computeYDimension(Ref topLeft, - Ref topRight, - Ref bottomLeft, - Ref bottomRight, - float moduleWidth); - - Ref sampleLines(std::vector > const &vertices, - int dimensionY, - int dimension); - - static void codewordsToBitMatrix(std::vector > &codewords, - Ref &matrix); - static int calculateClusterNumber(int codeword); - static Ref sampleGrid(Ref image, - int dimension); - static void computeSymbolWidths(std::vector& symbolWidths, - const int symbolsPerLine, Ref linesMatrix); - static void linesMatrixToCodewords(std::vector > &clusterNumbers, - const int symbolsPerLine, - const std::vector &symbolWidths, - Ref linesMatrix, - std::vector > &codewords); - static std::vector > > - distributeVotes(const int symbolsPerLine, - const std::vector >& codewords, - const std::vector >& clusterNumbers); - static std::vector - findMissingLines(const int symbolsPerLine, - std::vector > &detectedCodeWords); - static int decodeRowCount(const int symbolsPerLine, - std::vector > &detectedCodeWords, - std::vector &insertLinesAt); - - static int round(float d); - static Point intersection(Line a, Line b); - -public: - LinesSampler(Ref linesMatrix, int dimension); - Ref sample(); -}; - -} -} -} - -#endif // __LINESSAMPLER_H__ diff --git a/src/qzxing/zxing/zxing/pdf417/detector/PDF417Detector.cpp b/src/qzxing/zxing/zxing/pdf417/detector/PDF417Detector.cpp deleted file mode 100644 index c79cfc3..0000000 --- a/src/qzxing/zxing/zxing/pdf417/detector/PDF417Detector.cpp +++ /dev/null @@ -1,664 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * Copyright 2010 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include -#include - -using std::max; -using std::abs; -using std::numeric_limits; -using zxing::pdf417::detector::Detector; -using zxing::common::detector::Math; -using zxing::common::detector::MathUtils; -using zxing::Ref; -using zxing::ArrayRef; -using zxing::DetectorResult; -using zxing::ResultPoint; -using zxing::Point; -using zxing::BitMatrix; -using zxing::GridSampler; - -// VC++ - -using zxing::BinaryBitmap; -using zxing::DecodeHints; -using zxing::Line; - -/** - *

Encapsulates logic that can detect a PDF417 Code in an image, even if the - * PDF417 Code is rotated or skewed, or partially obscured.

- * - * @author SITA Lab (kevin.osullivan@sita.aero) - * @author Daniel Switkin (dswitkin@google.com) - * @author Schweers Informationstechnologie GmbH (hartmut.neubauer@schweers.de) - * @author creatale GmbH (christoph.schulz@creatale.de) - */ - -const int Detector::MAX_AVG_VARIANCE= (int) (PATTERN_MATCH_RESULT_SCALE_FACTOR * 0.42f); -const int Detector::MAX_INDIVIDUAL_VARIANCE = (int) (PATTERN_MATCH_RESULT_SCALE_FACTOR * 0.8f); - -// B S B S B S B S Bar/Space pattern -// 11111111 0 1 0 1 0 1 000 -const int Detector::START_PATTERN[] = {8, 1, 1, 1, 1, 1, 1, 3}; -const int Detector::START_PATTERN_LENGTH = sizeof(START_PATTERN) / sizeof(int); - -// 11111111 0 1 0 1 0 1 000 -const int Detector::START_PATTERN_REVERSE[] = {3, 1, 1, 1, 1, 1, 1, 8}; -const int Detector::START_PATTERN_REVERSE_LENGTH = sizeof(START_PATTERN_REVERSE) / sizeof(int); - -// 1111111 0 1 000 1 0 1 00 1 -const int Detector::STOP_PATTERN[] = {7, 1, 1, 3, 1, 1, 1, 2, 1}; -const int Detector::STOP_PATTERN_LENGTH = sizeof(STOP_PATTERN) / sizeof(int); - -// B S B S B S B S B Bar/Space pattern -// 1111111 0 1 000 1 0 1 00 1 -const int Detector::STOP_PATTERN_REVERSE[] = {1, 2, 1, 1, 1, 3, 1, 1, 7}; -const int Detector::STOP_PATTERN_REVERSE_LENGTH = sizeof(STOP_PATTERN_REVERSE) / sizeof(int); - -Detector::Detector(Ref image) : image_(image) {} - -Ref Detector::detect() { - return detect(DecodeHints()); -} - -Ref Detector::detect(DecodeHints const& hints) { - (void)hints; - // Fetch the 1 bit matrix once up front. - Ref matrix = image_->getBlackMatrix(); - - // Try to find the vertices assuming the image is upright. - const int rowStep = 8; - ArrayRef< Ref > vertices (findVertices(matrix, rowStep)); - if (!vertices) { - // Maybe the image is rotated 180 degrees? - vertices = findVertices180(matrix, rowStep); - if (vertices) { - correctVertices(matrix, vertices, true); - } - } else { - correctVertices(matrix, vertices, false); - } - - if (!vertices) { - throw NotFoundException("No vertices found."); - } - - float moduleWidth = computeModuleWidth(vertices); - if (moduleWidth < 1.0f) { - throw NotFoundException("Bad module width."); - } - - int dimension = computeDimension(vertices[12], vertices[14], - vertices[13], vertices[15], moduleWidth); - if (dimension < 1) { - throw NotFoundException("Bad dimension."); - } - - int yDimension = max(computeYDimension(vertices[12], vertices[14], - vertices[13], vertices[15], moduleWidth), dimension); - - // Deskew and sample lines from image. - Ref linesMatrix = sampleLines(vertices, dimension, yDimension); - Ref linesGrid(LinesSampler(linesMatrix, dimension).sample()); - - ArrayRef< Ref > points(4); - points[0] = vertices[5]; - points[1] = vertices[4]; - points[2] = vertices[6]; - points[3] = vertices[7]; - return Ref(new DetectorResult(linesGrid, points)); -} - -/** - * Locate the vertices and the codewords area of a black blob using the Start - * and Stop patterns as locators. - * - * @param matrix the scanned barcode image. - * @param rowStep the step size for iterating rows (every n-th row). - * @return an array containing the vertices: - * vertices[0] x, y top left barcode - * vertices[1] x, y bottom left barcode - * vertices[2] x, y top right barcode - * vertices[3] x, y bottom right barcode - * vertices[4] x, y top left codeword area - * vertices[5] x, y bottom left codeword area - * vertices[6] x, y top right codeword area - * vertices[7] x, y bottom right codeword area - */ -ArrayRef< Ref > Detector::findVertices(Ref matrix, int rowStep) -{ - const int height = matrix->getHeight(); - const int width = matrix->getWidth(); - - ArrayRef< Ref > result(16); - bool found = false; - - ArrayRef counters(new Array(START_PATTERN_LENGTH)); - - // Top Left - for (int i = 0; i < height; i += rowStep) { - ArrayRef loc = findGuardPattern(matrix, 0, i, width, false, START_PATTERN, - START_PATTERN_LENGTH, counters); - if (loc) { - result[0] = new ResultPoint((float)loc[0], (float)i); - result[4] = new ResultPoint((float)loc[1], (float)i); - found = true; - break; - } - } - // Bottom left - if (found) { // Found the Top Left vertex - found = false; - for (int i = height - 1; i > 0; i -= rowStep) { - ArrayRef loc = findGuardPattern(matrix, 0, i, width, false, START_PATTERN, - START_PATTERN_LENGTH, counters); - if (loc) { - result[1] = new ResultPoint((float)loc[0], (float)i); - result[5] = new ResultPoint((float)loc[1], (float)i); - found = true; - break; - } - } - } - - counters = new Array(STOP_PATTERN_LENGTH); - - // Top right - if (found) { // Found the Bottom Left vertex - found = false; - for (int i = 0; i < height; i += rowStep) { - ArrayRef loc = findGuardPattern(matrix, 0, i, width, false, STOP_PATTERN, - STOP_PATTERN_LENGTH, counters); - if (loc) { - result[2] = new ResultPoint((float)loc[1], (float)i); - result[6] = new ResultPoint((float)loc[0], (float)i); - found = true; - break; - } - } - } - // Bottom right - if (found) { // Found the Top right vertex - found = false; - for (int i = height - 1; i > 0; i -= rowStep) { - ArrayRef loc = findGuardPattern(matrix, 0, i, width, false, STOP_PATTERN, - STOP_PATTERN_LENGTH, counters); - if (loc) { - result[3] = new ResultPoint((float)loc[1], (float)i); - result[7] = new ResultPoint((float)loc[0], (float)i); - found = true; - break; - } - } - } - - return found ? result : ArrayRef< Ref >(); -} - -ArrayRef< Ref > Detector::findVertices180(Ref matrix, int rowStep) { - const int height = matrix->getHeight(); - const int width = matrix->getWidth(); - const int halfWidth = width >> 1; - - ArrayRef< Ref > result(16); - bool found = false; - - ArrayRef counters = new Array(START_PATTERN_REVERSE_LENGTH); - - // Top Left - for (int i = height - 1; i > 0; i -= rowStep) { - ArrayRef loc = - findGuardPattern(matrix, halfWidth, i, halfWidth, true, START_PATTERN_REVERSE, - START_PATTERN_REVERSE_LENGTH, counters); - if (loc) { - result[0] = new ResultPoint((float)loc[1], (float)i); - result[4] = new ResultPoint((float)loc[0], (float)i); - found = true; - break; - } - } - // Bottom Left - if (found) { // Found the Top Left vertex - found = false; - for (int i = 0; i < height; i += rowStep) { - ArrayRef loc = - findGuardPattern(matrix, halfWidth, i, halfWidth, true, START_PATTERN_REVERSE, - START_PATTERN_REVERSE_LENGTH, counters); - if (loc) { - result[1] = new ResultPoint((float)loc[1], (float)i); - result[5] = new ResultPoint((float)loc[0], (float)i); - found = true; - break; - } - } - } - - counters = new Array(STOP_PATTERN_REVERSE_LENGTH); - - // Top Right - if (found) { // Found the Bottom Left vertex - found = false; - for (int i = height - 1; i > 0; i -= rowStep) { - ArrayRef loc = findGuardPattern(matrix, 0, i, halfWidth, false, STOP_PATTERN_REVERSE, - STOP_PATTERN_REVERSE_LENGTH, counters); - if (loc) { - result[2] = new ResultPoint((float)loc[0], (float)i); - result[6] = new ResultPoint((float)loc[1], (float)i); - found = true; - break; - } - } - } - // Bottom Right - if (found) { // Found the Top Right vertex - found = false; - for (int i = 0; i < height; i += rowStep) { - ArrayRef loc = findGuardPattern(matrix, 0, i, halfWidth, false, STOP_PATTERN_REVERSE, - STOP_PATTERN_REVERSE_LENGTH, counters); - if (loc) { - result[3] = new ResultPoint((float)loc[0], (float)i); - result[7] = new ResultPoint((float)loc[1], (float)i); - found = true; - break; - } - } - } - - return found ? result : ArrayRef< Ref >(); -} - -/** - * @param matrix row of black/white values to search - * @param column x position to start search - * @param row y position to start search - * @param width the number of pixels to search on this row - * @param pattern pattern of counts of number of black and white pixels that are - * being searched for as a pattern - * @param counters array of counters, as long as pattern, to re-use - * @return start/end horizontal offset of guard pattern, as an array of two ints. - */ -ArrayRef Detector::findGuardPattern(Ref matrix, - int column, - int row, - int width, - bool whiteFirst, - const int pattern[], - int patternSize, - ArrayRef& counters) { - counters->values().assign(counters->size(), 0); - int patternLength = patternSize; - bool isWhite = whiteFirst; - - int counterPosition = 0; - int patternStart = column; - for (int x = column; x < column + width; x++) { - bool pixel = matrix->get(x, row); - if (pixel ^ isWhite) { - counters[counterPosition]++; - } else { - if (counterPosition == patternLength - 1) { - if (patternMatchVariance(counters, pattern, - MAX_INDIVIDUAL_VARIANCE) < MAX_AVG_VARIANCE) { - ArrayRef result = new Array(2); - result[0] = patternStart; - result[1] = x; - return result; - } - patternStart += counters[0] + counters[1]; - for(int i = 0; i < patternLength - 2; ++i) - counters[i] = counters[ i + 2]; - counters[patternLength - 2] = 0; - counters[patternLength - 1] = 0; - counterPosition--; - } else { - counterPosition++; - } - counters[counterPosition] = 1; - isWhite = !isWhite; - } - } - return ArrayRef(); -} - -/** - * Determines how closely a set of observed counts of runs of black/white - * values matches a given target pattern. This is reported as the ratio of - * the total variance from the expected pattern proportions across all - * pattern elements, to the length of the pattern. - * - * @param counters observed counters - * @param pattern expected pattern - * @param maxIndividualVariance The most any counter can differ before we give up - * @return ratio of total variance between counters and pattern compared to - * total pattern size, where the ratio has been multiplied by 256. - * So, 0 means no variance (perfect match); 256 means the total - * variance between counters and patterns equals the pattern length, - * higher values mean even more variance - */ -int Detector::patternMatchVariance(ArrayRef& counters, - const int pattern[], - int maxIndividualVariance) -{ - int numCounters = counters->size(); - int total = 0; - int patternLength = 0; - for (int i = 0; i < numCounters; i++) { - total += counters[i]; - patternLength += pattern[i]; - } - if (total < patternLength) { - // If we don't even have one pixel per unit of bar width, assume this - // is too small to reliably match, so fail: - return numeric_limits::max(); - } - // We're going to fake floating-point math in integers. We just need to use more bits. - // Scale up patternLength so that intermediate values below like scaledCounter will have - // more "significant digits". - int unitBarWidth = (total << 8) / patternLength; - maxIndividualVariance = (maxIndividualVariance * unitBarWidth) >> 8; - - int totalVariance = 0; - for (int x = 0; x < numCounters; x++) { - int counter = counters[x] << 8; - int scaledPattern = pattern[x] * unitBarWidth; - int variance = counter > scaledPattern ? counter - scaledPattern : scaledPattern - counter; - if (variance > maxIndividualVariance) { - return numeric_limits::max(); - } - totalVariance += variance; - } - return totalVariance / total; -} - -/** - *

Correct the vertices by searching for top and bottom vertices of wide - * bars, then locate the intersections between the upper and lower horizontal - * line and the inner vertices vertical lines.

- * - * @param matrix the scanned barcode image. - * @param vertices the vertices vector is extended and the new members are: - * vertices[ 8] x,y point on upper border of left wide bar - * vertices[ 9] x,y point on lower border of left wide bar - * vertices[10] x,y point on upper border of right wide bar - * vertices[11] x,y point on lower border of right wide bar - * vertices[12] x,y final top left codeword area - * vertices[13] x,y final bottom left codeword area - * vertices[14] x,y final top right codeword area - * vertices[15] x,y final bottom right codeword area - * @param upsideDown true if rotated by 180 degree. - */ -void Detector::correctVertices(Ref matrix, - ArrayRef< Ref >& vertices, - bool upsideDown) -{ - bool isLowLeft = abs(vertices[4]->getY() - vertices[5]->getY()) < 20.0; - bool isLowRight = abs(vertices[6]->getY() - vertices[7]->getY()) < 20.0; - if (isLowLeft || isLowRight) { - throw NotFoundException("Cannot find enough PDF417 guard patterns!"); - } else { - findWideBarTopBottom(matrix, vertices, 0, 0, 8, 17, upsideDown ? 1 : -1); - findWideBarTopBottom(matrix, vertices, 1, 0, 8, 17, upsideDown ? -1 : 1); - findWideBarTopBottom(matrix, vertices, 2, 11, 7, 18, upsideDown ? 1 : -1); - findWideBarTopBottom(matrix, vertices, 3, 11, 7, 18, upsideDown ? -1 : 1); - findCrossingPoint(vertices, 12, 4, 5, 8, 10, matrix); - findCrossingPoint(vertices, 13, 4, 5, 9, 11, matrix); - findCrossingPoint(vertices, 14, 6, 7, 8, 10, matrix); - findCrossingPoint(vertices, 15, 6, 7, 9, 11, matrix); - } -} - -/** - *

Locate the top or bottom of one of the two wide black bars of a guard pattern.

- * - *

Warning: it only searches along the y axis, so the return points would not be - * right if the barcode is too curved.

- * - * @param matrix The bit matrix. - * @param vertices The 16 vertices located by findVertices(); the result - * points are stored into vertices[8], ... , vertices[11]. - * @param offsetVertice The offset of the outer vertice and the inner - * vertice (+ 4) to be corrected and (+ 8) where the result is stored. - * @param startWideBar start of a wide bar. - * @param lenWideBar length of wide bar. - * @param lenPattern length of the pattern. - * @param rowStep +1 if corner should be exceeded towards the bottom, -1 towards the top. - */ -void Detector::findWideBarTopBottom(Ref matrix, - ArrayRef< Ref > &vertices, - int offsetVertice, - int startWideBar, - int lenWideBar, - int lenPattern, - int rowStep) -{ - Ref verticeStart(vertices[offsetVertice]); - Ref verticeEnd(vertices[offsetVertice + 4]); - - // Start horizontally at the middle of the bar. - int endWideBar = startWideBar + lenWideBar; - float barDiff = verticeEnd->getX() - verticeStart->getX(); - float barStart = verticeStart->getX() + barDiff * (float)startWideBar / (float)lenPattern; - float barEnd = verticeStart->getX() + barDiff * (float)endWideBar / (float)lenPattern; - int x = Math::round((barStart + barEnd) / 2.0f); - - // Start vertically between the preliminary vertices. - int yStart = Math::round(verticeStart->getY()); - int y = yStart; - - // Find offset of thin bar to the right as additional safeguard. - int nextBarX = int(max(barStart, barEnd) + 1); - for (; nextBarX < matrix->getWidth(); nextBarX++) - if (!matrix->get(nextBarX - 1, y) && matrix->get(nextBarX, y)) break; - nextBarX -= x; - - bool isEnd = false; - while (!isEnd) { - if (matrix->get(x, y)) { - // If the thin bar to the right ended, stop as well - isEnd = !matrix->get(x + nextBarX, y) && !matrix->get(x + nextBarX + 1, y); - y += rowStep; - if (y <= 0 || y >= (int)matrix->getHeight() - 1) { - // End of barcode image reached. - isEnd = true; - } - } else { - // Look sidewise whether black bar continues? (in the case the image is skewed) - if (x > 0 && matrix->get(x - 1, y)) { - x--; - } else if (x < (int)matrix->getWidth() - 1 && matrix->get(x + 1, y)) { - x++; - } else { - // End of pattern regarding big bar and big gap reached. - isEnd = true; - if (y != yStart) { - // Turn back one step, because target has been exceeded. - y -= rowStep; - } - } - } - } - - vertices[offsetVertice + 8] = new ResultPoint((float)x, (float)y); -} - -/** - *

Finds the intersection of two lines.

- * - * @param vertices The reference of the vertices vector - * @param idxResult Index of result point inside the vertices vector. - * @param idxLineA1 - * @param idxLineA2 Indices two points inside the vertices vector that define the first line. - * @param idxLineB1 - * @param idxLineB2 Indices two points inside the vertices vector that define the second line. - * @param matrix: bit matrix, here only for testing whether the result is inside the matrix. - * @return Returns true when the result is valid and lies inside the matrix. Otherwise throws an - * exception. - **/ -void Detector::findCrossingPoint(ArrayRef< Ref >& vertices, - int idxResult, - int idxLineA1, int idxLineA2, - int idxLineB1, int idxLineB2, - Ref& matrix) -{ - Point p1(vertices[idxLineA1]->getX(), vertices[idxLineA1]->getY()); - Point p2(vertices[idxLineA2]->getX(), vertices[idxLineA2]->getY()); - Point p3(vertices[idxLineB1]->getX(), vertices[idxLineB1]->getY()); - Point p4(vertices[idxLineB2]->getX(), vertices[idxLineB2]->getY()); - - Point result(intersection(Line(p1, p2), Line(p3, p4))); - if (result.x == numeric_limits::infinity() || - result.y == numeric_limits::infinity()) { - throw NotFoundException("PDF:Detector: cannot find the crossing of parallel lines!"); - } - - int x = Math::round(result.x); - int y = Math::round(result.y); - if (x < 0 || x >= (int)matrix->getWidth() || y < 0 || y >= (int)matrix->getHeight()) { - throw NotFoundException("PDF:Detector: crossing points out of region!"); - } - - vertices[idxResult] = Ref(new ResultPoint(result.x, result.y)); -} - -/** - * Computes the intersection between two lines. - */ -Point Detector::intersection(Line a, Line b) { - float dxa = a.start.x - a.end.x; - float dxb = b.start.x - b.end.x; - float dya = a.start.y - a.end.y; - float dyb = b.start.y - b.end.y; - - float p = a.start.x * a.end.y - a.start.y * a.end.x; - float q = b.start.x * b.end.y - b.start.y * b.end.x; - float denom = dxa * dyb - dya * dxb; - if(abs(denom) < 1e-12) // Lines don't intersect (replaces "denom == 0") - return Point(numeric_limits::infinity(), - numeric_limits::infinity()); - - float x = (p * dxb - dxa * q) / denom; - float y = (p * dyb - dya * q) / denom; - - return Point(x, y); -} - -/** - *

Estimates module size (pixels in a module) based on the Start and End - * finder patterns.

- * - * @param vertices an array of vertices: - * vertices[0] x, y top left barcode - * vertices[1] x, y bottom left barcode - * vertices[2] x, y top right barcode - * vertices[3] x, y bottom right barcode - * vertices[4] x, y top left codeword area - * vertices[5] x, y bottom left codeword area - * vertices[6] x, y top right codeword area - * vertices[7] x, y bottom right codeword area - * @return the module size. - */ -float Detector::computeModuleWidth(ArrayRef< Ref >& vertices) { - float pixels1 = ResultPoint::distance(vertices[0], vertices[4]); - float pixels2 = ResultPoint::distance(vertices[1], vertices[5]); - float moduleWidth1 = (pixels1 + pixels2) / (17 * 2.0f); - float pixels3 = ResultPoint::distance(vertices[6], vertices[2]); - float pixels4 = ResultPoint::distance(vertices[7], vertices[3]); - float moduleWidth2 = (pixels3 + pixels4) / (18 * 2.0f); - return (moduleWidth1 + moduleWidth2) / 2.0f; -} - -/** - * Computes the dimension (number of modules in a row) of the PDF417 Code - * based on vertices of the codeword area and estimated module size. - * - * @param topLeft of codeword area - * @param topRight of codeword area - * @param bottomLeft of codeword area - * @param bottomRight of codeword are - * @param moduleWidth estimated module size - * @return the number of modules in a row. - */ -int Detector::computeDimension(Ref const& topLeft, - Ref const& topRight, - Ref const& bottomLeft, - Ref const& bottomRight, - float moduleWidth) -{ - int topRowDimension = MathUtils::round(ResultPoint::distance(topLeft, topRight) / moduleWidth); - int bottomRowDimension = - MathUtils::round(ResultPoint::distance(bottomLeft, bottomRight) / moduleWidth); - return ((((topRowDimension + bottomRowDimension) >> 1) + 8) / 17) * 17; -} - -/** - * Computes the y dimension (number of modules in a column) of the PDF417 Code - * based on vertices of the codeword area and estimated module size. - * - * @param topLeft of codeword area - * @param topRight of codeword area - * @param bottomLeft of codeword area - * @param bottomRight of codeword are - * @param moduleWidth estimated module size - * @return the number of modules in a row. - */ -int Detector::computeYDimension(Ref const& topLeft, - Ref const& topRight, - Ref const& bottomLeft, - Ref const& bottomRight, - float moduleWidth) -{ - int leftColumnDimension = - MathUtils::round(ResultPoint::distance(topLeft, bottomLeft) / moduleWidth); - int rightColumnDimension = - MathUtils::round(ResultPoint::distance(topRight, bottomRight) / moduleWidth); - return (leftColumnDimension + rightColumnDimension) >> 1; -} - -/** - * Deskew and over-sample image. - * - * @param vertices vertices from findVertices() - * @param dimension x dimension - * @param yDimension y dimension - * @return an over-sampled BitMatrix. - */ -Ref Detector::sampleLines(ArrayRef< Ref > const& vertices, - int dimensionY, - int dimension) { - const int sampleDimensionX = dimension * 8; - const int sampleDimensionY = dimensionY * 4; - Ref transform( - PerspectiveTransform::quadrilateralToQuadrilateral( - 0.0f, 0.0f, - (float)sampleDimensionX, 0.0f, - 0.0f, (float)sampleDimensionY, - (float)sampleDimensionX, (float)sampleDimensionY, - vertices[12]->getX(), vertices[12]->getY(), - vertices[14]->getX(), vertices[14]->getY(), - vertices[13]->getX(), vertices[13]->getY(), - vertices[15]->getX(), vertices[15]->getY())); - - Ref linesMatrix = GridSampler::getInstance().sampleGrid( - image_->getBlackMatrix(), sampleDimensionX, sampleDimensionY, transform); - - - return linesMatrix; -} diff --git a/src/qzxing/zxing/zxing/qrcode/decoder/QRDecodedBitStreamParser.cpp b/src/qzxing/zxing/zxing/qrcode/decoder/QRDecodedBitStreamParser.cpp deleted file mode 100644 index f9430f8..0000000 --- a/src/qzxing/zxing/zxing/qrcode/decoder/QRDecodedBitStreamParser.cpp +++ /dev/null @@ -1,430 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * DecodedBitStreamParser.cpp - * zxing - * - * Created by Christian Brunschen on 20/05/2008. - * Copyright 2008 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include -#include -#ifndef NO_ICONV -#include -#endif - -// Required for compatibility. TODO: test on Symbian -#ifdef ZXING_ICONV_CONST -#undef ICONV_CONST -#define ICONV_CONST const -#endif - -#ifndef ICONV_CONST -#define ICONV_CONST /**/ -#endif - -using namespace std; -using namespace zxing; -using namespace zxing::qrcode; -using namespace zxing::common; - -const char DecodedBitStreamParser::ALPHANUMERIC_CHARS[] = - { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', - 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', - 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', - 'Y', 'Z', ' ', '$', '%', '*', '+', '-', '.', '/', ':' - }; - -namespace {int GB2312_SUBSET = 1;} - -void DecodedBitStreamParser::append(std::string &result, - string const& in, - const char *src) { - append(result, (char const*)in.c_str(), in.length(), src); -} - -void DecodedBitStreamParser::append(std::string &result, - const char *bufIn, - size_t nIn, - const char *src) { -#ifndef NO_ICONV - if (nIn == 0) { - return; - } - - iconv_t cd = iconv_open(StringUtils::UTF8, src); - if (cd == (iconv_t)-1) { - result.append((const char *)bufIn, nIn); - return; - } - - const int maxOut = 4 * nIn + 1; - char* bufOut = new char[maxOut]; - - ICONV_CONST char *fromPtr = (ICONV_CONST char *)bufIn; - size_t nFrom = nIn; - char *toPtr = (char *)bufOut; - size_t nTo = maxOut; - - while (nFrom > 0) { -#ifdef Q_OS_SYMBIAN - size_t oneway = iconv(cd, &fromPtr, &nFrom, &toPtr, &nTo); -#else - size_t oneway = iconv(cd, (char**)&fromPtr, &nFrom, &toPtr, &nTo); -#endif - if (oneway == (size_t)(-1)) { - iconv_close(cd); - delete[] bufOut; - throw ReaderException("error converting characters"); - } - } - iconv_close(cd); - - int nResult = maxOut - nTo; - bufOut[nResult] = '\0'; - result.append((const char *)bufOut); - delete[] bufOut; -#else - result.append((const char *)bufIn, nIn); -#endif -} - -void DecodedBitStreamParser::decodeHanziSegment(Ref bits_, - string& result, - int count) { - BitSource& bits (*bits_); - // Don't crash trying to read more bits than we have available. - if (count * 13 > bits.available()) { - throw FormatException(); - } - - // Each character will require 2 bytes. Read the characters as 2-byte pairs - // and decode as GB2312 afterwards - size_t nBytes = 2 * count; - char* buffer = new char[nBytes]; - int offset = 0; - while (count > 0) { - // Each 13 bits encodes a 2-byte character - int twoBytes = bits.readBits(13); - int assembledTwoBytes = ((twoBytes / 0x060) << 8) | (twoBytes % 0x060); - if (assembledTwoBytes < 0x003BF) { - // In the 0xA1A1 to 0xAAFE range - assembledTwoBytes += 0x0A1A1; - } else { - // In the 0xB0A1 to 0xFAFE range - assembledTwoBytes += 0x0A6A1; - } - buffer[offset] = (char) ((assembledTwoBytes >> 8) & 0xFF); - buffer[offset + 1] = (char) (assembledTwoBytes & 0xFF); - offset += 2; - count--; - } - - try { - append(result, buffer, nBytes, StringUtils::GB2312); - } catch (ReaderException const& ignored) { - (void)ignored; - delete [] buffer; - throw FormatException(); - } - - delete [] buffer; -} - -void DecodedBitStreamParser::decodeKanjiSegment(Ref bits, std::string &result, int count) { - // Each character will require 2 bytes. Read the characters as 2-byte pairs - // and decode as Shift_JIS afterwards - size_t nBytes = 2 * count; - char* buffer = new char[nBytes]; - int offset = 0; - while (count > 0) { - // Each 13 bits encodes a 2-byte character - - int twoBytes = bits->readBits(13); - int assembledTwoBytes = ((twoBytes / 0x0C0) << 8) | (twoBytes % 0x0C0); - if (assembledTwoBytes < 0x01F00) { - // In the 0x8140 to 0x9FFC range - assembledTwoBytes += 0x08140; - } else { - // In the 0xE040 to 0xEBBF range - assembledTwoBytes += 0x0C140; - } - buffer[offset] = (char)(assembledTwoBytes >> 8); - buffer[offset + 1] = (char)assembledTwoBytes; - offset += 2; - count--; - } - try { - append(result, buffer, nBytes, StringUtils::SHIFT_JIS); - } catch (ReaderException const& ignored) { - (void)ignored; - delete [] buffer; - throw FormatException(); - } - delete[] buffer; -} - -void DecodedBitStreamParser::decodeByteSegment(Ref bits_, - string& result, - int count, - CharacterSetECI* currentCharacterSetECI, - ArrayRef< ArrayRef >& byteSegments, - Hashtable const& hints) { - int nBytes = count; - BitSource& bits (*bits_); - // Don't crash trying to read more bits than we have available. - if (count << 3 > bits.available()) { - throw FormatException(); - } - - ArrayRef bytes_ (count); - char* readBytes = &(*bytes_)[0]; - for (int i = 0; i < count; i++) { - readBytes[i] = (char) bits.readBits(8); - } - string encoding; - if (currentCharacterSetECI == 0) { - // The spec isn't clear on this mode; see - // section 6.4.5: t does not say which encoding to assuming - // upon decoding. I have seen ISO-8859-1 used as well as - // Shift_JIS -- without anything like an ECI designator to - // give a hint. - encoding = StringUtils::guessEncoding(readBytes, count, hints); - } else { - encoding = currentCharacterSetECI->name(); - } - try { - append(result, readBytes, nBytes, encoding.c_str()); - } catch (ReaderException const& ignored) { - (void)ignored; - throw FormatException(); - } - byteSegments->values().push_back(bytes_); -} - -void DecodedBitStreamParser::decodeNumericSegment(Ref bits, std::string &result, int count) { - int nBytes = count; - char* bytes = new char[nBytes]; - int i = 0; - // Read three digits at a time - while (count >= 3) { - // Each 10 bits encodes three digits - if (bits->available() < 10) { - throw ReaderException("format exception"); - } - int threeDigitsBits = bits->readBits(10); - if (threeDigitsBits >= 1000) { - ostringstream s; - s << "Illegal value for 3-digit unit: " << threeDigitsBits; - delete[] bytes; - throw ReaderException(s.str().c_str()); - } - bytes[i++] = ALPHANUMERIC_CHARS[threeDigitsBits / 100]; - bytes[i++] = ALPHANUMERIC_CHARS[(threeDigitsBits / 10) % 10]; - bytes[i++] = ALPHANUMERIC_CHARS[threeDigitsBits % 10]; - count -= 3; - } - if (count == 2) { - if (bits->available() < 7) { - throw ReaderException("format exception"); - } - // Two digits left over to read, encoded in 7 bits - int twoDigitsBits = bits->readBits(7); - if (twoDigitsBits >= 100) { - ostringstream s; - s << "Illegal value for 2-digit unit: " << twoDigitsBits; - delete[] bytes; - throw ReaderException(s.str().c_str()); - } - bytes[i++] = ALPHANUMERIC_CHARS[twoDigitsBits / 10]; - bytes[i++] = ALPHANUMERIC_CHARS[twoDigitsBits % 10]; - } else if (count == 1) { - if (bits->available() < 4) { - throw ReaderException("format exception"); - } - // One digit left over to read - int digitBits = bits->readBits(4); - if (digitBits >= 10) { - ostringstream s; - s << "Illegal value for digit unit: " << digitBits; - delete[] bytes; - throw ReaderException(s.str().c_str()); - } - bytes[i++] = ALPHANUMERIC_CHARS[digitBits]; - } - append(result, bytes, nBytes, StringUtils::ASCII); - delete[] bytes; -} - -char DecodedBitStreamParser::toAlphaNumericChar(size_t value) { - if (value >= sizeof(DecodedBitStreamParser::ALPHANUMERIC_CHARS)) { - throw FormatException(); - } - return ALPHANUMERIC_CHARS[value]; -} - -void DecodedBitStreamParser::decodeAlphanumericSegment(Ref bits_, - string& result, - int count, - bool fc1InEffect) { - BitSource& bits (*bits_); - ostringstream bytes; - // Read two characters at a time - while (count > 1) { - if (bits.available() < 11) { - throw FormatException(); - } - int nextTwoCharsBits = bits.readBits(11); - bytes << toAlphaNumericChar(nextTwoCharsBits / 45); - bytes << toAlphaNumericChar(nextTwoCharsBits % 45); - count -= 2; - } - if (count == 1) { - // special case: one character left - if (bits.available() < 6) { - throw FormatException(); - } - bytes << toAlphaNumericChar(bits.readBits(6)); - } - // See section 6.4.8.1, 6.4.8.2 - string s = bytes.str(); - if (fc1InEffect) { - // We need to massage the result a bit if in an FNC1 mode: - ostringstream r; - for (size_t i = 0; i < s.length(); i++) { - if (s[i] != '%') { - r << s[i]; - } else { - if (i < s.length() - 1 && s[i + 1] == '%') { - // %% is rendered as % - r << s[i++]; - } else { - // In alpha mode, % should be converted to FNC1 separator 0x1D - r << (char)0x1D; - } - } - } - s = r.str(); - } - append(result, s, StringUtils::ASCII); -} - -namespace { - int parseECIValue(BitSource& bits) { - int firstByte = bits.readBits(8); - if ((firstByte & 0x80) == 0) { - // just one byte - return firstByte & 0x7F; - } - if ((firstByte & 0xC0) == 0x80) { - // two bytes - int secondByte = bits.readBits(8); - return ((firstByte & 0x3F) << 8) | secondByte; - } - if ((firstByte & 0xE0) == 0xC0) { - // three bytes - int secondThirdBytes = bits.readBits(16); - return ((firstByte & 0x1F) << 16) | secondThirdBytes; - } - throw FormatException(); - } -} - -Ref -DecodedBitStreamParser::decode(ArrayRef bytes, - Version* version, - ErrorCorrectionLevel const& ecLevel, - Hashtable const& hints) { - Ref bits_ (new BitSource(bytes)); - BitSource& bits (*bits_); - string result; - result.reserve(50); - ArrayRef< ArrayRef > byteSegments (0); - try { - CharacterSetECI* currentCharacterSetECI = 0; - bool fc1InEffect = false; - Mode* mode = 0; - do { - // While still another segment to read... - if (bits.available() < 4) { - // OK, assume we're done. Really, a TERMINATOR mode should have been recorded here - mode = &Mode::TERMINATOR; - } else { - try { - mode = &Mode::forBits(bits.readBits(4)); // mode is encoded by 4 bits - } catch (IllegalArgumentException const& iae) { - throw iae; - // throw FormatException.getFormatInstance(); - } - } - if (mode != &Mode::TERMINATOR) { - if ((mode == &Mode::FNC1_FIRST_POSITION) || (mode == &Mode::FNC1_SECOND_POSITION)) { - // We do little with FNC1 except alter the parsed result a bit according to the spec - fc1InEffect = true; - } else if (mode == &Mode::STRUCTURED_APPEND) { - if (bits.available() < 16) { - throw FormatException(); - } - // not really supported; all we do is ignore it - // Read next 8 bits (symbol sequence #) and 8 bits (parity data), then continue - bits.readBits(16); - } else if (mode == &Mode::ECI) { - // Count doesn't apply to ECI - int value = parseECIValue(bits); - currentCharacterSetECI = CharacterSetECI::getCharacterSetECIByValue(value); - if (currentCharacterSetECI == 0) { - throw FormatException(); - } - } else { - // First handle Hanzi mode which does not start with character count - if (mode == &Mode::HANZI) { - //chinese mode contains a sub set indicator right after mode indicator - int subset = bits.readBits(4); - int countHanzi = bits.readBits(mode->getCharacterCountBits(version)); - if (subset == GB2312_SUBSET) { - decodeHanziSegment(bits_, result, countHanzi); - } - } else { - // "Normal" QR code modes: - // How many characters will follow, encoded in this mode? - int count = bits.readBits(mode->getCharacterCountBits(version)); - if (mode == &Mode::NUMERIC) { - decodeNumericSegment(bits_, result, count); - } else if (mode == &Mode::ALPHANUMERIC) { - decodeAlphanumericSegment(bits_, result, count, fc1InEffect); - } else if (mode == &Mode::BYTE) { - decodeByteSegment(bits_, result, count, currentCharacterSetECI, byteSegments, hints); - } else if (mode == &Mode::KANJI) { - decodeKanjiSegment(bits_, result, count); - } else { - throw FormatException(); - } - } - } - } - } while (mode != &Mode::TERMINATOR); - } catch (IllegalArgumentException const& iae) { - (void)iae; - // from readBits() calls - throw FormatException(); - } - - return Ref(new DecoderResult(bytes, Ref(new String(result)), byteSegments, (string)ecLevel)); -} - diff --git a/src/qzxing/zxing/zxing/qrcode/detector/QRFinderPattern.cpp b/src/qzxing/zxing/zxing/qrcode/detector/QRFinderPattern.cpp deleted file mode 100644 index e6a23a6..0000000 --- a/src/qzxing/zxing/zxing/qrcode/detector/QRFinderPattern.cpp +++ /dev/null @@ -1,69 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -/* - * FinderPattern.cpp - * zxing - * - * Created by Christian Brunschen on 13/05/2008. - * Copyright 2008 ZXing authors All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -using std::abs; -using zxing::Ref; -using zxing::qrcode::FinderPattern; - -FinderPattern::FinderPattern(float posX, float posY, float estimatedModuleSize) - : ResultPoint(posX,posY), estimatedModuleSize_(estimatedModuleSize), count_(1) {} - -FinderPattern::FinderPattern(float posX, float posY, float estimatedModuleSize, int count) - : ResultPoint(posX,posY), estimatedModuleSize_(estimatedModuleSize), count_(count) {} - -int FinderPattern::getCount() const { - return count_; -} - -float FinderPattern::getEstimatedModuleSize() const { - return estimatedModuleSize_; -} - -void FinderPattern::incrementCount() { - count_++; - // cerr << "ic " << getX() << " " << getY() << " " << count_ << endl; -} - -/* - bool FinderPattern::aboutEquals(float moduleSize, float i, float j) const { - return abs(i - posY_) <= moduleSize && abs(j - posX_) <= moduleSize && (abs(moduleSize - estimatedModuleSize_) - <= 1.0f || abs(moduleSize - estimatedModuleSize_) / estimatedModuleSize_ <= 0.1f); - } -*/ -bool FinderPattern::aboutEquals(float moduleSize, float i, float j) const { - if (abs(i - getY()) <= moduleSize && abs(j - getX()) <= moduleSize) { - float moduleSizeDiff = abs(moduleSize - estimatedModuleSize_); - return moduleSizeDiff <= 1.0f || moduleSizeDiff <= estimatedModuleSize_; - } - return false; -} - -Ref FinderPattern::combineEstimate(float i, float j, float newModuleSize) const { - // fprintf(stderr, "ce %f %f %f\n", i, j, newModuleSize); - - int combinedCount = count_ + 1; - float combinedX = (count_ * getX() + j) / combinedCount; - float combinedY = (count_ * getY() + i) / combinedCount; - float combinedModuleSize = (count_ * getEstimatedModuleSize() + newModuleSize) / combinedCount; - return Ref(new FinderPattern(combinedX, combinedY, combinedModuleSize, combinedCount)); -}