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

[Noel Grandin]

 vcl/source/bitmap/BitmapFilterStackBlur.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 17551216cc6843e8dcdf84bd8f9735d1c7fb145c
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Mar 27 10:04:37 2015 +0200

    more std::min and std::max fixes
    
    Change-Id: I4e654419221b39dfd64d85a18ae0919bbe2fab5a

diff --git a/vcl/source/bitmap/BitmapFilterStackBlur.cxx b/vcl/source/bitmap/BitmapFilterStackBlur.cxx
index 86b8af3..975f3ad 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);