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

[Noel Grandin]

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

New commits:
commit 478133eefe43ad09159a156ae3d4d55c3db78f54
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Mar 27 09:40:31 2015 +0200

    fix std::min issue
    
    some tinderboxes are complaining with:
    could not deduce template argument for 'std::initializer_list<_Elem>' from 'int'
    
    Change-Id: Ib6bb1c9958a86fd7bb98d5ce855764f381d2ba43

diff --git a/vcl/source/bitmap/BitmapFilterStackBlur.cxx b/vcl/source/bitmap/BitmapFilterStackBlur.cxx
index bedc2b7..86b8af3 100644
--- a/vcl/source/bitmap/BitmapFilterStackBlur.cxx
+++ b/vcl/source/bitmap/BitmapFilterStackBlur.cxx
@@ -436,7 +436,7 @@ void stackBlurVertical(
 void stackBlur24(Bitmap& rBitmap, sal_Int32 nRadius, sal_Int32 nComponentWidth)
 {
     // Limit radius
-    nRadius = std::min(254, std::max<sal_Int32>(2, nRadius));
+    nRadius = std::min<sal_Int32>(254, std::max<sal_Int32>(2, nRadius));
     const long nColorChannels = 3; // 3 color channel
     BlurSharedData aData(nRadius, nComponentWidth, nColorChannels);