commit 777d2155349ee6761308f6dcf8c169ef147c3ab3
author Tom Sepez <tsepez@chromium.org> Wed Sep 01 23:17:48 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Sep 01 23:17:48 2021 +0000
tree 25a3a710a7042485b1afbd20537398ad2ba8f69e
parent 858ee3bb2dae06cf55b9a4c51dc63f65368fdc5c

Encapsulate CPDF_ColorSpace::m_dwStandardConversion

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

core/fpdfapi/page/cpdf_colorspace.h

diff --git a/core/fpdfapi/page/cpdf_colorspace.h b/core/fpdfapi/page/cpdf_colorspace.h
index 6b5b8c7..e76e92d 100644
--- a/core/fpdfapi/page/cpdf_colorspace.h
+++ b/core/fpdfapi/page/cpdf_colorspace.h
@@ -132,10 +132,11 @@
   // components count.
   void SetComponentsForStockCS(uint32_t nComponents);
 
+  bool IsStdConversionEnabled() const { return m_dwStdConversion != 0; }
+
   UnownedPtr<const CPDF_Document> const m_pDocument;
   RetainPtr<const CPDF_Array> m_pArray;
   const Family m_Family;
-  uint32_t m_dwStdConversion = 0;
 
  private:
   friend class CPDF_CalGray_TranslateImageLine_Test;
@@ -145,6 +146,7 @@
       CPDF_Document* pDocument,
       ByteStringView bsFamilyName);
 
+  uint32_t m_dwStdConversion = 0;
   uint32_t m_nComponents = 0;
 };
 

core/fpdfapi/page/cpdf_devicecs.cpp

diff --git a/core/fpdfapi/page/cpdf_devicecs.cpp b/core/fpdfapi/page/cpdf_devicecs.cpp
index 8940e63..4ceb501 100644
--- a/core/fpdfapi/page/cpdf_devicecs.cpp
+++ b/core/fpdfapi/page/cpdf_devicecs.cpp
@@ -60,7 +60,7 @@
       *B = NormalizeChannel(pBuf[2]);
       return true;
     case Family::kDeviceCMYK:
-      if (m_dwStdConversion) {
+      if (IsStdConversionEnabled()) {
         float k = pBuf[3];
         *R = 1.0f - std::min(1.0f, pBuf[0] + k);
         *G = 1.0f - std::min(1.0f, pBuf[1] + k);
@@ -106,7 +106,7 @@
         }
       } else {
         for (int i = 0; i < pixels; i++) {
-          if (m_dwStdConversion) {
+          if (IsStdConversionEnabled()) {
             uint8_t k = pSrcBuf[3];
             pDestBuf[2] = 255 - std::min(255, pSrcBuf[0] + k);
             pDestBuf[1] = 255 - std::min(255, pSrcBuf[1] + k);