| OLD | NEW | 
|---|
| 1 // Copyright 2014 PDFium Authors. All rights reserved. | 1 // Copyright 2014 PDFium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com | 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com | 
| 6 // Original code is licensed as follows: | 6 // Original code is licensed as follows: | 
| 7 /* | 7 /* | 
| 8  * Copyright 2009 ZXing authors | 8  * Copyright 2009 ZXing authors | 
| 9  * | 9  * | 
| 10  * Licensed under the Apache License, Version 2.0 (the "License"); | 10  * Licensed under the Apache License, Version 2.0 (the "License"); | 
| 11  * you may not use this file except in compliance with the License. | 11  * you may not use this file except in compliance with the License. | 
| 12  * You may obtain a copy of the License at | 12  * You may obtain a copy of the License at | 
| 13  * | 13  * | 
| 14  *      http://www.apache.org/licenses/LICENSE-2.0 | 14  *      http://www.apache.org/licenses/LICENSE-2.0 | 
| 15  * | 15  * | 
| 16  * Unless required by applicable law or agreed to in writing, software | 16  * Unless required by applicable law or agreed to in writing, software | 
| 17  * distributed under the License is distributed on an "AS IS" BASIS, | 17  * distributed under the License is distributed on an "AS IS" BASIS, | 
| 18  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | 18  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | 
| 19  * See the License for the specific language governing permissions and | 19  * See the License for the specific language governing permissions and | 
| 20  * limitations under the License. | 20  * limitations under the License. | 
| 21  */ | 21  */ | 
| 22 | 22 | 
| 23 #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" | 23 #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" | 
| 24 #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" | 24 #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" | 
| 25 #include "xfa/src/fxbarcode/BC_DecoderResult.h" | 25 #include "xfa/src/fxbarcode/BC_DecoderResult.h" | 
| 26 #include "xfa/src/fxbarcode/BC_Reader.h" | 26 #include "xfa/src/fxbarcode/BC_Reader.h" | 
| 27 #include "xfa/src/fxbarcode/BC_ResultPoint.h" | 27 #include "xfa/src/fxbarcode/BC_ResultPoint.h" | 
| 28 #include "xfa/src/fxbarcode/barcode.h" |  | 
| 29 #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" | 28 #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" | 
| 30 #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" | 29 #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" | 
| 31 #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" | 30 #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" | 
| 32 #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" | 31 #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" | 
| 33 #include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h" | 32 #include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h" | 
| 34 #include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" | 33 #include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" | 
| 35 #include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" | 34 #include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" | 
| 36 #include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" | 35 #include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" | 
| 37 #include "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h" | 36 #include "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h" | 
| 38 #include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" | 37 #include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" | 
| 39 #include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" | 38 #include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" | 
| 40 #include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" | 39 #include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" | 
| 41 #include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" | 40 #include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" | 
| 42 #include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h" | 41 #include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h" | 
| 43 #include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" | 42 #include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" | 
| 44 #include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" | 43 #include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" | 
| 45 #include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h" | 44 #include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h" | 
| 46 #include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" | 45 #include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" | 
| 47 #include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" | 46 #include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" | 
| 48 #include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h" | 47 #include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h" | 
| 49 #include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" | 48 #include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" | 
| 50 #include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" | 49 #include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" | 
| 51 #include "xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h" | 50 #include "xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h" | 
| 52 #include "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h" | 51 #include "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h" | 
|  | 52 #include "xfa/src/fxbarcode/utils.h" | 
|  | 53 | 
| 53 #define Integer_MAX_VALUE 2147483647 | 54 #define Integer_MAX_VALUE 2147483647 | 
|  | 55 | 
| 54 CBC_PDF417Reader::CBC_PDF417Reader() {} | 56 CBC_PDF417Reader::CBC_PDF417Reader() {} | 
| 55 CBC_PDF417Reader::~CBC_PDF417Reader() {} | 57 CBC_PDF417Reader::~CBC_PDF417Reader() {} | 
| 56 CFX_ByteString CBC_PDF417Reader::Decode(CBC_BinaryBitmap* image, int32_t& e) { | 58 CFX_ByteString CBC_PDF417Reader::Decode(CBC_BinaryBitmap* image, int32_t& e) { | 
| 57   return Decode(image, 0, e); | 59   return Decode(image, 0, e); | 
| 58 } | 60 } | 
| 59 CFX_ByteString CBC_PDF417Reader::Decode(CBC_BinaryBitmap* image, | 61 CFX_ByteString CBC_PDF417Reader::Decode(CBC_BinaryBitmap* image, | 
| 60                                         FX_BOOL multiple, | 62                                         FX_BOOL multiple, | 
| 61                                         int32_t hints, | 63                                         int32_t hints, | 
| 62                                         int32_t& e) { | 64                                         int32_t& e) { | 
| 63   CFX_ByteString results; | 65   CFX_ByteString results; | 
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 138                   ? getMinWidth((CBC_ResultPoint*)p.GetAt(0), | 140                   ? getMinWidth((CBC_ResultPoint*)p.GetAt(0), | 
| 139                                 (CBC_ResultPoint*)p.GetAt(4)) | 141                                 (CBC_ResultPoint*)p.GetAt(4)) | 
| 140                   : a; | 142                   : a; | 
| 141   int32_t d = getMinWidth((CBC_ResultPoint*)p.GetAt(1), | 143   int32_t d = getMinWidth((CBC_ResultPoint*)p.GetAt(1), | 
| 142                           (CBC_ResultPoint*)p.GetAt(5)) < b | 144                           (CBC_ResultPoint*)p.GetAt(5)) < b | 
| 143                   ? getMinWidth((CBC_ResultPoint*)p.GetAt(1), | 145                   ? getMinWidth((CBC_ResultPoint*)p.GetAt(1), | 
| 144                                 (CBC_ResultPoint*)p.GetAt(5)) | 146                                 (CBC_ResultPoint*)p.GetAt(5)) | 
| 145                   : b; | 147                   : b; | 
| 146   return c < d ? c : d; | 148   return c < d ? c : d; | 
| 147 } | 149 } | 
| OLD | NEW | 
|---|