diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-03-15 15:06:11 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-03-15 15:06:11 +0000 |
| commit | c2d9e2d00ee871fa538bc46c8209e98ab9a30c44 (patch) | |
| tree | e2d97c232971510f74bbf1a6d6e25045592c56b4 /core/fxge/win32 | |
| parent | 9875889910585b08d2abd372ddc95469baf1a7e9 (diff) | |
| download | pdfium-c2d9e2d00ee871fa538bc46c8209e98ab9a30c44.tar.xz | |
Rename FX_COLORREF variables from "rgb" to "bgr".
FX_COLORREF should work like win32 COLORREF, which is BGR.
Change-Id: I9f8bb3e2d30a64dc822ac6b8c46130358a03678a
Reviewed-on: https://pdfium-review.googlesource.com/28574
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'core/fxge/win32')
| -rw-r--r-- | core/fxge/win32/fx_win32_device.cpp | 24 | ||||
| -rw-r--r-- | core/fxge/win32/fx_win32_print.cpp | 6 |
2 files changed, 15 insertions, 15 deletions
diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp index ec0ed3561d..673593cdda 100644 --- a/core/fxge/win32/fx_win32_device.cpp +++ b/core/fxge/win32/fx_win32_device.cpp @@ -133,10 +133,10 @@ HPEN CreateExtPen(const CFX_GraphStateData* pGraphState, } int a; - FX_COLORREF rgb; - std::tie(a, rgb) = ArgbToColorRef(argb); + FX_COLORREF bgr; + std::tie(a, bgr) = ArgbToColorRef(argb); LOGBRUSH lb; - lb.lbColor = rgb; + lb.lbColor = bgr; lb.lbStyle = BS_SOLID; lb.lbHatch = 0; std::vector<uint32_t> dashes; @@ -156,9 +156,9 @@ HPEN CreateExtPen(const CFX_GraphStateData* pGraphState, HBRUSH CreateBrush(uint32_t argb) { int a; - FX_COLORREF rgb; - std::tie(a, rgb) = ArgbToColorRef(argb); - return CreateSolidBrush(rgb); + FX_COLORREF bgr; + std::tie(a, bgr) = ArgbToColorRef(argb); + return CreateSolidBrush(bgr); } void SetPathToDC(HDC hDC, @@ -1073,15 +1073,15 @@ bool CGdiDeviceDriver::FillRectWithBlend(const FX_RECT* pRect, return false; int alpha; - FX_COLORREF rgb; - std::tie(alpha, rgb) = ArgbToColorRef(fill_color); + FX_COLORREF bgr; + std::tie(alpha, bgr) = ArgbToColorRef(fill_color); if (alpha == 0) return true; if (alpha < 255) return false; - HBRUSH hBrush = CreateSolidBrush(rgb); + HBRUSH hBrush = CreateSolidBrush(bgr); ::FillRect(m_hDC, (RECT*)pRect, hBrush); DeleteObject(hBrush); return true; @@ -1127,12 +1127,12 @@ bool CGdiDeviceDriver::DrawCosmeticLine(const CFX_PointF& ptMoveTo, return false; int a; - FX_COLORREF rgb; - std::tie(a, rgb) = ArgbToColorRef(color); + FX_COLORREF bgr; + std::tie(a, bgr) = ArgbToColorRef(color); if (a == 0) return true; - HPEN hPen = CreatePen(PS_SOLID, 1, rgb); + HPEN hPen = CreatePen(PS_SOLID, 1, bgr); hPen = (HPEN)SelectObject(m_hDC, hPen); MoveToEx(m_hDC, FXSYS_round(ptMoveTo.x), FXSYS_round(ptMoveTo.y), nullptr); LineTo(m_hDC, FXSYS_round(ptLineTo.x), FXSYS_round(ptLineTo.y)); diff --git a/core/fxge/win32/fx_win32_print.cpp b/core/fxge/win32/fx_win32_print.cpp index df9e8387d5..f2ae8a726e 100644 --- a/core/fxge/win32/fx_win32_print.cpp +++ b/core/fxge/win32/fx_win32_print.cpp @@ -281,9 +281,9 @@ bool CGdiPrinterDriver::DrawDeviceText(int nChars, // Color int iUnusedAlpha; - FX_COLORREF rgb; - std::tie(iUnusedAlpha, rgb) = ArgbToColorRef(color); - SetTextColor(m_hDC, rgb); + FX_COLORREF bgr; + std::tie(iUnusedAlpha, bgr) = ArgbToColorRef(color); + SetTextColor(m_hDC, bgr); SetBkMode(m_hDC, TRANSPARENT); // Text |