From 77ead3d8c01b3663b0ff701a934f10b602252412 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sat, 9 Jul 2022 10:58:11 +0200 Subject: [PATCH] tdf#149890 SVG: pattern is displayed with black fill regression from commit 3cbe3a0259bea4dec70e72191ec3c03441926a07 Author: Noel Grandin Date: Mon Jun 14 15:05:59 2021 +0200 tdf#101083 speed up SVG rendering with pattern fill Change-Id: Ifabe5dd0de92c3b27033c49af5713bc5825d10c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136912 Tested-by: Jenkins Reviewed-by: Noel Grandin --- drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index ac27fa59dc70..df2642c9fdbe 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -1286,7 +1286,9 @@ void VclPixelProcessor2D::processPatternFillPrimitive2D( { mpOutputDevice->Push(vcl::PushFlags::CLIPREGION); mpOutputDevice->IntersectClipRegion(vcl::Region(aMask)); - mpOutputDevice->DrawWallpaper(aMaskRect, Wallpaper(aTileImage)); + Wallpaper aWallpaper(aTileImage); + aWallpaper.SetColor(COL_TRANSPARENT); + mpOutputDevice->DrawWallpaper(aMaskRect, aWallpaper); mpOutputDevice->Pop(); return; } @@ -1309,7 +1311,11 @@ void VclPixelProcessor2D::processPatternFillPrimitive2D( mpOutputDevice->DrawRect(aMaskRect); } else - mpOutputDevice->DrawWallpaper(aMaskRect, Wallpaper(aTileImage)); + { + Wallpaper aWallpaper(aTileImage); + aWallpaper.SetColor(COL_TRANSPARENT); + mpOutputDevice->DrawWallpaper(aMaskRect, aWallpaper); + } // back to old OutDev mpOutputDevice = pLastOutputDevice; -- 2.11.4.GIT