diff options
Diffstat (limited to 'core/src')
4 files changed, 27 insertions, 14 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; diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp index 4ed6c07675..015f1a3166 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp @@ -881,20 +881,18 @@ void CPDF_RenderStatus::DrawShading(CPDF_ShadingPattern* pPattern, pColorSpace, alpha); break; case 4: { - DrawFreeGouraudShading(pBitmap, &FinalMatrix, - ToStream(pPattern->m_pShadingObj), pFuncs, nFuncs, - pColorSpace, alpha); + DrawFreeGouraudShading(pBitmap, &FinalMatrix, pPattern->m_pShadingObj, + pFuncs, nFuncs, pColorSpace, alpha); } break; case 5: { - DrawLatticeGouraudShading(pBitmap, &FinalMatrix, - ToStream(pPattern->m_pShadingObj), pFuncs, - nFuncs, pColorSpace, alpha); + DrawLatticeGouraudShading(pBitmap, &FinalMatrix, pPattern->m_pShadingObj, + pFuncs, nFuncs, pColorSpace, alpha); } break; case 6: case 7: { DrawCoonPatchMeshes(pPattern->m_ShadingType - 6, pBitmap, &FinalMatrix, - ToStream(pPattern->m_pShadingObj), pFuncs, nFuncs, - pColorSpace, fill_mode, alpha); + pPattern->m_pShadingObj, pFuncs, nFuncs, pColorSpace, + fill_mode, alpha); } break; } if (bAlphaMode) { diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp new file mode 100644 index 0000000000..30d7a416be --- /dev/null +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp @@ -0,0 +1,16 @@ +// Copyright 2015 PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "../../../testing/embedder_test.h" +#include "testing/gtest/include/gtest/gtest.h" + +class FPDFRenderPatternEmbeddertest : public EmbedderTest {}; + +TEST_F(FPDFRenderPatternEmbeddertest, LoadError_547706) { + // Test shading where object is a dictionary instead of a stream. + EXPECT_TRUE(OpenDocument("testing/resources/bug_547706.pdf")); + FPDF_PAGE page = LoadPage(0); + RenderPage(page); + UnloadPage(page); +} |