commit 71bb5e0d712e5fe552a404237aa6bd2cfd567daa
author Tom Sepez <tsepez@chromium.org> Tue May 05 18:38:01 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Tue May 05 18:38:01 2020 +0000
tree 03fc2d61ebd0115ff4d12254e064503f11418a8a
parent 698154b7a5371798aeb2a32c49a251c03ee5c263

Rename CPDF_CalRGB:m_b{Gamma,Matrix} to m_bHas{Gamma,Matrix}

Avoids collisions with m_Gamma and m_Matrix should the Hungarian
portion of the name be removed someday.

Change-Id: Idd40f17635c2b4785047f671fac0303af1954c72
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/69591
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

core/fpdfapi/page/cpdf_colorspace.cpp

diff --git a/core/fpdfapi/page/cpdf_colorspace.cpp b/core/fpdfapi/page/cpdf_colorspace.cpp
index 1039270..b75e4ed 100644
--- a/core/fpdfapi/page/cpdf_colorspace.cpp
+++ b/core/fpdfapi/page/cpdf_colorspace.cpp
@@ -163,8 +163,8 @@
   float m_BlackPoint[kBlackWhitePointCount];
   float m_Gamma[kGammaCount];
   float m_Matrix[kMatrixCount];
-  bool m_bGamma = false;
-  bool m_bMatrix = false;
+  bool m_bHasGamma = false;
+  bool m_bHasMatrix = false;
 };
 
 class CPDF_LabCS final : public CPDF_ColorSpace {
@@ -735,14 +735,14 @@
 
   const CPDF_Array* pParam = pDict->GetArrayFor("Gamma");
   if (pParam) {
-    m_bGamma = true;
+    m_bHasGamma = true;
     for (size_t i = 0; i < FX_ArraySize(m_Gamma); ++i)
       m_Gamma[i] = pParam->GetNumberAt(i);
   }
 
   pParam = pDict->GetArrayFor("Matrix");
   if (pParam) {
-    m_bMatrix = true;
+    m_bHasMatrix = true;
     for (size_t i = 0; i < FX_ArraySize(m_Matrix); ++i)
       m_Matrix[i] = pParam->GetNumberAt(i);
   }
@@ -756,7 +756,7 @@
   float A_ = pBuf[0];
   float B_ = pBuf[1];
   float C_ = pBuf[2];
-  if (m_bGamma) {
+  if (m_bHasGamma) {
     A_ = FXSYS_pow(A_, m_Gamma[0]);
     B_ = FXSYS_pow(B_, m_Gamma[1]);
     C_ = FXSYS_pow(C_, m_Gamma[2]);
@@ -765,7 +765,7 @@
   float X;
   float Y;
   float Z;
-  if (m_bMatrix) {
+  if (m_bHasMatrix) {
     X = m_Matrix[0] * A_ + m_Matrix[3] * B_ + m_Matrix[6] * C_;
     Y = m_Matrix[1] * A_ + m_Matrix[4] * B_ + m_Matrix[7] * C_;
     Z = m_Matrix[2] * A_ + m_Matrix[5] * B_ + m_Matrix[8] * C_;