Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(356)

Side by Side Diff: core/src/fxge/win32/fx_win32_gdipext.cpp

Issue 1438573002: Merge to XFA: Fix relative includes within core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « core/src/fxge/win32/fx_win32_dwrite.cpp ('k') | core/src/fxge/win32/fx_win32_print.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "../../../include/fxge/fx_ge.h" 7 #include "core/include/fxge/fx_ge.h"
8 8
9 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ 9 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
10 #include <windows.h> 10 #include <windows.h>
11 #include <algorithm> 11 #include <algorithm>
12 12
13 namespace Gdiplus { 13 namespace Gdiplus {
14 using std::min; 14 using std::min;
15 using std::max; 15 using std::max;
16 } // namespace Gdiplus 16 } // namespace Gdiplus
17 17
18 #include <gdiplus.h> 18 #include <gdiplus.h>
19 #include "../../../include/fxge/fx_ge_win32.h" 19 #include "core/include/fxge/fx_ge_win32.h"
20 #include "win32_int.h" 20 #include "win32_int.h"
21 21
22 using namespace Gdiplus; 22 using namespace Gdiplus;
23 using namespace Gdiplus::DllExports; 23 using namespace Gdiplus::DllExports;
24 24
25 #define GdiFillType2Gdip(fill_type) \ 25 #define GdiFillType2Gdip(fill_type) \
26 (fill_type == ALTERNATE ? FillModeAlternate : FillModeWinding) 26 (fill_type == ALTERNATE ? FillModeAlternate : FillModeWinding)
27 27
28 enum { 28 enum {
29 FuncId_GdipCreatePath2, 29 FuncId_GdipCreatePath2,
(...skipping 1477 matching lines...) Expand 10 before | Expand all | Expand 10 after
1507 dest_pitch); 1507 dest_pitch);
1508 } 1508 }
1509 } 1509 }
1510 CFX_DIBitmap* pDIBitmap = _FX_WindowsDIB_LoadFromBuf( 1510 CFX_DIBitmap* pDIBitmap = _FX_WindowsDIB_LoadFromBuf(
1511 pInfo->pbmi, pData, pInfo->pbmi->bmiHeader.biBitCount == 32); 1511 pInfo->pbmi, pData, pInfo->pbmi->bmiHeader.biBitCount == 32);
1512 FX_Free(pData); 1512 FX_Free(pData);
1513 FreeDIBitmap(pInfo); 1513 FreeDIBitmap(pInfo);
1514 return pDIBitmap; 1514 return pDIBitmap;
1515 } 1515 }
1516 #endif 1516 #endif
OLDNEW
« no previous file with comments | « core/src/fxge/win32/fx_win32_dwrite.cpp ('k') | core/src/fxge/win32/fx_win32_print.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698