Corrected bitmap scaler to not create 24bit outputs for scaling masks/alphas

61e12761 · Armin Le Grand · f6bff98d · 61e12761
Kaydet (Commit) 61e12761 authored Kas 12, 2012 tarafından Armin Le Grand
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

bitmap3.cxx vcl/source/gdi/bitmap3.cxx +2 -1

No files found.
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -1263,6 +1263,7 @@ sal_Bool Bitmap::ImplScaleInterpolate( const double& rScaleX, const double& rSca
        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( const double& rScaleX, const double& rSca

            if( bRet )
            {
-                ImplAdaptBitCount(aNewBmp);
+                aOriginal.ImplAdaptBitCount(aNewBmp);
                *this = aNewBmp;
            }
        }