From b7d358b498800e4c240d381fa6f098af17a4d95b Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 17 Jun 2015 10:01:00 -0700 Subject: Merge to XFA: Separate agg-authored code from fx-authored code. Original Review URL: https://codereview.chromium.org/1152743007. BUG=pdfium:166 R=brucedawson@chromium.org, thestig@chromium.org TBR=brucedawson@chromium.org, thestig@chromium.org Review URL: https://codereview.chromium.org/1186423003. --- core/src/fxge/win32/fx_win32_device.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'core/src/fxge/win32') diff --git a/core/src/fxge/win32/fx_win32_device.cpp b/core/src/fxge/win32/fx_win32_device.cpp index fd8fe4a8ad..5af2af5e65 100644 --- a/core/src/fxge/win32/fx_win32_device.cpp +++ b/core/src/fxge/win32/fx_win32_device.cpp @@ -5,17 +5,19 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../../../include/fxge/fx_ge.h" + #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ -#include "../../../include/fxge/fx_ge_win32.h" #include -#include "../agg/include/fxfx_agg_clip_liang_barsky.h" + +#include "../../../include/fxcodec/fx_codec.h" +#include "../../../include/fxge/fx_freetype.h" +#include "../../../include/fxge/fx_ge_win32.h" +#include "../agg/include/fx_agg_driver.h" +#include "../dib/dib_int.h" +#include "../ge/text_int.h" #include "dwrite_int.h" #include "win32_int.h" -#include "../ge/text_int.h" -#include "../dib/dib_int.h" -#include "../agg/include/fx_agg_driver.h" -#include "../../../include/fxge/fx_freetype.h" -#include "../../../include/fxcodec/fx_codec.h" + class CWin32FontInfo final : public IFX_SystemFontInfo { public: @@ -1212,4 +1214,5 @@ CFX_WinBitmapDevice::~CFX_WinBitmapDevice() } delete GetBitmap(); } -#endif + +#endif // _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_ -- cgit v1.2.3