From b1ec280837cc6e1932754ef40de26d12b77aa910 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 25 May 2018 21:55:24 +0000 Subject: Add proper const/non-const versions of CPDF_Dictionary::GetDictFor(). BUG=pdfium:234 Change-Id: I6fde00c976ad4bb9cab632f465cf292f5b1da3d2 Reviewed-on: https://pdfium-review.googlesource.com/32914 Commit-Queue: Lei Zhang Reviewed-by: dsinclair --- fpdfsdk/formfiller/cba_fontmap.cpp | 10 ++++---- fpdfsdk/formfiller/cba_fontmap.h | 2 +- fpdfsdk/fpdf_edit_embeddertest.cpp | 12 ++++++---- fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp | 37 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 29 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/formfiller/cba_fontmap.cpp b/fpdfsdk/formfiller/cba_fontmap.cpp index 6b31de7b37..d219ca40b7 100644 --- a/fpdfsdk/formfiller/cba_fontmap.cpp +++ b/fpdfsdk/formfiller/cba_fontmap.cpp @@ -93,11 +93,11 @@ CPDF_Font* CBA_FontMap::FindFontSameCharset(ByteString* sFontAlias, if (!pRootDict) return nullptr; - CPDF_Dictionary* pAcroFormDict = pRootDict->GetDictFor("AcroForm"); + const CPDF_Dictionary* pAcroFormDict = pRootDict->GetDictFor("AcroForm"); if (!pAcroFormDict) return nullptr; - CPDF_Dictionary* pDRDict = pAcroFormDict->GetDictFor("DR"); + const CPDF_Dictionary* pDRDict = pAcroFormDict->GetDictFor("DR"); if (!pDRDict) return nullptr; @@ -108,13 +108,13 @@ CPDF_Document* CBA_FontMap::GetDocument() { return m_pDocument.Get(); } -CPDF_Font* CBA_FontMap::FindResFontSameCharset(CPDF_Dictionary* pResDict, +CPDF_Font* CBA_FontMap::FindResFontSameCharset(const CPDF_Dictionary* pResDict, ByteString* sFontAlias, int32_t nCharset) { if (!pResDict) return nullptr; - CPDF_Dictionary* pFonts = pResDict->GetDictFor("Font"); + const CPDF_Dictionary* pFonts = pResDict->GetDictFor("Font"); if (!pFonts) return nullptr; @@ -197,7 +197,7 @@ CPDF_Font* CBA_FontMap::GetAnnotDefaultFont(ByteString* sAlias) { CPDF_Dictionary* pAcroFormDict = nullptr; const bool bWidget = (m_pAnnotDict->GetStringFor("Subtype") == "Widget"); if (bWidget) { - const CPDF_Dictionary* pRootDict = m_pDocument->GetRoot(); + CPDF_Dictionary* pRootDict = m_pDocument->GetRoot(); if (pRootDict) pAcroFormDict = pRootDict->GetDictFor("AcroForm"); } diff --git a/fpdfsdk/formfiller/cba_fontmap.h b/fpdfsdk/formfiller/cba_fontmap.h index 45df8c82ad..9d9f2e002a 100644 --- a/fpdfsdk/formfiller/cba_fontmap.h +++ b/fpdfsdk/formfiller/cba_fontmap.h @@ -30,7 +30,7 @@ class CBA_FontMap : public CPWL_FontMap { int32_t nCharset) override; void AddedFont(CPDF_Font* pFont, const ByteString& sFontAlias) override; - CPDF_Font* FindResFontSameCharset(CPDF_Dictionary* pResDict, + CPDF_Font* FindResFontSameCharset(const CPDF_Dictionary* pResDict, ByteString* sFontAlias, int32_t nCharset); CPDF_Font* GetAnnotDefaultFont(ByteString* csNameTag); diff --git a/fpdfsdk/fpdf_edit_embeddertest.cpp b/fpdfsdk/fpdf_edit_embeddertest.cpp index ebf356af45..458ae0022a 100644 --- a/fpdfsdk/fpdf_edit_embeddertest.cpp +++ b/fpdfsdk/fpdf_edit_embeddertest.cpp @@ -38,7 +38,7 @@ class FPDFEditEmbeddertest : public EmbedderTest { bool italic, uint32_t size, const uint8_t* data) { - CPDF_Dictionary* font_desc = font_dict->GetDictFor("FontDescriptor"); + const CPDF_Dictionary* font_desc = font_dict->GetDictFor("FontDescriptor"); ASSERT_TRUE(font_desc); EXPECT_EQ("FontDescriptor", font_desc->GetStringFor("Type")); EXPECT_EQ(font_dict->GetStringFor("BaseFont"), @@ -54,7 +54,7 @@ class FPDFEditEmbeddertest : public EmbedderTest { EXPECT_TRUE(FontStyleIsNonSymbolic(font_flags)); ASSERT_TRUE(font_desc->KeyExist("FontBBox")); - CPDF_Array* fontBBox = font_desc->GetArrayFor("FontBBox"); + const CPDF_Array* fontBBox = font_desc->GetArrayFor("FontBBox"); ASSERT_TRUE(fontBBox); EXPECT_EQ(4U, fontBBox->GetCount()); // Check that the coordinates are in the preferred order according to spec @@ -75,7 +75,7 @@ class FPDFEditEmbeddertest : public EmbedderTest { EXPECT_FALSE(font_desc->KeyExist(absent)); // Check that the font stream is the one that was provided - CPDF_Stream* font_stream = font_desc->GetStreamFor(present); + const CPDF_Stream* font_stream = font_desc->GetStreamFor(present); ASSERT_EQ(size, font_stream->GetRawSize()); if (font_type == FPDF_FONT_TRUETYPE) { ASSERT_EQ(static_cast(size), @@ -1078,7 +1078,8 @@ TEST_F(FPDFEditEmbeddertest, LoadCIDType0Font) { EXPECT_EQ("Font", cidfont_dict->GetStringFor("Type")); EXPECT_EQ("CIDFontType0", cidfont_dict->GetStringFor("Subtype")); EXPECT_EQ("Times New Roman", cidfont_dict->GetStringFor("BaseFont")); - CPDF_Dictionary* cidinfo_dict = cidfont_dict->GetDictFor("CIDSystemInfo"); + const CPDF_Dictionary* cidinfo_dict = + cidfont_dict->GetDictFor("CIDSystemInfo"); ASSERT_TRUE(cidinfo_dict); EXPECT_EQ("Adobe", cidinfo_dict->GetStringFor("Registry")); EXPECT_EQ("Identity", cidinfo_dict->GetStringFor("Ordering")); @@ -1121,7 +1122,8 @@ TEST_F(FPDFEditEmbeddertest, LoadCIDType2Font) { EXPECT_EQ("Font", cidfont_dict->GetStringFor("Type")); EXPECT_EQ("CIDFontType2", cidfont_dict->GetStringFor("Subtype")); EXPECT_EQ("Arial Italic", cidfont_dict->GetStringFor("BaseFont")); - CPDF_Dictionary* cidinfo_dict = cidfont_dict->GetDictFor("CIDSystemInfo"); + const CPDF_Dictionary* cidinfo_dict = + cidfont_dict->GetDictFor("CIDSystemInfo"); ASSERT_TRUE(cidinfo_dict); EXPECT_EQ("Adobe", cidinfo_dict->GetStringFor("Registry")); EXPECT_EQ("Identity", cidinfo_dict->GetStringFor("Ordering")); diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp index cc7a8898e8..f9f5981efb 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp @@ -462,24 +462,24 @@ void CPDFXFA_DocEnvironment::ExportData(CXFA_FFDoc* hDoc, if (!pRoot) return; - CPDF_Dictionary* pAcroForm = pRoot->GetDictFor("AcroForm"); + const CPDF_Dictionary* pAcroForm = pRoot->GetDictFor("AcroForm"); if (!pAcroForm) return; - CPDF_Array* pArray = ToArray(pAcroForm->GetObjectFor("XFA")); + const CPDF_Array* pArray = ToArray(pAcroForm->GetObjectFor("XFA")); if (!pArray) return; int size = pArray->GetCount(); for (int i = 1; i < size; i += 2) { - CPDF_Object* pPDFObj = pArray->GetObjectAt(i); - CPDF_Object* pPrePDFObj = pArray->GetObjectAt(i - 1); + const CPDF_Object* pPDFObj = pArray->GetObjectAt(i); + const CPDF_Object* pPrePDFObj = pArray->GetObjectAt(i - 1); if (!pPrePDFObj->IsString()) continue; if (!pPDFObj->IsReference()) continue; - CPDF_Stream* pStream = ToStream(pPDFObj->GetDirect()); + const CPDF_Stream* pStream = ToStream(pPDFObj->GetDirect()); if (!pStream) continue; if (pPrePDFObj->GetString() == "form") { @@ -761,13 +761,13 @@ bool CPDFXFA_DocEnvironment::ExportSubmitFile(FPDF_FILEHANDLER* pFileHandler, return false; } - CPDF_Dictionary* pAcroForm = pRoot->GetDictFor("AcroForm"); + const CPDF_Dictionary* pAcroForm = pRoot->GetDictFor("AcroForm"); if (!pAcroForm) { fileStream->Flush(); return false; } - CPDF_Array* pArray = ToArray(pAcroForm->GetObjectFor("XFA")); + const CPDF_Array* pArray = ToArray(pAcroForm->GetObjectFor("XFA")); if (!pArray) { fileStream->Flush(); return false; @@ -775,32 +775,33 @@ bool CPDFXFA_DocEnvironment::ExportSubmitFile(FPDF_FILEHANDLER* pFileHandler, int size = pArray->GetCount(); for (int i = 1; i < size; i += 2) { - CPDF_Object* pPDFObj = pArray->GetObjectAt(i); - CPDF_Object* pPrePDFObj = pArray->GetObjectAt(i - 1); + const CPDF_Object* pPDFObj = pArray->GetObjectAt(i); + const CPDF_Object* pPrePDFObj = pArray->GetObjectAt(i - 1); if (!pPrePDFObj->IsString()) continue; if (!pPDFObj->IsReference()) continue; - CPDF_Object* pDirectObj = pPDFObj->GetDirect(); + const CPDF_Object* pDirectObj = pPDFObj->GetDirect(); if (!pDirectObj->IsStream()) continue; - if (pPrePDFObj->GetString() == "config" && !(flag & FXFA_CONFIG)) + ByteString bsType = pPrePDFObj->GetString(); + if (bsType == "config" && !(flag & FXFA_CONFIG)) continue; - if (pPrePDFObj->GetString() == "template" && !(flag & FXFA_TEMPLATE)) + if (bsType == "template" && !(flag & FXFA_TEMPLATE)) continue; - if (pPrePDFObj->GetString() == "localeSet" && !(flag & FXFA_LOCALESET)) + if (bsType == "localeSet" && !(flag & FXFA_LOCALESET)) continue; - if (pPrePDFObj->GetString() == "datasets" && !(flag & FXFA_DATASETS)) + if (bsType == "datasets" && !(flag & FXFA_DATASETS)) continue; - if (pPrePDFObj->GetString() == "xmpmeta" && !(flag & FXFA_XMPMETA)) + if (bsType == "xmpmeta" && !(flag & FXFA_XMPMETA)) continue; - if (pPrePDFObj->GetString() == "xfdf" && !(flag & FXFA_XFDF)) + if (bsType == "xfdf" && !(flag & FXFA_XFDF)) continue; - if (pPrePDFObj->GetString() == "form" && !(flag & FXFA_FORM)) + if (bsType == "form" && !(flag & FXFA_FORM)) continue; - if (pPrePDFObj->GetString() == "form") { + if (bsType == "form") { ffdoc->SavePackage( ToNode(ffdoc->GetXFADoc()->GetXFAObject(XFA_HASHCODE_Form)), fileStream); -- cgit v1.2.3