projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow the 'subtract' convert type to work with times.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
color.cpp
diff --git
a/synfig-core/trunk/src/synfig/color.cpp
b/synfig-core/trunk/src/synfig/color.cpp
index
d70ed3f
..
576b212
100644
(file)
--- a/
synfig-core/trunk/src/synfig/color.cpp
+++ b/
synfig-core/trunk/src/synfig/color.cpp
@@
-34,6
+34,7
@@
#include <cstdio>
#include <sstream>
#include <iostream>
#include <cstdio>
#include <sstream>
#include <iostream>
+#include <iomanip>
#endif
#endif
@@
-47,8
+48,6
@@
using namespace std;
/* === G L O B A L S ======================================================= */
/* === G L O B A L S ======================================================= */
-String Color::hex_;
-
/* === P R O C E D U R E S ================================================= */
/* === M E T H O D S ======================================================= */
/* === P R O C E D U R E S ================================================= */
/* === M E T H O D S ======================================================= */
@@
-111,6
+110,14
@@
Color::set_hex(String& hex)
}
}
}
}
+const String
+Color::get_string(void)const
+{
+ std::ostringstream o;
+ o << std::fixed << std::setprecision(3) << "#" << get_hex() << " : " << std::setw(6) << a_;
+ return String(o.str().c_str());
+}
+
#if 0
Color&
Color::rotate_uv(const Angle& theta)const
#if 0
Color&
Color::rotate_uv(const Angle& theta)const
@@
-376,7
+383,7
@@
blendfunc_DIVIDE(Color &a,Color &b,float amount)
// We add COLOR_EPSILON in order to avoid a divide-by-zero condition.
// This causes DIVIDE to bias toward positive values, but the effect is
// We add COLOR_EPSILON in order to avoid a divide-by-zero condition.
// This causes DIVIDE to bias toward positive values, but the effect is
- // really negl
ega
ble. There is a reason why we use COLOR_EPSILON--we
+ // really negl
igi
ble. There is a reason why we use COLOR_EPSILON--we
// want the change to be imperceptable.
b.set_r(((b.get_r()/(a.get_r()+COLOR_EPSILON))-b.get_r())*(amount)+b.get_r());
// want the change to be imperceptable.
b.set_r(((b.get_r()/(a.get_r()+COLOR_EPSILON))-b.get_r())*(amount)+b.get_r());