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/common/BC_CommonBitArray.cpp | 2 +- xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp | 2 +- xfa/src/fxbarcode/common/BC_CommonBitSource.cpp | 2 +- xfa/src/fxbarcode/common/BC_CommonByteArray.cpp | 2 +- xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp | 2 +- xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp | 2 +- xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp | 6 +++--- xfa/src/fxbarcode/common/BC_CommonECI.cpp | 2 +- xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp | 2 +- xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp | 6 +++--- xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp | 8 ++++---- xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp | 2 +- xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp | 2 +- xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp | 2 +- xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-) (limited to 'xfa/src/fxbarcode/common') diff --git a/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp b/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp index d0d0d8ea54..61b4ce3b4f 100644 --- a/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_CommonBitArray.h" CBC_CommonBitArray::CBC_CommonBitArray(CBC_CommonBitArray* array) { m_size = array->GetSize(); diff --git a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp index ec2706b122..c45e28c0c8 100644 --- a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_CommonBitArray.h" #include "BC_CommonBitMatrix.h" CBC_CommonBitMatrix::CBC_CommonBitMatrix() { diff --git a/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp b/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp index 20b0d2accc..c308638fad 100644 --- a/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_CommonBitSource.h" CBC_CommonBitSource::CBC_CommonBitSource(CFX_ByteArray* bytes) { m_bytes.Copy((*bytes)); diff --git a/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp b/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp index 0ad07fd981..967a1849d5 100644 --- a/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_CommonByteArray.h" CBC_CommonByteArray::CBC_CommonByteArray() { m_bytes = NULL; diff --git a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp index d6208d41b5..875b8026c9 100644 --- a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_CommonByteMatrix.h" CBC_CommonByteMatrix::CBC_CommonByteMatrix(int32_t width, int32_t height) { m_height = height; diff --git a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp index fbc6607ae7..2beb850963 100644 --- a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_CommonECI.h" #include "BC_CommonCharacterSetECI.h" void CBC_CommonCharacterSetECI::initialize() {} diff --git a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp index d5f97029f4..1bf9f57981 100644 --- a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../qrcode/BC_QRCoderErrorCorrectionLevel.h" -#include "../pdf417/BC_PDF417ResultMetadata.h" +#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" CBC_CommonDecoderResult::CBC_CommonDecoderResult() {} void CBC_CommonDecoderResult::Init(const CFX_ByteArray& rawBytes, diff --git a/xfa/src/fxbarcode/common/BC_CommonECI.cpp b/xfa/src/fxbarcode/common/BC_CommonECI.cpp index 08cddc90a6..d9f918b025 100644 --- a/xfa/src/fxbarcode/common/BC_CommonECI.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonECI.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_CommonECI.h" #include "BC_CommonCharacterSetECI.h" CBC_CommonECI::CBC_CommonECI(int32_t value) { diff --git a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp index 8a4687036e..3fd2e4a893 100644 --- a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_CommonPerspectiveTransform.h" CBC_CommonPerspectiveTransform::CBC_CommonPerspectiveTransform(FX_FLOAT a11, FX_FLOAT a21, diff --git a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp index 5a15c36f01..24c17712cc 100644 --- a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp +++ b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Binarizer.h" -#include "../BC_LuminanceSource.h" +#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" diff --git a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp index 368a12efd7..a01eaee3ac 100644 --- a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp +++ b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp @@ -20,10 +20,10 @@ * limitations under the License. */ -#include "../barcode.h" -#include "BC_WhiteRectangleDetector.h" -#include "BC_CommonBitMatrix.h" -#include "../BC_ResultPoint.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" const int32_t CBC_WhiteRectangleDetector::INIT_SIZE = 30; const int32_t CBC_WhiteRectangleDetector::CORR = 1; CBC_WhiteRectangleDetector::CBC_WhiteRectangleDetector( diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp index c2ddd0f69f..a14a2d9cb5 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_ReedSolomonGF256.h" #include "BC_ReedSolomonGF256Poly.h" #include "BC_ReedSolomon.h" diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp index b072309a86..4ee87a4fa7 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_ReedSolomonGF256.h" #include "BC_ReedSolomonGF256Poly.h" #include "BC_ReedSolomonDecoder.h" diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp index d862e9a931..0957ca51b7 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_ReedSolomonGF256Poly.h" #include "BC_ReedSolomonGF256.h" CBC_ReedSolomonGF256* CBC_ReedSolomonGF256::QRCodeFild = NULL; diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp index b94508f900..f87cd5ba86 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_ReedSolomonGF256.h" #include "BC_ReedSolomonGF256Poly.h" CBC_ReedSolomonGF256Poly::CBC_ReedSolomonGF256Poly(CBC_ReedSolomonGF256* field, -- cgit v1.2.3