From 4f7479ad5bd977eff1d08c65c44cb8d3950a2d77 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 21 Mar 2018 13:37:06 +0000 Subject: Change FXSYS_RGB() to FXSYS_BGR(). Also change it from a macro to a constexpr function. Change-Id: I8b2bb42c45a23da6db136abdaee24132db4471c6 Reviewed-on: https://pdfium-review.googlesource.com/28579 Commit-Queue: dsinclair Reviewed-by: dsinclair --- core/fpdfdoc/cpdf_bookmark.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'core/fpdfdoc') diff --git a/core/fpdfdoc/cpdf_bookmark.cpp b/core/fpdfdoc/cpdf_bookmark.cpp index cc7e127d23..5f8997d647 100644 --- a/core/fpdfdoc/cpdf_bookmark.cpp +++ b/core/fpdfdoc/cpdf_bookmark.cpp @@ -14,6 +14,12 @@ #include "core/fpdfdoc/cpdf_nametree.h" #include "core/fxge/fx_dib.h" +namespace { + +constexpr uint32_t kBlackBGR = FXSYS_BGR(0, 0, 0); + +} // namespace + CPDF_Bookmark::CPDF_Bookmark() {} CPDF_Bookmark::CPDF_Bookmark(const CPDF_Bookmark& that) = default; @@ -24,16 +30,16 @@ CPDF_Bookmark::~CPDF_Bookmark() {} uint32_t CPDF_Bookmark::GetColorRef() const { if (!m_pDict) - return FXSYS_RGB(0, 0, 0); + return kBlackBGR; CPDF_Array* pColor = m_pDict->GetArrayFor("C"); if (!pColor) - return FXSYS_RGB(0, 0, 0); + return kBlackBGR; int r = FXSYS_round(pColor->GetNumberAt(0) * 255); int g = FXSYS_round(pColor->GetNumberAt(1) * 255); int b = FXSYS_round(pColor->GetNumberAt(2) * 255); - return FXSYS_RGB(r, g, b); + return FXSYS_BGR(b, g, r); } uint32_t CPDF_Bookmark::GetFontStyle() const { -- cgit v1.2.3