Remove some fx_dib functions with unused parameters.

core/fxge/ge/fx_ge_text.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <limits>
 #include <vector>
 
 #include "core/fxcodec/include/fx_codec.h"
@@ skipping 346 matching lines @@
     return false;
 
   if (bsPsName == "CNAAJI+cmex10")
     return false;
 #endif
   return true;
 }
 
 }  // namespace
 
-void Color2Argb(FX_ARGB& argb,
-                uint32_t color,
-                int alpha_flag,
-                void* pIccTransform) {
-  if (!pIccTransform && !FXGETFLAG_COLORTYPE(alpha_flag)) {

[Lei Zhang, 2016/06/20 16:20:38]

The two possible values of |alpha_flag| are 0 and 1 << 24, both of which evals
to false with FXGETFLAG_COLORTYPE(), so we always take the early return path.
All callers actually pass in the same variable for |argb| and |color|.

-    argb = color;
-    return;
-  }
-  if (!CFX_GEModule::Get()->GetCodecModule() ||
-      !CFX_GEModule::Get()->GetCodecModule()->GetIccModule()) {
-    pIccTransform = nullptr;
-  }
-  uint8_t bgra[4];
-  if (pIccTransform) {
-    CCodec_IccModule* pIccModule =
-        CFX_GEModule::Get()->GetCodecModule()->GetIccModule();
-    color = FXGETFLAG_COLORTYPE(alpha_flag) ? FXCMYK_TODIB(color)
-                                            : FXARGB_TODIB(color);
-    pIccModule->TranslateScanline(pIccTransform, bgra, (const uint8_t*)&color,
-                                  1);
-    bgra[3] = FXGETFLAG_COLORTYPE(alpha_flag)
-                  ? (alpha_flag >> 24) ? FXGETFLAG_ALPHA_FILL(alpha_flag)
-                                       : FXGETFLAG_ALPHA_STROKE(alpha_flag)
-                  : FXARGB_A(color);
-    argb = FXARGB_MAKE(bgra[3], bgra[2], bgra[1], bgra[0]);
-    return;
-  }
-  AdobeCMYK_to_sRGB1(FXSYS_GetCValue(color), FXSYS_GetMValue(color),
-                     FXSYS_GetYValue(color), FXSYS_GetKValue(color), bgra[2],
-                     bgra[1], bgra[0]);
-  bgra[3] = (alpha_flag >> 24) ? FXGETFLAG_ALPHA_FILL(alpha_flag)
-                               : FXGETFLAG_ALPHA_STROKE(alpha_flag);
-  argb = FXARGB_MAKE(bgra[3], bgra[2], bgra[1], bgra[0]);
-}
-
 FX_RECT FXGE_GetGlyphsBBox(const std::vector<FXTEXT_GLYPHPOS>& glyphs,
                            int anti_alias,
                            FX_FLOAT retinaScaleX,
                            FX_FLOAT retinaScaleY) {
   FX_RECT rect(0, 0, 0, 0);
   bool bStarted = false;
   for (const FXTEXT_GLYPHPOS& glyph : glyphs) {
     const CFX_GlyphBitmap* pGlyph = glyph.m_pGlyph;
     if (!pGlyph)
       continue;
@@ skipping 193 matching lines @@
     if (bitmap.m_pAlphaMask) {
       bitmap.m_pAlphaMask->Clear(0);
     }
   }
 
   int dest_width = pixel_width;
   int a = 0;
   int r = 0;
   int g = 0;
   int b = 0;
-  if (anti_alias == FXFT_RENDER_MODE_LCD) {
-    Color2Argb(fill_color, fill_color, (1 << 24), nullptr);
+  if (anti_alias == FXFT_RENDER_MODE_LCD)
     ArgbDecode(fill_color, a, r, g, b);
-  }
+
   for (const FXTEXT_GLYPHPOS& glyph : glyphs) {
     if (!glyph.m_pGlyph)
       continue;
 
     const CFX_DIBitmap* pGlyph = &glyph.m_pGlyph->m_Bitmap;
     int left = glyph.m_OriginX + glyph.m_pGlyph->m_Left - pixel_left;
     int top = glyph.m_OriginY - glyph.m_pGlyph->m_Top - pixel_top;
     int ncols = pGlyph->GetWidth();
     int nrows = pGlyph->GetHeight();
     if (anti_alias == FXFT_RENDER_MODE_NORMAL) {
@@ skipping 808 matching lines @@
 void _CFX_UniqueKeyGen::Generate(int count, ...) {
   va_list argList;
   va_start(argList, count);
   for (int i = 0; i < count; i++) {
     int p = va_arg(argList, int);
     ((uint32_t*)m_Key)[i] = p;
   }
   va_end(argList);
   m_KeyLen = count * sizeof(uint32_t);
 }