projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 1795802: Fixed a crash in the animated gradient code I wrote yesterday. Added...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
color.h
diff --git
a/synfig-core/trunk/src/synfig/color.h
b/synfig-core/trunk/src/synfig/color.h
index
4624341
..
447bd56
100644
(file)
--- a/
synfig-core/trunk/src/synfig/color.h
+++ b/
synfig-core/trunk/src/synfig/color.h
@@
-28,6
+28,11
@@
/* === H E A D E R S ======================================================= */
/* === H E A D E R S ======================================================= */
+#include <iostream>
+#include <iomanip>
+#include <sstream>
+#include <string>
+
//#include <cmath>
#include <math.h>
#include <cassert>
//#include <cmath>
#include <math.h>
#include <cassert>
@@
-107,10
+112,16
@@
public:
private:
value_type a_, r_, g_, b_;
private:
value_type a_, r_, g_, b_;
- static String hex_;
public:
public:
+ inline const String 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());
+ }
+
Color &
operator+=(const Color &rhs)
{
Color &
operator+=(const Color &rhs)
{
@@
-271,7
+282,7
@@
public:
static const String real2hex(ColorReal c);
//! Returns the color as a 6 character hex sting
static const String real2hex(ColorReal c);
//! Returns the color as a 6 character hex sting
- const String
& get_hex()const { return hex_ = real2hex(r_)+real2hex(g_)+real2hex(b_
); }
+ const String
get_hex()const { return String(real2hex(r_)+real2hex(g_)+real2hex(b_)
); }
//! Sets the color's R, G, and B from a 3 or 6 character hex string
void set_hex(String& hex);
//! Sets the color's R, G, and B from a 3 or 6 character hex string
void set_hex(String& hex);