diff options
author | Armin Le Grand <alg@apache.org> | 2012-11-12 16:56:58 +0000 |
---|---|---|
committer | Armin Le Grand <alg@apache.org> | 2012-11-12 16:56:58 +0000 |
commit | 61e12761a4887b8a6bbb977996cd1ea4080d00ac (patch) | |
tree | 9c12c2f76d00f9fa05ece6c9153dfd2164d2fd40 /vcl | |
parent | f6bff98d6f13bf71fc4bce53c189598c002343c2 (diff) |
Corrected bitmap scaler to not create 24bit outputs for scaling masks/alphas
Notes
Notes:
merged as: bdfac6fdb521104f71fc28e24dfd8c9ea02a95d3
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 731dd23c0c12..9698e53d12f6 100644 --- 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; } } |