projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo: 'suposidly' -> 'supposedly'.
[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
..
a7b5133
100644
(file)
--- 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
**
** \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
**
** 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 <cstdio>
#include <sstream>
#include <iostream>
+#include <iomanip>
#endif
#endif
@@
-53,7
+55,7
@@
using namespace std;
-
static
ColorReal
+ColorReal
Color::hex2real(String s)
{
std::istringstream i(s);
Color::hex2real(String s)
{
std::istringstream i(s);
@@
-64,7
+66,7
@@
Color::hex2real(String s)
return n / 255.0f;
}
return n / 255.0f;
}
-
static
const String
+const String
Color::real2hex(ColorReal c)
{
std::ostringstream o;
Color::real2hex(ColorReal c)
{
std::ostringstream o;
@@
-82,7
+84,12
@@
Color::set_hex(String& hex)
value_type r, g, b;
try
{
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));
{
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
#if 0
Color&
Color::rotate_uv(const Angle& theta)const
@@
-369,7
+384,7
@@
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
// 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 negl
ega
ble. There is a reason why we use COLOR_EPSILON--we
+ // really negl
igi
ble. There is a reason why we use COLOR_EPSILON--we
// want the change to be imperceptable.
b.set_r(((b.get_r()/(a.get_r()+COLOR_EPSILON))-b.get_r())*(amount)+b.get_r());
// want the change to be imperceptable.
b.set_r(((b.get_r()/(a.get_r()+COLOR_EPSILON))-b.get_r())*(amount)+b.get_r());