[Libreoffice-commits] core.git: Branch 'feature/skia' - vcl/skia

[Tomaž Vajngerl (via logerrit)]

 vcl/skia/gdiimpl.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 8242c0112f6f6866be7396dc0057b93d76136164
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Wed Oct 23 22:32:04 2019 +0200
Commit:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Wed Oct 23 22:32:04 2019 +0200

    skia: redirect drawBitmap with bitmap + mask to drawAlphaBitmap
    
    Change-Id: I5dc62f9d6222447083b027d5ff3da1582ff4ef01

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 1ae116c1fd29..a7ba9233d654 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -632,10 +632,7 @@ void SkiaSalGraphicsImpl::drawBitmap(const SalTwoRect& rPosAry, const SalBitmap&
 void SkiaSalGraphicsImpl::drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap,
                                      const SalBitmap& rMaskBitmap)
 {
-    (void)rPosAry;
-    (void)rSalBitmap;
-    (void)rMaskBitmap;
-    abort();
+    drawAlphaBitmap(rPosAry, rSalBitmap, rMaskBitmap);
 }
 
 void SkiaSalGraphicsImpl::drawMask(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap,