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/fpdfapi/render/cpdf_transferfunc.cpp | 8 ++++---- core/fpdfapi/render/cpdf_transferfunc.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'core/fpdfapi/render') diff --git a/core/fpdfapi/render/cpdf_transferfunc.cpp b/core/fpdfapi/render/cpdf_transferfunc.cpp index c28afde0d9..25717437d3 100644 --- a/core/fpdfapi/render/cpdf_transferfunc.cpp +++ b/core/fpdfapi/render/cpdf_transferfunc.cpp @@ -14,10 +14,10 @@ CPDF_TransferFunc::CPDF_TransferFunc(CPDF_Document* pDoc) : m_pPDFDoc(pDoc) {} CPDF_TransferFunc::~CPDF_TransferFunc() {} -FX_COLORREF CPDF_TransferFunc::TranslateColor(FX_COLORREF bgr) const { - return FXSYS_RGB(m_Samples[FXSYS_GetRValue(bgr)], - m_Samples[256 + FXSYS_GetGValue(bgr)], - m_Samples[512 + FXSYS_GetBValue(bgr)]); +FX_COLORREF CPDF_TransferFunc::TranslateColor(FX_COLORREF colorref) const { + return FXSYS_BGR(m_Samples[512 + FXSYS_GetBValue(colorref)], + m_Samples[256 + FXSYS_GetGValue(colorref)], + m_Samples[FXSYS_GetRValue(colorref)]); } RetainPtr CPDF_TransferFunc::TranslateImage( diff --git a/core/fpdfapi/render/cpdf_transferfunc.h b/core/fpdfapi/render/cpdf_transferfunc.h index de95a439c3..dfc186ec6c 100644 --- a/core/fpdfapi/render/cpdf_transferfunc.h +++ b/core/fpdfapi/render/cpdf_transferfunc.h @@ -19,7 +19,7 @@ class CPDF_TransferFunc : public Retainable { template friend RetainPtr pdfium::MakeRetain(Args&&... args); - FX_COLORREF TranslateColor(FX_COLORREF bgr) const; + FX_COLORREF TranslateColor(FX_COLORREF colorref) const; RetainPtr TranslateImage(const RetainPtr& pSrc); const CPDF_Document* GetDocument() const { return m_pPDFDoc.Get(); } -- cgit v1.2.3