[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Sep 7 18:43:23 UTC 2018
include/vcl/BitmapAlphaClampFilter.hxx | 2 +-
include/vcl/BitmapColorQuantizationFilter.hxx | 2 +-
include/vcl/BitmapConvolutionMatrixFilter.hxx | 2 +-
include/vcl/BitmapDuoToneFilter.hxx | 2 +-
include/vcl/BitmapEmbossGreyFilter.hxx | 2 +-
include/vcl/BitmapFilter.hxx | 6 +++---
include/vcl/BitmapGaussianSeparableBlurFilter.hxx | 4 ++--
include/vcl/BitmapMedianFilter.hxx | 2 +-
include/vcl/BitmapMonochromeFilter.hxx | 2 +-
include/vcl/BitmapMosaicFilter.hxx | 10 +++++++---
include/vcl/BitmapPopArtFilter.hxx | 2 +-
include/vcl/BitmapSeparableUnsharpenFilter.hxx | 2 +-
include/vcl/BitmapSepiaFilter.hxx | 2 +-
include/vcl/BitmapSimpleColorQuantizationFilter.hxx | 2 +-
include/vcl/BitmapSmoothenFilter.hxx | 2 +-
include/vcl/BitmapSobelGreyFilter.hxx | 2 +-
include/vcl/BitmapSolarizeFilter.hxx | 2 +-
vcl/inc/BitmapColorizeFilter.hxx | 2 +-
vcl/inc/BitmapDisabledImageFilter.hxx | 2 +-
vcl/inc/BitmapFastScaleFilter.hxx | 2 +-
vcl/inc/BitmapInterpolateScaleFilter.hxx | 2 +-
vcl/inc/BitmapLightenFilter.hxx | 2 +-
vcl/inc/BitmapScaleConvolutionFilter.hxx | 2 +-
vcl/inc/BitmapScaleSuperFilter.hxx | 2 +-
vcl/source/bitmap/BitmapAlphaClampFilter.cxx | 2 +-
vcl/source/bitmap/BitmapColorQuantizationFilter.cxx | 2 +-
vcl/source/bitmap/BitmapColorizeFilter.cxx | 2 +-
vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx | 2 +-
vcl/source/bitmap/BitmapDisabledImageFilter.cxx | 2 +-
vcl/source/bitmap/BitmapDuoToneFilter.cxx | 2 +-
vcl/source/bitmap/BitmapEmbossGreyFilter.cxx | 2 +-
vcl/source/bitmap/BitmapFastScaleFilter.cxx | 2 +-
vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx | 4 ++--
vcl/source/bitmap/BitmapInterpolateScaleFilter.cxx | 2 +-
vcl/source/bitmap/BitmapLightenFilter.cxx | 2 +-
vcl/source/bitmap/BitmapMedianFilter.cxx | 2 +-
vcl/source/bitmap/BitmapMonochromeFilter.cxx | 2 +-
vcl/source/bitmap/BitmapMosaicFilter.cxx | 8 +-------
vcl/source/bitmap/BitmapPopArtFilter.cxx | 2 +-
vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx | 2 +-
vcl/source/bitmap/BitmapScaleSuperFilter.cxx | 2 +-
vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx | 2 +-
vcl/source/bitmap/BitmapSepiaFilter.cxx | 2 +-
vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx | 2 +-
vcl/source/bitmap/BitmapSmoothenFilter.cxx | 2 +-
vcl/source/bitmap/BitmapSobelGreyFilter.cxx | 2 +-
vcl/source/bitmap/BitmapSolarizeFilter.cxx | 2 +-
vcl/source/bitmap/bitmapfilter.cxx | 4 ++--
48 files changed, 59 insertions(+), 61 deletions(-)
New commits:
commit 453fde35bb838febf73bfda0bd981ee270c9b12e
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Sep 7 17:39:58 2018 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Sep 7 20:42:59 2018 +0200
BitmapFilter::execute can be const
...after a little tweak to BitmapMosaicFilter
Change-Id: I76b8ffdbf719a9d7960e7f3dafeb3adeb2300ec5
Reviewed-on: https://gerrit.libreoffice.org/60165
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/include/vcl/BitmapAlphaClampFilter.hxx b/include/vcl/BitmapAlphaClampFilter.hxx
index 0fc6274b6d4e..39c039cbd02c 100644
--- a/include/vcl/BitmapAlphaClampFilter.hxx
+++ b/include/vcl/BitmapAlphaClampFilter.hxx
@@ -25,7 +25,7 @@ public:
{
}
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
sal_uInt8 mcThreshold;
diff --git a/include/vcl/BitmapColorQuantizationFilter.hxx b/include/vcl/BitmapColorQuantizationFilter.hxx
index e695567a7bc0..170b0d88a471 100644
--- a/include/vcl/BitmapColorQuantizationFilter.hxx
+++ b/include/vcl/BitmapColorQuantizationFilter.hxx
@@ -28,7 +28,7 @@ public:
{
}
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
sal_uInt16 mnNewColorCount;
diff --git a/include/vcl/BitmapConvolutionMatrixFilter.hxx b/include/vcl/BitmapConvolutionMatrixFilter.hxx
index cae8c3d8a91c..928eaa9f0aa2 100644
--- a/include/vcl/BitmapConvolutionMatrixFilter.hxx
+++ b/include/vcl/BitmapConvolutionMatrixFilter.hxx
@@ -25,7 +25,7 @@ public:
{
}
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
protected:
const long (&mrMatrix)[9];
diff --git a/include/vcl/BitmapDuoToneFilter.hxx b/include/vcl/BitmapDuoToneFilter.hxx
index 72c02e7afcfa..ce29a2c93c6b 100644
--- a/include/vcl/BitmapDuoToneFilter.hxx
+++ b/include/vcl/BitmapDuoToneFilter.hxx
@@ -24,7 +24,7 @@ public:
{
}
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
sal_uLong mnColorOne;
diff --git a/include/vcl/BitmapEmbossGreyFilter.hxx b/include/vcl/BitmapEmbossGreyFilter.hxx
index 0a3227295d6e..eebb2d3ecc8e 100644
--- a/include/vcl/BitmapEmbossGreyFilter.hxx
+++ b/include/vcl/BitmapEmbossGreyFilter.hxx
@@ -24,7 +24,7 @@ public:
{
}
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
sal_uInt16 mnAzimuthAngle100;
diff --git a/include/vcl/BitmapFilter.hxx b/include/vcl/BitmapFilter.hxx
index ee7ac96b8d1c..9fc8f8017683 100644
--- a/include/vcl/BitmapFilter.hxx
+++ b/include/vcl/BitmapFilter.hxx
@@ -20,10 +20,10 @@ public:
BitmapFilter();
virtual ~BitmapFilter();
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) = 0;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const = 0;
- static bool Filter(BitmapEx& rBmpEx, BitmapFilter& rFilter);
- static bool Filter(Animation& rBmpEx, BitmapFilter& rFilter);
+ static bool Filter(BitmapEx& rBmpEx, BitmapFilter const& rFilter);
+ static bool Filter(Animation& rBmpEx, BitmapFilter const& rFilter);
};
#endif
diff --git a/include/vcl/BitmapGaussianSeparableBlurFilter.hxx b/include/vcl/BitmapGaussianSeparableBlurFilter.hxx
index c1359dab4761..fde41c935dc6 100644
--- a/include/vcl/BitmapGaussianSeparableBlurFilter.hxx
+++ b/include/vcl/BitmapGaussianSeparableBlurFilter.hxx
@@ -31,14 +31,14 @@ public:
Separable Blur implementation uses 2x separable 1D convolution
to process the image.
*/
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
double mfRadius;
bool convolutionPass(Bitmap& rBitmap, Bitmap& aNewBitmap, BitmapReadAccess const* pReadAcc,
int aNumberOfContributions, const double* pWeights, int const* pPixels,
- const int* pCount);
+ const int* pCount) const;
static std::vector<double> makeBlurKernel(const double radius, int& rows);
static void blurContributions(const int aSize, const int aNumberOfContributions,
diff --git a/include/vcl/BitmapMedianFilter.hxx b/include/vcl/BitmapMedianFilter.hxx
index e51a66eabcb7..b9d2fc555759 100644
--- a/include/vcl/BitmapMedianFilter.hxx
+++ b/include/vcl/BitmapMedianFilter.hxx
@@ -20,7 +20,7 @@ class VCL_DLLPUBLIC BitmapMedianFilter : public BitmapFilter
public:
BitmapMedianFilter() {}
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
};
#endif
diff --git a/include/vcl/BitmapMonochromeFilter.hxx b/include/vcl/BitmapMonochromeFilter.hxx
index acbcc3cc9b2c..09723b7a4009 100644
--- a/include/vcl/BitmapMonochromeFilter.hxx
+++ b/include/vcl/BitmapMonochromeFilter.hxx
@@ -34,7 +34,7 @@ public:
{
}
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
sal_uInt8 mcThreshold;
diff --git a/include/vcl/BitmapMosaicFilter.hxx b/include/vcl/BitmapMosaicFilter.hxx
index 0fbf19613b5f..f38e0ac1c6d5 100644
--- a/include/vcl/BitmapMosaicFilter.hxx
+++ b/include/vcl/BitmapMosaicFilter.hxx
@@ -11,6 +11,10 @@
#ifndef INCLUDED_VCL_BITMAPMOSAICFILTER_HXX
#define INCLUDED_VCL_BITMAPMOSAICFILTER_HXX
+#include <sal/config.h>
+
+#include <algorithm>
+
#include <vcl/BitmapFilter.hxx>
class BitmapEx;
@@ -19,12 +23,12 @@ class VCL_DLLPUBLIC BitmapMosaicFilter : public BitmapFilter
{
public:
BitmapMosaicFilter(sal_uLong nTileWidth, sal_uLong nTileHeight)
- : mnTileWidth(nTileWidth)
- , mnTileHeight(nTileHeight)
+ : mnTileWidth(std::max(nTileWidth, sal_uLong(1)))
+ , mnTileHeight(std::max(nTileHeight, sal_uLong(1)))
{
}
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
sal_uLong mnTileWidth;
diff --git a/include/vcl/BitmapPopArtFilter.hxx b/include/vcl/BitmapPopArtFilter.hxx
index 5c926940d3cf..9312c7b9367a 100644
--- a/include/vcl/BitmapPopArtFilter.hxx
+++ b/include/vcl/BitmapPopArtFilter.hxx
@@ -18,7 +18,7 @@ class VCL_DLLPUBLIC BitmapPopArtFilter : public BitmapFilter
public:
BitmapPopArtFilter() {}
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
struct PopArtEntry
diff --git a/include/vcl/BitmapSeparableUnsharpenFilter.hxx b/include/vcl/BitmapSeparableUnsharpenFilter.hxx
index 1812b9013fe8..91fcbf479498 100644
--- a/include/vcl/BitmapSeparableUnsharpenFilter.hxx
+++ b/include/vcl/BitmapSeparableUnsharpenFilter.hxx
@@ -26,7 +26,7 @@ public:
{
}
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
double mfRadius;
diff --git a/include/vcl/BitmapSepiaFilter.hxx b/include/vcl/BitmapSepiaFilter.hxx
index d636ebe6fea6..787a15e3f9f3 100644
--- a/include/vcl/BitmapSepiaFilter.hxx
+++ b/include/vcl/BitmapSepiaFilter.hxx
@@ -27,7 +27,7 @@ public:
mnSepiaPercent = 100;
}
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
sal_uInt16 mnSepiaPercent;
diff --git a/include/vcl/BitmapSimpleColorQuantizationFilter.hxx b/include/vcl/BitmapSimpleColorQuantizationFilter.hxx
index b05b13fe6896..200e35356b07 100644
--- a/include/vcl/BitmapSimpleColorQuantizationFilter.hxx
+++ b/include/vcl/BitmapSimpleColorQuantizationFilter.hxx
@@ -28,7 +28,7 @@ public:
{
}
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
sal_uInt16 mnNewColorCount;
diff --git a/include/vcl/BitmapSmoothenFilter.hxx b/include/vcl/BitmapSmoothenFilter.hxx
index 131809700680..3403b99ea5ee 100644
--- a/include/vcl/BitmapSmoothenFilter.hxx
+++ b/include/vcl/BitmapSmoothenFilter.hxx
@@ -23,7 +23,7 @@ public:
{
}
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
double mfRadius;
diff --git a/include/vcl/BitmapSobelGreyFilter.hxx b/include/vcl/BitmapSobelGreyFilter.hxx
index ac4cd9498d65..4ce6ef60b7d6 100644
--- a/include/vcl/BitmapSobelGreyFilter.hxx
+++ b/include/vcl/BitmapSobelGreyFilter.hxx
@@ -18,7 +18,7 @@ class VCL_DLLPUBLIC BitmapSobelGreyFilter : public BitmapFilter
public:
BitmapSobelGreyFilter() {}
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
};
#endif
diff --git a/include/vcl/BitmapSolarizeFilter.hxx b/include/vcl/BitmapSolarizeFilter.hxx
index 219bc881874f..f91a9fd287aa 100644
--- a/include/vcl/BitmapSolarizeFilter.hxx
+++ b/include/vcl/BitmapSolarizeFilter.hxx
@@ -23,7 +23,7 @@ public:
{
}
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
sal_uInt8 mcSolarGreyThreshold;
diff --git a/vcl/inc/BitmapColorizeFilter.hxx b/vcl/inc/BitmapColorizeFilter.hxx
index 0fac997d5f10..0d2ab8176f93 100644
--- a/vcl/inc/BitmapColorizeFilter.hxx
+++ b/vcl/inc/BitmapColorizeFilter.hxx
@@ -23,7 +23,7 @@ public:
{
}
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
Color maColor;
diff --git a/vcl/inc/BitmapDisabledImageFilter.hxx b/vcl/inc/BitmapDisabledImageFilter.hxx
index 2f69e8fa0c51..34336464aff6 100644
--- a/vcl/inc/BitmapDisabledImageFilter.hxx
+++ b/vcl/inc/BitmapDisabledImageFilter.hxx
@@ -18,7 +18,7 @@ class VCL_DLLPUBLIC BitmapDisabledImageFilter : public BitmapFilter
public:
BitmapDisabledImageFilter() {}
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
};
#endif
diff --git a/vcl/inc/BitmapFastScaleFilter.hxx b/vcl/inc/BitmapFastScaleFilter.hxx
index bc0ddfc7718f..1b156d670b91 100644
--- a/vcl/inc/BitmapFastScaleFilter.hxx
+++ b/vcl/inc/BitmapFastScaleFilter.hxx
@@ -23,7 +23,7 @@ public:
{
}
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
double mfScaleX;
diff --git a/vcl/inc/BitmapInterpolateScaleFilter.hxx b/vcl/inc/BitmapInterpolateScaleFilter.hxx
index 3c6dd310909b..7ab36c94ed1b 100644
--- a/vcl/inc/BitmapInterpolateScaleFilter.hxx
+++ b/vcl/inc/BitmapInterpolateScaleFilter.hxx
@@ -23,7 +23,7 @@ public:
{
}
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
double mfScaleX;
diff --git a/vcl/inc/BitmapLightenFilter.hxx b/vcl/inc/BitmapLightenFilter.hxx
index ffd8ede55574..540f07fb39b8 100644
--- a/vcl/inc/BitmapLightenFilter.hxx
+++ b/vcl/inc/BitmapLightenFilter.hxx
@@ -16,7 +16,7 @@
class VCL_DLLPUBLIC BitmapLightenFilter : public BitmapFilter
{
public:
- virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
};
#endif
diff --git a/vcl/inc/BitmapScaleConvolutionFilter.hxx b/vcl/inc/BitmapScaleConvolutionFilter.hxx
index bb5fb38409e1..b3db59065c7c 100644
--- a/vcl/inc/BitmapScaleConvolutionFilter.hxx
+++ b/vcl/inc/BitmapScaleConvolutionFilter.hxx
@@ -37,7 +37,7 @@ protected:
{
}
- virtual BitmapEx execute(BitmapEx const& rBitmap) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmap) const override;
private:
std::unique_ptr<Kernel> mxKernel;
diff --git a/vcl/inc/BitmapScaleSuperFilter.hxx b/vcl/inc/BitmapScaleSuperFilter.hxx
index 3b403015a5c9..7fa26f0c769a 100644
--- a/vcl/inc/BitmapScaleSuperFilter.hxx
+++ b/vcl/inc/BitmapScaleSuperFilter.hxx
@@ -28,7 +28,7 @@ public:
BitmapScaleSuperFilter(const double& rScaleX, const double& rScaleY);
virtual ~BitmapScaleSuperFilter() override;
- virtual BitmapEx execute(BitmapEx const& rBitmap) override;
+ virtual BitmapEx execute(BitmapEx const& rBitmap) const override;
private:
double mrScaleX;
diff --git a/vcl/source/bitmap/BitmapAlphaClampFilter.cxx b/vcl/source/bitmap/BitmapAlphaClampFilter.cxx
index 5fd19235b6d1..258f30991d7e 100644
--- a/vcl/source/bitmap/BitmapAlphaClampFilter.cxx
+++ b/vcl/source/bitmap/BitmapAlphaClampFilter.cxx
@@ -15,7 +15,7 @@
#include <bitmapwriteaccess.hxx>
-BitmapEx BitmapAlphaClampFilter::execute(BitmapEx const& rBitmapEx)
+BitmapEx BitmapAlphaClampFilter::execute(BitmapEx const& rBitmapEx) const
{
if (!rBitmapEx.IsTransparent())
return rBitmapEx;
diff --git a/vcl/source/bitmap/BitmapColorQuantizationFilter.cxx b/vcl/source/bitmap/BitmapColorQuantizationFilter.cxx
index 643354515f06..c877dd4adb66 100644
--- a/vcl/source/bitmap/BitmapColorQuantizationFilter.cxx
+++ b/vcl/source/bitmap/BitmapColorQuantizationFilter.cxx
@@ -21,7 +21,7 @@
#include <cstdlib>
-BitmapEx BitmapColorQuantizationFilter::execute(BitmapEx const& aBitmapEx)
+BitmapEx BitmapColorQuantizationFilter::execute(BitmapEx const& aBitmapEx) const
{
Bitmap aBitmap = aBitmapEx.GetBitmap();
diff --git a/vcl/source/bitmap/BitmapColorizeFilter.cxx b/vcl/source/bitmap/BitmapColorizeFilter.cxx
index f9a89ac60dde..4ec5bfe75d32 100644
--- a/vcl/source/bitmap/BitmapColorizeFilter.cxx
+++ b/vcl/source/bitmap/BitmapColorizeFilter.cxx
@@ -16,7 +16,7 @@
#include <bitmapwriteaccess.hxx>
#include <BitmapColorizeFilter.hxx>
-BitmapEx BitmapColorizeFilter::execute(BitmapEx const& rBitmapEx)
+BitmapEx BitmapColorizeFilter::execute(BitmapEx const& rBitmapEx) const
{
Bitmap aBitmap = rBitmapEx.GetBitmap();
BitmapScopedWriteAccess pWriteAccess(aBitmap);
diff --git a/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx b/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx
index bb1a1932c763..c2f2750f69a0 100644
--- a/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx
+++ b/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx
@@ -18,7 +18,7 @@
#include <bitmapwriteaccess.hxx>
-BitmapEx BitmapConvolutionMatrixFilter::execute(BitmapEx const& rBitmapEx)
+BitmapEx BitmapConvolutionMatrixFilter::execute(BitmapEx const& rBitmapEx) const
{
Bitmap aBitmap(rBitmapEx.GetBitmap());
diff --git a/vcl/source/bitmap/BitmapDisabledImageFilter.cxx b/vcl/source/bitmap/BitmapDisabledImageFilter.cxx
index c341ddea7534..3529f7e67dc2 100644
--- a/vcl/source/bitmap/BitmapDisabledImageFilter.cxx
+++ b/vcl/source/bitmap/BitmapDisabledImageFilter.cxx
@@ -15,7 +15,7 @@
#include <bitmapwriteaccess.hxx>
#include <BitmapDisabledImageFilter.hxx>
-BitmapEx BitmapDisabledImageFilter::execute(BitmapEx const& rBitmapEx)
+BitmapEx BitmapDisabledImageFilter::execute(BitmapEx const& rBitmapEx) const
{
const Size aSize(rBitmapEx.GetSizePixel());
diff --git a/vcl/source/bitmap/BitmapDuoToneFilter.cxx b/vcl/source/bitmap/BitmapDuoToneFilter.cxx
index 1769081b9ccd..521d1cc6d98e 100644
--- a/vcl/source/bitmap/BitmapDuoToneFilter.cxx
+++ b/vcl/source/bitmap/BitmapDuoToneFilter.cxx
@@ -24,7 +24,7 @@ static inline sal_uInt8 lcl_getDuotoneColorComponent(sal_uInt8 base, sal_uInt16
return static_cast<sal_uInt8>(color1 + color2);
}
-BitmapEx BitmapDuoToneFilter::execute(BitmapEx const& rBitmapEx)
+BitmapEx BitmapDuoToneFilter::execute(BitmapEx const& rBitmapEx) const
{
Bitmap aBitmap(rBitmapEx.GetBitmap());
diff --git a/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx b/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx
index 3c12c5364168..7b6e503ffe22 100644
--- a/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx
+++ b/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx
@@ -15,7 +15,7 @@
#include <bitmapwriteaccess.hxx>
-BitmapEx BitmapEmbossGreyFilter::execute(BitmapEx const& rBitmapEx)
+BitmapEx BitmapEmbossGreyFilter::execute(BitmapEx const& rBitmapEx) const
{
Bitmap aBitmap(rBitmapEx.GetBitmap());
diff --git a/vcl/source/bitmap/BitmapFastScaleFilter.cxx b/vcl/source/bitmap/BitmapFastScaleFilter.cxx
index 5d02e5ea32c6..cff8f3148980 100644
--- a/vcl/source/bitmap/BitmapFastScaleFilter.cxx
+++ b/vcl/source/bitmap/BitmapFastScaleFilter.cxx
@@ -26,7 +26,7 @@
#include <BitmapFastScaleFilter.hxx>
#include <sal/log.hxx>
-BitmapEx BitmapFastScaleFilter::execute(BitmapEx const& rBitmapEx)
+BitmapEx BitmapFastScaleFilter::execute(BitmapEx const& rBitmapEx) const
{
SAL_INFO("vcl.gdi", "BitmapFastScaleFilter::execute()");
diff --git a/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx b/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx
index d65d82e238b3..38b417929bb3 100644
--- a/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx
+++ b/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx
@@ -17,7 +17,7 @@
#include <bitmapwriteaccess.hxx>
-BitmapEx BitmapGaussianSeparableBlurFilter::execute(BitmapEx const& rBitmapEx)
+BitmapEx BitmapGaussianSeparableBlurFilter::execute(BitmapEx const& rBitmapEx) const
{
Bitmap aBitmap(rBitmapEx.GetBitmap());
@@ -86,7 +86,7 @@ bool BitmapGaussianSeparableBlurFilter::convolutionPass(Bitmap& rBitmap, Bitmap&
BitmapReadAccess const* pReadAcc,
int aNumberOfContributions,
const double* pWeights, int const* pPixels,
- const int* pCount)
+ const int* pCount) const
{
if (!pReadAcc)
return false;
diff --git a/vcl/source/bitmap/BitmapInterpolateScaleFilter.cxx b/vcl/source/bitmap/BitmapInterpolateScaleFilter.cxx
index 32266595b93e..cbc5dc34d837 100644
--- a/vcl/source/bitmap/BitmapInterpolateScaleFilter.cxx
+++ b/vcl/source/bitmap/BitmapInterpolateScaleFilter.cxx
@@ -26,7 +26,7 @@
#include <BitmapFastScaleFilter.hxx>
#include <BitmapInterpolateScaleFilter.hxx>
-BitmapEx BitmapInterpolateScaleFilter::execute(BitmapEx const& rBitmapEx)
+BitmapEx BitmapInterpolateScaleFilter::execute(BitmapEx const& rBitmapEx) const
{
Bitmap aBitmap(rBitmapEx.GetBitmap());
diff --git a/vcl/source/bitmap/BitmapLightenFilter.cxx b/vcl/source/bitmap/BitmapLightenFilter.cxx
index 1432ce02ae59..52e41ae33e97 100644
--- a/vcl/source/bitmap/BitmapLightenFilter.cxx
+++ b/vcl/source/bitmap/BitmapLightenFilter.cxx
@@ -15,7 +15,7 @@
#include <bitmapwriteaccess.hxx>
#include <BitmapLightenFilter.hxx>
-BitmapEx BitmapLightenFilter::execute(BitmapEx const& rBitmapEx)
+BitmapEx BitmapLightenFilter::execute(BitmapEx const& rBitmapEx) const
{
const Size aSize(rBitmapEx.GetSizePixel());
diff --git a/vcl/source/bitmap/BitmapMedianFilter.cxx b/vcl/source/bitmap/BitmapMedianFilter.cxx
index 45f1149a1c0c..81b935ac5212 100644
--- a/vcl/source/bitmap/BitmapMedianFilter.cxx
+++ b/vcl/source/bitmap/BitmapMedianFilter.cxx
@@ -52,7 +52,7 @@
MN3(a, b, c); \
MX3(d, e, f);
-BitmapEx BitmapMedianFilter::execute(BitmapEx const& rBitmapEx)
+BitmapEx BitmapMedianFilter::execute(BitmapEx const& rBitmapEx) const
{
Bitmap aBitmap(rBitmapEx.GetBitmap());
diff --git a/vcl/source/bitmap/BitmapMonochromeFilter.cxx b/vcl/source/bitmap/BitmapMonochromeFilter.cxx
index 0bdb2cd09226..72bacf84955a 100644
--- a/vcl/source/bitmap/BitmapMonochromeFilter.cxx
+++ b/vcl/source/bitmap/BitmapMonochromeFilter.cxx
@@ -15,7 +15,7 @@
#include <bitmapwriteaccess.hxx>
-BitmapEx BitmapMonochromeFilter::execute(BitmapEx const& aBitmapEx)
+BitmapEx BitmapMonochromeFilter::execute(BitmapEx const& aBitmapEx) const
{
Bitmap aBitmap = aBitmapEx.GetBitmap();
Bitmap::ScopedReadAccess pReadAcc(aBitmap);
diff --git a/vcl/source/bitmap/BitmapMosaicFilter.cxx b/vcl/source/bitmap/BitmapMosaicFilter.cxx
index 496d687ef4e3..0b94cf845f7c 100644
--- a/vcl/source/bitmap/BitmapMosaicFilter.cxx
+++ b/vcl/source/bitmap/BitmapMosaicFilter.cxx
@@ -15,18 +15,12 @@
#include <bitmapwriteaccess.hxx>
-BitmapEx BitmapMosaicFilter::execute(BitmapEx const& rBitmapEx)
+BitmapEx BitmapMosaicFilter::execute(BitmapEx const& rBitmapEx) const
{
Bitmap aBitmap(rBitmapEx.GetBitmap());
bool bRet = false;
- if (!mnTileWidth)
- mnTileWidth = 1;
-
- if (!mnTileHeight)
- mnTileHeight = 1;
-
if (mnTileWidth > 1 || mnTileHeight > 1)
{
Bitmap* pNewBmp;
diff --git a/vcl/source/bitmap/BitmapPopArtFilter.cxx b/vcl/source/bitmap/BitmapPopArtFilter.cxx
index 15b1b9ea09dd..271cb658258b 100644
--- a/vcl/source/bitmap/BitmapPopArtFilter.cxx
+++ b/vcl/source/bitmap/BitmapPopArtFilter.cxx
@@ -17,7 +17,7 @@
#include <cstdlib>
-BitmapEx BitmapPopArtFilter::execute(BitmapEx const& rBitmapEx)
+BitmapEx BitmapPopArtFilter::execute(BitmapEx const& rBitmapEx) const
{
Bitmap aBitmap(rBitmapEx.GetBitmap());
diff --git a/vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx b/vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx
index 566abf22c78a..95345ae88fbe 100644
--- a/vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx
+++ b/vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx
@@ -372,7 +372,7 @@ bool ImplScaleConvolution(Bitmap& rBitmap, const double& rScaleX, const double&
} // end anonymous namespace
-BitmapEx BitmapScaleConvolutionFilter::execute(BitmapEx const& rBitmapEx)
+BitmapEx BitmapScaleConvolutionFilter::execute(BitmapEx const& rBitmapEx) const
{
bool bRetval = false;
Bitmap aBitmap(rBitmapEx.GetBitmap());
diff --git a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
index 10ab46f5214c..9668a4a28a45 100644
--- a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
+++ b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
@@ -930,7 +930,7 @@ BitmapScaleSuperFilter::BitmapScaleSuperFilter(const double& rScaleX, const doub
BitmapScaleSuperFilter::~BitmapScaleSuperFilter()
{}
-BitmapEx BitmapScaleSuperFilter::execute(BitmapEx const& rBitmap)
+BitmapEx BitmapScaleSuperFilter::execute(BitmapEx const& rBitmap) const
{
Bitmap aBitmap(rBitmap.GetBitmap());
diff --git a/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx b/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx
index 4361cb864c87..0ee1fd3159b2 100644
--- a/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx
+++ b/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx
@@ -18,7 +18,7 @@
#include <bitmapwriteaccess.hxx>
-BitmapEx BitmapSeparableUnsharpenFilter::execute(BitmapEx const& rBitmapEx)
+BitmapEx BitmapSeparableUnsharpenFilter::execute(BitmapEx const& rBitmapEx) const
{
Bitmap aBitmap(rBitmapEx.GetBitmap());
diff --git a/vcl/source/bitmap/BitmapSepiaFilter.cxx b/vcl/source/bitmap/BitmapSepiaFilter.cxx
index 0d1a41083974..9e2aaeaac31d 100644
--- a/vcl/source/bitmap/BitmapSepiaFilter.cxx
+++ b/vcl/source/bitmap/BitmapSepiaFilter.cxx
@@ -15,7 +15,7 @@
#include <bitmapwriteaccess.hxx>
-BitmapEx BitmapSepiaFilter::execute(BitmapEx const& rBitmapEx)
+BitmapEx BitmapSepiaFilter::execute(BitmapEx const& rBitmapEx) const
{
Bitmap aBitmap(rBitmapEx.GetBitmap());
Bitmap::ScopedReadAccess pReadAcc(aBitmap);
diff --git a/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx b/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx
index 5436a227770e..1885308275e5 100644
--- a/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx
+++ b/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx
@@ -18,7 +18,7 @@
#include <cstdlib>
-BitmapEx BitmapSimpleColorQuantizationFilter::execute(BitmapEx const& aBitmapEx)
+BitmapEx BitmapSimpleColorQuantizationFilter::execute(BitmapEx const& aBitmapEx) const
{
Bitmap aBitmap = aBitmapEx.GetBitmap();
diff --git a/vcl/source/bitmap/BitmapSmoothenFilter.cxx b/vcl/source/bitmap/BitmapSmoothenFilter.cxx
index 49ecfc97122e..3e6f3148cd3d 100644
--- a/vcl/source/bitmap/BitmapSmoothenFilter.cxx
+++ b/vcl/source/bitmap/BitmapSmoothenFilter.cxx
@@ -17,7 +17,7 @@
#include <bitmapwriteaccess.hxx>
-BitmapEx BitmapSmoothenFilter::execute(BitmapEx const& rBitmapEx)
+BitmapEx BitmapSmoothenFilter::execute(BitmapEx const& rBitmapEx) const
{
BitmapEx aBitmapEx(rBitmapEx);
bool bRet = false;
diff --git a/vcl/source/bitmap/BitmapSobelGreyFilter.cxx b/vcl/source/bitmap/BitmapSobelGreyFilter.cxx
index 450772dd2abe..47c6f438f995 100644
--- a/vcl/source/bitmap/BitmapSobelGreyFilter.cxx
+++ b/vcl/source/bitmap/BitmapSobelGreyFilter.cxx
@@ -15,7 +15,7 @@
#include <bitmapwriteaccess.hxx>
-BitmapEx BitmapSobelGreyFilter::execute(BitmapEx const& rBitmapEx)
+BitmapEx BitmapSobelGreyFilter::execute(BitmapEx const& rBitmapEx) const
{
Bitmap aBitmap(rBitmapEx.GetBitmap());
diff --git a/vcl/source/bitmap/BitmapSolarizeFilter.cxx b/vcl/source/bitmap/BitmapSolarizeFilter.cxx
index 3c8b3b598c68..d12986c81c9f 100644
--- a/vcl/source/bitmap/BitmapSolarizeFilter.cxx
+++ b/vcl/source/bitmap/BitmapSolarizeFilter.cxx
@@ -15,7 +15,7 @@
#include <bitmapwriteaccess.hxx>
-BitmapEx BitmapSolarizeFilter::execute(BitmapEx const& rBitmapEx)
+BitmapEx BitmapSolarizeFilter::execute(BitmapEx const& rBitmapEx) const
{
Bitmap aBitmap(rBitmapEx.GetBitmap());
bool bRet = false;
diff --git a/vcl/source/bitmap/bitmapfilter.cxx b/vcl/source/bitmap/bitmapfilter.cxx
index 1cfb6d4d4d36..b28573cf3906 100644
--- a/vcl/source/bitmap/bitmapfilter.cxx
+++ b/vcl/source/bitmap/bitmapfilter.cxx
@@ -18,7 +18,7 @@ BitmapFilter::BitmapFilter() {}
BitmapFilter::~BitmapFilter() {}
-bool BitmapFilter::Filter(BitmapEx& rBmpEx, BitmapFilter& rFilter)
+bool BitmapFilter::Filter(BitmapEx& rBmpEx, BitmapFilter const & rFilter)
{
BitmapEx aTmpBmpEx(rFilter.execute(rBmpEx));
@@ -32,7 +32,7 @@ bool BitmapFilter::Filter(BitmapEx& rBmpEx, BitmapFilter& rFilter)
return true;
}
-bool BitmapFilter::Filter(Animation& rAnimation, BitmapFilter& rFilter)
+bool BitmapFilter::Filter(Animation& rAnimation, BitmapFilter const & rFilter)
{
SAL_WARN_IF(rAnimation.IsInAnimation(), "vcl", "Animation modified while it is animated");
More information about the Libreoffice-commits
mailing list