core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp - Issue 1701073002: Split CPDF_PageObjectHolder off from CPDF_PageObjectList

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_render/fpdf_render_text.cpp

Issue 1701073002: Split CPDF_PageObjectHolder off from CPDF_PageObjectList (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: m_pPage can never be null, remove checks. Created 4 years, 10 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:

Index: core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp

diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp

index d0427f68fa5bb84d3ec2e1061157093a9f72c422..7e2c0bd0fdbdcc98e2e2007acb05edfe6ba496c1 100644

--- a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp

+++ b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp

@@ -316,9 +316,9 @@ FX_BOOL CPDF_Type3Char::LoadBitmap(CPDF_RenderContext* pContext) {

if (m_pBitmap || !m_pForm) {

return TRUE;

}

- if (m_pForm->CountObjects() == 1 && !m_bColored) {

- CPDF_PageObject* pPageObj =

- m_pForm->GetObjectAt(m_pForm->GetFirstObjectPosition());

+ if (m_pForm->GetPageObjectList()->GetCount() == 1 && !m_bColored) {

+ CPDF_PageObject* pPageObj = m_pForm->GetPageObjectList()->GetObjectAt(

+ m_pForm->GetPageObjectList()->GetHeadPosition());

if (pPageObj->m_Type == CPDF_PageObject::IMAGE) {

CPDF_ImageObject* pImage = (CPDF_ImageObject*)pPageObj;

m_ImageMatrix = pImage->m_Matrix;