diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-08-31 13:19:18 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-31 17:29:26 +0000 |
| commit | bcd1e70175b6bbbcb9d9466c579e0538f34297c6 (patch) | |
| tree | 9748923cde5a3e52054488fbad5f9dbb855aecc0 /core/fxcodec/jbig2 | |
| parent | bc0ca1ec9b157ab8773c9043725c7422f7c1a57c (diff) | |
| download | pdfium-bcd1e70175b6bbbcb9d9466c579e0538f34297c6.tar.xz | |
Remove fx_basic.h
This CL removes the fx_basic.h header and fixes up includes as needed.
Change-Id: I49af32a8327bdbcda40c50a61ffbd75d06609040
Reviewed-on: https://pdfium-review.googlesource.com/12670
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fxcodec/jbig2')
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_ArithDecoder.cpp | 2 | ||||
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp | 2 | ||||
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_BitStream.h | 1 | ||||
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_HtrdProc.cpp | 1 | ||||
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_HuffmanDecoder.h | 2 | ||||
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.cpp | 3 | ||||
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_Image.cpp | 1 | ||||
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_SddProc.cpp | 1 | ||||
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_SymbolDict.h | 1 |
9 files changed, 7 insertions, 7 deletions
diff --git a/core/fxcodec/jbig2/JBig2_ArithDecoder.cpp b/core/fxcodec/jbig2/JBig2_ArithDecoder.cpp index 78c7939458..45628a87ce 100644 --- a/core/fxcodec/jbig2/JBig2_ArithDecoder.cpp +++ b/core/fxcodec/jbig2/JBig2_ArithDecoder.cpp @@ -7,7 +7,7 @@ #include "core/fxcodec/jbig2/JBig2_ArithDecoder.h" #include "core/fxcodec/jbig2/JBig2_BitStream.h" -#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_memory.h" namespace { diff --git a/core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp b/core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp index 228e16ec09..1701538b4f 100644 --- a/core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp +++ b/core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp @@ -8,7 +8,7 @@ #include <vector> -#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_memory.h" namespace { diff --git a/core/fxcodec/jbig2/JBig2_BitStream.h b/core/fxcodec/jbig2/JBig2_BitStream.h index 7517eb0c6c..0be6c4b977 100644 --- a/core/fxcodec/jbig2/JBig2_BitStream.h +++ b/core/fxcodec/jbig2/JBig2_BitStream.h @@ -8,7 +8,6 @@ #define CORE_FXCODEC_JBIG2_JBIG2_BITSTREAM_H_ #include "core/fxcrt/cfx_retain_ptr.h" -#include "core/fxcrt/fx_basic.h" class CPDF_StreamAcc; diff --git a/core/fxcodec/jbig2/JBig2_HtrdProc.cpp b/core/fxcodec/jbig2/JBig2_HtrdProc.cpp index 9c9480e263..bd1d92f2be 100644 --- a/core/fxcodec/jbig2/JBig2_HtrdProc.cpp +++ b/core/fxcodec/jbig2/JBig2_HtrdProc.cpp @@ -12,7 +12,6 @@ #include "core/fxcodec/jbig2/JBig2_BitStream.h" #include "core/fxcodec/jbig2/JBig2_GrdProc.h" #include "core/fxcodec/jbig2/JBig2_Image.h" -#include "core/fxcrt/fx_basic.h" #include "third_party/base/ptr_util.h" std::unique_ptr<CJBig2_Image> CJBig2_HTRDProc::decode_Arith( diff --git a/core/fxcodec/jbig2/JBig2_HuffmanDecoder.h b/core/fxcodec/jbig2/JBig2_HuffmanDecoder.h index c7192b74ed..15ebf7827d 100644 --- a/core/fxcodec/jbig2/JBig2_HuffmanDecoder.h +++ b/core/fxcodec/jbig2/JBig2_HuffmanDecoder.h @@ -9,6 +9,8 @@ #include "core/fxcodec/jbig2/JBig2_BitStream.h" #include "core/fxcodec/jbig2/JBig2_HuffmanTable.h" +#include "core/fxcrt/cfx_unowned_ptr.h" + class CJBig2_HuffmanDecoder { public: explicit CJBig2_HuffmanDecoder(CJBig2_BitStream* pStream); diff --git a/core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.cpp b/core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.cpp index 4c2ba997d5..abff7868e8 100644 --- a/core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.cpp +++ b/core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.cpp @@ -5,7 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h" -#include "core/fxcrt/fx_basic.h" + +#include "core/fxcrt/fx_memory.h" const bool HuffmanTable_HTOOB_B1 = false; const JBig2TableLine HuffmanTable_B1[] = {{1, 4, 0}, diff --git a/core/fxcodec/jbig2/JBig2_Image.cpp b/core/fxcodec/jbig2/JBig2_Image.cpp index e07eb32fe3..f9868797da 100644 --- a/core/fxcodec/jbig2/JBig2_Image.cpp +++ b/core/fxcodec/jbig2/JBig2_Image.cpp @@ -8,6 +8,7 @@ #include "core/fxcodec/jbig2/JBig2_Image.h" #include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_memory.h" #include "core/fxcrt/fx_safe_types.h" #include "third_party/base/ptr_util.h" diff --git a/core/fxcodec/jbig2/JBig2_SddProc.cpp b/core/fxcodec/jbig2/JBig2_SddProc.cpp index 1a98b17d34..b587ac01dd 100644 --- a/core/fxcodec/jbig2/JBig2_SddProc.cpp +++ b/core/fxcodec/jbig2/JBig2_SddProc.cpp @@ -19,7 +19,6 @@ #include "core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h" #include "core/fxcodec/jbig2/JBig2_SymbolDict.h" #include "core/fxcodec/jbig2/JBig2_TrdProc.h" -#include "core/fxcrt/fx_basic.h" #include "third_party/base/ptr_util.h" std::unique_ptr<CJBig2_SymbolDict> CJBig2_SDDProc::decode_Arith( diff --git a/core/fxcodec/jbig2/JBig2_SymbolDict.h b/core/fxcodec/jbig2/JBig2_SymbolDict.h index d6b897ce70..49289fb650 100644 --- a/core/fxcodec/jbig2/JBig2_SymbolDict.h +++ b/core/fxcodec/jbig2/JBig2_SymbolDict.h @@ -12,7 +12,6 @@ #include <vector> #include "core/fxcodec/jbig2/JBig2_ArithDecoder.h" -#include "core/fxcrt/fx_basic.h" class CJBig2_Image; |