drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx | 6 +++++-
drawinglayer/source/processor2d/vclprocessor2d.cxx | 7 ++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit ff422b8b153289143d16857890cbe3c0b411cd54
Author: Herbert Dürr <h...@apache.org>
Date: Thu Jan 24 16:55:41 2013 +0000
Related: #i121534# avoid expensive emulation of 1bit masks for Mac's Quartz
(cherry picked from commit 194c7ff906c9164a522f924dc1c1f8c5fc81b6e6)
Change-Id: I28a31c5abb14ceb72dc290e6ed2161c0ef6592df
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index ee51ea0..99a1ff7 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -179,7 +179,11 @@ namespace
// create BitmapEx
Bitmap aMainBitmap = aVirtualDevice.GetBitmap(Point(),
aVirtualDevice.GetOutputSizePixel());
- Bitmap aMaskBitmap = aVirtualDeviceMask.GetBitmap(Point(),
aVirtualDeviceMask.GetOutputSizePixel());
+#if defined(MACOSX)
+ AlphaMask aMaskBitmap( aVirtualDeviceMask.GetBitmap( Point(),
aVirtualDeviceMask.GetOutputSizePixel()));
+#else
+ Bitmap aMaskBitmap = aVirtualDeviceMask.GetBitmap( Point(),
aVirtualDeviceMask.GetOutputSizePixel());
+#endif
aNextStep.maBitmapEx = BitmapEx(aMainBitmap, aMaskBitmap);
// add to vector
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index a11c49b..56d56b7 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -464,7 +464,12 @@ namespace drawinglayer
{
// parts will be uncovered, extend aBitmapEx with a mask bitmap
const Bitmap aContent(aBitmapEx.GetBitmap());
- aBitmapEx = BitmapEx(aContent, Bitmap(aContent.GetSizePixel(),
1));
+#if defined(MACOSX)
+ const AlphaMask aMaskBmp( aContent.GetSizePixel());
+#else
+ const Bitmap aMaskBmp( aContent.GetSizePixel(), 1);
+#endif
+ aBitmapEx = BitmapEx(aContent, aMaskBmp);
}
// draw using OutputDevice'sDrawTransformedBitmapEx
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
