projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo: 'cacheing' -> 'caching'.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
valuenode_range.cpp
diff --git
a/synfig-core/trunk/src/synfig/valuenode_range.cpp
b/synfig-core/trunk/src/synfig/valuenode_range.cpp
index
40104d0
..
10d7f55
100644
(file)
--- a/
synfig-core/trunk/src/synfig/valuenode_range.cpp
+++ b/
synfig-core/trunk/src/synfig/valuenode_range.cpp
@@
-6,6
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007 Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-110,10
+111,6
@@
synfig::ValueNode_Range::~ValueNode_Range()
unlink_all();
}
unlink_all();
}
-#define min(x,y) (x>y ? y : x)
-#define max(x,y) (x>y ? x : y)
-#define range(low,high,input) (min(high,max(low,input)))
-
synfig::ValueBase
synfig::ValueNode_Range::operator()(Time t)const
{
synfig::ValueBase
synfig::ValueNode_Range::operator()(Time t)const
{
@@
-138,11
+135,11
@@
synfig::ValueNode_Range::operator()(Time t)const
return maximum;
}
case ValueBase::TYPE_INTEGER:
return maximum;
}
case ValueBase::TYPE_INTEGER:
- return
range((*min_)(t).get(int()), (*max_)(t).get(int()), (*link_)(t).get(int(
)));
+ return
std::max((*min_)(t).get(int()), std::min((*max_)(t).get(int()), (*link_)(t).get(int()
)));
case ValueBase::TYPE_REAL:
case ValueBase::TYPE_REAL:
- return
range((*min_)(t).get(Real()), (*max_)(t).get(Real()), (*link_)(t).get(Real(
)));
+ return
std::max((*min_)(t).get(Real()), std::min((*max_)(t).get(Real()), (*link_)(t).get(Real()
)));
case ValueBase::TYPE_TIME:
case ValueBase::TYPE_TIME:
- return
range((*min_)(t).get(Time()), (*max_)(t).get(Time()), (*link_)(t).get(Time(
)));
+ return
std::max((*min_)(t).get(Time()), std::min((*max_)(t).get(Time()), (*link_)(t).get(Time()
)));
default:
assert(0);
break;
default:
assert(0);
break;