summaryrefslogtreecommitdiff
path: root/vcl/source/bitmap
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-03-27 10:04:37 +0200
committerNoel Grandin <noel@peralex.com>2015-03-27 10:04:37 +0200
commit17551216cc6843e8dcdf84bd8f9735d1c7fb145c (patch)
tree114396cb95fd0e1f3d8978389ec4fd9d14aad9de /vcl/source/bitmap
parent25b6499d1f7638cf270da98b5bdfcfc7266283ce (diff)
more std::min and std::max fixes
Change-Id: I4e654419221b39dfd64d85a18ae0919bbe2fab5a
Diffstat (limited to 'vcl/source/bitmap')
-rw-r--r--vcl/source/bitmap/BitmapFilterStackBlur.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/bitmap/BitmapFilterStackBlur.cxx b/vcl/source/bitmap/BitmapFilterStackBlur.cxx
index 86b8af364f97..975f3ad0fa00 100644
--- a/vcl/source/bitmap/BitmapFilterStackBlur.cxx
+++ b/vcl/source/bitmap/BitmapFilterStackBlur.cxx
@@ -458,7 +458,7 @@ void stackBlur24(Bitmap& rBitmap, sal_Int32 nRadius, sal_Int32 nComponentWidth)
void stackBlur8(Bitmap& rBitmap, sal_Int32 nRadius, sal_Int32 nComponentWidth)
{
// Limit radius
- nRadius = std::min(254, std::max(2, nRadius));
+ nRadius = std::min<sal_Int32>(254, std::max<sal_Int32>(2, nRadius));
const long nColorChannels = 1; // 1 color channel
BlurSharedData aData(nRadius, nComponentWidth, nColorChannels);