From a550e4cfd41d6e86b2a676e38200f3f4cebf5f2e Mon Sep 17 00:00:00 2001 From: Bo Xu Date: Mon, 25 Aug 2014 11:52:41 -0700 Subject: Revert of Use number of components from ICC profile and alternateCS (patchset #1 of https://codereview.chromium.org/493163003/) Reason for revert: Needs to address comments before landing Original issue's description: > Use number of components from ICC profile and alternate color space > > BUG=406806 > > Committed: https://pdfium.googlesource.com/pdfium/+/be83103 TBR=tsepez@chromium.org,jun_fang@foxitsoftware.com NOTREECHECKS=true NOTRY=true BUG=406806 Review URL: https://codereview.chromium.org/504883003 --- core/src/fpdfapi/fpdf_page/pageint.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'core/src/fpdfapi/fpdf_page/pageint.h') diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h index 24261ef8b2..625e5df737 100644 --- a/core/src/fpdfapi/fpdf_page/pageint.h +++ b/core/src/fpdfapi/fpdf_page/pageint.h @@ -426,7 +426,7 @@ public: void ReleasePattern(CPDF_Object* pPatternObj); CPDF_Image* GetImage(CPDF_Object* pImageStream); void ReleaseImage(CPDF_Object* pImageStream); - CPDF_IccProfile* GetIccProfile(CPDF_Stream* pIccProfileStream); + CPDF_IccProfile* GetIccProfile(CPDF_Stream* pIccProfileStream, FX_INT32 nComponents); void ReleaseIccProfile(CPDF_Stream* pIccProfileStream, CPDF_IccProfile* pIccProfile); CPDF_StreamAcc* GetFontFileStreamAcc(CPDF_Stream* pFontStream); void ReleaseFontFileStreamAcc(CPDF_Stream* pFontStream, FX_BOOL bForce = FALSE); @@ -468,11 +468,9 @@ protected: class CPDF_IccProfile : public CFX_Object { public: - CPDF_IccProfile(FX_LPCBYTE pData, FX_DWORD dwSize); + CPDF_IccProfile(FX_LPCBYTE pData, FX_DWORD dwSize, int nComponents); ~CPDF_IccProfile(); - FX_INT32 GetComponents() { return m_nSrcComponents; } FX_BOOL m_bsRGB; - FX_INT32 m_nSrcComponents; FX_LPVOID m_pTransform; }; class CPDF_DeviceCS : public CPDF_ColorSpace -- cgit v1.2.3