summaryrefslogtreecommitdiff
path: root/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2015-10-26 16:14:23 -0400
committerDan Sinclair <dsinclair@chromium.org>2015-10-26 16:14:23 -0400
commit85361b227ad6786d2aeef8409b79a8d077a26ee9 (patch)
treefe1ecb088ee13e6a8104183d4777d8fd3e216771 /core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
parent6ee3484bcb413f4cce303e237fe15e2bdaf51ade (diff)
downloadpdfium-85361b227ad6786d2aeef8409b79a8d077a26ee9.tar.xz
Make m_pShadingObj a CPDF_Stream instead of CPDF_Object.
This object is required to be a stream and was being converted as such. With the new type checking this caused us to pass a nullptr where previously we'd have, incorrectly, cast a CPDF_Dictionary to a CPDF_Stream. This CL changes the m_pShadingObj to always be a CPDF_Stream. Then, we never go down the bad code path because we check if m_pShadingObj is nullptr earlier and bail out. BUG=chromium:547706 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1426713002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp')
-rw-r--r--core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp14
1 files changed, 6 insertions, 8 deletions
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) {