From 04d02dbdd511aed4ddd61d8648edc633a0fb8c43 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 22 Feb 2016 13:04:17 -0500 Subject: 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 . --- xfa/src/fxbarcode/oned/BC_OneDReader.cpp | 2 +- xfa/src/fxbarcode/oned/BC_OneDimReader.cpp | 4 ++-- xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp | 2 +- xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp | 8 ++++---- xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp | 4 ++-- xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp | 8 ++++---- xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp | 4 ++-- xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp | 8 ++++---- xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp | 6 +++--- xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp | 10 +++++----- xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp | 6 +++--- xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp | 8 ++++---- xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp | 8 ++++---- xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp | 6 +++--- 14 files changed, 42 insertions(+), 42 deletions(-) (limited to 'xfa/src/fxbarcode/oned') 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 #include 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; -- cgit v1.2.3