Use number of components from ICC profile and alternateCS

core/src/fpdfapi/fpdf_page/fpdf_page_doc.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/fpdfapi/fpdf_page.h"
 #include "../../../include/fpdfapi/fpdf_module.h"
 #include "../../../include/fdrm/fx_crypt.h"
 #include "../fpdf_font/font_int.h"
@@ skipping 89 matching lines @@
 }
 CPDF_ColorSpace* _CSFromName(const CFX_ByteString& name);
 CPDF_ColorSpace* CPDF_Document::LoadColorSpace(CPDF_Object* pCSObj, CPDF_Dictionary* pResources)
 {
     return GetValidatePageData()->GetColorSpace(pCSObj, pResources);
 }
 CPDF_Pattern* CPDF_Document::LoadPattern(CPDF_Object* pPatternObj, FX_BOOL bShading, const CFX_AffineMatrix* matrix)
 {
     return GetValidatePageData()->GetPattern(pPatternObj, bShading, matrix);
 }
-CPDF_IccProfile* CPDF_Document::LoadIccProfile(CPDF_Stream* pStream, int nComponents)
+CPDF_IccProfile* CPDF_Document::LoadIccProfile(CPDF_Stream* pStream)
 {
-    return GetValidatePageData()->GetIccProfile(pStream, nComponents);
+    return GetValidatePageData()->GetIccProfile(pStream);
 }
 CPDF_Image* CPDF_Document::LoadImageF(CPDF_Object* pObj)
 {
     if (!pObj) {
         return NULL;
     }
     FXSYS_assert(pObj->GetObjNum());
     return GetValidatePageData()->GetImage(pObj);
 }
 void CPDF_Document::RemoveColorSpaceFromPageData(CPDF_Object* pCSObj)
@@ skipping 413 matching lines @@
     m_ImageMap.SetAt(dwImageObjNum, imageData);
     return pImage;
 }
 void CPDF_DocPageData::ReleaseImage(CPDF_Object* pImageStream)
 {
     if (!pImageStream) {
         return;
     }
     PDF_DocPageData_Release<FX_DWORD, CPDF_Image*>(m_ImageMap, pImageStream->GetObjNum(), NULL);
 }
-CPDF_IccProfile* CPDF_DocPageData::GetIccProfile(CPDF_Stream* pIccProfileStream, FX_INT32 nComponents)
+CPDF_IccProfile* CPDF_DocPageData::GetIccProfile(CPDF_Stream* pIccProfileStream)
 {
     if (!pIccProfileStream) {
         return NULL;
     }
     CPDF_CountedObject<CPDF_IccProfile*>* ipData = NULL;
     if (m_IccProfileMap.Lookup(pIccProfileStream, ipData)) {
         ipData->m_nCount++;
         return ipData->m_Obj;
     }
     CPDF_StreamAcc stream;
     stream.LoadAllData(pIccProfileStream, FALSE);
     FX_BYTE digest[20];
     CPDF_Stream* pCopiedStream = NULL;
     CRYPT_SHA1Generate(stream.GetData(), stream.GetSize(), digest);
     if (m_HashProfileMap.Lookup(CFX_ByteStringC(digest, 20), (void*&)pCopiedStream)) {
         m_IccProfileMap.Lookup(pCopiedStream, ipData);
         ipData->m_nCount++;
         return ipData->m_Obj;
     }
-    CPDF_IccProfile* pProfile = FX_NEW CPDF_IccProfile(stream.GetData(), stream.GetSize(), nComponents);
+    CPDF_IccProfile* pProfile = FX_NEW CPDF_IccProfile(stream.GetData(), stream.GetSize());
     if (!pProfile) {
         return NULL;
     }
     ipData = FX_NEW CPDF_CountedObject<CPDF_IccProfile*>;
     if (!ipData) {
         delete pProfile;
         return NULL;
     }
     ipData->m_nCount = 2;
     ipData->m_Obj = pProfile;
@@ skipping 51 matching lines @@
     m_FontFileMap.SetAt(pFontStream, ftData);
     return pFontFile;
 }
 void CPDF_DocPageData::ReleaseFontFileStreamAcc(CPDF_Stream* pFontStream, FX_BOOL bForce)
 {
     if (!pFontStream) {
         return;
     }
     PDF_DocPageData_Release<CPDF_Stream*, CPDF_StreamAcc*>(m_FontFileMap, pFontStream, NULL, bForce);
 }