From c909ce872d999a17ffd44afdc88caf2de43e6cba Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 8 Jan 2016 15:44:36 -0800 Subject: XFA: Remove many relative includes in xfa/ Also remove useless files. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1570743002 . --- xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp | 4 ++-- xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp | 4 ++-- .../fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp | 6 +++--- xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp | 4 ++-- xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp | 20 ++++++++++---------- xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp | 8 ++++---- xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h | 2 +- xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp | 4 ++-- xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp | 2 +- xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp | 4 ++-- xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp | 10 +++++----- xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp | 2 +- xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp | 2 +- xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp | 12 ++++++------ .../qrcode/BC_QRCoderErrorCorrectionLevel.cpp | 2 +- .../fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp | 2 +- xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp | 4 ++-- xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp | 4 ++-- xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp | 2 +- xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp | 6 +++--- xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp | 2 +- xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp | 4 ++-- .../fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp | 12 ++++++------ xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp | 6 +++--- xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp | 6 +++--- xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp | 4 ++-- .../fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp | 6 +++--- xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp | 6 +++--- 28 files changed, 75 insertions(+), 75 deletions(-) (limited to 'xfa/src/fxbarcode/qrcode') diff --git a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp index 16e8a9accd..dfc6148910 100644 --- a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.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" #include "BC_QRFinderPattern.h" #include "BC_FinderPatternInfo.h" CBC_QRFinderPatternInfo::CBC_QRFinderPatternInfo(CFX_PtrArray* patternCenters) { diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp index 79066fe83e..e5bbb7d9c8 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.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" #include "BC_QRAlignmentPattern.h" CBC_QRAlignmentPattern::CBC_QRAlignmentPattern(FX_FLOAT posX, FX_FLOAT posY, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp index f504517d44..a2c01c2fce 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_ResultPoint.h" -#include "../common/BC_CommonBitMatrix.h" +#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" CBC_QRAlignmentPatternFinder::CBC_QRAlignmentPatternFinder( diff --git a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp index ad8bd566bf..5428902883 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonBitMatrix.h" +#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" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp index 05635917bd..8de9ef7e80 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp @@ -20,16 +20,16 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Reader.h" -#include "../BC_LuminanceSource.h" -#include "../BC_BufferedImageLuminanceSource.h" -#include "../BC_Binarizer.h" -#include "../BC_BinaryBitmap.h" -#include "../BC_ResultPoint.h" -#include "../common/BC_GlobalHistogramBinarizer.h" -#include "../common/BC_CommonDecoderResult.h" -#include "../common/reedsolomon/BC_ReedSolomonGF256.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/BC_LuminanceSource.h" +#include "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h" +#include "xfa/src/fxbarcode/BC_Binarizer.h" +#include "xfa/src/fxbarcode/BC_BinaryBitmap.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" +#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" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp index 2621abeb63..0d3096c4ae 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp @@ -20,10 +20,10 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_TwoDimWriter.h" -#include "../BC_Reader.h" -#include "../common/BC_CommonByteMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#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" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h index 51272f65f6..6cdd1e9c15 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h +++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h @@ -6,7 +6,7 @@ #ifndef _BC_QRCODERWRITER_H_ #define _BC_QRCODERWRITER_H_ -#include "../BC_TwoDimWriter.h" +#include "xfa/src/fxbarcode/BC_TwoDimWriter.h" class CBC_TwoDimWriter; class CBC_MultiBarCodes; class CBC_QRCoderWriter; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp index 3569c1c2ec..9d2553d4e0 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonByteMatrix.h" +#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" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp index 21c2f09637..825d527388 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_QRCoderBitVector.h" CBC_QRCoderBitVector::CBC_QRCoderBitVector() { m_sizeInBits = 0; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp index 7c23ce68ff..4990a157b0 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonByteArray.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonByteArray.h" #include "BC_QRCoderBlockPair.h" CBC_QRCoderBlockPair::CBC_QRCoderBlockPair( CBC_CommonByteArray* data, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp index 78e7a89f18..7815c99aee 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp @@ -20,11 +20,11 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonBitMatrix.h" -#include "../common/BC_CommonDecoderResult.h" -#include "../common/reedsolomon/BC_ReedSolomonDecoder.h" -#include "../common/reedsolomon/BC_ReedSolomonGF256.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#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" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp index c3633afaa8..bfb1c6455b 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_QRCoderECB.h" CBC_QRCoderECB::CBC_QRCoderECB(int32_t count, int32_t dataCodeWords) { m_dataCodeWords = dataCodeWords; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp index 8489106d82..c5c32222f6 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_QRCoderECB.h" #include "BC_QRCoderECBlocks.h" CBC_QRCoderECBlocks::CBC_QRCoderECBlocks(int32_t ecCodeWordsPerBlock, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp index bbdaa0b93b..2610db95dc 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp @@ -20,12 +20,12 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_UtilCodingConvert.h" -#include "../common/BC_CommonByteArray.h" -#include "../common/BC_CommonByteMatrix.h" -#include "../common/reedsolomon/BC_ReedSolomon.h" -#include "../common/reedsolomon/BC_ReedSolomonGF256.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/common/BC_CommonByteArray.h" +#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" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp index 52265000c1..330a992361 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_QRCoderErrorCorrectionLevel.h" CBC_QRCoderErrorCorrectionLevel* CBC_QRCoderErrorCorrectionLevel::L = NULL; CBC_QRCoderErrorCorrectionLevel* CBC_QRCoderErrorCorrectionLevel::M = NULL; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp index 7f605c3ea5..f2fe512d43 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_QRCoderErrorCorrectionLevel.h" #include "BC_QRCoderFormatInformation.h" const int32_t CBC_QRCoderFormatInformation::FORMAT_INFO_MASK_QR = 0X5412; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp index e63f0237ef..ac1b74b5a0 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonByteMatrix.h" +#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" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp index 3c663c7b69..8c66717d84 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonByteMatrix.h" +#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" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp index 7481a8ec67..f122627986 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_QRCoderVersion.h" #include "BC_QRCoderMode.h" CBC_QRCoderMode* CBC_QRCoderMode::sBYTE = NULL; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp index dde09ee564..15b99fbb6a 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../utils.h" -#include "../common/BC_CommonBitMatrix.h" +#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" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp index 0a265c9d04..b4a7b53258 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_QRCoderECBlocks.h" #include "BC_QRCoderECB.h" #include "BC_QRDataBlock.h" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp index 79b6db39a9..f825ce4766 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_QRDataMask.h" static int32_t N_DATA_MASKS = 0; CFX_PtrArray* CBC_QRDataMask::DATA_MASKS = NULL; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp index 26180ceff4..c9a9222506 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp @@ -20,12 +20,12 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_UtilCodingConvert.h" -#include "../common/BC_CommonBitSource.h" -#include "../common/BC_CommonECI.h" -#include "../common/BC_CommonCharacterSetECI.h" -#include "../common/BC_CommonDecoderResult.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitSource.h" +#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" const FX_CHAR* CBC_QRDecodedBitStreamParser::UTF_8 = "utf8"; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp index 70edfeff40..1b799114b4 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonBitMatrix.h" -#include "../BC_ResultPoint.h" +#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" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp index 561c10a3ab..55656c48fd 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_ResultPoint.h" -#include "../common/BC_CommonBitMatrix.h" +#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" CBC_QRDetectorResult::CBC_QRDetectorResult(CBC_CommonBitMatrix* bits, CFX_PtrArray* points) diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp index f9fdfbd2cf..0ff97e21b7 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.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" #include "BC_QRFinderPattern.h" CBC_QRFinderPattern::CBC_QRFinderPattern(FX_FLOAT x, FX_FLOAT posY, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp index fc82584370..69614f0710 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_ResultPoint.h" -#include "../common/BC_CommonBitMatrix.h" +#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" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp index 1bc85f1a12..b06be55f7e 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonPerspectiveTransform.h" -#include "../common/BC_CommonBitMatrix.h" +#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" CBC_QRGridSampler CBC_QRGridSampler::m_gridSampler; CBC_QRGridSampler::CBC_QRGridSampler() {} -- cgit v1.2.3