[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/headless

Jan Holesovsky (via logerrit) logerrit at kemper.freedesktop.org
Mon Dec 9 20:19:10 UTC 2019


 vcl/headless/svpgdi.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1e2eb3816794117b09496be58230ceb292bc547d
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Thu Dec 5 11:05:39 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Dec 9 21:18:24 2019 +0100

    drawPixel() should still get 'true' for bXorModeAllowed.
    
    That part of 7b267be4b2c87b2c3987d4d751307977a7d3ad41 was not necessary.
    
    Change-Id: Ie085f635d4adb6f574f3eca37976f9aded505524
    Reviewed-on: https://gerrit.libreoffice.org/84536
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 0fd0ecd751e0..7b2286d6d9a5 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -718,7 +718,7 @@ void SvpSalGraphics::drawPixel( long nX, long nY )
 
 void SvpSalGraphics::drawPixel( long nX, long nY, Color aColor )
 {
-    cairo_t* cr = getCairoContext(false);
+    cairo_t* cr = getCairoContext(true);
     clipRegion(cr);
 
     cairo_rectangle(cr, nX, nY, 1, 1);
@@ -726,7 +726,7 @@ void SvpSalGraphics::drawPixel( long nX, long nY, Color aColor )
     cairo_fill(cr);
 
     basegfx::B2DRange extents = getClippedFillDamage(cr);
-    releaseCairoContext(cr, false, extents);
+    releaseCairoContext(cr, true, extents);
 }
 
 void SvpSalGraphics::drawRect( long nX, long nY, long nWidth, long nHeight )


More information about the Libreoffice-commits mailing list