commit 0d79a775d8980bfa57580c2773888682947adc4c
author Lei Zhang <thestig@chromium.org> Thu Feb 21 18:51:43 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Feb 21 18:51:43 2019 +0000
tree dd9d944aeba0d762970879963b4dd873c4403381
parent c92c0f296ad3cbc508bc91affafadaad6c6584e0

Remove |alpha_flag| parameter to CFX_ScanlineCompositor::Init().

It is always 0.

Change-Id: I7c58e544f1db0dab4a7169674e158f6a0e4a1961
Reviewed-on: https://pdfium-review.googlesource.com/c/51001
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>

core/fxge/dib/cfx_bitmapcomposer.cpp

diff --git a/core/fxge/dib/cfx_bitmapcomposer.cpp b/core/fxge/dib/cfx_bitmapcomposer.cpp
index c1142e5..a4e4863 100644
--- a/core/fxge/dib/cfx_bitmapcomposer.cpp
+++ b/core/fxge/dib/cfx_bitmapcomposer.cpp
@@ -49,7 +49,7 @@
   if (!m_Compositor.Init(m_pBitmap->GetFormat(), src_format, width, pSrcPalette,
                          m_MaskColor, BlendMode::kNormal,
                          m_pClipMask != nullptr || (m_BitmapAlpha < 255),
-                         m_bRgbByteOrder, 0)) {
+                         m_bRgbByteOrder)) {
     return false;
   }
   if (m_bVertical) {

core/fxge/dib/cfx_dibitmap.cpp

diff --git a/core/fxge/dib/cfx_dibitmap.cpp b/core/fxge/dib/cfx_dibitmap.cpp
index f351622..a710330 100644
--- a/core/fxge/dib/cfx_dibitmap.cpp
+++ b/core/fxge/dib/cfx_dibitmap.cpp
@@ -891,7 +891,7 @@
   CFX_ScanlineCompositor compositor;
   if (!compositor.Init(GetFormat(), pSrcBitmap->GetFormat(), width,
                        pSrcBitmap->GetPalette(), 0, blend_type,
-                       pClipMask != nullptr, bRgbByteOrder, 0)) {
+                       pClipMask != nullptr, bRgbByteOrder)) {
     return false;
   }
   int dest_Bpp = m_bpp / 8;
@@ -968,7 +968,7 @@
   int Bpp = GetBPP() / 8;
   CFX_ScanlineCompositor compositor;
   if (!compositor.Init(GetFormat(), pMask->GetFormat(), width, nullptr, color,
-                       blend_type, pClipMask != nullptr, bRgbByteOrder, 0)) {
+                       blend_type, pClipMask != nullptr, bRgbByteOrder)) {
     return false;
   }
   for (int row = 0; row < height; row++) {

core/fxge/dib/cfx_scanlinecompositor.cpp

diff --git a/core/fxge/dib/cfx_scanlinecompositor.cpp b/core/fxge/dib/cfx_scanlinecompositor.cpp
index ac73b24..7ed27a5 100644
--- a/core/fxge/dib/cfx_scanlinecompositor.cpp
+++ b/core/fxge/dib/cfx_scanlinecompositor.cpp
@@ -2841,8 +2841,7 @@
                                   uint32_t mask_color,
                                   BlendMode blend_type,
                                   bool bClip,
-                                  bool bRgbByteOrder,
-                                  int alpha_flag) {
+                                  bool bRgbByteOrder) {
   m_SrcFormat = src_format;
   m_DestFormat = dest_format;
   m_BlendType = blend_type;
@@ -2850,7 +2849,7 @@
   if (GetBppFromFormat(dest_format) == 1)
     return false;
   if (m_SrcFormat == FXDIB_1bppMask || m_SrcFormat == FXDIB_8bppMask) {
-    InitSourceMask(alpha_flag, mask_color);
+    InitSourceMask(mask_color);
     return true;
   }
   if ((~src_format & 0x0400) && (dest_format & 0x0400))
@@ -2873,49 +2872,18 @@
   return true;
 }
 
-void CFX_ScanlineCompositor::InitSourceMask(int alpha_flag,
-                                            uint32_t mask_color) {
-  int mask_black = 0;
-  if (alpha_flag >> 8) {
-    m_MaskAlpha = alpha_flag & 0xff;
-    m_MaskRed = FXSYS_GetCValue(mask_color);
-    m_MaskGreen = FXSYS_GetMValue(mask_color);
-    m_MaskBlue = FXSYS_GetYValue(mask_color);
-    mask_black = FXSYS_GetKValue(mask_color);
-  } else {
-    m_MaskAlpha = FXARGB_A(mask_color);
-    m_MaskRed = FXARGB_R(mask_color);
-    m_MaskGreen = FXARGB_G(mask_color);
-    m_MaskBlue = FXARGB_B(mask_color);
-  }
+void CFX_ScanlineCompositor::InitSourceMask(uint32_t mask_color) {
+  m_MaskAlpha = FXARGB_A(mask_color);
+  m_MaskRed = FXARGB_R(mask_color);
+  m_MaskGreen = FXARGB_G(mask_color);
+  m_MaskBlue = FXARGB_B(mask_color);
   if (m_DestFormat == FXDIB_8bppMask)
     return;
 
   if ((m_DestFormat & 0xff) == 8) {
-    if (alpha_flag >> 8) {
-      uint8_t r;
-      uint8_t g;
-      uint8_t b;
-      std::tie(r, g, b) =
-          AdobeCMYK_to_sRGB1(m_MaskRed, m_MaskGreen, m_MaskBlue, mask_black);
-      m_MaskRed = FXRGB2GRAY(r, g, b);
-    } else {
-      m_MaskRed = FXRGB2GRAY(m_MaskRed, m_MaskGreen, m_MaskBlue);
-    }
+    m_MaskRed = FXRGB2GRAY(m_MaskRed, m_MaskGreen, m_MaskBlue);
     if (m_DestFormat & 0x0400)
       m_MaskRed = FX_CCOLOR(m_MaskRed);
-    return;
-  }
-  uint8_t* mask_color_p = (uint8_t*)&mask_color;
-  mask_color =
-      (alpha_flag >> 8) ? FXCMYK_TODIB(mask_color) : FXARGB_TODIB(mask_color);
-  if (alpha_flag >> 8) {
-    std::tie(mask_color_p[2], mask_color_p[1], mask_color_p[0]) =
-        AdobeCMYK_to_sRGB1(mask_color_p[0], mask_color_p[1], mask_color_p[2],
-                           mask_color_p[3]);
-    m_MaskRed = mask_color_p[2];
-    m_MaskGreen = mask_color_p[1];
-    m_MaskBlue = mask_color_p[0];
   }
 }
 

core/fxge/dib/cfx_scanlinecompositor.h

diff --git a/core/fxge/dib/cfx_scanlinecompositor.h b/core/fxge/dib/cfx_scanlinecompositor.h
index b9625d9..3269910 100644
--- a/core/fxge/dib/cfx_scanlinecompositor.h
+++ b/core/fxge/dib/cfx_scanlinecompositor.h
@@ -23,8 +23,7 @@
             uint32_t mask_color,
             BlendMode blend_type,
             bool bClip,
-            bool bRgbByteOrder,
-            int alpha_flag);
+            bool bRgbByteOrder);
 
   void CompositeRgbBitmapLine(uint8_t* dest_scan,
                               const uint8_t* src_scan,
@@ -59,7 +58,7 @@
                          FXDIB_Format dest_format,
                          const uint32_t* pSrcPalette);
 
-  void InitSourceMask(int alpha_flag, uint32_t mask_color);
+  void InitSourceMask(uint32_t mask_color);
 
   int m_iTransparency;
   FXDIB_Format m_SrcFormat;