diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-10-16 14:18:50 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-10-16 14:18:50 -0700 |
| commit | 24e733ef26280268ac6ede6d73fac7475aedd1a9 (patch) | |
| tree | b067396d52855d4e7a63d040fd99029f76ac6b94 /core/src/fxge/win32/fx_win32_gdipext.cpp | |
| parent | db0be96179f0cd5f1787564cbccf86320a4d54ae (diff) | |
| download | pdfium-24e733ef26280268ac6ede6d73fac7475aedd1a9.tar.xz | |
fxcrt convergence - XFA side.
Take extern tables portion only of fx_bidi change.
Take itoa fixes and corresponding unit test.
Merge typo in skia font mgr.
Kill some null checks after new.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1409223002 .
Diffstat (limited to 'core/src/fxge/win32/fx_win32_gdipext.cpp')
| -rw-r--r-- | core/src/fxge/win32/fx_win32_gdipext.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/src/fxge/win32/fx_win32_gdipext.cpp b/core/src/fxge/win32/fx_win32_gdipext.cpp index ce65a26301..cae6c67823 100644 --- a/core/src/fxge/win32/fx_win32_gdipext.cpp +++ b/core/src/fxge/win32/fx_win32_gdipext.cpp @@ -5,20 +5,26 @@ // 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 <windows.h> #include <algorithm> + namespace Gdiplus { using std::min; using std::max; } // namespace Gdiplus + #include <gdiplus.h> #include "../../../include/fxge/fx_ge_win32.h" #include "win32_int.h" + using namespace Gdiplus; using namespace Gdiplus::DllExports; + #define GdiFillType2Gdip(fill_type) \ (fill_type == ALTERNATE ? FillModeAlternate : FillModeWinding) + static CombineMode GdiCombineMode2Gdip(int mode) { switch (mode) { case RGN_AND: |