diff options
author | weili <weili@chromium.org> | 2016-06-14 18:20:04 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-06-14 18:20:04 -0700 |
commit | 29b8ad0b130ec6ed4f72ebd0c0a4f9e6a5b03467 (patch) | |
tree | d40c21b3396ad28de29640fcf759ca678203910f /xfa/fxbarcode/pdf417 | |
parent | f4bb580add3824196dc49cd7de2f7d051019ede8 (diff) | |
download | pdfium-29b8ad0b130ec6ed4f72ebd0c0a4f9e6a5b03467.tar.xz |
Make code compile with clang_use_chrome_plugin (part III)
This change contains files in xfa/fxbarcode directory.
This is part of the efforts to make PDFium code compilable
by Clang chromium style plugins.
The changes are mainly the following:
-- move inline constructor/destructor of complex class/struct out-of-line;
-- add constructor/destructor of complex class/struct if not
explicitly defined;
-- add explicit out-of-line copy constructor when needed;
-- move inline virtual functions out-of-line;
-- Properly mark virtual functions with 'override';
-- some minor cleanups;
BUG=pdfium:469
Review-Url: https://codereview.chromium.org/2067903002
Diffstat (limited to 'xfa/fxbarcode/pdf417')
20 files changed, 33 insertions, 6 deletions
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417.h b/xfa/fxbarcode/pdf417/BC_PDF417.h index 2e46f80ce8..f2fb5cb89e 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417.h @@ -18,6 +18,7 @@ class CBC_PDF417 { CBC_PDF417(); CBC_PDF417(FX_BOOL compact); virtual ~CBC_PDF417(); + CBC_BarcodeMatrix* getBarcodeMatrix(); void generateBarcodeLogic(CFX_WideString msg, int32_t errorCorrectionLevel, diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h index c86f714fbb..16da60f5cd 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h @@ -16,6 +16,7 @@ class CBC_BarcodeMatrix { CBC_BarcodeMatrix(); CBC_BarcodeMatrix(int32_t height, int32_t width); virtual ~CBC_BarcodeMatrix(); + void set(int32_t x, int32_t y, uint8_t value); void setMatrix(int32_t x, int32_t y, FX_BOOL black); void startRow(); diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h index 2b398f13f6..07072e5217 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h @@ -16,6 +16,7 @@ class CBC_BarcodeMetadata { int32_t rowCountLowerPart, int32_t errorCorrectionLevel); virtual ~CBC_BarcodeMetadata(); + int32_t getColumnCount(); int32_t getErrorCorrectionLevel(); int32_t getRowCount(); diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h index 80d931b587..9bf1b3cbce 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h @@ -13,6 +13,7 @@ class CBC_BarcodeRow { public: CBC_BarcodeRow(int32_t width); virtual ~CBC_BarcodeRow(); + void set(int32_t x, uint8_t value); void set(int32_t x, FX_BOOL black); void addBar(FX_BOOL black, int32_t width); diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BoundingBox.h b/xfa/fxbarcode/pdf417/BC_PDF417BoundingBox.h index 3ae0e107ab..69a43e0700 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417BoundingBox.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417BoundingBox.h @@ -22,6 +22,7 @@ class CBC_BoundingBox { int32_t& e); CBC_BoundingBox(CBC_BoundingBox* boundingBox); virtual ~CBC_BoundingBox(); + static CBC_BoundingBox* merge(CBC_BoundingBox* leftBox, CBC_BoundingBox* rightBox, int32_t& e); diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Codeword.h b/xfa/fxbarcode/pdf417/BC_PDF417Codeword.h index d397485b1d..2423cab757 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417Codeword.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417Codeword.h @@ -13,6 +13,7 @@ class CBC_Codeword { public: CBC_Codeword(int32_t startX, int32_t endX, int32_t bucket, int32_t value); virtual ~CBC_Codeword(); + FX_BOOL hasValidRowNumber(); FX_BOOL isValidRowNumber(int32_t rowNumber); void setRowNumberAsRowIndicatorColumn(); diff --git a/xfa/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h b/xfa/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h index 4c31b31ea2..ed0c235a9a 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h @@ -13,6 +13,7 @@ class CBC_PDF417CodewordDecoder { public: CBC_PDF417CodewordDecoder(); virtual ~CBC_PDF417CodewordDecoder(); + static void Initialize(); static void Finalize(); static int32_t getDecodedValue(CFX_Int32Array& moduleBitCount); diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Common.h b/xfa/fxbarcode/pdf417/BC_PDF417Common.h index c72d66410e..490507285b 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417Common.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417Common.h @@ -13,6 +13,7 @@ class CBC_PDF417Common { public: CBC_PDF417Common(); virtual ~CBC_PDF417Common(); + static int32_t getBitCountSum(CFX_Int32Array& moduleBitCount); static int32_t getCodeword(uint32_t symbol); static const int32_t NUMBER_OF_CODEWORDS = 929; diff --git a/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h b/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h index e08fb15427..e32103e27c 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h @@ -17,6 +17,7 @@ class CBC_DecodedBitStreamPaser { public: CBC_DecodedBitStreamPaser(); virtual ~CBC_DecodedBitStreamPaser(); + static void Initialize(); static void Finalize(); static CBC_CommonDecoderResult* decode(CFX_Int32Array& codewords, diff --git a/xfa/fxbarcode/pdf417/BC_PDF417DetectionResult.h b/xfa/fxbarcode/pdf417/BC_PDF417DetectionResult.h index 1590ce227a..e5cad81b9f 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417DetectionResult.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417DetectionResult.h @@ -16,6 +16,7 @@ class CBC_DetectionResult { CBC_DetectionResult(CBC_BarcodeMetadata* barcodeMetadata, CBC_BoundingBox* boundingBox); virtual ~CBC_DetectionResult(); + CFX_ArrayTemplate<CBC_DetectionResultColumn*>& getDetectionResultColumns(); void setBoundingBox(CBC_BoundingBox* boundingBox); CBC_BoundingBox* getBoundingBox(); diff --git a/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h b/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h index f914354124..23fbe74bc3 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h @@ -14,7 +14,8 @@ class CBC_DetectionResultRowIndicatorColumn : public CBC_DetectionResultColumn { public: CBC_DetectionResultRowIndicatorColumn(CBC_BoundingBox* boundingBox, FX_BOOL isLeft); - virtual ~CBC_DetectionResultRowIndicatorColumn(); + ~CBC_DetectionResultRowIndicatorColumn() override; + void setRowNumbers(); int32_t adjustCompleteIndicatorColumnRowNumbers( CBC_BarcodeMetadata barcodeMetadata); diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Detector.h b/xfa/fxbarcode/pdf417/BC_PDF417Detector.h index c6fa6f6e7e..c7c21b2a22 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417Detector.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417Detector.h @@ -17,6 +17,7 @@ class CBC_Detector { public: CBC_Detector(); virtual ~CBC_Detector(); + static CBC_PDF417DetectorResult* detect(CBC_BinaryBitmap* image, int32_t hints, FX_BOOL multiple, diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Dimensions.h b/xfa/fxbarcode/pdf417/BC_PDF417Dimensions.h index 622ad236bc..dedbea3e58 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417Dimensions.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417Dimensions.h @@ -16,6 +16,7 @@ class CBC_Dimensions { int32_t minRows, int32_t maxRows); virtual ~CBC_Dimensions(); + int32_t getMinCols(); int32_t getMaxCols(); int32_t getMinRows(); diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h b/xfa/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h index 95e691a60a..2503311c72 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h @@ -13,6 +13,7 @@ class CBC_PDF417ECErrorCorrection { public: CBC_PDF417ECErrorCorrection(); virtual ~CBC_PDF417ECErrorCorrection(); + static void Initialize(int32_t& e); static void Finalize(); static int32_t decode(CFX_Int32Array& received, diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ECModulusGF.h b/xfa/fxbarcode/pdf417/BC_PDF417ECModulusGF.h index 094e00164d..3614f5355d 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417ECModulusGF.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417ECModulusGF.h @@ -12,6 +12,7 @@ class CBC_PDF417ECModulusGF { public: CBC_PDF417ECModulusGF(int32_t modulus, int32_t generator, int32_t& e); virtual ~CBC_PDF417ECModulusGF(); + static void Initialize(int32_t& e); static void Finalize(); CBC_PDF417ECModulusPoly* getZero(); diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h b/xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h index b97638660f..20717b118b 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h @@ -15,6 +15,7 @@ class CBC_PDF417ErrorCorrection { public: CBC_PDF417ErrorCorrection(); virtual ~CBC_PDF417ErrorCorrection(); + static int32_t getErrorCorrectionCodewordCount(int32_t errorCorrectionLevel, int32_t& e); static int32_t getRecommendedMinimumErrorCorrectionLevel(int32_t n, diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Reader.h b/xfa/fxbarcode/pdf417/BC_PDF417Reader.h index 73499b9cdf..193d7efdee 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417Reader.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417Reader.h @@ -17,13 +17,18 @@ class CBC_ResultPoint; class CBC_PDF417Reader : public CBC_Reader { public: CBC_PDF417Reader(); - virtual ~CBC_PDF417Reader(); - CFX_ByteString Decode(CBC_BinaryBitmap* image, int32_t& e); + ~CBC_PDF417Reader() override; + + // CBC_Reader + CFX_ByteString Decode(CBC_BinaryBitmap* image, int32_t& e) override; + CFX_ByteString Decode(CBC_BinaryBitmap* image, + int32_t hints, + int32_t& e) override; + CFX_ByteString Decode(CBC_BinaryBitmap* image, FX_BOOL multiple, int32_t hints, int32_t& e); - CFX_ByteString Decode(CBC_BinaryBitmap* image, int32_t hints, int32_t& e); private: static int32_t getMaxWidth(CBC_ResultPoint* p1, CBC_ResultPoint* p2); diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ResultMetadata.h b/xfa/fxbarcode/pdf417/BC_PDF417ResultMetadata.h index 924f25f1c4..92f4ea4966 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417ResultMetadata.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417ResultMetadata.h @@ -13,6 +13,7 @@ class CBC_PDF417ResultMetadata { public: CBC_PDF417ResultMetadata(); virtual ~CBC_PDF417ResultMetadata(); + int32_t getSegmentIndex(); void setSegmentIndex(int32_t segmentIndex); CFX_ByteString getFileId(); diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h b/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h index aa99d5a0d4..d136630003 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h @@ -22,6 +22,7 @@ class CBC_PDF417ScanningDecoder { public: CBC_PDF417ScanningDecoder(); virtual ~CBC_PDF417ScanningDecoder(); + static void Initialize(); static void Finalize(); static CBC_CommonDecoderResult* decode(CBC_CommonBitMatrix* image, diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Writer.h b/xfa/fxbarcode/pdf417/BC_PDF417Writer.h index 7f7195948c..e16c51474e 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417Writer.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417Writer.h @@ -14,12 +14,16 @@ class CBC_PDF417Writer : public CBC_TwoDimWriter { public: CBC_PDF417Writer(); - virtual ~CBC_PDF417Writer(); + ~CBC_PDF417Writer() override; + uint8_t* Encode(const CFX_WideString& contents, int32_t& outWidth, int32_t& outHeight, int32_t& e); - FX_BOOL SetErrorCorrectionLevel(int32_t level); + + // CBC_TwoDimWriter + FX_BOOL SetErrorCorrectionLevel(int32_t level) override; + void SetTruncated(FX_BOOL truncated); private: |