summaryrefslogtreecommitdiff
path: root/vcl/source/outdev
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-11-14 20:35:44 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-11-15 14:43:54 +0100
commitbad9b2d464cb350fd59e2808dc4e7415cc6658ea (patch)
tree750c526da4984123cd0b67f2d5ea43c22ab27f67 /vcl/source/outdev
parent1e15058e08445d2857755ec8ef06deb2e3393b97 (diff)
vcl: The backend should decide whether fast alpha drawing is available.
The unx drawAlphaBitmap() already already checks that the source and destination have the same size. Windows and OpenGL should be able to handle that without trouble. OS X would need some additional code, so added an early return for the case the source and result sizes do not match. Change-Id: Ib09654aaa9c9064c232cff5094fcaa1190e931c6
Diffstat (limited to 'vcl/source/outdev')
-rw-r--r--vcl/source/outdev/bitmap.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 9a2e56d106a7..4b0583be3f0c 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -524,10 +524,10 @@ void OutputDevice::DrawDeviceBitmap( const Point& rDestPt, const Size& rDestSize
if (bTryDirectPaint)
{
- // only paint direct when no scaling and no MapMode, else the
+ // only paint direct when no MapMode, else the
// more expensive conversions may be done for short-time Bitmap/BitmapEx
// used for buffering only
- if (IsMapMode() || aPosAry.mnSrcWidth != aPosAry.mnDestWidth || aPosAry.mnSrcHeight != aPosAry.mnDestHeight)
+ if (IsMapMode())
{
bTryDirectPaint = false;
}
@@ -663,10 +663,10 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap& rBmp, const AlphaMask& r
if (bTryDirectPaint)
{
- // only paint direct when no scaling and no MapMode, else the
+ // only paint direct when no MapMode, else the
// more expensive conversions may be done for short-time Bitmap/BitmapEx
// used for buffering only
- if (IsMapMode() || rSrcSizePixel.Width() != aOutSz.Width() || rSrcSizePixel.Height() != aOutSz.Height())
+ if (IsMapMode())
{
bTryDirectPaint = false;
}