diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-17 10:01:00 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-17 10:01:00 -0700 |
| commit | b7d358b498800e4c240d381fa6f098af17a4d95b (patch) | |
| tree | aa0d8677af748caf9881ecd011af2b00af925188 /core/src/fxge/win32/fx_win32_device.cpp | |
| parent | 9555022ee550ee97415a86957686cc28716c4dee (diff) | |
| download | pdfium-b7d358b498800e4c240d381fa6f098af17a4d95b.tar.xz | |
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.
Diffstat (limited to 'core/src/fxge/win32/fx_win32_device.cpp')
| -rw-r--r-- | core/src/fxge/win32/fx_win32_device.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
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 <crtdbg.h> -#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_ |