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

[Chris Sherlock (via logerrit)]

 vcl/source/outdev/bitmap.cxx      |    4 ----
 vcl/source/outdev/transparent.cxx |   11 ++---------
 2 files changed, 2 insertions(+), 13 deletions(-)

New commits:
commit 17926a7283af17017a3da2cd42c2089b9da8c4f4
Author:     Chris Sherlock <chris.sherlock79 at gmail.com>
AuthorDate: Sun Dec 27 21:20:42 2020 +1100
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Dec 28 07:28:33 2020 +0100

    vcl: remove ancient SAL_DISABLE_NATIVE_ALPHA environment variable
    
    This environment variable was introduced in ed61578b3f9109bb, in 2006!
    I'm removing this code given it's older than my eldest daughter.
    
    Change-Id: Ia221f79f8ac76a1273520ff1cb151b6bfd71b216
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108373
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index ad02fccff63d..9f5ef1f51f20 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -660,10 +660,6 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap& rBmp, const AlphaMask& r
     if (aDstRect.Intersection(tools::Rectangle(aOutPt, aOutSz)).IsEmpty())
         return;
 
-    static const char* pDisableNative = getenv( "SAL_DISABLE_NATIVE_ALPHA");
-    bool bTryDirectPaint = !pDisableNative;
-
-    if (bTryDirectPaint)
     {
         Point aRelPt = aOutPt + Point(mnOutOffX, mnOutOffY);
         SalTwoRect aTR(
diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx
index 5944c9777299..358b8bba6857 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -330,11 +330,7 @@ bool OutputDevice::DrawTransparentNatively ( const tools::PolyPolygon& rPolyPoly
 
     bool bDrawn = false;
 
-    // debug helper:
-    static const char* pDisableNative = getenv( "SAL_DISABLE_NATIVE_ALPHA");
-
-    if( !pDisableNative &&
-        mpGraphics->supportsOperation( OutDevSupportType::B2DDraw )
+    if (mpGraphics->supportsOperation(OutDevSupportType::B2DDraw)
 #if defined UNX && ! defined MACOSX && ! defined IOS
         && GetBitCount() > 8
 #endif
@@ -436,14 +432,11 @@ void OutputDevice::EmulateDrawTransparent ( const tools::PolyPolygon& rPolyPoly,
     {
         bool bDrawn = false;
 
-        // debug helper:
-        static const char* pDisableNative = getenv( "SAL_DISABLE_NATIVE_ALPHA" );
-
         // #i66849# Added fast path for exactly rectangular
         // polygons
         // #i83087# Naturally, system alpha blending cannot
         // work with separate alpha VDev
-        if( !mpAlphaVDev && !pDisableNative && aPolyPoly.IsRect() )
+        if( !mpAlphaVDev && aPolyPoly.IsRect() )
         {
             // setup Graphics only here (other cases delegate
             // to basic OutDev methods)