From bcd1e70175b6bbbcb9d9466c579e0538f34297c6 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 31 Aug 2017 13:19:18 -0400 Subject: 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 Reviewed-by: Tom Sepez --- core/fxcodec/codec/ccodec_jbig2module.h | 2 +- core/fxcodec/codec/ccodec_tiffmodule.cpp | 1 + core/fxcodec/codec/ccodec_tiffmodule.h | 1 + core/fxcodec/codec/fx_codec_progress.cpp | 1 + core/fxcodec/fx_codec.h | 1 - core/fxcodec/jbig2/JBig2_ArithDecoder.cpp | 2 +- core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp | 2 +- core/fxcodec/jbig2/JBig2_BitStream.h | 1 - core/fxcodec/jbig2/JBig2_HtrdProc.cpp | 1 - core/fxcodec/jbig2/JBig2_HuffmanDecoder.h | 2 ++ core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.cpp | 3 ++- core/fxcodec/jbig2/JBig2_Image.cpp | 1 + core/fxcodec/jbig2/JBig2_SddProc.cpp | 1 - core/fxcodec/jbig2/JBig2_SymbolDict.h | 1 - core/fxcodec/lbmp/fx_bmp.cpp | 1 + core/fxcodec/lbmp/fx_bmp.h | 1 - core/fxcodec/lgif/cgifcontext.h | 2 +- core/fxcodec/lgif/fx_gif.h | 2 -- 18 files changed, 13 insertions(+), 13 deletions(-) (limited to 'core/fxcodec') diff --git a/core/fxcodec/codec/ccodec_jbig2module.h b/core/fxcodec/codec/ccodec_jbig2module.h index 9b894fbc97..6b36f19a6d 100644 --- a/core/fxcodec/codec/ccodec_jbig2module.h +++ b/core/fxcodec/codec/ccodec_jbig2module.h @@ -10,7 +10,7 @@ #include #include "core/fxcodec/fx_codec_def.h" -#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/cfx_retain_ptr.h" class CJBig2_Context; class CJBig2_Image; diff --git a/core/fxcodec/codec/ccodec_tiffmodule.cpp b/core/fxcodec/codec/ccodec_tiffmodule.cpp index 1f101061b4..e0cb719475 100644 --- a/core/fxcodec/codec/ccodec_tiffmodule.cpp +++ b/core/fxcodec/codec/ccodec_tiffmodule.cpp @@ -12,6 +12,7 @@ #include "core/fxcodec/fx_codec.h" #include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_safe_types.h" +#include "core/fxcrt/fx_stream.h" #include "core/fxge/dib/cfx_dibitmap.h" #include "core/fxge/fx_dib.h" #include "third_party/base/logging.h" diff --git a/core/fxcodec/codec/ccodec_tiffmodule.h b/core/fxcodec/codec/ccodec_tiffmodule.h index 73d9c37992..6e6e36b697 100644 --- a/core/fxcodec/codec/ccodec_tiffmodule.h +++ b/core/fxcodec/codec/ccodec_tiffmodule.h @@ -14,6 +14,7 @@ #include "core/fxge/dib/cfx_dibitmap.h" class CFX_DIBAttribute; +class IFX_SeekableReadStream; class CCodec_TiffModule { public: diff --git a/core/fxcodec/codec/fx_codec_progress.cpp b/core/fxcodec/codec/fx_codec_progress.cpp index 905a957184..a70041bff9 100644 --- a/core/fxcodec/codec/fx_codec_progress.cpp +++ b/core/fxcodec/codec/fx_codec_progress.cpp @@ -11,6 +11,7 @@ #include #include "core/fxcodec/fx_codec.h" +#include "core/fxcrt/fx_stream.h" #include "core/fxge/dib/cfx_dibitmap.h" #include "core/fxge/fx_dib.h" #include "third_party/base/logging.h" diff --git a/core/fxcodec/fx_codec.h b/core/fxcodec/fx_codec.h index 71b002282c..2e83319ef7 100644 --- a/core/fxcodec/fx_codec.h +++ b/core/fxcodec/fx_codec.h @@ -22,7 +22,6 @@ #include "core/fxcodec/codec/ccodec_jpxmodule.h" #include "core/fxcodec/codec/ccodec_scanlinedecoder.h" #include "core/fxcodec/fx_codec_def.h" -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" #ifdef PDF_ENABLE_XFA 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 -#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_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_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 #include "core/fxcodec/jbig2/JBig2_ArithDecoder.h" -#include "core/fxcrt/fx_basic.h" class CJBig2_Image; diff --git a/core/fxcodec/lbmp/fx_bmp.cpp b/core/fxcodec/lbmp/fx_bmp.cpp index 989b3a4f84..f445453c65 100644 --- a/core/fxcodec/lbmp/fx_bmp.cpp +++ b/core/fxcodec/lbmp/fx_bmp.cpp @@ -10,6 +10,7 @@ #include #include "core/fxcrt/fx_system.h" +#include "third_party/base/logging.h" #include "third_party/base/ptr_util.h" static_assert(sizeof(BmpFileHeader) == 14, diff --git a/core/fxcodec/lbmp/fx_bmp.h b/core/fxcodec/lbmp/fx_bmp.h index 175d9bede5..3876aed407 100644 --- a/core/fxcodec/lbmp/fx_bmp.h +++ b/core/fxcodec/lbmp/fx_bmp.h @@ -13,7 +13,6 @@ #include #include "core/fxcodec/codec/ccodec_bmpmodule.h" -#include "core/fxcrt/fx_basic.h" #define BMP_WIDTHBYTES(width, bitCount) ((width * bitCount) + 31) / 32 * 4 #define BMP_PAL_ENCODE(a, r, g, b) \ diff --git a/core/fxcodec/lgif/cgifcontext.h b/core/fxcodec/lgif/cgifcontext.h index fa46b14559..1bd6d46d31 100644 --- a/core/fxcodec/lgif/cgifcontext.h +++ b/core/fxcodec/lgif/cgifcontext.h @@ -13,7 +13,7 @@ #include "core/fxcodec/codec/ccodec_gifmodule.h" #include "core/fxcodec/lgif/fx_gif.h" #include "core/fxcrt/cfx_unowned_ptr.h" -#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_string.h" class CGifContext : public CCodec_GifModule::Context { public: diff --git a/core/fxcodec/lgif/fx_gif.h b/core/fxcodec/lgif/fx_gif.h index 5216eeb70e..fd95aba17a 100644 --- a/core/fxcodec/lgif/fx_gif.h +++ b/core/fxcodec/lgif/fx_gif.h @@ -10,8 +10,6 @@ #include #include -#include "core/fxcrt/fx_basic.h" - class CGifContext; #define GIF_SIGNATURE "GIF" -- cgit v1.2.3