diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2018-03-12 21:36:35 +1100 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-03-13 05:29:00 +0100 |
commit | f2da65d7e9ea3b96a946686153dc12d3d6c88be2 (patch) | |
tree | 8a9897d65952032b9d539745f9672e0376cbe0e8 /vcl/source | |
parent | e22e4f75e4af2cb2fc041eef6f0178a4941285da (diff) |
vcl: rename BitmapFilter::filter() to execute(), rename existing classes
Change-Id: I0c7b840de6bb4c7570bd6a55ccf3b427f98cc524
Reviewed-on: https://gerrit.libreoffice.org/51142
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/source')
-rw-r--r-- | vcl/source/bitmap/BitmapScaleConvolution.cxx | 2 | ||||
-rw-r--r-- | vcl/source/bitmap/bitmapscalesuper.cxx | 6 | ||||
-rw-r--r-- | vcl/source/gdi/bitmap3.cxx | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/vcl/source/bitmap/BitmapScaleConvolution.cxx b/vcl/source/bitmap/BitmapScaleConvolution.cxx index cf5f22c9a9c4..7644c687033b 100644 --- a/vcl/source/bitmap/BitmapScaleConvolution.cxx +++ b/vcl/source/bitmap/BitmapScaleConvolution.cxx @@ -371,7 +371,7 @@ bool ImplScaleConvolution(Bitmap& rBitmap, const double& rScaleX, const double& } // end anonymous namespace -bool BitmapScaleConvolution::filter(Bitmap& rBitmap) +bool BitmapScaleConvolutionFilter::execute(Bitmap& rBitmap) { switch(meKernelType) diff --git a/vcl/source/bitmap/bitmapscalesuper.cxx b/vcl/source/bitmap/bitmapscalesuper.cxx index 7fae7a6a8dc0..46f8a6b02d67 100644 --- a/vcl/source/bitmap/bitmapscalesuper.cxx +++ b/vcl/source/bitmap/bitmapscalesuper.cxx @@ -918,15 +918,15 @@ void scaleNonPalleteGeneral2(ScaleContext &rCtx, long nStartY, long nEndY) } // end anonymous namespace -BitmapScaleSuper::BitmapScaleSuper(const double& rScaleX, const double& rScaleY) : +BitmapScaleSuperFilter::BitmapScaleSuperFilter(const double& rScaleX, const double& rScaleY) : mrScaleX(rScaleX), mrScaleY(rScaleY) {} -BitmapScaleSuper::~BitmapScaleSuper() +BitmapScaleSuperFilter::~BitmapScaleSuperFilter() {} -bool BitmapScaleSuper::filter(Bitmap& rBitmap) +bool BitmapScaleSuperFilter::execute(Bitmap& rBitmap) { bool bRet = false; diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 9c9b528bfe90..3ca45b578cf1 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -776,28 +776,28 @@ bool Bitmap::Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag n } else { - BitmapScaleSuper aScaleSuper(rScaleX, rScaleY); - bRetval = aScaleSuper.filter(*this); + BitmapScaleSuperFilter aScaleSuperFilter(rScaleX, rScaleY); + bRetval = aScaleSuperFilter.execute(*this); } break; } case BmpScaleFlag::Lanczos : case BmpScaleFlag::BestQuality: { - vcl::BitmapScaleConvolution aScaleConvolution(rScaleX, rScaleY, vcl::ConvolutionKernelType::Lanczos3); - bRetval = aScaleConvolution.filter(*this); + vcl::BitmapScaleConvolutionFilter aScaleConvolutionFilter(rScaleX, rScaleY, vcl::ConvolutionKernelType::Lanczos3); + bRetval = aScaleConvolutionFilter.execute(*this); break; } case BmpScaleFlag::BiCubic : { - vcl::BitmapScaleConvolution aScaleConvolution(rScaleX, rScaleY, vcl::ConvolutionKernelType::BiCubic); - bRetval = aScaleConvolution.filter(*this); + vcl::BitmapScaleConvolutionFilter aScaleConvolutionFilter(rScaleX, rScaleY, vcl::ConvolutionKernelType::BiCubic); + bRetval = aScaleConvolutionFilter.execute(*this); break; } case BmpScaleFlag::BiLinear : { - vcl::BitmapScaleConvolution aScaleConvolution(rScaleX, rScaleY, vcl::ConvolutionKernelType::BiLinear); - bRetval = aScaleConvolution.filter(*this); + vcl::BitmapScaleConvolutionFilter aScaleConvolutionFilter(rScaleX, rScaleY, vcl::ConvolutionKernelType::BiLinear); + bRetval = aScaleConvolutionFilter.execute(*this); break; } } |