Author: Carlos Lopez <[email protected]>
Date: Tue Jun 5 19:40:02 2012 +0200
CairoColor: Don't use alpha=1 for default value. Use its own ceil value (255).
Constructor from Color uses constant argument.
---
synfig-core/src/synfig/color.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/synfig-core/src/synfig/color.h b/synfig-core/src/synfig/color.h
index 7e9802b..29a8680 100644
--- a/synfig-core/src/synfig/color.h
+++ b/synfig-core/src/synfig/color.h
@@ -707,13 +707,13 @@ public:
CairoColor() :a_(0), r_(0), g_(0), b_(0) { }
CairoColor(const unsigned char u) :a_(u),r_(u), g_(u), b_(u) { }
//CairoColor(int f) :a_(f),r_(f), g_(f), b_(f) { }
- CairoColor(const unsigned char R, const unsigned char G, const unsigned
char B, const unsigned char A=1):
+ CairoColor(const unsigned char R, const unsigned char G, const unsigned
char B, const unsigned char A=ceil()):
a_(A), r_(R), g_(G), b_(B) { }
CairoColor(const CairoColor& c, const unsigned char A):
a_(A), r_(c.r_), g_(c.g_), b_(c.b_) { }
CairoColor(const CairoColor& c): a_(c.a_), r_(c.r_), g_(c.g_), b_(c.b_)
{ }
// Conversor constructor
- CairoColor(Color& c)
+ CairoColor(const Color& c)
{
set_r((ceil()-floor())*c.get_r()/(Color::ceil()-Color::floor()));
set_g((ceil()-floor())*c.get_g()/(Color::ceil()-Color::floor()));
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
