Fixed a crash. Revision 354's addition of the 'mutable String hex_;' in class Color...

git-svn-id: http://svn.voria.com/code@356 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-core/trunk/src/synfig/color.cpp b/synfig-core/trunk/src/synfig/color.cpp
index 9ef2c03..7df6106 100644 (file)
--- a/synfig-core/trunk/src/synfig/color.cpp
+++ b/synfig-core/trunk/src/synfig/color.cpp
@@ -47,13 +47,15 @@ using namespace std;
 
 /* === 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 ======================================================= */
 
 
 
-static ColorReal
+ColorReal
 Color::hex2real(String s)
 {
        std::istringstream i(s);
@@ -64,7 +66,7 @@ Color::hex2real(String s)
        return n / 255.0f;
 }
 
-static const String
+const String
 Color::real2hex(ColorReal c)
 {
        std::ostringstream o;

diff --git a/synfig-core/trunk/src/synfig/color.h b/synfig-core/trunk/src/synfig/color.h
index 3d501a2..d3ae54d 100644 (file)
--- a/synfig-core/trunk/src/synfig/color.h
+++ b/synfig-core/trunk/src/synfig/color.h
@@ -107,7 +107,7 @@ public:
 
 private:
        value_type a_, r_, g_, b_;
-       mutable String hex_;
+       static String hex_;
 
 public: