diff options
| author | Henrique Nakashima <hnakashima@chromium.org> | 2017-08-30 17:02:01 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-31 19:34:56 +0000 |
| commit | ce9ad1bee792856c2d9e940ecffff97145e18d32 (patch) | |
| tree | 8410b6a25c2f99f91c2bab98d9d764c11ed159b5 /core/fpdfapi/page/cpdf_docpagedata.h | |
| parent | 670c4fdea0acb9663145b96bec1fbf76279781df (diff) | |
| download | pdfium-ce9ad1bee792856c2d9e940ecffff97145e18d32.tar.xz | |
Fix colorspace loading for mutually referencing colorspaces.
For example, Indexed colorspace A uses ICC Based colorspace B as its
"base". B declares A as its "Alternate" fallback.
Bug: chromium:759012
Change-Id: I4b78e68b9a77456050ecae4452837495546bf93d
Reviewed-on: https://pdfium-review.googlesource.com/12471
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'core/fpdfapi/page/cpdf_docpagedata.h')
| -rw-r--r-- | core/fpdfapi/page/cpdf_docpagedata.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/fpdfapi/page/cpdf_docpagedata.h b/core/fpdfapi/page/cpdf_docpagedata.h index 0fda16911d..40647bc9a6 100644 --- a/core/fpdfapi/page/cpdf_docpagedata.h +++ b/core/fpdfapi/page/cpdf_docpagedata.h @@ -41,6 +41,10 @@ class CPDF_DocPageData { CPDF_ColorSpace* GetColorSpace(CPDF_Object* pCSObj, const CPDF_Dictionary* pResources); + CPDF_ColorSpace* GetColorSpaceGuarded(CPDF_Object* pCSObj, + const CPDF_Dictionary* pResources, + std::set<CPDF_Object*>* pVisited); + CPDF_ColorSpace* GetCopiedColorSpace(CPDF_Object* pCSObj); void ReleaseColorSpace(const CPDF_Object* pColorSpace); @@ -64,10 +68,6 @@ class CPDF_DocPageData { private: using CPDF_CountedFont = CPDF_CountedObject<CPDF_Font>; - CPDF_ColorSpace* GetColorSpaceImpl(CPDF_Object* pCSObj, - const CPDF_Dictionary* pResources, - std::set<CPDF_Object*>* pVisited); - bool m_bForceClear; CFX_UnownedPtr<CPDF_Document> const m_pPDFDoc; std::map<CFX_ByteString, CPDF_Stream*> m_HashProfileMap; |