diff options
| author | Armin Le Grand <alg@apache.org> | 2012-11-12 16:56:58 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-12 17:16:53 +0100 |
| commit | bdfac6fdb521104f71fc28e24dfd8c9ea02a95d3 (patch) | |
| tree | 817c9ef887e5ca044213926ab4fddc82a807a607 /vcl | |
| parent | d959ff60f0f014a03ecbb55b2ab6256d474f5e84 (diff) | |
Corrected bitmap scaler to not create 24bit outputs for scaling masks/alphas
(cherry picked from commit 61e12761a4887b8a6bbb977996cd1ea4080d00ac)
Change-Id: Ic358251ac6646b1fd8c8323171bb48958236f407
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/bitmap3.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index eeec752f83b6..6507d5de4f38 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -1179,6 +1179,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(); @@ -1249,7 +1250,7 @@ sal_Bool Bitmap::ImplScaleInterpolate( const double& rScaleX, const double& rSca if( bRet ) { - ImplAdaptBitCount(aNewBmp); + aOriginal.ImplAdaptBitCount(aNewBmp); *this = aNewBmp; } } |