diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-10-25 19:28:10 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-10-25 19:28:10 +0000 |
| commit | 5ada7bcf1f200eaa8d78ea2c74233b6b54f6d5f5 (patch) | |
| tree | d30f97e0b55be2a3ca3b720e80e075d36f11e941 /core/fpdfapi | |
| parent | 0c327657fb8c23934c5beae520e7a97a48e2eef6 (diff) | |
| download | pdfium-5ada7bcf1f200eaa8d78ea2c74233b6b54f6d5f5.tar.xz | |
Change StartDIBits() to take a matrix by reference.
In RenderDeviceDriverIface and related classes, and for related methods
in the call stack.
Change-Id: I420fafe70084eb3941dffc6f9f51ecbed79581de
Reviewed-on: https://pdfium-review.googlesource.com/c/44552
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi')
| -rw-r--r-- | core/fpdfapi/render/cpdf_imagerenderer.cpp | 4 | ||||
| -rw-r--r-- | core/fpdfapi/render/cpdf_renderstatus.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/fpdfapi/render/cpdf_imagerenderer.cpp b/core/fpdfapi/render/cpdf_imagerenderer.cpp index 03e00a2554..c937ee68bb 100644 --- a/core/fpdfapi/render/cpdf_imagerenderer.cpp +++ b/core/fpdfapi/render/cpdf_imagerenderer.cpp @@ -382,7 +382,7 @@ bool CPDF_ImageRenderer::StartDIBBase() { if (m_pDIBBase->HasAlpha()) CFX_SkiaDeviceDriver::PreMultiply(premultiplied); if (m_pRenderStatus->GetRenderDevice()->StartDIBitsWithBlend( - premultiplied, m_BitmapAlpha, m_FillArgb, &m_ImageMatrix, m_Flags, + premultiplied, m_BitmapAlpha, m_FillArgb, m_ImageMatrix, m_Flags, &m_DeviceHandle, m_BlendType)) { if (m_DeviceHandle) { m_Status = 3; @@ -392,7 +392,7 @@ bool CPDF_ImageRenderer::StartDIBBase() { } #else if (m_pRenderStatus->GetRenderDevice()->StartDIBitsWithBlend( - m_pDIBBase, m_BitmapAlpha, m_FillArgb, &m_ImageMatrix, m_Flags, + m_pDIBBase, m_BitmapAlpha, m_FillArgb, m_ImageMatrix, m_Flags, &m_DeviceHandle, m_BlendType)) { if (m_DeviceHandle) { m_Status = 3; diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp index b409203a54..691cdb408c 100644 --- a/core/fpdfapi/render/cpdf_renderstatus.cpp +++ b/core/fpdfapi/render/cpdf_renderstatus.cpp @@ -2392,7 +2392,7 @@ void CPDF_RenderStatus::CompositeDIBitmap( 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); |