From 35d4587eceb07cad6b38675b0ebb4b73eca3a62b Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 12 Oct 2018 19:07:03 +0000 Subject: Remove more unnecessary includes and do IWYU as needed. Also move some implementations out of headers. Change-Id: I321fc26970c440d874b135bd28e8bc8156b9afee Reviewed-on: https://pdfium-review.googlesource.com/c/43890 Commit-Queue: Lei Zhang Reviewed-by: Tom Sepez --- core/fxcodec/bmp/cfx_bmpcontext.h | 1 + core/fxcodec/bmp/cfx_bmpdecompressor.h | 1 - core/fxcodec/codec/ccodec_iccmodule.cpp | 1 + core/fxcodec/codec/ccodec_jpxmodule.cpp | 1 + core/fxcodec/gif/cfx_gifcontext.h | 1 - core/fxcodec/gif/cfx_lzwdecompressor.cpp | 1 - core/fxcodec/jbig2/JBig2_Image.cpp | 1 - 7 files changed, 3 insertions(+), 4 deletions(-) (limited to 'core/fxcodec') diff --git a/core/fxcodec/bmp/cfx_bmpcontext.h b/core/fxcodec/bmp/cfx_bmpcontext.h index ddb179b0b3..66e3f54b28 100644 --- a/core/fxcodec/bmp/cfx_bmpcontext.h +++ b/core/fxcodec/bmp/cfx_bmpcontext.h @@ -9,6 +9,7 @@ #include "core/fxcodec/bmp/cfx_bmpdecompressor.h" #include "core/fxcodec/bmp/fx_bmp.h" +#include "core/fxcrt/unowned_ptr.h" class CFX_BmpContext final : public CodecModuleIface::Context { public: diff --git a/core/fxcodec/bmp/cfx_bmpdecompressor.h b/core/fxcodec/bmp/cfx_bmpdecompressor.h index ebab9ea223..0af4da4b08 100644 --- a/core/fxcodec/bmp/cfx_bmpdecompressor.h +++ b/core/fxcodec/bmp/cfx_bmpdecompressor.h @@ -12,7 +12,6 @@ #include #include "core/fxcodec/bmp/fx_bmp.h" -#include "third_party/base/span.h" class CFX_BmpContext; class CFX_CodecMemory; diff --git a/core/fxcodec/codec/ccodec_iccmodule.cpp b/core/fxcodec/codec/ccodec_iccmodule.cpp index a15e72d5fd..ae88dec708 100644 --- a/core/fxcodec/codec/ccodec_iccmodule.cpp +++ b/core/fxcodec/codec/ccodec_iccmodule.cpp @@ -12,6 +12,7 @@ #include "core/fxcodec/codec/codec_int.h" #include "third_party/base/ptr_util.h" +#include "third_party/base/stl_util.h" namespace { diff --git a/core/fxcodec/codec/ccodec_jpxmodule.cpp b/core/fxcodec/codec/ccodec_jpxmodule.cpp index 28221be340..aaaaf81d24 100644 --- a/core/fxcodec/codec/ccodec_jpxmodule.cpp +++ b/core/fxcodec/codec/ccodec_jpxmodule.cpp @@ -17,6 +17,7 @@ #include "core/fxcrt/fx_memory.h" #include "core/fxcrt/fx_safe_types.h" #include "third_party/base/ptr_util.h" +#include "third_party/base/stl_util.h" #include "third_party/libopenjpeg20/openjpeg.h" #include "third_party/libopenjpeg20/opj_malloc.h" diff --git a/core/fxcodec/gif/cfx_gifcontext.h b/core/fxcodec/gif/cfx_gifcontext.h index 5febb5940b..2bb2adcf6a 100644 --- a/core/fxcodec/gif/cfx_gifcontext.h +++ b/core/fxcodec/gif/cfx_gifcontext.h @@ -15,7 +15,6 @@ #include "core/fxcodec/gif/cfx_lzwdecompressor.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/unowned_ptr.h" -#include "third_party/base/span.h" class CFX_CodecMemory; diff --git a/core/fxcodec/gif/cfx_lzwdecompressor.cpp b/core/fxcodec/gif/cfx_lzwdecompressor.cpp index 5708d11cbf..14e34f595d 100644 --- a/core/fxcodec/gif/cfx_lzwdecompressor.cpp +++ b/core/fxcodec/gif/cfx_lzwdecompressor.cpp @@ -12,7 +12,6 @@ #include #include "third_party/base/numerics/safe_math.h" -#include "third_party/base/stl_util.h" std::unique_ptr CFX_LZWDecompressor::Create( uint8_t color_exp, diff --git a/core/fxcodec/jbig2/JBig2_Image.cpp b/core/fxcodec/jbig2/JBig2_Image.cpp index a2d9f486e1..5054ab5867 100644 --- a/core/fxcodec/jbig2/JBig2_Image.cpp +++ b/core/fxcodec/jbig2/JBig2_Image.cpp @@ -16,7 +16,6 @@ #include "core/fxcrt/fx_memory.h" #include "core/fxcrt/fx_safe_types.h" #include "third_party/base/ptr_util.h" -#include "third_party/base/stl_util.h" #define JBIG2_GETDWORD(buf) \ ((static_cast((buf)[0]) << 24) | \ -- cgit v1.2.3