svn commit: r1408379 - /incubator/ooo/trunk/main/vcl/source/gdi/bitmap3.cxx

[alg]

Author: alg
Date: Mon Nov 12 17:56:58 2012
New Revision: 1408379

URL: http://svn.apache.org/viewvc?rev=1408379&view=rev
Log:
Corrected bitmap scaler to not create 24bit outputs for scaling masks/alphas

Modified:
    incubator/ooo/trunk/main/vcl/source/gdi/bitmap3.cxx

Modified: incubator/ooo/trunk/main/vcl/source/gdi/bitmap3.cxx
URL: 
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/source/gdi/bitmap3.cxx?rev=1408379&r1=1408378&r2=1408379&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/source/gdi/bitmap3.cxx (original)
+++ incubator/ooo/trunk/main/vcl/source/gdi/bitmap3.cxx Mon Nov 12 17:56:58 2012
@@ -1263,6 +1263,7 @@ sal_Bool Bitmap::ImplScaleInterpolate( c
                if( bRet )
                {
                        bRet = sal_False;
+            const Bitmap aOriginal(*this);
             *this = aNewBmp;
                        aNewBmp = Bitmap( Size( nNewWidth, nNewHeight ), 24 );
                        pReadAcc = AcquireReadAccess();
@@ -1333,7 +1334,7 @@ sal_Bool Bitmap::ImplScaleInterpolate( c
 
                        if( bRet )
             {
-                ImplAdaptBitCount(aNewBmp);
+                aOriginal.ImplAdaptBitCount(aNewBmp);
                                *this = aNewBmp;
             }
                }