Code cleanups

on behalf of Lebedev, see issue 1332
This commit is contained in:
Oliver Duis
2012-04-22 10:44:51 +02:00
parent 0dec768a2b
commit 29dc72e26c
105 changed files with 539 additions and 690 deletions

View File

@@ -5,7 +5,12 @@
#include "rtengine.h"
#define D50x 0.96422
#define D50z 0.82521
namespace rtengine {
static const int MAXVAL = 0xffff;
template <typename _Tp>
inline const _Tp SQR (_Tp x) {
// return std::pow(x,2); Slower than:
@@ -22,6 +27,24 @@ namespace rtengine {
return std::max(a,b);
}
template<typename _Tp>
inline const _Tp& LIM(const _Tp& a, const _Tp& b, const _Tp& c) {
return std::max(b,std::min(a,c));
}
template<typename _Tp>
inline const _Tp& ULIM(const _Tp& a, const _Tp& b, const _Tp& c) {
return ((b < c) ? LIM(a,b,c) : LIM(a,c,b));
}
template<typename _Tp>
inline const _Tp& CLIP(const _Tp& a) {
return LIM(a, static_cast<typeof(a)>(0), static_cast<typeof(a)>(MAXVAL));
//return ((a)>0.0? ((a)<MAXVAL?(a):MAXVAL):0.0);
}
template<typename _Tp>
inline const _Tp& min(const _Tp& a, const _Tp& b, const _Tp& c) {
return std::min(c,std::min(a,b));