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

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

Issue 1773733002: Review and cleanup lint warnings. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 9 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 | « core/src/fxcrt/fx_xml_parser.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 "core/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
19 #include "core/include/fxge/fx_ge_win32.h" 20 #include "core/include/fxge/fx_ge_win32.h"
20 #include "core/src/fxge/win32/win32_int.h" 21 #include "core/src/fxge/win32/win32_int.h"
21 22
22 using namespace Gdiplus; 23 using namespace Gdiplus; // NOLINT
23 using namespace Gdiplus::DllExports; 24 using namespace Gdiplus::DllExports; // NOLINT
24 25
25 #define GdiFillType2Gdip(fill_type) \ 26 #define GdiFillType2Gdip(fill_type) \
26 (fill_type == ALTERNATE ? FillModeAlternate : FillModeWinding) 27 (fill_type == ALTERNATE ? FillModeAlternate : FillModeWinding)
27 28
28 enum { 29 enum {
29 FuncId_GdipCreatePath2, 30 FuncId_GdipCreatePath2,
30 FuncId_GdipSetPenDashStyle, 31 FuncId_GdipSetPenDashStyle,
31 FuncId_GdipSetPenDashArray, 32 FuncId_GdipSetPenDashArray,
32 FuncId_GdipSetPenDashCap197819, 33 FuncId_GdipSetPenDashCap197819,
33 FuncId_GdipSetPenLineJoin, 34 FuncId_GdipSetPenLineJoin,
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 INT x, 414 INT x,
414 INT y); 415 INT y);
415 typedef GpStatus(WINGDIPAPI* FuncType_GdipDrawImageRectI)(GpGraphics* graphics, 416 typedef GpStatus(WINGDIPAPI* FuncType_GdipDrawImageRectI)(GpGraphics* graphics,
416 GpImage* image, 417 GpImage* image,
417 INT x, 418 INT x,
418 INT y, 419 INT y,
419 INT width, 420 INT width,
420 INT height); 421 INT height);
421 typedef GpStatus(WINGDIPAPI* FuncType_GdipDrawString)( 422 typedef GpStatus(WINGDIPAPI* FuncType_GdipDrawString)(
422 GpGraphics* graphics, 423 GpGraphics* graphics,
423 GDIPCONST WCHAR* string, 424 GDIPCONST WCHAR* str,
424 INT length, 425 INT length,
425 GDIPCONST GpFont* font, 426 GDIPCONST GpFont* font,
426 GDIPCONST RectF* layoutRect, 427 GDIPCONST RectF* layoutRect,
427 GDIPCONST GpStringFormat* stringFormat, 428 GDIPCONST GpStringFormat* stringFormat,
428 GDIPCONST GpBrush* brush); 429 GDIPCONST GpBrush* brush);
429 typedef GpStatus(WINGDIPAPI* FuncType_GdipSetPenTransform)(GpPen* pen, 430 typedef GpStatus(WINGDIPAPI* FuncType_GdipSetPenTransform)(GpPen* pen,
430 GpMatrix* matrix); 431 GpMatrix* matrix);
431 #define CallFunc(funcname) \ 432 #define CallFunc(funcname) \
432 ((FuncType_##funcname)GdiplusExt.m_Functions[FuncId_##funcname]) 433 ((FuncType_##funcname)GdiplusExt.m_Functions[FuncId_##funcname])
433 typedef HANDLE(__stdcall* FuncType_GdiAddFontMemResourceEx)(PVOID pbFont, 434 typedef HANDLE(__stdcall* FuncType_GdiAddFontMemResourceEx)(PVOID pbFont,
(...skipping 1074 matching lines...) Expand 10 before | Expand all | Expand 10 after
1508 dest_pitch); 1509 dest_pitch);
1509 } 1510 }
1510 } 1511 }
1511 CFX_DIBitmap* pDIBitmap = _FX_WindowsDIB_LoadFromBuf( 1512 CFX_DIBitmap* pDIBitmap = _FX_WindowsDIB_LoadFromBuf(
1512 pInfo->pbmi, pData, pInfo->pbmi->bmiHeader.biBitCount == 32); 1513 pInfo->pbmi, pData, pInfo->pbmi->bmiHeader.biBitCount == 32);
1513 FX_Free(pData); 1514 FX_Free(pData);
1514 FreeDIBitmap(pInfo); 1515 FreeDIBitmap(pInfo);
1515 return pDIBitmap; 1516 return pDIBitmap;
1516 } 1517 }
1517 #endif 1518 #endif
OLDNEW
« no previous file with comments | « core/src/fxcrt/fx_xml_parser.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