X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcolor.cpp;h=6c4dd5b7beca7b9ceae4cacdb7227eb2346051bf;hb=f485d7a2c5c55a86c95ac92bd6cded4a0b47278a;hp=9ef2c03f2f3a46789d936171bdbebb50c0c12caf;hpb=40dda9d27b5249ee32f62d84c819ff569f078929;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/color.cpp b/synfig-core/trunk/src/synfig/color.cpp
index 9ef2c03..6c4dd5b 100644
--- a/synfig-core/trunk/src/synfig/color.cpp
+++ b/synfig-core/trunk/src/synfig/color.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -34,6 +35,7 @@
 #include <cstdio>
 #include <sstream>
 #include <iostream>
+#include <iomanip>
 
 #endif
 
@@ -53,7 +55,7 @@ using namespace std;
 
 
 
-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));
@@ -104,6 +111,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
@@ -369,8 +384,8 @@ 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
-	// really neglegable. There is a reason why we use COLOR_EPSILON--we
-	// want the change to be imperceptable.
+	// really negligible. There is a reason why we use COLOR_EPSILON--we
+	// want the change to be imperceptible.
 
 	b.set_r(((b.get_r()/(a.get_r()+COLOR_EPSILON))-b.get_r())*(amount)+b.get_r());
 	b.set_g(((b.get_g()/(a.get_g()+COLOR_EPSILON))-b.get_g())*(amount)+b.get_g());