X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcolor.cpp;h=1dcc314ebe049fe06add9eb84d6d7b953e96fc55;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=75e644196e7e49a6c59b15bd2bc1ee237fbe852f;hpb=e4883f31d05090b5e55b1364503862fb493ed7d1;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/color.cpp b/synfig-core/trunk/src/synfig/color.cpp
index 75e6441..1dcc314 100644
--- a/synfig-core/trunk/src/synfig/color.cpp
+++ b/synfig-core/trunk/src/synfig/color.cpp
@@ -6,7 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007 Chris Moore
+**	Copyright (c) 2007, 2008 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
@@ -444,7 +444,9 @@ blendfunc_BEHIND(Color &a,Color &b,float amount)
 static Color
 blendfunc_ALPHA_BRIGHTEN(Color &a,Color &b,float amount)
 {
-	if(a.get_a()<b.get_a()*amount)
+	// \todo can this be right, multiplying amount by *b*'s alpha?
+	// compare with blendfunc_BRIGHTEN where it is multiplied by *a*'s
+	if(a.get_a() < b.get_a()*amount)
 		return a.set_a(a.get_a()*amount);
 	return b;
 }
@@ -452,7 +454,7 @@ blendfunc_ALPHA_BRIGHTEN(Color &a,Color &b,float amount)
 static Color
 blendfunc_ALPHA_DARKEN(Color &a,Color &b,float amount)
 {
-	if(a.get_a()*amount>b.get_a())
+	if(a.get_a()*amount > b.get_a())
 		return a.set_a(a.get_a()*amount);
 	return b;
 }