From b116136da234afcad018bb44a3ccb64b9ad2a554 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 9 Jun 2015 11:29:12 -0700 Subject: Merge to XFA: Remove more cruft from fx_system.h New manual edits in the following to fix compilation: fx_bmp.h, fx_gif.h, fx_graphics.h Original Review URL: https://codereview.chromium.org/1169963003 R=thestig@chromium.org Review URL: https://codereview.chromium.org/1170103004 --- core/src/fxcodec/codec/fx_codec_jpeg.cpp | 2 ++ core/src/fxcodec/lbmp/fx_bmp.h | 5 +++-- core/src/fxcodec/lgif/fx_gif.h | 5 +++-- 3 files changed, 8 insertions(+), 4 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 903d2319fd..7d18cb599f 100644 --- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp @@ -4,6 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include + #include "../../../include/fxcodec/fx_codec.h" #include "../../../include/fxcrt/fx_safe_types.h" #include "../../../include/fxge/fx_dib.h" diff --git a/core/src/fxcodec/lbmp/fx_bmp.h b/core/src/fxcodec/lbmp/fx_bmp.h index 1603770eb4..b7c3617182 100644 --- a/core/src/fxcodec/lbmp/fx_bmp.h +++ b/core/src/fxcodec/lbmp/fx_bmp.h @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_BASIC_H_ +#include + #include "../../../include/fxcrt/fx_basic.h" -#endif + #define BMP_SUPPORT_BITFIELD #define BMP_WIDTHBYTES(width,bitCount) ((width*bitCount) + 31)/32*4 #define BMP_PAL_ENCODE(a,r,g,b) (((FX_DWORD)(a) << 24) | ((r) << 16) | ((g) << 8) | (b)) diff --git a/core/src/fxcodec/lgif/fx_gif.h b/core/src/fxcodec/lgif/fx_gif.h index 3d2b232267..09c63e20f6 100644 --- a/core/src/fxcodec/lgif/fx_gif.h +++ b/core/src/fxcodec/lgif/fx_gif.h @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_BASIC_H_ +#include + #include "../../../include/fxcrt/fx_basic.h" -#endif + extern FX_WORD _GetWord_LSBFirst(FX_LPBYTE p); extern void _SetWord_LSBFirst(FX_LPBYTE p, FX_WORD v); extern void _BpcConvert(FX_LPCBYTE src_buf, FX_DWORD src_len, FX_INT32 src_bpc, FX_INT32 dst_bpc, -- cgit v1.2.3