diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-06 15:53:26 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-06 15:53:26 -0800 |
| commit | e6cab2252ee48212420b52735afa6346bb256e2c (patch) | |
| tree | 1ffbed054fd1c73dd1da6cd3393b82665c21c6ff /xfa/src/fxbarcode/pdf417 | |
| parent | b4e7f304af0ad92d20f952e6634000d177974f47 (diff) | |
| download | pdfium-e6cab2252ee48212420b52735afa6346bb256e2c.tar.xz | |
XFA: Actually fix all relative includes to third_party.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1413253003 .
Diffstat (limited to 'xfa/src/fxbarcode/pdf417')
4 files changed, 25 insertions, 13 deletions
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp index e14b2b37c4..af63d19bfe 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp @@ -20,13 +20,16 @@ * limitations under the License.
*/
+#include "BC_PDF417DecodedBitStreamParser.h"
+
#include <stdlib.h>
-#include "../barcode.h"
+
#include "../BC_DecoderResult.h"
+#include "../barcode.h"
#include "../common/BC_CommonDecoderResult.h"
-#include "../../../../third_party/bigint/BigIntegerLibrary.hh"
#include "BC_PDF417ResultMetadata.h"
-#include "BC_PDF417DecodedBitStreamParser.h"
+#include "third_party/bigint/BigIntegerLibrary.hh"
+
#define TEXT_COMPACTION_MODE_LATCH 900
#define BYTE_COMPACTION_MODE_LATCH 901
#define NUMERIC_COMPACTION_MODE_LATCH 902
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h index f60d3eb929..6779f938d9 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h @@ -4,10 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _BC_DECODEDBITSTREAMPARSER_H_
-#define _BC_DECODEDBITSTREAMPARSER_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417DECODEDBITSTREAMPARSER_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417DECODEDBITSTREAMPARSER_H_
+
+#include "core/include/fxcrt/fx_basic.h"
+#include "core/include/fxcrt/fx_string.h"
+
class CBC_CommonDecoderResult;
class CBC_PDF417ResultMetadata;
+
class CBC_DecodedBitStreamPaser {
public:
CBC_DecodedBitStreamPaser();
@@ -54,4 +59,4 @@ class CBC_DecodedBitStreamPaser { int32_t count,
int32_t& e);
};
-#endif
+#endif // XFA_SRC_FXBARCODE_PDF417_BC_PDF417DECODEDBITSTREAMPARSER_H_
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp index db321bc846..6a8beaab20 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp @@ -20,11 +20,13 @@ * limitations under the License.
*/
-#include "../barcode.h"
+#include "BC_PDF417HighLevelEncoder.h"
+
#include "../BC_UtilCodingConvert.h"
-#include "../../../../third_party/bigint/BigIntegerLibrary.hh"
+#include "../barcode.h"
#include "BC_PDF417Compaction.h"
-#include "BC_PDF417HighLevelEncoder.h"
+#include "third_party/bigint/BigIntegerLibrary.hh"
+
#define SUBMODE_ALPHA 0
#define SUBMODE_LOWER 1
#define SUBMODE_MIXED 2
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h index e11f0a5632..14e1c7270c 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h @@ -4,10 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _BC_PDF417HIGHLEVELENCODER_H_
-#define _BC_PDF417HIGHLEVELENCODER_H_
+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417HIGHLEVELENCODER_H_
+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417HIGHLEVELENCODER_H_
-#include "BC_PDF417Compaction.h"
+#include "core/include/fxcrt/fx_basic.h"
+#include "core/include/fxcrt/fx_string.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h"
class CBC_PDF417HighLevelEncoder {
public:
@@ -69,4 +71,4 @@ class CBC_PDF417HighLevelEncoder { friend class PDF417HighLevelEncoder_ConsecutiveBinaryCount_Test;
};
-#endif
+#endif // XFA_SRC_FXBARCODE_PDF417_BC_PDF417HIGHLEVELENCODER_H_
|