summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BUILD.gn1
-rw-r--r--xfa.gyp1
-rw-r--r--xfa/src/fxbarcode/BC_BarCode.cpp2
-rw-r--r--xfa/src/fxbarcode/BC_Binarizer.cpp2
-rw-r--r--xfa/src/fxbarcode/BC_BinaryBitmap.cpp3
-rw-r--r--xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp4
-rw-r--r--xfa/src/fxbarcode/BC_Dimension.cpp2
-rw-r--r--xfa/src/fxbarcode/BC_Library.cpp2
-rw-r--r--xfa/src/fxbarcode/BC_LuminanceSource.cpp2
-rw-r--r--xfa/src/fxbarcode/BC_Reader.cpp2
-rw-r--r--xfa/src/fxbarcode/BC_ResultPoint.cpp2
-rw-r--r--xfa/src/fxbarcode/BC_TwoDimWriter.cpp1
-rw-r--r--xfa/src/fxbarcode/BC_UtilCodingConvert.cpp1
-rw-r--r--xfa/src/fxbarcode/BC_UtilRSS.cpp5
-rw-r--r--xfa/src/fxbarcode/BC_Utils.cpp4
-rw-r--r--xfa/src/fxbarcode/BC_Writer.cpp2
-rw-r--r--xfa/src/fxbarcode/barcode.h15
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonBitArray.cpp3
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonBitArray.h2
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp3
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonBitMatrix.h3
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonBitSource.cpp2
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonBitSource.h3
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonByteArray.cpp2
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonByteArray.h2
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp3
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonByteMatrix.h4
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp2
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h1
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp4
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonDecoderResult.h3
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonECI.cpp3
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonECI.h2
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp4
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h2
-rw-r--r--xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp4
-rw-r--r--xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp4
-rw-r--r--xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h3
-rw-r--r--xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp2
-rw-r--r--xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h3
-rw-r--r--xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp2
-rw-r--r--xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h3
-rw-r--r--xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp2
-rw-r--r--xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h3
-rw-r--r--xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp3
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h3
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp3
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h3
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp3
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp3
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp6
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h6
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_Encoder.h2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp5
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp3
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp2
-rw-r--r--xfa/src/fxbarcode/oned/BC_OneDReader.cpp4
-rw-r--r--xfa/src/fxbarcode/oned/BC_OneDReader.h4
-rw-r--r--xfa/src/fxbarcode/oned/BC_OneDimReader.cpp4
-rw-r--r--xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp1
-rw-r--r--xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp5
-rw-r--r--xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp3
-rw-r--r--xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp3
-rw-r--r--xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp3
-rw-r--r--xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp4
-rw-r--r--xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp2
-rw-r--r--xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp4
-rw-r--r--xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp2
-rw-r--r--xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp3
-rw-r--r--xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp2
-rw-r--r--xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp4
-rw-r--r--xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417.cpp3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417.h1
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp4
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417Common.h2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp4
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp11
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp4
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp4
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h4
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp4
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp4
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp4
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp2
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp2
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp2
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp2
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h4
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp2
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp2
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp4
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h2
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp2
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp2
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp2
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h2
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp2
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h2
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp4
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp4
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp4
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h5
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp4
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRDataMask.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp2
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp2
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp2
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp5
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp4
-rw-r--r--xfa/src/fxbarcode/utils.h2
167 files changed, 334 insertions, 142 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 8cd8292a17..6b7131f351 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1054,7 +1054,6 @@ if (pdf_enable_xfa) {
"xfa/src/fxbarcode/BC_Utils.cpp",
"xfa/src/fxbarcode/BC_Writer.cpp",
"xfa/src/fxbarcode/BC_Writer.h",
- "xfa/src/fxbarcode/barcode.h",
"xfa/src/fxbarcode/common/BC_CommonBitArray.cpp",
"xfa/src/fxbarcode/common/BC_CommonBitArray.h",
"xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp",
diff --git a/xfa.gyp b/xfa.gyp
index 992ddee80e..23dc24b644 100644
--- a/xfa.gyp
+++ b/xfa.gyp
@@ -513,7 +513,6 @@
"xfa/src/fxbarcode/BC_UtilCodingConvert.h",
"xfa/src/fxbarcode/BC_UtilRSS.h",
"xfa/src/fxbarcode/BC_Writer.h",
- "xfa/src/fxbarcode/barcode.h",
"xfa/src/fxbarcode/utils.h",
"xfa/src/fxfa/src/app/xfa_checksum.cpp",
"xfa/src/fxfa/src/app/xfa_checksum.h",
diff --git a/xfa/src/fxbarcode/BC_BarCode.cpp b/xfa/src/fxbarcode/BC_BarCode.cpp
index 5fbbee65c1..d76ec810d6 100644
--- a/xfa/src/fxbarcode/BC_BarCode.cpp
+++ b/xfa/src/fxbarcode/BC_BarCode.cpp
@@ -31,7 +31,6 @@
#include "xfa/src/fxbarcode/BC_TwoDimWriter.h"
#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
#include "xfa/src/fxbarcode/BC_Writer.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
@@ -80,6 +79,7 @@
#include "xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h"
+
CBC_CodeBase::CBC_CodeBase() {}
CBC_CodeBase::~CBC_CodeBase() {}
FX_BOOL CBC_CodeBase::SetCharEncoding(int32_t encoding) {
diff --git a/xfa/src/fxbarcode/BC_Binarizer.cpp b/xfa/src/fxbarcode/BC_Binarizer.cpp
index d61eeae601..8e214561c6 100644
--- a/xfa/src/fxbarcode/BC_Binarizer.cpp
+++ b/xfa/src/fxbarcode/BC_Binarizer.cpp
@@ -22,9 +22,9 @@
#include "xfa/src/fxbarcode/BC_Binarizer.h"
#include "xfa/src/fxbarcode/BC_LuminanceSource.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+
CBC_Binarizer::CBC_Binarizer(CBC_LuminanceSource* source) {
m_source = source;
}
diff --git a/xfa/src/fxbarcode/BC_BinaryBitmap.cpp b/xfa/src/fxbarcode/BC_BinaryBitmap.cpp
index 23789cc8a2..a21e00e9fe 100644
--- a/xfa/src/fxbarcode/BC_BinaryBitmap.cpp
+++ b/xfa/src/fxbarcode/BC_BinaryBitmap.cpp
@@ -23,9 +23,10 @@
#include "xfa/src/fxbarcode/BC_Binarizer.h"
#include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
#include "xfa/src/fxbarcode/BC_LuminanceSource.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_BinaryBitmap::CBC_BinaryBitmap(CBC_Binarizer* binarizer)
: m_binarizer(binarizer), m_matrix(NULL) {}
CBC_BinaryBitmap::~CBC_BinaryBitmap() {
diff --git a/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp b/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp
index 1b73618ac6..b2fc8a5eac 100644
--- a/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp
+++ b/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp
@@ -20,9 +20,11 @@
* limitations under the License.
*/
+#include "core/include/fxcodec/fx_codec.h"
#include "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h"
#include "xfa/src/fxbarcode/BC_LuminanceSource.h"
-#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/utils.h"
+
class CBC_Pause : public IFX_Pause {
public:
virtual FX_BOOL NeedToPauseNow() { return TRUE; }
diff --git a/xfa/src/fxbarcode/BC_Dimension.cpp b/xfa/src/fxbarcode/BC_Dimension.cpp
index 35671b3a9e..253a4ea7e0 100644
--- a/xfa/src/fxbarcode/BC_Dimension.cpp
+++ b/xfa/src/fxbarcode/BC_Dimension.cpp
@@ -21,8 +21,8 @@
*/
#include "xfa/src/fxbarcode/BC_Dimension.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h"
+
CBC_Dimension::CBC_Dimension() {}
CBC_Dimension::CBC_Dimension(int32_t width, int32_t height, int32_t& e) {
if (width < 0 || height < 0) {
diff --git a/xfa/src/fxbarcode/BC_Library.cpp b/xfa/src/fxbarcode/BC_Library.cpp
index 3a47c162e5..a5ec431db9 100644
--- a/xfa/src/fxbarcode/BC_Library.cpp
+++ b/xfa/src/fxbarcode/BC_Library.cpp
@@ -17,7 +17,6 @@
#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
#include "xfa/src/fxbarcode/BC_Writer.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
@@ -86,6 +85,7 @@
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h"
+
void BC_Library_Init() {
CBC_QRCoderErrorCorrectionLevel::Initialize();
CBC_QRCoderMode::Initialize();
diff --git a/xfa/src/fxbarcode/BC_LuminanceSource.cpp b/xfa/src/fxbarcode/BC_LuminanceSource.cpp
index 9bf3f984a6..02ff694ca1 100644
--- a/xfa/src/fxbarcode/BC_LuminanceSource.cpp
+++ b/xfa/src/fxbarcode/BC_LuminanceSource.cpp
@@ -21,7 +21,7 @@
*/
#include "xfa/src/fxbarcode/BC_LuminanceSource.h"
-#include "xfa/src/fxbarcode/barcode.h"
+
CBC_LuminanceSource::CBC_LuminanceSource(int32_t width, int32_t height)
: m_width(width), m_height(height) {}
CBC_LuminanceSource::~CBC_LuminanceSource() {}
diff --git a/xfa/src/fxbarcode/BC_Reader.cpp b/xfa/src/fxbarcode/BC_Reader.cpp
index 5af914ebc3..15d161f174 100644
--- a/xfa/src/fxbarcode/BC_Reader.cpp
+++ b/xfa/src/fxbarcode/BC_Reader.cpp
@@ -5,6 +5,6 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "xfa/src/fxbarcode/BC_Reader.h"
-#include "xfa/src/fxbarcode/barcode.h"
+
CBC_Reader::CBC_Reader() {}
CBC_Reader::~CBC_Reader() {}
diff --git a/xfa/src/fxbarcode/BC_ResultPoint.cpp b/xfa/src/fxbarcode/BC_ResultPoint.cpp
index d499235a3a..492f156da7 100644
--- a/xfa/src/fxbarcode/BC_ResultPoint.cpp
+++ b/xfa/src/fxbarcode/BC_ResultPoint.cpp
@@ -21,7 +21,7 @@
*/
#include "xfa/src/fxbarcode/BC_ResultPoint.h"
-#include "xfa/src/fxbarcode/barcode.h"
+
CBC_ResultPoint::CBC_ResultPoint(FX_FLOAT x, FX_FLOAT y) : m_x(x), m_y(y) {}
FX_FLOAT CBC_ResultPoint::GetX() {
return m_x;
diff --git a/xfa/src/fxbarcode/BC_TwoDimWriter.cpp b/xfa/src/fxbarcode/BC_TwoDimWriter.cpp
index a97ae2069b..3d36135482 100644
--- a/xfa/src/fxbarcode/BC_TwoDimWriter.cpp
+++ b/xfa/src/fxbarcode/BC_TwoDimWriter.cpp
@@ -9,7 +9,6 @@
#include "third_party/base/numerics/safe_math.h"
#include "xfa/src/fxbarcode/BC_TwoDimWriter.h"
#include "xfa/src/fxbarcode/BC_Writer.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
CBC_TwoDimWriter::CBC_TwoDimWriter() {
diff --git a/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp b/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp
index 3ca466ca20..dd42cdb5cc 100644
--- a/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp
+++ b/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp
@@ -5,7 +5,6 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
-#include "xfa/src/fxbarcode/barcode.h"
CBC_UtilCodingConvert::CBC_UtilCodingConvert() {}
diff --git a/xfa/src/fxbarcode/BC_UtilRSS.cpp b/xfa/src/fxbarcode/BC_UtilRSS.cpp
index e2f4d752fd..958f192358 100644
--- a/xfa/src/fxbarcode/BC_UtilRSS.cpp
+++ b/xfa/src/fxbarcode/BC_UtilRSS.cpp
@@ -21,7 +21,10 @@
*/
#include "xfa/src/fxbarcode/BC_UtilRSS.h"
-#include "xfa/src/fxbarcode/barcode.h"
+
+#include "core/include/fxcrt/fx_basic.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_UtilRSS::CBC_UtilRSS() {}
CBC_UtilRSS::~CBC_UtilRSS() {}
CFX_Int32Array* CBC_UtilRSS::GetRssWidths(int32_t val,
diff --git a/xfa/src/fxbarcode/BC_Utils.cpp b/xfa/src/fxbarcode/BC_Utils.cpp
index ba1462d53f..5c681a99d7 100644
--- a/xfa/src/fxbarcode/BC_Utils.cpp
+++ b/xfa/src/fxbarcode/BC_Utils.cpp
@@ -4,7 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/fxbarcode/barcode.h"
+#include "core/include/fxcrt/fx_basic.h"
+#include "xfa/src/fxbarcode/utils.h"
+
FX_BOOL BC_FX_ByteString_Replace(CFX_ByteString& dst,
FX_DWORD first,
FX_DWORD last,
diff --git a/xfa/src/fxbarcode/BC_Writer.cpp b/xfa/src/fxbarcode/BC_Writer.cpp
index 224fe50a91..87b856a61e 100644
--- a/xfa/src/fxbarcode/BC_Writer.cpp
+++ b/xfa/src/fxbarcode/BC_Writer.cpp
@@ -5,7 +5,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "xfa/src/fxbarcode/BC_Writer.h"
-#include "xfa/src/fxbarcode/barcode.h"
+
CBC_Writer::CBC_Writer() {
m_CharEncoding = 0;
m_ModuleHeight = 1;
diff --git a/xfa/src/fxbarcode/barcode.h b/xfa/src/fxbarcode/barcode.h
deleted file mode 100644
index f46ce86d00..0000000000
--- a/xfa/src/fxbarcode/barcode.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-// TODO(thestig): Remove this file and do IWYU.
-
-#ifndef XFA_SRC_FXBARCODE_BARCODE_H_
-#define XFA_SRC_FXBARCODE_BARCODE_H_
-
-#include "xfa/src/foxitlib.h"
-#include "xfa/src/fxbarcode/utils.h"
-
-#endif // XFA_SRC_FXBARCODE_BARCODE_H_
diff --git a/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp b/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp
index 7801746701..43f1758720 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp
@@ -20,8 +20,9 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_CommonBitArray::CBC_CommonBitArray(CBC_CommonBitArray* array) {
m_size = array->GetSize();
m_bits.Copy(array->GetBits());
diff --git a/xfa/src/fxbarcode/common/BC_CommonBitArray.h b/xfa/src/fxbarcode/common/BC_CommonBitArray.h
index c2364c2bc8..bf2b3559b7 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitArray.h
+++ b/xfa/src/fxbarcode/common/BC_CommonBitArray.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXBARCODE_COMMON_BC_COMMONBITARRAY_H_
#define XFA_SRC_FXBARCODE_COMMON_BC_COMMONBITARRAY_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_CommonBitArray {
public:
CBC_CommonBitArray(CBC_CommonBitArray* array);
diff --git a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp
index aa4cb2c243..e346967a27 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp
@@ -20,9 +20,10 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_CommonBitMatrix::CBC_CommonBitMatrix() {
m_width = 0;
m_height = 0;
diff --git a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h
index 75e0b43502..86838a1d91 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h
+++ b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h
@@ -7,7 +7,10 @@
#ifndef XFA_SRC_FXBARCODE_COMMON_BC_COMMONBITMATRIX_H_
#define XFA_SRC_FXBARCODE_COMMON_BC_COMMONBITMATRIX_H_
+#include "core/include/fxcrt/fx_system.h"
+
class CBC_CommonBitArray;
+
class CBC_CommonBitMatrix {
public:
CBC_CommonBitMatrix();
diff --git a/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp b/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp
index 19bfe3eab7..dc10002f84 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp
@@ -20,8 +20,8 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitSource.h"
+
CBC_CommonBitSource::CBC_CommonBitSource(CFX_ByteArray* bytes) {
m_bytes.Copy((*bytes));
m_bitOffset = 0;
diff --git a/xfa/src/fxbarcode/common/BC_CommonBitSource.h b/xfa/src/fxbarcode/common/BC_CommonBitSource.h
index 546e5e9d5c..0e2a4bfb58 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitSource.h
+++ b/xfa/src/fxbarcode/common/BC_CommonBitSource.h
@@ -7,6 +7,9 @@
#ifndef XFA_SRC_FXBARCODE_COMMON_BC_COMMONBITSOURCE_H_
#define XFA_SRC_FXBARCODE_COMMON_BC_COMMONBITSOURCE_H_
+#include "core/include/fxcrt/fx_basic.h"
+#include "xfa/src/fxbarcode/utils.h"
+
class CBC_CommonBitSource {
public:
CBC_CommonBitSource(CFX_ByteArray* bytes);
diff --git a/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp b/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp
index 7917dcc198..e085ffcec2 100644
--- a/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp
@@ -22,8 +22,8 @@
#include <algorithm>
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonByteArray.h"
+
CBC_CommonByteArray::CBC_CommonByteArray() {
m_bytes = NULL;
m_size = 0;
diff --git a/xfa/src/fxbarcode/common/BC_CommonByteArray.h b/xfa/src/fxbarcode/common/BC_CommonByteArray.h
index 1653596e57..c8fb05d50a 100644
--- a/xfa/src/fxbarcode/common/BC_CommonByteArray.h
+++ b/xfa/src/fxbarcode/common/BC_CommonByteArray.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXBARCODE_COMMON_BC_COMMONBYTEARRAY_H_
#define XFA_SRC_FXBARCODE_COMMON_BC_COMMONBYTEARRAY_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_CommonByteArray {
private:
int32_t m_size;
diff --git a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp
index 302dd99e55..656071fa31 100644
--- a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp
@@ -20,8 +20,9 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
+#include "core/include/fxcrt/fx_memory.h"
#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h"
+
CBC_CommonByteMatrix::CBC_CommonByteMatrix(int32_t width, int32_t height) {
m_height = height;
m_width = width;
diff --git a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h
index 371c185659..d9af45d2f3 100644
--- a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h
+++ b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h
@@ -7,6 +7,10 @@
#ifndef XFA_SRC_FXBARCODE_COMMON_BC_COMMONBYTEMATRIX_H_
#define XFA_SRC_FXBARCODE_COMMON_BC_COMMONBYTEMATRIX_H_
+#include <stdint.h>
+
+#include "core/include/fxcrt/fx_system.h"
+
class CBC_CommonByteMatrix {
public:
CBC_CommonByteMatrix(int32_t width, int32_t height);
diff --git a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp
index 787324deee..58347c37bd 100644
--- a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp
@@ -20,9 +20,9 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h"
#include "xfa/src/fxbarcode/common/BC_CommonECI.h"
+
void CBC_CommonCharacterSetECI::initialize() {}
CBC_CommonCharacterSetECI::CBC_CommonCharacterSetECI(
int32_t value,
diff --git a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h
index 5575147fbe..c593b94f7a 100644
--- a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h
+++ b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h
@@ -7,6 +7,7 @@
#ifndef XFA_SRC_FXBARCODE_COMMON_BC_COMMONCHARACTERSETECI_H_
#define XFA_SRC_FXBARCODE_COMMON_BC_COMMONCHARACTERSETECI_H_
+#include "core/include/fxcrt/fx_string.h"
#include "xfa/src/fxbarcode/common/BC_CommonECI.h"
class CBC_CommonCharacterSetECI : public CBC_CommonECI {
diff --git a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp
index 9df2c31c21..5342cfcca7 100644
--- a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp
@@ -20,10 +20,12 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
+#include "core/include/fxcrt/fx_basic.h"
#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_CommonDecoderResult::CBC_CommonDecoderResult() {}
void CBC_CommonDecoderResult::Init(const CFX_ByteArray& rawBytes,
const CFX_ByteString& text,
diff --git a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h
index 219a9f3a87..185f38d082 100644
--- a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h
+++ b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h
@@ -7,8 +7,11 @@
#ifndef XFA_SRC_FXBARCODE_COMMON_BC_COMMONDECODERRESULT_H_
#define XFA_SRC_FXBARCODE_COMMON_BC_COMMONDECODERRESULT_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_QRCoderErrorCorrectionLevel;
class CBC_PDF417ResultMetadata;
+
class CBC_CommonDecoderResult {
public:
CBC_CommonDecoderResult();
diff --git a/xfa/src/fxbarcode/common/BC_CommonECI.cpp b/xfa/src/fxbarcode/common/BC_CommonECI.cpp
index b6be150eb4..146c9e24ba 100644
--- a/xfa/src/fxbarcode/common/BC_CommonECI.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonECI.cpp
@@ -20,9 +20,10 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h"
#include "xfa/src/fxbarcode/common/BC_CommonECI.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_CommonECI::CBC_CommonECI(int32_t value) {
m_value = value;
}
diff --git a/xfa/src/fxbarcode/common/BC_CommonECI.h b/xfa/src/fxbarcode/common/BC_CommonECI.h
index 3f46b3560c..e0dc797fbf 100644
--- a/xfa/src/fxbarcode/common/BC_CommonECI.h
+++ b/xfa/src/fxbarcode/common/BC_CommonECI.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXBARCODE_COMMON_BC_COMMONECI_H_
#define XFA_SRC_FXBARCODE_COMMON_BC_COMMONECI_H_
+#include <stdint.h>
+
class CBC_CommonECI {
public:
CBC_CommonECI(int32_t value);
diff --git a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp
index 3f8bc44ae3..c0e982cb63 100644
--- a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp
@@ -20,8 +20,10 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
+#include "core/include/fxcrt/fx_basic.h"
#include "xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_CommonPerspectiveTransform::CBC_CommonPerspectiveTransform(FX_FLOAT a11,
FX_FLOAT a21,
FX_FLOAT a31,
diff --git a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h
index 70e7bfb1ae..dfe0ce1f2d 100644
--- a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h
+++ b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXBARCODE_COMMON_BC_COMMONPERSPECTIVETRANSFORM_H_
#define XFA_SRC_FXBARCODE_COMMON_BC_COMMONPERSPECTIVETRANSFORM_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_CommonPerspectiveTransform {
public:
CBC_CommonPerspectiveTransform(FX_FLOAT a11,
diff --git a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp
index 567b357545..6c3920483c 100644
--- a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp
+++ b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp
@@ -22,13 +22,15 @@
#include "xfa/src/fxbarcode/BC_Binarizer.h"
#include "xfa/src/fxbarcode/BC_LuminanceSource.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h"
+#include "xfa/src/fxbarcode/utils.h"
+
const int32_t LUMINANCE_BITS = 5;
const int32_t LUMINANCE_SHIFT = 8 - LUMINANCE_BITS;
const int32_t LUMINANCE_BUCKETS = 1 << LUMINANCE_BITS;
+
CBC_GlobalHistogramBinarizer::CBC_GlobalHistogramBinarizer(
CBC_LuminanceSource* source)
: CBC_Binarizer(source) {}
diff --git a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp
index 13b852c1f7..05d079c9c4 100644
--- a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp
+++ b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp
@@ -21,11 +21,13 @@
*/
#include "xfa/src/fxbarcode/BC_ResultPoint.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h"
+#include "xfa/src/fxbarcode/utils.h"
+
const int32_t CBC_WhiteRectangleDetector::INIT_SIZE = 30;
const int32_t CBC_WhiteRectangleDetector::CORR = 1;
+
CBC_WhiteRectangleDetector::CBC_WhiteRectangleDetector(
CBC_CommonBitMatrix* image) {
m_image = image;
diff --git a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h
index 32ae819a3f..ccd6a84a0d 100644
--- a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h
+++ b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h
@@ -7,8 +7,11 @@
#ifndef XFA_SRC_FXBARCODE_COMMON_BC_WHITERECTANGLEDETECTOR_H_
#define XFA_SRC_FXBARCODE_COMMON_BC_WHITERECTANGLEDETECTOR_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_CommonBitMatrix;
class CBC_ResultPoint;
+
class CBC_WhiteRectangleDetector {
public:
CBC_WhiteRectangleDetector(CBC_CommonBitMatrix* image);
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp
index 26bc9e4c7b..78c5bdc5e2 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp
@@ -20,10 +20,10 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h"
#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h"
+
CBC_ReedSolomonEncoder::CBC_ReedSolomonEncoder(CBC_ReedSolomonGF256* field) {
m_field = field;
}
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
index 339f40ae84..71eacc5e76 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
@@ -7,8 +7,11 @@
#ifndef XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMON_H_
#define XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMON_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_ReedSolomonGF256;
class CBC_ReedSolomonGF256Poly;
+
class CBC_ReedSolomonEncoder {
private:
CBC_ReedSolomonGF256* m_field;
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp
index 22819c9342..86c8a60c39 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp
@@ -20,10 +20,10 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h"
#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h"
+
CBC_ReedSolomonDecoder::CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256* field) {
m_field = field;
}
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
index cb8eefca61..092033ca39 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
@@ -7,8 +7,11 @@
#ifndef XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONDECODER_H_
#define XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONDECODER_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_ReedSolomonGF256;
class CBC_ReedSolomonGF256Poly;
+
class CBC_ReedSolomonDecoder {
private:
CBC_ReedSolomonGF256* m_field;
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp
index 2e059acf37..993b9c526a 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp
@@ -20,9 +20,9 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h"
+
CBC_ReedSolomonGF256* CBC_ReedSolomonGF256::QRCodeFild = NULL;
CBC_ReedSolomonGF256* CBC_ReedSolomonGF256::DataMatrixField = NULL;
void CBC_ReedSolomonGF256::Initialize() {
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
index d635694c10..b351a03079 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
@@ -7,6 +7,9 @@
#ifndef XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256_H_
#define XFA_SRC_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256_H_
+#include "core/include/fxcrt/fx_basic.h"
+#include "xfa/src/fxbarcode/utils.h"
+
class CBC_ReedSolomonGF256Poly;
class CBC_ReedSolomonGF256 {
public:
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp
index cbcc13e369..baafde023a 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp
@@ -20,9 +20,9 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h"
+
CBC_ReedSolomonGF256Poly::CBC_ReedSolomonGF256Poly(CBC_ReedSolomonGF256* field,
int32_t coefficients) {
if (field == NULL) {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp
index 91f5b8ee26..6c4633e605 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp
@@ -21,13 +21,13 @@
*/
#include "xfa/src/fxbarcode/BC_Dimension.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h"
#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h"
#include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h"
#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h"
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h"
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+
CBC_ASCIIEncoder::CBC_ASCIIEncoder() {}
CBC_ASCIIEncoder::~CBC_ASCIIEncoder() {}
int32_t CBC_ASCIIEncoder::getEncodingMode() {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp
index 4fced54c5f..61cacc1612 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp
@@ -21,13 +21,13 @@
*/
#include "xfa/src/fxbarcode/BC_Dimension.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h"
#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h"
#include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h"
#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h"
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h"
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+
CBC_Base256Encoder::CBC_Base256Encoder() {}
CBC_Base256Encoder::~CBC_Base256Encoder() {}
int32_t CBC_Base256Encoder::getEncodingMode() {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp
index 48bce2bd50..a1be45e291 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp
@@ -21,7 +21,6 @@
*/
#include "xfa/src/fxbarcode/BC_Dimension.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h"
#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h"
@@ -29,6 +28,7 @@
#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h"
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h"
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+
CBC_C40Encoder::CBC_C40Encoder() {}
CBC_C40Encoder::~CBC_C40Encoder() {}
int32_t CBC_C40Encoder::getEncodingMode() {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp
index 6b9191bd56..4ba3a5c44b 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp
@@ -20,10 +20,11 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h"
#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_DataMatrixBitMatrixParser::CBC_DataMatrixBitMatrixParser() {
m_mappingBitMatrix = NULL;
m_version = NULL;
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
index 2008ea7f2c..967e08ddfd 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
@@ -7,8 +7,11 @@
#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXBITMATRIXPARSER_H_
#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXBITMATRIXPARSER_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_CommonBitMatrix;
class CBC_DataMatrixVersion;
+
class CBC_DataMatrixBitMatrixParser {
public:
CBC_DataMatrixBitMatrixParser();
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp
index c3eae91d34..4728bb3572 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp
@@ -20,9 +20,10 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h"
#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_DataMatrixDataBlock::~CBC_DataMatrixDataBlock() {}
CBC_DataMatrixDataBlock::CBC_DataMatrixDataBlock(int32_t numDataCodewords,
CFX_ByteArray* codewords) {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
index ca81e62655..68a4ceacc7 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
@@ -7,7 +7,10 @@
#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDATABLOCK_H_
#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDATABLOCK_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_DataMatrixVersion;
+
class CBC_DataMatrixDataBlock {
public:
virtual ~CBC_DataMatrixDataBlock();
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp
index 697d617ae5..02a202b27d 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp
@@ -20,10 +20,10 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitSource.h"
#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h"
#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h"
+
const FX_CHAR CBC_DataMatrixDecodedBitStreamParser::C40_BASIC_SET_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',
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp
index d260c396af..45e9abda1f 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp
@@ -20,7 +20,6 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h"
#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
@@ -29,6 +28,7 @@
#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h"
#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h"
#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h"
+
CBC_DataMatrixDecoder::CBC_DataMatrixDecoder() {
m_rsDecoder = NULL;
}
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp
index 930480f7b9..d1b36b9949 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp
@@ -23,13 +23,14 @@
#include <algorithm>
#include "xfa/src/fxbarcode/BC_ResultPoint.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h"
#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h"
+#include "xfa/src/fxbarcode/utils.h"
+
const int32_t CBC_DataMatrixDetector::INTEGERS[5] = {0, 1, 2, 3, 4};
CBC_DataMatrixDetector::CBC_DataMatrixDetector(CBC_CommonBitMatrix* image)
: m_image(image), m_rectangleDetector(NULL) {}
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp
index fb2e51c21f..1b2f82d489 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp
@@ -22,12 +22,13 @@
#include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
#include "xfa/src/fxbarcode/BC_Reader.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h"
#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h"
#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h"
#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_DataMatrixReader::CBC_DataMatrixReader() {
m_decoder = NULL;
}
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp
index 89483fe28c..2e7685dbb6 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp
@@ -20,11 +20,11 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h"
#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h"
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h"
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+
CBC_DataMatrixSymbolInfo144::CBC_DataMatrixSymbolInfo144()
: CBC_SymbolInfo(FALSE, 1558, 620, 22, 22, 36) {
m_rsBlockData = -1;
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp
index 7994594c55..28262ca1f0 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp
@@ -20,9 +20,13 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
+#include <stdint.h>
+
#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CFX_PtrArray* CBC_DataMatrixVersion::VERSIONS = NULL;
+
void CBC_DataMatrixVersion::Initialize() {
VERSIONS = new CFX_PtrArray();
}
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
index e96b743164..0a29e2b49c 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
@@ -7,8 +7,10 @@
#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXVERSION_H_
#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXVERSION_H_
-class ECBlocks;
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_DataMatrixVersion;
+
class ECB {
public:
ECB(int32_t count, int32_t dataCodewords) {
@@ -24,6 +26,7 @@ class ECB {
int32_t m_count;
int32_t m_dataCodewords;
};
+
class ECBlocks {
public:
ECBlocks(int32_t ecCodewords, ECB* ecBlocks) {
@@ -51,6 +54,7 @@ class ECBlocks {
int32_t m_ecCodewords;
CFX_PtrArray m_ecBlocks;
};
+
class CBC_DataMatrixVersion {
public:
CBC_DataMatrixVersion(int32_t versionNumber,
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
index ab488d9a5b..5a6a082808 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
@@ -25,7 +25,6 @@
#include "xfa/src/fxbarcode/BC_TwoDimWriter.h"
#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
#include "xfa/src/fxbarcode/BC_Writer.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h"
#include "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h"
@@ -43,6 +42,7 @@
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
#include "xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h"
#include "xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h"
+
CBC_DataMatrixWriter::CBC_DataMatrixWriter() {}
CBC_DataMatrixWriter::~CBC_DataMatrixWriter() {}
FX_BOOL CBC_DataMatrixWriter::SetErrorCorrectionLevel(int32_t level) {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp
index d87ac7472c..f021b75282 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp
@@ -20,9 +20,9 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h"
#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h"
+
CBC_DefaultPlacement::CBC_DefaultPlacement(CFX_WideString codewords,
int32_t numcols,
int32_t numrows) {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h
index 860199e42d..be67f3c05a 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DEFAULTPLACEMENT_H_
#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DEFAULTPLACEMENT_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_DefaultPlacement {
public:
CBC_DefaultPlacement(CFX_WideString codewords,
diff --git a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
index 81822335f9..006c85117d 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
@@ -21,7 +21,6 @@
*/
#include "xfa/src/fxbarcode/BC_Dimension.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h"
#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h"
@@ -29,6 +28,7 @@
#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h"
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h"
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+
CBC_EdifactEncoder::CBC_EdifactEncoder() {}
CBC_EdifactEncoder::~CBC_EdifactEncoder() {}
int32_t CBC_EdifactEncoder::getEncodingMode() {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp
index bb4d9492df..5a5ca3f5a4 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h"
+
CBC_Encoder::CBC_Encoder() {}
CBC_Encoder::~CBC_Encoder() {}
diff --git a/xfa/src/fxbarcode/datamatrix/BC_Encoder.h b/xfa/src/fxbarcode/datamatrix/BC_Encoder.h
index 36637fd3aa..a11b19cc74 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_Encoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_Encoder.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_ENCODER_H_
#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_ENCODER_H_
+#include "xfa/src/fxbarcode/utils.h"
+
class CBC_EncoderContext;
class CBC_Encoder {
public:
diff --git a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp
index 51d4583668..54aa5349b0 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp
@@ -22,12 +22,12 @@
#include "xfa/src/fxbarcode/BC_Dimension.h"
#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h"
#include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h"
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h"
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+
CBC_EncoderContext::CBC_EncoderContext(const CFX_WideString msg,
CFX_WideString ecLevel,
int32_t& e) {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp
index 64dd8e23f7..d5ae9bf9bf 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp
@@ -20,11 +20,11 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h"
#include "xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h"
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h"
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+
int32_t CBC_ErrorCorrection::FACTOR_SETS[] = {5, 7, 10, 11, 12, 14, 18, 20,
24, 28, 36, 42, 48, 56, 62, 68};
int32_t CBC_ErrorCorrection::FACTORS[][100] = {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp
index a09fa39e72..3173c9c594 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp
@@ -22,7 +22,6 @@
#include "xfa/src/fxbarcode/BC_Dimension.h"
#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h"
#include "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h"
@@ -35,7 +34,10 @@
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
#include "xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h"
#include "xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h"
+#include "xfa/src/fxbarcode/utils.h"
+
#define Integer_MAX_VALUE 2147483647
+
FX_WCHAR CBC_HighLevelEncoder::LATCH_TO_C40 = 230;
FX_WCHAR CBC_HighLevelEncoder::LATCH_TO_BASE256 = 231;
FX_WCHAR CBC_HighLevelEncoder::UPPER_SHIFT = 235;
@@ -50,6 +52,7 @@ FX_WCHAR CBC_HighLevelEncoder::MACRO_06 = 237;
const wchar_t* CBC_HighLevelEncoder::MACRO_05_HEADER = L"[)>05";
const wchar_t* CBC_HighLevelEncoder::MACRO_06_HEADER = L"[)>06";
const wchar_t CBC_HighLevelEncoder::MACRO_TRAILER = 0x0004;
+
CBC_HighLevelEncoder::CBC_HighLevelEncoder() {}
CBC_HighLevelEncoder::~CBC_HighLevelEncoder() {}
CFX_ByteArray& CBC_HighLevelEncoder::getBytesForMessage(CFX_WideString msg) {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp
index d73953744e..7c9d5a9688 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp
@@ -21,13 +21,14 @@
*/
#include "xfa/src/fxbarcode/BC_Dimension.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h"
#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h"
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h"
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+
#define SYMBOLS_COUNT 30
+
CBC_SymbolInfo* CBC_SymbolInfo::m_PROD_SYMBOLS[30] = {
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h
index c857c25840..acbc038ef3 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_
#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_
+#include "core/include/fxcrt/fx_string.h"
+#include "core/include/fxcrt/fx_system.h"
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
class CBC_Dimension;
diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp
index e5475a148a..52c9960257 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp
@@ -20,7 +20,7 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+
CBC_SymbolShapeHint::CBC_SymbolShapeHint() {}
CBC_SymbolShapeHint::~CBC_SymbolShapeHint() {}
diff --git a/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp
index 5de3846600..61e8f7dec2 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp
@@ -21,7 +21,6 @@
*/
#include "xfa/src/fxbarcode/BC_Dimension.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h"
#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h"
@@ -30,6 +29,7 @@
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h"
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
#include "xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h"
+
CBC_TextEncoder::CBC_TextEncoder() {}
CBC_TextEncoder::~CBC_TextEncoder() {}
int32_t CBC_TextEncoder::getEncodingMode() {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp
index f7dfe800a6..759279d526 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp
@@ -21,7 +21,6 @@
*/
#include "xfa/src/fxbarcode/BC_Dimension.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h"
#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h"
@@ -30,6 +29,7 @@
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h"
#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
#include "xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h"
+
CBC_X12Encoder::CBC_X12Encoder() {}
CBC_X12Encoder::~CBC_X12Encoder() {}
int32_t CBC_X12Encoder::getEncodingMode() {
diff --git a/xfa/src/fxbarcode/oned/BC_OneDReader.cpp b/xfa/src/fxbarcode/oned/BC_OneDReader.cpp
index 7e872d565a..0b699c9624 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDReader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OneDReader.cpp
@@ -24,11 +24,13 @@
#include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
#include "xfa/src/fxbarcode/BC_Reader.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
#include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
+#include "xfa/src/fxbarcode/utils.h"
+
const int32_t CBC_OneDReader::INTEGER_MATH_SHIFT = 8;
const int32_t CBC_OneDReader::PATTERN_MATCH_RESULT_SCALE_FACTOR = 1 << 8;
+
CBC_OneDReader::CBC_OneDReader() {}
CBC_OneDReader::~CBC_OneDReader() {}
CFX_ByteString CBC_OneDReader::Decode(CBC_BinaryBitmap* image, int32_t& e) {
diff --git a/xfa/src/fxbarcode/oned/BC_OneDReader.h b/xfa/src/fxbarcode/oned/BC_OneDReader.h
index 17e0934287..5a55d1f5e2 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDReader.h
+++ b/xfa/src/fxbarcode/oned/BC_OneDReader.h
@@ -7,10 +7,12 @@
#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDREADER_H_
#define XFA_SRC_FXBARCODE_ONED_BC_ONEDREADER_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_Reader;
class CBC_BinaryBitmap;
class CBC_CommonBitArray;
-class CBC_OneDReader;
+
class CBC_OneDReader : public CBC_Reader {
public:
CBC_OneDReader();
diff --git a/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp
index 8de79c12c4..075e69f219 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp
@@ -21,10 +21,11 @@
*/
#include "xfa/src/fxbarcode/BC_Reader.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
#include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
#include "xfa/src/fxbarcode/oned/BC_OneDimReader.h"
+#include "xfa/src/fxbarcode/utils.h"
+
const int32_t CBC_OneDimReader::MAX_AVG_VARIANCE = (int32_t)(256 * 0.48f);
const int32_t CBC_OneDimReader::MAX_INDIVIDUAL_VARIANCE = (int32_t)(256 * 0.7f);
const int32_t CBC_OneDimReader::START_END_PATTERN[3] = {1, 1, 1};
@@ -37,6 +38,7 @@ const int32_t CBC_OneDimReader::L_AND_G_PATTERNS[20][4] = {
{1, 2, 3, 1}, {1, 1, 1, 4}, {1, 3, 1, 2}, {1, 2, 1, 3}, {3, 1, 1, 2},
{1, 1, 2, 3}, {1, 2, 2, 2}, {2, 2, 1, 2}, {1, 1, 4, 1}, {2, 3, 1, 1},
{1, 3, 2, 1}, {4, 1, 1, 1}, {2, 1, 3, 1}, {3, 1, 2, 1}, {2, 1, 1, 3}};
+
CBC_OneDimReader::CBC_OneDimReader() {}
CBC_OneDimReader::~CBC_OneDimReader() {}
CFX_Int32Array* CBC_OneDimReader::FindStartGuardPattern(CBC_CommonBitArray* row,
diff --git a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp
index be2a71b1ef..ed93e9852b 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp
@@ -26,7 +26,6 @@
#include <memory>
#include "xfa/src/fxbarcode/BC_Writer.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
CBC_OneDimWriter::CBC_OneDimWriter() {
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp
index 0c395712cb..d7caf68226 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp
@@ -22,12 +22,14 @@
#include <algorithm>
+#include "core/include/fxcrt/fx_basic.h"
#include "xfa/src/fxbarcode/BC_Reader.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
#include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
#include "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h"
#include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h"
+#include "xfa/src/fxbarcode/utils.h"
+
const FX_CHAR* CBC_OnedCodaBarReader::ALPHABET_STRING =
"0123456789-$:/.+ABCDTN";
const int32_t CBC_OnedCodaBarReader::CHARACTER_ENCODINGS[22] = {
@@ -37,6 +39,7 @@ const int32_t CBC_OnedCodaBarReader::CHARACTER_ENCODINGS[22] = {
const int32_t CBC_OnedCodaBarReader::minCharacterLength = 3;
const FX_CHAR CBC_OnedCodaBarReader::STARTEND_ENCODING[8] = {
'E', '*', 'A', 'B', 'C', 'D', 'T', 'N'};
+
CBC_OnedCodaBarReader::CBC_OnedCodaBarReader() {}
CBC_OnedCodaBarReader::~CBC_OnedCodaBarReader() {}
CFX_ByteString CBC_OnedCodaBarReader::DecodeRow(int32_t rowNumber,
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp
index a70415fb3a..f056c17616 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp
@@ -22,18 +22,19 @@
#include "xfa/src/fxbarcode/BC_Reader.h"
#include "xfa/src/fxbarcode/BC_Writer.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
#include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h"
#include "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h"
#include "xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.h"
+
const FX_CHAR CBC_OnedCodaBarWriter::START_END_CHARS[] = {
'A', 'B', 'C', 'D', 'T', 'N', '*', 'E', 'a', 'b', 'c', 'd', 't', 'n', 'e'};
const FX_CHAR CBC_OnedCodaBarWriter::CONTENT_CHARS[] = {
'0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', '-', '$', '/', ':', '+', '.'};
+
CBC_OnedCodaBarWriter::CBC_OnedCodaBarWriter() {
m_chStart = 'A';
m_chEnd = 'B';
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp
index b2e978c650..8d9671089b 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp
@@ -23,10 +23,11 @@
#include <algorithm>
#include "xfa/src/fxbarcode/BC_Reader.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
#include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
#include "xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h"
+#include "xfa/src/fxbarcode/utils.h"
+
const int32_t CBC_OnedCode128Reader::CODE_PATTERNS[107][7] = {
{2, 1, 2, 2, 2, 2, 0}, {2, 2, 2, 1, 2, 2, 0}, {2, 2, 2, 2, 2, 1, 0},
{1, 2, 1, 2, 2, 3, 0}, {1, 2, 1, 3, 2, 2, 0}, {1, 3, 1, 2, 2, 2, 0},
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp
index 045dacb6ea..c8977d3171 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp
@@ -22,16 +22,17 @@
#include "xfa/src/fxbarcode/BC_Reader.h"
#include "xfa/src/fxbarcode/BC_Writer.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
#include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h"
#include "xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h"
#include "xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h"
+
const int32_t CBC_OnedCode128Writer::CODE_CODE_B = 100;
const int32_t CBC_OnedCode128Writer::CODE_CODE_C = 99;
const int32_t CBC_OnedCode128Writer::CODE_START_B = 104;
const int32_t CBC_OnedCode128Writer::CODE_START_C = 105;
const int32_t CBC_OnedCode128Writer::CODE_STOP = 106;
+
CBC_OnedCode128Writer::CBC_OnedCode128Writer() {
m_codeFormat = BC_CODE128_B;
}
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp
index 3b13b671ca..73999a4818 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp
@@ -23,10 +23,11 @@
#include <algorithm>
#include "xfa/src/fxbarcode/BC_Reader.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
#include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
#include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h"
+#include "xfa/src/fxbarcode/utils.h"
+
const FX_CHAR* CBC_OnedCode39Reader::ALPHABET_STRING =
"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. *$/+%";
const FX_CHAR* CBC_OnedCode39Reader::CHECKSUM_STRING =
@@ -38,6 +39,7 @@ const int32_t CBC_OnedCode39Reader::CHARACTER_ENCODINGS[44] = {
0x106, 0x046, 0x016, 0x181, 0x0C1, 0x1C0, 0x091, 0x190, 0x0D0,
0x085, 0x184, 0x0C4, 0x094, 0x0A8, 0x0A2, 0x08A, 0x02A};
const int32_t CBC_OnedCode39Reader::ASTERISK_ENCODING = 0x094;
+
CBC_OnedCode39Reader::CBC_OnedCode39Reader()
: m_usingCheckDigit(FALSE), m_extendedMode(FALSE) {
}
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp
index 02de5f224f..5b33965622 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp
@@ -22,12 +22,12 @@
#include "xfa/src/fxbarcode/BC_Reader.h"
#include "xfa/src/fxbarcode/BC_Writer.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
#include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h"
#include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h"
#include "xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h"
+
CBC_OnedCode39Writer::CBC_OnedCode39Writer() {
m_extendedMode = FALSE;
m_iWideNarrRatio = 3;
diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp
index d5ac09ed39..fe05069d4f 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp
@@ -21,13 +21,15 @@
*/
#include "xfa/src/fxbarcode/BC_Reader.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
#include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
#include "xfa/src/fxbarcode/oned/BC_OneDimReader.h"
#include "xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h"
+#include "xfa/src/fxbarcode/utils.h"
+
const int32_t CBC_OnedEAN13Reader::FIRST_DIGIT_ENCODINGS[10] = {
0x00, 0x0B, 0x0D, 0xE, 0x13, 0x19, 0x1C, 0x15, 0x16, 0x1A};
+
CBC_OnedEAN13Reader::CBC_OnedEAN13Reader() {}
CBC_OnedEAN13Reader::~CBC_OnedEAN13Reader() {}
void CBC_OnedEAN13Reader::DetermineFirstDigit(CFX_ByteString& result,
diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp
index a291b1ac24..9b8456d6ed 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp
@@ -22,12 +22,12 @@
#include "xfa/src/fxbarcode/BC_Reader.h"
#include "xfa/src/fxbarcode/BC_Writer.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
#include "xfa/src/fxbarcode/oned/BC_OneDimReader.h"
#include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h"
#include "xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h"
#include "xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h"
+
CBC_OnedEAN13Writer::CBC_OnedEAN13Writer() {
m_bLeftPadding = TRUE;
m_codeWidth = 3 + (7 * 6) + 5 + (7 * 6) + 3;
diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp
index 21a6fb30e3..503454f71f 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp
@@ -21,11 +21,12 @@
*/
#include "xfa/src/fxbarcode/BC_Reader.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
#include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
#include "xfa/src/fxbarcode/oned/BC_OneDimReader.h"
#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_OnedEAN8Reader::CBC_OnedEAN8Reader() {}
CBC_OnedEAN8Reader::~CBC_OnedEAN8Reader() {}
int32_t CBC_OnedEAN8Reader::DecodeMiddle(CBC_CommonBitArray* row,
diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp
index ae557866ec..f552531e63 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp
@@ -22,12 +22,12 @@
#include "xfa/src/fxbarcode/BC_Reader.h"
#include "xfa/src/fxbarcode/BC_Writer.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
#include "xfa/src/fxbarcode/oned/BC_OneDimReader.h"
#include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h"
#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h"
+
CBC_OnedEAN8Writer::CBC_OnedEAN8Writer() {
m_iDataLenth = 8;
m_codeWidth = 3 + (7 * 4) + 5 + (7 * 4) + 3;
diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp
index 3f524cd210..14040632a7 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp
@@ -20,12 +20,14 @@
* limitations under the License.
*/
+#include "core/include/fxcrt/fx_basic.h"
#include "xfa/src/fxbarcode/BC_Reader.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
#include "xfa/src/fxbarcode/oned/BC_OneDimReader.h"
#include "xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h"
#include "xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_OnedUPCAReader::CBC_OnedUPCAReader() {
m_ean13Reader = NULL;
}
diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp
index be626c6a1e..08a849f362 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp
@@ -21,10 +21,10 @@
*/
#include "xfa/src/fxbarcode/BC_Writer.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h"
#include "xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h"
#include "xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h"
+
CBC_OnedUPCAWriter::CBC_OnedUPCAWriter() {
m_subWriter = NULL;
m_bLeftPadding = TRUE;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp
index 9ad72849bf..c8b7c4cffa 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp
@@ -20,13 +20,14 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h"
+#include "xfa/src/fxbarcode/utils.h"
+
int32_t CBC_PDF417::START_PATTERN = 0x1fea8;
int32_t CBC_PDF417::STOP_PATTERN = 0x3fa29;
int32_t CBC_PDF417::CODEWORD_TABLE[][1000] = {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417.h b/xfa/src/fxbarcode/pdf417/BC_PDF417.h
index 684b290e67..55b9b6c483 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417.h
@@ -7,6 +7,7 @@
#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417_H_
#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417_H_
+#include "core/include/fxcrt/fx_basic.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h"
class CBC_Compaction;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
index cd9de0c4c5..fbc252e202 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
@@ -20,9 +20,9 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h"
+
CBC_BarcodeMatrix::CBC_BarcodeMatrix(int32_t height, int32_t width) {
m_matrix.SetSize(height + 2);
for (int32_t i = 0, matrixLength = m_matrix.GetSize(); i < matrixLength;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
index 9c44cee288..15e1c3f2bb 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417BARCODEMATRIX_H_
#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417BARCODEMATRIX_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_BarcodeRow;
class CBC_BarcodeMatrix {
public:
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp
index 4b53e8c458..87aacb1ff9 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp
@@ -20,8 +20,8 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h"
+
CBC_BarcodeMetadata::CBC_BarcodeMetadata(int32_t columnCount,
int32_t rowCountUpperPart,
int32_t rowCountLowerPart,
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h
index 4bec2939ee..6d4b95e8f9 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h
@@ -7,7 +7,8 @@
#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417BARCODEMETADATA_H_
#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417BARCODEMETADATA_H_
-class CBC_BarcodeMetadata;
+#include <stdint.h>
+
class CBC_BarcodeMetadata {
public:
CBC_BarcodeMetadata(int32_t columnCount,
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp
index 0fcbb9c836..41e1955c48 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp
@@ -20,8 +20,8 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h"
+
CBC_BarcodeRow::CBC_BarcodeRow(int32_t width) {
m_row.SetSize(width);
m_currentLocation = 0;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
index 16f351681c..f387a62740 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417BARCODEROW_H_
#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417BARCODEROW_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_BarcodeRow {
public:
CBC_BarcodeRow(int32_t width);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp
index 0f310f6f1f..7ecb1a7b30 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp
@@ -20,9 +20,9 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h"
+
CBC_BarcodeValue::CBC_BarcodeValue() {}
CBC_BarcodeValue::~CBC_BarcodeValue() {}
void CBC_BarcodeValue::setValue(int32_t value) {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
index a02c2ab1fb..8e567d7ec8 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417BARCODEVALUE_H_
#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417BARCODEVALUE_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_BarcodeValue {
public:
CBC_BarcodeValue();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp
index c14e0de133..df1ab78ba5 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp
@@ -21,9 +21,10 @@
*/
#include "xfa/src/fxbarcode/BC_ResultPoint.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_BoundingBox::CBC_BoundingBox(CBC_CommonBitMatrix* image,
CBC_ResultPoint* topLeft,
CBC_ResultPoint* bottomLeft,
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h
index 84ace71811..c241572985 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h
@@ -7,8 +7,11 @@
#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417BOUNDINGBOX_H_
#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417BOUNDINGBOX_H_
+#include "core/include/fxcrt/fx_system.h"
+
class CBC_CommonBitMatrix;
class CBC_ResultPoint;
+
class CBC_BoundingBox {
public:
CBC_BoundingBox(CBC_CommonBitMatrix* image,
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp
index cd6787554e..f8b627a8b4 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp
@@ -20,8 +20,8 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h"
+
int32_t CBC_Codeword::BARCODE_ROW_UNKNOWN = -1;
CBC_Codeword::CBC_Codeword(int32_t startX,
int32_t endX,
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h
index 93ac84d384..e2eb52c9ba 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417CODEWORD_H_
#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417CODEWORD_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_Codeword {
public:
CBC_Codeword(int32_t startX, int32_t endX, int32_t bucket, int32_t value);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp
index 171f658325..8bb2c1ebc8 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp
@@ -20,12 +20,14 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h"
+
#define SYMBOL_TABLE_Length 2787
#define Float_MAX_VALUE 2147483647
+
FX_FLOAT CBC_PDF417CodewordDecoder::RATIOS_TABLE[2787][8] = {{0}};
+
CBC_PDF417CodewordDecoder::CBC_PDF417CodewordDecoder() {}
CBC_PDF417CodewordDecoder::~CBC_PDF417CodewordDecoder() {}
void CBC_PDF417CodewordDecoder::Initialize() {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
index 41612c1a71..149a640676 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417CODEWORDDECODER_H_
#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417CODEWORDDECODER_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_PDF417CodewordDecoder {
public:
CBC_PDF417CodewordDecoder();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp
index 074325ec51..5bd2dafbe8 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp
@@ -20,8 +20,8 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h"
+
int32_t CBC_PDF417Common::NUMBER_OF_CODEWORDS = 929;
int32_t CBC_PDF417Common::MAX_CODEWORDS_IN_BARCODE = NUMBER_OF_CODEWORDS - 1;
int32_t CBC_PDF417Common::MIN_ROWS_IN_BARCODE = 3;
@@ -615,6 +615,7 @@ int32_t CBC_PDF417Common::CODEWORD_TABLE[] = {
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};
+
CBC_PDF417Common::CBC_PDF417Common() {}
CBC_PDF417Common::~CBC_PDF417Common() {}
int32_t CBC_PDF417Common::getBitCountSum(CFX_Int32Array& moduleBitCount) {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h
index 16882e3bd4..f145b25383 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417COMMON_H_
#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417COMMON_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_PDF417Common {
public:
CBC_PDF417Common();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp
index 22481c4d05..01e85d64c0 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp
@@ -20,7 +20,7 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h"
+
CBC_Compaction::CBC_Compaction() {}
CBC_Compaction::~CBC_Compaction() {}
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
index 79d195aee4..7a04fddebe 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
@@ -26,9 +26,9 @@
#include "third_party/bigint/BigIntegerLibrary.hh"
#include "xfa/src/fxbarcode/BC_DecoderResult.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h"
+#include "xfa/src/fxbarcode/utils.h"
#define TEXT_COMPACTION_MODE_LATCH 900
#define BYTE_COMPACTION_MODE_LATCH 901
@@ -55,6 +55,7 @@ FX_CHAR CBC_DecodedBitStreamPaser::PUNCT_CHARS[29] = {
FX_CHAR CBC_DecodedBitStreamPaser::MIXED_CHARS[30] = {
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '&', '\r', '\t',
',', ':', '#', '-', '.', '$', '/', '+', '%', '*', '=', '^'};
+
void CBC_DecodedBitStreamPaser::Initialize() {}
void CBC_DecodedBitStreamPaser::Finalize() {}
CBC_DecodedBitStreamPaser::CBC_DecodedBitStreamPaser() {}
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp
index 107ab39c51..f48faa3bb7 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp
@@ -20,7 +20,6 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h"
@@ -28,7 +27,9 @@
#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h"
+
int32_t CBC_DetectionResult::ADJUST_ROW_NUMBER_SKIP = 2;
+
CBC_DetectionResult::CBC_DetectionResult(CBC_BarcodeMetadata* barcodeMetadata,
CBC_BoundingBox* boundingBox) {
m_barcodeMetadata = barcodeMetadata;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp
index 39dea3ab53..9c492ba010 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp
@@ -20,11 +20,12 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h"
+
int32_t CBC_DetectionResultColumn::MAX_NEARBY_DISTANCE = 5;
+
CBC_DetectionResultColumn::CBC_DetectionResultColumn(
CBC_BoundingBox* boundingBox) {
m_boundingBox = boundingBox;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp
index 14a87d60a2..a5d61b9210 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp
@@ -20,8 +20,8 @@
* limitations under the License.
*/
+#include "core/include/fxcrt/fx_basic.h"
#include "xfa/src/fxbarcode/BC_ResultPoint.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h"
@@ -29,6 +29,8 @@
#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_DetectionResultRowIndicatorColumn::CBC_DetectionResultRowIndicatorColumn(
CBC_BoundingBox* boundingBox,
FX_BOOL isLeft)
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp
index ca845ff04a..273f4906d1 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp
@@ -22,12 +22,14 @@
#include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
#include "xfa/src/fxbarcode/BC_ResultPoint.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h"
-#define INTERGER_MAX 2147483647
+#include "xfa/src/fxbarcode/utils.h"
+
+#define INTEGER_MAX 2147483647
+
int32_t CBC_Detector::INDEXES_START_PATTERN[] = {0, 4, 1, 5};
int32_t CBC_Detector::INDEXES_STOP_PATTERN[] = {6, 2, 7, 3};
int32_t CBC_Detector::INTEGER_MATH_SHIFT = 8;
@@ -44,6 +46,7 @@ int32_t CBC_Detector::MAX_PATTERN_DRIFT = 5;
int32_t CBC_Detector::SKIPPED_ROW_COUNT_MAX = 25;
int32_t CBC_Detector::ROW_STEP = 5;
int32_t CBC_Detector::BARCODE_MIN_HEIGHT = 10;
+
CBC_Detector::CBC_Detector() {}
CBC_Detector::~CBC_Detector() {}
CBC_PDF417DetectorResult* CBC_Detector::detect(CBC_BinaryBitmap* image,
@@ -330,7 +333,7 @@ int32_t CBC_Detector::patternMatchVariance(CFX_Int32Array& counters,
patternLength += pattern[i];
}
if (total < patternLength) {
- return INTERGER_MAX;
+ return INTEGER_MAX;
}
int32_t unitBarWidth = (total << INTEGER_MATH_SHIFT) / patternLength;
maxIndividualVariance =
@@ -342,7 +345,7 @@ int32_t CBC_Detector::patternMatchVariance(CFX_Int32Array& counters,
int32_t variance = counter > scaledPattern ? counter - scaledPattern
: scaledPattern - counter;
if (variance > maxIndividualVariance) {
- return INTERGER_MAX;
+ return INTEGER_MAX;
}
totalVariance += variance;
}
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp
index 8a46c44877..395c53954b 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp
@@ -21,9 +21,9 @@
*/
#include "xfa/src/fxbarcode/BC_ResultPoint.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h"
+
CBC_PDF417DetectorResult::CBC_PDF417DetectorResult(CBC_CommonBitMatrix* bits,
CFX_PtrArray* points) {
m_bits = bits;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h
index dbc2ffcf35..b0b365e9a9 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h
@@ -7,7 +7,10 @@
#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417DETECTORRESULT_H_
#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417DETECTORRESULT_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_CommonBitMatrix;
+
class CBC_PDF417DetectorResult {
public:
CBC_PDF417DetectorResult(CBC_CommonBitMatrix* bits, CFX_PtrArray* points);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp
index d0d7fab8da..18edeacddb 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp
@@ -20,8 +20,8 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h"
+
CBC_Dimensions::CBC_Dimensions(int32_t minCols,
int32_t maxCols,
int32_t minRows,
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h
index d7d1623452..9b69fc4a8a 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417DIMENSIONS_H_
#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417DIMENSIONS_H_
+#include <stdint.h>
+
class CBC_Dimensions {
public:
CBC_Dimensions(int32_t minCols,
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp
index c4c65e24bf..aea60df578 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp
@@ -20,12 +20,14 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_PDF417ECModulusGF* CBC_PDF417ECErrorCorrection::m_field = NULL;
+
void CBC_PDF417ECErrorCorrection::Initialize(int32_t& e) {
m_field =
new CBC_PDF417ECModulusGF(CBC_PDF417Common::NUMBER_OF_CODEWORDS, 3, e);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp
index b8de25da76..1ba77dac16 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp
@@ -20,10 +20,11 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_PDF417ECModulusGF* CBC_PDF417ECModulusGF::PDF417_GF = NULL;
void CBC_PDF417ECModulusGF::Initialize(int32_t& e) {
PDF417_GF =
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp
index aad247a615..04f7752b65 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp
@@ -20,10 +20,11 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_PDF417ECModulusPoly::CBC_PDF417ECModulusPoly(CBC_PDF417ECModulusGF* field,
CFX_Int32Array& coefficients,
int32_t& e) {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp
index 920860bb42..5fb2d8e21e 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp
@@ -20,8 +20,9 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h"
+#include "xfa/src/fxbarcode/utils.h"
+
int32_t CBC_PDF417ErrorCorrection::EC_COEFFICIENTS[][2500] = {
{27, 917},
{522, 568, 723, 809},
@@ -96,6 +97,7 @@ int32_t CBC_PDF417ErrorCorrection::EC_COEFFICIENTS[][2500] = {
284, 736, 138, 646, 411, 877, 669, 141, 919, 45, 780, 407, 164, 332, 899,
165, 726, 600, 325, 498, 655, 357, 752, 768, 223, 849, 647, 63, 310, 863,
251, 366, 304, 282, 738, 675, 410, 389, 244, 31, 121, 303, 263}};
+
CBC_PDF417ErrorCorrection::CBC_PDF417ErrorCorrection() {}
CBC_PDF417ErrorCorrection::~CBC_PDF417ErrorCorrection() {}
int32_t CBC_PDF417ErrorCorrection::getErrorCorrectionCodewordCount(
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
index e043bacfdf..1c73173e55 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
@@ -7,6 +7,10 @@
#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417ERRORCORRECTION_H_
#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417ERRORCORRECTION_H_
+#include <stdint.h>
+
+#include "core/include/fxcrt/fx_string.h"
+
class CBC_PDF417ErrorCorrection {
public:
CBC_PDF417ErrorCorrection();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp
index 9610498565..8bd4fe1ba4 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp
@@ -24,12 +24,13 @@
#include "third_party/bigint/BigIntegerLibrary.hh"
#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h"
+#include "xfa/src/fxbarcode/utils.h"
#define SUBMODE_ALPHA 0
#define SUBMODE_LOWER 1
#define SUBMODE_MIXED 2
+
int32_t CBC_PDF417HighLevelEncoder::TEXT_COMPACTION = 0;
int32_t CBC_PDF417HighLevelEncoder::BYTE_COMPACTION = 1;
int32_t CBC_PDF417HighLevelEncoder::NUMERIC_COMPACTION = 2;
@@ -47,6 +48,7 @@ uint8_t CBC_PDF417HighLevelEncoder::TEXT_PUNCTUATION_RAW[] = {
10, 45, 46, 36, 47, 34, 124, 42, 40, 41, 63, 123, 125, 39, 0};
int32_t CBC_PDF417HighLevelEncoder::MIXED[128] = {0};
int32_t CBC_PDF417HighLevelEncoder::PUNCTUATION[128] = {0};
+
void CBC_PDF417HighLevelEncoder::Initialize() {
Inverse();
}
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp
index a8167816c4..7e5d0d8851 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp
@@ -25,7 +25,6 @@
#include "xfa/src/fxbarcode/BC_DecoderResult.h"
#include "xfa/src/fxbarcode/BC_Reader.h"
#include "xfa/src/fxbarcode/BC_ResultPoint.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
@@ -50,7 +49,10 @@
#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h"
+#include "xfa/src/fxbarcode/utils.h"
+
#define Integer_MAX_VALUE 2147483647
+
CBC_PDF417Reader::CBC_PDF417Reader() {}
CBC_PDF417Reader::~CBC_PDF417Reader() {}
CFX_ByteString CBC_PDF417Reader::Decode(CBC_BinaryBitmap* image, int32_t& e) {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp
index 09fbcef2e3..5bfcdee412 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp
@@ -20,8 +20,8 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h"
+
CBC_PDF417ResultMetadata::CBC_PDF417ResultMetadata() {}
CBC_PDF417ResultMetadata::~CBC_PDF417ResultMetadata() {}
int32_t CBC_PDF417ResultMetadata::getSegmentIndex() {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
index a95203d600..a70d3efc4a 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417RESULTMETADATA_H_
#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417RESULTMETADATA_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_PDF417ResultMetadata {
public:
CBC_PDF417ResultMetadata();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp
index df36e30926..8090c79975 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp
@@ -22,7 +22,6 @@
#include "xfa/src/fxbarcode/BC_DecoderResult.h"
#include "xfa/src/fxbarcode/BC_ResultPoint.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h"
@@ -40,10 +39,13 @@
#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h"
+#include "xfa/src/fxbarcode/utils.h"
+
int32_t CBC_PDF417ScanningDecoder::CODEWORD_SKEW_SIZE = 2;
int32_t CBC_PDF417ScanningDecoder::MAX_ERRORS = 3;
int32_t CBC_PDF417ScanningDecoder::MAX_EC_CODEWORDS = 512;
CBC_PDF417ECErrorCorrection* CBC_PDF417ScanningDecoder::errorCorrection = NULL;
+
CBC_PDF417ScanningDecoder::CBC_PDF417ScanningDecoder() {}
CBC_PDF417ScanningDecoder::~CBC_PDF417ScanningDecoder() {}
void CBC_PDF417ScanningDecoder::Initialize() {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp
index 7b4a200978..97cd9d82c4 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp
@@ -21,13 +21,13 @@
*/
#include "xfa/src/fxbarcode/BC_TwoDimWriter.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h"
#include "xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h"
+
CBC_PDF417Writer::CBC_PDF417Writer() {
m_bFixedSize = FALSE;
}
diff --git a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp
index c3aa28c593..1a2069030e 100644
--- a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp
@@ -21,9 +21,9 @@
*/
#include "xfa/src/fxbarcode/BC_ResultPoint.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h"
+
CBC_QRFinderPatternInfo::CBC_QRFinderPatternInfo(CFX_PtrArray* patternCenters) {
m_bottomLeft = (CBC_QRFinderPattern*)(*patternCenters)[0];
m_topLeft = (CBC_QRFinderPattern*)(*patternCenters)[1];
diff --git a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h
index 245f407b80..14316e5a16 100644
--- a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h
+++ b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h
@@ -7,7 +7,10 @@
#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_FINDERPATTERNINFO_H_
#define XFA_SRC_FXBARCODE_QRCODE_BC_FINDERPATTERNINFO_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_QRFinderPattern;
+
class CBC_QRFinderPatternInfo {
private:
CBC_QRFinderPattern* m_bottomLeft;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp
index 3eb70f9cc7..50b25f8535 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp
@@ -21,8 +21,8 @@
*/
#include "xfa/src/fxbarcode/BC_ResultPoint.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.h"
+
CBC_QRAlignmentPattern::CBC_QRAlignmentPattern(FX_FLOAT posX,
FX_FLOAT posY,
FX_FLOAT estimateModuleSize)
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp
index c9de17729d..19d3f2b411 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp
@@ -21,10 +21,10 @@
*/
#include "xfa/src/fxbarcode/BC_ResultPoint.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h"
+
CBC_QRAlignmentPatternFinder::CBC_QRAlignmentPatternFinder(
CBC_CommonBitMatrix* image,
int32_t startX,
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
index 922c2bb891..d1fff0aa3c 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
@@ -7,8 +7,12 @@
#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRALIGNMENTPATTERNFINDER_H_
#define XFA_SRC_FXBARCODE_QRCODE_BC_QRALIGNMENTPATTERNFINDER_H_
+#include "core/include/fxcrt/fx_basic.h"
+#include "xfa/src/fxbarcode/utils.h"
+
class CBC_CommonBitMatrix;
class CBC_QRAlignmentPattern;
+
class CBC_QRAlignmentPatternFinder {
private:
CBC_CommonBitMatrix* m_image;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp
index 4bd502665f..d4d0cb6148 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp
@@ -20,12 +20,13 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_QRBitMatrixParser::CBC_QRBitMatrixParser() {}
void CBC_QRBitMatrixParser::Init(CBC_CommonBitMatrix* bitMatrix, int32_t& e) {
m_dimension = bitMatrix->GetDimension(e);
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
index 0142f8209f..8964b86d62 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
@@ -7,10 +7,13 @@
#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRBITMATRIXPARSER_H_
#define XFA_SRC_FXBARCODE_QRCODE_BC_QRBITMATRIXPARSER_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_CommonBitMatrix;
class CBC_QRCoderVersion;
class CBC_QRCoderFormatInformation;
class CBC_QRDataMask;
+
class CBC_QRBitMatrixParser {
private:
CBC_CommonBitMatrix* m_bitMatrix;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp
index e74f8e7f3a..9eaffa119d 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp
@@ -26,7 +26,6 @@
#include "xfa/src/fxbarcode/BC_LuminanceSource.h"
#include "xfa/src/fxbarcode/BC_Reader.h"
#include "xfa/src/fxbarcode/BC_ResultPoint.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h"
#include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h"
#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
@@ -40,6 +39,7 @@
#include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRDetector.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h"
+
CBC_QRCodeReader::CBC_QRCodeReader() : m_decoder(NULL) {}
void CBC_QRCodeReader::Init() {
m_decoder = new CBC_QRCoderDecoder;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp
index ebb55aea34..e51b9260ef 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp
@@ -22,13 +22,13 @@
#include "xfa/src/fxbarcode/BC_Reader.h"
#include "xfa/src/fxbarcode/BC_TwoDimWriter.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
+
CBC_QRCodeWriter::CBC_QRCodeWriter() {
m_bFixedSize = TRUE;
m_iCorrectLevel = 1;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp
index 9b0effcd30..ab370f8842 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp
@@ -20,11 +20,12 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_QRCoder::CBC_QRCoder() {
m_mode = NULL;
m_ecLevel = NULL;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
index cfd50d135e..28f30cab09 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
@@ -20,8 +20,10 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
+#include "core/include/fxcrt/fx_memory.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_QRCoderBitVector::CBC_QRCoderBitVector() {
m_sizeInBits = 0;
m_size = 32;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h
index 5613de1f89..86c40527a1 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERBITVECTOR_H_
#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERBITVECTOR_H_
+#include <stdint.h>
+
class CBC_QRCoderBitVector {
private:
int32_t m_sizeInBits;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp
index ac20c03a6c..b3ed5d4d9b 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp
@@ -20,9 +20,9 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonByteArray.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h"
+
CBC_QRCoderBlockPair::CBC_QRCoderBlockPair(
CBC_CommonByteArray* data,
CBC_CommonByteArray* errorCorrection) {
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp
index 4a337b12cd..fcef73acbf 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp
@@ -20,7 +20,6 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h"
#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h"
@@ -31,6 +30,7 @@
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h"
+
CBC_QRCoderDecoder::CBC_QRCoderDecoder() {
m_rsDecoder = NULL;
}
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp
index 91e2ba7fa4..4dc394daae 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp
@@ -20,8 +20,8 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h"
+
CBC_QRCoderECB::CBC_QRCoderECB(int32_t count, int32_t dataCodeWords) {
m_dataCodeWords = dataCodeWords;
m_count = count;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h
index 67b3987efa..c269e38093 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERECB_H_
#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERECB_H_
+#include <stdint.h>
+
class CBC_QRCoderECB {
private:
int32_t m_count;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp
index c63ee63c5a..c418651483 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp
@@ -20,9 +20,9 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h"
+
CBC_QRCoderECBlocks::CBC_QRCoderECBlocks(int32_t ecCodeWordsPerBlock,
CBC_QRCoderECB* ecBlocks) {
m_ecCodeWordsPerBlock = ecCodeWordsPerBlock;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h
index d2ba509631..7d25eee42b 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h
@@ -7,7 +7,10 @@
#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERECBLOCKS_H_
#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERECBLOCKS_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_QRCoderECB;
+
class CBC_QRCoderECBlocks {
private:
int32_t m_ecCodeWordsPerBlock;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
index 1ebd35203a..a451ab50b8 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
@@ -23,7 +23,6 @@
#include <algorithm>
#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonByteArray.h"
#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h"
#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h"
@@ -38,6 +37,7 @@
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h"
+
const int32_t CBC_QRCoderEncoder::m_alphaNumbericTable[] = {
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -45,6 +45,7 @@ const int32_t CBC_QRCoderEncoder::m_alphaNumbericTable[] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1,
-1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1};
+
CBC_QRCoderEncoder::CBC_QRCoderEncoder() {}
CBC_QRCoderEncoder::~CBC_QRCoderEncoder() {}
class Make_Pair {
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp
index 8d3f567cec..ea239bdc0c 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp
@@ -20,12 +20,13 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
+
CBC_QRCoderErrorCorrectionLevel* CBC_QRCoderErrorCorrectionLevel::L = NULL;
CBC_QRCoderErrorCorrectionLevel* CBC_QRCoderErrorCorrectionLevel::M = NULL;
CBC_QRCoderErrorCorrectionLevel* CBC_QRCoderErrorCorrectionLevel::Q = NULL;
CBC_QRCoderErrorCorrectionLevel* CBC_QRCoderErrorCorrectionLevel::H = NULL;
+
CBC_QRCoderErrorCorrectionLevel::CBC_QRCoderErrorCorrectionLevel(
int32_t ordinal,
int32_t bits,
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
index fbe050d352..77142423bf 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERERRORCORRECTIONLEVEL_H_
#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERERRORCORRECTIONLEVEL_H_
+#include "core/include/fxcrt/fx_string.h"
+
class CBC_QRCoderErrorCorrectionLevel {
private:
int32_t m_ordinal;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp
index b4d21e3a2d..1bb5a295a0 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp
@@ -20,9 +20,10 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h"
+#include "xfa/src/fxbarcode/utils.h"
+
const int32_t CBC_QRCoderFormatInformation::FORMAT_INFO_MASK_QR = 0X5412;
const int32_t CBC_QRCoderFormatInformation::FORMAT_INFO_DECODE_LOOKUP[32][2] = {
{0x5412, 0x00}, {0x5125, 0x01}, {0x5E7C, 0x02}, {0x5B4B, 0x03},
@@ -36,6 +37,7 @@ const int32_t CBC_QRCoderFormatInformation::FORMAT_INFO_DECODE_LOOKUP[32][2] = {
};
const int32_t CBC_QRCoderFormatInformation::BITS_SET_IN_HALF_BYTE[] = {
0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4};
+
CBC_QRCoderFormatInformation::CBC_QRCoderFormatInformation(int32_t formatInfo) {
m_errorCorrectLevl =
CBC_QRCoderErrorCorrectionLevel::ForBits((formatInfo >> 3) & 0x03);
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp
index e8c8373242..840d542fc3 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp
@@ -20,11 +20,12 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_QRCoderMaskUtil::CBC_QRCoderMaskUtil() {}
CBC_QRCoderMaskUtil::~CBC_QRCoderMaskUtil() {}
int32_t CBC_QRCoderMaskUtil::ApplyMaskPenaltyRule1(
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp
index 0fd46d5bbb..bf1d258d2a 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp
@@ -20,13 +20,14 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h"
+#include "xfa/src/fxbarcode/utils.h"
+
const int32_t CBC_QRCoderMatrixUtil::POSITION_DETECTION_PATTERN[7][7] = {
{1, 1, 1, 1, 1, 1, 1},
{1, 0, 0, 0, 0, 0, 1},
@@ -77,6 +78,7 @@ const int32_t CBC_QRCoderMatrixUtil::TYPE_INFO_COORDINATES[15][2] = {
const int32_t CBC_QRCoderMatrixUtil::VERSION_INFO_POLY = 0x1f25;
const int32_t CBC_QRCoderMatrixUtil::TYPE_INFO_POLY = 0x0537;
const int32_t CBC_QRCoderMatrixUtil::TYPE_INFO_MASK_PATTERN = 0x5412;
+
void CBC_QRCoderMatrixUtil::ClearMatrix(CBC_CommonByteMatrix* matrix,
int32_t& e) {
if (matrix == NULL) {
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp
index 405cf5489d..7ec3df2b08 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp
@@ -20,9 +20,10 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_QRCoderMode* CBC_QRCoderMode::sBYTE = NULL;
CBC_QRCoderMode* CBC_QRCoderMode::sNUMERIC = NULL;
CBC_QRCoderMode* CBC_QRCoderMode::sALPHANUMERIC = NULL;
@@ -33,6 +34,7 @@ CBC_QRCoderMode* CBC_QRCoderMode::sTERMINATOR = NULL;
CBC_QRCoderMode* CBC_QRCoderMode::sFNC1_FIRST_POSITION = NULL;
CBC_QRCoderMode* CBC_QRCoderMode::sFNC1_SECOND_POSITION = NULL;
CBC_QRCoderMode* CBC_QRCoderMode::sSTRUCTURED_APPEND = NULL;
+
CBC_QRCoderMode::CBC_QRCoderMode(int32_t* characterCountBitsForVersions,
int32_t x1,
int32_t x2,
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h
index 354daf51c1..9098b35beb 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h
@@ -7,7 +7,12 @@
#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERMODE_H_
#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERMODE_H_
+#include <stdint.h>
+
+#include "core/include/fxcrt/fx_string.h"
+
class CBC_QRCoderVersion;
+
class CBC_QRCoderMode {
private:
int32_t* m_characterCountBitsForVersions;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp
index 9fae0ef0c6..86e08c933c 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp
@@ -20,7 +20,6 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h"
@@ -29,6 +28,7 @@
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h"
#include "xfa/src/fxbarcode/utils.h"
+
const int32_t CBC_QRCoderVersion::VERSION_DECODE_INFO[] = {
0x07C94, 0x085BC, 0x09A99, 0x0A4D3, 0x0BBF6, 0x0C762, 0x0D847,
0x0E60D, 0x0F928, 0x10B78, 0x1145D, 0x12A17, 0x13532, 0x149A6,
@@ -36,6 +36,7 @@ const int32_t CBC_QRCoderVersion::VERSION_DECODE_INFO[] = {
0x1CC1A, 0x1D33F, 0x1ED75, 0x1F250, 0x209D5, 0x216F0, 0x228BA,
0x2379F, 0x24B0B, 0x2542E, 0x26A64, 0x27541, 0x28C69};
CFX_PtrArray* CBC_QRCoderVersion::VERSION = NULL;
+
void CBC_QRCoderVersion::Initialize() {
VERSION = new CFX_PtrArray();
}
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h
index 1f64faa98e..755a7345dc 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h
@@ -7,9 +7,12 @@
#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERVERSION_H_
#define XFA_SRC_FXBARCODE_QRCODE_BC_QRCODERVERSION_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_QRCoderECBlocks;
class CBC_CommonBitMatrix;
class CBC_QRCoderErrorCorrectionLevel;
+
class CBC_QRCoderVersion {
private:
const static int32_t VERSION_DECODE_INFO[34];
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp
index c8cf58a6dc..1e36dc1614 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp
@@ -20,11 +20,12 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_QRDataBlock::CBC_QRDataBlock(int32_t numDataCodewords,
CFX_ByteArray* codewords)
: m_numDataCodewords(numDataCodewords), m_codewords(codewords) {}
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp
index dc4fddbbea..a5a8a3a73b 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp
@@ -20,11 +20,13 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h"
+#include "xfa/src/fxbarcode/utils.h"
+
static int32_t N_DATA_MASKS = 0;
CFX_PtrArray* CBC_QRDataMask::DATA_MASKS = NULL;
+
void CBC_QRDataMask::Initialize() {
DATA_MASKS = new CFX_PtrArray();
N_DATA_MASKS = BuildDataMasks();
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h
index b32a35d822..cbf8d47a0e 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h
@@ -7,7 +7,10 @@
#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRDATAMASK_H_
#define XFA_SRC_FXBARCODE_QRCODE_BC_QRDATAMASK_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_CommonBitMatrix;
+
class CBC_QRDataMask {
public:
static CFX_PtrArray* DATA_MASKS;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp
index d967892eb1..ed97280932 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp
@@ -21,18 +21,19 @@
*/
#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitSource.h"
#include "xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h"
#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h"
#include "xfa/src/fxbarcode/common/BC_CommonECI.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h"
+
const FX_CHAR* CBC_QRDecodedBitStreamParser::UTF_8 = "utf8";
const FX_CHAR CBC_QRDecodedBitStreamParser::ALPHANUMERIC_CHARS[45] = {
'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', ' ', '$', '%', '*', '+', '-', '.', '/', ':'};
+
CBC_QRDecodedBitStreamParser::CBC_QRDecodedBitStreamParser() {}
CBC_QRDecodedBitStreamParser::~CBC_QRDecodedBitStreamParser() {}
CBC_CommonDecoderResult* CBC_QRDecodedBitStreamParser::Decode(
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp
index ac1e4b5298..b6a6f7e10b 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp
@@ -23,7 +23,6 @@
#include <algorithm>
#include "xfa/src/fxbarcode/BC_ResultPoint.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h"
@@ -33,6 +32,7 @@
#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h"
+
CBC_QRDetector::CBC_QRDetector(CBC_CommonBitMatrix* image) : m_image(image) {}
CBC_QRDetector::~CBC_QRDetector() {}
CBC_QRDetectorResult* CBC_QRDetector::Detect(int32_t hints, int32_t& e) {
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp
index 10eb839e74..fad100816f 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp
@@ -21,9 +21,9 @@
*/
#include "xfa/src/fxbarcode/BC_ResultPoint.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h"
+
CBC_QRDetectorResult::CBC_QRDetectorResult(CBC_CommonBitMatrix* bits,
CFX_PtrArray* points)
: m_bits(bits), m_points(points) {}
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h
index 3086cb8c95..50381d9742 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h
@@ -7,8 +7,11 @@
#ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRDETECTORRESULT_H_
#define XFA_SRC_FXBARCODE_QRCODE_BC_QRDETECTORRESULT_H_
+#include "core/include/fxcrt/fx_basic.h"
+
class CBC_CommonBitMatrix;
class CBC_ResultPoint;
+
class CBC_QRDetectorResult {
private:
CBC_CommonBitMatrix* m_bits;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp
index c368f5742a..b4482cae1d 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp
@@ -21,8 +21,8 @@
*/
#include "xfa/src/fxbarcode/BC_ResultPoint.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h"
+
CBC_QRFinderPattern::CBC_QRFinderPattern(FX_FLOAT x,
FX_FLOAT posY,
FX_FLOAT estimatedModuleSize)
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp
index 58ac1c0df4..d143e276bb 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp
@@ -20,16 +20,19 @@
* limitations under the License.
*/
+#include "core/include/fxcrt/fx_basic.h"
#include "xfa/src/fxbarcode/BC_ResultPoint.h"
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h"
+#include "xfa/src/fxbarcode/utils.h"
+
const int32_t CBC_QRFinderPatternFinder::CENTER_QUORUM = 2;
const int32_t CBC_QRFinderPatternFinder::MIN_SKIP = 3;
const int32_t CBC_QRFinderPatternFinder::MAX_MODULES = 57;
const int32_t CBC_QRFinderPatternFinder::INTEGER_MATH_SHIFT = 8;
+
CBC_QRFinderPatternFinder::CBC_QRFinderPatternFinder(
CBC_CommonBitMatrix* image) {
m_image = image;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp
index f78c543476..7b9fe7b4f3 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp
@@ -20,11 +20,13 @@
* limitations under the License.
*/
-#include "xfa/src/fxbarcode/barcode.h"
#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h"
#include "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h"
+#include "xfa/src/fxbarcode/utils.h"
+
CBC_QRGridSampler CBC_QRGridSampler::m_gridSampler;
+
CBC_QRGridSampler::CBC_QRGridSampler() {}
CBC_QRGridSampler::~CBC_QRGridSampler() {}
CBC_QRGridSampler& CBC_QRGridSampler::GetInstance() {
diff --git a/xfa/src/fxbarcode/utils.h b/xfa/src/fxbarcode/utils.h
index 341d65bb36..37d2ce775b 100644
--- a/xfa/src/fxbarcode/utils.h
+++ b/xfa/src/fxbarcode/utils.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXBARCODE_UTILS_H_
#define XFA_SRC_FXBARCODE_UTILS_H_
+#include "core/include/fxcrt/fx_basic.h"
+
typedef CFX_MapPtrTemplate<void*, int32_t> CFX_PtrToInt32;
FX_BOOL BC_FX_ByteString_Replace(CFX_ByteString& dst,
FX_DWORD first,