[Libreoffice-commits] core.git: 2 commits - chart2/Library_chartcore.mk drawinglayer/source

[Tor Lillqvist]

 chart2/Library_chartcore.mk                                  |    3 ++-
 drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 8ce32af6b28bbdcc6772ccb79838087a5c1a3432
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 8 11:43:57 2014 +0300

    We build the vclopengl library only for FREEBSD LINUX MACOSX WNT
    
    Change-Id: I6d9f6a33f7f825196d8d2aeec658b9323577ac7c

diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index 709b6fa..dae64e9 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -58,7 +58,8 @@ $(eval $(call gb_Library_use_libraries,chartcore,\
     ucbhelper \
     utl \
     vcl \
-    vclopengl \
+    $(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)), \
+        vclopengl) \
 	$(gb_UWINAPI) \
 ))
 
commit 7190d6b04f2488ae39ab88886b8e64971714212c
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 8 11:37:29 2014 +0300

    Use same code for iOS and OS X here, too, not that it seems to help any
    
    Change-Id: I16d11447757680edb0ff786a5ee1e3d453b38910

diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index 7fc6426..0f77658 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -175,7 +175,7 @@ namespace
 
                 // create BitmapEx
                 Bitmap aMainBitmap = aVirtualDevice.GetBitmap(Point(), aVirtualDevice.GetOutputSizePixel());
-#if defined(MACOSX)
+#if defined(MACOSX) || defined(IOS)
                 AlphaMask aMaskBitmap( aVirtualDeviceMask.GetBitmap( Point(), aVirtualDeviceMask.GetOutputSizePixel()));
 #else
                 Bitmap aMaskBitmap = aVirtualDeviceMask.GetBitmap( Point(), aVirtualDeviceMask.GetOutputSizePixel());