[Libreoffice-commits] core.git: drawinglayer/source

Mike Kaganski (via logerrit) logerrit at kemper.freedesktop.org
Thu Aug 20 05:19:02 UTC 2020


 drawinglayer/source/processor2d/vclprocessor2d.cxx |   23 ++++++---------------
 1 file changed, 7 insertions(+), 16 deletions(-)

New commits:
commit 5bf71c698fb1d0a4c36aae86a01d0a99223c9d7a
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Thu Aug 20 00:06:18 2020 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Thu Aug 20 07:18:25 2020 +0200

    Deduplicate some code
    
    Change-Id: I37c492adef30db748eaa975247d386dcd953257b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100949
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 3aa7d0262b98..148017cc2408 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -790,22 +790,13 @@ void VclProcessor2D::RenderMaskPrimitive2DPixel(const primitive2d::MaskPrimitive
     if (!basegfx::utils::isRectangle(aMask))
     {
         // draw mask
-        if (getOptionsDrawinglayer().IsAntiAliasing())
-        {
-            // with AA, use 8bit AlphaMask to get nice borders
-            VirtualDevice& rTransparence = aBufferDevice.getTransparence();
-            rTransparence.SetLineColor();
-            rTransparence.SetFillColor(COL_BLACK);
-            rTransparence.DrawPolyPolygon(aMask);
-        }
-        else
-        {
-            // No AA, use 1bit mask
-            VirtualDevice& rMask = aBufferDevice.getMask();
-            rMask.SetLineColor();
-            rMask.SetFillColor(COL_BLACK);
-            rMask.DrawPolyPolygon(aMask);
-        }
+        // with AA, use 8bit AlphaMask to get nice borders; no AA -> use 1bit mask
+        VirtualDevice& rMask = getOptionsDrawinglayer().IsAntiAliasing()
+                                   ? aBufferDevice.getTransparence()
+                                   : aBufferDevice.getMask();
+        rMask.SetLineColor();
+        rMask.SetFillColor(COL_BLACK);
+        rMask.DrawPolyPolygon(aMask);
     }
 
     // dump buffer to outdev


More information about the Libreoffice-commits mailing list