diff options
Diffstat (limited to 'xfa/src/fxbarcode/datamatrix')
27 files changed, 89 insertions, 84 deletions
diff --git a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp index d2ae5f955f..91f5b8ee26 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp @@ -20,14 +20,14 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #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_SymbolShapeHint.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" #include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" #include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.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_ASCIIEncoder.h b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h index c01c4ce035..932b353ad4 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h +++ b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h @@ -7,9 +7,10 @@ #ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_ASCIIENCODER_H_ #define XFA_SRC_FXBARCODE_DATAMATRIX_BC_ASCIIENCODER_H_ -class CBC_Encoder; +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" + class CBC_EncoderContext; -class CBC_ASCIIEncoder; + class CBC_ASCIIEncoder : public CBC_Encoder { public: CBC_ASCIIEncoder(); diff --git a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp index 08d174d229..4fced54c5f 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp @@ -20,14 +20,14 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #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_SymbolShapeHint.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" #include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" #include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.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_Base256Encoder.h b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h index 9cdef1996e..c7aa18c2c8 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h +++ b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h @@ -7,8 +7,8 @@ #ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_BASE256ENCODER_H_ #define XFA_SRC_FXBARCODE_DATAMATRIX_BC_BASE256ENCODER_H_ -class CBC_Encoder; -class CBC_Base256Encoder; +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" + class CBC_Base256Encoder : public CBC_Encoder { public: CBC_Base256Encoder(); diff --git a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp index 93851376d3..48bce2bd50 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp @@ -20,15 +20,15 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #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" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" #include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" #include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.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_C40Encoder.h b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h index e082e81487..ebc67efb17 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h +++ b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h @@ -7,7 +7,8 @@ #ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_C40ENCODER_H_ #define XFA_SRC_FXBARCODE_DATAMATRIX_BC_C40ENCODER_H_ -class CBC_C40Encoder; +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" + class CBC_C40Encoder : public CBC_Encoder { public: CBC_C40Encoder(); diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp index 0b5b430679..6b9191bd56 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp @@ -22,8 +22,8 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" CBC_DataMatrixBitMatrixParser::CBC_DataMatrixBitMatrixParser() { m_mappingBitMatrix = NULL; m_version = NULL; diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp index e5c39fb929..c3eae91d34 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" CBC_DataMatrixDataBlock::~CBC_DataMatrixDataBlock() {} CBC_DataMatrixDataBlock::CBC_DataMatrixDataBlock(int32_t numDataCodewords, CFX_ByteArray* codewords) { diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp index 1838a03f1e..697d617ae5 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.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', diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp index b797e2f9f3..d260c396af 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp @@ -24,11 +24,11 @@ #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" -#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h" -#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h" #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 f5adb06df4..930480f7b9 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp @@ -22,14 +22,14 @@ #include <algorithm> -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" -#include "xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.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/datamatrix/BC_DataMatrixDetector.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 75498f6bec..fb2e51c21f 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp @@ -20,14 +20,14 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" #include "xfa/src/fxbarcode/BC_Reader.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.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" 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 7348680be4..89483fe28c 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp @@ -21,10 +21,10 @@ */ #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_SymbolShapeHint.h" #include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" -#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.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_DataMatrixSymbolInfo144.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h index ce16004817..607e8937cd 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h @@ -7,8 +7,8 @@ #ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXSYMBOLINFO144_H_ #define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXSYMBOLINFO144_H_ -class CBC_SymbolInfo; -class CBC_DataMatrixSymbolInfo144; +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" + class CBC_DataMatrixSymbolInfo144 : public CBC_SymbolInfo { public: CBC_DataMatrixSymbolInfo144(); diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp index 4b11a07742..ab488d9a5b 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp @@ -20,29 +20,29 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/BC_Writer.h" -#include "xfa/src/fxbarcode/BC_TwoDimWriter.h" -#include "xfa/src/fxbarcode/BC_Dimension.h" #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" +#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_Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h" -#include "xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" -#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.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" #include "xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.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 55437de91d..d87ac7472c 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.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_EdifactEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp index 1d0fc4ce50..81822335f9 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp @@ -20,15 +20,15 @@ * limitations under the License. */ +#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/BC_Dimension.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" #include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" #include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.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_EdifactEncoder.h b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h index 26324ed9d6..4d905edb63 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h +++ b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h @@ -7,8 +7,8 @@ #ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_EDIFACTENCODER_H_ #define XFA_SRC_FXBARCODE_DATAMATRIX_BC_EDIFACTENCODER_H_ -class CBC_EncoderContext; -class CBC_EdifactEncoder; +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" + class CBC_EdifactEncoder : public CBC_Encoder { public: CBC_EdifactEncoder(); diff --git a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp index 6743e4387d..51d4583668 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp @@ -20,14 +20,14 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #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_SymbolShapeHint.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.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_EncoderContext.h b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h index 9b78f86661..076581c7aa 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h +++ b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h @@ -7,10 +7,11 @@ #ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_ENCODERCONTEXT_H_ #define XFA_SRC_FXBARCODE_DATAMATRIX_BC_ENCODERCONTEXT_H_ -class CBC_SymbolShapeHint; +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" + class CBC_SymbolInfo; class CBC_Dimension; -class CBC_EncoderContext; + class CBC_EncoderContext : public CBC_SymbolShapeHint { public: CBC_EncoderContext(const CFX_WideString msg, diff --git a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp index 7a83a2ac39..64dd8e23f7 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp @@ -22,9 +22,9 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.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 7e1c2edc68..a09fa39e72 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp @@ -20,21 +20,21 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #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" +#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" #include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" -#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.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" #include "xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" #define Integer_MAX_VALUE 2147483647 FX_WCHAR CBC_HighLevelEncoder::LATCH_TO_C40 = 230; FX_WCHAR CBC_HighLevelEncoder::LATCH_TO_BASE256 = 231; diff --git a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h index 658bc4eb68..2ac64695eb 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h +++ b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h @@ -7,14 +7,15 @@ #ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_HIGHLEVELENCODER_H_ #define XFA_SRC_FXBARCODE_DATAMATRIX_BC_HIGHLEVELENCODER_H_ -class CBC_SymbolShapeHint; -class CBC_HighLevelEncoder; +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" + #define ASCII_ENCODATION 0 #define C40_ENCODATION 1 #define TEXT_ENCODATION 2 #define X12_ENCODATION 3 #define EDIFACT_ENCODATION 4 #define BASE256_ENCODATION 5 + class CBC_HighLevelEncoder : public CBC_SymbolShapeHint { public: CBC_HighLevelEncoder(); diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp index 8845225553..d73953744e 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp @@ -20,13 +20,13 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #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_SymbolShapeHint.h" #include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" -#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.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, diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h index b00e804fa0..c857c25840 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h +++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h @@ -7,9 +7,10 @@ #ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_ #define XFA_SRC_FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_ -class CBC_SymbolShapeHint; +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" + class CBC_Dimension; -class CBC_SymbolInfo; + class CBC_SymbolInfo : public CBC_SymbolShapeHint { public: CBC_SymbolInfo(FX_BOOL rectangular, diff --git a/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp index 1ed260d10b..5de3846600 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp @@ -20,15 +20,15 @@ * limitations under the License. */ +#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/BC_Dimension.h" +#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" #include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" #include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" +#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() {} diff --git a/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp index 91b917facf..f7dfe800a6 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp @@ -20,15 +20,15 @@ * limitations under the License. */ +#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/BC_Dimension.h" +#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" #include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" #include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" +#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() {} |