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 --- fpdfsdk/cpdfsdk_widget.cpp | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'fpdfsdk/cpdfsdk_widget.cpp') diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp index 0d765ed947..6d81829bc9 100644 --- a/fpdfsdk/cpdfsdk_widget.cpp +++ b/fpdfsdk/cpdfsdk_widget.cpp @@ -41,17 +41,6 @@ #include "xfa/fxfa/parser/cxfa_node.h" #endif // PDF_ENABLE_XFA -namespace { - -// Convert a FX_ARGB to a FX_COLORREF. -FX_COLORREF ARGBToColorRef(FX_ARGB argb) { - return (((static_cast(argb) & 0x00FF0000) >> 16) | - (static_cast(argb) & 0x0000FF00) | - ((static_cast(argb) & 0x000000FF) << 16)); -} - -} // namespace - CPDFSDK_Widget::CPDFSDK_Widget(CPDF_Annot* pAnnot, CPDFSDK_PageView* pPageView, CPDFSDK_InterForm* pInterForm) @@ -428,14 +417,14 @@ WideString CPDFSDK_Widget::GetName() const { bool CPDFSDK_Widget::GetFillColor(FX_COLORREF& color) const { CPDF_FormControl* pFormCtrl = GetFormControl(); int iColorType = 0; - color = ARGBToColorRef(pFormCtrl->GetBackgroundColor(iColorType)); + color = ArgbToColorRef(pFormCtrl->GetBackgroundColor(iColorType)); return iColorType != CFX_Color::kTransparent; } bool CPDFSDK_Widget::GetBorderColor(FX_COLORREF& color) const { CPDF_FormControl* pFormCtrl = GetFormControl(); int iColorType = 0; - color = ARGBToColorRef(pFormCtrl->GetBorderColor(iColorType)); + color = ArgbToColorRef(pFormCtrl->GetBorderColor(iColorType)); return iColorType != CFX_Color::kTransparent; } @@ -448,7 +437,7 @@ bool CPDFSDK_Widget::GetTextColor(FX_COLORREF& color) const { FX_ARGB argb; int iColorType = CFX_Color::kTransparent; da.GetColor(argb, iColorType); - color = ARGBToColorRef(argb); + color = ArgbToColorRef(argb); return iColorType != CFX_Color::kTransparent; } -- cgit v1.2.3