commit 53907458f782466cee17aee9be0df75cf899daaf
author Lei Zhang <thestig@chromium.org> Thu Oct 22 17:56:50 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Oct 22 17:56:50 2020 +0000
tree 6592dde30f109f61932932236d720b96f098b867
parent 20e4de4893e097e052ec5a276e0394294bd73f07

Slightly simplify CFX_ImageTransformer.

- Inline GetTransformedFormat() into the only caller.
- Remove unused parameter from CalcMono().

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

core/fxge/dib/cfx_imagetransformer.cpp

diff --git a/core/fxge/dib/cfx_imagetransformer.cpp b/core/fxge/dib/cfx_imagetransformer.cpp
index 4604955..b5b70f7 100644
--- a/core/fxge/dib/cfx_imagetransformer.cpp
+++ b/core/fxge/dib/cfx_imagetransformer.cpp
@@ -13,6 +13,7 @@
 #include "core/fxge/dib/cfx_dibitmap.h"
 #include "core/fxge/dib/cfx_imagestretcher.h"
 #include "core/fxge/dib/fx_dib.h"
+#include "third_party/base/check.h"
 #include "third_party/base/compiler_specific.h"
 #include "third_party/base/notreached.h"
 #include "third_party/base/numerics/safe_conversions.h"
@@ -101,10 +102,6 @@
   v_w[3] = SDP_Table[512 - res_y];
 }
 
-FXDIB_Format GetTransformedFormat(const RetainPtr<CFX_DIBBase>& pSrc) {
-  return pSrc->IsMask() ? FXDIB_Format::k8bppMask : FXDIB_Format::kArgb;
-}
-
 // Let the compiler deduce the type for |func|, which cheaper than specifying it
 // with std::function.
 template <typename F>
@@ -391,7 +388,9 @@
     return;
 
   auto pTransformed = pdfium::MakeRetain<CFX_DIBitmap>();
-  FXDIB_Format format = GetTransformedFormat(m_Stretcher->source());
+  FXDIB_Format format = m_Stretcher->source()->IsMask()
+                            ? FXDIB_Format::k8bppMask
+                            : FXDIB_Format::kArgb;
   if (!pTransformed->Create(m_result.Width(), m_result.Height(), format))
     return;
 
@@ -427,7 +426,7 @@
   } else {
     int Bpp = m_Storer.GetBitmap()->GetBPP() / 8;
     if (Bpp == 1)
-      CalcMono(cdata, format);
+      CalcMono(cdata);
     else
       CalcColor(cdata, format, Bpp);
   }
@@ -484,8 +483,7 @@
   }
 }
 
-void CFX_ImageTransformer::CalcMono(const CalcData& cdata,
-                                    FXDIB_Format format) {
+void CFX_ImageTransformer::CalcMono(const CalcData& cdata) {
   uint32_t argb[256];
   if (m_Storer.GetBitmap()->HasPalette()) {
     pdfium::span<const uint32_t> palette =
@@ -527,6 +525,7 @@
 void CFX_ImageTransformer::CalcColor(const CalcData& cdata,
                                      FXDIB_Format format,
                                      int Bpp) {
+  DCHECK(format == FXDIB_Format::k8bppMask || format == FXDIB_Format::kArgb);
   bool bHasAlpha = m_Storer.GetBitmap()->HasAlpha();
   int destBpp = cdata.bitmap->GetBPP() / 8;
   if (IsBilinear()) {

core/fxge/dib/cfx_imagetransformer.h

diff --git a/core/fxge/dib/cfx_imagetransformer.h b/core/fxge/dib/cfx_imagetransformer.h
index 3372003..88af9e5 100644
--- a/core/fxge/dib/cfx_imagetransformer.h
+++ b/core/fxge/dib/cfx_imagetransformer.h
@@ -79,7 +79,7 @@
 
   void CalcMask(const CalcData& cdata);
   void CalcAlpha(const CalcData& cdata);
-  void CalcMono(const CalcData& cdata, FXDIB_Format format);
+  void CalcMono(const CalcData& cdata);
   void CalcColor(const CalcData& cdata, FXDIB_Format format, int Bpp);
 
   bool IsBilinear() const;