Remove some fx_dib functions with unused parameters.

core/fxge/win32/fx_win32_device.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 "core/fxge/include/fx_ge.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 766 matching lines @@
 
 void CGdiDeviceDriver::RestoreState(bool bKeepSaved) {
   RestoreDC(m_hDC, -1);
   if (bKeepSaved)
     SaveDC(m_hDC);
 }
 
 FX_BOOL CGdiDeviceDriver::GDI_SetDIBits(CFX_DIBitmap* pBitmap1,
                                         const FX_RECT* pSrcRect,
                                         int left,
-                                        int top,
-                                        void* pIccTransform) {
+                                        int top) {
   if (m_DeviceClass == FXDC_PRINTER) {
     std::unique_ptr<CFX_DIBitmap> pBitmap(pBitmap1->FlipImage(FALSE, TRUE));
     if (!pBitmap)
       return FALSE;
 
-    if ((pBitmap->IsCmykImage() || pIccTransform) &&
-        !pBitmap->ConvertFormat(FXDIB_Rgb, pIccTransform)) {
+    if (pBitmap->IsCmykImage() && !pBitmap->ConvertFormat(FXDIB_Rgb))
       return FALSE;
-    }
 
     int width = pSrcRect->Width(), height = pSrcRect->Height();
     LPBYTE pBuffer = pBitmap->GetBuffer();
     CFX_ByteString info = CFX_WindowsDIB::GetBitmapInfo(pBitmap.get());
     ((BITMAPINFOHEADER*)info.c_str())->biHeight *= -1;
     FX_RECT dst_rect(0, 0, width, height);
     dst_rect.Intersect(0, 0, pBitmap->GetWidth(), pBitmap->GetHeight());
     int dst_width = dst_rect.Width();
     int dst_height = dst_rect.Height();
     ::StretchDIBits(m_hDC, left, top, dst_width, dst_height, 0, 0, dst_width,
                     dst_height, pBuffer, (BITMAPINFO*)info.c_str(),
                     DIB_RGB_COLORS, SRCCOPY);
   } else {
     CFX_DIBitmap* pBitmap = pBitmap1;
-    if (pBitmap->IsCmykImage() || pIccTransform) {
-      pBitmap = pBitmap->CloneConvert(FXDIB_Rgb, nullptr, pIccTransform);
+    if (pBitmap->IsCmykImage()) {
+      pBitmap = pBitmap->CloneConvert(FXDIB_Rgb);
       if (!pBitmap)
         return FALSE;
     }
     int width = pSrcRect->Width(), height = pSrcRect->Height();
     LPBYTE pBuffer = pBitmap->GetBuffer();
     CFX_ByteString info = CFX_WindowsDIB::GetBitmapInfo(pBitmap);
     ::SetDIBitsToDevice(m_hDC, left, top, width, height, pSrcRect->left,
                         pBitmap->GetHeight() - pSrcRect->bottom, 0,
                         pBitmap->GetHeight(), pBuffer,
                         (BITMAPINFO*)info.c_str(), DIB_RGB_COLORS);
     if (pBitmap != pBitmap1) {
       delete pBitmap;
     }
   }
   return TRUE;
 }
 
 FX_BOOL CGdiDeviceDriver::GDI_StretchDIBits(CFX_DIBitmap* pBitmap1,
                                             int dest_left,
                                             int dest_top,
                                             int dest_width,
                                             int dest_height,
-                                            uint32_t flags,
-                                            void* pIccTransform) {
+                                            uint32_t flags) {
   CFX_DIBitmap* pBitmap = pBitmap1;
   if (!pBitmap || dest_width == 0 || dest_height == 0)
     return FALSE;
 
-  if ((pBitmap->IsCmykImage() || pIccTransform) &&
-      !pBitmap->ConvertFormat(FXDIB_Rgb, pIccTransform)) {
+  if (pBitmap->IsCmykImage() && !pBitmap->ConvertFormat(FXDIB_Rgb))
     return FALSE;
-  }
+
   CFX_ByteString info = CFX_WindowsDIB::GetBitmapInfo(pBitmap);
   if ((int64_t)abs(dest_width) * abs(dest_height) <
           (int64_t)pBitmap1->GetWidth() * pBitmap1->GetHeight() * 4 ||
       (flags & FXDIB_INTERPOL) || (flags & FXDIB_BICUBIC_INTERPOL)) {
     SetStretchBltMode(m_hDC, HALFTONE);
   } else {
     SetStretchBltMode(m_hDC, COLORONCOLOR);
   }
   CFX_DIBitmap* pToStrechBitmap = pBitmap;
   bool del = false;
   if (m_DeviceClass == FXDC_PRINTER &&
       ((int64_t)pBitmap->GetWidth() * pBitmap->GetHeight() >
        (int64_t)abs(dest_width) * abs(dest_height))) {
     pToStrechBitmap = pBitmap->StretchTo(dest_width, dest_height);
     del = true;
   }
   CFX_ByteString toStrechBitmapInfo =
       CFX_WindowsDIB::GetBitmapInfo(pToStrechBitmap);
   ::StretchDIBits(m_hDC, dest_left, dest_top, dest_width, dest_height, 0, 0,
                   pToStrechBitmap->GetWidth(), pToStrechBitmap->GetHeight(),
                   pToStrechBitmap->GetBuffer(),
                   (BITMAPINFO*)toStrechBitmapInfo.c_str(), DIB_RGB_COLORS,
                   SRCCOPY);
-  if (del) {
+  if (del)
     delete pToStrechBitmap;
-  }
   return TRUE;
 }
 
 FX_BOOL CGdiDeviceDriver::GDI_StretchBitMask(CFX_DIBitmap* pBitmap1,
                                              int dest_left,
                                              int dest_top,
                                              int dest_width,
                                              int dest_height,
                                              uint32_t bitmap_color,
-                                             uint32_t flags,
-                                             int alpha_flag,
-                                             void* pIccTransform) {
+                                             uint32_t flags) {
   CFX_DIBitmap* pBitmap = pBitmap1;
   if (!pBitmap || dest_width == 0 || dest_height == 0)
     return FALSE;
 
-  Color2Argb(bitmap_color, bitmap_color, alpha_flag | (1 << 24), pIccTransform);
   int width = pBitmap->GetWidth(), height = pBitmap->GetHeight();
   struct {
     BITMAPINFOHEADER bmiHeader;
     uint32_t bmiColors[2];
   } bmi;
   FXSYS_memset(&bmi.bmiHeader, 0, sizeof(BITMAPINFOHEADER));
   bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
   bmi.bmiHeader.biBitCount = 1;
   bmi.bmiHeader.biCompression = BI_RGB;
   bmi.bmiHeader.biHeight = -height;
@@ skipping 93 matching lines @@
 FX_BOOL CGdiDeviceDriver::DrawPath(const CFX_PathData* pPathData,
                                    const CFX_Matrix* pMatrix,
                                    const CFX_GraphStateData* pGraphState,
                                    uint32_t fill_color,
                                    uint32_t stroke_color,
                                    int fill_mode,
                                    int blend_type) {
   if (blend_type != FXDIB_BLEND_NORMAL)
     return FALSE;
 
-  Color2Argb(fill_color, fill_color, 1 << 24, nullptr);
-  Color2Argb(stroke_color, stroke_color, 0, nullptr);
   CWin32Platform* pPlatform =
       (CWin32Platform*)CFX_GEModule::Get()->GetPlatformData();
   if (!(pGraphState || stroke_color == 0) &&
       !pPlatform->m_GdiplusExt.IsAvailable()) {
     CFX_FloatRect bbox_f = pPathData->GetBoundingBox();
     if (pMatrix) {
       bbox_f.Transform(pMatrix);
     }
     FX_RECT bbox = bbox_f.GetInnerRect();
     if (bbox.Width() <= 0) {
@@ skipping 80 matching lines @@
   }
   return TRUE;
 }
 
 FX_BOOL CGdiDeviceDriver::FillRectWithBlend(const FX_RECT* pRect,
                                             uint32_t fill_color,
                                             int blend_type) {
   if (blend_type != FXDIB_BLEND_NORMAL)
     return FALSE;
 
-  Color2Argb(fill_color, fill_color, 1 << 24, nullptr);
   int alpha;
   FX_COLORREF rgb;
   ArgbDecode(fill_color, alpha, rgb);
   if (alpha == 0)
     return TRUE;
 
   if (alpha < 255)
     return FALSE;
 
   HBRUSH hBrush = CreateSolidBrush(rgb);
@@ skipping 36 matching lines @@
 
 FX_BOOL CGdiDeviceDriver::DrawCosmeticLine(FX_FLOAT x1,
                                            FX_FLOAT y1,
                                            FX_FLOAT x2,
                                            FX_FLOAT y2,
                                            uint32_t color,
                                            int blend_type) {
   if (blend_type != FXDIB_BLEND_NORMAL)
     return FALSE;
 
-  Color2Argb(color, color, 1 << 24, nullptr);
   int a;
   FX_COLORREF rgb;
   ArgbDecode(color, a, rgb);
   if (a == 0)
     return TRUE;
 
   HPEN hPen = CreatePen(PS_SOLID, 1, rgb);
   hPen = (HPEN)SelectObject(m_hDC, hPen);
   MoveToEx(m_hDC, FXSYS_round(x1), FXSYS_round(y1), nullptr);
   LineTo(m_hDC, FXSYS_round(x2), FXSYS_round(y2));
@@ skipping 31 matching lines @@
   bmi.bmiHeader.biWidth = width;
   if (pBitmap->GetBPP() > 8 && !pBitmap->IsCmykImage()) {
     ret = ::GetDIBits(hDCMemory, hbmp, 0, height, pBitmap->GetBuffer(), &bmi,
                       DIB_RGB_COLORS) == height;
   } else {
     CFX_DIBitmap bitmap;
     if (bitmap.Create(width, height, FXDIB_Rgb)) {
       bmi.bmiHeader.biBitCount = 24;
       ::GetDIBits(hDCMemory, hbmp, 0, height, bitmap.GetBuffer(), &bmi,
                   DIB_RGB_COLORS);
-      ret =
-          pBitmap->TransferBitmap(0, 0, width, height, &bitmap, 0, 0, nullptr);
+      ret = pBitmap->TransferBitmap(0, 0, width, height, &bitmap, 0, 0);
     } else {
       ret = FALSE;
     }
   }
   if (pBitmap->HasAlpha() && ret)
     pBitmap->LoadChannel(FXDIB_Alpha, 0xff);
 
   DeleteObject(hbmp);
   DeleteObject(hDCMemory);
   return ret;
@@ skipping 38 matching lines @@
                                 FALSE, nullptr)) {
       return FALSE;
     }
     FX_RECT src_rect(0, 0, width, height);
     return SetDIBits(&bitmap, 0, &src_rect, left, top, FXDIB_BLEND_NORMAL);
   }
   CFX_DIBExtractor temp(pSource);
   CFX_DIBitmap* pBitmap = temp;
   if (!pBitmap)
     return FALSE;
-  return GDI_SetDIBits(pBitmap, pSrcRect, left, top, nullptr);
+  return GDI_SetDIBits(pBitmap, pSrcRect, left, top);
 }
 
 FX_BOOL CGdiDisplayDriver::UseFoxitStretchEngine(const CFX_DIBSource* pSource,
                                                  uint32_t color,
                                                  int dest_left,
                                                  int dest_top,
                                                  int dest_width,
                                                  int dest_height,
                                                  const FX_RECT* pClipRect,
                                                  int render_flags) {
@@ skipping 73 matching lines @@
           pClipRect, flags);
     }
     return UseFoxitStretchEngine(pSource, color, dest_left, dest_top,
                                  dest_width, dest_height, pClipRect, flags);
   }
   CFX_DIBExtractor temp(pSource);
   CFX_DIBitmap* pBitmap = temp;
   if (!pBitmap)
     return FALSE;
   return GDI_StretchDIBits(pBitmap, dest_left, dest_top, dest_width,
-                           dest_height, flags, nullptr);
+                           dest_height, flags);
 }
 
 FX_BOOL CGdiDisplayDriver::StartDIBits(const CFX_DIBSource* pBitmap,
                                        int bitmap_alpha,
                                        uint32_t color,
                                        const CFX_Matrix* pMatrix,
                                        uint32_t render_flags,
                                        void*& handle,
                                        int blend_type) {
   return FALSE;
@@ skipping 51 matching lines @@
   if (m_hDC) {
     SelectObject(m_hDC, m_hOldBitmap);
     DeleteDC(m_hDC);
   }
   if (m_hBitmap)
     DeleteObject(m_hBitmap);
   delete GetBitmap();
 }
 
 #endif  // _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_