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

[Noel Grandin (via logerrit)]

 include/vcl/bitmap.hxx       |    3 +--
 vcl/source/bitmap/bitmap.cxx |    3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 6ccc85290ea66ac69a609ef2345aea48605cefba
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Jun 23 15:18:14 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Jun 24 21:32:52 2021 +0200

    BmpScaleFlag::Super is dead
    
    ever since
        commit 2269ac65de127d33d41843ae15f6bece5bc778bc
        Author: Michael Meeks <michael.meeks at collabora.com>
        Date:   Fri Nov 7 05:42:51 2014 +0000
        icontest: remove hand-coded opengl path.
    
    Change-Id: Ida030be0e087353e20897a9e961c9ce1134b21e7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117782
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index f9e116c56d3b..2a6872c179f0 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -61,8 +61,7 @@ enum class BmpScaleFlag
     Interpolate, // fast, integer bilinear
     Lanczos,
     BiCubic,
-    BiLinear,
-    Super // bilinear interpolation when supersampling and averaging when subsampling under certain scale
+    BiLinear
 };
 
 #define BMP_COL_TRANS               Color( 252, 3, 251 )
diff --git a/vcl/source/bitmap/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx
index e093e0afabb5..1c50d35e649b 100644
--- a/vcl/source/bitmap/bitmap.cxx
+++ b/vcl/source/bitmap/bitmap.cxx
@@ -1435,9 +1435,6 @@ bool Bitmap::Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag n
             bRetval = BitmapFilter::Filter(aBmpEx, BitmapInterpolateScaleFilter(rScaleX, rScaleY));
             break;
 
-        case BmpScaleFlag::Super:
-            bRetval = BitmapFilter::Filter(aBmpEx, BitmapScaleSuperFilter(rScaleX, rScaleY));
-            break;
         case BmpScaleFlag::BestQuality:
         case BmpScaleFlag::Lanczos:
             bRetval = BitmapFilter::Filter(aBmpEx, vcl::BitmapScaleLanczos3Filter(rScaleX, rScaleY));