summaryrefslogtreecommitdiff
path: root/xfa/src/fxbarcode/datamatrix
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2016-02-22 13:04:17 -0500
committerDan Sinclair <dsinclair@chromium.org>2016-02-22 13:04:17 -0500
commit04d02dbdd511aed4ddd61d8648edc633a0fb8c43 (patch)
tree23c45c573096dbb58ca67c4c296d7c5aee579514 /xfa/src/fxbarcode/datamatrix
parent22d6607d104d4cb8c5263c4d307b4ba1e4ff959e (diff)
downloadpdfium-04d02dbdd511aed4ddd61d8648edc633a0fb8c43.tar.xz
Expand XFA includes to be relative to pdfium/.
This Cl updates the includes in the XFA directory to be relative to the pdfium/ directory instead of the current directory. This does not sort the includes as that is a larger IWYU task that will be handled separately. BUG=pdfium:65 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1723533002 .
Diffstat (limited to 'xfa/src/fxbarcode/datamatrix')
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp12
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp12
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp12
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp4
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp4
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp10
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp6
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp8
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp30
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp4
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp12
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp8
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp8
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp22
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp8
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp14
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp14
22 files changed, 99 insertions, 99 deletions
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() {