Author: Carlos Lopez <[email protected]>
Date: Fri Nov 23 19:07:05 2012 +0100
CairoColor: new constructor for integer color channels.
---
synfig-core/src/synfig/color.h | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/synfig-core/src/synfig/color.h b/synfig-core/src/synfig/color.h
index 435151b..15dd1db 100644
--- a/synfig-core/src/synfig/color.h
+++ b/synfig-core/src/synfig/color.h
@@ -689,7 +689,7 @@ public:
CairoColor
operator~()const
- { return CairoColor(ceil-get_r(),ceil-get_g(),ceil-get_b(),get_a()); }
+ { return CairoColor((unsigned char)(ceil-get_r()),(unsigned
char)(ceil-get_g()),(unsigned char)(ceil-get_b()),get_a()); }
bool is_valid()const
{ return true; }
@@ -731,6 +731,7 @@ public:
// From CairoColorAccumulator
friend class CairoColorAccumulator;
CairoColor(const CairoColorAccumulator& c);
+ CairoColor(int r, int g, int b, int a);
const value_type get_pixel()const {return pixel; }
const unsigned char get_a()const { return pixel>>24; }
@@ -1038,7 +1039,15 @@ public:
set_g(CairoColor::clamp(c.g_*CairoColor::range));
set_b(CairoColor::clamp(c.b_*CairoColor::range));
}
-
+ inline
+ CairoColor::CairoColor(int r, int g, int b, int a)
+ {
+ set_r(CairoColor::clamp(r));
+ set_g(CairoColor::clamp(g));
+ set_b(CairoColor::clamp(b));
+ set_a(CairoColor::clamp(a));
+ }
+
//
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
