Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-studio / trunk / src / synfigapp / blineconvert.h

diff --git a/synfig-studio/trunk/src/synfigapp/blineconvert.h b/synfig-studio/trunk/src/synfigapp/blineconvert.h
index 7e5c020..2b27187 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/blineconvert.h
+++ b/synfig-studio/trunk/src/synfigapp/blineconvert.h
@@ -2,7 +2,7 @@
 /*!    \file blineconvert.h
 **     \brief Template Header
 **
-**     $Id: blineconvert.h,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -39,7 +39,7 @@
 /* === C L A S S E S & S T R U C T S ======================================= */
 
 namespace synfigapp {
-       
+
 class BLineConverter
 {
 public:
@@ -48,51 +48,51 @@ public:
                int             curind;
                synfig::Real    tangentscale;
                synfig::Real    error;  //negative error will indicate invalid;
-               
-               cpindex(int ci, synfig::Real s=0, synfig::Real e=-1) 
-               :curind(ci), tangentscale(s), error(e) 
+
+               cpindex(int ci, synfig::Real s=0, synfig::Real e=-1)
+               :curind(ci), tangentscale(s), error(e)
                {}
-               
+
                cpindex(const cpindex & o)
-               :curind(o.curind), tangentscale(o.tangentscale), error(o.error) 
+               :curind(o.curind), tangentscale(o.tangentscale), error(o.error)
                {}
-               
-               const cpindex & operator = (const cpindex & rhs)
+
+               const cpindex & operator=(const cpindex & rhs)
                {
                        curind = rhs.curind;
                        tangentscale = rhs.tangentscale;
                        error = rhs.error;
                        return *this;
                }
-               
-               bool operator < (const cpindex &rhs) const
+
+               bool operator<(const cpindex &rhs) const
                {
-                       return curind < rhs.curind;             
+                       return curind < rhs.curind;
                }
-               
+
                //point is obviously in[curind]
                //tangent scale will get reset to the smallest (or something else depending on experimentation)
        };
 
 private:
        //cached data
-       std::vector<synfig::Point>      f;      //the preprocessed input cache
-       std::vector<synfig::Real>       f_w;
+       std::vector<synfig::Point>      point_cache;    //the preprocessed input cache
+       std::vector<synfig::Real>       width_cache;
 
        //temporary point storage for vector calc
        std::vector<synfig::Point>      ftemp;
-       
-       std::vector<synfig::Vector>     df; //the derivative cache      
-       std::vector<synfig::Real>       cvt; //the curvature cache
-       
-       std::vector<int>                        brk; //the break point cache
-       
-       std::vector<synfig::Real>       di,     //cumulative distance
-                                                               d_i; //distance between adjacent segments
-       
+
+       std::vector<synfig::Vector>     deriv; //the derivative cache
+       std::vector<synfig::Real>       curvature; //the curvature cache
+
+       std::vector<int>                        break_tangents; //the break point cache
+
+       std::vector<synfig::Real>       cum_dist,       //cumulative distance
+                                                               this_dist; //distance between adjacent segments
+
        std::vector<synfig::Point>      work; //the working point cache for the entire curve
        std::vector<cpindex>            curind;
-       
+
        //function parameters
        void clear();
 
@@ -106,9 +106,9 @@ public:
        BLineConverter();
 
        static void EnforceMinWidth(std::list<synfig::BLinePoint> &bline, synfig::Real min_pressure);
-       void operator ()(std::list<synfig::BLinePoint> &out, const std::list<synfig::Point> &in,const std::list<synfig::Real> &in_w);
+       void operator()(std::list<synfig::BLinePoint> &out, const std::list<synfig::Point> &in,const std::list<synfig::Real> &in_w);
 };
-       
+
 }; // END of namespace synfigapp
 
 /* === E N D =============================================================== */