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

[Noel Grandin]

 vcl/inc/BitmapScaleConvolution.hxx           |    1 -
 vcl/inc/ResampleKernel.hxx                   |   15 ---------------
 vcl/source/bitmap/BitmapScaleConvolution.cxx |    2 --
 3 files changed, 18 deletions(-)

New commits:
commit e9e6228533b336317aa809a7aaaa4fd1c338d4f7
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Mon Feb 20 09:49:19 2017 +0200

    remove unused Box from ConvolutionKernelType enum
    
    Change-Id: I9f8610bc9ed7d5c175c369973dc8906179ae042d
    Reviewed-on: https://gerrit.libreoffice.org/34456
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/inc/BitmapScaleConvolution.hxx b/vcl/inc/BitmapScaleConvolution.hxx
index 0ce161d..324a739 100644
--- a/vcl/inc/BitmapScaleConvolution.hxx
+++ b/vcl/inc/BitmapScaleConvolution.hxx
@@ -27,7 +27,6 @@ namespace vcl
 
 enum class ConvolutionKernelType
 {
-    Box       = 0,
     BiLinear  = 1,
     BiCubic   = 2,
     Lanczos3  = 3,
diff --git a/vcl/inc/ResampleKernel.hxx b/vcl/inc/ResampleKernel.hxx
index 225336a..9088c7a 100644
--- a/vcl/inc/ResampleKernel.hxx
+++ b/vcl/inc/ResampleKernel.hxx
@@ -109,21 +109,6 @@ private:
     }
 };
 
-class BoxKernel : public Kernel
-{
-public:
-    BoxKernel() : Kernel () {}
-
-private:
-    virtual double  GetWidth() const override { return 0.5; }
-    virtual double  Calculate (double x) const override
-    {
-        if (-0.5 <= x && x < 0.5)
-            return 1.0;
-        return 0.0;
-    }
-};
-
 } // namespace vcl
 
 #endif // INCLUDED_VCL_RESAMPLEKERNEL_HXX
diff --git a/vcl/source/bitmap/BitmapScaleConvolution.cxx b/vcl/source/bitmap/BitmapScaleConvolution.cxx
index 6149573..dde9cb6e 100644
--- a/vcl/source/bitmap/BitmapScaleConvolution.cxx
+++ b/vcl/source/bitmap/BitmapScaleConvolution.cxx
@@ -374,8 +374,6 @@ bool BitmapScaleConvolution::filter(Bitmap& rBitmap)
 
     switch(meKernelType)
     {
-        case ConvolutionKernelType::Box:
-            return ImplScaleConvolution(rBitmap, mrScaleX, mrScaleY, BoxKernel());
         case ConvolutionKernelType::BiLinear:
             return ImplScaleConvolution(rBitmap, mrScaleX, mrScaleY, BilinearKernel());
         case ConvolutionKernelType::BiCubic: