Don't include atkmm/stateset.h, since it is unused and will be removed from gtkmm...

[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..cf0ff1b 100644 (file)
--- a/synfig-core/trunk/src/synfig/curve_helper.cpp
+++ b/synfig-core/trunk/src/synfig/curve_helper.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file curve_helper.cpp
 **     \brief Curve Helper File
 **
 **     $Id: curve_helper.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**     This software and associated documentation
-**     are CONFIDENTIAL and PROPRIETARY property of
-**     the above-mentioned copyright holder.
+**     This package is free software; you can redistribute it and/or
+**     modify it under the terms of the GNU General Public License as
+**     published by the Free Software Foundation; either version 2 of
+**     the License, or (at your option) any later version.
 **
-**     You may not copy, print, publish, or in any
-**     other way distribute this software without
-**     a prior written agreement with
-**     the copyright holder.
+**     This package is distributed in the hope that it will be useful,
+**     but WITHOUT ANY WARRANTY; without even the implied warranty of
+**     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**     General Public License for more details.
 **     \endlegal
 */
 /* ========================================================================= */
@@ -39,7 +40,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 #define ERR    1e-11
@@ -53,7 +54,7 @@ const Real ERROR = 1e-11;
 
 /* === E N T R Y P O I N T ================================================= */
 
-Real sinfg::find_closest(const etl::bezier<Point> &curve, const Point &point, 
+Real synfig::find_closest(const etl::bezier<Point> &curve, const Point &point, 
                                float step, Real *dout, float *tout)
 {
 #if 0
@@ -261,7 +262,7 @@ void BezHull::Bound(const etl::bezier<Point> &b)
 
 //Line Intersection
 int 
-sinfg::intersect(const Point &p1, const Vector &v1, float &t1, 
+synfig::intersect(const Point &p1, const Vector &v1, float &t1, 
                                        const Point &p2, const Vector &v2, float &t2)
 {
        /* Parametric intersection:
@@ -341,7 +342,7 @@ int intersect(const Rect &r, const Point &p, const Vector &v)
        return (int)(t[0] <= t[3] && t[1] >= t[2]);
 }
 
-int sinfg::intersect(const Rect &r, const Point &p)
+int synfig::intersect(const Rect &r, const Point &p)
 {
        return (p[1] < r.maxy && p[1] > r.miny) && p[0] > r.minx;
 }
@@ -695,7 +696,7 @@ int intersect_scurve(const CIntersect::SCurve &b, const Point &p)
        return  intersect_scurve(l,p) + intersect_scurve(r,p);
 }
 
-int sinfg::intersect(const bezier<Point> &b, const Point &p)
+int synfig::intersect(const bezier<Point> &b, const Point &p)
 {
        CIntersect::SCurve      c(b,0,1);