diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-10 00:18:09 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-10 00:18:09 -0800 |
| commit | 36a9d086bc8a89d699461b3a03c56745ceae98c3 (patch) | |
| tree | dd8ac69676b25b10d1ec3f75069ac9d0a8db9422 /core/src/fpdfapi/fpdf_page | |
| parent | 5fae972302efd368a3ecc7cfa655891323c59a1b (diff) | |
| download | pdfium-36a9d086bc8a89d699461b3a03c56745ceae98c3.tar.xz | |
Merge to XFA: Cleanup CPDF_DIBSource::LoadColorInfo() and ValidateDictParam().
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1507043004 .
(cherry picked from commit d9324d8f7345d4546c06c4a9d6cd497b0f7f3ad2)
Review URL: https://codereview.chromium.org/1512203003 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_page')
| -rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp | 5 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_page/pageint.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp index 2adf9f4e19..3ae04d7111 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp @@ -307,8 +307,9 @@ void CPDF_DocPageData::ReleaseFont(CPDF_Dictionary* pFontDict) { } } -CPDF_ColorSpace* CPDF_DocPageData::GetColorSpace(CPDF_Object* pCSObj, - CPDF_Dictionary* pResources) { +CPDF_ColorSpace* CPDF_DocPageData::GetColorSpace( + CPDF_Object* pCSObj, + const CPDF_Dictionary* pResources) { if (!pCSObj) return nullptr; diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h index 208a09b8d8..84c8366780 100644 --- a/core/src/fpdfapi/fpdf_page/pageint.h +++ b/core/src/fpdfapi/fpdf_page/pageint.h @@ -402,7 +402,7 @@ class CPDF_DocPageData { CPDF_FontEncoding* pEncoding); void ReleaseFont(CPDF_Dictionary* pFontDict); CPDF_ColorSpace* GetColorSpace(CPDF_Object* pCSObj, - CPDF_Dictionary* pResources); + const CPDF_Dictionary* pResources); CPDF_ColorSpace* GetCopiedColorSpace(CPDF_Object* pCSObj); void ReleaseColorSpace(CPDF_Object* pColorSpace); CPDF_Pattern* GetPattern(CPDF_Object* pPatternObj, |