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

Tor Lillqvist tml at collabora.com
Fri Apr 11 09:04:04 PDT 2014


 drawinglayer/source/processor2d/vclhelperbufferdevice.cxx |   17 --------------
 1 file changed, 17 deletions(-)

New commits:
commit 1808330a85329a739dbd9196aeb3e10a06521f64
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Apr 11 19:02:37 2014 +0300

    Revert ""Fix" for some SmartArt rendering artefacts on iOS"
    
    Nah, the "fix" is largely accidental. Must. Try. Harder.
    
    This reverts commit c03986e084e8806f66f7490f2aeeb33db5748e4b.

diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index d1045cc..e94f581 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -332,26 +332,9 @@ namespace drawinglayer
             }
             else if(0.0 != fTrans)
             {
-#ifndef IOS
-                // For some reason using this "normal" code path on
-                // iOS with tiled rendering causes horrible artefacts:
-                // The mask ends up being drawn too, ending up looking
-                // as translucent milky rectangles covering the
-                // SmartArt (which is what this typically (?) ends up
-                // being used for) ... Why this doesn't cause any
-                // artefacts on OS X, which uses largely the very same
-                // code in vcl/quartz, I don't know.
                 sal_uInt8 nMaskValue((sal_uInt8)basegfx::fround(fTrans * 255.0));
                 const AlphaMask aAlphaMask(aSizePixel, &nMaskValue);
                 mrOutDev.DrawBitmapEx(maDestPixel.TopLeft(), BitmapEx(aContent, aAlphaMask));
-#else
-                // Not sure at all why this works, but it does. The
-                // result is not beautiful (jaggies), but better than
-                // blocking out rectangles of the image.
-                Bitmap aMask(aContent);
-                aMask.Convert(BMP_CONVERSION_8BIT_GREYS);
-                mrOutDev.DrawBitmapEx(maDestPixel.TopLeft(), BitmapEx(aContent, aMask));
-#endif
             }
             else
             {


More information about the Libreoffice-commits mailing list