From 2e6405c333d8daae4e3edaa6b48f5ac5a8d7675b Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 20 Mar 2018 15:25:57 +0000 Subject: Change ArgbToColorRef() to ArgbToAlphaAndColorRef(). 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 Commit-Queue: dsinclair --- core/fxge/dib/fx_dib_main.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'core/fxge/dib/fx_dib_main.cpp') diff --git a/core/fxge/dib/fx_dib_main.cpp b/core/fxge/dib/fx_dib_main.cpp index 161d2bd32e..5d7b585979 100644 --- a/core/fxge/dib/fx_dib_main.cpp +++ b/core/fxge/dib/fx_dib_main.cpp @@ -79,9 +79,12 @@ std::tuple ArgbDecode(FX_ARGB argb) { FXARGB_B(argb)); } -std::pair ArgbToColorRef(FX_ARGB argb) { - return {FXARGB_A(argb), - FXSYS_RGB(FXARGB_R(argb), FXARGB_G(argb), FXARGB_B(argb))}; +std::pair ArgbToAlphaAndColorRef(FX_ARGB argb) { + return {FXARGB_A(argb), ArgbToColorRef(argb)}; +} + +FX_COLORREF ArgbToColorRef(FX_ARGB argb) { + return FXSYS_RGB(FXARGB_R(argb), FXARGB_G(argb), FXARGB_B(argb)); } uint32_t ArgbEncode(int a, FX_COLORREF bgr) { -- cgit v1.2.3