diff options
| author | Armin Le Grand <alg@apache.org> | 2012-10-30 11:02:38 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-12 17:16:52 +0100 |
| commit | 9536e3cbb8b1e765b83cdb10359cca91ff80b172 (patch) | |
| tree | 6617502b34081aaba985b4aacf81ae8715a8035e /include/vcl/bitmap.hxx | |
| parent | fix build (removed/renamed header) (diff) | |
| download | core-9536e3cbb8b1e765b83cdb10359cca91ff80b172.tar.gz core-9536e3cbb8b1e765b83cdb10359cca91ff80b172.zip | |
Resolves: #i121233# some slight corrections/enhancements
(cherry picked from commit db00dfd93ac0e215a5d71e72645790918db0e734)
Conflicts:
vcl/inc/vcl/bitmap.hxx
vcl/source/gdi/bitmap3.cxx
Change-Id: I1a7817a94232b3d7f1c095dd27025e4cccea348c
Diffstat (limited to 'include/vcl/bitmap.hxx')
| -rw-r--r-- | include/vcl/bitmap.hxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 1715022b4790..a5388fa2c25d 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -342,7 +342,7 @@ public: BitmapWriteAccess& rAcc, sal_Bool bRLE4 ); SAL_DLLPRIVATE static sal_Bool ImplWriteRLE( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool bRLE4 ); - SAL_DLLPRIVATE void ImplAdaptBitCount(Bitmap& rNew); + SAL_DLLPRIVATE void ImplAdaptBitCount(Bitmap& rNew) const; SAL_DLLPRIVATE sal_Bool ImplScaleFast( const double& rScaleX, const double& rScaleY ); SAL_DLLPRIVATE sal_Bool ImplScaleInterpolate( const double& rScaleX, const double& rScaleY ); SAL_DLLPRIVATE sal_Bool ImplScaleSuper( const double& rScaleX, const double& rScaleY ); @@ -616,6 +616,10 @@ public: */ sal_Bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag = BMP_SCALE_DEFAULT ); + // Adapt the BitCount of rNew to BitCount of lolal, including grey or color paltette + // Can be used to create alpha/mask bitmaps after their processing in 24bit + void AdaptBitCount(Bitmap& rNew) const; + /** Rotate bitmap by the specified angle @param nAngle10 |