From a8a28e0702a1874d29d3c9f2b155bce1557eb4fd Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 23 Mar 2016 15:41:39 -0400 Subject: Move core/include/fxcrt to core/fxcrt/include. This CL moves the fxcrt code into the core/fxcrt directory. The only exception was fx_bidi.h which was moved into core/fxcrt as it is not used outside of core/. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1825953002 . --- xfa/fxbarcode/common/BC_CommonBitArray.h | 2 +- xfa/fxbarcode/common/BC_CommonBitMatrix.h | 2 +- xfa/fxbarcode/common/BC_CommonBitSource.h | 2 +- xfa/fxbarcode/common/BC_CommonByteArray.h | 2 +- xfa/fxbarcode/common/BC_CommonByteMatrix.cpp | 2 +- xfa/fxbarcode/common/BC_CommonByteMatrix.h | 2 +- xfa/fxbarcode/common/BC_CommonCharacterSetECI.h | 2 +- xfa/fxbarcode/common/BC_CommonDecoderResult.cpp | 2 +- xfa/fxbarcode/common/BC_CommonDecoderResult.h | 2 +- xfa/fxbarcode/common/BC_CommonPerspectiveTransform.cpp | 2 +- xfa/fxbarcode/common/BC_CommonPerspectiveTransform.h | 2 +- xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h | 2 +- xfa/fxbarcode/common/BC_WhiteRectangleDetector.h | 2 +- xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h | 2 +- xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h | 2 +- xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h | 2 +- xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) (limited to 'xfa/fxbarcode/common') diff --git a/xfa/fxbarcode/common/BC_CommonBitArray.h b/xfa/fxbarcode/common/BC_CommonBitArray.h index 6ddd789480..1c89500138 100644 --- a/xfa/fxbarcode/common/BC_CommonBitArray.h +++ b/xfa/fxbarcode/common/BC_CommonBitArray.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_COMMON_BC_COMMONBITARRAY_H_ #define XFA_FXBARCODE_COMMON_BC_COMMONBITARRAY_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CBC_CommonBitArray { public: diff --git a/xfa/fxbarcode/common/BC_CommonBitMatrix.h b/xfa/fxbarcode/common/BC_CommonBitMatrix.h index 78b42641dd..ebf7454dca 100644 --- a/xfa/fxbarcode/common/BC_CommonBitMatrix.h +++ b/xfa/fxbarcode/common/BC_CommonBitMatrix.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_COMMON_BC_COMMONBITMATRIX_H_ #define XFA_FXBARCODE_COMMON_BC_COMMONBITMATRIX_H_ -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" class CBC_CommonBitArray; diff --git a/xfa/fxbarcode/common/BC_CommonBitSource.h b/xfa/fxbarcode/common/BC_CommonBitSource.h index 7617a6f19d..f33e077c68 100644 --- a/xfa/fxbarcode/common/BC_CommonBitSource.h +++ b/xfa/fxbarcode/common/BC_CommonBitSource.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_COMMON_BC_COMMONBITSOURCE_H_ #define XFA_FXBARCODE_COMMON_BC_COMMONBITSOURCE_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" #include "xfa/fxbarcode/utils.h" class CBC_CommonBitSource { diff --git a/xfa/fxbarcode/common/BC_CommonByteArray.h b/xfa/fxbarcode/common/BC_CommonByteArray.h index 69d470b0e5..eaf68d9f41 100644 --- a/xfa/fxbarcode/common/BC_CommonByteArray.h +++ b/xfa/fxbarcode/common/BC_CommonByteArray.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_COMMON_BC_COMMONBYTEARRAY_H_ #define XFA_FXBARCODE_COMMON_BC_COMMONBYTEARRAY_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CBC_CommonByteArray { private: diff --git a/xfa/fxbarcode/common/BC_CommonByteMatrix.cpp b/xfa/fxbarcode/common/BC_CommonByteMatrix.cpp index c9ed7495c0..05028bd395 100644 --- a/xfa/fxbarcode/common/BC_CommonByteMatrix.cpp +++ b/xfa/fxbarcode/common/BC_CommonByteMatrix.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "core/include/fxcrt/fx_memory.h" +#include "core/fxcrt/include/fx_memory.h" #include "xfa/fxbarcode/common/BC_CommonByteMatrix.h" CBC_CommonByteMatrix::CBC_CommonByteMatrix(int32_t width, int32_t height) { diff --git a/xfa/fxbarcode/common/BC_CommonByteMatrix.h b/xfa/fxbarcode/common/BC_CommonByteMatrix.h index 271feef34f..74e1203481 100644 --- a/xfa/fxbarcode/common/BC_CommonByteMatrix.h +++ b/xfa/fxbarcode/common/BC_CommonByteMatrix.h @@ -9,7 +9,7 @@ #include -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" class CBC_CommonByteMatrix { public: diff --git a/xfa/fxbarcode/common/BC_CommonCharacterSetECI.h b/xfa/fxbarcode/common/BC_CommonCharacterSetECI.h index 18a676a449..5bd77e4fd1 100644 --- a/xfa/fxbarcode/common/BC_CommonCharacterSetECI.h +++ b/xfa/fxbarcode/common/BC_CommonCharacterSetECI.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_COMMON_BC_COMMONCHARACTERSETECI_H_ #define XFA_FXBARCODE_COMMON_BC_COMMONCHARACTERSETECI_H_ -#include "core/include/fxcrt/fx_string.h" +#include "core/fxcrt/include/fx_string.h" #include "xfa/fxbarcode/common/BC_CommonECI.h" class CBC_CommonCharacterSetECI : public CBC_CommonECI { diff --git a/xfa/fxbarcode/common/BC_CommonDecoderResult.cpp b/xfa/fxbarcode/common/BC_CommonDecoderResult.cpp index 0c545c4eba..d28a88bfbc 100644 --- a/xfa/fxbarcode/common/BC_CommonDecoderResult.cpp +++ b/xfa/fxbarcode/common/BC_CommonDecoderResult.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" #include "xfa/fxbarcode/common/BC_CommonDecoderResult.h" #include "xfa/fxbarcode/pdf417/BC_PDF417ResultMetadata.h" #include "xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" diff --git a/xfa/fxbarcode/common/BC_CommonDecoderResult.h b/xfa/fxbarcode/common/BC_CommonDecoderResult.h index dbdb9d34d4..9dc4b66dce 100644 --- a/xfa/fxbarcode/common/BC_CommonDecoderResult.h +++ b/xfa/fxbarcode/common/BC_CommonDecoderResult.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_COMMON_BC_COMMONDECODERRESULT_H_ #define XFA_FXBARCODE_COMMON_BC_COMMONDECODERRESULT_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CBC_QRCoderErrorCorrectionLevel; class CBC_PDF417ResultMetadata; diff --git a/xfa/fxbarcode/common/BC_CommonPerspectiveTransform.cpp b/xfa/fxbarcode/common/BC_CommonPerspectiveTransform.cpp index daa6189e56..d84ed6163d 100644 --- a/xfa/fxbarcode/common/BC_CommonPerspectiveTransform.cpp +++ b/xfa/fxbarcode/common/BC_CommonPerspectiveTransform.cpp @@ -24,7 +24,7 @@ #include -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" #include "xfa/fxbarcode/utils.h" CBC_CommonPerspectiveTransform::CBC_CommonPerspectiveTransform(FX_FLOAT a11, diff --git a/xfa/fxbarcode/common/BC_CommonPerspectiveTransform.h b/xfa/fxbarcode/common/BC_CommonPerspectiveTransform.h index 36defd8146..d701b7ec34 100644 --- a/xfa/fxbarcode/common/BC_CommonPerspectiveTransform.h +++ b/xfa/fxbarcode/common/BC_CommonPerspectiveTransform.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_COMMON_BC_COMMONPERSPECTIVETRANSFORM_H_ #define XFA_FXBARCODE_COMMON_BC_COMMONPERSPECTIVETRANSFORM_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CBC_CommonPerspectiveTransform { public: diff --git a/xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h b/xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h index da13cac402..01ac9a6c2a 100644 --- a/xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h +++ b/xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_COMMON_BC_GLOBALHISTOGRAMBINARIZER_H_ #define XFA_FXBARCODE_COMMON_BC_GLOBALHISTOGRAMBINARIZER_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" #include "xfa/fxbarcode/BC_Binarizer.h" class CBC_CommonBitArray; diff --git a/xfa/fxbarcode/common/BC_WhiteRectangleDetector.h b/xfa/fxbarcode/common/BC_WhiteRectangleDetector.h index 3d6c01ceff..d713d0fa99 100644 --- a/xfa/fxbarcode/common/BC_WhiteRectangleDetector.h +++ b/xfa/fxbarcode/common/BC_WhiteRectangleDetector.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_COMMON_BC_WHITERECTANGLEDETECTOR_H_ #define XFA_FXBARCODE_COMMON_BC_WHITERECTANGLEDETECTOR_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CBC_CommonBitMatrix; class CBC_ResultPoint; diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h index 6f6aef7e7d..0dfa37ddb7 100644 --- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h +++ b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMON_H_ #define XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMON_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CBC_ReedSolomonGF256; class CBC_ReedSolomonGF256Poly; diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h index ec14344fe0..f44f92072e 100644 --- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h +++ b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONDECODER_H_ #define XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONDECODER_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CBC_ReedSolomonGF256; class CBC_ReedSolomonGF256Poly; diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h index 099cab57d5..cd788111ed 100644 --- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h +++ b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256_H_ #define XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" #include "xfa/fxbarcode/utils.h" class CBC_ReedSolomonGF256Poly; diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h index 16a1f9066e..aa549efe60 100644 --- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h +++ b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256POLY_H_ #define XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256POLY_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CBC_ReedSolomonGF256; -- cgit v1.2.3