From dbf13f6562a902df17f6e543d3be844ca82956e2 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 24 May 2018 01:36:40 +0000 Subject: Improve constness for more CPDF_Objects pointers. Most of them can be marked const. A couple are marked non-const because eventually something inside gets modified. Change-Id: I5415ca8d1efdac451cde340272436cd1e6ec433f Reviewed-on: https://pdfium-review.googlesource.com/32184 Commit-Queue: Lei Zhang Reviewed-by: Henrique Nakashima --- fpdfsdk/fpdf_save.cpp | 6 +++--- fpdfsdk/pwl/cpwl_icon.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/fpdf_save.cpp b/fpdfsdk/fpdf_save.cpp index e4a1a607bb..6064a73629 100644 --- a/fpdfsdk/fpdf_save.cpp +++ b/fpdfsdk/fpdf_save.cpp @@ -59,7 +59,7 @@ bool SaveXFADocumentData(CPDFXFA_Context* pContext, if (!pPDFDocument) return false; - const CPDF_Dictionary* pRoot = pPDFDocument->GetRoot(); + CPDF_Dictionary* pRoot = pPDFDocument->GetRoot(); if (!pRoot) return false; @@ -80,7 +80,7 @@ bool SaveXFADocumentData(CPDFXFA_Context* pContext, int iDataSetsIndex = -1; int iLast = size - 2; for (int i = 0; i < size - 1; i++) { - CPDF_Object* pPDFObj = pArray->GetObjectAt(i); + const CPDF_Object* pPDFObj = pArray->GetObjectAt(i); if (!pPDFObj->IsString()) continue; if (pPDFObj->GetString() == "form") @@ -90,7 +90,6 @@ bool SaveXFADocumentData(CPDFXFA_Context* pContext, } CPDF_Stream* pFormStream = nullptr; - CPDF_Stream* pDataSetsStream = nullptr; if (iFormIndex != -1) { // Get form CPDF_Stream CPDF_Object* pFormPDFObj = pArray->GetObjectAt(iFormIndex); @@ -104,6 +103,7 @@ bool SaveXFADocumentData(CPDFXFA_Context* pContext, } } + CPDF_Stream* pDataSetsStream = nullptr; if (iDataSetsIndex != -1) { // Get datasets CPDF_Stream CPDF_Object* pDataSetsPDFObj = pArray->GetObjectAt(iDataSetsIndex); diff --git a/fpdfsdk/pwl/cpwl_icon.cpp b/fpdfsdk/pwl/cpwl_icon.cpp index 52a4464639..567a5786e6 100644 --- a/fpdfsdk/pwl/cpwl_icon.cpp +++ b/fpdfsdk/pwl/cpwl_icon.cpp @@ -49,7 +49,7 @@ std::pair CPWL_Icon::GetIconPosition() { if (!m_pIconFit) return {0.0f, 0.0f}; - CPDF_Array* pA = + const CPDF_Array* pA = m_pIconFit->GetDict() ? m_pIconFit->GetDict()->GetArrayFor("A") : nullptr; if (!pA) return {0.0f, 0.0f}; -- cgit v1.2.3