Added copyright lines for files I've edited this year.

[synfig.git] / synfig-core / trunk / src / synfig / color.h

diff --git a/synfig-core/trunk/src/synfig/color.h b/synfig-core/trunk/src/synfig/color.h
index 22d0587..d54b0e9 100644 (file)
--- a/synfig-core/trunk/src/synfig/color.h
+++ b/synfig-core/trunk/src/synfig/color.h
@@ -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
@@ -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)