Remove .gitignore do nothing is ignored.

[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 6805f26..d599620 100644 (file)
--- a/synfig-core/trunk/src/synfig/curve_helper.cpp
+++ b/synfig-core/trunk/src/synfig/curve_helper.cpp
@@ -530,7 +530,7 @@ static int recurse_intersect(const CIntersect::SCurve &b, const Point &p1, int d
 
                for(int i = 0; i < 3; ++i)
                {
-                       //intersect line segmentsssss
+                       //intersect line segments
 
                        //solve for the y_value
                        Vector v = b.b[i+1] - b.b[i];
@@ -569,7 +569,7 @@ int intersect(const bezier<Point> &b, const Point &p)
 //Curve curve intersection
 void CIntersect::recurse_intersect(const SCurve &left, const SCurve &right, int depth)
 {
-       //reject curves that do not overlap with bouding boxes
+       //reject curves that do not overlap with bounding boxes
        if(!intersect(left.aabb,right.aabb)) return;
 
        //accept curves (and perform super detailed check for intersections)
@@ -590,7 +590,7 @@ void CIntersect::recurse_intersect(const SCurve &left, const SCurve &right, int
                {
                        for(int j = 0; j < 3; ++j)
                        {
-                               //intersect line segmentsssss
+                               //intersect line segments
                                if(intersect_line_segments(left.b[i],left.b[i+1],t,right.b[j],right.b[j+1],s))
                                {
                                        //We got one Jimmy
@@ -621,7 +621,7 @@ void CIntersect::recurse_intersect(const SCurve &left, const SCurve &right, int
 
 
 
-bool CIntersect::operator()(const bezier<Point> &c1, const bezier<Point> &c2)
+bool CIntersect::operator()(const etl::bezier<Point> &c1, const etl::bezier<Point> &c2)
 {
        times.clear();