core/src/fpdfapi/fpdf_render/fpdf_render.cpp - Issue 1243953004: Re-land else-after-returns

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.cpp

Issue 1243953004: Re-land else-after-returns (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: 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:

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

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

index 12f60632fce465984fade58ccb09d326b6ffc0c4..f8b59913e474f169e8585e667370ad75fd9f9dc5 100644

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

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

@@ -551,7 +551,8 @@ FX_ARGB CPDF_RenderStatus::GetFillArgb(const CPDF_PageObject* pObj, FX_BOOL bTyp

CPDF_ColorStateData* pColorData = (CPDF_ColorStateData*)(const CPDF_ColorStateData*)pObj->m_ColorState;

if (m_pType3Char && !bType3 && (!m_pType3Char->m_bColored || (m_pType3Char->m_bColored && (!pColorData || pColorData->m_FillColor.IsNull())))) {

return m_T3FillColor;

- } else if (!pColorData || pColorData->m_FillColor.IsNull()) {

+ }

+ if (!pColorData || pColorData->m_FillColor.IsNull()) {

pColorData = (CPDF_ColorStateData*)(const CPDF_ColorStateData*)m_InitialStates.m_ColorState;

}

FX_COLORREF rgb = pColorData->m_FillRGB;

@@ -580,7 +581,8 @@ FX_ARGB CPDF_RenderStatus::GetStrokeArgb(const CPDF_PageObject* pObj) const

CPDF_ColorStateData* pColorData = (CPDF_ColorStateData*)(const CPDF_ColorStateData*)pObj->m_ColorState;

if (m_pType3Char && (!m_pType3Char->m_bColored || (m_pType3Char->m_bColored && (!pColorData || pColorData->m_StrokeColor.IsNull())))) {

return m_T3FillColor;

- } else if (!pColorData || pColorData->m_StrokeColor.IsNull()) {

+ }

+ if (!pColorData || pColorData->m_StrokeColor.IsNull()) {

pColorData = (CPDF_ColorStateData*)(const CPDF_ColorStateData*)m_InitialStates.m_ColorState;

}

FX_COLORREF rgb = pColorData->m_StrokeRGB;