projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nur
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
curve_helper.cpp
diff --git
a/synfig-core/trunk/src/synfig/curve_helper.cpp
b/synfig-core/trunk/src/synfig/curve_helper.cpp
index
62023f8
..
b613b19
100644
(file)
--- a/
synfig-core/trunk/src/synfig/curve_helper.cpp
+++ b/
synfig-core/trunk/src/synfig/curve_helper.cpp
@@
-1,4
+1,4
@@
-/* === S
I N F G ==
========================================================= */
+/* === S
Y N F I G
========================================================= */
/*! \file curve_helper.cpp
** \brief Curve Helper File
**
/*! \file curve_helper.cpp
** \brief Curve Helper File
**
@@
-39,7
+39,7
@@
using namespace std;
using namespace etl;
using namespace std;
using namespace etl;
-using namespace s
inf
g;
+using namespace s
ynfi
g;
/* === M A C R O S ========================================================= */
#define ERR 1e-11
/* === M A C R O S ========================================================= */
#define ERR 1e-11
@@
-53,7
+53,7
@@
const Real ERROR = 1e-11;
/* === E N T R Y P O I N T ================================================= */
/* === E N T R Y P O I N T ================================================= */
-Real s
inf
g::find_closest(const etl::bezier<Point> &curve, const Point &point,
+Real s
ynfi
g::find_closest(const etl::bezier<Point> &curve, const Point &point,
float step, Real *dout, float *tout)
{
#if 0
float step, Real *dout, float *tout)
{
#if 0
@@
-261,7
+261,7
@@
void BezHull::Bound(const etl::bezier<Point> &b)
//Line Intersection
int
//Line Intersection
int
-s
inf
g::intersect(const Point &p1, const Vector &v1, float &t1,
+s
ynfi
g::intersect(const Point &p1, const Vector &v1, float &t1,
const Point &p2, const Vector &v2, float &t2)
{
/* Parametric intersection:
const Point &p2, const Vector &v2, float &t2)
{
/* Parametric intersection:
@@
-341,7
+341,7
@@
int intersect(const Rect &r, const Point &p, const Vector &v)
return (int)(t[0] <= t[3] && t[1] >= t[2]);
}
return (int)(t[0] <= t[3] && t[1] >= t[2]);
}
-int s
inf
g::intersect(const Rect &r, const Point &p)
+int s
ynfi
g::intersect(const Rect &r, const Point &p)
{
return (p[1] < r.maxy && p[1] > r.miny) && p[0] > r.minx;
}
{
return (p[1] < r.maxy && p[1] > r.miny) && p[0] > r.minx;
}
@@
-695,7
+695,7
@@
int intersect_scurve(const CIntersect::SCurve &b, const Point &p)
return intersect_scurve(l,p) + intersect_scurve(r,p);
}
return intersect_scurve(l,p) + intersect_scurve(r,p);
}
-int s
inf
g::intersect(const bezier<Point> &b, const Point &p)
+int s
ynfi
g::intersect(const bezier<Point> &b, const Point &p)
{
CIntersect::SCurve c(b,0,1);
{
CIntersect::SCurve c(b,0,1);