From 54ef2cb9eb5b145c6e973e95ccb488e121556ad7 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 9 May 2018 20:13:42 +0000 Subject: Mark numerious pointers as const. They are mostly CPDF_Object* and derived classes, but others that should be are marked const as well. Change-Id: Ib3344d7d8db90940df8edc97c0dd6c59da080541 Reviewed-on: https://pdfium-review.googlesource.com/32180 Commit-Queue: Lei Zhang Reviewed-by: Henrique Nakashima --- core/fpdfapi/page/cpdf_docpagedata.cpp | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'core/fpdfapi/page/cpdf_docpagedata.cpp') diff --git a/core/fpdfapi/page/cpdf_docpagedata.cpp b/core/fpdfapi/page/cpdf_docpagedata.cpp index 03db315912..9ac5c1e304 100644 --- a/core/fpdfapi/page/cpdf_docpagedata.cpp +++ b/core/fpdfapi/page/cpdf_docpagedata.cpp @@ -209,32 +209,33 @@ void CPDF_DocPageData::ReleaseFont(const CPDF_Dictionary* pFontDict) { } CPDF_ColorSpace* CPDF_DocPageData::GetColorSpace( - CPDF_Object* pCSObj, + const CPDF_Object* pCSObj, const CPDF_Dictionary* pResources) { - std::set visited; + std::set visited; return GetColorSpaceGuarded(pCSObj, pResources, &visited); } CPDF_ColorSpace* CPDF_DocPageData::GetColorSpaceGuarded( - CPDF_Object* pCSObj, + const CPDF_Object* pCSObj, const CPDF_Dictionary* pResources, - std::set* pVisited) { - std::set visitedLocal; + std::set* pVisited) { + std::set visitedLocal; return GetColorSpaceInternal(pCSObj, pResources, pVisited, &visitedLocal); } CPDF_ColorSpace* CPDF_DocPageData::GetColorSpaceInternal( - CPDF_Object* pCSObj, + const CPDF_Object* pCSObj, const CPDF_Dictionary* pResources, - std::set* pVisited, - std::set* pVisitedInternal) { + std::set* pVisited, + std::set* pVisitedInternal) { if (!pCSObj) return nullptr; if (pdfium::ContainsKey(*pVisitedInternal, pCSObj)) return nullptr; - pdfium::ScopedSetInsertion insertion(pVisitedInternal, pCSObj); + pdfium::ScopedSetInsertion insertion(pVisitedInternal, + pCSObj); if (pCSObj->IsName()) { ByteString name = pCSObj->GetString(); @@ -272,7 +273,7 @@ CPDF_ColorSpace* CPDF_DocPageData::GetColorSpaceInternal( pVisitedInternal); } - CPDF_Array* pArray = pCSObj->AsArray(); + const CPDF_Array* pArray = pCSObj->AsArray(); if (!pArray || pArray->IsEmpty()) return nullptr; @@ -304,7 +305,8 @@ CPDF_ColorSpace* CPDF_DocPageData::GetColorSpaceInternal( return csData->AddRef(); } -CPDF_ColorSpace* CPDF_DocPageData::GetCopiedColorSpace(CPDF_Object* pCSObj) { +CPDF_ColorSpace* CPDF_DocPageData::GetCopiedColorSpace( + const CPDF_Object* pCSObj) { if (!pCSObj) return nullptr; @@ -484,7 +486,7 @@ void CPDF_DocPageData::MaybePurgeFontFileStreamAcc( } CPDF_CountedColorSpace* CPDF_DocPageData::FindColorSpacePtr( - CPDF_Object* pCSObj) const { + const CPDF_Object* pCSObj) const { if (!pCSObj) return nullptr; -- cgit v1.2.3