more std::min and std::max fixes

Change-Id: I4e654419221b39dfd64d85a18ae0919bbe2fab5a
This commit is contained in:
Noel Grandin 2015-03-27 10:04:37 +02:00
parent 25b6499d1f
commit 17551216cc

View File

@ -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);