diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-03-20 15:25:57 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-03-20 15:25:57 +0000 |
| commit | 2e6405c333d8daae4e3edaa6b48f5ac5a8d7675b (patch) | |
| tree | df8f6a28b695c34407b3bbe28220584f421afc0e /core/fxge/win32/fx_win32_print.cpp | |
| parent | b3a5240832fce3f0b706c16070a1e69c2c1edb86 (diff) | |
| download | pdfium-2e6405c333d8daae4e3edaa6b48f5ac5a8d7675b.tar.xz | |
Change ArgbToColorRef() to ArgbToAlphaAndColorRef().chromium/3377
Since that is what it really returns. Add a replacement ArgbToColorRef()
that only returns a FX_COLORREF, and remove a duplicate implementation.
Then update callers and only use ArgbToAlphaAndColorRef() where
appropriate.
Also update comments to explain what FX_COLORREF is.
Change-Id: I5ed3d71683898dc2b3a66395dea0ec2562c14a68
Reviewed-on: https://pdfium-review.googlesource.com/28575
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxge/win32/fx_win32_print.cpp')
| -rw-r--r-- | core/fxge/win32/fx_win32_print.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/fxge/win32/fx_win32_print.cpp b/core/fxge/win32/fx_win32_print.cpp index f2ae8a726e..66fbdd9b02 100644 --- a/core/fxge/win32/fx_win32_print.cpp +++ b/core/fxge/win32/fx_win32_print.cpp @@ -280,10 +280,8 @@ bool CGdiPrinterDriver::DrawDeviceText(int nChars, ModifyWorldTransform(m_hDC, &xform, MWT_LEFTMULTIPLY); // Color - int iUnusedAlpha; - FX_COLORREF bgr; - std::tie(iUnusedAlpha, bgr) = ArgbToColorRef(color); - SetTextColor(m_hDC, bgr); + FX_COLORREF colorref = ArgbToColorRef(color); + SetTextColor(m_hDC, colorref); SetBkMode(m_hDC, TRANSPARENT); // Text |