diff options
author | caryclark <caryclark@google.com> | 2016-06-29 12:10:50 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-06-29 12:10:50 -0700 |
commit | 1e62a254e6a9ad8c6f18a8def3d104e0fe98a2e2 (patch) | |
tree | eb80db712833301ec435c93b9273f24d769259b9 /core/fpdfapi/fpdf_render/fpdf_render_image.cpp | |
parent | e89391e2cbec0788d39985df9c0967dd467cbfa8 (diff) | |
download | pdfium-1e62a254e6a9ad8c6f18a8def3d104e0fe98a2e2.tar.xz |
fix skia unit tests
Add checks to pass unit tests.
R=thestig@chromium.org,dsinclair@chromium.org
BUG=pdfium:525, pdfium:526, pdfium:527, pdfium:528, pdfium:529
Review-Url: https://codereview.chromium.org/2111553003
Diffstat (limited to 'core/fpdfapi/fpdf_render/fpdf_render_image.cpp')
-rw-r--r-- | core/fpdfapi/fpdf_render/fpdf_render_image.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp index 272c779fe8..10fd5f3f15 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp @@ -27,6 +27,10 @@ #include "core/fxcrt/include/fx_safe_types.h" #include "core/fxge/include/fx_ge.h" +#ifdef _SKIA_SUPPORT_ +#include "core/fxge/skia/fx_skia_device.h" +#endif + FX_BOOL CPDF_RenderStatus::ProcessImage(const CPDF_ImageObject* pImageObj, const CFX_Matrix* pObj2Device) { CPDF_ImageRenderer render; @@ -58,6 +62,10 @@ void CPDF_RenderStatus::CompositeDIBitmap(CFX_DIBitmap* pDIBitmap, pDIBitmap->MultiplyAlpha(bitmap_alpha); #endif } +#ifdef _SKIA_SUPPORT_ + static_cast<CFX_SkiaDeviceDriver*>(m_pDevice->GetDeviceDriver()) + ->PreMultiply(pDIBitmap); +#endif if (m_pDevice->SetDIBits(pDIBitmap, left, top)) { return; } @@ -920,7 +928,7 @@ CFX_DIBitmap* CPDF_RenderStatus::LoadSMask(CPDF_Dictionary* pSMaskDict, int width = pClipRect->right - pClipRect->left; int height = pClipRect->bottom - pClipRect->top; FXDIB_Format format; -#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || defined _SKIA_SUPPORT_ format = bLuminosity ? FXDIB_Rgb32 : FXDIB_8bppMask; #else format = bLuminosity ? FXDIB_Rgb : FXDIB_8bppMask; |