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

[synfig.git] / synfig-core / trunk / src / modules / mod_geometry / circle.cpp

diff --git a/synfig-core/trunk/src/modules/mod_geometry/circle.cpp b/synfig-core/trunk/src/modules/mod_geometry/circle.cpp
index fca1ef7..4c38f45 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_geometry/circle.cpp
+++ b/synfig-core/trunk/src/modules/mod_geometry/circle.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!    \file circle.cpp
-**     \brief Template Header
+**     \brief Implementation of the "Circle" layer
 **
 **     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 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
@@ -73,7 +74,9 @@ Circle::Circle():
 bool
 Circle::ImportParameters(const String &param, const ValueBase &value)
 {
-       IMPORT(color);
+       IMPORT_PLUS(color, { if (color.get_a() == 0) { if (converted_blend_) {
+                                       set_blend_method(Color::BLEND_ALPHA_OVER);
+                                       color.set_a(1); } else transparent_color_ = true; } });
        IMPORT(radius);
        IMPORT(feather);
        IMPORT(invert);
@@ -441,7 +444,8 @@ Circle::accelerated_render(Context context,Surface *surface,int quality, const R
 
        // Increasing the feather amount by the size of
        // a pixel will create an anti-aliased appearance
-       const Real newfeather=feather + (abs(ph)+abs(pw))/4.0;
+       // don't render feathering at all when quality is 10
+       const Real newfeather = (quality == 10) ? 0 : feather + (abs(ph)+abs(pw))/4.0;
 
        //int u,v;
        int left =      (int)   floor( (pos[0] - x_neg*(radius+newfeather) - tl[0]) / pw );