summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2018-04-05 16:21:56 +1000
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-04-05 10:56:49 +0200
commit2844b2fc2925fb191ff2779293a1503c6278260b (patch)
treef42b35f1e2fb502954c5ae39794dac9d5eb440b4 /vcl
parentf76a22c7656f8741cf26c220fed1f8cd5a7d79c1 (diff)
vcl: Bitmap::ImplAdaptBitCount() is not needed, just use AdaptBitCount()
Change-Id: I77e1e051f95c9dfe98b563ccf5c633e5373872f5 Reviewed-on: https://gerrit.libreoffice.org/52423 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/bitmap/BitmapScaleConvolution.cxx2
-rw-r--r--vcl/source/gdi/bitmap3.cxx7
2 files changed, 2 insertions, 7 deletions
diff --git a/vcl/source/bitmap/BitmapScaleConvolution.cxx b/vcl/source/bitmap/BitmapScaleConvolution.cxx
index 05b9c4c627b9..14e391c1ee77 100644
--- a/vcl/source/bitmap/BitmapScaleConvolution.cxx
+++ b/vcl/source/bitmap/BitmapScaleConvolution.cxx
@@ -363,7 +363,7 @@ bool ImplScaleConvolution(Bitmap& rBitmap, const double& rScaleX, const double&
if(bResult)
{
- rBitmap.ImplAdaptBitCount(aResult);
+ rBitmap.AdaptBitCount(aResult);
rBitmap = aResult;
}
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 3d330f3b8366..ba28fff0f112 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -835,11 +835,6 @@ bool Bitmap::HasFastScale()
void Bitmap::AdaptBitCount(Bitmap& rNew) const
{
- ImplAdaptBitCount(rNew);
-}
-
-void Bitmap::ImplAdaptBitCount(Bitmap& rNew) const
-{
// aNew is the result of some operation; adapt it's BitCount to the original (this)
if(GetBitCount() != rNew.GetBitCount())
{
@@ -1130,7 +1125,7 @@ bool Bitmap::ImplScaleInterpolate( const double& rScaleX, const double& rScaleY
if( bRet )
{
- aOriginal.ImplAdaptBitCount(aNewBmp);
+ aOriginal.AdaptBitCount(aNewBmp);
*this = aNewBmp;
}
}