vcl/inc/BitmapScaleConvolution.hxx | 6 +++--- vcl/inc/bitmapfilter.hxx | 2 +- vcl/inc/bitmapscalesuper.hxx | 8 ++++---- vcl/source/bitmap/BitmapScaleConvolution.cxx | 2 +- vcl/source/bitmap/bitmapscalesuper.cxx | 6 +++--- vcl/source/gdi/bitmap3.cxx | 16 ++++++++-------- 6 files changed, 20 insertions(+), 20 deletions(-)
New commits: commit f2da65d7e9ea3b96a946686153dc12d3d6c88be2 Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Mon Mar 12 21:36:35 2018 +1100 vcl: rename BitmapFilter::filter() to execute(), rename existing classes Change-Id: I0c7b840de6bb4c7570bd6a55ccf3b427f98cc524 Reviewed-on: https://gerrit.libreoffice.org/51142 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Tomaž Vajngerl <qui...@gmail.com> diff --git a/vcl/inc/BitmapScaleConvolution.hxx b/vcl/inc/BitmapScaleConvolution.hxx index 970f9d63390b..60e450f670ba 100644 --- a/vcl/inc/BitmapScaleConvolution.hxx +++ b/vcl/inc/BitmapScaleConvolution.hxx @@ -32,17 +32,17 @@ enum class ConvolutionKernelType Lanczos3 = 3, }; -class VCL_DLLPUBLIC BitmapScaleConvolution : public BitmapFilter +class VCL_DLLPUBLIC BitmapScaleConvolutionFilter : public BitmapFilter { public: - BitmapScaleConvolution(const double& rScaleX, const double& rScaleY, ConvolutionKernelType eKernelType) + BitmapScaleConvolutionFilter(const double& rScaleX, const double& rScaleY, ConvolutionKernelType eKernelType) : mrScaleX(rScaleX) , mrScaleY(rScaleY) , meKernelType(eKernelType) {} - virtual bool filter(Bitmap& rBitmap) override; + virtual bool execute(Bitmap& rBitmap) override; private: double mrScaleX; diff --git a/vcl/inc/bitmapfilter.hxx b/vcl/inc/bitmapfilter.hxx index 66dc4ccbe480..82f5f2edf091 100644 --- a/vcl/inc/bitmapfilter.hxx +++ b/vcl/inc/bitmapfilter.hxx @@ -19,7 +19,7 @@ public: BitmapFilter(); virtual ~BitmapFilter(); - virtual bool filter(Bitmap& rBitmap) = 0; + virtual bool execute(Bitmap& rBitmap) = 0; }; #endif diff --git a/vcl/inc/bitmapscalesuper.hxx b/vcl/inc/bitmapscalesuper.hxx index aff6986dd4e4..c8309c874b77 100644 --- a/vcl/inc/bitmapscalesuper.hxx +++ b/vcl/inc/bitmapscalesuper.hxx @@ -22,13 +22,13 @@ #include "bitmapfilter.hxx" -class BitmapScaleSuper : public BitmapFilter +class BitmapScaleSuperFilter : public BitmapFilter { public: - BitmapScaleSuper(const double& rScaleX, const double& rScaleY); - virtual ~BitmapScaleSuper() override; + BitmapScaleSuperFilter(const double& rScaleX, const double& rScaleY); + virtual ~BitmapScaleSuperFilter() override; - virtual bool filter(Bitmap& rBitmap) override; + virtual bool execute(Bitmap& rBitmap) override; private: double mrScaleX; 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; } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits