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 /xfa/fde | |
| 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 'xfa/fde')
| -rw-r--r-- | xfa/fde/cfde_renderdevice.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fde/cfde_renderdevice.cpp b/xfa/fde/cfde_renderdevice.cpp index 6f2431737b..839ffac019 100644 --- a/xfa/fde/cfde_renderdevice.cpp +++ b/xfa/fde/cfde_renderdevice.cpp @@ -13,6 +13,7 @@ #include "core/fxge/cfx_graphstatedata.h" #include "core/fxge/cfx_renderdevice.h" #include "core/fxge/cfx_substfont.h" +#include "core/fxge/dib/cfx_imagerenderer.h" #include "xfa/fde/cfde_brush.h" #include "xfa/fde/cfde_path.h" #include "xfa/fde/cfde_pen.h" @@ -111,12 +112,11 @@ bool CFDE_RenderDevice::DrawImage(const CFX_RetainPtr<CFX_DIBSource>& pDib, if (pDevMatrix) { dib2fxdev.Concat(*pDevMatrix); } - void* handle = nullptr; + std::unique_ptr<CFX_ImageRenderer> handle; m_pDevice->StartDIBits(pDib, 255, 0, (const CFX_Matrix*)&dib2fxdev, 0, - handle); - while (m_pDevice->ContinueDIBits(handle, nullptr)) { + &handle); + while (m_pDevice->ContinueDIBits(handle.get(), nullptr)) { } - m_pDevice->CancelDIBits(handle); return !!handle; } |