core/src/fpdfapi/fpdf_font/fpdf_font.cpp - Issue 1194933003: Make CPDF_Object::GetString() a virtual method.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: core/src/fpdfapi/fpdf_font/fpdf_font.cpp

Issue 1194933003: Make CPDF_Object::GetString() a virtual method. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master

Patch Set: rebase Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« core/include/fpdfapi/fpdf_objects.h ('K') | « core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp ('k') | core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp » ('j') | core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: core/src/fpdfapi/fpdf_font/fpdf_font.cpp

diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp

index e7072e8d55ea34c54bc629ef7a72aeec01c4e8cb..4b3670727a5a066da404b9bfe6a226cce298aab9 100644

--- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp

+++ b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp

@@ -421,12 +421,12 @@ const uint8_t ChineseFontNames[][5] = {

};

CPDF_Font* CPDF_Font::CreateFontF(CPDF_Document* pDoc, CPDF_Dictionary* pFontDict)

{

- CFX_ByteString type = pFontDict->GetString(FX_BSTRC("Subtype"));

+ CFX_ByteString type = pFontDict->GetStringAt("Subtype");

CPDF_Font* pFont;

if (type == FX_BSTRC("TrueType")) {

{

#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ || _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ || _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_ || _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_

- CFX_ByteString basefont = pFontDict->GetString(FX_BSTRC("BaseFont"));

+ CFX_ByteString basefont = pFontDict->GetStringAt("BaseFont");

CFX_ByteString tag = basefont.Left(4);

int i;

int count = sizeof(ChineseFontNames) / sizeof(ChineseFontNames[0]);

@@ -471,8 +471,8 @@ FX_BOOL CPDF_Font::Load()

if (m_pFontDict == NULL) {

return FALSE;

}

- CFX_ByteString type = m_pFontDict->GetString(FX_BSTRC("Subtype"));

- m_BaseFont = m_pFontDict->GetString(FX_BSTRC("BaseFont"));

+ CFX_ByteString type = m_pFontDict->GetStringAt("Subtype");

+ m_BaseFont = m_pFontDict->GetStringAt("BaseFont");

if (type == FX_BSTRC("MMType1")) {

type = FX_BSTRC("Type1");

}

@@ -773,7 +773,7 @@ void CPDF_Font::LoadPDFEncoding(CPDF_Object* pEncoding, int& iBaseEncoding, CFX_

}

CPDF_Dictionary* pDict = (CPDF_Dictionary*)pEncoding;

if (iBaseEncoding != PDFFONT_ENCODING_ADOBE_SYMBOL && iBaseEncoding != PDFFONT_ENCODING_ZAPFDINGBATS) {

- CFX_ByteString bsEncoding = pDict->GetString(FX_BSTRC("BaseEncoding"));

+ CFX_ByteString bsEncoding = pDict->GetStringAt("BaseEncoding");

if (bsEncoding.Compare(FX_BSTRC("MacExpertEncoding")) == 0 && bTrueType) {

bsEncoding = FX_BSTRC("WinAnsiEncoding");

}