commit eef064f3b1ea3d4d6961c56e6646f55abefd44a0
author Lei Zhang <thestig@chromium.org> Wed Jan 15 04:33:58 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Jan 15 04:33:58 2020 +0000
tree bbe98cb2132d19336e6ad4becbdc5bd2bb548d63
parent ea801cee3b8669ec0ed2bb9512250a4dd1c4cedd

Clean up some CPDF_TransferFuncDIB methods.

- GetDestPalette() always returns nullptr. Delete it.
- GetDestFormat() can be private and const. Fix nits in its impl.

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

core/fpdfapi/page/cpdf_transferfuncdib.cpp

diff --git a/core/fpdfapi/page/cpdf_transferfuncdib.cpp b/core/fpdfapi/page/cpdf_transferfuncdib.cpp
index 23d7ea1..ed2dfe5 100644
--- a/core/fpdfapi/page/cpdf_transferfuncdib.cpp
+++ b/core/fpdfapi/page/cpdf_transferfuncdib.cpp
@@ -22,21 +22,17 @@
 
 CPDF_TransferFuncDIB::~CPDF_TransferFuncDIB() = default;
 
-FXDIB_Format CPDF_TransferFuncDIB::GetDestFormat() {
+FXDIB_Format CPDF_TransferFuncDIB::GetDestFormat() const {
   if (m_pSrc->IsAlphaMask())
     return FXDIB_8bppMask;
 
 #if defined(OS_MACOSX)
-  return (m_pSrc->HasAlpha()) ? FXDIB_Argb : FXDIB_Rgb32;
+  return m_pSrc->HasAlpha() ? FXDIB_Argb : FXDIB_Rgb32;
 #else
-  return (m_pSrc->HasAlpha()) ? FXDIB_Argb : FXDIB_Rgb;
+  return m_pSrc->HasAlpha() ? FXDIB_Argb : FXDIB_Rgb;
 #endif
 }
 
-FX_ARGB* CPDF_TransferFuncDIB::GetDestPalette() {
-  return nullptr;
-}
-
 void CPDF_TransferFuncDIB::TranslateScanline(
     const uint8_t* src_buf,
     std::vector<uint8_t>* dest_buf) const {
@@ -188,7 +184,7 @@
   m_bpp = GetBppFromFormat(format);
   m_AlphaFlag = GetAlphaFlagFromFormat(format);
   m_Pitch = (m_Width * m_bpp + 31) / 32 * 4;
-  m_pPalette.reset(GetDestPalette());
+  m_pPalette.reset();
   m_Scanline.resize(m_Pitch);
 }
 

core/fpdfapi/page/cpdf_transferfuncdib.h

diff --git a/core/fpdfapi/page/cpdf_transferfuncdib.h b/core/fpdfapi/page/cpdf_transferfuncdib.h
index 4c22709..21ccc37 100644
--- a/core/fpdfapi/page/cpdf_transferfuncdib.h
+++ b/core/fpdfapi/page/cpdf_transferfuncdib.h
@@ -20,8 +20,6 @@
   template <typename T, typename... Args>
   friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
 
-  FXDIB_Format GetDestFormat();
-  FX_ARGB* GetDestPalette();
   void TranslateScanline(const uint8_t* src_buf,
                          std::vector<uint8_t>* dest_buf) const;
   void TranslateDownSamples(uint8_t* dest_buf,
@@ -45,6 +43,8 @@
                           int clip_left,
                           int clip_width) const override;
 
+  FXDIB_Format GetDestFormat() const;
+
   RetainPtr<CFX_DIBBase> m_pSrc;
   mutable std::vector<uint8_t> m_Scanline;
   RetainPtr<CPDF_TransferFunc> m_pTransferFunc;