From 97da97662417085774f75c26e535c6fbe70266ae Mon Sep 17 00:00:00 2001 From: Wei Li Date: Fri, 11 Mar 2016 17:00:48 -0800 Subject: Re-enable MSVC warning 4800 for compiling with chromium_code Mainly change the code to avoid the warnings; in a few cases we have to use explicit casts. BUG=pdfium:29 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1783023002 . --- core/include/fxge/fx_ge.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'core/include/fxge/fx_ge.h') diff --git a/core/include/fxge/fx_ge.h b/core/include/fxge/fx_ge.h index fc9119b123..8a62f13d14 100644 --- a/core/include/fxge/fx_ge.h +++ b/core/include/fxge/fx_ge.h @@ -412,20 +412,20 @@ class CFX_FxgeDevice : public CFX_RenderDevice { CFX_FxgeDevice(); ~CFX_FxgeDevice() override; - FX_BOOL Attach(CFX_DIBitmap* pBitmap, - int dither_bits = 0, - FX_BOOL bRgbByteOrder = FALSE, - CFX_DIBitmap* pOriDevice = NULL, - FX_BOOL bGroupKnockout = FALSE); - - FX_BOOL Create(int width, - int height, - FXDIB_Format format, - int dither_bits = 0, - CFX_DIBitmap* pOriDevice = NULL); + bool Attach(CFX_DIBitmap* pBitmap, + int dither_bits = 0, + bool bRgbByteOrder = false, + CFX_DIBitmap* pOriDevice = NULL, + bool bGroupKnockout = false); + + bool Create(int width, + int height, + FXDIB_Format format, + int dither_bits = 0, + CFX_DIBitmap* pOriDevice = NULL); protected: - FX_BOOL m_bOwnedBitmap; + bool m_bOwnedBitmap; }; class CFX_SkiaDevice : public CFX_RenderDevice { public: -- cgit v1.2.3