From 14094f22d9a7bfde8673689218a88d6feb02f3ee Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 28 Mar 2018 17:02:46 +0000 Subject: Remove ByteString PDF_NameDecode This CL removes the ByteString version of PDF_NameDecode and forces the callers to use the ByteStringView variant. Change-Id: I5a955d8e909e2045ee45843af54b23e98abe00ed Reviewed-on: https://pdfium-review.googlesource.com/29350 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- core/fpdfdoc/cpdf_defaultappearance.cpp | 2 +- core/fpdfdoc/cpdf_interform.cpp | 2 +- core/fpdfdoc/cpvt_generateap.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'core/fpdfdoc') diff --git a/core/fpdfdoc/cpdf_defaultappearance.cpp b/core/fpdfdoc/cpdf_defaultappearance.cpp index ba0679a19a..cae553a7c2 100644 --- a/core/fpdfdoc/cpdf_defaultappearance.cpp +++ b/core/fpdfdoc/cpdf_defaultappearance.cpp @@ -32,7 +32,7 @@ ByteString CPDF_DefaultAppearance::GetFont(float* fFontSize) { csFontNameTag.Delete(0, 1); *fFontSize = FX_atof(syntax.GetWord()); } - return PDF_NameDecode(csFontNameTag); + return PDF_NameDecode(csFontNameTag.AsStringView()); } bool CPDF_DefaultAppearance::HasColor() { diff --git a/core/fpdfdoc/cpdf_interform.cpp b/core/fpdfdoc/cpdf_interform.cpp index ac15aa66cc..c16c36ef3d 100644 --- a/core/fpdfdoc/cpdf_interform.cpp +++ b/core/fpdfdoc/cpdf_interform.cpp @@ -101,7 +101,7 @@ void InitDict(CPDF_Dictionary*& pFormDict, CPDF_Document* pDocument) { CPDF_Font* GetFont(CPDF_Dictionary* pFormDict, CPDF_Document* pDocument, const ByteString& csNameTag) { - ByteString csAlias = PDF_NameDecode(csNameTag); + ByteString csAlias = PDF_NameDecode(csNameTag.AsStringView()); if (!pFormDict || csAlias.IsEmpty()) return nullptr; diff --git a/core/fpdfdoc/cpvt_generateap.cpp b/core/fpdfdoc/cpvt_generateap.cpp index e2fbcc9720..4138b21a6b 100644 --- a/core/fpdfdoc/cpvt_generateap.cpp +++ b/core/fpdfdoc/cpvt_generateap.cpp @@ -925,7 +925,7 @@ void CPVT_GenerateAP::GenerateFormAP(Type type, CPDF_SimpleParser syntax(DA.AsStringView()); syntax.FindTagParamFromStart("Tf", 2); ByteString sFontName(syntax.GetWord()); - sFontName = PDF_NameDecode(sFontName); + sFontName = PDF_NameDecode(sFontName.AsStringView()); if (sFontName.IsEmpty()) return; -- cgit v1.2.3