diff options
| author | thestig <thestig@chromium.org> | 2016-04-26 11:46:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-26 11:46:02 -0700 |
| commit | 5cc24654fb345189140acb4711ff981e1c720951 (patch) | |
| tree | 1e9e11a9136363e2b330ffbbce6fdf9e3827b5b1 /core/fpdfapi/fpdf_render/fpdf_render_image.cpp | |
| parent | 76c53794b6202ec37f6dcace5f2ae86870e953b6 (diff) | |
| download | pdfium-5cc24654fb345189140acb4711ff981e1c720951.tar.xz | |
Clean up CPDF_Page.
- Merge CPDF_Page::Load() into ctor.
- Remove always nullptr param for CPDF_Page::ParseContent().
- Remove unneeded indirection in IPDF_RenderModule.
- Delete CPDF_ParseOptions.
- Fix up CPDF_Pattern.
Review URL: https://codereview.chromium.org/1918113002
Diffstat (limited to 'core/fpdfapi/fpdf_render/fpdf_render_image.cpp')
| -rw-r--r-- | core/fpdfapi/fpdf_render/fpdf_render_image.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp index ec8a784623..aedf8036cb 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp @@ -9,7 +9,6 @@ #include <utility> #include <vector> -#include "core/fpdfapi/fpdf_page/cpdf_parseoptions.h" #include "core/fpdfapi/fpdf_page/cpdf_shadingpattern.h" #include "core/fpdfapi/fpdf_page/cpdf_tilingpattern.h" #include "core/fpdfapi/fpdf_page/include/cpdf_form.h" @@ -534,14 +533,13 @@ FX_BOOL CPDF_ImageRenderer::DrawPatternImage(const CFX_Matrix* pObj2Device) { m_pRenderStatus->m_bDropObjects, NULL, TRUE); CFX_Matrix patternDevice = *pObj2Device; patternDevice.Translate((FX_FLOAT)-rect.left, (FX_FLOAT)-rect.top); - if (m_pPattern->m_PatternType == CPDF_Pattern::TILING) { - bitmap_render.DrawTilingPattern( - static_cast<CPDF_TilingPattern*>(m_pPattern), m_pImageObject, - &patternDevice, FALSE); - } else { - bitmap_render.DrawShadingPattern( - static_cast<CPDF_ShadingPattern*>(m_pPattern), m_pImageObject, - &patternDevice, FALSE); + if (CPDF_TilingPattern* pTilingPattern = m_pPattern->AsTilingPattern()) { + bitmap_render.DrawTilingPattern(pTilingPattern, m_pImageObject, + &patternDevice, FALSE); + } else if (CPDF_ShadingPattern* pShadingPattern = + m_pPattern->AsShadingPattern()) { + bitmap_render.DrawShadingPattern(pShadingPattern, m_pImageObject, + &patternDevice, FALSE); } } { @@ -894,7 +892,7 @@ CFX_DIBitmap* CPDF_RenderStatus::LoadSMask(CPDF_Dictionary* pSMaskDict, CPDF_Form form(m_pContext->GetDocument(), m_pContext->GetPageResources(), pGroup); - form.ParseContent(NULL, NULL, NULL, NULL); + form.ParseContent(nullptr, nullptr, nullptr); CFX_FxgeDevice bitmap_device; FX_BOOL bLuminosity = pSMaskDict->GetStringBy("S") != "Alpha"; |