From e0ad6a4af5d9c5f5671a9ecd0aa437dedae52b16 Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 15 Apr 2016 14:32:49 -0700 Subject: Avoid narrowing to StringC in CPDF_Name and CPDF_NameTree Remove redundant CPDF_Name constructors given promotion rules. Rework one char* in CPDF_PageContentGenerator. Review URL: https://codereview.chromium.org/1890973006 --- core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp | 8 ++++---- core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'core/fpdfapi/fpdf_edit') diff --git a/core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp b/core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp index 20fd1959f2..08bdb5bb07 100644 --- a/core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp +++ b/core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp @@ -58,22 +58,22 @@ void CPDF_PageContentGenerator::GenerateContent() { } CFX_ByteString CPDF_PageContentGenerator::RealizeResource( CPDF_Object* pResourceObj, - const FX_CHAR* szType) { + const CFX_ByteString& bsType) { if (!m_pPage->m_pResources) { m_pPage->m_pResources = new CPDF_Dictionary; int objnum = m_pDocument->AddIndirectObject(m_pPage->m_pResources); m_pPage->m_pFormDict->SetAtReference("Resources", m_pDocument, objnum); } - CPDF_Dictionary* pResList = m_pPage->m_pResources->GetDictBy(szType); + CPDF_Dictionary* pResList = m_pPage->m_pResources->GetDictBy(bsType); if (!pResList) { pResList = new CPDF_Dictionary; - m_pPage->m_pResources->SetAt(szType, pResList); + m_pPage->m_pResources->SetAt(bsType, pResList); } m_pDocument->AddIndirectObject(pResourceObj); CFX_ByteString name; int idnum = 1; while (1) { - name.Format("FX%c%d", szType[0], idnum); + name.Format("FX%c%d", bsType[0], idnum); if (!pResList->KeyExist(name)) { break; } diff --git a/core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h b/core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h index 564a9ff54c..f60b083be1 100644 --- a/core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h +++ b/core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h @@ -32,7 +32,7 @@ class CPDF_PageContentGenerator { uint32_t size, CFX_Matrix& matrix); CFX_ByteString RealizeResource(CPDF_Object* pResourceObj, - const FX_CHAR* szType); + const CFX_ByteString& bsType); CPDF_Page* m_pPage; CPDF_Document* m_pDocument; -- cgit v1.2.3