diff options
author | Nicolas Pena <npm@chromium.org> | 2017-04-20 15:29:25 -0400 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-20 20:12:17 +0000 |
commit | ddfc3dcce42ad1dc805f29102f7d056a5809d489 (patch) | |
tree | 686e0f28269a8d1e3c9eb2e9806f76ee2cb4b9f5 /core/fxge/win32/fx_win32_device.cpp | |
parent | 58532b670716d5fe3ab024475fa1aa1580ecfe5b (diff) | |
download | pdfium-ddfc3dcce42ad1dc805f29102f7d056a5809d489.tar.xz |
Let {Argb,Cmyk}Decode return tuples
Change-Id: Ic4e766d9417f9a9ece5f9e4269d0f96e1e91639b
Reviewed-on: https://pdfium-review.googlesource.com/4392
Commit-Queue: Nicolás Peña <npm@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fxge/win32/fx_win32_device.cpp')
-rw-r--r-- | core/fxge/win32/fx_win32_device.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp index 986839ee88..de2f6c4b04 100644 --- a/core/fxge/win32/fx_win32_device.cpp +++ b/core/fxge/win32/fx_win32_device.cpp @@ -137,7 +137,7 @@ HPEN CreatePen(const CFX_GraphStateData* pGraphState, } int a; FX_COLORREF rgb; - ArgbDecode(argb, a, rgb); + std::tie(a, rgb) = ArgbToColorRef(argb); LOGBRUSH lb; lb.lbColor = rgb; lb.lbStyle = BS_SOLID; @@ -160,7 +160,7 @@ HPEN CreatePen(const CFX_GraphStateData* pGraphState, HBRUSH CreateBrush(uint32_t argb) { int a; FX_COLORREF rgb; - ArgbDecode(argb, a, rgb); + std::tie(a, rgb) = ArgbToColorRef(argb); return CreateSolidBrush(rgb); } @@ -1090,7 +1090,7 @@ bool CGdiDeviceDriver::FillRectWithBlend(const FX_RECT* pRect, int alpha; FX_COLORREF rgb; - ArgbDecode(fill_color, alpha, rgb); + std::tie(alpha, rgb) = ArgbToColorRef(fill_color); if (alpha == 0) return true; @@ -1146,7 +1146,7 @@ bool CGdiDeviceDriver::DrawCosmeticLine(float x1, int a; FX_COLORREF rgb; - ArgbDecode(color, a, rgb); + std::tie(a, rgb) = ArgbToColorRef(color); if (a == 0) return true; |