liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert unintentional changes to rt_math.h

Browse Source 
This reverts a part of commit 7e70412090.
This commit is contained in:
Morgan Hardwood
2018-11-20 13:06:53 +01:00
parent 7e70412090
commit ab80e01451
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rtengine/rt_math.h
View File

@@ -56,13 +56,6 @@ constexpr const T& min(const T& a, const T& b)
return b < a ? b : a; return b < a ? b : a;
} }
template<>
constexpr const float& min(const float& a, const float& b)
{
// For consistency reasons we return b instead of a if a == b or a == NaN
return a < b ? a : b;
}
template<typename T, typename... ARGS> template<typename T, typename... ARGS>
constexpr const T& min(const T& a, const T& b, const ARGS&... args) constexpr const T& min(const T& a, const T& b, const ARGS&... args)
{ {
@@ -81,13 +74,6 @@ constexpr const T& max(const T& a, const T& b)
return a < b ? b : a; return a < b ? b : a;
} }
template<>
constexpr const float& max(const float& a, const float& b)
{
// For consistency reasons we return b instead of a if a == b or a == NaN
return b < a ? a : b;
}
template<typename T, typename... ARGS> template<typename T, typename... ARGS>
constexpr const T& max(const T& a, const T& b, const ARGS&... args) constexpr const T& max(const T& a, const T& b, const ARGS&... args)
{ {