mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not needlessly truncate MinMax argument before comparison with bounds

Browse Source 
Change-Id: I218e70d6a19901107fd037af255ad29692c850d4
Reviewed-on: https://gerrit.libreoffice.org/8461
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2014-03-05 12:24:14 +01:00
parent 0e78ce1483
commit f51f03a461
1 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
include/tools/helpers.hxx
View File

@@ -9,9 +9,39 @@
#ifndef INCLUDED_TOOLS_HELPERS_HXX #ifndef INCLUDED_TOOLS_HELPERS_HXX
#define INCLUDED_TOOLS_HELPERS_HXX #define INCLUDED_TOOLS_HELPERS_HXX
inline long MinMax( long nVal, long nMin, long nMax ) #include <sal/config.h>
#include <cassert>
#include <boost/mpl/or.hpp>
#include <boost/type_traits/is_floating_point.hpp>
#include <boost/type_traits/is_signed.hpp>
#include <boost/type_traits/is_unsigned.hpp>
#include <boost/utility/enable_if.hpp>
template<typename T>
inline
typename boost::enable_if<
boost::mpl::or_< boost::is_signed<T>, boost::is_floating_point<T> >, long>
::type
MinMax(T nVal, long nMin, long nMax)
{ {
return nVal >= nMin ? ( nVal <= nMax ? nVal : nMax ) : nMin; assert(nMin <= nMax);
return nVal >= nMin
? (nVal <= nMax ? static_cast<long>(nVal) : nMax) : nMin;
}
template<typename T>
inline typename boost::enable_if<boost::is_unsigned<T>, long>::type MinMax(
T nVal, long nMin, long nMax)
{
assert(nMin <= nMax);
return nMax < 0
? nMax
: ((nMin < 0 || nVal >= static_cast<unsigned long>(nMin))
? (nVal <= static_cast<unsigned long>(nMax)
? static_cast<long>(nVal) : nMax)
: nMin);
} }
inline long AlignedWidth4Bytes( long nWidthBits ) inline long AlignedWidth4Bytes( long nWidthBits )