Use number of components from ICC profile and alternateCS

core/src/fxcodec/codec/fx_codec_icc.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 "../../../include/fxcodec/fx_codec.h"
 #include "codec_int.h"
 #include "../lcms2/include/fx_lcms2.h"
+#define N_COMPONENT_LAB 3

[jun_fang, 2014/08/25 18:56:51]

It's better to use const variables rather than macro like:
const FX_DWORD N_COMPONENT_LAB = 3;

[Bo Xu, 2014/08/25 20:28:18]

Done.

+#define N_COMPONENT_GRAY 1
+#define N_COMPONENT_RGB 3
+#define N_COMPONENT_CMYK 4
+#define N_COMPONENT_DEFAULT 3
+
 FX_BOOL MD5ComputeID( FX_LPCVOID buf, FX_DWORD dwSize, FX_BYTE ID[16] )
 {
     return cmsMD5computeIDExt(buf, dwSize, ID);
 }
 struct CLcmsCmm : public CFX_Object {
     cmsHTRANSFORM m_hTransform;
     int                 m_nSrcComponents;
     int                 m_nDstComponents;
     FX_BOOL             m_bLab;
 };
@@ skipping 32 matching lines @@
             }
             break;
         default:
             if (nComponents != 3) {
                 return FALSE;
             }
             break;
     }
     return TRUE;
 }
-void* IccLib_CreateTransform(const unsigned char* pSrcProfileData, unsigned int dwSrcProfileSize, int nSrcComponents,
-                             const unsigned char* pDstProfileData, unsigned int dwDstProfileSize, int nDstComponents,
+FX_INT32 GetCSComponents(cmsColorSpaceSignature cs)
+{

[jun_fang, 2014/08/25 18:56:51]

FX_DWORD components = N_COMPONENT_DEFAULT;

[Bo Xu, 2014/08/25 20:28:18]

Done.

+    switch (cs) {
+        case cmsSigLabData:
+            return N_COMPONENT_LAB;

[jun_fang, 2014/08/25 18:56:51]

use |components = N_COMPONENT_LAB| to replace the return here. 

+            break;
+        case cmsSigGrayData:
+            return N_COMPONENT_GRAY;
+            break;
+        case cmsSigRgbData:
+            return N_COMPONENT_RGB;
+            break;
+        case cmsSigCmykData:
+            return N_COMPONENT_CMYK;
+            break;
+        default:
+            return N_COMPONENT_DEFAULT;
+            break;
+    }

[jun_fang, 2014/08/25 18:56:51]

return components;

+}
+void* IccLib_CreateTransform(const unsigned char* pSrcProfileData, FX_DWORD dwSrcProfileSize, FX_INT32* nSrcComponents,
+                             const unsigned char* pDstProfileData, FX_DWORD dwDstProfileSize, FX_INT32 nDstComponents,
                              int intent, FX_DWORD dwSrcFormat = Icc_FORMAT_DEFAULT, FX_DWORD dwDstFormat = Icc_FORMAT_DEFAULT)
 {
     cmsHPROFILE srcProfile = NULL;
     cmsHPROFILE dstProfile = NULL;
     cmsHTRANSFORM hTransform = NULL;
     CLcmsCmm* pCmm = NULL;
+    *nSrcComponents = 0;

[jun_fang, 2014/08/25 18:56:51]

Need to check whether nSrcComponents is NULL.

[Bo Xu, 2014/08/25 20:28:18]

I have changed nSrcComponents from pointer to reference.

     srcProfile = cmsOpenProfileFromMem((void*)pSrcProfileData, dwSrcProfileSize);
     if (srcProfile == NULL) {
         return NULL;
     }
     if(pDstProfileData == NULL && dwDstProfileSize == 0 && nDstComponents == 3) {
         dstProfile = cmsCreate_sRGBProfile();
     } else {
         dstProfile = cmsOpenProfileFromMem((void*)pDstProfileData, dwDstProfileSize);
     }
     if (dstProfile == NULL) {
         cmsCloseProfile(srcProfile);
         return NULL;
     }
     int srcFormat;
     FX_BOOL bLab = FALSE;
     cmsColorSpaceSignature srcCS = cmsGetColorSpace(srcProfile);
-    if (!CheckComponents(srcCS, nSrcComponents, FALSE)) {
-        cmsCloseProfile(srcProfile);
-        cmsCloseProfile(dstProfile);
-        return NULL;
-    }
+    *nSrcComponents = GetCSComponents(srcCS);
     if (srcCS == cmsSigLabData) {
-        srcFormat = COLORSPACE_SH(PT_Lab) | CHANNELS_SH(nSrcComponents) | BYTES_SH(0);
+        srcFormat = COLORSPACE_SH(PT_Lab) | CHANNELS_SH(*nSrcComponents) | BYTES_SH(0);
         bLab = TRUE;
     } else {
-        srcFormat = COLORSPACE_SH(PT_ANY) | CHANNELS_SH(nSrcComponents) | BYTES_SH(1);
+        srcFormat = COLORSPACE_SH(PT_ANY) | CHANNELS_SH(*nSrcComponents) | BYTES_SH(1);
         if (srcCS == cmsSigRgbData && T_DOSWAP(dwSrcFormat)) {
             srcFormat |= DOSWAP_SH(1);
         }
     }
     cmsColorSpaceSignature dstCS = cmsGetColorSpace(dstProfile);
     if (!CheckComponents(dstCS, nDstComponents, TRUE)) {
         cmsCloseProfile(srcProfile);
         cmsCloseProfile(dstProfile);
         return NULL;
     }
@@ skipping 14 matching lines @@
     }
     if (hTransform == NULL) {
         cmsCloseProfile(srcProfile);
         cmsCloseProfile(dstProfile);
         return NULL;
     }
     pCmm = FX_NEW CLcmsCmm;
     if (pCmm == NULL) {
         return NULL;
     }
-    pCmm->m_nSrcComponents = nSrcComponents;
+    pCmm->m_nSrcComponents = *nSrcComponents;
     pCmm->m_nDstComponents = nDstComponents;
     pCmm->m_hTransform = hTransform;
     pCmm->m_bLab = bLab;
     cmsCloseProfile(srcProfile);
     cmsCloseProfile(dstProfile);
     return pCmm;
 }
-void* IccLib_CreateTransform_sRGB(const unsigned char* pProfileData, unsigned int dwProfileSize, int nComponents, int intent, FX_DWORD dwSrcFormat)
+void* IccLib_CreateTransform_sRGB(const unsigned char* pProfileData, FX_DWORD dwProfileSize, FX_INT32* nComponents, FX_INT32 intent, FX_DWORD dwSrcFormat)
 {
     return IccLib_CreateTransform(pProfileData, dwProfileSize, nComponents, NULL, 0, 3, intent, dwSrcFormat);
 }
 void IccLib_DestroyTransform(void* pTransform)
 {
     if (pTransform == NULL) {
         return;
     }
     cmsDeleteTransform(((CLcmsCmm*)pTransform)->m_hTransform);
     delete (CLcmsCmm*)pTransform;
@@ skipping 36 matching lines @@
             pDestValues[2] = output[0] / 255.0f;
             break;
         case 4:
             pDestValues[0] = output[0] / 255.0f;
             pDestValues[1] = output[1] / 255.0f;
             pDestValues[2] = output[2] / 255.0f;
             pDestValues[3] = output[3] / 255.0f;
             break;
     }
 }
-void IccLib_TranslateImage(void* pTransform, unsigned char* pDest, const unsigned char* pSrc, int pixels)
+void IccLib_TranslateImage(void* pTransform, unsigned char* pDest, const unsigned char* pSrc, FX_INT32 pixels)
 {
     cmsDoTransform(((CLcmsCmm*)pTransform)->m_hTransform, (void*)pSrc, pDest, pixels);
 }
 FX_LPVOID CreateProfile_Gray(double gamma)
 {
     cmsCIExyY* D50 = (cmsCIExyY*)cmsD50_xyY();
     if (!cmsWhitePointFromTemp(D50, 6504)) {
         return NULL;
     }
     cmsToneCurve* curve = cmsBuildGamma(NULL, gamma);
@@ skipping 29 matching lines @@
         case cmsSigHlsData:
             return ICodec_IccModule::IccCS_Hls;
         case cmsSigCmykData:
             return ICodec_IccModule::IccCS_Cmyk;
         case cmsSigCmyData:
             return ICodec_IccModule::IccCS_Cmy;
         default:
             return ICodec_IccModule::IccCS_Unknown;
     }
 }
-ICodec_IccModule::IccCS CCodec_IccModule::GetProfileCS(FX_LPCBYTE pProfileData, unsigned int dwProfileSize)
+ICodec_IccModule::IccCS CCodec_IccModule::GetProfileCS(FX_LPCBYTE pProfileData, FX_DWORD dwProfileSize)
 {
     ICodec_IccModule::IccCS cs;
     cmsHPROFILE hProfile = cmsOpenProfileFromMem((void*)pProfileData, dwProfileSize);
     if (hProfile == NULL) {
         return IccCS_Unknown;
     }
     cs = GetProfileCSFromHandle(hProfile);
     if (hProfile)       {
         cmsCloseProfile(hProfile);
     }
@@ skipping 254 matching lines @@
     }
     pos = m_MapTranform.GetStartPosition();
     CFX_IccTransformCache* pTransformCache;
     while (pos) {
         m_MapTranform.GetNextAssoc(pos, key, (FX_LPVOID&)pTransformCache);
         if (pTransformCache) {
             delete pTransformCache;
         }
     }
 }
-void* CCodec_IccModule::CreateTransform_sRGB(FX_LPCBYTE pProfileData, unsigned int dwProfileSize, int nComponents, int intent, FX_DWORD dwSrcFormat)
+void* CCodec_IccModule::CreateTransform_sRGB(FX_LPCBYTE pProfileData, FX_DWORD dwProfileSize, FX_INT32* nComponents, FX_INT32 intent, FX_DWORD dwSrcFormat)
 {
     return IccLib_CreateTransform_sRGB(pProfileData, dwProfileSize, nComponents, intent, dwSrcFormat);
 }
-void* CCodec_IccModule::CreateTransform_CMYK(FX_LPCBYTE pSrcProfileData, unsigned int dwSrcProfileSize, int nSrcComponents,
-        FX_LPCBYTE pDstProfileData, unsigned int dwDstProfileSize, int intent,
+void* CCodec_IccModule::CreateTransform_CMYK(FX_LPCBYTE pSrcProfileData, FX_DWORD dwSrcProfileSize, FX_INT32* nSrcComponents,
+    FX_LPCBYTE pDstProfileData, FX_DWORD dwDstProfileSize, FX_INT32 intent,
         FX_DWORD dwSrcFormat , FX_DWORD dwDstFormat)
 {
     return IccLib_CreateTransform(pSrcProfileData, dwSrcProfileSize, nSrcComponents,
                                   pDstProfileData, dwDstProfileSize, 4, intent, dwSrcFormat, dwDstFormat);
 }
 void CCodec_IccModule::DestroyTransform(void* pTransform)
 {
     IccLib_DestroyTransform(pTransform);
 }
 void CCodec_IccModule::Translate(void* pTransform, FX_FLOAT* pSrcValues, FX_FLOAT* pDestValues)
 {
     IccLib_Translate(pTransform, m_nComponents, pSrcValues, pDestValues);
 }
-void CCodec_IccModule::TranslateScanline(void* pTransform, FX_LPBYTE pDest, FX_LPCBYTE pSrc, int pixels)
+void CCodec_IccModule::TranslateScanline(void* pTransform, FX_LPBYTE pDest, FX_LPCBYTE pSrc, FX_INT32 pixels)
 {
     IccLib_TranslateImage(pTransform, pDest, pSrc, pixels);
 }
 const FX_BYTE g_CMYKSamples[81 * 81 * 3] = {
     255, 255, 255, 225, 226, 228, 199, 200, 202, 173, 174, 178, 147, 149, 152, 123, 125, 128,  99, 99, 102,  69, 70, 71,  34, 30, 31,
     255, 253, 229, 226, 224, 203, 200, 199, 182, 173, 173, 158, 149, 148, 135, 125, 124, 113,  99, 99, 90,  70, 69, 63,  33, 29, 24,
     255, 251, 204, 228, 223, 182, 201, 198, 163, 174, 172, 142, 150, 147, 122, 125, 123, 101,  99, 98, 80,  70, 68, 54,  32, 28, 16,
     255, 249, 179, 230, 222, 160, 203, 197, 144, 174, 170, 124, 150, 145, 105, 125, 122, 88,  99, 97, 69,  70, 68, 46,  31, 28,  6,
     255, 247, 154, 229, 220, 138, 203, 195, 122, 176, 169, 107, 150, 145, 91, 125, 121, 74, 100, 96, 57,  70, 67, 35,  29, 26,  0,
     255, 246, 128, 231, 217, 114, 205, 194, 101, 176, 167, 88, 150, 144, 75, 125, 120, 60, 100, 96, 44,  70, 66, 24,  28, 26,  0,
@@ skipping 801 matching lines @@
     FX_BYTE c1 = FXSYS_round(c * 255);
     FX_BYTE m1 = FXSYS_round(m * 255);
     FX_BYTE y1 = FXSYS_round(y * 255);
     FX_BYTE k1 = FXSYS_round(k * 255);
     FX_BYTE r, g, b;
     AdobeCMYK_to_sRGB1(c1, m1, y1, k1, r, g, b);
     R = 1.0f * r / 255;
     G = 1.0f * g / 255;
     B = 1.0f * b / 255;
 }