diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-04-04 13:38:29 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-04 18:21:06 +0000 |
| commit | c3202a95773d7a2c95038ad45c5ba2c9e095e67b (patch) | |
| tree | 4742e65e173bbfec56a10b249abee6d9934047bd /core/fpdfapi/render/cpdf_renderstatus.cpp | |
| parent | 6088612c21898eb79cfbde401984176dd94c385c (diff) | |
| download | pdfium-c3202a95773d7a2c95038ad45c5ba2c9e095e67b.tar.xz | |
Let CPDF_ImageRenderer own the CFX_ImageRenderer
This CL avoids some void* usage and removes CancelDIBits after making a
CPDF_ImageRenderer own its CFX_ImageRenderer.
Bug: pdfium:686
Change-Id: Ied205c57a858cc14d8e2c592db3444ed465b2796
Reviewed-on: https://pdfium-review.googlesource.com/3673
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'core/fpdfapi/render/cpdf_renderstatus.cpp')
| -rw-r--r-- | core/fpdfapi/render/cpdf_renderstatus.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp index 09e5bc1433..985d6ce8c5 100644 --- a/core/fpdfapi/render/cpdf_renderstatus.cpp +++ b/core/fpdfapi/render/cpdf_renderstatus.cpp @@ -2424,10 +2424,10 @@ void CPDF_RenderStatus::CompositeDIBitmap( if (!pDIBitmap->IsAlphaMask()) { if (bitmap_alpha < 255) { #ifdef _SKIA_SUPPORT_ - void* dummy; + std::unique_ptr<CFX_ImageRenderer> dummy; CFX_Matrix m(pDIBitmap->GetWidth(), 0, 0, -pDIBitmap->GetHeight(), left, top + pDIBitmap->GetHeight()); - m_pDevice->StartDIBits(pDIBitmap, bitmap_alpha, 0, &m, 0, dummy); + m_pDevice->StartDIBits(pDIBitmap, bitmap_alpha, 0, &m, 0, &dummy); return; #else pDIBitmap->MultiplyAlpha(bitmap_alpha); |