projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow the 'subtract' convert type to work with times.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
layer_shape.cpp
diff --git
a/synfig-core/trunk/src/synfig/layer_shape.cpp
b/synfig-core/trunk/src/synfig/layer_shape.cpp
index
2c2d71d
..
3a9c52d
100644
(file)
--- a/
synfig-core/trunk/src/synfig/layer_shape.cpp
+++ b/
synfig-core/trunk/src/synfig/layer_shape.cpp
@@
-316,7
+316,7
@@
struct CurveArray
degrees.push_back(2);
}
degrees.push_back(2);
}
- static int intersect_conic(Real x, Real y, Point *p, int
level
= 0)
+ static int intersect_conic(Real x, Real y, Point *p, int
/*level*/
= 0)
{
Real ymin,ymax,xmin,xmax;
int intersects = 0;
{
Real ymin,ymax,xmin,xmax;
int intersects = 0;
@@
-440,7
+440,7
@@
struct CurveArray
const Real cn[4] = {a,b,c,d};
Real p,dp,newt,oldpmag=FLT_MAX;
const Real cn[4] = {a,b,c,d};
Real p,dp,newt,oldpmag=FLT_MAX;
- //eval cubic eqn and it
'
s derivative
+ //eval cubic eqn and its derivative
for(;;)
{
p = cn[0]*t + cn[1];
for(;;)
{
p = cn[0]*t + cn[1];
@@
-471,7
+471,7
@@
struct CurveArray
}
}
}
}
- static int intersect_cubic(Real x, Real y, Point *p, int
level
= 0)
+ static int intersect_cubic(Real x, Real y, Point *p, int
/*level*/
= 0)
{
const Real INVALIDROOT = -FLT_MAX;
Real ymin,ymax,xmin,xmax;
{
const Real INVALIDROOT = -FLT_MAX;
Real ymin,ymax,xmin,xmax;
@@
-2614,7
+2614,7
@@
Layer_Shape::accelerated_render(Context context,Surface *surface,int quality, co
}
bool
}
bool
-Layer_Shape::render_shape(Surface *surface,bool useblend,int
quality
,
+Layer_Shape::render_shape(Surface *surface,bool useblend,int
/*quality*/
,
const RendDesc &renddesc, ProgressCallback *cb)const
{
int tmp(0);
const RendDesc &renddesc, ProgressCallback *cb)const
{
int tmp(0);
@@
-2854,8
+2854,8
@@
Layer_Shape::render_shape(Surface *surface,bool useblend,int quality,
}
bool
}
bool
-Layer_Shape::render_shape(surface<float> *surface,int
quality
,
- const RendDesc &renddesc, ProgressCallback *
cb
)const
+Layer_Shape::render_shape(surface<float> *surface,int
/*quality*/
,
+ const RendDesc &renddesc, ProgressCallback *
/*cb*/
)const
{
// If our amount is set to zero, no need to render anything
if(!get_amount())
{
// If our amount is set to zero, no need to render anything
if(!get_amount())