2 files changed, 5 insertions, 6 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp
index b12a65a844..bd4319df11 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp
+++ b/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp
@@ -1128,10 +1128,9 @@ void CPDF_StreamContentParser::Handle_ShadeFill() {
     bbox = m_BBox;
   }
   if (pShading->m_ShadingType >= 4) {
-    bbox.Intersect(_GetShadingBBox(ToStream(pShading->m_pShadingObj),
-                                   pShading->m_ShadingType, &pObj->m_Matrix,
-                                   pShading->m_pFunctions, pShading->m_nFuncs,
-                                   pShading->m_pCS));
+    bbox.Intersect(_GetShadingBBox(
+        pShading->m_pShadingObj, pShading->m_ShadingType, &pObj->m_Matrix,
+        pShading->m_pFunctions, pShading->m_nFuncs, pShading->m_pCS));
   }
   pObj->m_Left = bbox.left;
   pObj->m_Right = bbox.right;
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp
index 7b04d8cd33..d06f481138 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp
+++ b/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp
@@ -71,12 +71,12 @@ CPDF_ShadingPattern::CPDF_ShadingPattern(CPDF_Document* pDoc,
     CPDF_Dictionary* pDict = m_pPatternObj->GetDict();
     ASSERT(pDict != NULL);
     m_Pattern2Form = pDict->GetMatrix(FX_BSTRC("Matrix"));
-    m_pShadingObj = pDict->GetElementValue(FX_BSTRC("Shading"));
+    m_pShadingObj = ToStream(pDict->GetElementValue(FX_BSTRC("Shading")));
     if (parentMatrix) {
       m_Pattern2Form.Concat(*parentMatrix);
     }
   } else {
-    m_pShadingObj = pPatternObj;
+    m_pShadingObj = ToStream(pPatternObj);
   }
   m_ShadingType = 0;
   m_pCS = NULL;