projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid warning.
[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
0f90a4b
..
cef640a
100644
(file)
--- a/
synfig-core/trunk/src/modules/mod_geometry/circle.cpp
+++ b/
synfig-core/trunk/src/modules/mod_geometry/circle.cpp
@@
-1,8
+1,8
@@
/* === S Y N F I G ========================================================= */
/*! \file circle.cpp
/* === S Y N F I G ========================================================= */
/*! \file circle.cpp
-** \brief
Template Head
er
+** \brief
Implementation of the "Circle" lay
er
**
**
-** $Id
: circle.cpp,v 1.2 2005/01/24 03:08:17 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@
-51,10
+51,10
@@
using namespace etl;
SYNFIG_LAYER_INIT(Circle);
SYNFIG_LAYER_SET_NAME(Circle,"circle");
SYNFIG_LAYER_INIT(Circle);
SYNFIG_LAYER_SET_NAME(Circle,"circle");
-SYNFIG_LAYER_SET_LOCAL_NAME(Circle,_("Circle"));
-SYNFIG_LAYER_SET_CATEGORY(Circle,_("Geometry"));
+SYNFIG_LAYER_SET_LOCAL_NAME(Circle,
N
_("Circle"));
+SYNFIG_LAYER_SET_CATEGORY(Circle,
N
_("Geometry"));
SYNFIG_LAYER_SET_VERSION(Circle,"0.1");
SYNFIG_LAYER_SET_VERSION(Circle,"0.1");
-SYNFIG_LAYER_SET_CVS_ID(Circle,"$Id
: circle.cpp,v 1.2 2005/01/24 03:08:17 darco Exp
$");
+SYNFIG_LAYER_SET_CVS_ID(Circle,"$Id$");
/* -- F U N C T I O N S ----------------------------------------------------- */
/* -- F U N C T I O N S ----------------------------------------------------- */
@@
-73,7
+73,9
@@
Circle::Circle():
bool
Circle::ImportParameters(const String ¶m, const ValueBase &value)
{
bool
Circle::ImportParameters(const String ¶m, 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);
IMPORT(radius);
IMPORT(feather);
IMPORT(invert);
@@
-441,7
+443,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
// 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 );
//int u,v;
int left = (int) floor( (pos[0] - x_neg*(radius+newfeather) - tl[0]) / pw );