[Libreoffice-commits] core.git: include/vcl vcl/source

[Chris Sherlock]

 include/vcl/bitmap.hxx                       |    3 +--
 vcl/source/bitmap/BitmapScaleConvolution.cxx |    2 +-
 vcl/source/gdi/bitmap3.cxx                   |    7 +------
 3 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 2844b2fc2925fb191ff2779293a1503c6278260b
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Thu Apr 5 16:21:56 2018 +1000

    vcl: Bitmap::ImplAdaptBitCount() is not needed, just use AdaptBitCount()
    
    Change-Id: I77e1e051f95c9dfe98b563ccf5c633e5373872f5
    Reviewed-on: https://gerrit.libreoffice.org/52423
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 172230c61a8f..ebf481aa3777 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -474,7 +474,7 @@ public:
 
     // Adapt the BitCount of rNew to BitCount of total, including grey or color palette
     // Can be used to create alpha/mask bitmaps after their processing in 24bit
-    void                    AdaptBitCount(Bitmap& rNew) const;
+    void AdaptBitCount(Bitmap& rNew) const;
 
     /** Rotate bitmap by the specified angle
 
@@ -668,7 +668,6 @@ public:
     SAL_DLLPRIVATE void     ImplSetImpBitmap( const std::shared_ptr<ImpBitmap>& xImpBmp );
     SAL_DLLPRIVATE void     ImplAssignWithSize( const Bitmap& rBitmap );
 
-    SAL_DLLPRIVATE void     ImplAdaptBitCount(Bitmap& rNew) const;
     SAL_DLLPRIVATE bool     ImplScaleFast( const double& rScaleX, const double& rScaleY );
     SAL_DLLPRIVATE bool     ImplScaleInterpolate( const double& rScaleX, const double& rScaleY );
 
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;
                 }
             }