Remove the ICC transform where it is never initialized.

- All callers of CFX_DIBitmap methods use nullptr as the ICC Transform.
- The CFX_ScanlineCompositor is always initialized with a null ICC transform.
Many of its methods call TranslateScanline from the ICC module. This method
casts just uses ((CLcmsCmm*)pTransform)->m_hTransform, and this should not be
done when pTransform is nullptr.

Change-Id: I1b846d1f20699fa017cb9a276be3214eb8fabd4b
Reviewed-on: https://pdfium-review.googlesource.com/3931
Commit-Queue: Nicolás Peña <npm@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

1 files changed, 3 insertions, 18 deletions

diff --git a/core/fxge/dib/cfx_dibitmap.h b/core/fxge/dib/cfx_dibitmap.h
index 87688a1ade..6fd4b7c89a 100644
--- a/core/fxge/dib/cfx_dibitmap.h
+++ b/core/fxge/dib/cfx_dibitmap.h
@@ -72,19 +72,7 @@ class CFX_DIBitmap : public CFX_DIBSource {
                        int src_top,
                        int blend_type = FXDIB_BLEND_NORMAL,
                        const CFX_ClipRgn* pClipRgn = nullptr,
-                       bool bRgbByteOrder = false,
-                       void* pIccTransform = nullptr);
-
-  bool TransferMask(int dest_left,
-                    int dest_top,
-                    int width,
-                    int height,
-                    const CFX_RetainPtr<CFX_DIBSource>& pMask,
-                    uint32_t color,
-                    int src_left,
-                    int src_top,
-                    int alpha_flag = 0,
-                    void* pIccTransform = nullptr);
+                       bool bRgbByteOrder = false);
 
   bool CompositeMask(int dest_left,
                      int dest_top,
@@ -97,16 +85,14 @@ class CFX_DIBitmap : public CFX_DIBSource {
                      int blend_type = FXDIB_BLEND_NORMAL,
                      const CFX_ClipRgn* pClipRgn = nullptr,
                      bool bRgbByteOrder = false,
-                     int alpha_flag = 0,
-                     void* pIccTransform = nullptr);
+                     int alpha_flag = 0);
 
   bool CompositeRect(int dest_left,
                      int dest_top,
                      int width,
                      int height,
                      uint32_t color,
-                     int alpha_flag = 0,
-                     void* pIccTransform = nullptr);
+                     int alpha_flag);
 
   bool ConvertColorScale(uint32_t forecolor, uint32_t backcolor);
 
@@ -121,7 +107,6 @@ class CFX_DIBitmap : public CFX_DIBSource {
   CFX_DIBitmap();
   CFX_DIBitmap(const CFX_DIBitmap& src);
 
-  bool GetGrayData(void* pIccTransform = nullptr);
 #if defined _SKIA_SUPPORT_PATHS_
   enum class Format { kCleared, kPreMultiplied, kUnPreMultiplied };
 #endif