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

[Tor Lillqvist]

 vcl/source/gdi/outdev6.cxx |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit f8d1f3a7b2906518eed2730c4f05c4fae00c5279
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Apr 7 13:39:48 2014 +0300

    Don't special-case iOS here, either
    
    Again, no effect.
    
    Change-Id: Iab6f1a59d8fe85d3a671c60685496093b8aa1b88

diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index d84bd65..b4de152 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -386,11 +386,7 @@ void OutputDevice::EmulateDrawTransparent ( const PolyPolygon& rPolyPoly,
 
         if( !bDrawn )
         {
-#ifdef IOS
-            VirtualDevice   aVDev( *this, 8 );
-#else
             VirtualDevice   aVDev( *this, 1 );
-#endif
             const Size      aDstSz( aDstRect.GetSize() );
             const sal_uInt8     cTrans = (sal_uInt8) MinMax( FRound( nTransparencePercent * 2.55 ), 0, 255 );
 
commit 2582f6464e1b1e6617068938254dd4e7bc72faf3
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Apr 7 13:31:47 2014 +0300

    Don't special-case iOS here, either
    
    Again, no visual effect, though.
    
    Change-Id: Ib0c68ef9ee8ca61b31453be97026448e029ec579

diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index 49a51bf..d84bd65 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -262,9 +262,7 @@ bool OutputDevice::DrawTransparentNatively ( const PolyPolygon& rPolyPoly,
 
     if( !pDisableNative
         && mpGraphics->supportsOperation( OutDevSupport_B2DDraw )
-// Should iOS be included? Android? Or does this code even get invoked
-// ever for those?
-#if defined UNX && ! defined MACOSX
+#if defined UNX && ! defined MACOSX && ! defined IOS
             && GetBitCount() > 8
 #endif
 #ifdef WIN32