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

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

Issue 438843003: Fix for min/max compile error on Windows (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 6 years, 4 months 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 | « no previous file | pdfium.gyp » ('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 "../../../include/fxge/fx_ge.h"
8 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_ 8 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_
9 #include <windows.h> 9 #include <windows.h>
10 #include <algorithm>
11 namespace Gdiplus {
12 using std::min;
13 using std::max;
14 } // namespace Gdiplus
10 #include <gdiplus.h> 15 #include <gdiplus.h>
11 #include "../../../include/fxge/fx_ge_win32.h" 16 #include "../../../include/fxge/fx_ge_win32.h"
12 #include "win32_int.h" 17 #include "win32_int.h"
13 using namespace Gdiplus; 18 using namespace Gdiplus;
14 using namespace Gdiplus::DllExports; 19 using namespace Gdiplus::DllExports;
15 #define GdiFillType2Gdip(fill_type) (fill_type == ALTERNATE ? FillModeAlternate : FillModeWinding) 20 #define GdiFillType2Gdip(fill_type) (fill_type == ALTERNATE ? FillModeAlternate : FillModeWinding)
16 static CombineMode GdiCombineMode2Gdip(int mode) 21 static CombineMode GdiCombineMode2Gdip(int mode)
17 { 22 {
18 switch (mode) { 23 switch (mode) {
19 case RGN_AND: 24 case RGN_AND:
(...skipping 1256 matching lines...) Expand 10 before | Expand all | Expand 10 after
1276 FXSYS_memcpy32(pData, pInfo->pScan0, dest_pitch * height); 1281 FXSYS_memcpy32(pData, pInfo->pScan0, dest_pitch * height);
1277 } else for (int i = 0; i < height; i ++) { 1282 } else for (int i = 0; i < height; i ++) {
1278 FXSYS_memcpy32(pData + dest_pitch * i, pInfo->pScan0 + pInfo->Stride * i, dest_pitch); 1283 FXSYS_memcpy32(pData + dest_pitch * i, pInfo->pScan0 + pInfo->Stride * i, dest_pitch);
1279 } 1284 }
1280 CFX_DIBitmap* pDIBitmap = _FX_WindowsDIB_LoadFromBuf(pInfo->pbmi, pData, pIn fo->pbmi->bmiHeader.biBitCount == 32); 1285 CFX_DIBitmap* pDIBitmap = _FX_WindowsDIB_LoadFromBuf(pInfo->pbmi, pData, pIn fo->pbmi->bmiHeader.biBitCount == 32);
1281 FX_Free(pData); 1286 FX_Free(pData);
1282 FreeDIBitmap(pInfo); 1287 FreeDIBitmap(pInfo);
1283 return pDIBitmap; 1288 return pDIBitmap;
1284 } 1289 }
1285 #endif 1290 #endif
OLDNEW
« no previous file with comments | « no previous file | pdfium.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698