diff options
Diffstat (limited to 'xfa/src/fxbarcode')
113 files changed, 367 insertions, 367 deletions
diff --git a/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp b/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp index 73eb6478c6..e11b1c1c82 100644 --- a/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp +++ b/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "barcode.h" -#include "BC_LuminanceSource.h" -#include "BC_BufferedImageLuminanceSource.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_LuminanceSource.h" +#include "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h" class CBC_Pause : public IFX_Pause { public: virtual FX_BOOL NeedToPauseNow() { return TRUE; } diff --git a/xfa/src/fxbarcode/BC_LuminanceSource.cpp b/xfa/src/fxbarcode/BC_LuminanceSource.cpp index 90586b2a1d..046bdcc4fc 100644 --- a/xfa/src/fxbarcode/BC_LuminanceSource.cpp +++ b/xfa/src/fxbarcode/BC_LuminanceSource.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "barcode.h" -#include "BC_LuminanceSource.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_LuminanceSource.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 868fafadf3..0f56137b42 100644 --- a/xfa/src/fxbarcode/BC_Reader.cpp +++ b/xfa/src/fxbarcode/BC_Reader.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "barcode.h" -#include "BC_Reader.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Reader.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 57b6439bd0..47eb8aeb33 100644 --- a/xfa/src/fxbarcode/BC_ResultPoint.cpp +++ b/xfa/src/fxbarcode/BC_ResultPoint.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "barcode.h" -#include "BC_ResultPoint.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.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_UtilCodingConvert.cpp b/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp index 280d3a73b6..3dc08adbbf 100644 --- a/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp +++ b/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "barcode.h" -#include "BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" CBC_UtilCodingConvert::CBC_UtilCodingConvert() {} diff --git a/xfa/src/fxbarcode/BC_UtilRSS.cpp b/xfa/src/fxbarcode/BC_UtilRSS.cpp index fd74d5d7c5..d263074cc0 100644 --- a/xfa/src/fxbarcode/BC_UtilRSS.cpp +++ b/xfa/src/fxbarcode/BC_UtilRSS.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "barcode.h" -#include "BC_UtilRSS.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_UtilRSS.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 560340d4a6..ba1462d53f 100644 --- a/xfa/src/fxbarcode/BC_Utils.cpp +++ b/xfa/src/fxbarcode/BC_Utils.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "barcode.h" +#include "xfa/src/fxbarcode/barcode.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 c23f9e2cef..7a279fa05c 100644 --- a/xfa/src/fxbarcode/BC_Writer.cpp +++ b/xfa/src/fxbarcode/BC_Writer.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "barcode.h" -#include "BC_Writer.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Writer.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 index 2228ca1ccb..f46ce86d00 100644 --- a/xfa/src/fxbarcode/barcode.h +++ b/xfa/src/fxbarcode/barcode.h @@ -10,6 +10,6 @@ #define XFA_SRC_FXBARCODE_BARCODE_H_ #include "xfa/src/foxitlib.h" -#include "utils.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 e9bb3b747a..7801746701 100644 --- a/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.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_CommonBitMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp index 42e07c3dee..aa4cb2c243 100644 --- a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_CommonBitArray.h" -#include "BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" CBC_CommonBitMatrix::CBC_CommonBitMatrix() { m_width = 0; m_height = 0; diff --git a/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp b/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp index 7bf4bf61fd..19bfe3eab7 100644 --- a/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_CommonBitSource.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_CommonByteArray.cpp b/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp index b3e2a636e5..7917dcc198 100644 --- a/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp @@ -23,7 +23,7 @@ #include <algorithm> #include "xfa/src/fxbarcode/barcode.h" -#include "BC_CommonByteArray.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_CommonByteMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp index e075a5fab8..302dd99e55 100644 --- a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_CommonByteMatrix.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_CommonCharacterSetECI.cpp b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp index 6bd7d70c49..af9b0bcb70 100644 --- a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_CommonECI.h" -#include "BC_CommonCharacterSetECI.h" +#include "xfa/src/fxbarcode/common/BC_CommonECI.h" +#include "xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h" void CBC_CommonCharacterSetECI::initialize() {} CBC_CommonCharacterSetECI::CBC_CommonCharacterSetECI( int32_t value, diff --git a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp index 76219794df..4210cb8513 100644 --- a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp @@ -23,7 +23,7 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h" -#include "BC_CommonDecoderResult.h" +#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.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_CommonECI.cpp b/xfa/src/fxbarcode/common/BC_CommonECI.cpp index c83980bb20..efb9e94657 100644 --- a/xfa/src/fxbarcode/common/BC_CommonECI.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonECI.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_CommonECI.h" -#include "BC_CommonCharacterSetECI.h" +#include "xfa/src/fxbarcode/common/BC_CommonECI.h" +#include "xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h" CBC_CommonECI::CBC_CommonECI(int32_t value) { m_value = value; } diff --git a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp index e67041a50c..3f8bc44ae3 100644 --- a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_CommonPerspectiveTransform.h" +#include "xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h" CBC_CommonPerspectiveTransform::CBC_CommonPerspectiveTransform(FX_FLOAT a11, FX_FLOAT a21, FX_FLOAT a31, diff --git a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp index 42438978df..9f0d99a99d 100644 --- a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp +++ b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp @@ -23,9 +23,9 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Binarizer.h" #include "xfa/src/fxbarcode/BC_LuminanceSource.h" -#include "BC_CommonBitMatrix.h" -#include "BC_CommonBitArray.h" -#include "BC_GlobalHistogramBinarizer.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h" const int32_t LUMINANCE_BITS = 5; const int32_t LUMINANCE_SHIFT = 8 - LUMINANCE_BITS; const int32_t LUMINANCE_BUCKETS = 1 << LUMINANCE_BITS; diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp index af526a7ead..f74b5ff331 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp @@ -21,9 +21,9 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_ReedSolomonGF256.h" -#include "BC_ReedSolomonGF256Poly.h" -#include "BC_ReedSolomon.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h" CBC_ReedSolomonEncoder::CBC_ReedSolomonEncoder(CBC_ReedSolomonGF256* field) { m_field = field; } diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp index b053f2a784..5bb30912d4 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp @@ -21,9 +21,9 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_ReedSolomonGF256.h" -#include "BC_ReedSolomonGF256Poly.h" -#include "BC_ReedSolomonDecoder.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h" CBC_ReedSolomonDecoder::CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256* field) { m_field = field; } diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp index 97aa70d786..6c7bbf7dea 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_ReedSolomonGF256Poly.h" -#include "BC_ReedSolomonGF256.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.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_ReedSolomonGF256Poly.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp index b1eed008cf..f99cac81f5 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_ReedSolomonGF256.h" -#include "BC_ReedSolomonGF256Poly.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 307314038b..d2ae5f955f 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp @@ -22,12 +22,12 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Dimension.h" -#include "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_EncoderContext.h" -#include "BC_HighLevelEncoder.h" -#include "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" 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 1b7b3f24d1..08d174d229 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp @@ -22,12 +22,12 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Dimension.h" -#include "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_EncoderContext.h" -#include "BC_HighLevelEncoder.h" -#include "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" 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 05f33f1191..93851376d3 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp @@ -23,12 +23,12 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Dimension.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_EncoderContext.h" -#include "BC_HighLevelEncoder.h" -#include "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" 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 ac4803f785..0b5b430679 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 "BC_DataMatrixVersion.h" -#include "BC_DataMatrixBitMatrixParser.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.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 611a4509aa..e5c39fb929 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 "BC_DataMatrixVersion.h" -#include "BC_DataMatrixDataBlock.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.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 22f81efc65..1838a03f1e 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp @@ -23,7 +23,7 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" #include "xfa/src/fxbarcode/common/BC_CommonBitSource.h" -#include "BC_DataMatrixDecodedBitStreamParser.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 aa6ee72c29..b797e2f9f3 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 "BC_DataMatrixDecoder.h" -#include "BC_DataMatrixBitMatrixParser.h" -#include "BC_DataMatrixVersion.h" -#include "BC_DataMatrixDataBlock.h" -#include "BC_DataMatrixDecodedBitStreamParser.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" 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 9a769b05fe..f5adb06df4 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp @@ -29,7 +29,7 @@ #include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h" #include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" #include "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h" -#include "BC_DataMatrixDetector.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 cd772d0e83..75498f6bec 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp @@ -25,9 +25,9 @@ #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" -#include "BC_DataMatrixDecoder.h" -#include "BC_DataMatrixDetector.h" -#include "BC_DataMatrixReader.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" 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 b06ebd2cb9..7348680be4 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 "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "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" 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 117105e316..7994594c55 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_DataMatrixVersion.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" CFX_PtrArray* CBC_DataMatrixVersion::VERSIONS = NULL; void CBC_DataMatrixVersion::Initialize() { VERSIONS = new CFX_PtrArray(); diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp index 642537fbac..4b11a07742 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp @@ -28,21 +28,21 @@ #include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" -#include "BC_Encoder.h" -#include "BC_DefaultPlacement.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_DataMatrixSymbolInfo144.h" -#include "BC_ErrorCorrection.h" -#include "BC_EncoderContext.h" -#include "BC_C40Encoder.h" -#include "BC_TextEncoder.h" -#include "BC_X12Encoder.h" -#include "BC_EdifactEncoder.h" -#include "BC_Base256Encoder.h" -#include "BC_ASCIIEncoder.h" -#include "BC_HighLevelEncoder.h" -#include "BC_DataMatrixWriter.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_DataMatrixSymbolInfo144.h" +#include "xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" +#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.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 75432d110b..55437de91d 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 "BC_Encoder.h" -#include "BC_DefaultPlacement.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.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 9a270bf4d9..1d0fc4ce50 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp @@ -23,12 +23,12 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/BC_Dimension.h" -#include "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_EncoderContext.h" -#include "BC_HighLevelEncoder.h" -#include "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" 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 f79556ef2f..bb4d9492df 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp @@ -5,6 +5,6 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/fxbarcode/barcode.h" -#include "BC_Encoder.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_EncoderContext.cpp b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp index 237f902c92..6743e4387d 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp @@ -24,10 +24,10 @@ #include "xfa/src/fxbarcode/BC_Dimension.h" #include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_EncoderContext.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" 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 dc6a2ac451..7a83a2ac39 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp @@ -21,10 +21,10 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_ErrorCorrection.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" 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 7d9ccd7724..7e1c2edc68 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp @@ -24,17 +24,17 @@ #include "xfa/src/fxbarcode/BC_Dimension.h" #include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_EncoderContext.h" -#include "BC_C40Encoder.h" -#include "BC_TextEncoder.h" -#include "BC_X12Encoder.h" -#include "BC_EdifactEncoder.h" -#include "BC_Base256Encoder.h" -#include "BC_ASCIIEncoder.h" -#include "BC_HighLevelEncoder.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_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_SymbolInfo.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp index 482b83b5e1..8845225553 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp @@ -23,10 +23,10 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Dimension.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "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" #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_SymbolShapeHint.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp index 33645ff336..e5475a148a 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp @@ -21,6 +21,6 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_SymbolShapeHint.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 cecba137a6..1ed260d10b 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp @@ -23,13 +23,13 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/BC_Dimension.h" -#include "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_EncoderContext.h" -#include "BC_HighLevelEncoder.h" -#include "BC_C40Encoder.h" -#include "BC_TextEncoder.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_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 4c67ec0b72..91b917facf 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp @@ -23,13 +23,13 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/BC_Dimension.h" -#include "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_EncoderContext.h" -#include "BC_HighLevelEncoder.h" -#include "BC_C40Encoder.h" -#include "BC_X12Encoder.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_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 01f28f4f47..047506d337 100644 --- a/xfa/src/fxbarcode/oned/BC_OneDReader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OneDReader.cpp @@ -26,7 +26,7 @@ #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" -#include "BC_OneDReader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDReader.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() {} diff --git a/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp index e3c839b889..b11711a0ea 100644 --- a/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp @@ -23,8 +23,8 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" -#include "BC_OneDReader.h" -#include "BC_OneDimReader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDReader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimReader.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}; diff --git a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp index acf82c6825..b7ad14d592 100644 --- a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp +++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "BC_OneDimWriter.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h" #include <algorithm> #include <memory> diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp index 279561e9d7..187a9e8ab8 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp @@ -25,10 +25,10 @@ #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" -#include "BC_OneDReader.h" -#include "BC_OneDimWriter.h" -#include "BC_OnedCodaBarReader.h" -#include "BC_OnedCodaBarWriter.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[] = { diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp index b8cfb7be39..db2702968b 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp @@ -25,8 +25,8 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" -#include "BC_OneDReader.h" -#include "BC_OnedCode128Reader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDReader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode128Reader.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 0387977e61..cc923e6735 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp @@ -23,10 +23,10 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Writer.h" #include "xfa/src/fxbarcode/BC_Reader.h" -#include "BC_OneDReader.h" -#include "BC_OneDimWriter.h" -#include "BC_OnedCode128Reader.h" -#include "BC_OnedCode128Writer.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; diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp index 9c1a264232..d171019f62 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp @@ -25,8 +25,8 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" -#include "BC_OneDReader.h" -#include "BC_OnedCode39Reader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDReader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h" const FX_CHAR* CBC_OnedCode39Reader::ALPHABET_STRING = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. *$/+%"; const FX_CHAR* CBC_OnedCode39Reader::CHECKSUM_STRING = diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp index 297f2efc9f..10c2529337 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp @@ -24,10 +24,10 @@ #include "xfa/src/fxbarcode/BC_Writer.h" #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_OneDReader.h" -#include "BC_OneDimWriter.h" -#include "BC_OnedCode39Reader.h" -#include "BC_OnedCode39Writer.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 6e0dc38ff5..0c94fb2b34 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp @@ -23,9 +23,9 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" -#include "BC_OneDReader.h" -#include "BC_OneDimReader.h" -#include "BC_OnedEAN13Reader.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" const int32_t CBC_OnedEAN13Reader::FIRST_DIGIT_ENCODINGS[10] = { 0x00, 0x0B, 0x0D, 0xE, 0x13, 0x19, 0x1C, 0x15, 0x16, 0x1A}; CBC_OnedEAN13Reader::CBC_OnedEAN13Reader() {} diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp index e9c92eaea4..62ffd7bc8e 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp @@ -23,11 +23,11 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Writer.h" #include "xfa/src/fxbarcode/BC_Reader.h" -#include "BC_OneDReader.h" -#include "BC_OneDimReader.h" -#include "BC_OneDimWriter.h" -#include "BC_OnedEAN13Reader.h" -#include "BC_OnedEAN13Writer.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 42b46f245e..5dc1357f3a 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp @@ -23,9 +23,9 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" -#include "BC_OneDReader.h" -#include "BC_OneDimReader.h" -#include "BC_OnedEAN8Reader.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" 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 2bc07d3764..d0aab2704d 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp @@ -24,10 +24,10 @@ #include "xfa/src/fxbarcode/BC_Writer.h" #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_OneDReader.h" -#include "BC_OneDimWriter.h" -#include "BC_OneDimReader.h" -#include "BC_OnedEAN8Writer.h" +#include "xfa/src/fxbarcode/oned/BC_OneDReader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimReader.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 b81273bb32..ac85853898 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp @@ -22,10 +22,10 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Reader.h" -#include "BC_OneDReader.h" -#include "BC_OneDimReader.h" -#include "BC_OnedEAN13Reader.h" -#include "BC_OnedUPCAReader.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" 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 cad3f5de3f..bd18a95e7e 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp @@ -22,9 +22,9 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Writer.h" -#include "BC_OneDimWriter.h" -#include "BC_OnedEAN13Writer.h" -#include "BC_OnedUPCAWriter.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 f1d11785a1..c4e9463420 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp @@ -21,12 +21,12 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Compaction.h" -#include "BC_PDF417BarcodeRow.h" -#include "BC_PDF417BarcodeMatrix.h" -#include "BC_PDF417ErrorCorrection.h" -#include "BC_PDF417HighLevelEncoder.h" -#include "BC_PDF417.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417.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_PDF417BarcodeMatrix.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp index 137e335f38..76e8e18504 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417BarcodeRow.h" -#include "BC_PDF417BarcodeMatrix.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.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_PDF417BarcodeMetadata.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp index 10fcf27f52..4b53e8c458 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417BarcodeMetadata.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_PDF417BarcodeRow.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp index c5e95e6695..0fcbb9c836 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417BarcodeRow.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_PDF417BarcodeValue.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp index 8bb5b25750..4d9ea60a18 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Common.h" -#include "BC_PDF417BarcodeValue.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" CBC_BarcodeValue::CBC_BarcodeValue() {} CBC_BarcodeValue::~CBC_BarcodeValue() {} void CBC_BarcodeValue::setValue(int32_t value) { diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp index 73fa1327ef..1a999bbae4 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp @@ -23,7 +23,7 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_PDF417BoundingBox.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" CBC_BoundingBox::CBC_BoundingBox(CBC_CommonBitMatrix* image, CBC_ResultPoint* topLeft, CBC_ResultPoint* bottomLeft, diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp index 92b413f6d6..cd6787554e 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Codeword.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_PDF417CodewordDecoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp index 821cf07825..d8adabbf58 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Common.h" -#include "BC_PDF417CodewordDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h" #define SYMBOL_TABLE_Length 2787 #define Float_MAX_VALUE 2147483647 FX_FLOAT CBC_PDF417CodewordDecoder::RATIOS_TABLE[2787][8] = {{0}}; diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp index 62eaa7c25b..074325ec51 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Common.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; diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp index 2b61b0de32..22481c4d05 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp @@ -21,6 +21,6 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Compaction.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 4a3e2447f4..27d483be85 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp @@ -20,14 +20,14 @@ * limitations under the License. */ -#include "BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" #include <stdlib.h> #include "xfa/src/fxbarcode/BC_DecoderResult.h" #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" -#include "BC_PDF417ResultMetadata.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h" #include "third_party/bigint/BigIntegerLibrary.hh" #define TEXT_COMPACTION_MODE_LATCH 900 diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp index ecb5f75134..bd92a06007 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp @@ -21,13 +21,13 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Codeword.h" -#include "BC_PDF417BarcodeMetadata.h" -#include "BC_PDF417BoundingBox.h" -#include "BC_PDF417DetectionResultColumn.h" -#include "BC_PDF417Common.h" -#include "BC_PDF417DetectionResultRowIndicatorColumn.h" -#include "BC_PDF417DetectionResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h" int32_t CBC_DetectionResult::ADJUST_ROW_NUMBER_SKIP = 2; CBC_DetectionResult::CBC_DetectionResult(CBC_BarcodeMetadata* barcodeMetadata, CBC_BoundingBox* boundingBox) { diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp index 53bdfbed9b..b03ef7d39e 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp @@ -21,9 +21,9 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Codeword.h" -#include "BC_PDF417BoundingBox.h" -#include "BC_PDF417DetectionResultColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" int32_t CBC_DetectionResultColumn::MAX_NEARBY_DISTANCE = 5; CBC_DetectionResultColumn::CBC_DetectionResultColumn( CBC_BoundingBox* boundingBox) { diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp index 4f681d1e7d..ad3bd8e216 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp @@ -22,13 +22,13 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" -#include "BC_PDF417BarcodeMetadata.h" -#include "BC_PDF417BoundingBox.h" -#include "BC_PDF417Codeword.h" -#include "BC_PDF417BarcodeValue.h" -#include "BC_PDF417Common.h" -#include "BC_PDF417DetectionResultColumn.h" -#include "BC_PDF417DetectionResultRowIndicatorColumn.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" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.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 4ad85ca479..40f00b42ee 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp @@ -25,8 +25,8 @@ #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" -#include "BC_PDF417DetectorResult.h" -#include "BC_PDF417Detector.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h" #define INTERGER_MAX 2147483647 int32_t CBC_Detector::INDEXES_START_PATTERN[] = {0, 4, 1, 5}; int32_t CBC_Detector::INDEXES_STOP_PATTERN[] = {6, 2, 7, 3}; diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp index 7fe76e70be..7b1329e5ac 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp @@ -23,7 +23,7 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" -#include "BC_PDF417DetectorResult.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_PDF417Dimensions.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp index 7bd5c2d2f2..d0d7fab8da 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Dimensions.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_PDF417ECErrorCorrection.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp index cf02449701..b814f32dca 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp @@ -21,10 +21,10 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Common.h" -#include "BC_PDF417ECModulusPoly.h" -#include "BC_PDF417ECModulusGF.h" -#include "BC_PDF417ECErrorCorrection.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h" CBC_PDF417ECModulusGF* CBC_PDF417ECErrorCorrection::m_field = NULL; void CBC_PDF417ECErrorCorrection::Initialize(int32_t& e) { m_field = diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp index 8f6a8cacc4..b0b3cb69e8 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp @@ -21,9 +21,9 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Common.h" -#include "BC_PDF417ECModulusPoly.h" -#include "BC_PDF417ECModulusGF.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.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 710b0c703d..aad247a615 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp @@ -21,9 +21,9 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Common.h" -#include "BC_PDF417ECModulusGF.h" -#include "BC_PDF417ECModulusPoly.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" 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 47fa4976d6..920860bb42 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417ErrorCorrection.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h" int32_t CBC_PDF417ErrorCorrection::EC_COEFFICIENTS[][2500] = { {27, 917}, {522, 568, 723, 809}, diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp index 4025c26bb5..52b1f8a84c 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp @@ -20,11 +20,11 @@ * limitations under the License. */ -#include "BC_PDF417HighLevelEncoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h" #include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Compaction.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h" #include "third_party/bigint/BigIntegerLibrary.hh" #define SUBMODE_ALPHA 0 diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp index 4e0f3c962b..57a12e222d 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp @@ -5,7 +5,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "core/include/fxcrt/fx_basic.h" #include "testing/fx_string_testhelpers.h" -#include "BC_PDF417HighLevelEncoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h" TEST(PDF417HighLevelEncoder, EncodeHighLevel) { // TODO(tsepez): implement test cases. diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp index 23595fbe03..556e6e1db8 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp @@ -30,26 +30,26 @@ #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_PDF417DetectorResult.h" -#include "BC_PDF417Detector.h" -#include "BC_PDF417DetectorResult.h" -#include "BC_PDF417Codeword.h" -#include "BC_PDF417Common.h" -#include "BC_PDF417BarcodeValue.h" -#include "BC_PDF417BarcodeMetadata.h" -#include "BC_PDF417BoundingBox.h" -#include "BC_PDF417DetectionResultColumn.h" -#include "BC_PDF417DetectionResultRowIndicatorColumn.h" -#include "BC_PDF417DetectionResult.h" -#include "BC_PDF417DecodedBitStreamParser.h" -#include "BC_PDF417CodewordDecoder.h" -#include "BC_PDF417DecodedBitStreamParser.h" -#include "BC_PDF417ECModulusPoly.h" -#include "BC_PDF417ECModulusGF.h" -#include "BC_PDF417ECErrorCorrection.h" -#include "BC_PDF417DecodedBitStreamParser.h" -#include "BC_PDF417ScanningDecoder.h" -#include "BC_PDF417Reader.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h" #define Integer_MAX_VALUE 2147483647 CBC_PDF417Reader::CBC_PDF417Reader() {} CBC_PDF417Reader::~CBC_PDF417Reader() {} diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp index 5230f0b505..09fbcef2e3 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417ResultMetadata.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_PDF417ScanningDecoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp index 89b2d2865a..9ef37e6a14 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp @@ -24,22 +24,22 @@ #include "xfa/src/fxbarcode/BC_DecoderResult.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_PDF417Codeword.h" -#include "BC_PDF417Common.h" -#include "BC_PDF417BarcodeValue.h" -#include "BC_PDF417BarcodeMetadata.h" -#include "BC_PDF417BoundingBox.h" -#include "BC_PDF417DetectionResultColumn.h" -#include "BC_PDF417DetectionResultRowIndicatorColumn.h" -#include "BC_PDF417DetectionResult.h" -#include "BC_PDF417DecodedBitStreamParser.h" -#include "BC_PDF417CodewordDecoder.h" -#include "BC_PDF417DecodedBitStreamParser.h" -#include "BC_PDF417ECModulusPoly.h" -#include "BC_PDF417ECModulusGF.h" -#include "BC_PDF417ECErrorCorrection.h" -#include "BC_PDF417DecodedBitStreamParser.h" -#include "BC_PDF417ScanningDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h" int32_t CBC_PDF417ScanningDecoder::CODEWORD_SKEW_SIZE = 2; int32_t CBC_PDF417ScanningDecoder::MAX_ERRORS = 3; int32_t CBC_PDF417ScanningDecoder::MAX_EC_CODEWORDS = 512; diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp index 3a921dae83..b832c8a7c2 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp @@ -24,10 +24,10 @@ #include "xfa/src/fxbarcode/BC_TwoDimWriter.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_PDF417Compaction.h" -#include "BC_PDF417.h" -#include "BC_PDF417BarcodeMatrix.h" -#include "BC_PDF417Writer.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.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 0142458b99..680806eafb 100644 --- a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp @@ -22,8 +22,8 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" -#include "BC_QRFinderPattern.h" -#include "BC_FinderPatternInfo.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h" +#include "xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.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_QRAlignmentPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp index 960bdad64a..47e3197f76 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp @@ -22,7 +22,7 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" -#include "BC_QRAlignmentPattern.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 396f272f3f..4e88215a58 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp @@ -23,8 +23,8 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_QRAlignmentPattern.h" -#include "BC_QRAlignmentPatternFinder.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_QRBitMatrixParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp index 339c5ab77c..db4f243fee 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp @@ -22,10 +22,10 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_QRCoderVersion.h" -#include "BC_QRCoderFormatInformation.h" -#include "BC_QRDataMask.h" -#include "BC_QRBitMatrixParser.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.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_QRCodeReader.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp index a09ac1e892..d5effa0b66 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp @@ -30,16 +30,16 @@ #include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h" #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" -#include "BC_QRCodeReader.h" -#include "BC_QRCodeReader.h" -#include "BC_QRCoderMode.h" -#include "BC_QRCoderDecoder.h" -#include "BC_QRDetector.h" -#include "BC_QRDetectorResult.h" -#include "BC_QRCoderErrorCorrectionLevel.h" -#include "BC_QRDataMask.h" -#include "BC_QRCodeReader.h" -#include "BC_QRCoderVersion.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDetector.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.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 39f9884d45..0506b4fb97 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp @@ -24,11 +24,11 @@ #include "xfa/src/fxbarcode/BC_TwoDimWriter.h" #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" -#include "BC_QRCodeWriter.h" -#include "BC_QRCoderEncoder.h" -#include "BC_QRCoder.h" -#include "BC_QRCodeReader.h" -#include "BC_QRCoderErrorCorrectionLevel.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.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 9db8267280..fdc7a4e064 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp @@ -22,9 +22,9 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" -#include "BC_QRCoderErrorCorrectionLevel.h" -#include "BC_QRCoderMode.h" -#include "BC_QRCoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoder.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 605aacc79a..cfd50d135e 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_QRCoderBitVector.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h" CBC_QRCoderBitVector::CBC_QRCoderBitVector() { m_sizeInBits = 0; m_size = 32; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp index 59c1a637f3..ac20c03a6c 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp @@ -22,7 +22,7 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonByteArray.h" -#include "BC_QRCoderBlockPair.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 81bd220389..676f7e4971 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp @@ -25,12 +25,12 @@ #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" -#include "BC_QRBitMatrixParser.h" -#include "BC_QRDataBlock.h" -#include "BC_QRDecodedBitStreamParser.h" -#include "BC_QRCoderVersion.h" -#include "BC_QRCoderFormatInformation.h" -#include "BC_QRCoderDecoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.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 b3fc1f78ff..91e2ba7fa4 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_QRCoderECB.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_QRCoderECBlocks.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp index 0b2a2a6c28..c63ee63c5a 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_QRCoderECB.h" -#include "BC_QRCoderECBlocks.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_QRCoderEncoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp index bb496cb0e5..74ce5316a1 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp @@ -28,16 +28,16 @@ #include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" -#include "BC_QRCoder.h" -#include "BC_QRCoderEncoder.h" -#include "BC_QRCoderMode.h" -#include "BC_QRCoderEncoder.h" -#include "BC_QRCoderECBlocks.h" -#include "BC_QRCoderVersion.h" -#include "BC_QRCoderBlockPair.h" -#include "BC_QRCoderMaskUtil.h" -#include "BC_QRCoderMatrixUtil.h" -#include "BC_QRCoderBitVector.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.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, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp index 879351c40a..8d3f567cec 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_QRCoderErrorCorrectionLevel.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; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp index 729f351f3d..b4d21e3a2d 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_QRCoderErrorCorrectionLevel.h" -#include "BC_QRCoderFormatInformation.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.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}, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp index 8c4538a300..de2d428596 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp @@ -22,9 +22,9 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" -#include "BC_QRCoderErrorCorrectionLevel.h" -#include "BC_QRCoder.h" -#include "BC_QRCoderMaskUtil.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.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 fd4d4b84ff..5bf02b9573 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp @@ -22,11 +22,11 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" -#include "BC_QRCoderErrorCorrectionLevel.h" -#include "BC_QRCoder.h" -#include "BC_QRCoderMaskUtil.h" -#include "BC_QRCoderMatrixUtil.h" -#include "BC_QRCoderBitVector.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.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}, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp index 738193a2b5..3e24c72cd1 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_QRCoderVersion.h" -#include "BC_QRCoderMode.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h" CBC_QRCoderMode* CBC_QRCoderMode::sBYTE = NULL; CBC_QRCoderMode* CBC_QRCoderMode::sNUMERIC = NULL; CBC_QRCoderMode* CBC_QRCoderMode::sALPHANUMERIC = NULL; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp index 1798db760a..06686a918b 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp @@ -23,12 +23,12 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/utils.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_QRCoderECB.h" -#include "BC_QRCoderFormatInformation.h" -#include "BC_QRCoderErrorCorrectionLevel.h" -#include "BC_QRCoderBitVector.h" -#include "BC_QRCoderECBlocks.h" -#include "BC_QRCoderVersion.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" const int32_t CBC_QRCoderVersion::VERSION_DECODE_INFO[] = { 0x07C94, 0x085BC, 0x09A99, 0x0A4D3, 0x0BBF6, 0x0C762, 0x0D847, 0x0E60D, 0x0F928, 0x10B78, 0x1145D, 0x12A17, 0x13532, 0x149A6, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp index cf85c33d5d..4fca780590 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp @@ -21,10 +21,10 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_QRCoderECBlocks.h" -#include "BC_QRCoderECB.h" -#include "BC_QRDataBlock.h" -#include "BC_QRCoderVersion.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.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 846374e3b3..dc4fddbbea 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp @@ -22,7 +22,7 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_QRDataMask.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h" static int32_t N_DATA_MASKS = 0; CFX_PtrArray* CBC_QRDataMask::DATA_MASKS = NULL; void CBC_QRDataMask::Initialize() { diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp index 3aba699bce..4297253ccd 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp @@ -26,8 +26,8 @@ #include "xfa/src/fxbarcode/common/BC_CommonECI.h" #include "xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h" #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" -#include "BC_QRCoderMode.h" -#include "BC_QRDecodedBitStreamParser.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', diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp index 44bbce3aab..96c156a892 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp @@ -25,14 +25,14 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" -#include "BC_QRFinderPattern.h" -#include "BC_QRCoderVersion.h" -#include "BC_FinderPatternInfo.h" -#include "BC_QRGridSampler.h" -#include "BC_QRAlignmentPatternFinder.h" -#include "BC_QRFinderPatternFinder.h" -#include "BC_QRDetectorResult.h" -#include "BC_QRDetector.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" +#include "xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDetector.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 894204ef97..0d0ae9f034 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp @@ -23,7 +23,7 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_QRDetectorResult.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_QRFinderPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp index 7d3e98feaa..205abe348a 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp @@ -22,7 +22,7 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" -#include "BC_QRFinderPattern.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 72edb53db7..5242f2c1e0 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp @@ -23,9 +23,9 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_QRFinderPatternFinder.h" -#include "BC_FinderPatternInfo.h" -#include "BC_QRFinderPattern.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h" +#include "xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.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; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp index e762171a3f..088b3cbd7c 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp @@ -23,7 +23,7 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_QRGridSampler.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h" CBC_QRGridSampler CBC_QRGridSampler::m_gridSampler; CBC_QRGridSampler::CBC_QRGridSampler() {} CBC_QRGridSampler::~CBC_QRGridSampler() {} |