vcl/source/gdi/outdev2.cxx | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
New commits:
commit 3cf3700b7a903e88f5296076c40ae854bce91cdc
Author: Jan Holesovsky <ke...@collabora.com>
Date: Mon Jan 27 20:11:26 2014 +0100
fdo#74124: Scale the pictures before calling ImplDrawAlpha().
When the source and destination bitmap do not have the same size,
ImplDrawAlpha() does not use direct paint, but instead it gets the image
from
the screen, blends it with the provided bitmap, and again draws it.
Unfortunately, the blending uses the most trivial (and ugly) way of scaling;
so to produce much better results, let's scale to the destination size
before
even calling ImplDrawAlpha().
The sideeffect is that we use the direct paint in most cases now; so
hopefully
it pays off to do the (a bit more expensive) scale first.
Change-Id: I3b6b275710220910709ae4345ad6be3d6e4bf79c
diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index f362b32..501d42b 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -990,7 +990,25 @@ void OutputDevice::ImplDrawBitmapEx( const Point& rDestPt,
const Size& rDestSize
if(aBmpEx.IsAlpha())
{
- ImplDrawAlpha( aBmpEx.GetBitmap(), aBmpEx.GetAlpha(), rDestPt,
rDestSize, rSrcPtPixel, rSrcSizePixel );
+ Size aDestSizePixel(LogicToPixel(rDestSize));
+
+ BitmapEx aScaledBitmapEx(aBmpEx);
+ Point aSrcPtPixel(rSrcPtPixel);
+ Size aSrcSizePixel(rSrcSizePixel);
+
+ // we have beautiful scaling algorithms, let's use them
+ if (aDestSizePixel != rSrcSizePixel && rSrcSizePixel.Width() != 0 &&
rSrcSizePixel.Height() != 0)
+ {
+ double fScaleX = double(aDestSizePixel.Width()) /
rSrcSizePixel.Width();
+ double fScaleY = double(aDestSizePixel.Height()) /
rSrcSizePixel.Height();
+
+ aScaledBitmapEx.Scale(fScaleX, fScaleY);
+
+ aSrcSizePixel = aDestSizePixel;
+ aSrcPtPixel.X() = rSrcPtPixel.X() * fScaleX;
+ aSrcPtPixel.Y() = rSrcPtPixel.Y() * fScaleY;
+ }
+ ImplDrawAlpha(aScaledBitmapEx.GetBitmap(), aScaledBitmapEx.GetAlpha(),
rDestPt, rDestSize, aSrcPtPixel, aSrcSizePixel);
return;
}
@@ -2045,6 +2063,9 @@ void OutputDevice::ImplDrawAlpha( const Bitmap& rBmp,
const AlphaMask& rAlpha,
if( !bNativeAlpha
&& !aBmpRect.Intersection( Rectangle( rSrcPtPixel,
rSrcSizePixel ) ).IsEmpty() )
{
+ // The scaling in this code path produces really ugly results - it
+ // does the most trivial scaling with no smoothing.
+
GDIMetaFile* pOldMetaFile = mpMetaFile;
const bool bOldMap = mbMap;
mpMetaFile = NULL; // fdo#55044 reset before GetBitmap!
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
