diff options
Diffstat (limited to 'xfa/src/fxbarcode/datamatrix')
28 files changed, 51 insertions, 23 deletions
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() { |