Partially fix 1702760: stop compiler warning about trgt_png.cpp.

[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 9ef2c03..d70ed3f 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;
@@ -82,7 +84,12 @@ Color::set_hex(String& hex)
        value_type r, g, b;
        try
        {
-               if (hex.size() == 3)
+               if (hex.size() == 1)
+               {
+                       r = hex2real(hex.substr(0,1)+hex.substr(0,1));
+                       r_ = g_ = b_ = r;
+               }
+               else if (hex.size() == 3)
                {
                        r = hex2real(hex.substr(0,1)+hex.substr(0,1));
                        g = hex2real(hex.substr(1,1)+hex.substr(1,1));