| 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;
|
|
|