Change colorspace's number of components to be unsigned

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 "core/include/fxcodec/fx_codec.h"
 #include "core/src/fxcodec/codec/codec_int.h"
 #include "third_party/lcms2-2.6/include/lcms2.h"
 
@@ skipping 48 matching lines @@
       }
       break;
     default:
       if (nComponents != 3) {
         return FALSE;
       }
       break;
   }
   return TRUE;
 }
-int32_t GetCSComponents(cmsColorSpaceSignature cs) {
+
+FX_DWORD GetCSComponents(cmsColorSpaceSignature cs) {
   FX_DWORD components;
   switch (cs) {
     case cmsSigLabData:
       components = N_COMPONENT_LAB;
       break;
     case cmsSigGrayData:
       components = N_COMPONENT_GRAY;
       break;
     case cmsSigRgbData:
       components = N_COMPONENT_RGB;
       break;
     case cmsSigCmykData:
       components = N_COMPONENT_CMYK;
       break;
     default:
       components = N_COMPONENT_DEFAULT;
       break;
   }
   return components;
 }
+
 void* IccLib_CreateTransform(const unsigned char* pSrcProfileData,
                              FX_DWORD dwSrcProfileSize,
-                             int32_t& nSrcComponents,
+                             FX_DWORD& nSrcComponents,
                              const unsigned char* pDstProfileData,
                              FX_DWORD dwDstProfileSize,
                              int32_t 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;
@@ skipping 59 matching lines @@
   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,
                                   FX_DWORD dwProfileSize,
-                                  int32_t& nComponents,
+                                  FX_DWORD& nComponents,
                                   int32_t intent,
                                   FX_DWORD dwSrcFormat) {
   return IccLib_CreateTransform(pProfileData, dwProfileSize, nComponents, NULL,
                                 0, 3, intent, dwSrcFormat);
 }
 void IccLib_DestroyTransform(void* pTransform) {
   if (!pTransform) {
     return;
   }
   cmsDeleteTransform(((CLcmsCmm*)pTransform)->m_hTransform);
@@ skipping 346 matching lines @@
     delete pair.second;
   }
   m_MapProfile.clear();
   for (const auto& pair : m_MapTranform) {
     delete pair.second;
   }
   m_MapTranform.clear();
 }
 void* CCodec_IccModule::CreateTransform_sRGB(const uint8_t* pProfileData,
                                              FX_DWORD dwProfileSize,
-                                             int32_t& nComponents,
+                                             FX_DWORD& nComponents,
                                              int32_t intent,
                                              FX_DWORD dwSrcFormat) {
   return IccLib_CreateTransform_sRGB(pProfileData, dwProfileSize, nComponents,
                                      intent, dwSrcFormat);
 }
+
 void* CCodec_IccModule::CreateTransform_CMYK(const uint8_t* pSrcProfileData,
                                              FX_DWORD dwSrcProfileSize,
-                                             int32_t& nSrcComponents,
+                                             FX_DWORD& nSrcComponents,
                                              const uint8_t* pDstProfileData,
                                              FX_DWORD dwDstProfileSize,
                                              int32_t 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,
                                          uint8_t* pDest,
@@ skipping 1406 matching lines @@
   uint8_t c1 = FXSYS_round(c * 255);
   uint8_t m1 = FXSYS_round(m * 255);
   uint8_t y1 = FXSYS_round(y * 255);
   uint8_t k1 = FXSYS_round(k * 255);
   uint8_t 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;
 }