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

[Chris Sherlock]

 vcl/source/outdev/bitmap.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 896526dec395e679f4145428328b690b0c81df52
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date:   Sat Apr 19 21:16:06 2014 +1000

    fdo#77667 Remove gcc3 workaround
    
    It appears from previous commit log entries that GCC 3.3 and below had
    problems handling instantiated objects as parameters. Therefore, we
    don't need this aNullPt, so removing it.
    
    Change-Id: I8f88067628078e5b57ed76b8b7dfdb76baa3b2ea

diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 23d1177..130a2c3 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -941,10 +941,9 @@ void OutputDevice::ImplDrawAlpha( const Bitmap& rBmp, 
const AlphaMask& rAlpha,
                                   const Point& rDestPt, const Size& rDestSize,
                                   const Point& rSrcPtPixel, const Size& 
rSrcSizePixel )
 {
-    const Point aNullPt;
     Point       aOutPt( LogicToPixel( rDestPt ) );
     Size        aOutSz( LogicToPixel( rDestSize ) );
-    Rectangle   aDstRect( aNullPt, GetOutputSizePixel() );
+    Rectangle   aDstRect( Point(), GetOutputSizePixel() );
     const bool  bHMirr = aOutSz.Width() < 0;
     const bool  bVMirr = aOutSz.Height() < 0;
 
@@ -999,7 +998,7 @@ void OutputDevice::ImplDrawAlpha( const Bitmap& rBmp, const 
AlphaMask& rAlpha,
 
         VirtualDevice* pOldVDev = mpAlphaVDev;
 
-        Rectangle aBmpRect( aNullPt, rBmp.GetSizePixel() );
+        Rectangle aBmpRect( Point(), rBmp.GetSizePixel() );
         if( !bNativeAlpha
                 &&  !aBmpRect.Intersection( Rectangle( rSrcPtPixel, 
rSrcSizePixel ) ).IsEmpty() )
         {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits