core/src/fpdfapi/fpdf_font/fpdf_font_cid.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_cid.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_font/fpdf_font.cpp ('k') | core/src/fpdfapi/fpdf_page/fpdf_page.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_cid.cpp

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

index 7dd019da8570fbf4902707fcea8fcd252202f086..3bb22deb302d6d3242c790f162c6d82e535d1be7 100644

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

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

@@ -872,7 +872,7 @@ static void FT_UseCIDCharmap(FXFT_Face face, int coding)

}

FX_BOOL CPDF_CIDFont::_Load()

{

- if (m_pFontDict->GetString(FX_BSTRC("Subtype")) == FX_BSTRC("TrueType")) {

+ if (m_pFontDict->GetStringAt("Subtype") == "TrueType") {

return LoadGB2312();

}

CPDF_Array* pFonts = m_pFontDict->GetArray(FX_BSTRC("DescendantFonts"));

@@ -886,7 +886,7 @@ FX_BOOL CPDF_CIDFont::_Load()

if (pCIDFontDict == NULL) {

return FALSE;

}

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

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

if ((m_BaseFont.Compare("CourierStd") == 0 || m_BaseFont.Compare("CourierStd-Bold") == 0

|| m_BaseFont.Compare("CourierStd-BoldOblique") == 0 || m_BaseFont.Compare("CourierStd-Oblique") == 0)

&& !IsEmbedded()) {

@@ -900,7 +900,7 @@ FX_BOOL CPDF_CIDFont::_Load()

if (pEncoding == NULL) {

return FALSE;

}

- CFX_ByteString subtype = pCIDFontDict->GetString(FX_BSTRC("Subtype"));

+ CFX_ByteString subtype = pCIDFontDict->GetStringAt("Subtype");

m_bType1 = FALSE;

if (subtype == FX_BSTRC("CIDFontType0")) {

m_bType1 = TRUE;

@@ -925,7 +925,7 @@ FX_BOOL CPDF_CIDFont::_Load()

if (m_Charset == CIDSET_UNKNOWN) {

CPDF_Dictionary* pCIDInfo = pCIDFontDict->GetDict(FX_BSTRC("CIDSystemInfo"));

if (pCIDInfo) {

- m_Charset = _CharsetFromOrdering(pCIDInfo->GetString(FX_BSTRC("Ordering")));

+ m_Charset = _CharsetFromOrdering(pCIDInfo->GetStringAt("Ordering"));

}

if (m_Charset != CIDSET_UNKNOWN)

@@ -1390,7 +1390,7 @@ void CPDF_CIDFont::LoadMetricsArray(CPDF_Array* pArray, CFX_DWordArray& result,

}

FX_BOOL CPDF_CIDFont::LoadGB2312()

{

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

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

CPDF_Dictionary* pFontDesc = m_pFontDict->GetDict(FX_BSTRC("FontDescriptor"));

if (pFontDesc) {

LoadFontDescriptor(pFontDesc);