Cleanup: trailing space for freestyle
authorCampbell Barton <ideasman42@gmail.com>
Sun, 17 Jun 2018 15:05:14 +0000 (17:05 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 17 Jun 2018 15:05:14 +0000 (17:05 +0200)
83 files changed:
source/blender/freestyle/intern/application/AppCanvas.cpp
source/blender/freestyle/intern/application/Controller.cpp
source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
source/blender/freestyle/intern/geometry/FastGrid.h
source/blender/freestyle/intern/geometry/FitCurve.cpp
source/blender/freestyle/intern/geometry/FitCurve.h
source/blender/freestyle/intern/geometry/GeomUtils.h
source/blender/freestyle/intern/geometry/Grid.cpp
source/blender/freestyle/intern/geometry/GridHelpers.h
source/blender/freestyle/intern/geometry/SweepLine.h
source/blender/freestyle/intern/geometry/VecMat.h
source/blender/freestyle/intern/geometry/matrix_util.cpp
source/blender/freestyle/intern/image/GaussianFilter.h
source/blender/freestyle/intern/python/BPy_Convert.cpp
source/blender/freestyle/intern/python/BPy_Convert.h
source/blender/freestyle/intern/python/BPy_Freestyle.cpp
source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
source/blender/freestyle/intern/python/BPy_Interface0D.cpp
source/blender/freestyle/intern/python/BPy_MediumType.cpp
source/blender/freestyle/intern/python/BPy_SShape.cpp
source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
source/blender/freestyle/intern/python/BPy_ViewShape.cpp
source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp
source/blender/freestyle/intern/python/Director.cpp
source/blender/freestyle/intern/python/Director.h
source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
source/blender/freestyle/intern/scene_graph/LineRep.cpp
source/blender/freestyle/intern/scene_graph/Node.h
source/blender/freestyle/intern/scene_graph/NodeCamera.h
source/blender/freestyle/intern/scene_graph/NodeGroup.h
source/blender/freestyle/intern/scene_graph/NodeLight.cpp
source/blender/freestyle/intern/scene_graph/NodeLight.h
source/blender/freestyle/intern/scene_graph/Rep.h
source/blender/freestyle/intern/scene_graph/TriangleRep.h
source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h
source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp
source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h
source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h
source/blender/freestyle/intern/stroke/BasicStrokeShaders.h
source/blender/freestyle/intern/stroke/Canvas.h
source/blender/freestyle/intern/stroke/ChainingIterators.h
source/blender/freestyle/intern/stroke/ContextFunctions.h
source/blender/freestyle/intern/stroke/Curve.cpp
source/blender/freestyle/intern/stroke/Curve.h
source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h
source/blender/freestyle/intern/stroke/CurveIterators.h
source/blender/freestyle/intern/stroke/Operators.cpp
source/blender/freestyle/intern/stroke/Operators.h
source/blender/freestyle/intern/stroke/Stroke.h
source/blender/freestyle/intern/stroke/StrokeRenderer.h
source/blender/freestyle/intern/stroke/StrokeRep.cpp
source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
source/blender/freestyle/intern/system/Id.h
source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp
source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp
source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
source/blender/freestyle/intern/view_map/Functions0D.cpp
source/blender/freestyle/intern/view_map/Functions1D.h
source/blender/freestyle/intern/view_map/Silhouette.h
source/blender/freestyle/intern/view_map/SphericalGrid.h
source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
source/blender/freestyle/intern/view_map/SteerableViewMap.h
source/blender/freestyle/intern/view_map/ViewMap.cpp
source/blender/freestyle/intern/view_map/ViewMap.h
source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
source/blender/freestyle/intern/view_map/ViewMapBuilder.h
source/blender/freestyle/intern/view_map/ViewMapIO.cpp
source/blender/freestyle/intern/view_map/ViewMapIterators.h

index f621f45ff776071ad5c65ddc50e73bb11401b91c..aca725a0384581a205f37999689303487861faef 100644 (file)
@@ -64,7 +64,7 @@ void AppCanvas::setViewer(AppView *iViewer)
        _pViewer = iViewer;
 }
 
-int AppCanvas::width() const 
+int AppCanvas::width() const
 {
        return _pViewer->width();
 }
@@ -84,7 +84,7 @@ float AppCanvas::thickness() const
        return _pViewer->thickness();
 }
 
-BBox<Vec3r> AppCanvas::scene3DBBox() const 
+BBox<Vec3r> AppCanvas::scene3DBBox() const
 {
        return _pViewer->scene3DBBox();
 }
index e84d85416ddb381b9c35b208e1866107b0e188dd..46db99a8d516f852340a2546e968802cad6c35aa 100644 (file)
@@ -471,11 +471,11 @@ void Controller::ComputeViewMap()
 
        // retrieve the 3D viewpoint and transformations information
        //----------------------------------------------------------
-       // Save the viewpoint context at the view level in order 
+       // Save the viewpoint context at the view level in order
        // to be able to restore it later:
 
        // Restore the context of view:
-       // we need to perform all these operations while the 
+       // we need to perform all these operations while the
        // 3D context is on.
        Vec3f vp(UNPACK3(g_freestyle.viewpoint));
 
index 1f5e2b63bfae786dce69e4297951bdd82508e5cb..f16c4c3574b41b420c39d362764bc68f0c0c5596 100644 (file)
@@ -668,7 +668,7 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id)
                }
        }
 
-       // We might have several times the same vertex. We want a clean 
+       // We might have several times the same vertex. We want a clean
        // shape with no real-vertex. Here, we are making a cleaning pass.
        float *cleanVertices = NULL;
        unsigned int cvSize;
index 71c77b60a071aa6aa2c70e1ec6288bae0ef1415f..d885ef4735fa91f31787f3a7dc8f2bf513f79669 100644 (file)
@@ -113,7 +113,7 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : Str
        freestyle_scene->r.gauss = old_scene->r.gauss;
        freestyle_scene->r.dither_intensity = old_scene->r.dither_intensity;
        BLI_strncpy(freestyle_scene->r.engine, old_scene->r.engine, sizeof(freestyle_scene->r.engine));
-       freestyle_scene->r.im_format.planes = R_IMF_PLANES_RGBA; 
+       freestyle_scene->r.im_format.planes = R_IMF_PLANES_RGBA;
        freestyle_scene->r.im_format.imtype = R_IMF_IMTYPE_PNG;
 
        if (G.debug & G_DEBUG_FREESTYLE) {
index ea22633c50e3d3c63e6fb2201fe7c9d5940d2d37..45da59e92157bde1366f0a635d116f441c317cc8 100644 (file)
@@ -96,7 +96,7 @@ static bCallbackFuncStore load_post_callback_funcstore = {
 };
 
 //=======================================================
-//   Initialization 
+//   Initialization
 //=======================================================
 
 void FRS_initialize()
@@ -133,7 +133,7 @@ void FRS_exit()
 }
 
 //=======================================================
-//   Rendering 
+//   Rendering
 //=======================================================
 
 static void init_view(Render *re)
index 355a6e5339906fcc5c95efdbd193756ca2d26be8..75624bb9d9c37610441ada8dad0fb7d94ed86d3b 100644 (file)
@@ -32,7 +32,7 @@
 
 namespace Freestyle {
 
-/*! Class to define a regular grid used for ray casting computations 
+/*! Class to define a regular grid used for ray casting computations
  *  We don't use a hashtable here. The grid is explicitly stored for faster computations.
  *  However, this might result in significant increase in memory usage (compared to the regular grid)
  */
index fbfa5b331e66a4a78f56a93f8d735877ba0337bb..fd7d63bbd28c5a7731cd192920688423578df4bc 100644 (file)
@@ -61,7 +61,7 @@ static double V2SquaredLength(Vector2 *a)
 }
 
 /* returns length of input vector */
-static double V2Length(Vector2 *a) 
+static double V2Length(Vector2 *a)
 {
        return (sqrt(V2SquaredLength(a)));
 }
@@ -96,7 +96,7 @@ static Vector2 *V2Add(Vector2 *a, Vector2 *b, Vector2 *c)
        (*c)[0] = (*a)[0] + (*b)[0];
        (*c)[1] = (*a)[1] + (*b)[1];
        return c;
-} 
+}
 
 /* normalizes the input vector and returns it */
 static Vector2 *V2Normalize(Vector2 *v)
index 2268f6be1b76684477cee498fa072966eb61dc92..c402f431c277737eea8b414fb1aa814ba608e35b 100644 (file)
@@ -90,7 +90,7 @@ public:
         *      Control points of the sets of bezier curve segments.
         *      Each segment is made of 4 points (polynomial degree of curve = 3)
         *    error
-        *      max error tolerance between resulting curve and input data 
+        *      max error tolerance between resulting curve and input data
         */
        void FitCurve(std::vector<Vec2d>& data, std::vector<Vec2d>& oCurve, double error);
 
index 8f3abf451c94d3ef933e8649fb8268f94d989f2e..9e7c629191fd79b7640322d6c8dc478614a2c928 100644 (file)
@@ -174,7 +174,7 @@ void fromWorldToImage(const Vec3r& p, Vec3r& q, const real model_view_matrix[4][
  */
 void fromWorldToImage(const Vec3r& p, Vec3r& q, const real transform[4][4], const int viewport[4]);
 
-/*! Projects from world coordinates to camera coordinates 
+/*! Projects from world coordinates to camera coordinates
  *  Returns the point's coordinates expressed in the camera's
  *  coordinates system.
  *  p
@@ -220,7 +220,7 @@ void fromRetinaToImage(const Vec3r& p, Vec3r& q, const int viewport[4]);
  */
 void fromImageToRetina(const Vec3r& p, Vec3r& q, const int viewport[4]);
 
-/*! computes the coordinates of q in the camera coordinates system, 
+/*! computes the coordinates of q in the camera coordinates system,
  *  using the known z coordinates of the 3D point.
  *  That means that this method does not inverse any matrices,
  *  it only computes X and Y from x,y and Z)
index 371c63318decfe9edc84406a74339bee54b5b7ec..61cf70a0aa3b3dce2b642e2f6d8bbc9dcb992852 100644 (file)
@@ -242,7 +242,7 @@ bool Grid::nextRayCell(Vec3u& current_cell, Vec3u& next_cell)
        real t_min, t;
        unsigned i;
 
-       t_min = FLT_MAX;    // init tmin with handle of the case where one or 2 _u[i] = 0. 
+       t_min = FLT_MAX;    // init tmin with handle of the case where one or 2 _u[i] = 0.
        unsigned coord = 0; // predominant coord(0=x, 1=y, 2=z)
 
 
index 22efdcf1d119940101277fc9c2f402fba4375e74..4dd345e9b07d209dd2d3873009515a65935cdc6c 100644 (file)
@@ -73,7 +73,7 @@ T closestPointToSegment(const T& P, const T& A, const T& B, real& distance)
 
        distance = PPb.norm();
        return Pb; // closest point lies on AB
-} 
+}
 
 inline Vec3r closestPointOnPolygon(const Vec3r& point, const Polygon3r& poly)
 {
index 039ecd7ebf48947911e00f0371db0ea1c1ec9059..98e860862bbbed349e5a80657b6e3e31ac13c6dc 100644 (file)
@@ -216,7 +216,7 @@ struct binary_rule
 
 
 template<class T, class Point>
-class SweepLine 
+class SweepLine
 {
 public:
        SweepLine() {}
@@ -231,7 +231,7 @@ public:
                }
        }
 
-       inline void process(Point& p, vector<Segment<T, Point>*>& segments, 
+       inline void process(Point& p, vector<Segment<T, Point>*>& segments,
 #if 0
                            binary_rule<Segment<T, Point>,Segment<T, Point> >& binrule = \
                                    binary_rule<Segment<T, Point>, Segment<T, Point> >(),
index 3c3d40875d03b90a4d1455b882f1fb8b06c09955..e7a44e00b1bb17c2cce1eb26628da2cb4578197b 100644 (file)
@@ -150,21 +150,21 @@ public:
                Vec<T, N> res(v);
                res += *this;
                return res;
-       } 
+       }
 
        inline Vec<T, N> operator-(const Vec<T, N>& v) const
        {
                Vec<T, N> res(*this);
                res -= v;
                return res;
-       } 
+       }
 
        inline Vec<T, N> operator*(const typename Vec<T, N>::value_type r) const
        {
                Vec<T, N> res(*this);
                res *= r;
                return res;
-       } 
+       }
 
        inline Vec<T, N> operator/(const typename Vec<T, N>::value_type r) const
        {
@@ -172,7 +172,7 @@ public:
                if (r)
                        res /= r;
                return res;
-       } 
+       }
 
        // dot product
        inline value_type operator*(const Vec<T, N>& v) const
@@ -181,7 +181,7 @@ public:
                for (unsigned int i = 0; i < N; i++)
                        sum += (*this)[i] * v[i];
                return sum;
-       } 
+       }
 
        template <class U>
        inline Vec<T, N>& operator=(const Vec<U, N>& v)
@@ -255,7 +255,7 @@ public:
                        if (this->_coord[i] == v[i])
                                continue;
                }
-               return false;  
+               return false;
        }
 
        inline bool operator>(const Vec<T, N>& v) const
@@ -268,7 +268,7 @@ public:
                        if (this->_coord[i] == v[i])
                                continue;
                }
-               return false;  
+               return false;
        }
 
 protected:
index 5e5854975166d52a690182ba1f754a457a7939fd..40195361fe09dcc4a737d7e7ca1eaa6fb2da6b81 100644 (file)
@@ -95,7 +95,7 @@ namespace MatrixUtil {
                // Ugly Fortran-porting trick: indices for v are between 1 and n
                v--;
 
-               // Step 3 : compute the weight of the non diagonal terms 
+               // Step 3 : compute the weight of the non diagonal terms
                ij = 1;
                a_norm = 0.0;
                for (i = 1; i <= n; i++) {
@@ -240,7 +240,7 @@ namespace MatrixUtil {
                        index[i] = jj;
                }
 
-               // Step 7: save the eigen vectors 
+               // Step 7: save the eigen vectors
 
                // back from Fortran to to C++
                v++;
index 7abd1bc18bccc1b38adf990ae66fa08f2ed6e63d..fdbfd20d764d3526ee919bd0bd49d3ca46848169 100644 (file)
@@ -120,7 +120,7 @@ protected:
 };
 
 /*
-  
+
   #############################################
   #############################################
   #############################################
@@ -130,7 +130,7 @@ protected:
   #############################################
   #############################################
   #############################################
-  
+
 */
 
 template<class Map>
index 4e1a0a119aa4a1a6761f5d06529a03093cee264b..0ac116b1bd497ad6098c361bbdd1a01aac04c844 100644 (file)
@@ -89,7 +89,7 @@ PyObject *Vector_from_Vec3f(Vec3f& vec)
        float vec_data[3]; // because vec->_coord is protected
        vec_data[0] = vec.x();
        vec_data[1] = vec.y();
-       vec_data[2] = vec.z(); 
+       vec_data[2] = vec.z();
        return Vector_CreatePyObject(vec_data, 3, NULL);
 }
 
@@ -356,7 +356,7 @@ PyObject *BPy_SShape_from_SShape(SShape& ss)
        PyObject *py_ss = SShape_Type.tp_new(&SShape_Type, 0, 0);
        ((BPy_SShape *)py_ss)->ss = &ss;
        ((BPy_SShape *)py_ss)->borrowed = true;
-       return py_ss;   
+       return py_ss;
 }
 
 PyObject *BPy_ViewShape_from_ViewShape(ViewShape& vs)
index 35c1e58369cda8fd9143600e1d67b49f99aaee61..a0e0b578c101dd5c431ebdbd870d94fae462c5c2 100644 (file)
@@ -40,7 +40,7 @@ using namespace Freestyle::Geometry;
 #include "../geometry/BBox.h"
 
 // FEdge, FEdgeSharp, FEdgeSmooth, SShape, SVertex, FEdgeInternal::SVertexIterator
-#include "../view_map/Silhouette.h" 
+#include "../view_map/Silhouette.h"
 
 // Id
 #include "../system/Id.h"
index 0b09a3c24423f7fdeb5621e065bdb05c7a50ef85..23deb63ce36edf0551352bd4ece313c22291792e 100644 (file)
@@ -486,7 +486,7 @@ static PyModuleDef module_definition = {
 PyObject *Freestyle_Init(void)
 {
        PyObject *module;
-       
+
        // initialize modules
        module = PyModule_Create(&module_definition);
        if (!module)
@@ -509,9 +509,9 @@ PyObject *Freestyle_Init(void)
        else {
                printf("Freestyle: couldn't find 'scripts/freestyle/modules', Freestyle won't work properly.\n");
        }
-       
+
        // attach its classes (adding the object types to the module)
-       
+
        // those classes have to be initialized before the others
        MediumType_Init(module);
        Nature_Init(module);
index 0db25753caa5d361969f373ecedb78582217deb0..548ab529f34f4eaa7c339e74f38ea9c54eef6c1e 100644 (file)
@@ -216,7 +216,7 @@ static PyLongObject _IntegrationType_LAST = {
 int IntegrationType_Init(PyObject *module)
 {
        PyObject *m, *d, *f;
-       
+
        if (module == NULL)
                return -1;
 
@@ -230,7 +230,7 @@ int IntegrationType_Init(PyObject *module)
        PyDict_SetItemString(IntegrationType_Type.tp_dict, "MAX", BPy_IntegrationType_MAX);
        PyDict_SetItemString(IntegrationType_Type.tp_dict, "FIRST", BPy_IntegrationType_FIRST);
        PyDict_SetItemString(IntegrationType_Type.tp_dict, "LAST", BPy_IntegrationType_LAST);
-       
+
        m = PyModule_Create(&module_definition);
        if (m == NULL)
                return -1;
index 8f23800fb7aaf97d1a092f0b4f46b7dee965485a..d592aed749dee50c2ad7b01ae9ec5c6c1715d725 100644 (file)
@@ -59,7 +59,7 @@ int Interface0D_Init(PyObject *module)
        if (PyType_Ready(&SVertex_Type) < 0)
                return -1;
        Py_INCREF(&SVertex_Type);
-       PyModule_AddObject(module, "SVertex", (PyObject *)&SVertex_Type);       
+       PyModule_AddObject(module, "SVertex", (PyObject *)&SVertex_Type);
 
        if (PyType_Ready(&ViewVertex_Type) < 0)
                return -1;
index 240f3f2d6e25726662e24f319675008e37625c00..ebd9c6822a94e51bf42729a6f557efbf09a32a99 100644 (file)
@@ -103,7 +103,7 @@ PyLongObject _BPy_MediumType_OPAQUE_MEDIUM = {
 //-------------------MODULE INITIALIZATION--------------------------------
 
 int MediumType_Init(PyObject *module)
-{      
+{
        if (module == NULL)
                return -1;
 
index 9169adf4d9f6dbc05049738544c777d34118bf45..cf4880ad3f7baf68e8a574469c81b5cadd58073d 100644 (file)
@@ -232,11 +232,11 @@ static PyObject *SShape_vertices_get(BPy_SShape *self, void *UNUSED(closure))
        vector< SVertex * >::iterator it;
        PyObject *py_vertices = PyList_New(vertices.size());
        unsigned int i = 0;
-       
+
        for (it = vertices.begin(); it != vertices.end(); it++) {
                PyList_SET_ITEM(py_vertices, i++, BPy_SVertex_from_SVertex(*(*it)));
        }
-       
+
        return py_vertices;
 }
 
@@ -252,11 +252,11 @@ static PyObject *SShape_edges_get(BPy_SShape *self, void *UNUSED(closure))
        vector< FEdge * >::iterator it;
        PyObject *py_edges = PyList_New(edges.size());
        unsigned int i = 0;
-       
+
        for (it = edges.begin(); it != edges.end(); it++) {
                PyList_SET_ITEM(py_edges, i++, Any_BPy_FEdge_from_FEdge(*(*it)));
        }
-       
+
        return py_edges;
 }
 
index 6b4a1872b617d355a3cc1a6a0ad0e74aad7d9e38..eee48f19e1bfd39d1b7ccb4f49a53ee61176623c 100644 (file)
@@ -216,7 +216,7 @@ static PyObject *StrokeShader_shade(BPy_StrokeShader *self, PyObject *args, PyOb
 
        if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist, &Stroke_Type, &py_s))
                return NULL;
-       
+
        if (typeid(*(self->ss)) == typeid(StrokeShader)) {
                PyErr_SetString(PyExc_TypeError, "shade method not properly overridden");
                return NULL;
index fc43accabf0d6268034b7ff5282191594872fec9..87e5e7505ca32f8f014842f0f00492ed2646de7f 100644 (file)
@@ -161,9 +161,9 @@ static PyObject *UnaryPredicate1D___call__(BPy_UnaryPredicate1D *self, PyObject
 
        if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist, &Interface1D_Type, &py_if1D))
                return NULL;
-       
+
        Interface1D *if1D = ((BPy_Interface1D *)py_if1D)->if1D;
-       
+
        if (!if1D) {
                string class_name(Py_TYPE(self)->tp_name);
                PyErr_SetString(PyExc_RuntimeError, (class_name + " has no Interface1D").c_str());
index f2f53159fcfdfbb9e0605e6258a63273e4f102cd..33c18c3ce8014b563bdd900fabe01c4719a5d26f 100644 (file)
@@ -222,7 +222,7 @@ static int ViewShape_vertices_set(BPy_ViewShape *self, PyObject *value, void *UN
 {
        PyObject *item;
        vector< ViewVertex *> v;
-       
+
        if (!PyList_Check(value)) {
                PyErr_SetString(PyExc_TypeError, "value must be a list of ViewVertex objects");
                return -1;
index 2072faa43efe0bf240512e1e3bd5fead630adcaf..8d81e5083407d161e06bd57a335375ecc2484912 100644 (file)
@@ -35,7 +35,7 @@ extern "C" {
 
 //------------------------INSTANCE METHODS ----------------------------------
 
-//ViewMapGradientNormBP1D(int level, IntegrationType iType=MEAN, float sampling=2.0) 
+//ViewMapGradientNormBP1D(int level, IntegrationType iType=MEAN, float sampling=2.0)
 
 static char ViewMapGradientNormBP1D___doc__[] =
 "Class hierarchy: :class:`freestyle.types.BinaryPredicate1D` > :class:`ViewMapGradientNormBP1D`\n"
index 9f85e84e297bcf6b4653c68ceeb03e8ccd772c57..f4f02a7026fd3969f5f94fa179f7b64fab96d0c8 100644 (file)
@@ -325,7 +325,7 @@ int Director_BPy_UnaryFunction1D___call__(void *uf1D, void *py_uf1D, Interface1D
                        vec.push_back(b);
                }
                ((UnaryFunction1D< vector<ViewShape*> > *)uf1D)->result = vec;
-       } 
+       }
        Py_DECREF(result);
        return 0;
 }
index 40576c0ec2ca4a836e2eab5bdf826957441b78f6..6a0ae7dd7049ed41053526105e3aa67ac85cb4d7 100644 (file)
@@ -53,7 +53,7 @@ int Director_BPy_UnaryFunction1D___call__(void *uf1D, void *py_uf1D, Interface1D
 
 // UnaryPredicate0D: __call__
 int Director_BPy_UnaryPredicate0D___call__(UnaryPredicate0D *up0D, Interface0DIterator& if0D_it);
-       
+
 // UnaryPredicate1D: __call__
 int Director_BPy_UnaryPredicate1D___call__(UnaryPredicate1D *up1D, Interface1D& if1D);
 
index 39919b414231e37dc52b7238375b7ce9fea6e109..33300ea70b51527147c4e38b371f9db0b0c9c19a 100644 (file)
@@ -341,7 +341,7 @@ PyDoc_STRVAR(SVertex_normals_doc,
 
 static PyObject *SVertex_normals_get(BPy_SVertex *self, void *UNUSED(closure))
 {
-       PyObject *py_normals; 
+       PyObject *py_normals;
        set< Vec3r > normals = self->sv->normals();
        set< Vec3r >::iterator it;
        py_normals = PyList_New(normals.size());
index 5c816bdfea13501388e49ba8424ba20ffe31be4d..9a39db0ee7e90d6c2d5c6af84f758fc84599ba1f 100644 (file)
@@ -314,7 +314,7 @@ static PyObject *Stroke_stroke_vertices_size(BPy_Stroke *self)
        return PyLong_FromLong(self->s->strokeVerticesSize());
 }
 
-static PyMethodDef BPy_Stroke_methods[] = {    
+static PyMethodDef BPy_Stroke_methods[] = {
        {"compute_sampling", (PyCFunction)Stroke_compute_sampling, METH_VARARGS | METH_KEYWORDS,
                             Stroke_compute_sampling_doc},
        {"resample", (PyCFunction)Stroke_resample, METH_VARARGS | METH_KEYWORDS, Stroke_resample_doc},
index bcae5a2c2a42843aa14a69c530bf25a4c76e157a..9119d8f999ef87db5089b097fbe065431a43a6a0 100644 (file)
@@ -182,7 +182,7 @@ PyDoc_STRVAR(ViewEdge_viewshape_doc,
 ":type: :class:`ViewShape`");
 
 static PyObject *ViewEdge_viewshape_get(BPy_ViewEdge *self, void *UNUSED(closure))
-{      
+{
        ViewShape *vs = self->ve->viewShape();
        if (vs)
                return BPy_ViewShape_from_ViewShape(*vs);
index 08cfffec86016b5818a45b9879209bad45564fe4..5a6e838dcc6009d22c9ff6e71c018d0a2267a992 100644 (file)
@@ -98,7 +98,7 @@ static int ChainSilhouetteIterator_init(BPy_ChainSilhouetteIterator *self, PyObj
                bool restrict_to_selection = (!obj1) ? true : bool_from_PyBool(obj1);
                ViewEdge *begin = (!obj2 || obj2 == Py_None) ? NULL : ((BPy_ViewEdge *)obj2)->ve;
                bool orientation = (!obj3) ? true : bool_from_PyBool(obj3);
-               self->cs_it = new ChainSilhouetteIterator(restrict_to_selection, begin, orientation);   
+               self->cs_it = new ChainSilhouetteIterator(restrict_to_selection, begin, orientation);
        }
        else {
                PyErr_SetString(PyExc_TypeError, "invalid argument(s)");
index e91c62c7d240bcf499d1ec1d7a7fae9e845cd971..1f5444d7bebe13b2367e9d7e9b40d2d7991e3376 100644 (file)
@@ -161,15 +161,15 @@ static int UnaryFunction1DDouble___init__(BPy_UnaryFunction1DDouble *self, PyObj
 
        if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O!", (char **)kwlist, &IntegrationType_Type, &obj))
                return -1;
-       
+
        if (!obj)
                self->uf1D_double = new UnaryFunction1D<double>();
        else {
                self->uf1D_double = new UnaryFunction1D<double>(IntegrationType_from_BPy_IntegrationType(obj));
        }
-       
+
        self->uf1D_double->py_uf1D = (PyObject *)self;
-       
+
        return 0;
 }
 
index abef3b2676ff9bd68db5b6378169cb6955432f6a..3f0611dba84e9637f695147f68319926a64e6c81 100644 (file)
@@ -83,15 +83,15 @@ static int UnaryFunction1DEdgeNature___init__(BPy_UnaryFunction1DEdgeNature *sel
 
        if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O!", (char **)kwlist, &IntegrationType_Type, &obj))
                return -1;
-       
+
        if (!obj)
                self->uf1D_edgenature = new UnaryFunction1D<Nature::EdgeNature>();
        else {
                self->uf1D_edgenature = new UnaryFunction1D<Nature::EdgeNature>(IntegrationType_from_BPy_IntegrationType(obj));
        }
-       
+
        self->uf1D_edgenature->py_uf1D = (PyObject *)self;
-       
+
        return 0;
 }
 
index 13a001c585bc3ae1b56ceda783cef89b7f0b196d..b3b27aabade571513806f7fad6317569f3b1128b 100644 (file)
@@ -76,15 +76,15 @@ static int UnaryFunction1DFloat___init__(BPy_UnaryFunction1DFloat *self, PyObjec
 
        if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O!", (char **)kwlist, &IntegrationType_Type, &obj))
                return -1;
-       
+
        if (!obj)
                self->uf1D_float = new UnaryFunction1D<float>();
        else {
                self->uf1D_float = new UnaryFunction1D<float>(IntegrationType_from_BPy_IntegrationType(obj));
        }
-       
+
        self->uf1D_float->py_uf1D = (PyObject *)self;
-       
+
        return 0;
 }
 
index 4e88020b5c8d4536b3f7d4ced88012087e4a44b6..0814eafb18ea02c5ad427862cd809dacd02d523e 100644 (file)
@@ -83,15 +83,15 @@ static int UnaryFunction1DUnsigned___init__(BPy_UnaryFunction1DUnsigned *self, P
 
        if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O!", (char **)kwlist, &IntegrationType_Type, &obj))
                return -1;
-       
+
        if (!obj)
                self->uf1D_unsigned = new UnaryFunction1D<unsigned int>();
        else {
                self->uf1D_unsigned = new UnaryFunction1D<unsigned int>(IntegrationType_from_BPy_IntegrationType(obj));
        }
-       
+
        self->uf1D_unsigned->py_uf1D = (PyObject *)self;
-       
+
        return 0;
 }
 
index 9a864a3f5797d9bfbe488e27edf1cb785a6107e3..f7f4fea02ae7b770675842387ce18d93447fbd8d 100644 (file)
@@ -89,15 +89,15 @@ static int UnaryFunction1DVec2f___init__(BPy_UnaryFunction1DVec2f *self, PyObjec
 
        if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O!", (char **)kwlist, &IntegrationType_Type, &obj))
                return -1;
-       
+
        if (!obj)
                self->uf1D_vec2f = new UnaryFunction1D<Vec2f>();
        else {
                self->uf1D_vec2f = new UnaryFunction1D<Vec2f>(IntegrationType_from_BPy_IntegrationType(obj));
        }
-       
+
        self->uf1D_vec2f->py_uf1D = (PyObject *)self;
-       
+
        return 0;
 }
 
index 60c581ac845a7c8084911b428ad012a69de24f94..980df2c22680857fa3831264d98f40ab7647c809 100644 (file)
@@ -83,15 +83,15 @@ static int UnaryFunction1DVec3f___init__(BPy_UnaryFunction1DVec3f *self, PyObjec
 
        if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O!", (char **)kwlist, &IntegrationType_Type, &obj))
                return -1;
-       
+
        if (!obj)
                self->uf1D_vec3f = new UnaryFunction1D<Vec3f>();
        else {
                self->uf1D_vec3f = new UnaryFunction1D<Vec3f>(IntegrationType_from_BPy_IntegrationType(obj));
        }
-       
+
        self->uf1D_vec3f->py_uf1D = (PyObject *)self;
-       
+
        return 0;
 }
 
index c15d974e771b633e4400e788f2d90a83b5f34d9f..5eba1573d80285c04dd32ef2abd8a962b52fa95a 100644 (file)
@@ -97,16 +97,16 @@ static int UnaryFunction1DVectorViewShape___init__(BPy_UnaryFunction1DVectorView
 
        if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O!", (char **)kwlist, &IntegrationType_Type, &obj))
                return -1;
-       
+
        if (!obj) {
                self->uf1D_vectorviewshape = new UnaryFunction1D< std::vector<ViewShape*> >();
        }
        else {
                self->uf1D_vectorviewshape = new UnaryFunction1D< std::vector<ViewShape*> >(IntegrationType_from_BPy_IntegrationType(obj));
        }
-       
+
        self->uf1D_vectorviewshape->py_uf1D = (PyObject *)self;
-       
+
        return 0;
 }
 
@@ -149,7 +149,7 @@ static PyObject *UnaryFunction1DVectorViewShape___call__(BPy_UnaryFunction1DVect
                ViewShape *v = self->uf1D_vectorviewshape->result[i];
                PyList_SET_ITEM(list, i, v ? BPy_ViewShape_from_ViewShape(*v) : (Py_INCREF(Py_None), Py_None));
        }
-       
+
        return list;
 }
 
index 4db28c0db958ef00f7b11117ce325da69a82de3c..7a83a49b9d2438fa54f103640af1403763d46f14 100644 (file)
@@ -96,15 +96,15 @@ static int UnaryFunction1DVoid___init__(BPy_UnaryFunction1DVoid *self, PyObject
 
        if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O!", (char **)kwlist, &IntegrationType_Type, &obj))
                return -1;
-       
+
        if (!obj)
                self->uf1D_void = new UnaryFunction1D_void();
        else {
                self->uf1D_void = new UnaryFunction1D_void(IntegrationType_from_BPy_IntegrationType(obj));
        }
-       
+
        self->uf1D_void->py_uf1D = (PyObject *)self;
-       
+
        return 0;
 }
 
index 8d7bf986bde417474d297d6dda4602758a334b59..a8fe3d8bbfae4f2b4b064124e685059ed8954525 100644 (file)
@@ -90,7 +90,7 @@ public:
         *        - TRIANGLES     : the face indices describe single triangles
         *      If iCopy != 0, the array is copied; you must desallocate iFaceStyle. Else you must not.
         *    iVIndices,
-        *      Array of vertices indices. 
+        *      Array of vertices indices.
         *      The integers contained in this array must be multiple of 3.
         *      If iCopy != 0, the array is copied; you must desallocate iVIndices. Else you must not.
         *    iVISize
index e7d811139742896fe4733b2b98de2c961c9cd920..a35920a4f4c3f9cae7dc6ce0454a1c0c14af59d9 100644 (file)
@@ -39,7 +39,7 @@ void LineRep::ComputeBBox()
        real YMin = _vertices.front()[1];
        real ZMin = _vertices.front()[2];
 
-       // parse all the coordinates to find 
+       // parse all the coordinates to find
        // the XMax, YMax, ZMax
        vector<Vec3r>::iterator v;
        for (v = _vertices.begin(); v != _vertices.end(); ++v) {
index 546458bad4896e2087cb9d6e3d760916be7bb7ba..4ddcadd35427cb258de21a55b920e7baf184bd98 100644 (file)
@@ -104,7 +104,7 @@ public:
 
 protected:
 
-private: 
+private:
        BBox<Vec3r> _BBox;
 
 #ifdef WITH_CXX_GUARDEDALLOC
index 78c34fdef6d4f3f753d85c5919a8ae4cb94dd5b7..c2f70d514a8b05f4604b5337dd41bfdb387149b7 100644 (file)
@@ -52,7 +52,7 @@ public:
        } CameraType;
 
        /*! Default matrices: Identity for both projection and modelview. */
-       NodeCamera(CameraType camera_type = GENERIC); 
+       NodeCamera(CameraType camera_type = GENERIC);
 #if 0  /* UNUSED, gives warning in gcc */
        NodeCamera(const NodeCamera& iBrother);
 #endif
index 69c8a2c8f3b67b095dfa217f0c218dc9e0a959f1..e8e58b0915ee29c49e9ae8b7c9ab30976e0e9129 100644 (file)
@@ -48,7 +48,7 @@ public:
        /*! Adds a child. Makes a addRef on the iChild reference counter */
        virtual void AddChild(Node *iChild);
 
-       /*! destroys all the underlying nodes 
+       /*! destroys all the underlying nodes
         *  Returns the reference counter after having done a release()
         */
        virtual int destroy();
index 5a54bc09891e786c6e7b5a5fac4ba54b13013ad4..9e15f6c1eeebfbd2044e10e507ccfc4aa0ebf87d 100644 (file)
@@ -37,7 +37,7 @@ NodeLight::NodeLight() : Node()
                _number = 7;
        }
        else {
-               _number = numberOfLights; 
+               _number = numberOfLights;
                numberOfLights++;
        }
 
@@ -61,7 +61,7 @@ NodeLight::NodeLight(NodeLight& iBrother) : Node(iBrother)
                _number = 7;
        }
        else {
-               _number = numberOfLights; 
+               _number = numberOfLights;
                numberOfLights++;
        }
 
index c633a6bc7b89ebbc1b381c42548874bed48c77d6..10d6f65787222e0d68494b637fc5227be6b0eb2a 100644 (file)
@@ -41,7 +41,7 @@ using namespace Geometry;
 class NodeLight : public Node
 {
 public:
-       NodeLight(); 
+       NodeLight();
        NodeLight(NodeLight& iBrother);
 
        virtual ~NodeLight() {}
index 773eb2d32789428286ae568c64ac6bfa4ead94dc..4c8017e162d22df659e40f32c72dcdcb97e74224 100644 (file)
@@ -97,7 +97,7 @@ public:
                return *this;
        }
 
-       virtual ~Rep() 
+       virtual ~Rep()
        {
                if (0 != _FrsMaterial) {
                        delete _FrsMaterial;
index d101cfd798805c15b7d055b589db7e00762d0606..353555b2802875d9a696deefc49f2cc0a922be14 100644 (file)
@@ -28,7 +28,7 @@
  *  \date 16/12/2002
  */
 
-//! inherits from class Rep 
+//! inherits from class Rep
 #include "Rep.h"
 
 namespace Freestyle {
index 48d5cd4803e739d739a84ea5d64cbe13029067f7..87f132b1ff3cb79651ac929012f56a3b63ebbd08 100644 (file)
@@ -109,7 +109,7 @@ private:
        int _level;
 
 public:
-       /*! Builds the functor from name of the 
+       /*! Builds the functor from name of the
         *  Map that must be read.
         *  \param iMapName
         *    The name of the map.
@@ -171,7 +171,7 @@ private:
        int _level;
 
 public:
-       /*! Builds the functor 
+       /*! Builds the functor
         *  \param level
         *    The level of the pyramid from which the pixel must be read.
         */
@@ -199,7 +199,7 @@ private:
        float _step;
 
 public:
-       /*! Builds the functor 
+       /*! Builds the functor
         *  \param level
         *    The level of the pyramid from which the pixel must be read.
         */
index ed527080f3665ea50ad11ac398fa30b5e41d32a3..247217791a5c5034ae3dcb92fb2eecb71a33ae07 100644 (file)
@@ -114,7 +114,7 @@ int GetDirectionalViewMapDensityF1D::operator()(Interface1D& inter)
        //soc unsigned size;
        result = integrate(_fun, inter.pointsBegin(_sampling), inter.pointsEnd(_sampling), _integration);
        return 0;
-} 
+}
 
 int GetCompleteViewMapDensityF1D::operator()(Interface1D& inter)
 {
index 9df690cf5b0429c5219837d0e5244e840f796e0f..ec698ca5e685ac13f5305b3c03707847170c9cdb 100644 (file)
@@ -135,7 +135,7 @@ class GetCompleteViewMapDensityF1D : public UnaryFunction1D<double>
 public:
        /*! Builds the functor.
         *  \param level
-        *    The level of the pyramid from which 
+        *    The level of the pyramid from which
         *    the pixel must be read.
         *  \param iType
         *    The integration method used to compute
index a9ef49aa802769e2720006b1a51f5d676b090891..5ba96f31272ca66cb0881ba686e8328df2d53c81 100644 (file)
@@ -61,7 +61,7 @@ public:
 protected:
        real _maxThickness;
        real _minThickness;
-       Vec2f _orientation; 
+       Vec2f _orientation;
        bool _clamp;
 };
 
index cc935a7e311ea58fec2e51bb4df98519d5a30c19..d3d19beba95a8b1eee3c25efbfa04586b96e9fbd 100644 (file)
@@ -405,7 +405,7 @@ public:
 class BackboneStretcherShader : public StrokeShader
 {
 private:
-       float _amount; 
+       float _amount;
 
 public:
        /*! Builds the shader.
@@ -524,7 +524,7 @@ public:
         *    The smaller, the closer the new stroke to the orinal one.
         *    This error corresponds to the maximum distance between the new stroke and the old one.
         */
-       PolygonalizationShader(float iError) : StrokeShader() 
+       PolygonalizationShader(float iError) : StrokeShader()
        {
                _error = iError;
        }
@@ -594,7 +594,7 @@ public:
        virtual int shade(Stroke &stroke) const;
 
 protected:
-       real _tipLength; 
+       real _tipLength;
 };
 
 /*! [ Texture Shader ].
index 5919344b6e01d8468443f0ab2567f82e368866cd..6d84ff995d2d65904ff39fb1ce85a693f528ed21 100644 (file)
@@ -128,7 +128,7 @@ public:
        void Clear();
 
        /* Erases the layers */
-       virtual void Erase(); 
+       virtual void Erase();
 
        /* Reads a pixel area from the canvas */
        virtual void readColorPixels(int x, int y, int w, int h, RGBImage& oImage) const = 0;
index 4ece24c5ecf6a2233d7a23cb75ce0ac6311113a7..310409f160fc14e8063cae29cba6310458c58ca2 100644 (file)
@@ -80,7 +80,7 @@ public:
        {
                _internalIterator = iBrother._internalIterator;
                _restrictToSelection = iBrother._restrictToSelection;
-               _restrictToUnvisited = iBrother._restrictToUnvisited;  
+               _restrictToUnvisited = iBrother._restrictToUnvisited;
                return *this;
        }
 
@@ -289,7 +289,7 @@ public:
         */
        virtual int traverse(const AdjacencyIterator& it);
 
-       /*! Inits the iterator context */ 
+       /*! Inits the iterator context */
        virtual int init()
        {
                return 0;
index d8b780e77a0f5ec9ffb2f4213ff81e31247ca584..97710437e47ac76082442c2bc28e513e6e6c9342 100644 (file)
@@ -64,7 +64,7 @@ BBox<Vec2i> GetBorderCF();
 void LoadMapCF(const char *iFileName, const char *iMapName, unsigned iNbLevels = 4, float iSigma = 1.0f);
 
 // ReadMapPixel
-/*! Reads a pixel in a user-defined map 
+/*! Reads a pixel in a user-defined map
  *  \return the floating value stored for that pixel
  *  \param iMapName
  *    The name of the map
index a8dbce84971ec5e789962ed41f31eac388629f16..52fd780ee431073a28bdab3baa34d34ce6b0c28b 100644 (file)
@@ -317,7 +317,7 @@ float CurvePoint::shape_importance() const
        if (__A == 0)
                return __B->shape_importance();
        return __A->shape_importance();
-} 
+}
 
 
 const unsigned CurvePoint::qi() const
index 726b238c74be5e631063d0c8747c407bcc83cb94..04cc2fbfd39af450c3d9a6bd14a55abf346ef0a4 100644 (file)
@@ -94,7 +94,7 @@ public: // Implementation of Interface0D
                return _Point3d.z();
        }
 
-       /*!  Returns the 3D point. */ 
+       /*!  Returns the 3D point. */
        virtual Vec3r getPoint3D() const
        {
                return _Point3d;
@@ -118,7 +118,7 @@ public: // Implementation of Interface0D
                return _Point2d.z();
        }
 
-       /*!  Returns the 2D point. */ 
+       /*!  Returns the 2D point. */
        virtual Vec2r getPoint2D() const
        {
                return Vec2r(_Point2d.x(), _Point2d.y());
@@ -444,7 +444,7 @@ public:
        }
 
        /*! Adds a single vertex (SVertex) at the end of the Curve */
-       inline void push_vertex_back(SVertex *iVertex) 
+       inline void push_vertex_back(SVertex *iVertex)
        {
                if (!_Vertices.empty()) {
                        Vec3r vec_tmp(iVertex->point2d() - _Vertices.back()->point2d());
@@ -456,7 +456,7 @@ public:
        }
 
        /*! Adds a single vertex (CurvePoint) at the front of the Curve */
-       inline void push_vertex_front(Vertex *iVertex) 
+       inline void push_vertex_front(Vertex *iVertex)
        {
                if (!_Vertices.empty()) {
                        Vec3r vec_tmp(iVertex->point2d() - _Vertices.front()->point2d());
@@ -468,7 +468,7 @@ public:
        }
 
        /*! Adds a single vertex (SVertex) at the front of the Curve */
-       inline void push_vertex_front(SVertex *iVertex) 
+       inline void push_vertex_front(SVertex *iVertex)
        {
                if (!_Vertices.empty()) {
                        Vec3r vec_tmp(iVertex->point2d() - _Vertices.front()->point2d());
index 4142117c361f0ed6ff9a76d90026fd05b42ca73f..726c80d889cb0f1c79a7af9eec9550448c36987a 100644 (file)
@@ -39,7 +39,7 @@ class CurvePoint_const_traits : public Const_traits<CurvePoint*>
 public:
        typedef deque<CurvePoint*> vertex_container;
        typedef vertex_container::const_iterator vertex_container_iterator;
-       typedef SVertex vertex_type; 
+       typedef SVertex vertex_type;
 };
 
 class CurvePoint_nonconst_traits : public Nonconst_traits<CurvePoint*>
@@ -47,7 +47,7 @@ class CurvePoint_nonconst_traits : public Nonconst_traits<CurvePoint*>
 public:
        typedef deque<CurvePoint*> vertex_container;
        typedef vertex_container::iterator vertex_container_iterator;
-       typedef SVertex vertex_type; 
+       typedef SVertex vertex_type;
 };
 
 /**********************************/
@@ -325,7 +325,7 @@ protected:
                }
        }
 
-       virtual void decrement() 
+       virtual void decrement()
        {
                if (_Point != 0) {
                        delete _Point;
index d7a79d6e78801fdf35842347dcc581f6e16885f7..cb33221cfd4999342d4e25e5bbdc169474c47c16 100644 (file)
@@ -35,13 +35,13 @@ namespace Freestyle {
 
 namespace CurveInternal {
 
-/*! iterator on a curve. Allows an iterating outside 
+/*! iterator on a curve. Allows an iterating outside
  *  initial vertices. A CurvePoint is instanciated an returned
  *  when the iterator is dereferenced.
  */
 
 class CurvePointIterator : public Interface0DIteratorNested
-{ 
+{
 public:
        friend class Freestyle::Curve;
 
index dfb50d903f795a0214e9d4234e37c3f033ab8549..151cd29ca078848d3167f6b9fa69519c27146185 100644 (file)
@@ -704,7 +704,7 @@ static int __recursiveSplit(Chain *_curve, UnaryFunction0D<double>& func, UnaryP
        if (newId == 0) {
                newId = new Id(_curve->getId());
                _curve->setSplittingId(newId);
-       } 
+       }
 
        Chain *new_curve_a = new Chain(*newId);
        newId->setSecond(newId->getSecond() + 1);
@@ -791,9 +791,9 @@ int Operators::recursiveSplit(UnaryFunction0D<double>& func, UnaryPredicate1D& p
        if (!splitted_chains.empty()) {
                for (cit = splitted_chains.begin(), citend = splitted_chains.end(); cit != citend; ++cit) {
                        delete (*cit);
-               } 
+               }
                splitted_chains.clear();
-       } 
+       }
 
        _current_chains_set.clear();
 #if 0
@@ -1036,7 +1036,7 @@ static Stroke *createStroke(Interface1D& inter)
        Vec2r previous = current;
        SVertex *sv;
        CurvePoint *cp;
-       StrokeVertex *stroke_vertex = NULL;  
+       StrokeVertex *stroke_vertex = NULL;
        bool hasSingularity = false;
 
        do {
index c7b0e3f8b81f43603d660ec792359eebe0ccd957..4130f9b370e843c73bb48df0f07d4da8d08e0df7 100644 (file)
@@ -94,7 +94,7 @@ public:
         *  \param pred
         *           The predicate on the ViewEdge that expresses the stopping condition.
         */
-       static int chain(ViewEdgeInternal::ViewEdgeIterator& it, UnaryPredicate1D& pred);  
+       static int chain(ViewEdgeInternal::ViewEdgeIterator& it, UnaryPredicate1D& pred);
 
        /*! Builds a set of chains from the current set of ViewEdges.
         *  Each ViewEdge of the current list potentially starts a new chain. The chaining operator then iterates over
index db96a27e073bf277805b18da85c7f89c1616e1d1..60b8c21067f17773fa5dff6a29bd5a9c0f8507ca 100644 (file)
@@ -565,7 +565,7 @@ public:
         *    \param iBegin
         *      The iterator pointing to the first vertex.
         *    \param iEnd
-        *      The iterator pointing to the end of the vertex list. 
+        *      The iterator pointing to the end of the vertex list.
         */
        template<class InputVertexIterator>
        Stroke(InputVertexIterator iBegin, InputVertexIterator iEnd);
@@ -601,7 +601,7 @@ public:
         *  Resamples the curve with a given sampling.
         *  If this sampling is < to the actual sampling value, no resampling is done.
         *  \param iSampling
-        *    The new sampling value.  
+        *    The new sampling value.
         */
        int Resample(float iSampling);
 
@@ -609,7 +609,7 @@ public:
         */
        void RemoveAllVertices();
 
-       /*! Removes the stroke vertex iVertex 
+       /*! Removes the stroke vertex iVertex
         *  from the stroke.
         *  The length and curvilinear abscissa are updated
         *  consequently.
index 868f61224dea8a1dba44a4c44ad4e6126149447a..054182a558a9e5a90dcaaf0c83f981fce96335fe 100644 (file)
@@ -112,7 +112,7 @@ protected:
        static string _patterns_path;
        static string _brushes_path;
        unsigned int _defaultTextureId;
-       
+
 #ifdef WITH_CXX_GUARDEDALLOC
        MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:TextureManager")
 #endif
index 028127897ff87f2e960ba5f2e266d565b78c1ec9..81ef46e5b3b064b878fa587a0dc810aeccf4c7cb 100644 (file)
@@ -741,7 +741,7 @@ StrokeRep::StrokeRep(Stroke *iStroke)
 #if 0
        _averageTextureAlpha = 0.5; //default value
        if (_strokeType == OIL_STROKE)
-               _averageTextureAlpha = 0.75; 
+               _averageTextureAlpha = 0.75;
        if (_strokeType >= NO_BLEND_STROKE)
                _averageTextureAlpha = 1.0;
 #endif
index 02f7177b95c65f7b63b17156a241df9cd3046030..dd0b945e4d3773695e48ed7958255abc94a20930 100644 (file)
@@ -28,7 +28,7 @@
 //  Purpose          : Class to define the text rendering of a stroke
 //                     Format:
 //                     x y width height // bbox
-//                     //list of vertices : 
+//                     //list of vertices :
 //                     t x y z t1 t2 r g b alpha ...
 //                      ...
 //  Date of creation : 01/14/2005
index 8b028cdb3da5a3052c80fb69c549d00f993c57ac..279730f7934b8e72c57c37fa9f63888e78a7a2f6 100644 (file)
@@ -78,7 +78,7 @@ public:
                _first = iBrother._first;
                _second = iBrother._second;
                return *this;
-       } 
+       }
 
        /*! Returns the first Id number */
        id_type getFirst() const
index 3243c4d1fb797e98e0e360653027c4a2a271c867..79de3ca497dbc4e2226b5c473817ea2889e11482 100644 (file)
@@ -49,7 +49,7 @@ ArbitraryGridDensityProvider::ArbitraryGridDensityProvider(OccluderSource& sourc
 }
 
 ArbitraryGridDensityProvider::ArbitraryGridDensityProvider(OccluderSource& source, unsigned numCells)
-: GridDensityProvider(source), numCells(numCells) 
+: GridDensityProvider(source), numCells(numCells)
 {
        real proscenium[4];
        calculateOptimalProscenium(source, proscenium);
index d98a3238a25bbebcb8ab56268dd716041a7aa643..ae0d83a3551ad11ff83b911849e215a7e13ab89d 100644 (file)
@@ -199,7 +199,7 @@ void CulledOccluderSource::cullViewEdges(ViewMap& viewMap, bool extensiveFEdgeSe
                        fe = fe->nextEdge();
                }
 
-               // If bestOccluderTarget was not found inside the occluder proscenium, 
+               // If bestOccluderTarget was not found inside the occluder proscenium,
                // we need to expand the occluder proscenium to include it.
                if ((*ve)->isInImage() && bestOccluderTarget != NULL && ! bestOccluderTargetFound) {
                        // Expand occluder proscenium to enclose bestOccluderTarget
@@ -249,7 +249,7 @@ void CulledOccluderSource::cullViewEdges(ViewMap& viewMap, bool extensiveFEdgeSe
                        FEdge *festart = (*ve)->fedgeA();
                        FEdge *fe = festart;
                        do {
-                               // If not (already) visible and center point inside occluder proscenium, 
+                               // If not (already) visible and center point inside occluder proscenium,
                                if (!fe->isInImage() && insideProscenium(occluderProscenium, fe->center2d())) {
                                        // Use the feature edge for visibility determination
                                        fe->setIsInImage(true);
index a97e60d5f60da82deb2b0865c2c57e86535b9f7d..1eeb6805e7d94f2ea89978a66100107389ce64f0 100644 (file)
@@ -193,7 +193,7 @@ void FEdgeXDetector::computeCurvatures(WXVertex *vertex)
        Vec3r e1, n, v;
        // one vertex curvature info :
        CurvatureInfo *C;
-       float radius = _sphereRadius * _meanEdgeSize; 
+       float radius = _sphereRadius * _meanEdgeSize;
 
        // view independent stuff
        if (_computeViewIndependent) {
@@ -369,7 +369,7 @@ void FEdgeXDetector::processCreaseShape(WXShape *iWShape)
        if (!_computeViewIndependent)
                return;
 
-       // Make a pass on the edges to detect the CREASE 
+       // Make a pass on the edges to detect the CREASE
        vector<WEdge*>::iterator we, weend;
        vector<WEdge*> &wedges = iWShape->getEdgeList();
        for (we = wedges.begin(), weend = wedges.end(); we != weend; ++we) {
index f47e5ff16d5da3226de559d8180521a856949df9..15319e54f66416ac7ab949362fba9922c88a20d7 100644 (file)
@@ -250,7 +250,7 @@ int Curvature2DAngleF0D::operator()(Interface0DIterator& iter)
        if ((N1.norm() == 0) && (N2.norm() == 0)) {
                Exception::raiseException();
                result = 0;
-               return -1; 
+               return -1;
        }
        double cosin = N1 * N2;
        if (cosin > 1)
index d2a5870f27ab7d43f580e9acf1e82252ca6e67a9..f3c8957a8044beadb5ecd199fdf48388591c1311 100644 (file)
@@ -101,7 +101,7 @@ public:
        }
 
        /*! The operator ().
-        *  \param inter 
+        *  \param inter
         *    The Interface1D on which we wish to evaluate the function.
         *  \return the result of the function of type T.
         */
index 9d373107bfa2b56bff4e99accec2be599bc568db..44bce375a75212d3f4ef33d99af1e14bc22f7e90 100644 (file)
@@ -102,7 +102,7 @@ public: // Implementation of Interface0D
                return _Point3D.z();
        }
 
-       /*!  Returns the 3D point. */ 
+       /*!  Returns the 3D point. */
        virtual Vec3r getPoint3D() const
        {
                return _Point3D;
@@ -126,7 +126,7 @@ public: // Implementation of Interface0D
                return _Point2D.z();
        }
 
-       /*!  Returns the 2D point. */ 
+       /*!  Returns the 2D point. */
        virtual Vec2r getPoint2D() const
        {
                return Vec2r(_Point2D.x(), _Point2D.y());
@@ -144,16 +144,16 @@ public: // Implementation of Interface0D
        /*! Returns the nature of the vertex .*/
        virtual Nature::VertexNature getNature() const;
 
-       /*! Cast the Interface0D in SVertex if it can be. */ 
+       /*! Cast the Interface0D in SVertex if it can be. */
        virtual SVertex *castToSVertex();
 
-       /*! Cast the Interface0D in ViewVertex if it can be. */ 
+       /*! Cast the Interface0D in ViewVertex if it can be. */
        virtual ViewVertex *castToViewVertex();
 
-       /*! Cast the Interface0D in NonTVertex if it can be. */ 
+       /*! Cast the Interface0D in NonTVertex if it can be. */
        virtual NonTVertex *castToNonTVertex();
 
-       /*! Cast the Interface0D in TVertex if it can be. */ 
+       /*! Cast the Interface0D in TVertex if it can be. */
        virtual TVertex *castToTVertex();
 
 public:
@@ -163,7 +163,7 @@ private:
        Id _Id;
        Vec3r _Point3D;
        Vec3r _Point2D;
-       set<Vec3r> _Normals; 
+       set<Vec3r> _Normals;
        vector<FEdge*> _FEdges; // the edges containing this vertex
        SShape *_Shape;  // the shape to which belongs the vertex
        ViewVertex *_pViewVertex; // The associated viewvertex, in case there is one.
@@ -1291,10 +1291,10 @@ protected:
        unsigned _FrsMaterialIndex;
 #if 0
        bool _hasVisibilityPoint;
-       Vec3r _VisibilityPointA;  // The edge on which the visibility will be computed represented 
+       Vec3r _VisibilityPointA;  // The edge on which the visibility will be computed represented
        Vec3r _VisibilityPointB;  // using its 2 extremity points A and B
 #endif
-       void *_Face; // In case of exact silhouette, Face is the WFace crossed by Fedge 
+       void *_Face; // In case of exact silhouette, Face is the WFace crossed by Fedge
                      // NOT HANDLED BY THE COPY CONSTRUCTEUR
        bool _FaceMark;
 
@@ -1418,7 +1418,7 @@ private:
        const char *_Name;
        const char *_LibraryPath;
        BBox<Vec3r> _BBox;
-       vector<FrsMaterial> _FrsMaterials;  
+       vector<FrsMaterial> _FrsMaterials;
 
        float _importance;
 
index 5a94a84705da1007d6fb7cbc644ca0f7df487ad2..2310f5ffe2fce8c62ae5cc3c42e2127c2b46374f 100644 (file)
@@ -173,7 +173,7 @@ public:
        // Accessors:
        bool orthographicProjection() const;
        const Vec3r& viewpoint() const;
-       bool enableQI() const; 
+       bool enableQI() const;
 
 private:
        void getCellCoordinates(const Vec3r& point, unsigned& x, unsigned& y);
@@ -317,7 +317,7 @@ inline void SphericalGrid::Iterator::reportDepth(Vec3r origin, Vec3r u, real t)
                // If the current occluder is the best occludee so far, save it.
                if (! _foundOccludee || _occludeeDepth > depth) {
                        markCurrentOccludeeCandidate(depth);
-               } 
+               }
        }
        else {
 #if SPHERICAL_GRID_LOGGING
index 4f5b4cba779905c2d01adb13976db8a1dc855ef1..34d8ecb3a8d04396bd31419bac91f21f5dcd5445 100644 (file)
@@ -91,7 +91,7 @@ void SteerableViewMap::Clear()
                }
                delete[] _imagesPyramids;
                _imagesPyramids = 0;
-       } 
+       }
        if (!_mapping.empty()) {
                for (map<unsigned int, double*>::iterator m = _mapping.begin(), mend = _mapping.end();  m != mend; ++m) {
                        delete[] (*m).second;
@@ -170,7 +170,7 @@ unsigned SteerableViewMap::getSVMNumber(unsigned id)
        map<unsigned int, double *>::iterator o = _mapping.find(id);
        if (o != _mapping.end()) {
                double *wvalues = (*o).second;
-               double maxw = 0.0; 
+               double maxw = 0.0;
                unsigned winner = _nbOrientations + 1;
                for (unsigned i = 0; i < _nbOrientations; ++i) {
                        double w = wvalues[i];
index 3a6606277766582d02853ce838011a314aa90a2e..0327b4a460eceb4839078d3addef15ec23122daa 100644 (file)
@@ -48,7 +48,7 @@ class FEdge;
 class ImagePyramid;
 class GrayImage;
 
-/*! This class checks for every FEdge in which steerable it belongs and stores the mapping allowing to retrieve 
+/*! This class checks for every FEdge in which steerable it belongs and stores the mapping allowing to retrieve
  *  this information from the FEdge Id.
  */
 class SteerableViewMap
index 52769413e7929683214ca20c54541cb9a71231ac..01a6edad9736f6e0441bb91778fae98b04c74529 100644 (file)
@@ -95,7 +95,7 @@ ViewShape *ViewMap::viewShape(unsigned id)
 
 void ViewMap::AddViewShape(ViewShape *iVShape)
 {
-       _shapeIdToIndex[iVShape->getId().getFirst()] = _VShapes.size(); 
+       _shapeIdToIndex[iVShape->getId().getFirst()] = _VShapes.size();
        _VShapes.push_back(iVShape);
 }
 
@@ -305,13 +305,13 @@ static bool ViewEdgeComp(ViewVertex::directedViewEdge& dve1, ViewVertex::directe
        if (v1.y() > 0) {
                if (v2.y() < 0)
                        return true;
-               else 
+               else
                        return (v1.x() > v2.x());
        }
        else {
                if (v2.y() > 0)
                        return false;
-               else 
+               else
                        return (v1.x() < v2.x());
        }
        return false;
@@ -387,7 +387,7 @@ void TVertex::setBackEdgeB(ViewEdge *iBackEdgeB, bool incoming)
 
 void TVertex::Replace(ViewEdge *iOld, ViewEdge *iNew)
 {
-       // theoritically, we only replace edges for which this 
+       // theoritically, we only replace edges for which this
        // view vertex is the B vertex
        if ((iOld == _FrontEdgeA.first) && (_FrontEdgeA.first->B() == this)) {
                _FrontEdgeA.first = iNew;
@@ -501,7 +501,7 @@ ViewVertexInternal::orientedViewEdgeIterator TVertex::edgesIterator(ViewEdge *iE
 /**********************************/
 /*                                */
 /*                                */
-/*             NonTVertex         */ 
+/*             NonTVertex         */
 /*                                */
 /*                                */
 /**********************************/
index 8b73c8aac3a8be6543c6f8180b17a2b50edde009..06ab318302718210f4d83bdb89ea5e117f876ed9 100644 (file)
@@ -218,7 +218,7 @@ public:
         *    iB2D
         *      The x,y,z 2D coordinates of the projection of iB3D
         *    iFEdgeB
-        *      The second FEdge   
+        *      The second FEdge
         *    id
         *      The id that must be given to that TVertex
         */
@@ -650,7 +650,7 @@ public:
 /**********************************/
 /*                                */
 /*                                */
-/*             NonTVertex         */ 
+/*             NonTVertex         */
 /*                                */
 /*                                */
 /**********************************/
@@ -1643,7 +1643,7 @@ void ViewShape::SplitEdge(FEdge *fe, const vector<TVertex*>& iViewVertices, vect
        ViewEdge *vEdge = fe->viewedge();
 
        // We first need to sort the view vertices from farther to closer to fe->vertexA
-       SVertex *sv, *sv2; 
+       SVertex *sv, *sv2;
        ViewVertex *vva, *vvb;
        vector<TVertex*>::const_iterator vv, vvend;
        for (vv = iViewVertices.begin(), vvend = iViewVertices.end(); vv != vvend; vv++) {
@@ -1685,7 +1685,7 @@ void ViewShape::SplitEdge(FEdge *fe, const vector<TVertex*>& iViewVertices, vect
                if ((vva == 0) || (vvb == 0)) { // that means we're dealing with a closed viewedge (loop)
                        // remove the chain that was starting by the fedge A of vEdge (which is different from fe !!!!)
                        shape->RemoveEdgeFromChain(vEdge->fedgeA());
-                       // we set 
+                       // we set
                        vEdge->setA(*vv);
                        vEdge->setB(*vv);
                        vEdge->setFEdgeA(newEdge);
index 794c782bb7327dc75135774e8ccf341217af81c5..5b7576ccd3d00fbd06d743962be8d845c3881e4d 100644 (file)
@@ -1004,7 +1004,7 @@ ViewMap *ViewMapBuilder::BuildViewMap(WingedEdge& we, visibility_algo iAlgo, rea
        computeInitialViewEdges(we);
 
        // Detects cusps
-       computeCusps(_ViewMap); 
+       computeCusps(_ViewMap);
 
        // Compute intersections
        ComputeIntersections(_ViewMap, sweep_line, epsilon);
@@ -1059,7 +1059,7 @@ void ViewMapBuilder::CullViewEdges(ViewMap *ioViewMap, real viewProscenium[4], r
                cout << "Origin: [" << prosceniumOrigin[0] << ", " << prosceniumOrigin[1] << "]"<< endl;
        }
 
-       // A separate occluder proscenium will also be maintained, starting out the same as the viewport proscenium, and 
+       // A separate occluder proscenium will also be maintained, starting out the same as the viewport proscenium, and
        // expanding as necessary so that it encompasses the center point of at least one feature edge in each retained view
        // edge.
        // The occluder proscenium will be used later to cull occluding triangles before they are inserted into the Grid.
@@ -1182,7 +1182,7 @@ void ViewMapBuilder::CullViewEdges(ViewMap *ioViewMap, real viewProscenium[4], r
                        FEdge *festart = (*ve)->fedgeA();
                        FEdge *fe = festart;
                        do {
-                               // If not (already) visible and center point inside occluder proscenium, 
+                               // If not (already) visible and center point inside occluder proscenium,
                                if (!fe->isInImage() && insideProscenium(occluderProscenium, fe->center2d())) {
                                        // Use the feature edge for visibility determination
                                        fe->setIsInImage(true);
@@ -2286,7 +2286,7 @@ void ViewMapBuilder::ComputeSweepLineIntersections(ViewMap *ioViewMap, real epsi
        for (fe = ioEdges.begin(), fend = ioEdges.end(); fe != fend; fe++)
                (*fe)->userdata = NULL;
 
-       // list containing the new edges resulting from splitting operations. 
+       // list containing the new edges resulting from splitting operations.
        vector<FEdge*> newEdges;
 
        // retrieve the intersected edges:
index 440ae93c7dfadddbd04d5560f4a216d4c6a9d96b..acde37046255467513e735f51b4323b788047209 100644 (file)
@@ -159,7 +159,7 @@ public:
        /*! Builds the scene view map returns the list the view map
         *  it is up to the caller to delete this ViewMap
         *    iWRoot
-        *      The root group node containing the WEdge structured scene 
+        *      The root group node containing the WEdge structured scene
         */
        ViewMap *BuildViewMap(WingedEdge& we, visibility_algo iAlgo, real epsilon, const BBox<Vec3r>& bbox,
                              unsigned int sceneNumFaces);
@@ -180,7 +180,7 @@ public:
 
        /*! Computes the 2D scene silhouette edges visibility
         *    iGrid
-        *      For the Ray Casting algorithm. 
+        *      For the Ray Casting algorithm.
         */
        void ComputeEdgesVisibility(ViewMap *ioViewMap, WingedEdge& we, const BBox<Vec3r>& bbox, unsigned int sceneNumFaces,
                                    visibility_algo iAlgo = ray_casting, real epsilon = 1.0e-6);
index 71ae68c06bcb987067faec5162e4d6f5a1cae906..3e80c004b5f36ae44aec8ce20c84b8f54e1b5399 100644 (file)
@@ -284,7 +284,7 @@ static int load(istream& in, FEdge *fe)
                load(in, v);
                fesharp->setNormalB(v);
 
-               // Materials 
+               // Materials
                READ(matindex);
                fesharp->setaFrsMaterialIndex(matindex);
                READ(matindex);
index 469c2c3b29c4209896c3c0a0fc2578f4f9433224..b10de13cef7296777bcf3bf804349c2dbc83925b 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "ViewMap.h"
 
-#include "../system/Iterator.h" //soc 
+#include "../system/Iterator.h" //soc
 
 namespace Freestyle {