Write "operator()" instead of "operator ()", "operator&" instead of "operator &"...

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

diff --git a/synfig-studio/trunk/src/synfigapp/blineconvert.cpp b/synfig-studio/trunk/src/synfigapp/blineconvert.cpp
index 770f42c..957e667 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/blineconvert.cpp
+++ b/synfig-studio/trunk/src/synfigapp/blineconvert.cpp
@@ -6,6 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -39,6 +40,8 @@
 #include <synfig/general.h>
 #include <cassert>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -387,7 +390,7 @@ synfigapp::BLineConverter::clear()
 }
 
 void
-synfigapp::BLineConverter::operator () (std::list<synfig::BLinePoint> &out, const std::list<synfig::Point> &in,const std::list<synfig::Real> &in_w)
+synfigapp::BLineConverter::operator()(std::list<synfig::BLinePoint> &out, const std::list<synfig::Point> &in,const std::list<synfig::Real> &in_w)
 {
        //Profiling information
        /*etl::clock::value_type initialprocess=0, curveval=0, breakeval=0, disteval=0;
@@ -422,24 +425,17 @@ synfigapp::BLineConverter::operator () (std::list<synfig::BLinePoint> &out, cons
                if(in.size() == in_w.size())
                {
                        for(;i != end; ++i,++iw)
-                       {
-                               //eliminate duplicate points
-                               if(*i != c)
+                               if(*i != c)             // eliminate duplicate points
                                {
                                        f.push_back(c = *i);
                                        f_w.push_back(*iw);
                                }
-                       }
-               }else
+               }
+               else
                {
                        for(;i != end; ++i)
-                       {
-                               //eliminate duplicate points
-                               if(*i != c)
-                               {
+                               if(*i != c)             // eliminate duplicate points
                                        f.push_back(c = *i);
-                               }
-                       }
                }
        }
        //initialprocess = timer();
@@ -499,7 +495,8 @@ synfigapp::BLineConverter::operator () (std::list<synfig::BLinePoint> &out, cons
                                        minc = cvt[i];
                                        maxi = i;
                                }
-                       }else if(maxi >= 0)
+                       }
+                       else if(maxi >= 0)
                        {
                                if(maxi >= last + 8)
                                {
@@ -608,7 +605,22 @@ synfigapp::BLineConverter::operator () (std::list<synfig::BLinePoint> &out, cons
                                gaussian_blur_3(ftemp.begin(),ftemp.end(),false);
 
                        df.resize(size);
+
+                       // Wondering whether the modification of the df vector
+                       // using a char* pointer and pointer arithmetric was safe,
+                       // I looked it up...
+                       // 
+                       // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2369.pdf tells me:
+                       // 
+                       //      23.2.5  Class template vector [vector]
+                       // 
+                       //      [...] The elements of a vector are stored contiguously,
+                       //      meaning that if v is a vector<T,Allocator> where T is
+                       //      some type other than bool, then it obeys the identity
+                       //      &v[n] == &v[0] + n for all 0 <= n < v.size().
+                       // 
                        GetFirstDerivatives(ftemp,0,size,(char*)&df[0],sizeof(df[0]));
+
                        //GetSimpleDerivatives(ftemp,0,size,df,0,di);
                        //< don't have to worry about indexing stuff as it is all being taken care of right now
                        //preproceval += timer();
@@ -812,10 +824,6 @@ void synfigapp::BLineConverter::EnforceMinWidth(std::list<synfig::BLinePoint> &b
                                                                                        end = bline.end();
 
        for(i = bline.begin(); i != end; ++i)
-       {
                if(i->get_width() < min_pressure)
-               {
                        i->set_width(min_pressure);
-               }
-       }
 }