From 738ca226d4093e9e422b48e9bb460bb65076f973 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 4 Jun 2015 18:53:39 -0700 Subject: Move fx_safe_types.h to include/ directory. Small bit of OCD here, since this file is included cross-library (i.e. from fpdfsk), it can't be in src/. In other words, the following should be empty: grep -R 'include.*core/src/' fpdfsdk Fix some IWYU in it at the same time. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1147353006 --- core/src/fxcodec/codec/fx_codec_jpeg.cpp | 3 ++- core/src/fxcodec/jbig2/JBig2_Image.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'core/src/fxcodec') diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp index 3ef187e8fb..b80facfad6 100644 --- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp @@ -5,9 +5,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../../../include/fxcodec/fx_codec.h" +#include "../../../include/fxcrt/fx_safe_types.h" #include "../../../include/fxge/fx_dib.h" -#include "../../../src/fxcrt/fx_safe_types.h" #include "codec_int.h" + extern "C" { static void _JpegScanSOI(const FX_BYTE*& src_buf, FX_DWORD& src_size) { diff --git a/core/src/fxcodec/jbig2/JBig2_Image.cpp b/core/src/fxcodec/jbig2/JBig2_Image.cpp index 8e27bca80c..f2cea597c1 100644 --- a/core/src/fxcodec/jbig2/JBig2_Image.cpp +++ b/core/src/fxcodec/jbig2/JBig2_Image.cpp @@ -5,9 +5,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include + #include "../../../include/fxcrt/fx_basic.h" #include "../../../include/fxcrt/fx_coordinates.h" -#include "../../../src/fxcrt/fx_safe_types.h" +#include "../../../include/fxcrt/fx_safe_types.h" #include "JBig2_Image.h" CJBig2_Image::CJBig2_Image(FX_INT32 w, FX_INT32 h) -- cgit v1.2.3