| Index: core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
|
| diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
|
| index 805d648a24162a4709492a35e360fcbb472b25bf..8d3f5b8859655b66468dd21e59a57ff688350c42 100644
|
| --- a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
|
| +++ b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
|
| @@ -808,7 +808,7 @@ void CPDF_StreamContentParser::Handle_MarkPlace_Dictionary() {}
|
| void CPDF_StreamContentParser::Handle_EndImage() {}
|
|
|
| void CPDF_StreamContentParser::Handle_EndMarkedContent() {
|
| - if (m_CurContentMark.IsNull())
|
| + if (!m_CurContentMark)
|
| return;
|
|
|
| int count = m_CurContentMark.GetObject()->CountItems();
|
| @@ -1103,7 +1103,7 @@ void CPDF_StreamContentParser::Handle_ShadeFill() {
|
| pObj->m_Matrix = m_pCurStates->m_CTM;
|
| pObj->m_Matrix.Concat(m_mtContentToUser);
|
| CFX_FloatRect bbox =
|
| - pObj->m_ClipPath.IsNull() ? m_BBox : pObj->m_ClipPath.GetClipBox();
|
| + pObj->m_ClipPath ? pObj->m_ClipPath.GetClipBox() : m_BBox;
|
| if (pShading->IsMeshShading())
|
| bbox.Intersect(GetShadingBBox(pShading, pObj->m_Matrix));
|
| pObj->m_Left = bbox.left;
|
|
|