diff options
author | Lei Zhang <thestig@chromium.org> | 2015-11-05 18:39:40 -0800 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-11-05 18:39:40 -0800 |
commit | 34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c (patch) | |
tree | 422e979cbfdeab9781c07a4040aee94a9dd0a7f6 /core/src/fxcodec/jbig2 | |
parent | ba2d95fb6d7b6eb3b27ca8e6eb41d9aae1a8b691 (diff) | |
download | pdfium-chromium/2557.tar.xz |
Fix all relative includes to third_party.chromium/2560chromium/2559chromium/2558chromium/2557
- In non-standalone builds, use the provided jpeg library.
- Run gn format over all the GN files.
- Also roll DEPS for buildtools to c2f2598.
BUG=541704
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1425153006 .
Diffstat (limited to 'core/src/fxcodec/jbig2')
-rw-r--r-- | core/src/fxcodec/jbig2/JBig2_Context.h | 2 | ||||
-rw-r--r-- | core/src/fxcodec/jbig2/JBig2_GrdProc.cpp | 2 | ||||
-rw-r--r-- | core/src/fxcodec/jbig2/JBig2_GrrdProc.cpp | 2 | ||||
-rw-r--r-- | core/src/fxcodec/jbig2/JBig2_GsidProc.cpp | 2 | ||||
-rw-r--r-- | core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp | 2 | ||||
-rw-r--r-- | core/src/fxcodec/jbig2/JBig2_PddProc.cpp | 2 | ||||
-rw-r--r-- | core/src/fxcodec/jbig2/JBig2_SddProc.cpp | 4 | ||||
-rw-r--r-- | core/src/fxcodec/jbig2/JBig2_SymbolDict.h | 2 | ||||
-rw-r--r-- | core/src/fxcodec/jbig2/JBig2_TrdProc.cpp | 4 |
9 files changed, 11 insertions, 11 deletions
diff --git a/core/src/fxcodec/jbig2/JBig2_Context.h b/core/src/fxcodec/jbig2/JBig2_Context.h index 61379fe2ff..a98d7a98ca 100644 --- a/core/src/fxcodec/jbig2/JBig2_Context.h +++ b/core/src/fxcodec/jbig2/JBig2_Context.h @@ -10,12 +10,12 @@ #include <list> #include <utility> -#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "../../../include/fpdfapi/fpdf_objects.h" #include "../../../include/fxcodec/fx_codec_def.h" #include "JBig2_List.h" #include "JBig2_Page.h" #include "JBig2_Segment.h" +#include "third_party/base/nonstd_unique_ptr.h" class CJBig2_ArithDecoder; class CJBig2_GRDProc; diff --git a/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp b/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp index eda76bbce9..083ac5e186 100644 --- a/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp @@ -6,11 +6,11 @@ #include "JBig2_GrdProc.h" -#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "../../../include/fxcodec/fx_codec.h" #include "JBig2_ArithDecoder.h" #include "JBig2_BitStream.h" #include "JBig2_Image.h" +#include "third_party/base/nonstd_unique_ptr.h" CJBig2_GRDProc::CJBig2_GRDProc() : m_loopIndex(0), diff --git a/core/src/fxcodec/jbig2/JBig2_GrrdProc.cpp b/core/src/fxcodec/jbig2/JBig2_GrrdProc.cpp index 916683c8aa..549669a72f 100644 --- a/core/src/fxcodec/jbig2/JBig2_GrrdProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_GrrdProc.cpp @@ -6,10 +6,10 @@ #include "JBig2_GrrdProc.h" -#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "JBig2_ArithDecoder.h" #include "JBig2_BitStream.h" #include "JBig2_Image.h" +#include "third_party/base/nonstd_unique_ptr.h" CJBig2_Image* CJBig2_GRRDProc::decode(CJBig2_ArithDecoder* pArithDecoder, JBig2ArithCtx* grContext) { diff --git a/core/src/fxcodec/jbig2/JBig2_GsidProc.cpp b/core/src/fxcodec/jbig2/JBig2_GsidProc.cpp index 5f423c4b04..ee43cdba5e 100644 --- a/core/src/fxcodec/jbig2/JBig2_GsidProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_GsidProc.cpp @@ -6,12 +6,12 @@ #include "JBig2_GsidProc.h" -#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "../../../include/fxcrt/fx_basic.h" #include "JBig2_BitStream.h" #include "JBig2_GrdProc.h" #include "JBig2_Image.h" #include "JBig2_List.h" +#include "third_party/base/nonstd_unique_ptr.h" FX_DWORD* CJBig2_GSIDProc::decode_Arith(CJBig2_ArithDecoder* pArithDecoder, JBig2ArithCtx* gbContext, diff --git a/core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp b/core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp index a5a8b7abfe..d9768345a0 100644 --- a/core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp @@ -6,9 +6,9 @@ #include "JBig2_HtrdProc.h" -#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "../../../include/fxcrt/fx_basic.h" #include "JBig2_GsidProc.h" +#include "third_party/base/nonstd_unique_ptr.h" CJBig2_Image* CJBig2_HTRDProc::decode_Arith(CJBig2_ArithDecoder* pArithDecoder, JBig2ArithCtx* gbContext, diff --git a/core/src/fxcodec/jbig2/JBig2_PddProc.cpp b/core/src/fxcodec/jbig2/JBig2_PddProc.cpp index 56443a01d2..fbe9e4b17f 100644 --- a/core/src/fxcodec/jbig2/JBig2_PddProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_PddProc.cpp @@ -6,10 +6,10 @@ #include "JBig2_PddProc.h" -#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "JBig2_GrdProc.h" #include "JBig2_Image.h" #include "JBig2_PatternDict.h" +#include "third_party/base/nonstd_unique_ptr.h" CJBig2_PatternDict* CJBig2_PDDProc::decode_Arith( CJBig2_ArithDecoder* pArithDecoder, diff --git a/core/src/fxcodec/jbig2/JBig2_SddProc.cpp b/core/src/fxcodec/jbig2/JBig2_SddProc.cpp index ab3b34f583..fe39e71af9 100644 --- a/core/src/fxcodec/jbig2/JBig2_SddProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_SddProc.cpp @@ -6,8 +6,6 @@ #include "JBig2_SddProc.h" -#include "../../../../third_party/base/nonstd_unique_ptr.h" -#include "../../../../third_party/base/stl_util.h" #include "../../../include/fxcrt/fx_basic.h" #include "JBig2_ArithIntDecoder.h" #include "JBig2_GrdProc.h" @@ -16,6 +14,8 @@ #include "JBig2_HuffmanTable.h" #include "JBig2_SymbolDict.h" #include "JBig2_TrdProc.h" +#include "third_party/base/nonstd_unique_ptr.h" +#include "third_party/base/stl_util.h" using pdfium::vector_as_array; diff --git a/core/src/fxcodec/jbig2/JBig2_SymbolDict.h b/core/src/fxcodec/jbig2/JBig2_SymbolDict.h index 6ff4c2efe2..107b282c9e 100644 --- a/core/src/fxcodec/jbig2/JBig2_SymbolDict.h +++ b/core/src/fxcodec/jbig2/JBig2_SymbolDict.h @@ -9,10 +9,10 @@ #include <vector> -#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "../../../include/fxcrt/fx_basic.h" #include "JBig2_ArithDecoder.h" #include "JBig2_List.h" +#include "third_party/base/nonstd_unique_ptr.h" class CJBig2_Image; diff --git a/core/src/fxcodec/jbig2/JBig2_TrdProc.cpp b/core/src/fxcodec/jbig2/JBig2_TrdProc.cpp index 368ec9b11e..d76beea8e2 100644 --- a/core/src/fxcodec/jbig2/JBig2_TrdProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_TrdProc.cpp @@ -6,11 +6,11 @@ #include "JBig2_TrdProc.h" -#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "JBig2_ArithDecoder.h" #include "JBig2_ArithIntDecoder.h" -#include "JBig2_HuffmanDecoder.h" #include "JBig2_GrrdProc.h" +#include "JBig2_HuffmanDecoder.h" +#include "third_party/base/nonstd_unique_ptr.h" CJBig2_Image* CJBig2_TRDProc::decode_Huffman(CJBig2_BitStream* pStream, JBig2ArithCtx* grContext) { |