X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcolor.h;h=a5455c1faf4112ac10aefd52847c01f5e12f729c;hb=0313f3153df081c11ff8a57d1ded6864142b21e2;hp=4624341159bcb42cb39ee61edc5bfa8d0d910300;hpb=710af67b5341a2be2c920ce04d16e8c598fb43b7;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/color.h b/synfig-core/trunk/src/synfig/color.h index 4624341..a5455c1 100644 --- a/synfig-core/trunk/src/synfig/color.h +++ b/synfig-core/trunk/src/synfig/color.h @@ -107,10 +107,11 @@ public: private: value_type a_, r_, g_, b_; - static String hex_; public: + const String get_string(void)const; + Color & operator+=(const Color &rhs) { @@ -271,7 +272,7 @@ public: 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);