X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcolor.h;h=28bed9ca062a287f84e42d2c1fdcbd72eb737b11;hb=64591d2bbceaf68a64008a0044e2fef3454e44ac;hp=ebeb0b33620bf9cfc2fdf5b1889b8b9759ba90ba;hpb=35e03c698607b883a5bc68cfcdeeecc83d4d949f;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/color.h b/synfig-core/trunk/src/synfig/color.h
index ebeb0b3..28bed9c 100644
--- a/synfig-core/trunk/src/synfig/color.h
+++ b/synfig-core/trunk/src/synfig/color.h
@@ -477,7 +477,7 @@ public:
 		BLEND_COMPOSITE=0,			//!< Color A is composited onto B (Taking A's alpha into account)
 		BLEND_STRAIGHT=1,			//!< Straight linear interpolation from A->B (Alpha ignored)
 		BLEND_ONTO=13,				//!< Similar to BLEND_COMPOSITE, except that B's alpha is maintained
-		BLEND_STRAIGHT_ONTO=21,		//!< <deprecated> \writeme
+		BLEND_STRAIGHT_ONTO=21,		//!< \deprecated \writeme
 		BLEND_BEHIND=12,			//!< Similar to BLEND_COMPOSITE, except that B is composited onto A.
 		BLEND_SCREEN=16,			//!< \writeme
 		BLEND_OVERLAY=20,			//!< \writeme
@@ -494,9 +494,9 @@ public:
 		BLEND_SATURATION=10,		//!< Preserves the magnitude of the UV Vector of color A
 		BLEND_LUMINANCE=11,			//!< Preserves the Y channel of color A
 
-		BLEND_ALPHA_BRIGHTEN=14,	//!< <deprecated> If A is less opaque than B, use A
-		BLEND_ALPHA_DARKEN=15,		//!< <deprecated> If A is more opaque than B, use B
-		BLEND_ALPHA_OVER=19,		//!< <deprecated> multiply alphas and then straight blends using the amount
+		BLEND_ALPHA_BRIGHTEN=14,	//!< \deprecated If A is less opaque than B, use A
+		BLEND_ALPHA_DARKEN=15,		//!< \deprecated If A is more opaque than B, use B
+		BLEND_ALPHA_OVER=19,		//!< \deprecated multiply alphas and then straight blends using the amount
 
 		BLEND_END=22				//!< \internal
 	};
@@ -524,6 +524,15 @@ public:
 			|| x==BLEND_HARD_LIGHT
 		;
 	}
+
+	//! a blending method is considered 'straight' if transparent pixels in the upper layer can affect the result of the blend
+	static bool is_straight(BlendMethod x)
+	{
+		return x==BLEND_STRAIGHT
+			|| x==BLEND_STRAIGHT_ONTO
+			|| x==BLEND_ALPHA_BRIGHTEN
+		;
+	}
 /*protected:
 
 	value_type& operator[](const int i)
@@ -727,7 +736,7 @@ enum PixelFormat
 
 	PF_A_INV=(1<<7),		//!< If set, the alpha channel is stored as 1.0-a
 	PF_Z_INV=(1<<8),		//!< If set, the ZDepth channel is stored as 1.0-z
-	PF_RAW_COLOR=(1<<9)+(1<<1)	//!< If set, the data represents a raw Color datastructure, and all other bits are ignored.
+	PF_RAW_COLOR=(1<<9)+(1<<1)	//!< If set, the data represents a raw Color data structure, and all other bits are ignored.
 };
 
 inline PixelFormat operator|(PixelFormat lhs, PixelFormat rhs)