A big code clean-up patch from Bastien Montagne, many thanks!
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 7 Mar 2013 23:17:23 +0000 (23:17 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 7 Mar 2013 23:17:23 +0000 (23:17 +0000)
221 files changed:
source/blender/freestyle/FRS_freestyle.h
source/blender/freestyle/intern/application/AppCanvas.cpp
source/blender/freestyle/intern/application/AppCanvas.h
source/blender/freestyle/intern/application/AppConfig.cpp
source/blender/freestyle/intern/application/AppConfig.h
source/blender/freestyle/intern/application/AppView.h
source/blender/freestyle/intern/application/Controller.cpp
source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h
source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
source/blender/freestyle/intern/geometry/Bezier.cpp
source/blender/freestyle/intern/geometry/FastGrid.cpp
source/blender/freestyle/intern/geometry/FastGrid.h
source/blender/freestyle/intern/geometry/FitCurve.cpp
source/blender/freestyle/intern/geometry/GeomCleaner.cpp
source/blender/freestyle/intern/geometry/GeomUtils.cpp
source/blender/freestyle/intern/geometry/GeomUtils.h
source/blender/freestyle/intern/geometry/Grid.cpp
source/blender/freestyle/intern/geometry/Grid.h
source/blender/freestyle/intern/geometry/GridHelpers.h
source/blender/freestyle/intern/geometry/HashGrid.cpp
source/blender/freestyle/intern/geometry/HashGrid.h
source/blender/freestyle/intern/geometry/Polygon.h
source/blender/freestyle/intern/geometry/SweepLine.h
source/blender/freestyle/intern/geometry/VecMat.h
source/blender/freestyle/intern/geometry/normal_cycle.cpp
source/blender/freestyle/intern/image/GaussianFilter.h
source/blender/freestyle/intern/image/Image.h
source/blender/freestyle/intern/image/ImagePyramid.cpp
source/blender/freestyle/intern/image/ImagePyramid.h
source/blender/freestyle/intern/python/BPy_BBox.cpp
source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp
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_FrsMaterial.cpp
source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
source/blender/freestyle/intern/python/BPy_Id.cpp
source/blender/freestyle/intern/python/BPy_Interface0D.cpp
source/blender/freestyle/intern/python/BPy_Interface1D.cpp
source/blender/freestyle/intern/python/BPy_Iterator.cpp
source/blender/freestyle/intern/python/BPy_Operators.cpp
source/blender/freestyle/intern/python/BPy_SShape.cpp
source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
source/blender/freestyle/intern/python/BPy_ViewMap.cpp
source/blender/freestyle/intern/python/BPy_ViewShape.cpp
source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp
source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp
source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp
source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp
source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp
source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h
source/blender/freestyle/intern/python/Director.cpp
source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h
source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h
source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h
source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp
source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h
source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp
source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp
source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp
source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.cpp
source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h
source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp
source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp
source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h
source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp
source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h
source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp
source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp
source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp
source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h
source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp
source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h
source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp
source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp
source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp
source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.cpp
source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.cpp
source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp
source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.cpp
source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h
source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp
source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.cpp
source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.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_UnaryFunction1DEdgeNature.h
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_UnaryFunction1DUnsigned.h
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_UnaryFunction1DVectorViewShape.h
source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp
source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.cpp
source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.cpp
source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h
source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h
source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.cpp
source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h

index 3eaa1f3fbedb162de1918290f0cc9976dad28fb1..5b2b62818c111c843c872f7dd13e140a9a379957 100644 (file)
@@ -52,13 +52,13 @@ extern int freestyle_viewport[4];
 
 /* Rendering */
 void FRS_initialize(void);
-void FRS_set_context(bContextC);
-void FRS_read_file(bContextC);
-int FRS_is_freestyle_enabled(struct SceneRenderLayersrl);
-void FRS_init_stroke_rendering(struct Renderre);
-struct Render* FRS_do_stroke_rendering(struct Render* re, struct SceneRenderLayer* srl);
-void FRS_finish_stroke_rendering(struct Renderre);
-void FRS_composite_result(struct Render* re, struct SceneRenderLayer* srl, struct Render* freestyle_render);
+void FRS_set_context(bContext *C);
+void FRS_read_file(bContext *C);
+int FRS_is_freestyle_enabled(struct SceneRenderLayer *srl);
+void FRS_init_stroke_rendering(struct Render *re);
+struct Render *FRS_do_stroke_rendering(struct Render *re, struct SceneRenderLayer *srl);
+void FRS_finish_stroke_rendering(struct Render *re);
+void FRS_composite_result(struct Render *re, struct SceneRenderLayer *srl, struct Render *freestyle_render);
 void FRS_exit(void);
 
 /* FreestyleConfig.modules */
index 06391717bb9bb146ddabd9965c5b336bc769d5a9..d2dc14b1c19581220d3d1647f8f47c935ecd07e8 100644 (file)
@@ -47,7 +47,7 @@ AppCanvas::AppCanvas()
        _MapsPath = StringUtils::toAscii(Config::Path::getInstance()->getMapsDir()).c_str();
 }
 
-AppCanvas::AppCanvas(AppViewiViewer)
+AppCanvas::AppCanvas(AppView *iViewer)
 :Canvas()
 {
        _pViewer = iViewer;
@@ -116,7 +116,7 @@ void AppCanvas::init()
 void AppCanvas::postDraw()
 {
        for (unsigned int i = 0; i < _StyleModules.size(); i++) {
-               if(!_StyleModules[i]->getDisplayed() || !_Layers[i])
+               if (!_StyleModules[i]->getDisplayed() || !_Layers[i])
                        continue;
                _Layers[i]->ScaleThickness(thickness());
        }
@@ -130,9 +130,9 @@ void AppCanvas::Erase()
 
 // Abstract
 
-void AppCanvas::readColorPixels(int x,int y,int w, int h, RGBImage& oImage) const
+void AppCanvas::readColorPixels(int x, int y, int w, int h, RGBImage& oImage) const
 {
-       float *rgb = new float[3*w*h];
+       float *rgb = new float[3 * w * h];
        memset(rgb, 0, sizeof(float) * 3 * w * h);
        int xsch = width();
        int ysch = height();
@@ -147,8 +147,8 @@ void AppCanvas::readColorPixels(int x,int y,int w, int h, RGBImage& oImage) cons
                float yfac = ((float)recty) / ((float)(ymax - ymin));
 #if 0
                if (G.debug & G_DEBUG_FREESTYLE) {
-                       printf("readColorPixels %d x %d @ (%d, %d) in %d x %d [%d x %d] -- %d x %d @ %d%%\n", w, h, x, y, xsch, ysch,
-                              xmax - xmin, ymax - ymin, rectx, recty, (int)(xfac * 100.0f));
+                       printf("readColorPixels %d x %d @ (%d, %d) in %d x %d [%d x %d] -- %d x %d @ %d%%\n", w, h, x, y,
+                              xsch, ysch, xmax - xmin, ymax - ymin, rectx, recty, (int)(xfac * 100.0f));
                }
 #endif
                int ii, jj;
@@ -167,9 +167,9 @@ void AppCanvas::readColorPixels(int x,int y,int w, int h, RGBImage& oImage) cons
        oImage.setArray(rgb, xsch, ysch, w, h, x, y, false);
 }
 
-void AppCanvas::readDepthPixels(int x,int y,int w, int h, GrayImage& oImage) const
+void AppCanvas::readDepthPixels(int x, int y, int w, int h, GrayImage& oImage) const
 {
-       float *z = new float[w*h];
+       float *z = new float[w * h];
        memset(z, 0, sizeof(float) * w * h);
        int xsch = width();
        int ysch = height();
@@ -184,8 +184,8 @@ void AppCanvas::readDepthPixels(int x,int y,int w, int h, GrayImage& oImage) con
                float yfac = ((float)recty) / ((float)(ymax - ymin));
 #if 0
                if (G.debug & G_DEBUG_FREESTYLE) {
-                       printf("readDepthPixels %d x %d @ (%d, %d) in %d x %d [%d x %d] -- %d x %d @ %d%%\n", w, h, x, y, xsch, ysch,
-                              xmax - xmin, ymax - ymin, rectx, recty, (int)(xfac * 100.0f));
+                       printf("readDepthPixels %d x %d @ (%d, %d) in %d x %d [%d x %d] -- %d x %d @ %d%%\n", w, h, x, y,
+                              xsch, ysch, xmax - xmin, ymax - ymin, rectx, recty, (int)(xfac * 100.0f));
                }
 #endif
                int ii, jj;
@@ -206,7 +206,7 @@ void AppCanvas::readDepthPixels(int x,int y,int w, int h, GrayImage& oImage) con
 
 void AppCanvas::RenderStroke(Stroke *iStroke)
 {
-       if(_basic)
+       if (_basic)
                iStroke->RenderBasic(_Renderer);
        else
                iStroke->Render(_Renderer);
index 3a65020463c84a4a790c5f7e1aafc57adbfe9b20..a839c1efe0df89772b490f2aa6e8fc59737f906f 100644 (file)
@@ -56,14 +56,14 @@ public:
        virtual void init();
 
        /*! Reads a pixel area from the canvas */
-       virtual void readColorPixels(int x,int y,int w, int h, RGBImage& oImage) const;
+       virtual void readColorPixels(int x, int y, int w, int h, RGBImage& oImage) const;
        /*! Reads a depth pixel area from the canvas */
-       virtual void readDepthPixels(int x,int y,int w, int h, GrayImage& oImage) const;
+       virtual void readDepthPixels(int x, int y, int w, int h, GrayImage& oImage) const;
 
        virtual BBox<Vec3r> scene3DBBox() const;
 
        /* abstract */
-       virtual void RenderStroke(Stroke*);
+       virtual void RenderStroke(Stroke *);
        virtual void update();
 
 
index c8ebc45d7ebfe2fe0ead4b7357735c85ee589b6a..2500c9c68ee941c5e9e52c781fe0c761c07c4f60 100644 (file)
@@ -42,7 +42,7 @@ extern "C" {
 
 namespace Config {
 
-PathPath::_pInstance = 0;
+Path *Path::_pInstance = 0;
 Path::Path()
 {
        // get the root directory
@@ -80,7 +80,7 @@ Path::~Path()
        _pInstance = 0;
 }
 
-PathPath::getInstance()
+Path *Path::getInstance()
 {
        return _pInstance;
 }
@@ -89,11 +89,10 @@ string Path::getEnvVar(const string& iEnvVarName)
 {
        string value;
        if (!getenv(StringUtils::toAscii(iEnvVarName).c_str())) {
-               cerr << "Warning: You may want to set the $"
-                    << StringUtils::toAscii(iEnvVarName)
-                    << " environment variable to use Freestyle." << endl
-                    << "         Otherwise, the current directory will be used instead."
-                    << endl;
+               cerr << "Warning: You may want to set the $" <<
+                       StringUtils::toAscii(iEnvVarName) <<
+                       " environment variable to use Freestyle." << endl <<
+                       "         Otherwise, the current directory will be used instead." << endl;
                value = ".";
        }
        else {
index 9bd5506d94cd50ff042509d5ad31dd7bc9518615..54dde44df7cf7c068da1f0b31e3b1ca92e665f90 100644 (file)
@@ -43,7 +43,7 @@ using namespace std;
 
 namespace Config {
 
-class Path{
+class Path {
 protected:
        static Path * _pInstance;
        string _ProjectDir;
@@ -58,7 +58,7 @@ protected:
 public:
        Path();
        virtual ~Path();
-       static PathgetInstance();
+       static Path *getInstance();
 
        void setRootDir(const string& iRootDir);
        void setHomeDir(const string& iHomeDir);
index 7b8a892858ee72c31afe6bb833d21322ea172ea5..0aa3f8a4005e1e73ac083a7be875ca0ca9d20967 100644 (file)
@@ -94,7 +94,7 @@ public:
                _minAbs = std::min(rabs(_minBBox), rabs(_maxBBox));
        }
 
-       inline void AddSilhouette(NodeGroupiSilhouette)
+       inline void AddSilhouette(NodeGroup *iSilhouette)
        {
                _SilhouetteRootNode->AddChild(iSilhouette);
        }
@@ -109,7 +109,7 @@ public:
                //_pVisibleSilhouetteNode->AddChild(iVSilhouette);
        }
 
-       inline void setDebug(NodeGroupiDebug)
+       inline void setDebug(NodeGroup *iDebug)
        {
                if (0 != _DebugRootNode->numberOfChildren()) {
                        _DebugRootNode->DetachChildren();
@@ -119,7 +119,7 @@ public:
                AddDebug(iDebug);
        }
 
-       inline void AddDebug(NodeGroupiDebug)
+       inline void AddDebug(NodeGroup *iDebug)
        {
                _DebugRootNode->AddChild(iDebug);
        }
index b71f716459c313f72e741d82964841d8aefa1fda..bc847bb6114d8dd996f7ee56ea8f58b0d01c6f60 100644 (file)
@@ -185,7 +185,7 @@ Controller::~Controller()
 
 void Controller::setView(AppView *iView)
 {
-       if(NULL == iView)
+       if (NULL == iView)
                return;
 
        _pView = iView;
@@ -213,12 +213,12 @@ void Controller::setPassZ(float *buf, int width, int height)
 
 void Controller::setContext(bContext *C)
 {
-       PythonInterpreterpy_inter = dynamic_cast<PythonInterpreter*>(_inter);
+       PythonInterpreter *py_inter = dynamic_cast<PythonInterpreter*>(_inter);
        assert(py_inter != 0);
        py_inter->setContext(C);
 }
 
-int Controller::LoadMesh(Render *re, SceneRenderLayersrl)
+int Controller::LoadMesh(Render *re, SceneRenderLayer *srl)
 {
        BlenderFileLoader loader(re, srl);
 
@@ -300,7 +300,7 @@ int Controller::LoadMesh(Render *re, SceneRenderLayer* srl)
 
        _ListOfModels.push_back("Blender_models");
 
-       _bboxDiag = (_RootNode->bbox().getMax()-_RootNode->bbox().getMin()).norm();
+       _bboxDiag = (_RootNode->bbox().getMax() - _RootNode->bbox().getMin()).norm();
        if (G.debug & G_DEBUG_FREESTYLE) {
                cout << "Triangles nb     : " << _SceneNumFaces << endl;
                cout << "Bounding Box     : " << _bboxDiag << endl;
@@ -531,7 +531,7 @@ void Controller::ComputeViewMap()
        ViewMapBuilder vmBuilder;
        vmBuilder.setEnableQI(_EnableQI);
        vmBuilder.setViewpoint(Vec3r(vp));
-       vmBuilder.setTransform( mv, proj,viewport, _pView->GetFocalLength(), _pView->GetAspect(), _pView->GetFovyRadian());
+       vmBuilder.setTransform(mv, proj, viewport, _pView->GetFocalLength(), _pView->GetAspect(), _pView->GetFovyRadian());
        vmBuilder.setFrustum(_pView->znear(), _pView->zfar());
        vmBuilder.setGrid(&_Grid);
        vmBuilder.setRenderMonitor(_pRenderMonitor);
@@ -843,17 +843,17 @@ void Controller::ResetRenderCount()
        _render_count = 0;
 }
 
-RenderController::RenderStrokes(Render *re)
+Render *Controller::RenderStrokes(Render *re)
 {
        _Chrono.start();
-       BlenderStrokeRendererblenderRenderer = new BlenderStrokeRenderer(re, ++_render_count);
+       BlenderStrokeRenderer *blenderRenderer = new BlenderStrokeRenderer(re, ++_render_count);
        _Canvas->Render(blenderRenderer);
        real d = _Chrono.stop();
        if (G.debug & G_DEBUG_FREESTYLE) {
                cout << "Temporary scene generation: " << d << endl;
        }
        _Chrono.start();
-       Renderfreestyle_render = blenderRenderer->RenderScene(re);
+       Render *freestyle_render = blenderRenderer->RenderScene(re);
        d = _Chrono.stop();
        if (G.debug & G_DEBUG_FREESTYLE) {
                cout << "Stroke rendering  : " << d << endl;
@@ -866,18 +866,17 @@ Render* Controller::RenderStrokes(Render *re)
 void Controller::InsertStyleModule(unsigned index, const char *iFileName)
 {
        if (!BLI_testextensie(iFileName, ".py")) {
-               cerr << "Error: Cannot load \"" << StringUtils::toAscii(string(iFileName))
-                    << "\", unknown extension" << endl;
+               cerr << "Error: Cannot load \"" << StringUtils::toAscii(string(iFileName)) << "\", unknown extension" << endl;
                return;
        }
 
-       StyleModulesm = new StyleModule(iFileName, _inter);
+       StyleModule *sm = new StyleModule(iFileName, _inter);
        _Canvas->InsertStyleModule(index, sm);
 }
 
 void Controller::InsertStyleModule(unsigned index, const char *iName, struct Text *iText)
 {
-       StyleModulesm = new BlenderStyleModule(iText, iName, _inter);
+       StyleModule *sm = new BlenderStyleModule(iText, iName, _inter);
        _Canvas->InsertStyleModule(index, sm);
 }
 
@@ -898,7 +897,7 @@ void Controller::Clear()
 
 void Controller::ReloadStyleModule(unsigned index, const char * iFileName)
 {
-       StyleModulesm = new StyleModule(iFileName, _inter);
+       StyleModule *sm = new StyleModule(iFileName, _inter);
        _Canvas->ReplaceStyleModule(index, sm);
 }
 
index e9586e347a24d58508fdb41a4819e23e8fb34245..2018c7a740d21be93da67fea084529763157113f 100644 (file)
@@ -35,7 +35,7 @@
 
 #include "BKE_global.h"
 
-BlenderFileLoader::BlenderFileLoader(Render *re, SceneRenderLayersrl)
+BlenderFileLoader::BlenderFileLoader(Render *re, SceneRenderLayer *srl)
 {
        _re = re;
        _srl = srl;
@@ -50,7 +50,7 @@ BlenderFileLoader::~BlenderFileLoader()
        _Scene = NULL;
 }
 
-NodeGroupBlenderFileLoader::Load()
+NodeGroup *BlenderFileLoader::Load()
 {
        ObjectInstanceRen *obi;
 
@@ -582,10 +582,10 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id)
                                             edgeMarks, em1, false, em4, clip_1);
                        }
                        for (i = 0; i < numTris_1; i++) {
-                               addTriangle(&ls, triCoords[0], triCoords[i+1], triCoords[i+2],
-                                           triNormals[0], triNormals[i+1], triNormals[i+2],
-                                           fm, (i == 0) ? edgeMarks[0] : false, edgeMarks[i+1],
-                                           (i == numTris_1 - 1) ? edgeMarks[i+2] : false);
+                               addTriangle(&ls, triCoords[0], triCoords[i + 1], triCoords[i + 2],
+                                           triNormals[0], triNormals[i + 1], triNormals[i + 2],
+                                           fm, (i == 0) ? edgeMarks[0] : false, edgeMarks[i + 1],
+                                           (i == numTris_1 - 1) ? edgeMarks[i + 2] : false);
                                _numFacesRead++;
                        }
                }
@@ -600,10 +600,10 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id)
                                             edgeMarks, em2, em3, false, clip_2);
                        }
                        for (i = 0; i < numTris_2; i++) {
-                               addTriangle(&ls, triCoords[0], triCoords[i+1], triCoords[i+2],
-                                           triNormals[0], triNormals[i+1], triNormals[i+2],
-                                           fm, (i == 0) ? edgeMarks[0] : false, edgeMarks[i+1],
-                                           (i == numTris_2 - 1) ? edgeMarks[i+2] : false);
+                               addTriangle(&ls, triCoords[0], triCoords[i + 1], triCoords[i + 2],
+                                           triNormals[0], triNormals[i + 1], triNormals[i + 2],
+                                           fm, (i == 0) ? edgeMarks[0] : false, edgeMarks[i + 1],
+                                           (i == numTris_2 - 1) ? edgeMarks[i + 2] : false);
                                _numFacesRead++;
                        }
                }
@@ -624,12 +624,9 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id)
        GeomCleaner::CleanIndexedVertexArray(normals, nSize, NIndices, niSize, &cleanNormals, &cnSize, &cleanNIndices);
 
        // format materials array
-       FrsMaterial** marray = new FrsMaterial*[meshFrsMaterials.size()];
+       FrsMaterial **marray = new FrsMaterial *[meshFrsMaterials.size()];
        unsigned int mindex = 0;
-       for (vector<FrsMaterial>::iterator m = meshFrsMaterials.begin(), mend = meshFrsMaterials.end();
-            m!=mend;
-            ++m)
-       {
+       for (vector<FrsMaterial>::iterator m = meshFrsMaterials.begin(), mend = meshFrsMaterials.end(); m != mend; ++m) {
                marray[mindex] = new FrsMaterial(*m);
                ++mindex;
        }
@@ -653,11 +650,11 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id)
        for (i = 0; i < viSize; i += 3) {
                detri_t detri;
                vi0 = cleanVIndices[i];
-               vi1 = cleanVIndices[i+1];
-               vi2 = cleanVIndices[i+2];
-               Vec3r v0(cleanVertices[vi0], cleanVertices[vi0+1], cleanVertices[vi0+2]);
-               Vec3r v1(cleanVertices[vi1], cleanVertices[vi1+1], cleanVertices[vi1+2]);
-               Vec3r v2(cleanVertices[vi2], cleanVertices[vi2+1], cleanVertices[vi2+2]);
+               vi1 = cleanVIndices[i + 1];
+               vi2 = cleanVIndices[i + 2];
+               Vec3r v0(cleanVertices[vi0], cleanVertices[vi0 + 1], cleanVertices[vi0 + 2]);
+               Vec3r v1(cleanVertices[vi1], cleanVertices[vi1 + 1], cleanVertices[vi1 + 2]);
+               Vec3r v2(cleanVertices[vi2], cleanVertices[vi2 + 1], cleanVertices[vi2 + 2]);
                if (v0 == v1 || v0 == v2 || v1 == v2) {
                        continue; // do nothing for now
                }
@@ -686,11 +683,11 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id)
                        if (i == j)
                                continue;
                        vi0 = cleanVIndices[j];
-                       vi1 = cleanVIndices[j+1];
-                       vi2 = cleanVIndices[j+2];
-                       Vec3r v0(cleanVertices[vi0], cleanVertices[vi0+1], cleanVertices[vi0+2]);
-                       Vec3r v1(cleanVertices[vi1], cleanVertices[vi1+1], cleanVertices[vi1+2]);
-                       Vec3r v2(cleanVertices[vi2], cleanVertices[vi2+1], cleanVertices[vi2+2]);
+                       vi1 = cleanVIndices[j + 1];
+                       vi2 = cleanVIndices[j + 2];
+                       Vec3r v0(cleanVertices[vi0], cleanVertices[vi0 + 1], cleanVertices[vi0 + 2]);
+                       Vec3r v1(cleanVertices[vi1], cleanVertices[vi1 + 1], cleanVertices[vi1 + 2]);
+                       Vec3r v2(cleanVertices[vi2], cleanVertices[vi2 + 1], cleanVertices[vi2 + 2]);
                        if (detri.viP == vi0 && (detri.viA == vi1 || detri.viB == vi1)) {
                                detri.v += (v2 - v0);
                                detri.n++;
@@ -728,13 +725,13 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id)
                        detri_t detri = (*v);
                        if (detri.n == 0) {
                                cleanVertices[detri.viP]   = cleanVertices[detri.viA];
-                               cleanVertices[detri.viP+1] = cleanVertices[detri.viA+1];
-                               cleanVertices[detri.viP+2] = cleanVertices[detri.viA+2];
+                               cleanVertices[detri.viP + 1] = cleanVertices[detri.viA + 1];
+                               cleanVertices[detri.viP + 2] = cleanVertices[detri.viA + 2];
                        }
                        else if (detri.v.norm() > 0.0) {
                                cleanVertices[detri.viP]   += 1.0e-5 * detri.v.x();
-                               cleanVertices[detri.viP+1] += 1.0e-5 * detri.v.y();
-                               cleanVertices[detri.viP+2] += 1.0e-5 * detri.v.z();
+                               cleanVertices[detri.viP + 1] += 1.0e-5 * detri.v.y();
+                               cleanVertices[detri.viP + 2] += 1.0e-5 * detri.v.z();
                        }
                }
                if (G.debug & G_DEBUG_FREESTYLE) {
index 316cf93a617e95d68390747122bf8f0e2d6af741..1637a136a8a67bb09fe7c34a09dc3c00a036faf1 100644 (file)
@@ -87,7 +87,7 @@ class LIB_SCENE_GRAPH_EXPORT BlenderFileLoader
 {
 public:
        /*! Builds a MaxFileLoader */
-       BlenderFileLoader(Render *re, SceneRenderLayersrl);
+       BlenderFileLoader(Render *re, SceneRenderLayer *srl);
        virtual ~BlenderFileLoader();
 
        /*! Loads the 3D scene and returns a pointer to the scene root node */
index 254aca35d82435774dcb4f180fb255f60057d8df..cab6ebff4f2c5429221f91f65309746ca3e5ffaf 100644 (file)
@@ -67,7 +67,7 @@ extern "C" {
 }
 #endif
 
-BlenderStrokeRenderer::BlenderStrokeRenderer(Renderre, int render_count) : StrokeRenderer()
+BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : StrokeRenderer()
 {
        // TEMPORARY - need a  texture manager
        _textureManager = new BlenderTextureManager;
@@ -128,9 +128,9 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render* re, int render_count) : Str
        BKE_scene_set_background(G.main, freestyle_scene);
 
        // Camera
-       Objectobject_camera = BKE_object_add(freestyle_scene, OB_CAMERA);
+       Object *object_camera = BKE_object_add(freestyle_scene, OB_CAMERA);
 
-       Cameracamera = (Camera *)object_camera->data;
+       Camera *camera = (Camera *)object_camera->data;
        camera->type = CAM_ORTHO;
        camera->ortho_scale = max(re->rectx, re->recty);
        camera->clipsta = 0.1f;
@@ -172,7 +172,7 @@ BlenderStrokeRenderer::~BlenderStrokeRenderer()
        // compositor has finished.
 
        // release objects and data blocks
-       for (Base *b = (Base*)freestyle_scene->base.first; b; b = b->next) {
+       for (Base *b = (Base *)freestyle_scene->base.first; b; b = b->next) {
                Object *ob = b->object;
                void *data = ob->data;
                char *name = ob->id.name;
@@ -192,7 +192,7 @@ BlenderStrokeRenderer::~BlenderStrokeRenderer()
                        freestyle_scene->camera = NULL;
                        break;
                default:
-                       cerr << "Warning: unexpected object in the scene: " << name[0] << name[1] << ":" << (name+2) << endl;
+                       cerr << "Warning: unexpected object in the scene: " << name[0] << name[1] << ":" << (name + 2) << endl;
                }
        }
        BLI_freelistN(&freestyle_scene->base);
@@ -239,9 +239,7 @@ void BlenderStrokeRenderer::RenderStrokeRepBasic(StrokeRep *iStrokeRep) const
        unsigned int vertex_index, edge_index, loop_index;
        Vec2r p;
 
-       for (vector<Strip*>::iterator s = strips.begin(), send = strips.end();
-            s != send;
-            ++s){
+       for (vector<Strip*>::iterator s = strips.begin(), send = strips.end(); s != send; ++s) {
                Strip::vertex_container& strip_vertices = (*s)->vertices();
                int strip_vertex_count = (*s)->sizeStrip();
                int xl, xu, yl, yu, n, visible_faces, visible_segments;
@@ -286,11 +284,11 @@ void BlenderStrokeRenderer::RenderStrokeRepBasic(StrokeRep *iStrokeRep) const
 
                //me = Mesh.New()
 #if 0
-               Objectobject_mesh = BKE_object_add(freestyle_scene, OB_MESH);
+               Object *object_mesh = BKE_object_add(freestyle_scene, OB_MESH);
 #else
-               Objectobject_mesh = NewMesh();
+               Object *object_mesh = NewMesh();
 #endif
-               Mesh* mesh = (Mesh*)object_mesh->data;
+               Mesh *mesh = (Mesh *)object_mesh->data;
 #if 0
                MEM_freeN(mesh->bb);
                mesh->bb = NULL;
@@ -298,10 +296,10 @@ void BlenderStrokeRenderer::RenderStrokeRepBasic(StrokeRep *iStrokeRep) const
 #endif
 #if 1
                //me.materials = [mat]
-               mesh->mat = (Material**)MEM_mallocN(1 * sizeof(Material*), "MaterialList");
+               mesh->mat = (Material **)MEM_mallocN(1 * sizeof(Material *), "MaterialList");
                mesh->mat[0] = material;
                mesh->totcol = 1;
-               test_object_materials((ID*)mesh);
+               test_object_materials((ID *)mesh);
 #else
                assign_material(object_mesh, material, object_mesh->totcol + 1);
                object_mesh->actcol = object_mesh->totcol;
@@ -309,22 +307,22 @@ void BlenderStrokeRenderer::RenderStrokeRepBasic(StrokeRep *iStrokeRep) const
 
                // vertices allocation
                mesh->totvert = visible_faces + visible_segments * 2;
-               mesh->mvert = (MVert*)CustomData_add_layer(&mesh->vdata, CD_MVERT, CD_CALLOC, NULL, mesh->totvert);
+               mesh->mvert = (MVert *)CustomData_add_layer(&mesh->vdata, CD_MVERT, CD_CALLOC, NULL, mesh->totvert);
 
                // edges allocation
                mesh->totedge = visible_faces * 2 + visible_segments;
-               mesh->medge = (MEdge*)CustomData_add_layer(&mesh->edata, CD_MEDGE, CD_CALLOC, NULL, mesh->totedge);
+               mesh->medge = (MEdge *)CustomData_add_layer(&mesh->edata, CD_MEDGE, CD_CALLOC, NULL, mesh->totedge);
 
                // faces allocation
                mesh->totpoly = visible_faces;
-               mesh->mpoly = (MPoly*)CustomData_add_layer(&mesh->pdata, CD_MPOLY, CD_CALLOC, NULL, mesh->totpoly);
+               mesh->mpoly = (MPoly *)CustomData_add_layer(&mesh->pdata, CD_MPOLY, CD_CALLOC, NULL, mesh->totpoly);
 
                // loops allocation
                mesh->totloop = visible_faces * 3;
-               mesh->mloop = (MLoop*)CustomData_add_layer(&mesh->ldata, CD_MLOOP, CD_CALLOC, NULL, mesh->totloop);
+               mesh->mloop = (MLoop *)CustomData_add_layer(&mesh->ldata, CD_MLOOP, CD_CALLOC, NULL, mesh->totloop);
 
                // colors allocation
-               mesh->mloopcol = (MLoopCol*)CustomData_add_layer(&mesh->ldata, CD_MLOOPCOL, CD_CALLOC, NULL, mesh->totloop);
+               mesh->mloopcol = (MLoopCol *)CustomData_add_layer(&mesh->ldata, CD_MLOOPCOL, CD_CALLOC, NULL, mesh->totloop);
 
                ////////////////////
                //  Data copy
@@ -503,9 +501,9 @@ Object *BlenderStrokeRenderer::NewMesh() const
        return ob;
 }
 
-RenderBlenderStrokeRenderer::RenderScene(Render *re)
+Render *BlenderStrokeRenderer::RenderScene(Render *re)
 {
-       Camera *camera = (Camera*)freestyle_scene->camera->data;
+       Camera *camera = (Camera *)freestyle_scene->camera->data;
        if (camera->clipend < _z)
                camera->clipend = _z + _z_delta * 100.0f;
 #if 0
index 7a1ce0a082bb83f5a3b45018433f21c6d9ccf7e4..51eaf4fe504d2b69c9ebf531329caf8cc54c03cc 100644 (file)
@@ -62,7 +62,7 @@ public:
 protected:
        virtual int interpret()
        {
-               PythonInterpreterpy_inter = dynamic_cast<PythonInterpreter*>(_inter);
+               PythonInterpreter *py_inter = dynamic_cast<PythonInterpreter*>(_inter);
                assert(py_inter != 0);
                return py_inter->interpretText(_text, getFileName());
        }
index fdff9db3d60d858c8d4ebd0afaf9eb82b28e065b..f6f97bda1bf1eb2b03a9dfd414d14b58e380d374 100644 (file)
@@ -206,7 +206,7 @@ static void init_camera(Render *re)
 
 static char *escape_quotes(char *name)
 {
-       char *s = (char*)MEM_mallocN(strlen(name) * 2 + 1, "escape_quotes");
+       char *s = (char *)MEM_mallocN(strlen(name) * 2 + 1, "escape_quotes");
        char *p = s;
        while (*name) {
                if (*name == '\'')
@@ -323,13 +323,13 @@ static void prepare(Render *re, SceneRenderLayer *srl)
                if (G.debug & G_DEBUG_FREESTYLE) {
                        cout << "Modules :" << endl;
                }
-               for (FreestyleModuleConfig *module_conf = (FreestyleModuleConfig*)config->modules.first;
+               for (FreestyleModuleConfig *module_conf = (FreestyleModuleConfig *)config->modules.first;
                     module_conf;
                     module_conf = module_conf->next)
                {
-                       if(module_conf->is_displayed) {
+                       if (module_conf->is_displayed) {
                                if (G.debug & G_DEBUG_FREESTYLE) {
-                                       cout << "  " << layer_count+1 << ": " << module_conf->module_path << endl;
+                                       cout << "  " << layer_count + 1 << ": " << module_conf->module_path << endl;
                                }
                                controller->InsertStyleModule(layer_count, module_conf->module_path);
                                controller->toggleLayer(layer_count, true);
@@ -362,14 +362,14 @@ static void prepare(Render *re, SceneRenderLayer *srl)
                if (G.debug & G_DEBUG_FREESTYLE) {
                        cout << "Linesets:" << endl;
                }
-               for (FreestyleLineSet *lineset = (FreestyleLineSet*)config->linesets.first;
+               for (FreestyleLineSet *lineset = (FreestyleLineSet *)config->linesets.first;
                     lineset;
                     lineset = lineset->next)
                {
                        if (lineset->flags & FREESTYLE_LINESET_ENABLED) {
                                if (G.debug & G_DEBUG_FREESTYLE) {
-                                       cout << "  " << layer_count+1 << ": " << lineset->name << " - "
-                                            << lineset->linestyle->id.name+2 << endl;
+                                       cout << "  " << layer_count+1 << ": " << lineset->name << " - " <<
+                                               lineset->linestyle->id.name + 2 << endl;
                                }
                                Text *text = create_lineset_handler(srl->name, lineset->name);
                                controller->InsertStyleModule(layer_count, lineset->name, text);
@@ -444,21 +444,21 @@ static void prepare(Render *re, SceneRenderLayer *srl)
                cout << "Crease angle : " << controller->getCreaseAngle() << endl;
                cout << "Sphere radius : " << controller->getSphereRadius() << endl;
                cout << "Face smoothness : " << (controller->getFaceSmoothness() ? "enabled" : "disabled") << endl;
-               cout << "Redges and valleys : " << (controller->getComputeRidgesAndValleysFlag() ? "enabled" : "disabled")
-                    << endl;
-               cout << "Suggestive contours : " << (controller->getComputeSuggestiveContoursFlag() ? "enabled" : "disabled")
-                    << endl;
-               cout << "Suggestive contour Kr derivative epsilon : " << controller->getSuggestiveContourKrDerivativeEpsilon()
-                    << endl;
-               cout << "Material boundaries : " << (controller->getComputeMaterialBoundariesFlag() ? "enabled" : "disabled")
-                    << endl;
+               cout << "Redges and valleys : " << (controller->getComputeRidgesAndValleysFlag() ? "enabled" : "disabled") <<
+                       endl;
+               cout << "Suggestive contours : " <<
+                       (controller->getComputeSuggestiveContoursFlag() ? "enabled" : "disabled") << endl;
+               cout << "Suggestive contour Kr derivative epsilon : " <<
+                       controller->getSuggestiveContourKrDerivativeEpsilon() << endl;
+               cout << "Material boundaries : " <<
+                       (controller->getComputeMaterialBoundariesFlag() ? "enabled" : "disabled") << endl;
                cout << endl;
        }
 
        // set diffuse and z depth passes
        RenderLayer *rl = RE_GetRenderLayer(re->result, srl->name);
        bool diffuse = false, z = false;
-       for (RenderPass *rpass = (RenderPass*)rl->passes.first; rpass; rpass = rpass->next) {
+       for (RenderPass *rpass = (RenderPass *)rl->passes.first; rpass; rpass = rpass->next) {
                switch (rpass->passtype) {
                case SCE_PASS_DIFFUSE:
                        controller->setPassDiffuse(rpass->rect, rpass->rectx, rpass->recty);
@@ -483,7 +483,7 @@ static void prepare(Render *re, SceneRenderLayer *srl)
        controller->ComputeViewMap();
 }
 
-void FRS_composite_result(Render* re, SceneRenderLayer* srl, Render* freestyle_render)
+void FRS_composite_result(Render *re, SceneRenderLayer *srl, Render *freestyle_render)
 {
        RenderLayer *rl;
        float *src, *dest, *pixSrc, *pixDest;
@@ -539,7 +539,7 @@ static int displayed_layer_count(SceneRenderLayer *srl)
 
        switch (srl->freestyleConfig.mode) {
        case FREESTYLE_CONTROL_SCRIPT_MODE:
-               for (FreestyleModuleConfig *module = (FreestyleModuleConfig*)srl->freestyleConfig.modules.first;
+               for (FreestyleModuleConfig *module = (FreestyleModuleConfig *)srl->freestyleConfig.modules.first;
                     module;
                     module = module->next)
                {
@@ -548,7 +548,7 @@ static int displayed_layer_count(SceneRenderLayer *srl)
                }
                break;
        case FREESTYLE_CONTROL_EDITOR_MODE:
-               for (FreestyleLineSet *lineset = (FreestyleLineSet*)srl->freestyleConfig.linesets.first;
+               for (FreestyleLineSet *lineset = (FreestyleLineSet *)srl->freestyleConfig.linesets.first;
                     lineset;
                     lineset = lineset->next)
                {
@@ -630,7 +630,8 @@ Render *FRS_do_stroke_rendering(Render *re, SceneRenderLayer *srl)
        return freestyle_render;
 }
 
-void FRS_finish_stroke_rendering(Render *re) {
+void FRS_finish_stroke_rendering(Render *re)
+{
        // clear canvas
        controller->Clear();
 }
@@ -656,7 +657,7 @@ void FRS_free_freestyle_config(FreestyleConfig *config)
 {
        FreestyleLineSet *lineset;
 
-       for (lineset = (FreestyleLineSet*)config->linesets.first; lineset; lineset = lineset->next) {
+       for (lineset = (FreestyleLineSet *)config->linesets.first; lineset; lineset = lineset->next) {
                if (lineset->group) {
                        lineset->group->id.us--;
                        lineset->group = NULL;
@@ -681,17 +682,17 @@ void FRS_copy_freestyle_config(FreestyleConfig *new_config, FreestyleConfig *con
        new_config->crease_angle = config->crease_angle;
 
        new_config->linesets.first = new_config->linesets.last = NULL;
-       for (lineset = (FreestyleLineSet*)config->linesets.first; lineset; lineset = lineset->next) {
+       for (lineset = (FreestyleLineSet *)config->linesets.first; lineset; lineset = lineset->next) {
                new_lineset = FRS_alloc_lineset();
                copy_lineset(new_lineset, lineset);
-               BLI_addtail(&new_config->linesets, (void*)new_lineset);
+               BLI_addtail(&new_config->linesets, (void *)new_lineset);
        }
 
        new_config->modules.first = new_config->modules.last = NULL;
-       for (module = (FreestyleModuleConfig*)config->modules.first; module; module = module->next) {
+       for (module = (FreestyleModuleConfig *)config->modules.first; module; module = module->next) {
                new_module = FRS_alloc_module();
                copy_module(new_module, module);
-               BLI_addtail(&new_config->modules, (void*)new_module);
+               BLI_addtail(&new_config->modules, (void *)new_module);
        }
 }
 
@@ -715,14 +716,14 @@ static void copy_lineset(FreestyleLineSet *new_lineset, FreestyleLineSet *linese
 
 FreestyleModuleConfig *FRS_alloc_module()
 {
-       return (FreestyleModuleConfig*)MEM_callocN(sizeof(FreestyleModuleConfig), "style module configuration");
+       return (FreestyleModuleConfig *)MEM_callocN(sizeof(FreestyleModuleConfig), "style module configuration");
 }
 
 void FRS_add_module(FreestyleConfig *config)
 {
-       FreestyleModuleConfig *module_conf = (FreestyleModuleConfig*)MEM_callocN(sizeof(FreestyleModuleConfig),
-                                                                                "style module configuration");
-       BLI_addtail(&config->modules, (void*)module_conf);
+       FreestyleModuleConfig *module_conf = (FreestyleModuleConfig *)MEM_callocN(sizeof(FreestyleModuleConfig),
+                                                                                 "style module configuration");
+       BLI_addtail(&config->modules, (void *)module_conf);
 
        strcpy(module_conf->module_path, default_module_path.c_str());
        module_conf->is_displayed = 1;
@@ -759,7 +760,7 @@ static void unique_lineset_name(FreestyleConfig *config, FreestyleLineSet *lines
 
 FreestyleLineSet *FRS_alloc_lineset()
 {
-       return (FreestyleLineSet*)MEM_callocN(sizeof(FreestyleLineSet), "Freestyle line set");
+       return (FreestyleLineSet *)MEM_callocN(sizeof(FreestyleLineSet), "Freestyle line set");
 }
 
 FreestyleLineSet *FRS_add_lineset(FreestyleConfig *config)
@@ -767,7 +768,7 @@ FreestyleLineSet *FRS_add_lineset(FreestyleConfig *config)
        int lineset_index = BLI_countlist(&config->linesets);
 
        FreestyleLineSet *lineset = FRS_alloc_lineset();
-       BLI_addtail(&config->linesets, (void*)lineset);
+       BLI_addtail(&config->linesets, (void *)lineset);
        FRS_set_active_lineset_index(config, lineset_index);
 
        lineset->linestyle = FRS_new_linestyle("LineStyle", NULL);
@@ -880,7 +881,7 @@ FreestyleLineSet *FRS_get_active_lineset(FreestyleConfig *config)
 {
        FreestyleLineSet *lineset;
 
-       for (lineset = (FreestyleLineSet*)config->linesets.first; lineset; lineset = lineset->next) {
+       for (lineset = (FreestyleLineSet *)config->linesets.first; lineset; lineset = lineset->next) {
                if (lineset->flags & FREESTYLE_LINESET_CURRENT)
                        return lineset;
        }
@@ -892,7 +893,7 @@ short FRS_get_active_lineset_index(FreestyleConfig *config)
        FreestyleLineSet *lineset;
        short i;
 
-       for (lineset = (FreestyleLineSet*)config->linesets.first, i = 0; lineset; lineset = lineset->next, i++) {
+       for (lineset = (FreestyleLineSet *)config->linesets.first, i = 0; lineset; lineset = lineset->next, i++) {
                if (lineset->flags & FREESTYLE_LINESET_CURRENT)
                        return i;
        }
@@ -904,7 +905,7 @@ void FRS_set_active_lineset_index(FreestyleConfig *config, short index)
        FreestyleLineSet *lineset;
        short i;
 
-       for (lineset = (FreestyleLineSet*)config->linesets.first, i = 0; lineset; lineset = lineset->next, i++) {
+       for (lineset = (FreestyleLineSet *)config->linesets.first, i = 0; lineset; lineset = lineset->next, i++) {
                if (i == index)
                        lineset->flags |= FREESTYLE_LINESET_CURRENT;
                else
@@ -916,7 +917,7 @@ void FRS_unlink_target_object(FreestyleConfig *config, Object *ob)
 {
        FreestyleLineSet *lineset;
 
-       for (lineset = (FreestyleLineSet*)config->linesets.first; lineset; lineset = lineset->next) {
+       for (lineset = (FreestyleLineSet *)config->linesets.first; lineset; lineset = lineset->next) {
                FRS_unlink_linestyle_target_object(lineset->linestyle, ob);
        }
 }
index 9140f1f947d6c7e043ebe2b7a37fa1a0e6036e38..b332553f0b45bb3fa2ce397f9134ddccc1dc7833 100644 (file)
@@ -58,7 +58,7 @@ void BezierCurveSegment::Build()
                return;
 
        // Compute the rightmost part of the matrix:
-       vector<Vec2d>::const_iterator p0,p1,p2,p3;
+       vector<Vec2d>::const_iterator p0, p1, p2, p3;
        p0 = _ControlPolygon.begin();
        p1 = p0;
        ++p1;
@@ -101,7 +101,7 @@ BezierCurve::BezierCurve(vector<Vec2d>& iPoints, double error)
 
        fitcurve.FitCurve(iPoints, curve, error);
        int i = 0;
-       vector<Vec2d>::iterator v,vend;
+       vector<Vec2d>::iterator v, vend;
        for (v = curve.begin(), vend = curve.end(); v != vend; ++v) {
                if ((i == 0) || (i % 4 != 0))
                        AddControlPoint(*v);
@@ -111,7 +111,7 @@ BezierCurve::BezierCurve(vector<Vec2d>& iPoints, double error)
 
 BezierCurve::~BezierCurve()
 {
-       if(_currentSegment)
+       if (_currentSegment)
                delete _currentSegment;
 }
 
index 7051d9603462f3e3126f05b10b7b73120d3bf266..37871eadcec00f6c816143541857d07a19a404aa 100644 (file)
@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/freestyle/intern/geometry/FastGrid.h
+/** \file blender/freestyle/intern/geometry/FastGrid.cpp
  *  \ingroup freestyle
  *  \brief Class to define a cell grid surrounding the bounding box of the scene
  *  \author Stephane Grabli
@@ -56,7 +56,7 @@ void FastGrid::configure(const Vec3r& orig, const Vec3r& size, unsigned nb)
 {
        Grid::configure(orig, size, nb);
        _cells_size = _cells_nb[0] * _cells_nb[1] * _cells_nb[2];
-       _cells = new Cell*[_cells_size];
+       _cells = new Cell *[_cells_size];
        memset(_cells, 0, _cells_size * sizeof(*_cells));
 }
 
index 3a2ed392533a5c923865e80b9215f58ea2b0f61e..cf5f911497a1cf7ad0f24c828d1e2a1de9b4a0a5 100644 (file)
@@ -73,7 +73,7 @@ public:
        virtual void configure(const Vec3r& orig, const Vec3r& size, unsigned nb);
 
        /*! returns the cell whose coordinates are pased as argument */
-       CellgetCell(const Vec3u& p);
+       Cell *getCell(const Vec3u& p);
 
        /*! Fills the case p with the cell iCell */
        virtual void fillCell(const Vec3u& p, Cell& cell);
index 4eae543c9f9b24ce3e81bb25becda9ed5dec893b..cb338be8cf312bc86b36cbf3a7d5ab5691cfbac8 100644 (file)
@@ -154,7 +154,7 @@ static BezierCurve  GenerateBezier(Vector2 *d, int first, int last, double *uPri
        Vector2 tmp;             /* Utility variable */
        BezierCurve bezCurve;    /* RETURN bezier curve ctl pts */
 
-       bezCurve = (Vector2*)malloc(4 * sizeof(Vector2));
+       bezCurve = (Vector2 *)malloc(4 * sizeof(Vector2));
        nPts = last - first + 1;
 
        /* Compute the A's */
@@ -246,9 +246,9 @@ static double *Reparameterize(Vector2 *d, int first, int last, double *u, Bezier
        int i;
        double *uPrime; /* New parameter values */
 
-       uPrime = (double*)malloc(nPts * sizeof(double));
+       uPrime = (double *)malloc(nPts * sizeof(double));
        for (i = first; i <= last; i++) {
-               uPrime[i-first] = NewtonRaphsonRootFind(bezCurve, d[i], u[i - first]);
+               uPrime[i - first] = NewtonRaphsonRootFind(bezCurve, d[i], u[i - first]);
        }
        return (uPrime);
 }
@@ -313,21 +313,21 @@ static Vector2 BezierII(int degree, Vector2 *V, double t)
        Vector2 *Vtemp;  /* Local copy of control points */
 
        /* Copy array */
-       Vtemp = (Vector2*)malloc((unsigned)((degree + 1) * sizeof (Vector2)));
+       Vtemp = (Vector2 *)malloc((unsigned)((degree + 1) * sizeof(Vector2)));
        for (i = 0; i <= degree; i++) {
                Vtemp[i] = V[i];
        }
 
        /* Triangle computation */
        for (i = 1; i <= degree; i++) {
-               for (j = 0; j <= degree-i; j++) {
+               for (j = 0; j <= degree - i; j++) {
                        Vtemp[j][0] = (1.0 - t) * Vtemp[j][0] + t * Vtemp[j + 1][0];
                        Vtemp[j][1] = (1.0 - t) * Vtemp[j][1] + t * Vtemp[j + 1][1];
                }
        }
 
        Q = Vtemp[0];
-       free((void*)Vtemp);
+       free((void *)Vtemp);
        return Q;
 }
 
@@ -411,7 +411,7 @@ static double *ChordLengthParameterize(Vector2 *d, int first, int last)
        int i;
        double *u; /* Parameterization */
 
-       u = (double*)malloc((unsigned)(last - first + 1) * sizeof(double));
+       u = (double *)malloc((unsigned)(last - first + 1) * sizeof(double));
 
        u[0] = 0.0;
        for (i = first + 1; i <= last; i++) {
@@ -551,13 +551,13 @@ void FitCurveWrapper::FitCubic(Vector2 *d, int first, int last, Vector2 tHat1, V
        if (nPts == 2) {
                double dist = V2DistanceBetween2Points(&d[last], &d[first]) / 3.0;
 
-               bezCurve = (Vector2*)malloc(4 * sizeof(Vector2));
+               bezCurve = (Vector2 *)malloc(4 * sizeof(Vector2));
                bezCurve[0] = d[first];
                bezCurve[3] = d[last];
                V2Add(&bezCurve[0], V2Scale(&tHat1, dist), &bezCurve[1]);
                V2Add(&bezCurve[3], V2Scale(&tHat2, dist), &bezCurve[2]);
                DrawBezierCurve(3, bezCurve);
-               free((void*)bezCurve);
+               free((void *)bezCurve);
                return;
        }
 
@@ -569,8 +569,8 @@ void FitCurveWrapper::FitCubic(Vector2 *d, int first, int last, Vector2 tHat1, V
        maxError = ComputeMaxError(d, first, last, bezCurve, u, &splitPoint);
        if (maxError < error) {
                DrawBezierCurve(3, bezCurve);
-               free((void*)u);
-               free((void*)bezCurve);
+               free((void *)u);
+               free((void *)bezCurve);
                return;
        }
 
@@ -583,18 +583,18 @@ void FitCurveWrapper::FitCubic(Vector2 *d, int first, int last, Vector2 tHat1, V
                        bezCurve, uPrime, &splitPoint);
                        if (maxError < error) {
                                DrawBezierCurve(3, bezCurve);
-                               free((void*)u);
-                               free((void*)bezCurve);
+                               free((void *)u);
+                               free((void *)bezCurve);
                                return;
                        }
-                       free((void*)u);
+                       free((void *)u);
                        u = uPrime;
                }
        }
 
        /* Fitting failed -- split at max error point and fit recursively */
-       free((void*)u);
-       free((void*)bezCurve);
+       free((void *)u);
+       free((void *)bezCurve);
        tHatCenter = ComputeCenterTangent(d, splitPoint);
        FitCubic(d, first, splitPoint, tHat1, tHatCenter, error);
        V2Negate(&tHatCenter);
index c90513c62946e658b541a832470583f729714276..dc9618a1a45d70bddfdcd8af6a76af0c24a04eee 100644 (file)
@@ -177,7 +177,7 @@ void GeomCleaner::SortAndCompressIndexedVertexArray(const float *iVertices, unsi
 }
 
 /*! Defines a hash table used for searching the Cells */
-struct GeomCleanerHasher{
+struct GeomCleanerHasher {
 #define _MUL 950706376UL
 #define _MOD 2147483647UL
        inline size_t operator() (const Vec3r& p) const
index c0cd9450480d024872c00a2ad78bb01cbcd5344e..8d6317c9b07495c9e19980d84df9ddd030cb991b 100644 (file)
@@ -37,7 +37,7 @@
 namespace GeomUtils {
 
 // This internal procedure is defined below.
-bool intersect2dSegPoly(Vec2r* seg, Vec2r* poly, unsigned n);
+bool intersect2dSegPoly(Vec2r *seg, Vec2r *poly, unsigned n);
 
 bool intersect2dSeg2dArea(const Vec2r& min, const Vec2r& max, const Vec2r& A, const Vec2r& B)
 {
@@ -64,7 +64,9 @@ bool include2dSeg2dArea(const Vec2r& min, const Vec2r& max, const Vec2r& A, cons
 {
        if ((((max[0] > A[0]) && (A[0] > min[0])) && ((max[0] > B[0]) && (B[0] > min[0]))) &&
            (((max[1] > A[1]) && (A[1] > min[1])) && ((max[1] > B[1]) && (B[1] > min[1]))))
+       {
                return true;
+       }
        return false;
 }
 
@@ -512,9 +514,9 @@ bool intersectRayBBox(const Vec3r& orig, const Vec3r& dir,      // ray origin an
        bounds[1] = boxMax;
 
        tmin = (bounds[sign[0]].x() - orig.x()) * inv_direction.x();
-       tmax = (bounds[1-sign[0]].x() - orig.x()) * inv_direction.x();
+       tmax = (bounds[1 - sign[0]].x() - orig.x()) * inv_direction.x();
        tymin = (bounds[sign[1]].y() - orig.y()) * inv_direction.y();
-       tymax = (bounds[1-sign[1]].y() - orig.y()) * inv_direction.y();
+       tymax = (bounds[1 - sign[1]].y() - orig.y()) * inv_direction.y();
        if ((tmin > tymax) || (tymin > tmax))
                return false;
        if (tymin > tmin)
@@ -522,7 +524,7 @@ bool intersectRayBBox(const Vec3r& orig, const Vec3r& dir,      // ray origin an
        if (tymax < tmax)
                tmax = tymax;
        tzmin = (bounds[sign[2]].z() - orig.z()) * inv_direction.z();
-       tzmax = (bounds[1-sign[2]].z() - orig.z()) * inv_direction.z();
+       tzmax = (bounds[1 - sign[2]].z() - orig.z()) * inv_direction.z();
        if ((tmin > tzmax) || (tzmin > tmax))
                return false;
        if (tzmin > tmin)
@@ -587,7 +589,8 @@ void transformVertices(const vector<Vec3r>& vertices, const Matrix44r& trans, ve
        }
 }
 
-Vec3r rotateVector(const Matrix44r& mat, const Vec3r& v) {
+Vec3r rotateVector(const Matrix44r& mat, const Vec3r& v)
+{
        Vec3r res;
        for (unsigned int i = 0; i < 3; i++) {
                res[i] = 0;
@@ -693,7 +696,7 @@ void fromCameraToWorld(const Vec3r& p, Vec3r& q, const real model_view_matrix[4]
 
 #define PERP(u, v) ((u)[0] * (v)[1] - (u)[1] * (v)[0])   // 2D perp product
 
-inline bool intersect2dSegPoly(Vec2r* seg, Vec2r* poly, unsigned n)
+inline bool intersect2dSegPoly(Vec2r *seg, Vec2r *poly, unsigned n)
 {
        if (seg[0] == seg[1])
                return false;
@@ -705,7 +708,7 @@ inline bool intersect2dSegPoly(Vec2r* seg, Vec2r* poly, unsigned n)
        Vec2r e;                      // edge vector
 
        for (unsigned int i = 0; i < n; i++) { // process polygon edge poly[i]poly[i+1]
-               e = poly[i+1] - poly[i];
+               e = poly[i + 1] - poly[i];
                N = PERP(e, seg[0] - poly[i]);
                D = -PERP(e, dseg);
                if (fabs(D) < M_EPSILON) {
index 1b90f99c2edc8807314f00c9a4e57f60b8e84586..be20873e73bac6ce0c3a12eee19edec8ffecd267 100644 (file)
@@ -53,7 +53,7 @@ namespace GeomUtils {
 
 /*! Computes the distance from a point P to a segment AB */
 template<class T>
-real distPointSegment( const T& P, const T& A , const T& B)
+real distPointSegment(const T& P, const T& A, const T& B)
 {
        T AB, AP, BP;
        AB = B - A;
index 11c4f11b28193f0a398e10326274e11ed0d15f9b..0b798c5abb88c9fd24888dea394c08ecb21b4ef4 100644 (file)
@@ -158,7 +158,7 @@ void Grid::configure(const Vec3r& orig, const Vec3r& size, unsigned nb)
                _cell_size[i] = _size[i] / _cells_nb[i];
 }
 
-void Grid::insertOccluder(Polygon3roccluder)
+void Grid::insertOccluder(Polygon3r *occluder)
 {
        const vector<Vec3r> vertices = occluder->getVertices();
        if (vertices.size() == 0)
@@ -208,7 +208,7 @@ void Grid::insertOccluder(Polygon3r* occluder)
                                        if (GeomUtils::overlapTriangleBox(boxcenter, boxhalfsize, triverts)) {
                                                // We must then create the Cell and add it to the cells list if it does not exist yet.
                                                // We must then add the occluder to the occluders list of this cell.
-                                               Cellcell = getCell(coord);
+                                               Cell *cell = getCell(coord);
                                                if (!cell) {
                                                        cell = new Cell(boxmin);
                                                        fillCell(coord, *cell);
@@ -226,7 +226,7 @@ void Grid::insertOccluder(Polygon3r* occluder)
                                        coord[0] = x;
                                        coord[1] = y;
                                        coord[2] = z;
-                                       Cellcell = getCell(coord);
+                                       Cell *cell = getCell(coord);
                                        if (!cell) {
                                                Vec3r orig;
                                                getCellOrigin(coord, orig);
@@ -311,7 +311,7 @@ void Grid::castInfiniteRay(const Vec3r& orig, const Vec3r& dir, OccludersSet& oc
        castRayInternal(visitor);
 }
 
-Polygon3rGrid::castRayToFindFirstIntersection(const Vec3r& orig, const Vec3r& dir, double& t,
+Polygon3r *Grid::castRayToFindFirstIntersection(const Vec3r& orig, const Vec3r& dir, double& t,
                                                 double& u, double& v, unsigned timestamp)
 {
        Polygon3r *occluder = 0;
@@ -348,7 +348,8 @@ void Grid::initRay (const Vec3r &orig, const Vec3r& end, unsigned timestamp)
        //_ray_occluders.clear();
 }
 
-bool Grid::initInfiniteRay (const Vec3r &orig, const Vec3r& dir, unsigned timestamp) {
+bool Grid::initInfiniteRay (const Vec3r &orig, const Vec3r& dir, unsigned timestamp)
+{
        _ray_dir = dir;
        _t_end = FLT_MAX;
        _t = 0;
index 8b237673b8afe754777f30f713896a730e71efee..f37f7f615f074fc32bea6c443a290689d0b58e74 100644 (file)
@@ -71,7 +71,7 @@ public:
 
        virtual ~Cell() {}
 
-       inline void addOccluder(Polygon3ro) {
+       inline void addOccluder(Polygon3r *o) {
                if (o)
                        _occluders.push_back(o);
        }
@@ -142,7 +142,7 @@ private:
 
 public:
        firstIntersectionGridVisitor(const Vec3r& ray_org, const Vec3r& ray_dir, const Vec3r& cell_size) :
-           GridVisitor(), u_(0),v_(0),t_(DBL_MAX), occluder_(0), ray_org_(ray_org), ray_dir_(ray_dir),
+           GridVisitor(), u_(0), v_(0), t_(DBL_MAX), occluder_(0), ray_org_(ray_org), ray_dir_(ray_dir),
            cell_size_(cell_size), current_cell_(0)
        {
        }
@@ -213,14 +213,14 @@ public:
        virtual void fillCell(const Vec3u& coord, Cell& cell) = 0;
 
        /*! returns the cell whose coordinates are pased as argument */
-       virtual CellgetCell(const Vec3u& coord) = 0;
+       virtual Cell *getCell(const Vec3u& coord) = 0;
 
        /*! returns the cell containing the point passed as argument. If the cell is empty (contains no occluder),
         *  NULL is returned
         *    p
         *      The point for which we're looking the cell
         */
-       inline Cell* getCell(const Vec3r& p) {    
+       inline Cell *getCell(const Vec3r& p) {
                Vec3u coord;
                getCellCoordinates(p, coord);
                return getCell(coord);
@@ -255,10 +255,10 @@ public:
         *    convex_poly
         *      The list of 3D points constituing a convex polygon
         */
-       void insertOccluder(Polygon3r * convex_poly);
+       void insertOccluder(Polygon3r *convex_poly);
 
        /*! Adds an occluder to the list of occluders */
-       void addOccluder(Polygon3roccluder) {
+       void addOccluder(Polygon3r *occluder) {
                _occluders.push_back(occluder);
        }
 
@@ -311,7 +311,7 @@ public:
        }
 
        //ARB profiling only:
-       inline OccludersSetgetOccluders() {
+       inline OccludersSet *getOccluders() {
                return &_occluders;
        }
 
@@ -371,12 +371,12 @@ protected:
 class VirtualOccludersSet {
 public:
        VirtualOccludersSet(Grid& _grid) : grid (_grid) {};
-       Polygon3rbegin();
-       Polygon3rnext();
-       Polygon3rnext(bool stopOnNewCell);
+       Polygon3r *begin();
+       Polygon3r *next();
+       Polygon3r *next(bool stopOnNewCell);
 
 private:
-       Polygon3rfirstOccluderFromNextCell();
+       Polygon3r *firstOccluderFromNextCell();
        Grid& grid;
        OccludersSet::iterator it, end;
 };
index 4391b4f61a32e1f70edc9f27ea707d5b8871cc03..2503cb2ebbdce14d26cc680515c97a29fee20a67 100644 (file)
@@ -48,7 +48,7 @@ namespace GridHelpers {
 
 /*! Computes the distance from a point P to a segment AB */
 template<class T>
-T closestPointToSegment(const T& P, const T& A , const T& B, real& distance)
+T closestPointToSegment(const T& P, const T& A, const T& B, real& distance)
 {
        T AB, AP, BP;
        AB = B - A;
index b0ad9e0f276e66b660b3aa4e75db4580649028e6..3752fc2f32a57e14d65448f617c691fed4c7fa4a 100644 (file)
@@ -37,8 +37,8 @@
 void HashGrid::clear()
 {
        if (!_cells.empty()) {
-               for (GridHashTable::iterator it = _cells.begin(); it !=_cells.end(); it++) {
-                       Cellcell = (*it).second;
+               for (GridHashTable::iterator it = _cells.begin(); it != _cells.end(); it++) {
+                       Cell *cell = (*it).second;
                        delete cell;
                }
                _cells.clear();
index ca6edb258a99b30410502b096ae3749091bbdf9b..ea44196b52366b6bea9bb68ef641409659357a53 100644 (file)
@@ -93,9 +93,9 @@ public:
        virtual void configure(const Vec3r& orig, const Vec3r& size, unsigned nb);
 
        /*! returns the cell whose coordinates are pased as argument */
-       virtual CellgetCell(const Vec3u& p)
+       virtual Cell *getCell(const Vec3u& p)
        {
-               Cellfound_cell = NULL;
+               Cell *found_cell = NULL;
 
                GridHashTable::const_iterator found = _cells.find(p);
                if (found != _cells.end())
index 5ee4353ef5a70c14c7d428d3b181bfeda07b7ed3..e217a67b03e2e863f85e189e086912090c2507d3 100644 (file)
@@ -162,8 +162,8 @@ public:
        }
 
        // FIXME Is it possible to get rid of userdatas ?
-       voiduserdata;
-       voiduserdata2; // Used during ray casting
+       void *userdata;
+       void *userdata2; // Used during ray casting
 
 protected:
        vector<Point> _vertices;
index ec81507c5c6889e5f73cd054dcd5c833be8c875c..d03bc2224c71acbd44e6abf80bf9f15c0605e988 100644 (file)
@@ -44,7 +44,7 @@ class Intersection
 {
 public:
        template<class EdgeClass>
-       Intersection(EdgeClass* eA, real ta, EdgeClass* eB, real tb)
+       Intersection(EdgeClass *eA, real ta, EdgeClass *eB, real tb)
        {
                EdgeA = eA;
                EdgeB = eB;
@@ -109,7 +109,7 @@ public:
                }
        }
 
-       Segment(Segment<T,Point>& iBrother)
+       Segment(Segment<T, Point>& iBrother)
        {
                _edge = iBrother.edge();
                A = iBrother.A;
@@ -118,7 +118,7 @@ public:
                _order = iBrother._order;
        }
 
-       Segment(const Segment<T,Point>& iBrother)
+       Segment(const Segment<T, Point>& iBrother)
        {
                _edge = iBrother._edge;
                A = iBrother.A;
@@ -137,7 +137,7 @@ public:
                return (i % 2 == 0) ? A : B;
        }
 
-       inline bool operator==(const Segment<T,Point>& iBrother)
+       inline bool operator==(const Segment<T, Point>& iBrother)
        {
                if (_edge == iBrother._edge)
                        return true;
@@ -145,13 +145,13 @@ public:
        }
 
        /* Adds an intersection for this segment */
-       inline void AddIntersection(Intersection<Segment<T,Point> > *i)
+       inline void AddIntersection(Intersection<Segment<T, Point> > *i)
        {
                _Intersections.push_back(i);
        }
 
        /*! Checks for a common vertex with another edge */
-       inline bool CommonVertex(const Segment<T,Point>& S, Point& CP)
+       inline bool CommonVertex(const Segment<T, Point>& S, Point& CP)
        {
                if ((A == S[0]) || (A == S[1])) {
                        CP = A;
@@ -164,7 +164,7 @@ public:
                return false;
        }
 
-       inline vector<Intersection<Segment<T,Point> >*>& intersections()
+       inline vector<Intersection<Segment<T, Point> >*>& intersections()
        {
                return _Intersections;
        }
@@ -183,7 +183,7 @@ private:
        T _edge;
        Point A;
        Point B;
-       std::vector<Intersection<Segment<T,Point> >*> _Intersections; // list of intersections parameters
+       std::vector<Intersection<Segment<T, Point> >*> _Intersections; // list of intersections parameters
        bool _order; // true if A and B are in the same order than _edge.A and _edge.B. false otherwise.
 };
 
@@ -198,7 +198,7 @@ template<class T1, class T2>
 struct binary_rule
 {
        binary_rule() {}
-       template<class T3,class T4> binary_rule(const binary_rule<T3,T4>& brother) {}
+       template<class T3, class T4> binary_rule(const binary_rule<T3, T4>& brother) {}
        virtual ~binary_rule() {}
 
        virtual bool operator()(T1&, T2&)
@@ -208,14 +208,14 @@ struct binary_rule
 };
 
 
-template<class T,class Point>
+template<class T, class Point>
 class SweepLine 
 {
 public:
        SweepLine() {}
        ~SweepLine()
        {
-               for (typename vector<Intersection<Segment<T,Point> >*>::iterator i = _Intersections.begin(),
+               for (typename vector<Intersection<Segment<T, Point> >*>::iterator i = _Intersections.begin(),
                     iend = _Intersections.end();
                     i != iend;
                     i++)
@@ -224,18 +224,18 @@ 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> >(),
+                           binary_rule<Segment<T, Point>,Segment<T, Point> >& binrule = \
+                                   binary_rule<Segment<T, Point>, Segment<T, Point> >(),
 #else
-                           binary_rule<Segment<T,Point>,Segment<T,Point> >& binrule,
+                           binary_rule<Segment<T, Point>, Segment<T, Point> >& binrule,
 #endif
                            real epsilon = M_EPSILON)
        {
                // first we remove the segments that need to be removed and then we add the segments to add
-               vector<Segment<T,Point>*> toadd;
-               typename vector<Segment<T,Point>*>::iterator s, send;
+               vector<Segment<T, Point>*> toadd;
+               typename vector<Segment<T, Point>*>::iterator s, send;
                for (s = segments.begin(), send = segments.end(); s != send; s++) {
                        if (p == (*(*s))[0])
                                toadd.push_back((*s));
@@ -247,16 +247,16 @@ public:
                }
        }
 
-       inline void add(Segment<T,Point>* S,
+       inline void add(Segment<T, Point> *S,
 #if 0
-                       binary_rule<Segment<T,Point>,Segment<T,Point> >& binrule = \
-                               binary_rule<Segment<T,Point>, Segment<T,Point> >(),
+                       binary_rule<Segment<T, Point>, Segment<T, Point> >& binrule = \
+                               binary_rule<Segment<T, Point>, Segment<T, Point> >(),
 #else
-                       binary_rule<Segment<T,Point>,Segment<T,Point> >& binrule,
+                       binary_rule<Segment<T, Point>, Segment<T, Point> >& binrule,
 #endif
                        real epsilon)
        {
-               real t,u;
+               real t, u;
                Point CP;
                Vec2r v0, v1, v2, v3;
                if (true == S->order()) {
@@ -271,8 +271,8 @@ public:
                        v0[0] = ((*S)[1])[0];
                        v0[1] = ((*S)[1])[1];
                }
-               for (typename std::list<Segment<T,Point>* >::iterator s = _set.begin(), send = _set.end(); s != send; s++) {
-                       Segment<T,Point>* currentS = (*s);
+               for (typename std::list<Segment<T, Point> *>::iterator s = _set.begin(), send = _set.end(); s != send; s++) {
+                       Segment<T, Point> *currentS = (*s);
                        if (true != binrule(*S, *currentS))
                                continue;
 
@@ -293,7 +293,7 @@ public:
 
                        if (GeomUtils::intersect2dSeg2dSegParametric(v0, v1, v2, v3, t, u, epsilon) == GeomUtils::DO_INTERSECT) {
                                // create the intersection
-                               Intersection<Segment<T,Point> > *inter = new Intersection<Segment<T,Point> >(S,t,currentS,u);
+                               Intersection<Segment<T, Point> > *inter = new Intersection<Segment<T, Point> >(S, t, currentS, u);
                                // add it to the intersections list
                                _Intersections.push_back(inter);
                                // add this intersection to the first edge intersections list
@@ -306,27 +306,27 @@ public:
                _set.push_back(S);
        }
 
-       inline void remove(Segment<T,Point>* s)
+       inline void remove(Segment<T, Point> *s)
        {
                if (s->intersections().size() > 0)
                        _IntersectedEdges.push_back(s);
                _set.remove(s);
        }
 
-       vector<Segment<T,Point>* >& intersectedEdges()
+       vector<Segment<T, Point> *>& intersectedEdges()
        {
                return _IntersectedEdges;
        }
 
-       vector<Intersection<Segment<T,Point> >*>& intersections()
+       vector<Intersection<Segment<T, Point> >*>& intersections()
        {
                return _Intersections;
        }
 
 private:
-       std::list<Segment<T,Point>* > _set; // set of active edges for a given position of the sweep line
-       std::vector<Segment<T,Point>* > _IntersectedEdges; // the list of intersected edges
-       std::vector<Intersection<Segment<T,Point> >*> _Intersections; // the list of all intersections.
+       std::list<Segment<T, Point> *> _set; // set of active edges for a given position of the sweep line
+       std::vector<Segment<T, Point> *> _IntersectedEdges; // the list of intersected edges
+       std::vector<Intersection<Segment<T, Point> > *> _Intersections; // the list of all intersections.
 };
 
 #endif // __SWEEPLINE_H__
index 5b64a6e45027dc63335a7376348555448ebc49a7..34e10d31c4f12c297813a7b417619abb2e9d2151 100644 (file)
@@ -153,21 +153,21 @@ public:
                return res;
        } 
 
-       inline Vec<T, N> operator-(const Vec<T,N>& v) const
+       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
+       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
+       inline Vec<T, N> operator/(const typename Vec<T, N>::value_type r) const
        {
                Vec<T, N> res(*this);
                if (r)
@@ -435,7 +435,8 @@ public:
                return this->_coord[1];
        }
 
-       inline value_type& sy(){
+       inline value_type& sy()
+       {
                return this->_coord[1];
        }
 
index 2f0aa268c9f4ee8e0a185b8b1e431a921aeba05e..63195b243864643280ad7a33da7722ca3aee0255 100644 (file)
@@ -82,15 +82,15 @@ void NormalCycle::end()
        double l2 = ::fabs(eigen_value_[2]);
 
        if (l1 > l0) {
-               ogf_swap(l0   , l1   );
+               ogf_swap(l0,    l1   );
                ogf_swap(i_[0], i_[1]);
        }
        if (l2 > l1) {
-               ogf_swap(l1   , l2   );
+               ogf_swap(l1,    l2   );
                ogf_swap(i_[1], i_[2]);
        }
        if (l1 > l0) {
-               ogf_swap(l0   , l1   );
+               ogf_swap(l0,    l1   );
                ogf_swap(i_[0], i_[1]);
        }
 }
index 9890e615a7c94b1f06c1bce4a53776b35d8033d7..08fdf32ecd75f385aa44d40d1be6868ad38ab633 100644 (file)
@@ -50,7 +50,8 @@ protected:
        float _sigma;
        float *_mask;
        int _bound;
-       int _maskSize; // the real mask size (must be odd)(the size of the mask we store is ((_maskSize+1)/2)*((_maskSize+1)/2))
+       // the real mask size (must be odd)(the size of the mask we store is ((_maskSize+1)/2)*((_maskSize+1)/2))
+       int _maskSize;
        int _storedMaskSize; // (_maskSize+1)/2)
 
 public:
index 1487e43a0b030c78ccdebaa6697f5a062796d99e..757f6a8eca30dd5a5fbe5a921557ba57b91a86cf 100644 (file)
@@ -234,7 +234,7 @@ public:
 
        virtual ~RGBImage()
        {
-               if(_rgb)
+               if (_rgb)
                        delete[] _rgb;
        }
 
index c7616fbce239ad448e55074910f4389826721368..b9854782d5b1465f4597b0ab9205400c87da71cf 100644 (file)
@@ -134,7 +134,7 @@ GaussianPyramid::GaussianPyramid(const GrayImage& level0, unsigned nbLevels, flo
        BuildPyramid(level0, nbLevels);
 }
 
-GaussianPyramid::GaussianPyramid(GrayImagelevel0, unsigned nbLevels, float iSigma) : ImagePyramid()
+GaussianPyramid::GaussianPyramid(GrayImage *level0, unsigned nbLevels, float iSigma) : ImagePyramid()
 {
        _sigma = iSigma;
        BuildPyramid(level0, nbLevels);
@@ -151,7 +151,7 @@ void GaussianPyramid::BuildPyramid(const GrayImage& level0, unsigned nbLevels)
        BuildPyramid(pLevel, nbLevels);
 }
 
-void GaussianPyramid::BuildPyramid(GrayImagelevel0, unsigned nbLevels)
+void GaussianPyramid::BuildPyramid(GrayImage *level0, unsigned nbLevels)
 {
        GrayImage *pLevel = level0;
        _levels.push_back(pLevel);
index 4bab663318e4a4eaa161c49d358190bbd44bf6dd..0665874a8e921cf6a8abc86ebf0019f50298124e 100644 (file)
@@ -47,7 +47,7 @@ protected:
        std::vector<GrayImage*> _levels;
 
 public:
-       ImagePyramid(){}
+       ImagePyramid() {}
        ImagePyramid(const ImagePyramid& iBrother);
        //ImagePyramid(const GrayImage& level0, unsigned nbLevels);
        virtual ~ImagePyramid();
@@ -59,9 +59,9 @@ public:
        virtual void BuildPyramid(const GrayImage& level0, unsigned nbLevels) = 0;
 
        /*! Builds a pyramid without copying the base level */
-       virtual void BuildPyramid(GrayImagelevel0, unsigned nbLevels) = 0;
+       virtual void BuildPyramid(GrayImage *level0, unsigned nbLevels) = 0;
 
-       virtual GrayImage * getLevel(int l);
+       virtual GrayImage *getLevel(int l);
        /*! Returns the pixel x,y using bilinear interpolation.
         *  \param x
         *    the abscissa specified in the finest level coordinate system
@@ -97,12 +97,12 @@ public:
        }
 
        GaussianPyramid(const GrayImage& level0, unsigned nbLevels, float iSigma=1.0f);
-       GaussianPyramid(GrayImagelevel0, unsigned nbLevels, float iSigma=1.0f);
+       GaussianPyramid(GrayImage *level0, unsigned nbLevels, float iSigma=1.0f);
        GaussianPyramid(const GaussianPyramid& iBrother);
        virtual ~GaussianPyramid() {}
 
        virtual void BuildPyramid(const GrayImage& level0, unsigned nbLevels);
-       virtual void BuildPyramid(GrayImagelevel0, unsigned nbLevels);
+       virtual void BuildPyramid(GrayImage *level0, unsigned nbLevels);
 
        /* accessors */
        inline float getSigma() const
index eb92bacc6ab0cdd37de9b12ad269d9f7b9106307..1fff08dbd8fb6997e7eae4b6e3506c75f030ee87 100644 (file)
@@ -70,13 +70,13 @@ static int BBox_init(BPy_BBox *self, PyObject *args, PyObject *kwds)
        return 0;
 }
 
-static void BBox_dealloc(BPy_BBoxself)
+static void BBox_dealloc(BPy_BBox *self)
 {
        delete self->bb;
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyObject * BBox_repr(BPy_BBox* self)
+static PyObject *BBox_repr(BPy_BBox *self)
 {
        return PyUnicode_FromFormat("BBox - address: %p", self->bb);
 }
index 79714f1013f7c0022c4611a5949be1182acb50bc..dc87e283855368760da559c56b89fe006e0b6b66 100644 (file)
@@ -90,19 +90,19 @@ static int BinaryPredicate0D___init__(BPy_BinaryPredicate0D *self, PyObject *arg
        return 0;
 }
 
-static void BinaryPredicate0D___dealloc__(BPy_BinaryPredicate0Dself)
+static void BinaryPredicate0D___dealloc__(BPy_BinaryPredicate0D *self)
 {
        if (self->bp0D)
                delete self->bp0D;
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyObject * BinaryPredicate0D___repr__(BPy_BinaryPredicate0D* self)
+static PyObject *BinaryPredicate0D___repr__(BPy_BinaryPredicate0D *self)
 {
        return PyUnicode_FromFormat("type: %s - address: %p", Py_TYPE(self)->tp_name, self->bp0D);
 }
 
-static PyObject * BinaryPredicate0D___call__(BPy_BinaryPredicate0D *self, PyObject *args, PyObject *kwds)
+static PyObject *BinaryPredicate0D___call__(BPy_BinaryPredicate0D *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"inter1", "inter2", NULL};
        BPy_Interface0D *obj1, *obj2;
@@ -116,7 +116,7 @@ static PyObject * BinaryPredicate0D___call__(BPy_BinaryPredicate0D *self, PyObje
                PyErr_SetString(PyExc_TypeError, "__call__ method not properly overridden");
                return NULL;
        }
-       if (self->bp0D->operator()(*(obj1->if0D) , *(obj2->if0D)) < 0) {
+       if (self->bp0D->operator()(*(obj1->if0D), *(obj2->if0D)) < 0) {
                if (!PyErr_Occurred()) {
                        string class_name(Py_TYPE(self)->tp_name);
                        PyErr_SetString(PyExc_RuntimeError, (class_name + " __call__ method failed").c_str());
index 2e38ee6c10f240d2e934b9bba0221551dd0222ca..252fb8a7898ba7581732792dcbcff22658cf0720 100644 (file)
@@ -121,14 +121,14 @@ static int BinaryPredicate1D___init__(BPy_BinaryPredicate1D *self, PyObject *arg
        return 0;
 }
 
-static void BinaryPredicate1D___dealloc__(BPy_BinaryPredicate1Dself)
+static void BinaryPredicate1D___dealloc__(BPy_BinaryPredicate1D *self)
 {
        if (self->bp1D)
                delete self->bp1D;
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyObject * BinaryPredicate1D___repr__(BPy_BinaryPredicate1D* self)
+static PyObject *BinaryPredicate1D___repr__(BPy_BinaryPredicate1D *self)
 {
        return PyUnicode_FromFormat("type: %s - address: %p", Py_TYPE(self)->tp_name, self->bp1D);
 }
@@ -147,7 +147,7 @@ static PyObject *BinaryPredicate1D___call__(BPy_BinaryPredicate1D *self, PyObjec
                PyErr_SetString(PyExc_TypeError, "__call__ method not properly overridden");
                return NULL;
        }
-       if (self->bp1D->operator()(*(obj1->if1D) , *(obj2->if1D)) < 0) {
+       if (self->bp1D->operator()(*(obj1->if1D), *(obj2->if1D)) < 0) {
                if (!PyErr_Occurred()) {
                        string class_name(Py_TYPE(self)->tp_name);
                        PyErr_SetString(PyExc_RuntimeError, (class_name + " __call__ method failed").c_str());
index af5085dc54834f49f809a02077209b17598d2415..ed3aa882c6a90deb2236996627b0f3dd76e0875b 100644 (file)
@@ -51,7 +51,7 @@ static char ContextFunctions_get_time_stamp___doc__[] =
 "   :rtype: int\n";
 
 static PyObject *
-ContextFunctions_get_time_stamp(PyObjectself)
+ContextFunctions_get_time_stamp(PyObject *self)
 {
        return PyLong_FromLong(ContextFunctions::GetTimeStampCF());
 }
@@ -65,7 +65,7 @@ static char ContextFunctions_get_canvas_width___doc__[] =
 "   :rtype: int\n";
 
 static PyObject *
-ContextFunctions_get_canvas_width(PyObjectself)
+ContextFunctions_get_canvas_width(PyObject *self)
 {
        return PyLong_FromLong(ContextFunctions::GetCanvasWidthCF());
 }
@@ -79,7 +79,7 @@ static char ContextFunctions_get_canvas_height___doc__[] =
 "   :rtype: int\n";
 
 static PyObject *
-ContextFunctions_get_canvas_height(PyObjectself)
+ContextFunctions_get_canvas_height(PyObject *self)
 {
        return PyLong_FromLong(ContextFunctions::GetCanvasHeightCF());
 }
@@ -231,15 +231,25 @@ static char module_docstring[] = "The Blender Freestyle.ContextFunctions submodu
 /*-----------------------ContextFunctions module functions definitions-------------------*/
 
 static PyMethodDef module_functions[] = {
-  {"get_time_stamp", (PyCFunction)ContextFunctions_get_time_stamp, METH_NOARGS, ContextFunctions_get_time_stamp___doc__},
-  {"get_canvas_width", (PyCFunction)ContextFunctions_get_canvas_width, METH_NOARGS, ContextFunctions_get_canvas_width___doc__},
-  {"get_canvas_height", (PyCFunction)ContextFunctions_get_canvas_height, METH_NOARGS, ContextFunctions_get_canvas_height___doc__},
-  {"load_map", (PyCFunction)ContextFunctions_load_map, METH_VARARGS | METH_KEYWORDS, ContextFunctions_load_map___doc__},
-  {"read_map_pixel", (PyCFunction)ContextFunctions_read_map_pixel, METH_VARARGS | METH_KEYWORDS, ContextFunctions_read_map_pixel___doc__},
-  {"read_complete_view_map_pixel", (PyCFunction)ContextFunctions_read_complete_view_map_pixel, METH_VARARGS | METH_KEYWORDS, ContextFunctions_read_complete_view_map_pixel___doc__},
-  {"read_directional_view_map_pixel", (PyCFunction)ContextFunctions_read_directional_view_map_pixel, METH_VARARGS | METH_KEYWORDS, ContextFunctions_read_directional_view_map_pixel___doc__},
-  {"get_selected_fedge", (PyCFunction)ContextFunctions_get_selected_fedge, METH_NOARGS, ContextFunctions_get_selected_fedge___doc__},
-  {NULL, NULL, 0, NULL}
+       {"get_time_stamp", (PyCFunction)ContextFunctions_get_time_stamp, METH_NOARGS,
+                          ContextFunctions_get_time_stamp___doc__},
+       {"get_canvas_width", (PyCFunction)ContextFunctions_get_canvas_width, METH_NOARGS,
+                            ContextFunctions_get_canvas_width___doc__},
+       {"get_canvas_height", (PyCFunction)ContextFunctions_get_canvas_height, METH_NOARGS,
+                             ContextFunctions_get_canvas_height___doc__},
+       {"load_map", (PyCFunction)ContextFunctions_load_map, METH_VARARGS | METH_KEYWORDS,
+                    ContextFunctions_load_map___doc__},
+       {"read_map_pixel", (PyCFunction)ContextFunctions_read_map_pixel, METH_VARARGS | METH_KEYWORDS,
+                          ContextFunctions_read_map_pixel___doc__},
+       {"read_complete_view_map_pixel", (PyCFunction)ContextFunctions_read_complete_view_map_pixel,
+                                        METH_VARARGS | METH_KEYWORDS,
+                                        ContextFunctions_read_complete_view_map_pixel___doc__},
+       {"read_directional_view_map_pixel", (PyCFunction)ContextFunctions_read_directional_view_map_pixel,
+                                           METH_VARARGS | METH_KEYWORDS,
+                                           ContextFunctions_read_directional_view_map_pixel___doc__},
+       {"get_selected_fedge", (PyCFunction)ContextFunctions_get_selected_fedge, METH_NOARGS,
+                              ContextFunctions_get_selected_fedge___doc__},
+       {NULL, NULL, 0, NULL}
 };
 
 /*-----------------------ContextFunctions module definition--------------------------------*/
index 4c8e6557d02e2a3af427755f4754ad3b7396dea4..daf643c20c0d2cbe89febeaba9bc7eca459b980b 100644 (file)
@@ -378,7 +378,7 @@ PyObject *BPy_ViewShape_from_ViewShape(ViewShape& vs)
 PyObject *BPy_FrsMaterial_from_FrsMaterial(const FrsMaterial& m)
 {
        PyObject *py_m = FrsMaterial_Type.tp_new(&FrsMaterial_Type, 0, 0);
-       ((BPy_FrsMaterial*) py_m)->m = new FrsMaterial(m);
+       ((BPy_FrsMaterial *) py_m)->m = new FrsMaterial(m);
        return py_m;
 }
 
@@ -394,9 +394,9 @@ PyObject *BPy_IntegrationType_from_IntegrationType(IntegrationType i)
 PyObject *BPy_CurvePoint_from_CurvePoint(CurvePoint& cp)
 {
        PyObject *py_cp = CurvePoint_Type.tp_new(&CurvePoint_Type, 0, 0);
-       ((BPy_CurvePoint*) py_cp)->cp = &cp;
-       ((BPy_CurvePoint*) py_cp)->py_if0D.if0D = ((BPy_CurvePoint*) py_cp)->cp;
-       ((BPy_CurvePoint*) py_cp)->py_if0D.borrowed = 1;
+       ((BPy_CurvePoint *) py_cp)->cp = &cp;
+       ((BPy_CurvePoint *) py_cp)->py_if0D.if0D = ((BPy_CurvePoint *)py_cp)->cp;
+       ((BPy_CurvePoint *) py_cp)->py_if0D.borrowed = 1;
        return py_cp;
 }
 
@@ -504,22 +504,22 @@ bool bool_from_PyBool(PyObject *b)
        return PyObject_IsTrue(b) != 0;
 }
 
-IntegrationType IntegrationType_from_BPy_IntegrationType(PyObjectobj)
+IntegrationType IntegrationType_from_BPy_IntegrationType(PyObject *obj)
 {
        return static_cast<IntegrationType>(PyLong_AsLong(obj));
 }
 
-Stroke::MediumType MediumType_from_BPy_MediumType(PyObjectobj)
+Stroke::MediumType MediumType_from_BPy_MediumType(PyObject *obj)
 {
        return static_cast<Stroke::MediumType>(PyLong_AsLong(obj));
 }
 
-Nature::EdgeNature EdgeNature_from_BPy_Nature(PyObjectobj)
+Nature::EdgeNature EdgeNature_from_BPy_Nature(PyObject *obj)
 {
        return static_cast<Nature::EdgeNature>(PyLong_AsLong(obj));
 }
 
-Vec2f * Vec2f_ptr_from_PyObject(PyObject* obj)
+Vec2f *Vec2f_ptr_from_PyObject(PyObject *obj)
 {
        Vec2f *v;
        if ((v = Vec2f_ptr_from_Vector(obj)))
@@ -531,7 +531,7 @@ Vec2f * Vec2f_ptr_from_PyObject(PyObject* obj)
        return NULL;
 }
 
-Vec3f * Vec3f_ptr_from_PyObject(PyObject* obj)
+Vec3f *Vec3f_ptr_from_PyObject(PyObject *obj)
 {
        Vec3f *v;
        if ((v = Vec3f_ptr_from_Vector(obj)))
@@ -545,7 +545,7 @@ Vec3f * Vec3f_ptr_from_PyObject(PyObject* obj)
        return NULL;
 }
 
-Vec3r * Vec3r_ptr_from_PyObject(PyObject* obj)
+Vec3r *Vec3r_ptr_from_PyObject(PyObject *obj)
 {
        Vec3r *v;
        if ((v = Vec3r_ptr_from_Vector(obj)))
@@ -559,7 +559,7 @@ Vec3r * Vec3r_ptr_from_PyObject(PyObject* obj)
        return NULL;
 }
 
-Vec2f * Vec2f_ptr_from_Vector(PyObject* obj)
+Vec2f *Vec2f_ptr_from_Vector(PyObject *obj)
 {
        if (!VectorObject_Check(obj) || ((VectorObject *)obj)->size != 2)
                return NULL;
@@ -568,44 +568,44 @@ Vec2f * Vec2f_ptr_from_Vector(PyObject* obj)
        return new Vec2f(x, y);
 }
 
-Vec3f * Vec3f_ptr_from_Vector(PyObject* obj)
+Vec3f *Vec3f_ptr_from_Vector(PyObject *obj)
 {
        if (!VectorObject_Check(obj) || ((VectorObject *)obj)->size != 3)
                return NULL;
        float x = ((VectorObject *)obj)->vec[0];
        float y = ((VectorObject *)obj)->vec[1];
        float z = ((VectorObject *)obj)->vec[2];
-       return new Vec3f(x,y,z);
+       return new Vec3f(x, y, z);
 }
 
-Vec3r * Vec3r_ptr_from_Vector(PyObject* obj)
+Vec3r *Vec3r_ptr_from_Vector(PyObject *obj)
 {
        if (!VectorObject_Check(obj) || ((VectorObject *)obj)->size != 3)
                return NULL;
        real x = ((VectorObject *)obj)->vec[0];
        real y = ((VectorObject *)obj)->vec[1];
        real z = ((VectorObject *)obj)->vec[2];
-       return new Vec3r(x,y,z);
+       return new Vec3r(x, y, z);
 }
 
-Vec3f * Vec3f_ptr_from_Color(PyObject* obj)
+Vec3f *Vec3f_ptr_from_Color(PyObject *obj)
 {
        if (!ColorObject_Check(obj))
                return NULL;
        float r = ((ColorObject *)obj)->col[0];
        float g = ((ColorObject *)obj)->col[1];
        float b = ((ColorObject *)obj)->col[2];
-       return new Vec3f(r,g,b);
+       return new Vec3f(r, g, b);
 }
 
-Vec3r * Vec3r_ptr_from_Color(PyObject* obj)
+Vec3r *Vec3r_ptr_from_Color(PyObject *obj)
 {
        if (!ColorObject_Check(obj))
                return NULL;
        real r = ((ColorObject *)obj)->col[0];
        real g = ((ColorObject *)obj)->col[1];
        real b = ((ColorObject *)obj)->col[2];
-       return new Vec3r(r,g,b);
+       return new Vec3r(r, g, b);
 }
 
 static int float_array_from_PyList(PyObject *obj, float *v, int n)
@@ -620,7 +620,7 @@ static int float_array_from_PyList(PyObject *obj, float *v, int n)
        return 1;
 }
 
-Vec2f * Vec2f_ptr_from_PyList(PyObject* obj)
+Vec2f *Vec2f_ptr_from_PyList(PyObject *obj)
 {
        float v[2];
 
@@ -631,7 +631,7 @@ Vec2f * Vec2f_ptr_from_PyList(PyObject* obj)
        return new Vec2f(v[0], v[1]);
 }
 
-Vec3f * Vec3f_ptr_from_PyList(PyObject* obj)
+Vec3f *Vec3f_ptr_from_PyList(PyObject *obj)
 {
        float v[3];
 
@@ -642,7 +642,7 @@ Vec3f * Vec3f_ptr_from_PyList(PyObject* obj)
        return new Vec3f(v[0], v[1], v[2]);
 }
 
-Vec3r * Vec3r_ptr_from_PyList(PyObject* obj)
+Vec3r *Vec3r_ptr_from_PyList(PyObject *obj)
 {
        float v[3];
 
@@ -665,7 +665,7 @@ static int float_array_from_PyTuple(PyObject *obj, float *v, int n)
        return 1;
 }
 
-Vec2f * Vec2f_ptr_from_PyTuple(PyObject* obj)
+Vec2f *Vec2f_ptr_from_PyTuple(PyObject *obj)
 {
        float v[2];
 
@@ -676,7 +676,7 @@ Vec2f * Vec2f_ptr_from_PyTuple(PyObject* obj)
        return new Vec2f(v[0], v[1]);
 }
 
-Vec3f * Vec3f_ptr_from_PyTuple(PyObject* obj)
+Vec3f *Vec3f_ptr_from_PyTuple(PyObject *obj)
 {
        float v[3];
 
@@ -687,7 +687,7 @@ Vec3f * Vec3f_ptr_from_PyTuple(PyObject* obj)
        return new Vec3f(v[0], v[1], v[2]);
 }
 
-Vec3r * Vec3r_ptr_from_PyTuple(PyObject* obj)
+Vec3r *Vec3r_ptr_from_PyTuple(PyObject *obj)
 {
        float v[3];
 
index 187af21668573ea68bed98efc224eb84432c2104..20ab9d0d15d4af30531a639b0ddca2ad97811f3c 100644 (file)
@@ -137,9 +137,11 @@ PyObject * BPy_ViewShape_from_ViewShape(ViewShape& vs);
 PyObject * BPy_AdjacencyIterator_from_AdjacencyIterator(AdjacencyIterator& a_it);
 PyObject * BPy_Interface0DIterator_from_Interface0DIterator(Interface0DIterator& if0D_it, int reversed);
 PyObject * BPy_CurvePointIterator_from_CurvePointIterator(CurveInternal::CurvePointIterator& cp_it);
-PyObject * BPy_StrokeVertexIterator_from_StrokeVertexIterator(StrokeInternal::StrokeVertexIterator& sv_it, int reversed);
+PyObject * BPy_StrokeVertexIterator_from_StrokeVertexIterator(StrokeInternal::StrokeVertexIterator& sv_it,
+                                                              int reversed);
 PyObject * BPy_SVertexIterator_from_SVertexIterator(ViewEdgeInternal::SVertexIterator& sv_it);
-PyObject * BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator& ove_it, int reversed);
+PyObject * BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator& ove_it,
+                                                                      int reversed);
 PyObject * BPy_ViewEdgeIterator_from_ViewEdgeIterator(ViewEdgeInternal::ViewEdgeIterator& ve_it);
 PyObject * BPy_ChainingIterator_from_ChainingIterator(ChainingIterator& c_it);
 PyObject * BPy_ChainPredicateIterator_from_ChainPredicateIterator(ChainPredicateIterator& cp_it);
@@ -150,23 +152,23 @@ PyObject * BPy_ChainSilhouetteIterator_from_ChainSilhouetteIterator(ChainSilhoue
 //==============================
 
 bool bool_from_PyBool(PyObject *b);
-IntegrationType IntegrationType_from_BPy_IntegrationType(PyObjectobj);
-Stroke::MediumType MediumType_from_BPy_MediumType(PyObjectobj);
-Nature::EdgeNature EdgeNature_from_BPy_Nature(PyObjectobj);
-Vec2f * Vec2f_ptr_from_PyObject(PyObjectobj);
-Vec3f * Vec3f_ptr_from_PyObject(PyObjectobj);
-Vec3r * Vec3r_ptr_from_PyObject(PyObjectobj);
-Vec2f * Vec2f_ptr_from_Vector(PyObjectobj);
-Vec3f * Vec3f_ptr_from_Vector(PyObjectobj);
-Vec3r * Vec3r_ptr_from_Vector(PyObjectobj);
-Vec3f * Vec3f_ptr_from_Color(PyObjectobj);
-Vec3r * Vec3r_ptr_from_Color(PyObjectobj);
-Vec2f * Vec2f_ptr_from_PyList(PyObjectobj);
-Vec3f * Vec3f_ptr_from_PyList(PyObjectobj);
-Vec3r * Vec3r_ptr_from_PyList(PyObjectobj);
-Vec2f * Vec2f_ptr_from_PyTuple(PyObjectobj);
-Vec3f * Vec3f_ptr_from_PyTuple(PyObjectobj);
-Vec3r * Vec3r_ptr_from_PyTuple(PyObjectobj);
+IntegrationType IntegrationType_from_BPy_IntegrationType(PyObject *obj);
+Stroke::MediumType MediumType_from_BPy_MediumType(PyObject *obj);
+Nature::EdgeNature EdgeNature_from_BPy_Nature(PyObject *obj);
+Vec2f * Vec2f_ptr_from_PyObject(PyObject *obj);
+Vec3f * Vec3f_ptr_from_PyObject(PyObject *obj);
+Vec3r * Vec3r_ptr_from_PyObject(PyObject *obj);
+Vec2f * Vec2f_ptr_from_Vector(PyObject *obj);
+Vec3f * Vec3f_ptr_from_Vector(PyObject *obj);
+Vec3r * Vec3r_ptr_from_Vector(PyObject *obj);
+Vec3f * Vec3f_ptr_from_Color(PyObject *obj);
+Vec3r * Vec3r_ptr_from_Color(PyObject *obj);
+Vec2f * Vec2f_ptr_from_PyList(PyObject *obj);
+Vec3f * Vec3f_ptr_from_PyList(PyObject *obj);
+Vec3r * Vec3r_ptr_from_PyList(PyObject *obj);
+Vec2f * Vec2f_ptr_from_PyTuple(PyObject *obj);
+Vec3f * Vec3f_ptr_from_PyTuple(PyObject *obj);
+Vec3r * Vec3r_ptr_from_PyTuple(PyObject *obj);
 
 int float_array_from_PyObject(PyObject *obj, float *v, int n);
 
index 12635ad6b9dc91b5fddad3c9ea3b6b64f6bbdc65..21347dc2daea61a7bf273edcd6b477043dadb767 100644 (file)
@@ -148,12 +148,14 @@ static PyObject *Freestyle_blendRamp(PyObject *self, PyObject *args)
        }
        v1 = Vec3f_ptr_from_PyObject(obj1);
        if (!v1) {
-               PyErr_SetString(PyExc_TypeError, "argument 2 must be a 3D vector (either a tuple/list of 3 elements or Vector)");
+               PyErr_SetString(PyExc_TypeError,
+                               "argument 2 must be a 3D vector (either a tuple/list of 3 elements or Vector)");
                goto error;
        }
        v2 = Vec3f_ptr_from_PyObject(obj2);
        if (!v2) {
-               PyErr_SetString(PyExc_TypeError, "argument 4 must be a 3D vector (either a tuple/list of 3 elements or Vector)");
+               PyErr_SetString(PyExc_TypeError,
+                               "argument 4 must be a 3D vector (either a tuple/list of 3 elements or Vector)");
                goto error;
        }
        a[0] = v1->x(); b[0] = v2->x();
@@ -478,7 +480,8 @@ static PyMethodDef module_functions[] = {
        {"getCurrentScene", (PyCFunction) Freestyle_getCurrentScene, METH_NOARGS, Freestyle_getCurrentScene___doc__},
        {"blendRamp", (PyCFunction) Freestyle_blendRamp, METH_VARARGS, Freestyle_blendRamp___doc__},
        {"evaluateColorRamp", (PyCFunction) Freestyle_evaluateColorRamp, METH_VARARGS, Freestyle_evaluateColorRamp___doc__},
-       {"evaluateCurveMappingF", (PyCFunction) Freestyle_evaluateCurveMappingF, METH_VARARGS, Freestyle_evaluateCurveMappingF___doc__},
+       {"evaluateCurveMappingF", (PyCFunction) Freestyle_evaluateCurveMappingF, METH_VARARGS,
+                                 Freestyle_evaluateCurveMappingF___doc__},
        {NULL, NULL, 0, NULL}
 };
 
index 527bd920ea50b02aa42800b0013ff9870e02f1ed..1833708f08c3fafcee6872cf4a5564b3f36d1d94 100644 (file)
@@ -102,7 +102,8 @@ static int FrsMaterial_init(BPy_FrsMaterial *self, PyObject *args, PyObject *kwd
        if (PyArg_ParseTupleAndKeywords(args, kwds, "|O!", (char **)kwlist_1, &FrsMaterial_Type, &brother)) {
                if (!brother) {
                        self->m = new FrsMaterial();
-               } else {
+               }
+               else {
                        FrsMaterial *m = ((BPy_FrsMaterial *)brother)->m;
                        if (!m) {
                                PyErr_SetString(PyExc_RuntimeError, "invalid Material object");
@@ -128,13 +129,13 @@ static int FrsMaterial_init(BPy_FrsMaterial *self, PyObject *args, PyObject *kwd
        return 0;
 }
 
-static void FrsMaterial_dealloc(BPy_FrsMaterialself)
+static void FrsMaterial_dealloc(BPy_FrsMaterial *self)
 {
        delete self->m;
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyObject * FrsMaterial_repr(BPy_FrsMaterial* self)
+static PyObject *FrsMaterial_repr(BPy_FrsMaterial *self)
 {
        return PyUnicode_FromFormat("Material - address: %p", self->m);
 }
@@ -398,11 +399,16 @@ static int FrsMaterial_shininess_set(BPy_FrsMaterial *self, PyObject *value, voi
 }
 
 static PyGetSetDef BPy_FrsMaterial_getseters[] = {
-       {(char *)"diffuse", (getter)FrsMaterial_diffuse_get, (setter)FrsMaterial_diffuse_set, (char *)FrsMaterial_diffuse_doc, NULL},
-       {(char *)"specular", (getter)FrsMaterial_specular_get, (setter)FrsMaterial_specular_set, (char *)FrsMaterial_specular_doc, NULL},
-       {(char *)"ambient", (getter)FrsMaterial_ambient_get, (setter)FrsMaterial_ambient_set, (char *)FrsMaterial_ambient_doc, NULL},
-       {(char *)"emission", (getter)FrsMaterial_emission_get, (setter)FrsMaterial_emission_set, (char *)FrsMaterial_emission_doc, NULL},
-       {(char *)"shininess", (getter)FrsMaterial_shininess_get, (setter)FrsMaterial_shininess_set, (char *)FrsMaterial_shininess_doc, NULL},
+       {(char *)"diffuse", (getter)FrsMaterial_diffuse_get, (setter)FrsMaterial_diffuse_set,
+                           (char *)FrsMaterial_diffuse_doc, NULL},
+       {(char *)"specular", (getter)FrsMaterial_specular_get, (setter)FrsMaterial_specular_set,
+                            (char *)FrsMaterial_specular_doc, NULL},
+       {(char *)"ambient", (getter)FrsMaterial_ambient_get, (setter)FrsMaterial_ambient_set,
+                           (char *)FrsMaterial_ambient_doc, NULL},
+       {(char *)"emission", (getter)FrsMaterial_emission_get, (setter)FrsMaterial_emission_set,
+                            (char *)FrsMaterial_emission_doc, NULL},
+       {(char *)"shininess", (getter)FrsMaterial_shininess_get, (setter)FrsMaterial_shininess_set,
+                             (char *)FrsMaterial_shininess_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
 };
 
index b6e90a4b4406a69872ffc796b74035541c260d8f..3e6712eff16b47b575171306a6622e13286a3a71 100644 (file)
@@ -79,13 +79,13 @@ static int FrsNoise_init(BPy_FrsNoise *self, PyObject *args, PyObject *kwds)
        return 0;
 }
 
-static void FrsNoise_dealloc(BPy_FrsNoiseself)
+static void FrsNoise_dealloc(BPy_FrsNoise *self)
 {
        delete self->n;
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyObject * FrsNoise_repr(BPy_FrsNoise* self)
+static PyObject *FrsNoise_repr(BPy_FrsNoise *self)
 {
        return PyUnicode_FromFormat("Noise - address: %p", self->n);
 }
@@ -106,7 +106,7 @@ PyDoc_STRVAR(FrsNoise_turbulence1_doc,
 "   :return: A noise value.\n"
 "   :rtype: float");
 
-static PyObject * FrsNoise_turbulence1(BPy_FrsNoise *self , PyObject *args, PyObject *kwds)
+static PyObject *FrsNoise_turbulence1(BPy_FrsNoise *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"v", "freq", "amp", "oct", NULL};
        float f1, f2, f3;
@@ -133,7 +133,7 @@ PyDoc_STRVAR(FrsNoise_turbulence2_doc,
 "   :return: A noise value.\n"
 "   :rtype: float");
 
-static PyObject * FrsNoise_turbulence2(BPy_FrsNoise *self , PyObject *args, PyObject *kwds)
+static PyObject *FrsNoise_turbulence2(BPy_FrsNoise *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"v", "freq", "amp", "oct", NULL};
        PyObject *obj1;
@@ -168,7 +168,7 @@ PyDoc_STRVAR(FrsNoise_turbulence3_doc,
 "   :return: A noise value.\n"
 "   :rtype: float");
 
-static PyObject * FrsNoise_turbulence3(BPy_FrsNoise *self , PyObject *args, PyObject *kwds)
+static PyObject *FrsNoise_turbulence3(BPy_FrsNoise *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"v", "freq", "amp", "oct", NULL};
        PyObject *obj1;
@@ -197,7 +197,7 @@ PyDoc_STRVAR(FrsNoise_smoothNoise1_doc,
 "   :return: A smooth noise value.\n"
 "   :rtype: float");
 
-static PyObject * FrsNoise_smoothNoise1(BPy_FrsNoise *self , PyObject *args, PyObject *kwds)
+static PyObject *FrsNoise_smoothNoise1(BPy_FrsNoise *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"v", NULL};
        float f;
@@ -217,7 +217,7 @@ PyDoc_STRVAR(FrsNoise_smoothNoise2_doc,
 "   :return: A smooth noise value.\n"
 "   :rtype: float");
 
-static PyObject * FrsNoise_smoothNoise2(BPy_FrsNoise *self , PyObject *args, PyObject *kwds)
+static PyObject *FrsNoise_smoothNoise2(BPy_FrsNoise *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"v", NULL};
        PyObject *obj;
@@ -244,7 +244,7 @@ PyDoc_STRVAR(FrsNoise_smoothNoise3_doc,
 "   :return: A smooth noise value.\n"
 "   :rtype: float");
 
-static PyObject * FrsNoise_smoothNoise3(BPy_FrsNoise *self , PyObject *args, PyObject *kwds)
+static PyObject *FrsNoise_smoothNoise3(BPy_FrsNoise *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"v", NULL};
        PyObject *obj;
index f4ae7c18ecaab61f532b484592e4f3addc76d0db..d9f1d12dc718b3563055c2507837699068fad87d 100644 (file)
@@ -85,7 +85,7 @@ static int Id_init(BPy_Id *self, PyObject *args, PyObject *kwds)
                self->id = new Id(*(((BPy_Id *)brother)->id));
        }
        else if (PyErr_Clear(),
-                PyArg_ParseTupleAndKeywords(args, kwds, "|ii", (char**)kwlist_2, &first, &second))
+                PyArg_ParseTupleAndKeywords(args, kwds, "|ii", (char **)kwlist_2, &first, &second))
        {
                self->id = new Id(first, second);
        }
@@ -96,20 +96,20 @@ static int Id_init(BPy_Id *self, PyObject *args, PyObject *kwds)
        return 0;
 }
 
-static void Id_dealloc(BPy_Idself)
+static void Id_dealloc(BPy_Id *self)
 {
        delete self->id;
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyObject * Id_repr(BPy_Id* self)
+static PyObject *Id_repr(BPy_Id *self)
 {
        return PyUnicode_FromFormat("[ first: %i, second: %i ](BPy_Id)", self->id->getFirst(), self->id->getSecond());
 }
 
-static PyObject * Id_RichCompare(BPy_Id *o1, BPy_Id *o2, int opid)
+static PyObject *Id_RichCompare(BPy_Id *o1, BPy_Id *o2, int opid)
 {
-       switch(opid){
+       switch (opid) {
                case Py_LT:
                        return PyBool_from_bool(o1->id->operator<(*(o2->id)));
                        break;
index bbfe99ebbf0dabf6bccd7317f0ec269b2e17bbd6..0202230ac4cf2d0bffaeaa18c3c164cc83a90355 100644 (file)
@@ -114,14 +114,14 @@ static int Interface0D_init(BPy_Interface0D *self, PyObject *args, PyObject *kwd
        return 0;
 }
 
-static void Interface0D_dealloc(BPy_Interface0Dself)
+static void Interface0D_dealloc(BPy_Interface0D *self)
 {
        if (self->if0D && !self->borrowed)
                delete self->if0D;
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyObject * Interface0D_repr(BPy_Interface0D* self)
+static PyObject *Interface0D_repr(BPy_Interface0D *self)
 {
        return PyUnicode_FromFormat("type: %s - address: %p", self->if0D->getExactTypeName().c_str(), self->if0D);
 }
@@ -263,9 +263,12 @@ static PyObject *Interface0D_nature_get(BPy_Interface0D *self, void *UNUSED(clos
 static PyGetSetDef BPy_Interface0D_getseters[] = {
        {(char *)"name", (getter)Interface0D_name_get, (setter)NULL, (char *)Interface0D_name_doc, NULL},
        {(char *)"point_3d", (getter)Interface0D_point_3d_get, (setter)NULL, (char *)Interface0D_point_3d_doc, NULL},
-       {(char *)"projected_x", (getter)Interface0D_projected_x_get, (setter)NULL, (char *)Interface0D_projected_x_doc, NULL},
-       {(char *)"projected_y", (getter)Interface0D_projected_y_get, (setter)NULL, (char *)Interface0D_projected_y_doc, NULL},
-       {(char *)"projected_z", (getter)Interface0D_projected_z_get, (setter)NULL, (char *)Interface0D_projected_z_doc, NULL},
+       {(char *)"projected_x", (getter)Interface0D_projected_x_get, (setter)NULL,
+                               (char *)Interface0D_projected_x_doc, NULL},
+       {(char *)"projected_y", (getter)Interface0D_projected_y_get, (setter)NULL,
+                               (char *)Interface0D_projected_y_doc, NULL},
+       {(char *)"projected_z", (getter)Interface0D_projected_z_get, (setter)NULL,
+                               (char *)Interface0D_projected_z_doc, NULL},
        {(char *)"point_2d", (getter)Interface0D_point_2d_get, (setter)NULL, (char *)Interface0D_point_2d_doc, NULL},
        {(char *)"id", (getter)Interface0D_id_get, (setter)NULL, (char *)Interface0D_id_doc, NULL},
        {(char *)"nature", (getter)Interface0D_nature_get, (setter)NULL, (char *)Interface0D_nature_doc, NULL},
index e990f10f9465b2af414a99779fac7007e6a2fb40..a156e76fab667968f9d8af2617297e795946b37c 100644 (file)
@@ -124,14 +124,14 @@ static int Interface1D_init(BPy_Interface1D *self, PyObject *args, PyObject *kwd
        return 0;
 }
 
-static void Interface1D_dealloc(BPy_Interface1Dself)
+static void Interface1D_dealloc(BPy_Interface1D *self)
 {
        if (self->if1D && !self->borrowed)
                delete self->if1D;
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyObject * Interface1D_repr(BPy_Interface1D* self)
+static PyObject *Interface1D_repr(BPy_Interface1D *self)
 {
        return PyUnicode_FromFormat("type: %s - address: %p", self->if1D->getExactTypeName().c_str(), self->if1D);
 }
@@ -302,7 +302,8 @@ static PyGetSetDef BPy_Interface1D_getseters[] = {
        {(char *)"id", (getter)Interface1D_id_get, (setter)NULL, (char *)Interface1D_id_doc, NULL},
        {(char *)"nature", (getter)Interface1D_nature_get, (setter)NULL, (char *)Interface1D_nature_doc, NULL},
        {(char *)"length_2d", (getter)Interface1D_length_2d_get, (setter)NULL, (char *)Interface1D_length_2d_doc, NULL},
-       {(char *)"time_stamp", (getter)Interface1D_time_stamp_get, (setter)Interface1D_time_stamp_set, (char *)Interface1D_time_stamp_doc, NULL},
+       {(char *)"time_stamp", (getter)Interface1D_time_stamp_get, (setter)Interface1D_time_stamp_set,
+                              (char *)Interface1D_time_stamp_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
 };
 
index 785a24a47bb243c66bd5fad13dadc34ba3a90096..302f3455f52b9e897643bdf5e343ec7fcf2b4b92 100644 (file)
@@ -132,14 +132,14 @@ static int Iterator_init(BPy_Iterator *self, PyObject *args, PyObject *kwds)
        return 0;
 }
 
-static void Iterator_dealloc(BPy_Iteratorself)
+static void Iterator_dealloc(BPy_Iterator *self)
 {
        if (self->it)
                delete self->it;
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyObject * Iterator_repr(BPy_Iterator* self)
+static PyObject *Iterator_repr(BPy_Iterator *self)
 {
        return PyUnicode_FromFormat("type: %s - address: %p", Py_TYPE(self)->tp_name, self->it);
 }
@@ -149,10 +149,10 @@ PyDoc_STRVAR(Iterator_increment_doc,
 "\n"
 "   Makes the iterator point the next element.");
 
-static PyObject * Iterator_increment(BPy_Iterator* self)
+static PyObject *Iterator_increment(BPy_Iterator *self)
 {
        if (self->it->isEnd()) {
-               PyErr_SetString(PyExc_RuntimeError , "cannot increment any more");
+               PyErr_SetString(PyExc_RuntimeError, "cannot increment any more");
                return NULL;
        }
        self->it->increment();
@@ -164,10 +164,10 @@ PyDoc_STRVAR(Iterator_decrement_doc,
 "\n"
 "   Makes the iterator point the previous element.");
 
-static PyObject * Iterator_decrement(BPy_Iterator* self)
+static PyObject *Iterator_decrement(BPy_Iterator *self)
 {
        if (self->it->isBegin()) {
-               PyErr_SetString(PyExc_RuntimeError , "cannot decrement any more");
+               PyErr_SetString(PyExc_RuntimeError, "cannot decrement any more");
                return NULL;
        }
        self->it->decrement();
index 29498b1f480ceaec24a5712e04b3cf536daeda0b..a3f12f4d274833f958c85926d1b057f016b02934 100644 (file)
@@ -69,9 +69,9 @@ PyDoc_STRVAR(Operators_doc,
 "creation.  All these operators are user controlled through functors,\n"
 "predicates and shaders that are taken as arguments.");
 
-static void Operators_dealloc(BPy_Operatorsself)
+static void Operators_dealloc(BPy_Operators *self)
 {
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
 PyDoc_STRVAR(Operators_select_doc,
@@ -83,7 +83,7 @@ PyDoc_STRVAR(Operators_select_doc,
 "   :arg pred: The predicate expressing this condition.\n"
 "   :type pred: UnaryPredicate1D");
 
-static PyObject *Operators_select(BPy_Operatorsself, PyObject *args, PyObject *kwds)
+static PyObject *Operators_select(BPy_Operators *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"pred", NULL};
        PyObject *obj = 0;
@@ -142,7 +142,7 @@ PyDoc_STRVAR(Operators_chain_doc,
 "      stopping condition.\n"
 "   :type pred: :class:`UnaryPredicate1D`");
 
-static PyObject *Operators_chain(BPy_Operatorsself, PyObject *args, PyObject *kwds)
+static PyObject *Operators_chain(BPy_Operators *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"it", "pred", "modifier", NULL};
        PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0;
@@ -231,7 +231,7 @@ PyDoc_STRVAR(Operators_bidirectional_chain_doc,
 "      contains the chaining rule.\n"
 "   :type it: :class:`ChainingIterator`");
 
-static PyObject *Operators_bidirectional_chain(BPy_Operatorsself, PyObject *args, PyObject *kwds)
+static PyObject *Operators_bidirectional_chain(BPy_Operators *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"it", "pred", NULL};
        PyObject *obj1 = 0, *obj2 = 0;
@@ -242,7 +242,8 @@ static PyObject *Operators_bidirectional_chain(BPy_Operators* self, PyObject *ar
                return NULL;
        }
        if (!((BPy_ChainingIterator *)obj1)->c_it) {
-               PyErr_SetString(PyExc_TypeError, "Operators.bidirectional_chain(): 1st argument: invalid ChainingIterator object");
+               PyErr_SetString(PyExc_TypeError,
+                               "Operators.bidirectional_chain(): 1st argument: invalid ChainingIterator object");
                return NULL;
        }
        if (!obj2) {
@@ -254,7 +255,8 @@ static PyObject *Operators_bidirectional_chain(BPy_Operators* self, PyObject *ar
        }
        else {
                if (!((BPy_UnaryPredicate1D *)obj2)->up1D) {
-                       PyErr_SetString(PyExc_TypeError, "Operators.bidirectional_chain(): 2nd argument: invalid UnaryPredicate1D object");
+                       PyErr_SetString(PyExc_TypeError,
+                                       "Operators.bidirectional_chain(): 2nd argument: invalid UnaryPredicate1D object");
                        return NULL;
                }
                if (Operators::bidirectionalChain(*(((BPy_ChainingIterator *)obj1)->c_it),
@@ -309,7 +311,7 @@ PyDoc_STRVAR(Operators_sequential_split_doc,
 "      resolution.)\n"
 "   :type sampling: float");
 
-static PyObject *Operators_sequential_split(BPy_Operatorsself, PyObject *args, PyObject *kwds)
+static PyObject *Operators_sequential_split(BPy_Operators *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist_1[] = {"starting_pred", "stopping_pred", "sampling", NULL};
        static const char *kwlist_2[] = {"pred", "sampling", NULL};
@@ -320,11 +322,13 @@ static PyObject *Operators_sequential_split(BPy_Operators* self, PyObject *args,
                                        &UnaryPredicate0D_Type, &obj1, &UnaryPredicate0D_Type, &obj2, &f))
        {
                if (!((BPy_UnaryPredicate0D *)obj1)->up0D) {
-                       PyErr_SetString(PyExc_TypeError, "Operators.sequential_split(): 1st argument: invalid UnaryPredicate0D object");
+                       PyErr_SetString(PyExc_TypeError,
+                                       "Operators.sequential_split(): 1st argument: invalid UnaryPredicate0D object");
                        return NULL;
                }
                if (!((BPy_UnaryPredicate0D *)obj2)->up0D) {
-                       PyErr_SetString(PyExc_TypeError, "Operators.sequential_split(): 2nd argument: invalid UnaryPredicate0D object");
+                       PyErr_SetString(PyExc_TypeError,
+                                       "Operators.sequential_split(): 2nd argument: invalid UnaryPredicate0D object");
                        return NULL;
                }
                if (Operators::sequentialSplit(*(((BPy_UnaryPredicate0D *)obj1)->up0D),
@@ -341,7 +345,8 @@ static PyObject *Operators_sequential_split(BPy_Operators* self, PyObject *args,
                                             &UnaryPredicate0D_Type, &obj1, &f))
        {
                if (!((BPy_UnaryPredicate0D *)obj1)->up0D) {
-                       PyErr_SetString(PyExc_TypeError, "Operators.sequential_split(): 1st argument: invalid UnaryPredicate0D object");
+                       PyErr_SetString(PyExc_TypeError,
+                                       "Operators.sequential_split(): 1st argument: invalid UnaryPredicate0D object");
                        return NULL;
                }
                if (Operators::sequentialSplit(*(((BPy_UnaryPredicate0D *)obj1)->up0D), f) < 0) {
@@ -413,7 +418,7 @@ PyDoc_STRVAR(Operators_recursive_split_doc,
 "      resolution.)\n"
 "   :type sampling: float");
 
-static PyObject *Operators_recursive_split(BPy_Operatorsself, PyObject *args, PyObject *kwds)
+static PyObject *Operators_recursive_split(BPy_Operators *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist_1[] = {"func", "pred_1d", "sampling", NULL};
        static const char *kwlist_2[] = {"func", "pred_0d", "pred_1d", "sampling", NULL};
@@ -424,11 +429,13 @@ static PyObject *Operators_recursive_split(BPy_Operators* self, PyObject *args,
                                        &UnaryFunction0DDouble_Type, &obj1, &UnaryPredicate1D_Type, &obj2, &f))
        {
                if (!((BPy_UnaryFunction0DDouble *)obj1)->uf0D_double) {
-                       PyErr_SetString(PyExc_TypeError, "Operators.recursive_split(): 1st argument: invalid UnaryFunction0DDouble object");
+                       PyErr_SetString(PyExc_TypeError,
+                                       "Operators.recursive_split(): 1st argument: invalid UnaryFunction0DDouble object");
                        return NULL;
                }
                if (!((BPy_UnaryPredicate1D *)obj2)->up1D) {
-                       PyErr_SetString(PyExc_TypeError, "Operators.recursive_split(): 2nd argument: invalid UnaryPredicate1D object");
+                       PyErr_SetString(PyExc_TypeError,
+                                       "Operators.recursive_split(): 2nd argument: invalid UnaryPredicate1D object");
                        return NULL;
                }
                if (Operators::recursiveSplit(*(((BPy_UnaryFunction0DDouble *)obj1)->uf0D_double),
@@ -446,15 +453,18 @@ static PyObject *Operators_recursive_split(BPy_Operators* self, PyObject *args,
                                        &UnaryPredicate1D_Type, &obj3, &f))
        {
                if (!((BPy_UnaryFunction0DDouble *)obj1)->uf0D_double) {
-                       PyErr_SetString(PyExc_TypeError, "Operators.recursive_split(): 1st argument: invalid UnaryFunction0DDouble object");
+                       PyErr_SetString(PyExc_TypeError,
+                                       "Operators.recursive_split(): 1st argument: invalid UnaryFunction0DDouble object");
                        return NULL;
                }
                if (!((BPy_UnaryPredicate0D *)obj2)->up0D) {
-                       PyErr_SetString(PyExc_TypeError, "Operators.recursive_split(): 2nd argument: invalid UnaryPredicate0D object");
+                       PyErr_SetString(PyExc_TypeError,
+                                       "Operators.recursive_split(): 2nd argument: invalid UnaryPredicate0D object");
                        return NULL;
                }
                if (!((BPy_UnaryPredicate1D *)obj3)->up1D) {
-                       PyErr_SetString(PyExc_TypeError, "Operators.recursive_split(): 3rd argument: invalid UnaryPredicate1D object");
+                       PyErr_SetString(PyExc_TypeError,
+                                       "Operators.recursive_split(): 3rd argument: invalid UnaryPredicate1D object");
                        return NULL;
                }
                if (Operators::recursiveSplit(*(((BPy_UnaryFunction0DDouble *)obj1)->uf0D_double),
@@ -483,7 +493,7 @@ PyDoc_STRVAR(Operators_sort_doc,
 "   :arg pred: The binary predicate used for the comparison.\n"
 "   :type pred: BinaryPredicate1D");
 
-static PyObject *Operators_sort(BPy_Operatorsself, PyObject *args, PyObject *kwds)
+static PyObject *Operators_sort(BPy_Operators *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"pred", NULL};
        PyObject *obj = 0;
@@ -514,7 +524,7 @@ PyDoc_STRVAR(Operators_create_doc,
 "   :arg shaders: The list of shaders used to shade the strokes.\n"
 "   :type shaders: List of StrokeShader objects");
 
-static PyObject *Operators_create(BPy_Operatorsself, PyObject *args, PyObject *kwds)
+static PyObject *Operators_create(BPy_Operators *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"pred", "shaders", NULL};
        PyObject *obj1 = 0, *obj2 = 0;
@@ -555,7 +565,7 @@ PyDoc_STRVAR(Operators_get_viewedge_from_index_doc,
 "   :return: The ViewEdge object.\n"
 "   :rtype: :class:`ViewEdge`");
 
-static PyObject *Operators_get_viewedge_from_index(BPy_Operatorsself, PyObject *args, PyObject *kwds)
+static PyObject *Operators_get_viewedge_from_index(BPy_Operators *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"i", NULL};
        unsigned int i;
@@ -579,7 +589,7 @@ PyDoc_STRVAR(Operators_get_chain_from_index_doc,
 "   :return: The Chain object.\n"
 "   :rtype: :class:`Chain`");
 
-static PyObject *Operators_get_chain_from_index(BPy_Operatorsself, PyObject *args, PyObject *kwds)
+static PyObject *Operators_get_chain_from_index(BPy_Operators *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"i", NULL};
        unsigned int i;
@@ -603,7 +613,7 @@ PyDoc_STRVAR(Operators_get_stroke_from_index_doc,
 "   :return: The Stroke object.\n"
 "   :rtype: :class:`Stroke`");
 
-static PyObject *Operators_get_stroke_from_index(BPy_Operatorsself, PyObject *args, PyObject *kwds)
+static PyObject *Operators_get_stroke_from_index(BPy_Operators *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"i", NULL};
        unsigned int i;
@@ -625,7 +635,7 @@ PyDoc_STRVAR(Operators_get_view_edges_size_doc,
 "   :return: The number of ViewEdges.\n"
 "   :rtype: int");
 
-static PyObject *Operators_get_view_edges_size(BPy_Operatorsself)
+static PyObject *Operators_get_view_edges_size(BPy_Operators *self)
 {
        return PyLong_FromLong(Operators::getViewEdgesSize());
 }
@@ -638,7 +648,7 @@ PyDoc_STRVAR(Operators_get_chains_size_doc,
 "   :return: The number of Chains.\n"
 "   :rtype: int");
 
-static PyObject *Operators_get_chains_size(BPy_Operatorsself)
+static PyObject *Operators_get_chains_size(BPy_Operators *self)
 {
        return PyLong_FromLong(Operators::getChainsSize());
 }
@@ -651,7 +661,7 @@ PyDoc_STRVAR(Operators_get_strokes_size_doc,
 "   :return: The number of Strokes.\n"
 "   :rtype: int");
 
-static PyObject *Operators_get_strokes_size(BPy_Operatorsself)
+static PyObject *Operators_get_strokes_size(BPy_Operators *self)
 {
        return PyLong_FromLong(Operators::getStrokesSize());
 }
@@ -660,17 +670,26 @@ static PyObject *Operators_get_strokes_size(BPy_Operators* self)
 static PyMethodDef BPy_Operators_methods[] = {
        {"select", (PyCFunction) Operators_select, METH_VARARGS | METH_KEYWORDS | METH_STATIC, Operators_select_doc},
        {"chain", (PyCFunction) Operators_chain, METH_VARARGS | METH_KEYWORDS | METH_STATIC, Operators_chain_doc},
-       {"bidirectional_chain", (PyCFunction) Operators_bidirectional_chain, METH_VARARGS | METH_KEYWORDS | METH_STATIC, Operators_bidirectional_chain_doc},
-       {"sequential_split", (PyCFunction) Operators_sequential_split, METH_VARARGS | METH_KEYWORDS | METH_STATIC, Operators_sequential_split_doc},
-       {"recursive_split", (PyCFunction) Operators_recursive_split, METH_VARARGS | METH_KEYWORDS | METH_STATIC, Operators_recursive_split_doc},
+       {"bidirectional_chain", (PyCFunction) Operators_bidirectional_chain, METH_VARARGS | METH_KEYWORDS | METH_STATIC,
+                               Operators_bidirectional_chain_doc},
+       {"sequential_split", (PyCFunction) Operators_sequential_split, METH_VARARGS | METH_KEYWORDS | METH_STATIC,
+                            Operators_sequential_split_doc},
+       {"recursive_split", (PyCFunction) Operators_recursive_split, METH_VARARGS | METH_KEYWORDS | METH_STATIC,
+                           Operators_recursive_split_doc},
        {"sort", (PyCFunction) Operators_sort, METH_VARARGS | METH_KEYWORDS | METH_STATIC, Operators_sort_doc},
        {"create", (PyCFunction) Operators_create, METH_VARARGS | METH_KEYWORDS | METH_STATIC, Operators_create_doc},
-       {"get_viewedge_from_index", (PyCFunction) Operators_get_viewedge_from_index, METH_VARARGS | METH_KEYWORDS | METH_STATIC, Operators_get_viewedge_from_index_doc},
-       {"get_chain_from_index", (PyCFunction) Operators_get_chain_from_index, METH_VARARGS | METH_KEYWORDS | METH_STATIC, Operators_get_chain_from_index_doc},
-       {"get_stroke_from_index", (PyCFunction) Operators_get_stroke_from_index, METH_VARARGS | METH_KEYWORDS | METH_STATIC, Operators_get_stroke_from_index_doc},
-       {"get_view_edges_size", (PyCFunction) Operators_get_view_edges_size, METH_NOARGS | METH_STATIC, Operators_get_view_edges_size_doc},
-       {"get_chains_size", (PyCFunction) Operators_get_chains_size, METH_NOARGS | METH_STATIC, Operators_get_chains_size_doc},
-       {"get_strokes_size", (PyCFunction) Operators_get_strokes_size, METH_NOARGS | METH_STATIC, Operators_get_strokes_size_doc},
+       {"get_viewedge_from_index", (PyCFunction) Operators_get_viewedge_from_index,
+                                   METH_VARARGS | METH_KEYWORDS | METH_STATIC, Operators_get_viewedge_from_index_doc},
+       {"get_chain_from_index", (PyCFunction) Operators_get_chain_from_index, METH_VARARGS | METH_KEYWORDS | METH_STATIC,
+                                Operators_get_chain_from_index_doc},
+       {"get_stroke_from_index", (PyCFunction) Operators_get_stroke_from_index, METH_VARARGS | METH_KEYWORDS | METH_STATIC,
+                                 Operators_get_stroke_from_index_doc},
+       {"get_view_edges_size", (PyCFunction) Operators_get_view_edges_size, METH_NOARGS | METH_STATIC,
+                               Operators_get_view_edges_size_doc},
+       {"get_chains_size", (PyCFunction) Operators_get_chains_size, METH_NOARGS | METH_STATIC,
+                           Operators_get_chains_size_doc},
+       {"get_strokes_size", (PyCFunction) Operators_get_strokes_size, METH_NOARGS | METH_STATIC,
+                            Operators_get_strokes_size_doc},
        {NULL, NULL, 0, NULL}
 };
 
index 7d03ea06bc0930da1993dab752381a85f03fac32..4928d91b79dace9eafaf130dc457a2d91e9e8c41 100644 (file)
@@ -93,10 +93,10 @@ static void SShape_dealloc(BPy_SShape *self)
 {
        if (self->ss && !self->borrowed)
                delete self->ss;
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyObject * SShape_repr(BPy_SShape *self)
+static PyObject *SShape_repr(BPy_SShape *self)
 {
        return PyUnicode_FromFormat("SShape - address: %p", self->ss);
 }
@@ -109,7 +109,7 @@ static char SShape_add_edge_doc[] =
 "   :arg edge: An FEdge object.\n"
 "   :type edge: :class:`FEdge`\n";
 
-static PyObject * SShape_add_edge(BPy_SShape *self , PyObject *args, PyObject *kwds)
+static PyObject *SShape_add_edge(BPy_SShape *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"edge", NULL};
        PyObject *py_fe = 0;
@@ -129,7 +129,7 @@ PyDoc_STRVAR(SShape_add_vertex_doc,
 "   :arg vertex: An SVertex object.\n"
 "   :type vertex: :class:`SVertex`");
 
-static PyObject * SShape_add_vertex(BPy_SShape *self , PyObject *args, PyObject *kwds)
+static PyObject * SShape_add_vertex(BPy_SShape *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"edge", NULL};
        PyObject *py_sv = 0;
@@ -145,7 +145,7 @@ PyDoc_STRVAR(SShape_compute_bbox_doc,
 "\n"
 "   Compute the bbox of the SShape.");
 
-static PyObject * SShape_compute_bbox(BPy_SShape *self)
+static PyObject *SShape_compute_bbox(BPy_SShape *self)
 {
        self->ss->ComputeBBox();
        Py_RETURN_NONE;
@@ -223,7 +223,7 @@ static int SShape_bbox_set(BPy_SShape *self, PyObject *value, void *UNUSED(closu
                PyErr_SetString(PyExc_TypeError, "value must be a BBox");
                return -1;
        }
-       self->ss->setBBox(*(((BPy_BBox*)value)->bb));
+       self->ss->setBBox(*(((BPy_BBox *)value)->bb));
        return 0;
 }
 
index 3a5abd21d0743dff798519700282abb8b64efc1f..1547de42a918193d87a619a737ce16d65a92a9df 100644 (file)
@@ -135,22 +135,19 @@ static int StrokeAttribute_init(BPy_StrokeAttribute *self, PyObject *args, PyObj
        return 0;
 }
 
-static void StrokeAttribute_dealloc(BPy_StrokeAttributeself)
+static void StrokeAttribute_dealloc(BPy_StrokeAttribute *self)
 {
        if (self->sa && !self->borrowed)
                delete self->sa;
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyObject * StrokeAttribute_repr(BPy_StrokeAttributeself)
+static PyObject * StrokeAttribute_repr(BPy_StrokeAttribute *self)
 {
        stringstream repr("StrokeAttribute:");
-       repr << " r: " << self->sa->getColorR()
-                << " g: " << self->sa->getColorG()
-                << " b: " << self->sa->getColorB()
-                << " a: " << self->sa->getAlpha()
-                << " - R: " << self->sa->getThicknessR() 
-                << " L: " << self->sa->getThicknessL();
+       repr << " r: " << self->sa->getColorR() << " g: " << self->sa->getColorG() << " b: " << self->sa->getColorB() <<
+               " a: " << self->sa->getAlpha() <<
+               " - R: " << self->sa->getThicknessR()  << " L: " << self->sa->getThicknessL();
 
        return PyUnicode_FromString(repr.str().c_str());
 }
@@ -365,15 +362,24 @@ static PyObject * StrokeAttribute_set_attribute_vec3(BPy_StrokeAttribute *self,
 }
 
 static PyMethodDef BPy_StrokeAttribute_methods[] = {
-       {"get_attribute_real", (PyCFunction) StrokeAttribute_get_attribute_real, METH_VARARGS | METH_KEYWORDS, StrokeAttribute_get_attribute_real_doc},
-       {"get_attribute_vec2", (PyCFunction) StrokeAttribute_get_attribute_vec2, METH_VARARGS | METH_KEYWORDS, StrokeAttribute_get_attribute_vec2_doc},
-       {"get_attribute_vec3", (PyCFunction) StrokeAttribute_get_attribute_vec3, METH_VARARGS | METH_KEYWORDS, StrokeAttribute_get_attribute_vec3_doc},
-       {"has_attribute_real", (PyCFunction) StrokeAttribute_has_attribute_real, METH_VARARGS | METH_KEYWORDS, StrokeAttribute_has_attribute_real_doc},
-       {"has_attribute_vec2", (PyCFunction) StrokeAttribute_has_attribute_vec2, METH_VARARGS | METH_KEYWORDS, StrokeAttribute_has_attribute_vec2_doc},
-       {"has_attribute_vec3", (PyCFunction) StrokeAttribute_has_attribute_vec3, METH_VARARGS | METH_KEYWORDS, StrokeAttribute_has_attribute_vec3_doc},
-       {"set_attribute_real", (PyCFunction) StrokeAttribute_set_attribute_real, METH_VARARGS | METH_KEYWORDS, StrokeAttribute_set_attribute_real_doc},
-       {"set_attribute_vec2", (PyCFunction) StrokeAttribute_set_attribute_vec2, METH_VARARGS | METH_KEYWORDS, StrokeAttribute_set_attribute_vec2_doc},
-       {"set_attribute_vec3", (PyCFunction) StrokeAttribute_set_attribute_vec3, METH_VARARGS | METH_KEYWORDS, StrokeAttribute_set_attribute_vec3_doc},
+       {"get_attribute_real", (PyCFunction) StrokeAttribute_get_attribute_real, METH_VARARGS | METH_KEYWORDS,
+                              StrokeAttribute_get_attribute_real_doc},
+       {"get_attribute_vec2", (PyCFunction) StrokeAttribute_get_attribute_vec2, METH_VARARGS | METH_KEYWORDS,
+                              StrokeAttribute_get_attribute_vec2_doc},
+       {"get_attribute_vec3", (PyCFunction) StrokeAttribute_get_attribute_vec3, METH_VARARGS | METH_KEYWORDS,
+                              StrokeAttribute_get_attribute_vec3_doc},
+       {"has_attribute_real", (PyCFunction) StrokeAttribute_has_attribute_real, METH_VARARGS | METH_KEYWORDS,
+                              StrokeAttribute_has_attribute_real_doc},
+       {"has_attribute_vec2", (PyCFunction) StrokeAttribute_has_attribute_vec2, METH_VARARGS | METH_KEYWORDS,
+                              StrokeAttribute_has_attribute_vec2_doc},
+       {"has_attribute_vec3", (PyCFunction) StrokeAttribute_has_attribute_vec3, METH_VARARGS | METH_KEYWORDS,
+                              StrokeAttribute_has_attribute_vec3_doc},
+       {"set_attribute_real", (PyCFunction) StrokeAttribute_set_attribute_real, METH_VARARGS | METH_KEYWORDS,
+                              StrokeAttribute_set_attribute_real_doc},
+       {"set_attribute_vec2", (PyCFunction) StrokeAttribute_set_attribute_vec2, METH_VARARGS | METH_KEYWORDS,
+                              StrokeAttribute_set_attribute_vec2_doc},
+       {"set_attribute_vec3", (PyCFunction) StrokeAttribute_set_attribute_vec3, METH_VARARGS | METH_KEYWORDS,
+                              StrokeAttribute_set_attribute_vec3_doc},
        {NULL, NULL, 0, NULL}
 };
 
@@ -545,7 +551,8 @@ PyDoc_STRVAR(StrokeAttribute_thickness_doc,
 
 static PyObject *StrokeAttribute_thickness_get(BPy_StrokeAttribute *self, void *UNUSED(closure))
 {
-       return Vector_CreatePyObject_cb((PyObject *)self, 2, StrokeAttribute_mathutils_cb_index, MATHUTILS_SUBTYPE_THICKNESS);
+       return Vector_CreatePyObject_cb((PyObject *)self, 2, StrokeAttribute_mathutils_cb_index,
+                                       MATHUTILS_SUBTYPE_THICKNESS);
 }
 
 static int StrokeAttribute_thickness_set(BPy_StrokeAttribute *self, PyObject *value, void *UNUSED(closure))
@@ -580,10 +587,14 @@ static int StrokeAttribute_visible_set(BPy_StrokeAttribute *self, PyObject *valu
 }
 
 static PyGetSetDef BPy_StrokeAttribute_getseters[] = {
-       {(char *)"alpha", (getter)StrokeAttribute_alpha_get, (setter)StrokeAttribute_alpha_set, (char *)StrokeAttribute_alpha_doc, NULL},
-       {(char *)"color", (getter)StrokeAttribute_color_get, (setter)StrokeAttribute_color_set, (char *)StrokeAttribute_color_doc, NULL},
-       {(char *)"thickness", (getter)StrokeAttribute_thickness_get, (setter)StrokeAttribute_thickness_set, (char *)StrokeAttribute_thickness_doc, NULL},
-       {(char *)"visible", (getter)StrokeAttribute_visible_get, (setter)StrokeAttribute_visible_set, (char *)StrokeAttribute_visible_doc, NULL},
+       {(char *)"alpha", (getter)StrokeAttribute_alpha_get, (setter)StrokeAttribute_alpha_set,
+                         (char *)StrokeAttribute_alpha_doc, NULL},
+       {(char *)"color", (getter)StrokeAttribute_color_get, (setter)StrokeAttribute_color_set,
+                         (char *)StrokeAttribute_color_doc, NULL},
+       {(char *)"thickness", (getter)StrokeAttribute_thickness_get, (setter)StrokeAttribute_thickness_set,
+                             (char *)StrokeAttribute_thickness_doc, NULL},
+       {(char *)"visible", (getter)StrokeAttribute_visible_get, (setter)StrokeAttribute_visible_set,
+                           (char *)StrokeAttribute_visible_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
 };
 
index e2fd56734c55fb6a283bd6a0ac5bcc803db77ff3..bc77e8668dd8cce694d8f57d5dae2a8285aea1fc 100644 (file)
@@ -112,7 +112,8 @@ int StrokeShader_Init(PyObject *module)
        if (PyType_Ready(&ConstrainedIncreasingThicknessShader_Type) < 0)
                return -1;
        Py_INCREF(&ConstrainedIncreasingThicknessShader_Type);
-       PyModule_AddObject(module, "ConstrainedIncreasingThicknessShader", (PyObject *)&ConstrainedIncreasingThicknessShader_Type);
+       PyModule_AddObject(module, "ConstrainedIncreasingThicknessShader",
+                          (PyObject *)&ConstrainedIncreasingThicknessShader_Type);
 
        if (PyType_Ready(&fstreamShader_Type) < 0)
                return -1;
@@ -219,14 +220,14 @@ static int StrokeShader___init__(BPy_StrokeShader *self, PyObject *args, PyObjec
        return 0;
 }
 
-static void StrokeShader___dealloc__(BPy_StrokeShaderself)
+static void StrokeShader___dealloc__(BPy_StrokeShader *self)
 {
        if (self->ss)
                delete self->ss;
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyObject * StrokeShader___repr__(BPy_StrokeShader* self)
+static PyObject *StrokeShader___repr__(BPy_StrokeShader *self)
 {
        return PyUnicode_FromFormat("type: %s - address: %p", Py_TYPE(self)->tp_name, self->ss);
 }
index 89439995c71296cc5a4ff2e9a7dbaef490edafc5..d6d6f3189f9e53491f9788570fbd92742ddcb5e8 100644 (file)
@@ -95,12 +95,12 @@ static char UnaryFunction0D___doc__[] =
 "* :class:`UnaryFunction0DVectorViewShape`\n"
 "* :class:`UnaryFunction0DViewShape`\n";
 
-static void UnaryFunction0D___dealloc__(BPy_UnaryFunction0Dself)
+static void UnaryFunction0D___dealloc__(BPy_UnaryFunction0D *self)
 {
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyObject * UnaryFunction0D___repr__(BPy_UnaryFunction0D* self)
+static PyObject *UnaryFunction0D___repr__(BPy_UnaryFunction0D *self)
 {
        return PyUnicode_FromString("UnaryFunction0D");
 }
index 92b17f5374211e7476e909023e585dd9b2b12580..231769dede0cdb5fd4f30549da9e446e1d16153a 100644 (file)
@@ -89,12 +89,12 @@ static char UnaryFunction1D___doc__[] =
 "* :class:`UnaryFunction1DVectorViewShape`\n"
 "* :class:`UnaryFunction1DVoid`\n";
 
-static void UnaryFunction1D___dealloc__(BPy_UnaryFunction1Dself)
+static void UnaryFunction1D___dealloc__(BPy_UnaryFunction1D *self)
 {
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyObject * UnaryFunction1D___repr__(BPy_UnaryFunction1D* self)
+static PyObject *UnaryFunction1D___repr__(BPy_UnaryFunction1D *self)
 {
        return PyUnicode_FromString("UnaryFunction1D");
 }
index f5ee407152314770b1b15a955d01976a1279fe64..18383a1d17beba97a1d0858d747cab12a7eb2898 100644 (file)
@@ -101,19 +101,19 @@ static int UnaryPredicate0D___init__(BPy_UnaryPredicate0D *self, PyObject *args,
        return 0;
 }
 
-static void UnaryPredicate0D___dealloc__(BPy_UnaryPredicate0Dself)
+static void UnaryPredicate0D___dealloc__(BPy_UnaryPredicate0D *self)
 {
        if (self->up0D)
                delete self->up0D;
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyObject * UnaryPredicate0D___repr__(BPy_UnaryPredicate0D* self)
+static PyObject *UnaryPredicate0D___repr__(BPy_UnaryPredicate0D *self)
 {
        return PyUnicode_FromFormat("type: %s - address: %p", Py_TYPE(self)->tp_name, self->up0D);
 }
 
-static PyObject * UnaryPredicate0D___call__(BPy_UnaryPredicate0D *self, PyObject *args, PyObject *kwds)
+static PyObject *UnaryPredicate0D___call__(BPy_UnaryPredicate0D *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"it", NULL};
        PyObject *py_if0D_it;
index 3f0464db93a7af3b02f9db5f71cf5e789148e9a8..fe61d0cd3c3bc5e0af8bef2a1322db7729680eaf 100644 (file)
@@ -149,19 +149,19 @@ static int UnaryPredicate1D___init__(BPy_UnaryPredicate1D *self, PyObject *args,
        return 0;
 }
 
-static void UnaryPredicate1D___dealloc__(BPy_UnaryPredicate1Dself)
+static void UnaryPredicate1D___dealloc__(BPy_UnaryPredicate1D *self)
 {
        if (self->up1D)
                delete self->up1D;
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyObject * UnaryPredicate1D___repr__(BPy_UnaryPredicate1D* self)
+static PyObject *UnaryPredicate1D___repr__(BPy_UnaryPredicate1D *self)
 {
        return PyUnicode_FromFormat("type: %s - address: %p", Py_TYPE(self)->tp_name, self->up1D);
 }
 
-static PyObject * UnaryPredicate1D___call__(BPy_UnaryPredicate1D *self, PyObject *args, PyObject *kwds)
+static PyObject *UnaryPredicate1D___call__(BPy_UnaryPredicate1D *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"inter", NULL};
        PyObject *py_if1D;
index 46aad0d788cc27571a5e28b34f82f50d0b0be1fa..a5f837b0c03065c4e3ecce38e416d68df8f1dcd9 100644 (file)
@@ -79,10 +79,10 @@ static void ViewMap_dealloc(BPy_ViewMap *self)
 {
        if (self->vm)
                delete self->vm;
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyObject * ViewMap_repr(BPy_ViewMap *self)
+static PyObject *ViewMap_repr(BPy_ViewMap *self)
 {
        return PyUnicode_FromFormat("ViewMap - address: %p", self->vm);
 }
@@ -99,14 +99,14 @@ PyDoc_STRVAR(ViewMap_get_closest_viewedge_doc,
 "   :return: The ViewEdge nearest to the specified 2D point.\n"
 "   :rtype: :class:`ViewEdge`");
 
-static PyObject * ViewMap_get_closest_viewedge(BPy_ViewMap *self , PyObject *args, PyObject *kwds)
+static PyObject *ViewMap_get_closest_viewedge(BPy_ViewMap *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"x", "y", NULL};
        double x, y;
 
        if (!PyArg_ParseTupleAndKeywords(args, kwds, "dd", (char **)kwlist, &x, &y))
                return NULL;
-       ViewEdge *ve = const_cast<ViewEdge *>(self->vm->getClosestViewEdge(x,y));
+       ViewEdge *ve = const_cast<ViewEdge *>(self->vm->getClosestViewEdge(x, y));
        if (ve)
                return BPy_ViewEdge_from_ViewEdge(*ve);
        Py_RETURN_NONE;
@@ -124,14 +124,14 @@ PyDoc_STRVAR(ViewMap_get_closest_fedge_doc,
 "   :return: The FEdge nearest to the specified 2D point.\n"
 "   :rtype: :class:`FEdge`");
 
-static PyObject * ViewMap_get_closest_fedge(BPy_ViewMap *self , PyObject *args, PyObject *kwds)
+static PyObject *ViewMap_get_closest_fedge(BPy_ViewMap *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"x", "y", NULL};
        double x, y;
 
        if (!PyArg_ParseTupleAndKeywords(args, kwds, "dd", (char **)kwlist, &x, &y))
                return NULL;
-       FEdge *fe = const_cast<FEdge *>(self->vm->getClosestFEdge(x,y));
+       FEdge *fe = const_cast<FEdge *>(self->vm->getClosestFEdge(x, y));
        if (fe)
                return Any_BPy_FEdge_from_FEdge(*fe);
        Py_RETURN_NONE;
@@ -140,8 +140,10 @@ static PyObject * ViewMap_get_closest_fedge(BPy_ViewMap *self , PyObject *args,
 // static ViewMap *getInstance ();
 
 static PyMethodDef BPy_ViewMap_methods[] = {
-       {"get_closest_viewedge", (PyCFunction)ViewMap_get_closest_viewedge, METH_VARARGS | METH_KEYWORDS, ViewMap_get_closest_viewedge_doc},
-       {"get_closest_fedge", (PyCFunction)ViewMap_get_closest_fedge, METH_VARARGS | METH_KEYWORDS, ViewMap_get_closest_fedge_doc},
+       {"get_closest_viewedge", (PyCFunction)ViewMap_get_closest_viewedge, METH_VARARGS | METH_KEYWORDS,
+                                ViewMap_get_closest_viewedge_doc},
+       {"get_closest_fedge", (PyCFunction)ViewMap_get_closest_fedge, METH_VARARGS | METH_KEYWORDS,
+                             ViewMap_get_closest_fedge_doc},
        {NULL, NULL, 0, NULL}
 };
 
@@ -168,7 +170,8 @@ static int ViewMap_scene_bbox_set(BPy_ViewMap *self, PyObject *value, void *UNUS
 }
 
 static PyGetSetDef BPy_ViewMap_getseters[] = {
-       {(char *)"scene_bbox", (getter)ViewMap_scene_bbox_get, (setter)ViewMap_scene_bbox_set, (char *)ViewMap_scene_bbox_doc, NULL},
+       {(char *)"scene_bbox", (getter)ViewMap_scene_bbox_get, (setter)ViewMap_scene_bbox_set,
+                              (char *)ViewMap_scene_bbox_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
 };
 
index fdb2a695456f1fbcee1071f321a763b298528351..a921bf5aed6f891113b352d7bd23e307976c98e1 100644 (file)
@@ -91,7 +91,8 @@ static int ViewShape_init(BPy_ViewShape *self, PyObject *args, PyObject *kwds)
                if (!obj) {
                        self->vs = new ViewShape();
                        self->py_ss = NULL;
-               } else {
+               }
+               else {
                        self->vs = new ViewShape(*(((BPy_ViewShape *)obj)->vs));
                        self->py_ss = ((BPy_ViewShape *)obj)->py_ss;
                }
@@ -115,15 +116,15 @@ static int ViewShape_init(BPy_ViewShape *self, PyObject *args, PyObject *kwds)
 static void ViewShape_dealloc(BPy_ViewShape *self)
 {
        if (self->py_ss) {
-               self->vs->setSShape((SShape *)0);
+               self->vs->setSShape((SShape *)NULL);
                Py_DECREF(self->py_ss);
        }
        if (self->vs && !self->borrowed)
                delete self->vs;
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyObject * ViewShape_repr(BPy_ViewShape *self)
+static PyObject *ViewShape_repr(BPy_ViewShape *self)
 {
        return PyUnicode_FromFormat("ViewShape - address: %p", self->vs);
 }
@@ -136,7 +137,7 @@ PyDoc_STRVAR(ViewShape_add_edge_doc,
 "   :arg edge: A ViewEdge object.\n"
 "   :type edge: :class:`ViewEdge`\n");
 
-static PyObject * ViewShape_add_edge(BPy_ViewShape *self, PyObject *args, PyObject *kwds)
+static PyObject *ViewShape_add_edge(BPy_ViewShape *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"edge", NULL};
        PyObject *py_ve = 0;
@@ -155,7 +156,7 @@ PyDoc_STRVAR(ViewShape_add_vertex_doc,
 "   :arg vertex: A ViewVertex object.\n"
 "   :type vertex: :class:`ViewVertex`");
 
-static PyObject * ViewShape_add_vertex(BPy_ViewShape *self, PyObject *args, PyObject *kwds)
+static PyObject *ViewShape_add_vertex(BPy_ViewShape *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"vertex", NULL};
        PyObject *py_vv = 0;
@@ -215,8 +216,8 @@ static PyObject *ViewShape_vertices_get(BPy_ViewShape *self, void *UNUSED(closur
 {
        PyObject *py_vertices = PyList_New(0);
 
-       vector< ViewVertex * > vertices = self->vs->vertices();
-       vector< ViewVertex * >::iterator it;
+       vector<ViewVertex *> vertices = self->vs->vertices();
+       vector<ViewVertex *>::iterator it;
        for (it = vertices.begin(); it != vertices.end(); it++) {
                PyList_Append( py_vertices, Any_BPy_ViewVertex_from_ViewVertex(*(*it)));
        }
@@ -237,7 +238,8 @@ static int ViewShape_vertices_set(BPy_ViewShape *self, PyObject *value, void *UN
                item = PyList_GetItem(list, i);
                if (BPy_ViewVertex_Check(item)) {
                        v.push_back(((BPy_ViewVertex *)item)->vv);
-               } else {
+               }
+               else {
                        PyErr_SetString(PyExc_TypeError, "value must be a list of ViewVertex objects");
                        return -1;
                }
@@ -255,8 +257,8 @@ static PyObject *ViewShape_edges_get(BPy_ViewShape *self, void *UNUSED(closure))
 {
        PyObject *py_edges = PyList_New(0);
 
-       vector< ViewEdge * > edges = self->vs->edges();
-       vector< ViewEdge * >::iterator it;
+       vector<ViewEdge *> edges = self->vs->edges();
+       vector<ViewEdge *>::iterator it;
 
        for (it = edges.begin(); it != edges.end(); it++) {
                PyList_Append(py_edges, BPy_ViewEdge_from_ViewEdge(*(*it)));
@@ -278,7 +280,8 @@ static int ViewShape_edges_set(BPy_ViewShape *self, PyObject *value, void *UNUSE
                item = PyList_GetItem(list, i);
                if (BPy_ViewEdge_Check(item)) {
                        v.push_back(((BPy_ViewEdge *)item)->ve);
-               } else {
+               }
+               else {
                        PyErr_SetString(PyExc_TypeError, "argument must be list of ViewEdge objects");
                        return -1;
                }
@@ -310,7 +313,8 @@ static PyObject *ViewShape_id_get(BPy_ViewShape *self, void *UNUSED(closure))
 
 static PyGetSetDef BPy_ViewShape_getseters[] = {
        {(char *)"sshape", (getter)ViewShape_sshape_get, (setter)ViewShape_sshape_set, (char *)ViewShape_sshape_doc, NULL},
-       {(char *)"vertices", (getter)ViewShape_vertices_get, (setter)ViewShape_vertices_set, (char *)ViewShape_vertices_doc, NULL},
+       {(char *)"vertices", (getter)ViewShape_vertices_get, (setter)ViewShape_vertices_set,
+                            (char *)ViewShape_vertices_doc, NULL},
        {(char *)"edges", (getter)ViewShape_edges_get, (setter)ViewShape_edges_set, (char *)ViewShape_edges_doc, NULL},
        {(char *)"name", (getter)ViewShape_name_get, (setter)NULL, (char *)ViewShape_name_doc, NULL},
        {(char *)"id", (getter)ViewShape_id_get, (setter)NULL, (char *)ViewShape_id_doc, NULL},
index e034b48f06a2c765a878af59e5153e207ad1fa5b..9fcc8d4a69136448b94ab78e05244bf0e2164fe6 100644 (file)
@@ -53,7 +53,7 @@ static char FalseBP1D___doc__[] =
 "   :return: False.\n"
 "   :rtype: bool\n";
 
-static int FalseBP1D___init__(BPy_FalseBP1Dself, PyObject *args, PyObject *kwds)
+static int FalseBP1D___init__(BPy_FalseBP1D *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {NULL};
 
index 73d878cf90ef18a187bfa88613980138da7beaf4..6dd8919f4029e02e0827ef5a533b062b08116dc4 100644 (file)
@@ -54,7 +54,7 @@ static char Length2DBP1D___doc__[] =
 "   :return: True or false.\n"
 "   :rtype: bool\n";
 
-static int Length2DBP1D___init__(BPy_Length2DBP1Dself, PyObject *args, PyObject *kwds)
+static int Length2DBP1D___init__(BPy_Length2DBP1D *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {NULL};
 
index a2e9b2ac1122c873896008d33fe8ef149b04991a..5d991d50ae124d285edd708529243904adaedae4 100644 (file)
@@ -53,7 +53,7 @@ static char SameShapeIdBP1D___doc__[] =
 "   :return: True or false.\n"
 "   :rtype: bool\n";
 
-static int SameShapeIdBP1D___init__(BPy_SameShapeIdBP1Dself, PyObject *args, PyObject *kwds)
+static int SameShapeIdBP1D___init__(BPy_SameShapeIdBP1D *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {NULL};
 
index c56b8556d1dc968db1b67fdcf9217bdbcc8a300e..9063e407056d9f568c6bb5346ee7035619a1e7f5 100644 (file)
@@ -53,7 +53,7 @@ static char TrueBP1D___doc__[] =
 "   :return: True.\n"
 "   :rtype: bool\n";
 
-static int TrueBP1D___init__(BPy_TrueBP1Dself, PyObject *args, PyObject *kwds)
+static int TrueBP1D___init__(BPy_TrueBP1D *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {NULL};
 
index 9901a60b94eaacfc3961e43312c8b0d675b8f72d..a3ebf88b58a2909d46834d018270e18c982d6350 100644 (file)
@@ -75,7 +75,7 @@ static char ViewMapGradientNormBP1D___doc__[] =
 "   :return: True or false.\n"
 "   :rtype: bool\n";
 
-static int ViewMapGradientNormBP1D___init__(BPy_ViewMapGradientNormBP1Dself, PyObject *args, PyObject *kwds)
+static int ViewMapGradientNormBP1D___init__(BPy_ViewMapGradientNormBP1D *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"level", "integration_type", "sampling", NULL};
        PyObject *obj = 0;
index 70eba3e2bc089ba43cf9b60208e6f528574df954..cb5e59f146d370d122c585d4bb7468edbceb6cbe 100644 (file)
@@ -44,7 +44,8 @@ extern "C" {
 
 extern PyTypeObject ViewMapGradientNormBP1D_Type;
 
-#define BPy_ViewMapGradientNormBP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ViewMapGradientNormBP1D_Type))
+#define BPy_ViewMapGradientNormBP1D_Check(v) \
+            (PyObject_IsInstance((PyObject *)v, (PyObject *)&ViewMapGradientNormBP1D_Type))
 
 /*---------------------------Python BPy_ViewMapGradientNormBP1D structure definition----------*/
 typedef struct {
index 0746f0a8cf97dfe972d5f5455f4eb1ed991f33b9..04442ae0e3736ea60fc6afbbd385c41b4b18f0c8 100644 (file)
@@ -212,9 +212,11 @@ int Director_BPy_ChainingIterator_traverse(ChainingIterator *c_it, AdjacencyIter
                return -1;
        if (BPy_ViewEdge_Check(result)) {
                c_it->result = ((BPy_ViewEdge *)result)->ve;
-       } else if (result == Py_None) {
+       }
+       else if (result == Py_None) {
                c_it->result = NULL;
-       } else {
+       }
+       else {
                PyErr_SetString(PyExc_RuntimeError, "traverse method returned a wrong value");
                Py_DECREF(result);
                return -1;
@@ -267,7 +269,7 @@ int Director_BPy_UnaryFunction0D___call__(void *uf0D, PyObject *obj, Interface0D
        }
        else if (BPy_UnaryFunction0DVectorViewShape_Check(obj)) {
                vector<ViewShape*> vec;
-               for(int i = 0; i < PyList_Size(result); i++) {
+               for (int i = 0; i < PyList_Size(result); i++) {
                        ViewShape *b = ((BPy_ViewShape *)PyList_GetItem(result, i))->vs;
                        vec.push_back(b);
                }
@@ -317,7 +319,7 @@ int Director_BPy_UnaryFunction1D___call__(void *uf1D, PyObject *obj, Interface1D
        }
        else if (BPy_UnaryFunction1DVectorViewShape_Check(obj)) {
                vector<ViewShape*> vec;
-               for(int i = 1; i < PyList_Size(result); i++) {
+               for (int i = 1; i < PyList_Size(result); i++) {
                        ViewShape *b = ((BPy_ViewShape *)PyList_GetItem(result, i))->vs;
                        vec.push_back(b);
                }
index 4f49a8d0b708a0c7a24549a7dc97cd033f609566..4365aa123e9ba2799d29c50413b8390010b98206 100644 (file)
@@ -219,10 +219,13 @@ static PyObject *CurvePoint_curvature_fredo_get(BPy_CurvePoint *self, void *UNUS
 // todo - CurvePoint.directionFredo()
 
 static PyGetSetDef BPy_CurvePoint_getseters[] = {
-       {(char *)"first_svertex", (getter)CurvePoint_first_svertex_get, (setter)CurvePoint_first_svertex_set, (char *)CurvePoint_first_svertex_doc, NULL},
-       {(char *)"second_svertex", (getter)CurvePoint_second_svertex_get, (setter)CurvePoint_second_svertex_set, (char *)CurvePoint_second_svertex_doc, NULL},
+       {(char *)"first_svertex", (getter)CurvePoint_first_svertex_get, (setter)CurvePoint_first_svertex_set,
+                                 (char *)CurvePoint_first_svertex_doc, NULL},
+       {(char *)"second_svertex", (getter)CurvePoint_second_svertex_get, (setter)CurvePoint_second_svertex_set,
+                                  (char *)CurvePoint_second_svertex_doc, NULL},
        {(char *)"t2d", (getter)CurvePoint_t2d_get, (setter)CurvePoint_t2d_set, (char *)CurvePoint_t2d_doc, NULL},
-       {(char *)"curvature_fredo", (getter)CurvePoint_curvature_fredo_get, (setter)NULL, (char *)CurvePoint_curvature_fredo_doc, NULL},
+       {(char *)"curvature_fredo", (getter)CurvePoint_curvature_fredo_get, (setter)NULL,
+                                   (char *)CurvePoint_curvature_fredo_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
 };
 
index 072a602cf29a83d45a36da142d65f57278411103..ae0e1d36143d6c9abee4b4e319fa50fd34edb445 100644 (file)
@@ -110,7 +110,7 @@ PyDoc_STRVAR(SVertex_add_normal_doc,
 "   :arg normal: A three-dimensional vector.\n"
 "   :type normal: :class:`mathutils.Vector`, list or tuple of 3 real numbers");
 
-static PyObject *SVertex_add_normal(BPy_SVertex *self , PyObject *args, PyObject *kwds)
+static PyObject *SVertex_add_normal(BPy_SVertex *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"normal", NULL};
        PyObject *py_normal;
@@ -136,7 +136,7 @@ PyDoc_STRVAR(SVertex_add_fedge_doc,
 "   :arg fedge: An FEdge.\n"
 "   :type fedge: :class:`FEdge`");
 
-static PyObject *SVertex_add_fedge(BPy_SVertex *self , PyObject *args, PyObject *kwds)
+static PyObject *SVertex_add_fedge(BPy_SVertex *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"fedge", NULL};
        PyObject *py_fe;
@@ -421,8 +421,10 @@ static PyObject *SVertex_curvatures_get(BPy_SVertex *self, void *UNUSED(closure)
 }
 
 static PyGetSetDef BPy_SVertex_getseters[] = {
-       {(char *)"point_3d", (getter)SVertex_point_3d_get, (setter)SVertex_point_3d_set, (char *)SVertex_point_3d_doc, NULL},
-       {(char *)"point_2d", (getter)SVertex_point_2d_get, (setter)SVertex_point_2d_set, (char *)SVertex_point_2d_doc, NULL},
+       {(char *)"point_3d", (getter)SVertex_point_3d_get, (setter)SVertex_point_3d_set,
+                            (char *)SVertex_point_3d_doc, NULL},
+       {(char *)"point_2d", (getter)SVertex_point_2d_get, (setter)SVertex_point_2d_set,
+                            (char *)SVertex_point_2d_doc, NULL},
        {(char *)"id", (getter)SVertex_id_get, (setter)SVertex_id_set, (char *)SVertex_id_doc, NULL},
        {(char *)"normals", (getter)SVertex_normals_get, (setter)NULL, (char *)SVertex_normals_doc, NULL},
        {(char *)"normals_size", (getter)SVertex_normals_size_get, (setter)NULL, (char *)SVertex_normals_size_doc, NULL},
index 1e5f70144c18a74309968574a283a7e4df2aff51..d425105aa9d57b86370676893a646bfa881545b9 100644 (file)
@@ -74,7 +74,7 @@ PyDoc_STRVAR(ViewVertex_edges_begin_doc,
 "   :return: An orientedViewEdgeIterator pointing to the first ViewEdge.\n"
 "   :rtype: :class:`orientedViewEdgeIterator`");
 
-static PyObject * ViewVertex_edges_begin(BPy_ViewVertex *self)
+static PyObject *ViewVertex_edges_begin(BPy_ViewVertex *self)
 {
        ViewVertexInternal::orientedViewEdgeIterator ove_it(self->vv->edgesBegin());
        return BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator(ove_it, 0);
@@ -89,7 +89,7 @@ PyDoc_STRVAR(ViewVertex_edges_end_doc,
 "   :return: An orientedViewEdgeIterator pointing after the last ViewEdge.\n"
 "   :rtype: :class:`orientedViewEdgeIterator`");
 
-static PyObject * ViewVertex_edges_end(BPy_ViewVertex *self)
+static PyObject *ViewVertex_edges_end(BPy_ViewVertex *self)
 {
 #if 0
        ViewVertexInternal::orientedViewEdgeIterator ove_it(self->vv->edgesEnd());
@@ -111,7 +111,7 @@ PyDoc_STRVAR(ViewVertex_edges_iterator_doc,
 "   :return: An orientedViewEdgeIterator pointing to the given ViewEdge.\n"
 "   :rtype: :class:`orientedViewEdgeIterator`");
 
-static PyObject * ViewVertex_edges_iterator(BPy_ViewVertex *self, PyObject *args, PyObject *kwds)
+static PyObject *ViewVertex_edges_iterator(BPy_ViewVertex *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"edge", NULL};
        PyObject *py_ve;
@@ -126,7 +126,8 @@ static PyObject * ViewVertex_edges_iterator(BPy_ViewVertex *self, PyObject *args
 static PyMethodDef BPy_ViewVertex_methods[] = {
        {"edges_begin", (PyCFunction)ViewVertex_edges_begin, METH_NOARGS, ViewVertex_edges_begin_doc},
        {"edges_end", (PyCFunction)ViewVertex_edges_end, METH_NOARGS, ViewVertex_edges_end_doc},
-       {"edges_iterator", (PyCFunction)ViewVertex_edges_iterator, METH_VARARGS | METH_KEYWORDS, ViewVertex_edges_iterator_doc},
+       {"edges_iterator", (PyCFunction)ViewVertex_edges_iterator, METH_VARARGS | METH_KEYWORDS,
+                          ViewVertex_edges_iterator_doc},
        {NULL, NULL, 0, NULL}
 };
 
@@ -156,7 +157,8 @@ static int ViewVertex_nature_set(BPy_ViewVertex *self, PyObject *value, void *UN
 }
 
 static PyGetSetDef BPy_ViewVertex_getseters[] = {
-       {(char *)"nature", (getter)ViewVertex_nature_get, (setter)ViewVertex_nature_set, (char *)ViewVertex_nature_doc, NULL},
+       {(char *)"nature", (getter)ViewVertex_nature_get, (setter)ViewVertex_nature_set,
+                          (char *)ViewVertex_nature_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
 };
 
index 6475a09cb132847dfe5902adab51019163aaa06c..590716e1a76353edadb21d97e4402df00d61c652 100644 (file)
@@ -326,10 +326,15 @@ static PyObject *StrokeVertex_u_get(BPy_StrokeVertex *self, void *UNUSED(closure
 }
 
 static PyGetSetDef BPy_StrokeVertex_getseters[] = {
-       {(char *)"attribute", (getter)StrokeVertex_attribute_get, (setter)StrokeVertex_attribute_set, (char *)StrokeVertex_attribute_doc, NULL},
-       {(char *)"curvilinear_abscissa", (getter)StrokeVertex_curvilinear_abscissa_get, (setter)StrokeVertex_curvilinear_abscissa_set, (char *)StrokeVertex_curvilinear_abscissa_doc, NULL},
-       {(char *)"point", (getter)StrokeVertex_point_get, (setter)StrokeVertex_point_set, (char *)StrokeVertex_point_doc, NULL},
-       {(char *)"stroke_length", (getter)StrokeVertex_stroke_length_get, (setter)StrokeVertex_stroke_length_set, (char *)StrokeVertex_stroke_length_doc, NULL},
+       {(char *)"attribute", (getter)StrokeVertex_attribute_get, (setter)StrokeVertex_attribute_set,
+                             (char *)StrokeVertex_attribute_doc, NULL},
+       {(char *)"curvilinear_abscissa", (getter)StrokeVertex_curvilinear_abscissa_get,
+                                        (setter)StrokeVertex_curvilinear_abscissa_set,
+                                        (char *)StrokeVertex_curvilinear_abscissa_doc, NULL},
+       {(char *)"point", (getter)StrokeVertex_point_get, (setter)StrokeVertex_point_set,
+                         (char *)StrokeVertex_point_doc, NULL},
+       {(char *)"stroke_length", (getter)StrokeVertex_stroke_length_get, (setter)StrokeVertex_stroke_length_set,
+                                 (char *)StrokeVertex_stroke_length_doc, NULL},
        {(char *)"u", (getter)StrokeVertex_u_get, (setter)NULL, (char *)StrokeVertex_u_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
 };
index a4bfcab78e860cd7a087556876bb535f8ecd7ef1..8fd4425b291d112ae020380591b5418fb4244788 100644 (file)
@@ -104,7 +104,8 @@ static int NonTVertex_svertex_set(BPy_NonTVertex *self, PyObject *value, void *U
 }
 
 static PyGetSetDef BPy_NonTVertex_getseters[] = {
-       {(char *)"svertex", (getter)NonTVertex_svertex_get, (setter)NonTVertex_svertex_set, (char *)NonTVertex_svertex_doc, NULL},
+       {(char *)"svertex", (getter)NonTVertex_svertex_get, (setter)NonTVertex_svertex_set,
+                           (char *)NonTVertex_svertex_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
 };
 
index e6285371c77a409ad77e107caf95984971473fe3..e9295f323fbc7a858cd2ab12506fd6b6a3ae2f1b 100644 (file)
@@ -83,7 +83,7 @@ PyDoc_STRVAR(TVertex_get_svertex_doc,
 "   :return: The SVertex belonging to the given FEdge.\n"
 "   :rtype: :class:`SVertex`");
 
-static PyObject * TVertex_get_svertex( BPy_TVertex *self, PyObject *args, PyObject *kwds)
+static PyObject *TVertex_get_svertex( BPy_TVertex *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"fedge", NULL};
        PyObject *py_fe;
@@ -108,7 +108,7 @@ PyDoc_STRVAR(TVertex_get_mate_doc,
 "   :return: The mate edge of the given ViewEdge.\n"
 "   :rtype: :class:`ViewEdge`");
 
-static PyObject * TVertex_get_mate( BPy_TVertex *self, PyObject *args, PyObject *kwds)
+static PyObject *TVertex_get_mate( BPy_TVertex *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"viewedge", NULL};
        PyObject *py_ve;
@@ -197,8 +197,10 @@ static int TVertex_id_set(BPy_TVertex *self, PyObject *value, void *UNUSED(closu
 }
 
 static PyGetSetDef BPy_TVertex_getseters[] = {
-       {(char *)"front_svertex", (getter)TVertex_front_svertex_get, (setter)TVertex_front_svertex_set, (char *)TVertex_front_svertex_doc, NULL},
-       {(char *)"back_svertex", (getter)TVertex_back_svertex_get, (setter)TVertex_back_svertex_set, (char *)TVertex_back_svertex_doc, NULL},
+       {(char *)"front_svertex", (getter)TVertex_front_svertex_get, (setter)TVertex_front_svertex_set,
+                                 (char *)TVertex_front_svertex_doc, NULL},
+       {(char *)"back_svertex", (getter)TVertex_back_svertex_get, (setter)TVertex_back_svertex_set,
+                                (char *)TVertex_back_svertex_doc, NULL},
        {(char *)"id", (getter)TVertex_id_get, (setter)TVertex_id_set, (char *)TVertex_id_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
 };
index d2b965ad0e686508faa55565d76567b82da70300..0260199cceef71d10e61541be1d64a63b7f7555f 100644 (file)
@@ -320,10 +320,14 @@ static int FEdge_nature_set(BPy_FEdge *self, PyObject *value, void *UNUSED(closu
 }
 
 static PyGetSetDef BPy_FEdge_getseters[] = {
-       {(char *)"first_svertex", (getter)FEdge_first_svertex_get, (setter)FEdge_first_svertex_set, (char *)FEdge_first_svertex_doc, NULL},
-       {(char *)"second_svertex", (getter)FEdge_second_svertex_get, (setter)FEdge_second_svertex_set, (char *)FEdge_second_svertex_doc, NULL},
-       {(char *)"next_fedge", (getter)FEdge_next_fedge_get, (setter)FEdge_next_fedge_set, (char *)FEdge_next_fedge_doc, NULL},
-       {(char *)"previous_fedge", (getter)FEdge_previous_fedge_get, (setter)FEdge_previous_fedge_set, (char *)FEdge_previous_fedge_doc, NULL},
+       {(char *)"first_svertex", (getter)FEdge_first_svertex_get, (setter)FEdge_first_svertex_set,
+                                 (char *)FEdge_first_svertex_doc, NULL},
+       {(char *)"second_svertex", (getter)FEdge_second_svertex_get, (setter)FEdge_second_svertex_set,
+                                  (char *)FEdge_second_svertex_doc, NULL},
+       {(char *)"next_fedge", (getter)FEdge_next_fedge_get, (setter)FEdge_next_fedge_set,
+                              (char *)FEdge_next_fedge_doc, NULL},
+       {(char *)"previous_fedge", (getter)FEdge_previous_fedge_get, (setter)FEdge_previous_fedge_set,
+                                  (char *)FEdge_previous_fedge_doc, NULL},
        {(char *)"viewedge", (getter)FEdge_viewedge_get, (setter)FEdge_viewedge_set, (char *)FEdge_viewedge_doc, NULL},
        {(char *)"is_smooth", (getter)FEdge_is_smooth_get, (setter)FEdge_is_smooth_set, (char *)FEdge_is_smooth_doc, NULL},
        {(char *)"id", (getter)FEdge_id_get, (setter)FEdge_id_set, (char *)FEdge_id_doc, NULL},
index 368b6f80de3697d9b9937f04a5f8862496ed8fb4..7026d93774a255950bebafa7f8d78d62e188da48 100644 (file)
@@ -103,7 +103,7 @@ PyDoc_STRVAR(FrsCurve_push_vertex_back_doc,
 "   :arg vertex: A vertex object.\n"
 "   :type vertex: :class:`SVertex` or :class:`CurvePoint`");
 
-static PyObject * FrsCurve_push_vertex_back(BPy_FrsCurve *self, PyObject *args, PyObject *kwds)
+static PyObject *FrsCurve_push_vertex_back(BPy_FrsCurve *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"vertex", NULL};
        PyObject *obj = 0;
@@ -132,7 +132,7 @@ PyDoc_STRVAR(FrsCurve_push_vertex_front_doc,
 "   :arg vertex: A vertex object.\n"
 "   :type vertex: :class:`SVertex` or :class:`CurvePoint`");
 
-static PyObject * FrsCurve_push_vertex_front(BPy_FrsCurve *self, PyObject *args, PyObject *kwds)
+static PyObject *FrsCurve_push_vertex_front(BPy_FrsCurve *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"vertex", NULL};
        PyObject *obj = 0;
@@ -153,9 +153,11 @@ static PyObject * FrsCurve_push_vertex_front(BPy_FrsCurve *self, PyObject *args,
        Py_RETURN_NONE;
 }
 
-static PyMethodDef BPy_FrsCurve_methods[] = {  
-       {"push_vertex_back", (PyCFunction)FrsCurve_push_vertex_back, METH_VARARGS | METH_KEYWORDS, FrsCurve_push_vertex_back_doc},
-       {"push_vertex_front", (PyCFunction)FrsCurve_push_vertex_front, METH_VARARGS | METH_KEYWORDS, FrsCurve_push_vertex_front_doc},
+static PyMethodDef BPy_FrsCurve_methods[] = {
+       {"push_vertex_back", (PyCFunction)FrsCurve_push_vertex_back, METH_VARARGS | METH_KEYWORDS,
+                            FrsCurve_push_vertex_back_doc},
+       {"push_vertex_front", (PyCFunction)FrsCurve_push_vertex_front, METH_VARARGS | METH_KEYWORDS,
+                             FrsCurve_push_vertex_front_doc},
        {NULL, NULL, 0, NULL}
 };
 
@@ -183,7 +185,8 @@ static PyObject *FrsCurve_segments_size_get(BPy_FrsCurve *self, void *UNUSED(clo
 
 static PyGetSetDef BPy_FrsCurve_getseters[] = {
        {(char *)"is_empty", (getter)FrsCurve_is_empty_get, (setter)NULL, (char *)FrsCurve_is_empty_doc, NULL},
-       {(char *)"segments_size", (getter)FrsCurve_segments_size_get, (setter)NULL, (char *)FrsCurve_segments_size_doc, NULL},
+       {(char *)"segments_size", (getter)FrsCurve_segments_size_get, (setter)NULL,
+                                 (char *)FrsCurve_segments_size_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
 };
 
index 0cc12373eac83cfcb80c6855aaa777bb595e6f0f..53ec86f3c01d0c59e732a4bf19d5d0310b128695 100644 (file)
@@ -84,7 +84,7 @@ static int Stroke_init(BPy_Stroke *self, PyObject *args, PyObject *kwds)
        return 0;
 }
 
-static PyObject * Stroke_iter(PyObject *self)
+static PyObject *Stroke_iter(PyObject *self)
 {
        StrokeInternal::StrokeVertexIterator sv_it( ((BPy_Stroke *)self)->s->strokeVerticesBegin() );
        return BPy_StrokeVertexIterator_from_StrokeVertexIterator( sv_it, 0 );
@@ -121,7 +121,7 @@ PyDoc_STRVAR(Stroke_compute_sampling_doc,
 "      method.\n"
 "   :rtype: float");
 
-static PyObject * Stroke_compute_sampling(BPy_Stroke *self, PyObject *args, PyObject *kwds)
+static PyObject *Stroke_compute_sampling(BPy_Stroke *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"n", NULL};
        int i;
@@ -150,20 +150,17 @@ PyDoc_STRVAR(Stroke_resample_doc,
 "   :arg sampling: The new sampling value.\n"
 "   :type sampling: float");
 
-static PyObject * Stroke_resample(BPy_Stroke *self, PyObject *args, PyObject *kwds)
+static PyObject *Stroke_resample(BPy_Stroke *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist_1[] = {"n", NULL};
        static const char *kwlist_2[] = {"sampling", NULL};
        int i;
        float f;
 
-       if (PyArg_ParseTupleAndKeywords(args, kwds, "i", (char **)kwlist_1, &i))
-       {
+       if (PyArg_ParseTupleAndKeywords(args, kwds, "i", (char **)kwlist_1, &i)) {
                self->s->Resample(i);
        }
-       else if (PyErr_Clear(),
-                PyArg_ParseTupleAndKeywords(args, kwds, "f", (char **)kwlist_2, &f))
-       {
+       else if (PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, kwds, "f", (char **)kwlist_2, &f)) {
                self->s->Resample(f);
        }
        else {
@@ -186,7 +183,7 @@ PyDoc_STRVAR(Stroke_insert_vertex_doc,
 "      before which vertex must be inserted.\n"
 "   :type next: :class:`StrokeVertexIterator`");
 
-static PyObject * Stroke_insert_vertex(BPy_Stroke *self, PyObject *args, PyObject *kwds)
+static PyObject *Stroke_insert_vertex(BPy_Stroke *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"vertex", "next", NULL};
        PyObject *py_sv = 0, *py_sv_it = 0;
@@ -211,7 +208,7 @@ PyDoc_STRVAR(Stroke_remove_vertex_doc,
 "   :arg vertex: the StrokeVertex to remove from the Stroke.\n"
 "   :type vertex: :class:`StrokeVertex`");
 
-static PyObject * Stroke_remove_vertex( BPy_Stroke *self, PyObject *args, PyObject *kwds)
+static PyObject *Stroke_remove_vertex( BPy_Stroke *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"vertex", NULL};
        PyObject *py_sv = 0;
@@ -220,7 +217,8 @@ static PyObject * Stroke_remove_vertex( BPy_Stroke *self, PyObject *args, PyObje
                return NULL;
        if (((BPy_StrokeVertex *)py_sv)->sv) {
                self->s->RemoveVertex(((BPy_StrokeVertex *)py_sv)->sv);
-       } else {
+       }
+       else {
                PyErr_SetString(PyExc_TypeError, "invalid argument");
                return NULL;
        }
@@ -232,7 +230,7 @@ PyDoc_STRVAR(Stroke_update_length_doc,
 "\n"
 "   Updates the 2D length of the Stroke.");
 
-static PyObject * Stroke_update_length(BPy_Stroke *self)
+static PyObject *Stroke_update_length(BPy_Stroke *self)
 {
        self->s->UpdateLength();
        Py_RETURN_NONE;
@@ -251,7 +249,7 @@ PyDoc_STRVAR(Stroke_stroke_vertices_begin_doc,
 "   :return: A StrokeVertexIterator pointing on the first StrokeVertex.\n"
 "   :rtype: :class:`StrokeVertexIterator`");
 
-static PyObject * Stroke_stroke_vertices_begin( BPy_Stroke *self , PyObject *args, PyObject *kwds)
+static PyObject *Stroke_stroke_vertices_begin(BPy_Stroke *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"t", NULL};
        float f = 0.0f;
@@ -271,7 +269,7 @@ PyDoc_STRVAR(Stroke_stroke_vertices_end_doc,
 "   :return: A StrokeVertexIterator pointing after the last StrokeVertex.\n"
 "   :rtype: :class:`StrokeVertexIterator`");
 
-static PyObject * Stroke_stroke_vertices_end(BPy_Stroke *self)
+static PyObject *Stroke_stroke_vertices_end(BPy_Stroke *self)
 {
        StrokeInternal::StrokeVertexIterator sv_it(self->s->strokeVerticesEnd());
        return BPy_StrokeVertexIterator_from_StrokeVertexIterator(sv_it, 1);
@@ -285,18 +283,20 @@ PyDoc_STRVAR(Stroke_stroke_vertices_size_doc,
 "   :return: The number of stroke vertices.\n"
 "   :rtype: int");
 
-static PyObject * Stroke_stroke_vertices_size(BPy_Stroke *self)
+static PyObject *Stroke_stroke_vertices_size(BPy_Stroke *self)
 {
        return PyLong_FromLong(self->s->strokeVerticesSize());
 }
 
 static PyMethodDef BPy_Stroke_methods[] = {    
-       {"compute_sampling", (PyCFunction)Stroke_compute_sampling, METH_VARARGS | METH_KEYWORDS, Stroke_compute_sampling_doc},
+       {"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},
        {"remove_vertex", (PyCFunction)Stroke_remove_vertex, METH_VARARGS | METH_KEYWORDS, Stroke_remove_vertex_doc},
        {"insert_vertex", (PyCFunction)Stroke_insert_vertex, METH_VARARGS | METH_KEYWORDS, Stroke_insert_vertex_doc},
        {"update_length", (PyCFunction)Stroke_update_length, METH_NOARGS, Stroke_update_length_doc},
-       {"stroke_vertices_begin", (PyCFunction)Stroke_stroke_vertices_begin, METH_VARARGS | METH_KEYWORDS, Stroke_stroke_vertices_begin_doc},
+       {"stroke_vertices_begin", (PyCFunction)Stroke_stroke_vertices_begin, METH_VARARGS | METH_KEYWORDS,
+                                 Stroke_stroke_vertices_begin_doc},
        {"stroke_vertices_end", (PyCFunction)Stroke_stroke_vertices_end, METH_NOARGS, Stroke_stroke_vertices_end_doc},
        {"stroke_vertices_size", (PyCFunction)Stroke_stroke_vertices_size, METH_NOARGS, Stroke_stroke_vertices_size_doc},
        {NULL, NULL, 0, NULL}
@@ -337,7 +337,7 @@ static PyObject *Stroke_texture_id_get(BPy_Stroke *self, void *UNUSED(closure))
 static int Stroke_texture_id_set(BPy_Stroke *self, PyObject *value, void *UNUSED(closure))
 {
        unsigned int i = PyLong_AsUnsignedLong(value);
-       if(PyErr_Occurred())
+       if (PyErr_Occurred())
                return -1;
        self->s->setTextureId(i);
        return 0;
@@ -404,10 +404,13 @@ static int Stroke_id_set(BPy_Stroke *self, PyObject *value, void *UNUSED(closure
 }
 
 static PyGetSetDef BPy_Stroke_getseters[] = {
-       {(char *)"medium_type", (getter)Stroke_medium_type_get, (setter)Stroke_medium_type_set, (char *)Stroke_medium_type_doc, NULL},
-       {(char *)"texture_id", (getter)Stroke_texture_id_get, (setter)Stroke_texture_id_set, (char *)Stroke_texture_id_doc, NULL},
+       {(char *)"medium_type", (getter)Stroke_medium_type_get, (setter)Stroke_medium_type_set,
+                               (char *)Stroke_medium_type_doc, NULL},
+       {(char *)"texture_id", (getter)Stroke_texture_id_get, (setter)Stroke_texture_id_set,
+                              (char *)Stroke_texture_id_doc, NULL},
        {(char *)"tips", (getter)Stroke_tips_get, (setter)Stroke_tips_set, (char *)Stroke_tips_doc, NULL},
-       {(char *)"length_2d", (getter)Stroke_length_2d_get, (setter)Stroke_length_2d_set, (char *)Stroke_length_2d_doc, NULL},
+       {(char *)"length_2d", (getter)Stroke_length_2d_get, (setter)Stroke_length_2d_set,
+                             (char *)Stroke_length_2d_doc, NULL},
        {(char *)"id", (getter)Stroke_id_get, (setter)Stroke_id_set, (char *)Stroke_id_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
 };
index a30cfc0a824de5d3f673072df46394f851778e0f..e264b3b62175fb0694cdf37432828e3af31a6734 100644 (file)
@@ -86,7 +86,7 @@ PyDoc_STRVAR(ViewEdge_update_fedges_doc,
 "\n"
 "   Sets Viewedge to this for all embedded fedges.\n");
 
-static PyObject * ViewEdge_update_fedges(BPy_ViewEdge *self)
+static PyObject *ViewEdge_update_fedges(BPy_ViewEdge *self)
 {
        self->ve->UpdateFEdges();
        Py_RETURN_NONE;
@@ -114,7 +114,7 @@ static PyObject *ViewEdge_first_viewvertex_get(BPy_ViewEdge *self, void *UNUSED(
 
 static int ViewEdge_first_viewvertex_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(closure))
 {
-       if(!BPy_ViewVertex_Check(value))
+       if (!BPy_ViewVertex_Check(value))
                return -1;
        self->ve->setA(((BPy_ViewVertex *)value)->vv);
        return 0;
@@ -135,7 +135,7 @@ static PyObject *ViewEdge_last_viewvertex_get(BPy_ViewEdge *self, void *UNUSED(c
 
 static int ViewEdge_last_viewvertex_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(closure))
 {
-       if(!BPy_ViewVertex_Check(value))
+       if (!BPy_ViewVertex_Check(value))
                return -1;
        self->ve->setB(((BPy_ViewVertex *)value)->vv);
        return 0;
@@ -156,7 +156,7 @@ static PyObject *ViewEdge_first_fedge_get(BPy_ViewEdge *self, void *UNUSED(closu
 
 static int ViewEdge_first_fedge_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(closure))
 {
-       if(!BPy_FEdge_Check(value))
+       if (!BPy_FEdge_Check(value))
                return -1;
        self->ve->setFEdgeA(((BPy_FEdge *)value)->fe);
        return 0;
@@ -177,7 +177,7 @@ static PyObject *ViewEdge_last_fedge_get(BPy_ViewEdge *self, void *UNUSED(closur
 
 static int ViewEdge_last_fedge_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(closure))
 {
-       if(!BPy_FEdge_Check(value))
+       if (!BPy_FEdge_Check(value))
                return -1;
        self->ve->setFEdgeB(((BPy_FEdge *)value)->fe);
        return 0;
@@ -220,7 +220,7 @@ static PyObject *ViewEdge_occludee_get(BPy_ViewEdge *self, void *UNUSED(closure)
 
 static int ViewEdge_occludee_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(closure))
 {
-       if(!BPy_ViewShape_Check(value))
+       if (!BPy_ViewShape_Check(value))
                return -1;
        self->ve->setaShape(((BPy_ViewShape *)value)->vs);
        return 0;
@@ -291,7 +291,7 @@ static int ViewEdge_qi_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(clo
 {
        int qi;
 
-       if((qi = PyLong_AsLong(value)) == -1 && PyErr_Occurred())
+       if ((qi = PyLong_AsLong(value)) == -1 && PyErr_Occurred())
                return -1;
        self->ve->setQI(qi);
        return 0;
@@ -318,17 +318,24 @@ static int ViewEdge_chaining_time_stamp_set(BPy_ViewEdge *self, PyObject *value,
 }
 
 static PyGetSetDef BPy_ViewEdge_getseters[] = {
-       {(char *)"first_viewvertex", (getter)ViewEdge_first_viewvertex_get, (setter)ViewEdge_first_viewvertex_set, (char *)ViewEdge_first_viewvertex_doc, NULL},
-       {(char *)"last_viewvertex", (getter)ViewEdge_last_viewvertex_get, (setter)ViewEdge_last_viewvertex_set, (char *)ViewEdge_last_viewvertex_doc, NULL},
-       {(char *)"first_fedge", (getter)ViewEdge_first_fedge_get, (setter)ViewEdge_first_fedge_set, (char *)ViewEdge_first_fedge_doc, NULL},
-       {(char *)"last_fedge", (getter)ViewEdge_last_fedge_get, (setter)ViewEdge_last_fedge_set, (char *)ViewEdge_last_fedge_doc, NULL},
-       {(char *)"viewshape", (getter)ViewEdge_viewshape_get, (setter)ViewEdge_viewshape_set, (char *)ViewEdge_viewshape_doc, NULL},
-       {(char *)"occludee", (getter)ViewEdge_occludee_get, (setter)ViewEdge_occludee_set, (char *)ViewEdge_occludee_doc, NULL},
+       {(char *)"first_viewvertex", (getter)ViewEdge_first_viewvertex_get, (setter)ViewEdge_first_viewvertex_set,
+                                    (char *)ViewEdge_first_viewvertex_doc, NULL},
+       {(char *)"last_viewvertex", (getter)ViewEdge_last_viewvertex_get, (setter)ViewEdge_last_viewvertex_set,
+                                   (char *)ViewEdge_last_viewvertex_doc, NULL},
+       {(char *)"first_fedge", (getter)ViewEdge_first_fedge_get, (setter)ViewEdge_first_fedge_set,
+                               (char *)ViewEdge_first_fedge_doc, NULL},
+       {(char *)"last_fedge", (getter)ViewEdge_last_fedge_get, (setter)ViewEdge_last_fedge_set,
+                              (char *)ViewEdge_last_fedge_doc, NULL},
+       {(char *)"viewshape", (getter)ViewEdge_viewshape_get, (setter)ViewEdge_viewshape_set,
+                             (char *)ViewEdge_viewshape_doc, NULL},
+       {(char *)"occludee", (getter)ViewEdge_occludee_get, (setter)ViewEdge_occludee_set,
+                            (char *)ViewEdge_occludee_doc, NULL},
        {(char *)"is_closed", (getter)ViewEdge_is_closed_get, (setter)NULL, (char *)ViewEdge_is_closed_doc, NULL},
        {(char *)"id", (getter)ViewEdge_id_get, (setter)ViewEdge_id_set, (char *)ViewEdge_id_doc, NULL},
        {(char *)"nature", (getter)ViewEdge_nature_get, (setter)ViewEdge_nature_set, (char *)ViewEdge_nature_doc, NULL},
        {(char *)"qi", (getter)ViewEdge_qi_get, (setter)ViewEdge_qi_set, (char *)ViewEdge_qi_doc, NULL},
-       {(char *)"chaining_time_stamp", (getter)ViewEdge_chaining_time_stamp_get, (setter)ViewEdge_chaining_time_stamp_set, (char *)ViewEdge_chaining_time_stamp_doc, NULL},
+       {(char *)"chaining_time_stamp", (getter)ViewEdge_chaining_time_stamp_get, (setter)ViewEdge_chaining_time_stamp_set,
+                                       (char *)ViewEdge_chaining_time_stamp_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
 };
 
index 64e65417579617b17a0a7afd07f5ffc297c6a322..4a4e0c06fa802564e96a5c56cd3ab93bf92c0489 100644 (file)
@@ -106,7 +106,7 @@ PyDoc_STRVAR(Chain_push_viewedge_back_doc,
 "      processed.\n"
 "   :type orientation: bool");
 
-static PyObject * Chain_push_viewedge_back(BPy_Chain *self, PyObject *args, PyObject *kwds)
+static PyObject *Chain_push_viewedge_back(BPy_Chain *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"viewedge", "orientation", NULL};
        PyObject *obj1 = 0, *obj2 = 0;
@@ -133,7 +133,7 @@ PyDoc_STRVAR(Chain_push_viewedge_front_doc,
 "      processed.\n"
 "   :type orientation: bool");
 
-static PyObject * Chain_push_viewedge_front(BPy_Chain *self, PyObject *args, PyObject *kwds)
+static PyObject *Chain_push_viewedge_front(BPy_Chain *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"viewedge", "orientation", NULL};
        PyObject *obj1 = 0, *obj2 = 0;
@@ -149,9 +149,11 @@ static PyObject * Chain_push_viewedge_front(BPy_Chain *self, PyObject *args, PyO
        Py_RETURN_NONE;
 }
 
-static PyMethodDef BPy_Chain_methods[] = {     
-       {"push_viewedge_back", (PyCFunction)Chain_push_viewedge_back, METH_VARARGS | METH_KEYWORDS, Chain_push_viewedge_back_doc},
-       {"push_viewedge_front", (PyCFunction)Chain_push_viewedge_front, METH_VARARGS | METH_KEYWORDS, Chain_push_viewedge_front_doc},
+static PyMethodDef BPy_Chain_methods[] = {
+       {"push_viewedge_back", (PyCFunction)Chain_push_viewedge_back, METH_VARARGS | METH_KEYWORDS,
+                              Chain_push_viewedge_back_doc},
+       {"push_viewedge_front", (PyCFunction)Chain_push_viewedge_front, METH_VARARGS | METH_KEYWORDS,
+                               Chain_push_viewedge_front_doc},
        {NULL, NULL, 0, NULL}
 };
 
index f50abdbe44d0bfcf5db602346326268c2dc6d8a5..183e86a237ead47d820acbc0bde2577c562e0465 100644 (file)
@@ -284,7 +284,7 @@ static PyObject *FEdgeSharp_material_index_right_get(BPy_FEdgeSharp *self, void
 static int FEdgeSharp_material_index_right_set(BPy_FEdgeSharp *self, PyObject *value, void *UNUSED(closure))
 {
        unsigned int i = PyLong_AsUnsignedLong(value);
-       if(PyErr_Occurred())
+       if (PyErr_Occurred())
                return -1;
        self->fes->setaFrsMaterialIndex(i);
        return 0;
@@ -303,7 +303,7 @@ static PyObject *FEdgeSharp_material_index_left_get(BPy_FEdgeSharp *self, void *
 static int FEdgeSharp_material_index_left_set(BPy_FEdgeSharp *self, PyObject *value, void *UNUSED(closure))
 {
        unsigned int i = PyLong_AsUnsignedLong(value);
-       if(PyErr_Occurred())
+       if (PyErr_Occurred())
                return -1;
        self->fes->setbFrsMaterialIndex(i);
        return 0;
@@ -344,7 +344,7 @@ static PyObject *FEdgeSharp_face_mark_right_get(BPy_FEdgeSharp *self, void *UNUS
 
 static int FEdgeSharp_face_mark_right_set(BPy_FEdgeSharp *self, PyObject *value, void *UNUSED(closure))
 {
-       if(!PyBool_Check(value))
+       if (!PyBool_Check(value))
                return -1;
        self->fes->setaFaceMark(bool_from_PyBool(value));
        return 0;
@@ -362,21 +362,31 @@ static PyObject *FEdgeSharp_face_mark_left_get(BPy_FEdgeSharp *self, void *UNUSE
 
 static int FEdgeSharp_face_mark_left_set(BPy_FEdgeSharp *self, PyObject *value, void *UNUSED(closure))
 {
-       if(!PyBool_Check(value))
+       if (!PyBool_Check(value))
                return -1;
        self->fes->setbFaceMark(bool_from_PyBool(value));
        return 0;
 }
 
 static PyGetSetDef BPy_FEdgeSharp_getseters[] = {
-       {(char *)"normal_right", (getter)FEdgeSharp_normal_right_get, (setter)FEdgeSharp_normal_right_set, (char *)FEdgeSharp_normal_right_doc, NULL},
-       {(char *)"normal_left", (getter)FEdgeSharp_normal_left_get, (setter)FEdgeSharp_normal_left_set, (char *)FEdgeSharp_normal_left_doc, NULL},
-       {(char *)"material_index_right", (getter)FEdgeSharp_material_index_right_get, (setter)FEdgeSharp_material_index_right_set, (char *)FEdgeSharp_material_index_right_doc, NULL},
-       {(char *)"material_index_left", (getter)FEdgeSharp_material_index_left_get, (setter)FEdgeSharp_material_index_left_set, (char *)FEdgeSharp_material_index_left_doc, NULL},
-       {(char *)"material_right", (getter)FEdgeSharp_material_right_get, (setter)NULL, (char *)FEdgeSharp_material_right_doc, NULL},
-       {(char *)"material_left", (getter)FEdgeSharp_material_left_get, (setter)NULL, (char *)FEdgeSharp_material_left_doc, NULL},
-       {(char *)"face_mark_right", (getter)FEdgeSharp_face_mark_right_get, (setter)FEdgeSharp_face_mark_right_set, (char *)FEdgeSharp_face_mark_right_doc, NULL},
-       {(char *)"face_mark_left", (getter)FEdgeSharp_face_mark_left_get, (setter)FEdgeSharp_face_mark_left_set, (char *)FEdgeSharp_face_mark_left_doc, NULL},
+       {(char *)"normal_right", (getter)FEdgeSharp_normal_right_get, (setter)FEdgeSharp_normal_right_set,
+                                (char *)FEdgeSharp_normal_right_doc, NULL},
+       {(char *)"normal_left", (getter)FEdgeSharp_normal_left_get, (setter)FEdgeSharp_normal_left_set,
+                               (char *)FEdgeSharp_normal_left_doc, NULL},
+       {(char *)"material_index_right", (getter)FEdgeSharp_material_index_right_get,
+                                        (setter)FEdgeSharp_material_index_right_set,
+                                        (char *)FEdgeSharp_material_index_right_doc, NULL},
+       {(char *)"material_index_left", (getter)FEdgeSharp_material_index_left_get,
+                                       (setter)FEdgeSharp_material_index_left_set,
+                                       (char *)FEdgeSharp_material_index_left_doc, NULL},
+       {(char *)"material_right", (getter)FEdgeSharp_material_right_get, (setter)NULL,
+                                  (char *)FEdgeSharp_material_right_doc, NULL},
+       {(char *)"material_left", (getter)FEdgeSharp_material_left_get, (setter)NULL,
+                                 (char *)FEdgeSharp_material_left_doc, NULL},
+       {(char *)"face_mark_right", (getter)FEdgeSharp_face_mark_right_get, (setter)FEdgeSharp_face_mark_right_set,
+                                   (char *)FEdgeSharp_face_mark_right_doc, NULL},
+       {(char *)"face_mark_left", (getter)FEdgeSharp_face_mark_left_get, (setter)FEdgeSharp_face_mark_left_set,
+                                  (char *)FEdgeSharp_face_mark_left_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
 };
 
index a03c4a2d0bd38d9d5a71eebb3e7bfb708078196d..14b9b66b35c317038925b3e886807298e2cb44c2 100644 (file)
@@ -193,7 +193,7 @@ static PyObject *FEdgeSmooth_material_index_get(BPy_FEdgeSmooth *self, void *UNU
 static int FEdgeSmooth_material_index_set(BPy_FEdgeSmooth *self, PyObject *value, void *UNUSED(closure))
 {
        unsigned int i = PyLong_AsUnsignedLong(value);
-       if(PyErr_Occurred())
+       if (PyErr_Occurred())
                return -1;
        self->fes->setFrsMaterialIndex(i);
        return 0;
@@ -221,17 +221,20 @@ static PyObject *FEdgeSmooth_face_mark_get(BPy_FEdgeSmooth *self, void *UNUSED(c
 
 static int FEdgeSmooth_face_mark_set(BPy_FEdgeSmooth *self, PyObject *value, void *UNUSED(closure))
 {
-       if(!PyBool_Check(value))
+       if (!PyBool_Check(value))
                return -1;
        self->fes->setFaceMark(bool_from_PyBool(value));
        return 0;
 }
 
 static PyGetSetDef BPy_FEdgeSmooth_getseters[] = {
-       {(char *)"normal", (getter)FEdgeSmooth_normal_get, (setter)FEdgeSmooth_normal_set, (char *)FEdgeSmooth_normal_doc, NULL},
-       {(char *)"material_index", (getter)FEdgeSmooth_material_index_get, (setter)FEdgeSmooth_material_index_set, (char *)FEdgeSmooth_material_index_doc, NULL},
+       {(char *)"normal", (getter)FEdgeSmooth_normal_get, (setter)FEdgeSmooth_normal_set,
+                          (char *)FEdgeSmooth_normal_doc, NULL},
+       {(char *)"material_index", (getter)FEdgeSmooth_material_index_get, (setter)FEdgeSmooth_material_index_set,
+                                  (char *)FEdgeSmooth_material_index_doc, NULL},
        {(char *)"material", (getter)FEdgeSmooth_material_get, (setter)NULL, (char *)FEdgeSmooth_material_doc, NULL},
-       {(char *)"face_mark", (getter)FEdgeSmooth_face_mark_get, (setter)FEdgeSmooth_face_mark_set, (char *)FEdgeSmooth_face_mark_doc, NULL},
+       {(char *)"face_mark", (getter)FEdgeSmooth_face_mark_get, (setter)FEdgeSmooth_face_mark_set,
+                             (char *)FEdgeSmooth_face_mark_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
 };
 
index 134dfe3d6960b1571592fa5985daf22f7aedc181..3f245692ac705a9f8f7eb321f71ff87343f35a40 100644 (file)
@@ -102,7 +102,7 @@ static int AdjacencyIterator_init(BPy_AdjacencyIterator *self, PyObject *args, P
        return 0;
 }
 
-static PyObject * AdjacencyIterator_iternext(BPy_AdjacencyIterator *self)
+static PyObject *AdjacencyIterator_iternext(BPy_AdjacencyIterator *self)
 {
        if (self->a_it->isEnd()) {
                PyErr_SetNone(PyExc_StopIteration);
@@ -140,7 +140,8 @@ static PyObject *AdjacencyIterator_is_incoming_get(BPy_AdjacencyIterator *self,
 }
 
 static PyGetSetDef BPy_AdjacencyIterator_getseters[] = {
-       {(char *)"is_incoming", (getter)AdjacencyIterator_is_incoming_get, (setter)NULL, (char *)AdjacencyIterator_is_incoming_doc, NULL},
+       {(char *)"is_incoming", (getter)AdjacencyIterator_is_incoming_get, (setter)NULL,
+                               (char *)AdjacencyIterator_is_incoming_doc, NULL},
        {(char *)"object", (getter)AdjacencyIterator_object_get, (setter)NULL, (char *)AdjacencyIterator_object_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
 };
index 9b1030355595b6665c006b36369f783d953ee4ff..987075024f079ac8359b614238f2a8b3ea8fda3b 100644 (file)
@@ -45,7 +45,8 @@ extern "C" {
 //------------------------INSTANCE METHODS ----------------------------------
 
 PyDoc_STRVAR(ChainPredicateIterator_doc,
-"Class hierarchy: :class:`Iterator` > :class:`ViewEdgeIterator` > :class:`ChainingIterator` > :class:`ChainPredicateIterator`\n"
+"Class hierarchy: :class:`Iterator` > :class:`ViewEdgeIterator` > :class:`ChainingIterator` > "
+":class:`ChainPredicateIterator`\n"
 "\n"
 "A \"generic\" user-controlled ViewEdge iterator.  This iterator is in\n"
 "particular built from a unary predicate and a binary predicate.\n"
@@ -76,7 +77,8 @@ PyDoc_STRVAR(ChainPredicateIterator_doc,
 "      ViewVertex of begin. \n"
 "   :type orientation: bool\n"
 "\n"
-".. method:: __init__(upred, bpred, restrict_to_selection=True, restrict_to_unvisited=True, begin=None, orientation=True)\n"
+".. method:: __init__(upred, bpred, restrict_to_selection=True, restrict_to_unvisited=True, begin=None, "
+"orientation=True)\n"
 "\n"
 "   Builds a ChainPredicateIterator from a unary predicate, a binary\n"
 "   predicate, a starting ViewEdge and its orientation.\n"
@@ -118,7 +120,8 @@ static int check_begin(PyObject *obj, void *v)
 static int ChainPredicateIterator_init(BPy_ChainPredicateIterator *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist_1[] = {"brother", NULL};
-       static const char *kwlist_2[] = {"upred", "bpred", "restrict_to_selection", "restrict_to_unvisited", "begin", "orientation", NULL};
+       static const char *kwlist_2[] = {"upred", "bpred", "restrict_to_selection", "restrict_to_unvisited", "begin",
+                                        "orientation", NULL};
        static const char *kwlist_3[] = {"restrict_to_selection", "restrict_to_unvisited", "begin", "orientation", NULL};
        PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0, *obj4 = 0, *obj5 = 0, *obj6 = 0;
 
@@ -137,7 +140,8 @@ static int ChainPredicateIterator_init(BPy_ChainPredicateIterator *self, PyObjec
                bool restrict_to_unvisited = (!obj4) ? true : bool_from_PyBool(obj4);
                ViewEdge *begin = (!obj5 || obj5 == Py_None) ? NULL : ((BPy_ViewEdge *)obj5)->ve;
                bool orientation = (!obj6) ? true : bool_from_PyBool(obj6);
-               self->cp_it = new ChainPredicateIterator(*up1D, *bp1D, restrict_to_selection, restrict_to_unvisited, begin, orientation);
+               self->cp_it = new ChainPredicateIterator(*up1D, *bp1D, restrict_to_selection, restrict_to_unvisited, begin,
+                                                        orientation);
                self->upred = obj1;
                self->bpred = obj2;
                Py_INCREF(self->upred);
@@ -155,7 +159,8 @@ static int ChainPredicateIterator_init(BPy_ChainPredicateIterator *self, PyObjec
                self->cp_it = new ChainPredicateIterator(restrict_to_selection, restrict_to_unvisited, begin, orientation);
                self->upred = NULL;
                self->bpred = NULL;
-       }       else {
+       }
+       else {
                PyErr_SetString(PyExc_TypeError, "invalid argument(s)");
                return -1;
        }
index 90bc9123694d8ff8a610803b45f982e7f040f081..c69d1ad1a7bb8ecf4956903606b98c0eb948faab 100644 (file)
@@ -47,7 +47,8 @@ extern "C" {
 
 extern PyTypeObject ChainPredicateIterator_Type;
 
-#define BPy_ChainPredicateIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ChainPredicateIterator_Type))
+#define BPy_ChainPredicateIterator_Check(v) \
+            (PyObject_IsInstance((PyObject *)v, (PyObject *)&ChainPredicateIterator_Type))
 
 /*---------------------------Python BPy_ChainPredicateIterator structure definition----------*/
 typedef struct {
index 8d7e19b9ba54a1a2126f4214ef24bf751104af70..80b417d5e746dbdbe424d585b2d72eb584d1ad07 100644 (file)
@@ -46,7 +46,8 @@ extern "C" {
 // ChainSilhouetteIterator (const ChainSilhouetteIterator &brother)
 
 PyDoc_STRVAR(ChainSilhouetteIterator_doc,
-"Class hierarchy: :class:`Iterator` > :class:`ViewEdgeIterator` > :class:`ChainingIterator` > :class:`ChainSilhouetteIterator`\n"
+"Class hierarchy: :class:`Iterator` > :class:`ViewEdgeIterator` > :class:`ChainingIterator` > "
+":class:`ChainSilhouetteIterator`\n"
 "\n"
 "A ViewEdge Iterator used to follow ViewEdges the most naturally.  For\n"
 "example, it will follow visible ViewEdges of same nature.  As soon, as\n"
index 8c6f2983d3e972ae11a20cbd76fef50b663b2e0a..acc410b64a666ca542a0cd2484e76977d5ef7efa 100644 (file)
@@ -47,7 +47,8 @@ extern "C" {
 
 extern PyTypeObject ChainSilhouetteIterator_Type;
 
-#define BPy_ChainSilhouetteIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ChainSilhouetteIterator_Type))
+#define BPy_ChainSilhouetteIterator_Check(v) \
+            (PyObject_IsInstance((PyObject *)v, (PyObject *)&ChainSilhouetteIterator_Type))
 
 /*---------------------------Python BPy_ChainSilhouetteIterator structure definition----------*/
 typedef struct {
index 701f6871cc14de2512c158e317d6ad67519478a9..d193c0aa70b842c56f64638d79b3c62f87b8c786 100644 (file)
@@ -215,8 +215,10 @@ static PyObject *ChainingIterator_is_incrementing_get(BPy_ChainingIterator *self
 
 static PyGetSetDef BPy_ChainingIterator_getseters[] = {
        {(char *)"object", (getter)ChainingIterator_object_get, (setter)NULL, (char *)ChainingIterator_object_doc, NULL},
-       {(char *)"next_vertex", (getter)ChainingIterator_next_vertex_get, (setter)NULL, (char *)ChainingIterator_next_vertex_doc, NULL},
-       {(char *)"is_incrementing", (getter)ChainingIterator_is_incrementing_get, (setter)NULL, (char *)ChainingIterator_is_incrementing_doc, NULL},
+       {(char *)"next_vertex", (getter)ChainingIterator_next_vertex_get, (setter)NULL,
+                               (char *)ChainingIterator_next_vertex_doc, NULL},
+       {(char *)"is_incrementing", (getter)ChainingIterator_is_incrementing_get, (setter)NULL,
+                                   (char *)ChainingIterator_is_incrementing_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
 };
 
index 60a2bb6bc799096b8638df56ed5ffa150bc787ca..07d74bf2264bf0d3fc066db26db836f9945385c7 100644 (file)
@@ -128,7 +128,8 @@ static PyObject *CurvePointIterator_u_get(BPy_CurvePointIterator *self, void *UN
 }
 
 static PyGetSetDef BPy_CurvePointIterator_getseters[] = {
-       {(char *)"object", (getter)CurvePointIterator_object_get, (setter)NULL, (char *)CurvePointIterator_object_doc, NULL},
+       {(char *)"object", (getter)CurvePointIterator_object_get, (setter)NULL,
+                          (char *)CurvePointIterator_object_doc, NULL},
        {(char *)"t", (getter)CurvePointIterator_t_get, (setter)NULL, (char *)CurvePointIterator_t_doc, NULL},
        {(char *)"u", (getter)CurvePointIterator_u_get, (setter)NULL, (char *)CurvePointIterator_u_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
index 1e5598ddd1ca8c2941e5374d1efcb1f7fc2ce484..f589802b0a502ffb8c60bb9eacc71743018fea1f 100644 (file)
@@ -98,7 +98,7 @@ static int Interface0DIterator_init(BPy_Interface0DIterator *self, PyObject *arg
        return 0;
 }
 
-static PyObject * Interface0DIterator_iternext(BPy_Interface0DIterator *self)
+static PyObject *Interface0DIterator_iternext(BPy_Interface0DIterator *self)
 {
        Interface0D *if0D;
 
@@ -154,7 +154,8 @@ static PyObject *Interface0DIterator_u_get(BPy_Interface0DIterator *self, void *
 }
 
 static PyGetSetDef BPy_Interface0DIterator_getseters[] = {
-       {(char *)"object", (getter)Interface0DIterator_object_get, (setter)NULL, (char *)Interface0DIterator_object_doc, NULL},
+       {(char *)"object", (getter)Interface0DIterator_object_get, (setter)NULL,
+                          (char *)Interface0DIterator_object_doc, NULL},
        {(char *)"t", (getter)Interface0DIterator_t_get, (setter)NULL, (char *)Interface0DIterator_t_doc, NULL},
        {(char *)"u", (getter)Interface0DIterator_u_get, (setter)NULL, (char *)Interface0DIterator_u_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
index 6a03bd479041c53e82f11997d4ddb6c84a0d3ecb..889e29b6f42093ab2b79d79185aff08abe754095 100644 (file)
@@ -84,7 +84,7 @@ static int StrokeVertexIterator_init(BPy_StrokeVertexIterator *self, PyObject *a
        return 0;
 }
 
-static PyObject * StrokeVertexIterator_iternext(BPy_StrokeVertexIterator *self)
+static PyObject *StrokeVertexIterator_iternext(BPy_StrokeVertexIterator *self)
 {
        StrokeVertex *sv;
 
@@ -145,7 +145,8 @@ static PyObject *StrokeVertexIterator_u_get(BPy_StrokeVertexIterator *self, void
 }
 
 static PyGetSetDef BPy_StrokeVertexIterator_getseters[] = {
-       {(char *)"object", (getter)StrokeVertexIterator_object_get, (setter)NULL, (char *)StrokeVertexIterator_object_doc, NULL},
+       {(char *)"object", (getter)StrokeVertexIterator_object_get, (setter)NULL,
+                          (char *)StrokeVertexIterator_object_doc, NULL},
        {(char *)"t", (getter)StrokeVertexIterator_t_get, (setter)NULL, (char *)StrokeVertexIterator_t_doc, NULL},
        {(char *)"u", (getter)StrokeVertexIterator_u_get, (setter)NULL, (char *)StrokeVertexIterator_u_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
index 9e709b12a744f7b222a918aea044fa18d0b3690b..0a0f5d249a4e057f4010d2c30b76b59e2d168a2c 100644 (file)
@@ -115,7 +115,8 @@ static PyObject *ViewEdgeIterator_change_orientation(BPy_ViewEdgeIterator *self)
 }
 
 static PyMethodDef BPy_ViewEdgeIterator_methods[] = {
-       {"change_orientation", (PyCFunction) ViewEdgeIterator_change_orientation, METH_NOARGS, ViewEdgeIterator_change_orientation_doc},
+       {"change_orientation", (PyCFunction) ViewEdgeIterator_change_orientation, METH_NOARGS,
+                              ViewEdgeIterator_change_orientation_doc},
        {NULL, NULL, 0, NULL}
 };
 
@@ -195,7 +196,7 @@ static PyObject *ViewEdgeIterator_begin_get(BPy_ViewEdgeIterator *self, void *UN
 
 static int ViewEdgeIterator_begin_set(BPy_ViewEdgeIterator *self, PyObject *value, void *UNUSED(closure))
 {
-       if(!BPy_ViewEdge_Check(value)) {
+       if (!BPy_ViewEdge_Check(value)) {
                PyErr_SetString(PyExc_TypeError, "value must be a ViewEdge");
                return -1;
        }
@@ -205,9 +206,12 @@ static int ViewEdgeIterator_begin_set(BPy_ViewEdgeIterator *self, PyObject *valu
 
 static PyGetSetDef BPy_ViewEdgeIterator_getseters[] = {
        {(char *)"object", (getter)ViewEdgeIterator_object_get, (setter)NULL, (char *)ViewEdgeIterator_object_doc, NULL},
-       {(char *)"current_edge", (getter)ViewEdgeIterator_current_edge_get, (setter)ViewEdgeIterator_current_edge_set, (char *)ViewEdgeIterator_current_edge_doc, NULL},
-       {(char *)"orientation", (getter)ViewEdgeIterator_orientation_get, (setter)ViewEdgeIterator_orientation_set, (char *)ViewEdgeIterator_orientation_doc, NULL},
-       {(char *)"begin", (getter)ViewEdgeIterator_begin_get, (setter)ViewEdgeIterator_begin_set, (char *)ViewEdgeIterator_begin_doc, NULL},
+       {(char *)"current_edge", (getter)ViewEdgeIterator_current_edge_get, (setter)ViewEdgeIterator_current_edge_set,
+                                (char *)ViewEdgeIterator_current_edge_doc, NULL},
+       {(char *)"orientation", (getter)ViewEdgeIterator_orientation_get, (setter)ViewEdgeIterator_orientation_set,
+                               (char *)ViewEdgeIterator_orientation_doc, NULL},
+       {(char *)"begin", (getter)ViewEdgeIterator_begin_get, (setter)ViewEdgeIterator_begin_set,
+                         (char *)ViewEdgeIterator_begin_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
 };
 
index 844674665265565020680479963327cb4a17d466..d92f3dd2d49e26f9d5f4e6dc64c597d9f0bf32b5 100644 (file)
@@ -76,7 +76,7 @@ static int orientedViewEdgeIterator_init(BPy_orientedViewEdgeIterator *self, PyO
        return 0;
 }
 
-static PyObject * orientedViewEdgeIterator_iternext(BPy_orientedViewEdgeIterator *self)
+static PyObject *orientedViewEdgeIterator_iternext(BPy_orientedViewEdgeIterator *self)
 {
        ViewVertex::directedViewEdge *dve;
 
@@ -114,7 +114,8 @@ static PyObject *orientedViewEdgeIterator_object_get(BPy_orientedViewEdgeIterato
 }
 
 static PyGetSetDef BPy_orientedViewEdgeIterator_getseters[] = {
-       {(char *)"object", (getter)orientedViewEdgeIterator_object_get, (setter)NULL, (char *)orientedViewEdgeIterator_object_doc, NULL},
+       {(char *)"object", (getter)orientedViewEdgeIterator_object_get, (setter)NULL,
+                          (char *)orientedViewEdgeIterator_object_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
 };
 
index 84451a29347e0339b51dfb4055db81aa317a36b4..0d2846ce15819e13ccf854b28eb9954a45166c29 100644 (file)
@@ -47,7 +47,8 @@ extern "C" {
 
 extern PyTypeObject orientedViewEdgeIterator_Type;
 
-#define BPy_orientedViewEdgeIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&orientedViewEdgeIterator_Type))
+#define BPy_orientedViewEdgeIterator_Check(v) \
+            (PyObject_IsInstance((PyObject *)v, (PyObject *)&orientedViewEdgeIterator_Type))
 
 /*---------------------------Python BPy_orientedViewEdgeIterator structure definition----------*/
 typedef struct {
index de88d79366c39838bc3476970db68618621cd8c8..7ff97e6cc34e4ace1d075c793e2a4da2d5b417d5 100644 (file)
@@ -61,7 +61,7 @@ static char BackboneStretcherShader___doc__[] =
 "   :arg stroke: A Stroke object.\n"
 "   :type stroke: :class:`Stroke`\n";
 
-static int BackboneStretcherShader___init__(BPy_BackboneStretcherShaderself, PyObject *args, PyObject *kwds)
+static int BackboneStretcherShader___init__(BPy_BackboneStretcherShader *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"amount", NULL};
        float f = 2.0;
index f906f0cb61ab9c91fddcc8cbf8998b33644883ab..053af43f16632c0cea0a84a8fbbff42a7efe1904 100644 (file)
@@ -44,7 +44,8 @@ extern "C" {
 
 extern PyTypeObject BackboneStretcherShader_Type;
 
-#define BPy_BackboneStretcherShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&BackboneStretcherShader_Type))
+#define BPy_BackboneStretcherShader_Check(v) \
+            (PyObject_IsInstance((PyObject *)v, (PyObject *)&BackboneStretcherShader_Type))
 
 /*---------------------------Python BPy_BackboneStretcherShader structure definition----------*/
 typedef struct {
index 266c2d53efb6a94dd9de0bba68a55a22316b52f3..9e398dba42ee5b5cf4d5520657480a6d9f478e13 100644 (file)
@@ -63,7 +63,7 @@ static char BezierCurveShader___doc__[] =
 "   :arg stroke: A Stroke object.\n"
 "   :type stroke: :class:`Stroke`\n";
 
-static int BezierCurveShader___init__(BPy_BezierCurveShaderself, PyObject *args, PyObject *kwds)
+static int BezierCurveShader___init__(BPy_BezierCurveShader *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"error", NULL};
        float f = 4.0;
index e60e73ec82d8857d8c48b707182ee27132645aea..51efd94e324d6fd1b9fd3194341346302796f768 100644 (file)
@@ -79,7 +79,7 @@ static int convert_v2(PyObject *obj, void *v)
        return float_array_from_PyObject(obj, (float *)v, 2);
 }
 
-static int CalligraphicShader___init__(BPy_CalligraphicShaderself, PyObject *args, PyObject *kwds)
+static int CalligraphicShader___init__(BPy_CalligraphicShader *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"thickness_min", "thickness_max", "orientation", "clamp", NULL};
        double d1, d2;
index 27ac939a391c73b2bca2d9776072915149886f27..6119756f1cd97f2a2040b5404b20fc4fd0ef6cab 100644 (file)
@@ -62,7 +62,7 @@ static char ColorNoiseShader___doc__[] =
 "   :arg stroke: A Stroke object.\n"
 "   :type stroke: :class:`Stroke`\n";
 
-static int ColorNoiseShader___init__(BPy_ColorNoiseShaderself, PyObject *args, PyObject *kwds)
+static int ColorNoiseShader___init__(BPy_ColorNoiseShader *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"amplitude", "period", NULL};
        float f1, f2;
index b9010984a834bbe7d7397e563186382ddc5b0347..8e92bbc908c54c5d68edff03f3622242661c7049 100644 (file)
@@ -66,7 +66,7 @@ static char ColorVariationPatternShader___doc__[] =
 "   :arg stroke: A Stroke object.\n"
 "   :type stroke: :class:`Stroke`\n";
 
-static int ColorVariationPatternShader___init__(BPy_ColorVariationPatternShaderself, PyObject *args, PyObject *kwds)
+static int ColorVariationPatternShader___init__(BPy_ColorVariationPatternShader *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"pattern_name", "stretch", NULL};
        const char *s;
index be70938aae643abc53fdc8e2465b74c5dd912aa2..f72b4b54abfb42e8d91ab2b7b04f6c91f36c155b 100644 (file)
@@ -44,7 +44,8 @@ extern "C" {
 
 extern PyTypeObject ColorVariationPatternShader_Type;
 
-#define BPy_ColorVariationPatternShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ColorVariationPatternShader_Type))
+#define BPy_ColorVariationPatternShader_Check(v) \
+            (PyObject_IsInstance((PyObject *)v, (PyObject *)&ColorVariationPatternShader_Type))
 
 /*---------------------------Python BPy_ColorVariationPatternShader structure definition----------*/
 typedef struct {
index 90e9938368aa8525475a5230460af1dfdd98fe02..627f2a5423c69f6db2ecf4529f6444fee7dad397 100644 (file)
@@ -66,7 +66,7 @@ static char ConstantColorShader___doc__[] =
 "   :arg stroke: A Stroke object.\n"
 "   :type stroke: :class:`Stroke`\n";
 
-static int ConstantColorShader___init__(BPy_ConstantColorShaderself, PyObject *args, PyObject *kwds)
+static int ConstantColorShader___init__(BPy_ConstantColorShader *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"red", "green", "blue", "alpha", NULL};
        float f1, f2, f3, f4 = 1.0;
index dddb79960a06ca8d99ec093e6b26694bc3f432c2..0b2af7c385640ce3eabd411b0ac2885bcbe048bf 100644 (file)
@@ -60,7 +60,7 @@ static char ConstantThicknessShader___doc__[] =
 "   :arg stroke: A Stroke object.\n"
 "   :type stroke: :class:`Stroke`\n";
 
-static int ConstantThicknessShader___init__(BPy_ConstantThicknessShaderself, PyObject *args, PyObject *kwds)
+static int ConstantThicknessShader___init__(BPy_ConstantThicknessShader *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"thickness", NULL};
        float f;
index 686d52f0d03b9b00a4f3f4c02c05e342e3761b41..c8c22516cf178f2e85d0d7a4fbadb597082a0369 100644 (file)
@@ -44,7 +44,8 @@ extern "C" {
 
 extern PyTypeObject ConstantThicknessShader_Type;
 
-#define BPy_ConstantThicknessShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ConstantThicknessShader_Type))
+#define BPy_ConstantThicknessShader_Check(v) \
+            (PyObject_IsInstance((PyObject *)v, (PyObject *)&ConstantThicknessShader_Type))
 
 /*---------------------------Python BPy_ConstantThicknessShader structure definition----------*/
 typedef struct {
index f636074def2d02d975ef14bcbb8050b378a91501..c00897100eb4cad9ed56d5cdda2674a131e11f6e 100644 (file)
@@ -66,7 +66,8 @@ static char ConstrainedIncreasingThicknessShader___doc__[] =
 "   :arg stroke: A Stroke object.\n"
 "   :type stroke: :class:`Stroke`\n";
 
-static int ConstrainedIncreasingThicknessShader___init__(BPy_ConstrainedIncreasingThicknessShader* self, PyObject *args, PyObject *kwds)
+static int ConstrainedIncreasingThicknessShader___init__(BPy_ConstrainedIncreasingThicknessShader *self,
+                                                         PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"thickness_min", "thickness_max", "ratio", NULL};
        float f1, f2, f3;
index f36489459bea90578c5b12b4141abd52249dea37..104b57542b9382f5fd7850a04f41ff0d2283cb61 100644 (file)
@@ -44,7 +44,8 @@ extern "C" {
 
 extern PyTypeObject ConstrainedIncreasingThicknessShader_Type;
 
-#define BPy_ConstrainedIncreasingThicknessShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ConstrainedIncreasingThicknessShader_Type))
+#define BPy_ConstrainedIncreasingThicknessShader_Check(v) \
+            (PyObject_IsInstance((PyObject *)v, (PyObject *)&ConstrainedIncreasingThicknessShader_Type))
 
 /*---------------------------Python BPy_ConstrainedIncreasingThicknessShader structure definition----------*/
 typedef struct {
index 8d8838f88cb741fbfc67cae59f64db132ea1366b..37b53a496ec336d4685650cc65f1193d1e620ca4 100644 (file)
@@ -68,7 +68,7 @@ static char GuidingLinesShader___doc__[] =
 "   :arg stroke: A Stroke object.\n"
 "   :type stroke: :class:`Stroke`\n";
 
-static int GuidingLinesShader___init__(BPy_GuidingLinesShaderself, PyObject *args, PyObject *kwds)
+static int GuidingLinesShader___init__(BPy_GuidingLinesShader *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"offset", NULL};
        float f;
index 99c71c1693bfaa9a63b8358048ac9ccf59288318..9db4290e511832f03f48315c2b1281fefd17dbf8 100644 (file)
@@ -76,7 +76,7 @@ static char IncreasingColorShader___doc__[] =
 "   :arg stroke: A Stroke object.\n"
 "   :type stroke: :class:`Stroke`\n";
 
-static int IncreasingColorShader___init__(BPy_IncreasingColorShaderself, PyObject *args, PyObject *kwds)
+static int IncreasingColorShader___init__(BPy_IncreasingColorShader *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"red_min", "green_min", "blue_min", "alpha_min",
                                       "red_max", "green_max", "blue_max", "alpha_max", NULL};
index f0974dd49f748b4e068384b299267a3e8ea2d97b..220fccc83d49d09af2003f4d3fd4b5352cfca43b 100644 (file)
@@ -66,7 +66,7 @@ static char IncreasingThicknessShader___doc__[] =
 "   :arg stroke: A Stroke object.\n"
 "   :type stroke: :class:`Stroke`\n";
 
-static int IncreasingThicknessShader___init__(BPy_IncreasingThicknessShaderself, PyObject *args, PyObject *kwds)
+static int IncreasingThicknessShader___init__(BPy_IncreasingThicknessShader *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"thickness_A", "thickness_B", NULL};
        float f1, f2;
index ee4d370aa39bd1e8779f331838e35bbca69eef44..e162460a567718f60e64a8474912a493d4542e28 100644 (file)
@@ -44,7 +44,8 @@ extern "C" {
 
 extern PyTypeObject IncreasingThicknessShader_Type;
 
-#define BPy_IncreasingThicknessShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&IncreasingThicknessShader_Type))
+#define BPy_IncreasingThicknessShader_Check(v) \
+            (PyObject_IsInstance((PyObject *)v, (PyObject *)&IncreasingThicknessShader_Type))
 
 /*---------------------------Python BPy_IncreasingThicknessShader structure definition----------*/
 typedef struct {
index ccb703d35256fddab6a491ae7180ce96bfd0400d..908040cd0df17d137555d05cba31ea5c8b1b4668 100644 (file)
@@ -67,7 +67,7 @@ static char PolygonalizationShader___doc__[] =
 "   :arg stroke: A Stroke object.\n"
 "   :type stroke: :class:`Stroke`\n";
 
-static int PolygonalizationShader___init__(BPy_PolygonalizationShaderself, PyObject *args, PyObject *kwds)
+static int PolygonalizationShader___init__(BPy_PolygonalizationShader *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"error", NULL};
        float f;
index a79eab0974300d24dfd8ddf25c96dd5570d76807..ed8678143d3100c1bff9b95c1ab7e1375a073c98 100644 (file)
@@ -44,7 +44,8 @@ extern "C" {
 
 extern PyTypeObject PolygonalizationShader_Type;
 
-#define BPy_PolygonalizationShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&PolygonalizationShader_Type))
+#define BPy_PolygonalizationShader_Check(v) \
+            (PyObject_IsInstance((PyObject *)v, (PyObject *)&PolygonalizationShader_Type))
 
 /*---------------------------Python BPy_PolygonalizationShader structure definition----------*/
 typedef struct {
index b2f9011064f7b34944afdb80d6a0b09d2256c9fa..744ae057147180531c2639fd4ccc89821261cd9e 100644 (file)
@@ -60,7 +60,7 @@ static char SamplingShader___doc__[] =
 "   :arg stroke: A Stroke object.\n"
 "   :type stroke: :class:`Stroke`\n";
 
-static int SamplingShader___init__(BPy_SamplingShaderself, PyObject *args, PyObject *kwds)
+static int SamplingShader___init__(BPy_SamplingShader *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"sampling", NULL};
        float f;
index 7c10a09ffec99c725076ded18368168ea8c6d242..d6b0139d315b6908f5941e7335cb375833674dcb 100644 (file)
@@ -80,7 +80,7 @@ static char SmoothingShader___doc__[] =
 "   :arg stroke: A Stroke object.\n"
 "   :type stroke: :class:`Stroke`\n";
 
-static int SmoothingShader___init__(BPy_SmoothingShaderself, PyObject *args, PyObject *kwds)
+static int SmoothingShader___init__(BPy_SmoothingShader *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"num_iterations", "factor_point", "factor_curvature",
                                       "factor_curvature_difference", "aniso_point", "aniso_normal",
index 2193f8d2de3ccc2de997950aa4075d6636abf69b..3fdb51968181622c12fe4eb2b970763a28366bcc 100644 (file)
@@ -70,7 +70,7 @@ static char SpatialNoiseShader___doc__[] =
 "   :arg stroke: A Stroke object.\n"
 "   :type stroke: :class:`Stroke`\n";
 
-static int SpatialNoiseShader___init__(BPy_SpatialNoiseShaderself, PyObject *args, PyObject *kwds)
+static int SpatialNoiseShader___init__(BPy_SpatialNoiseShader *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"amount", "scale", "num_octaves", "smooth", "pure_random", NULL};
        float f1, f2;
index 933af8992e529e543aed17827fae5cb70474cf58..f83aa819c12666017f76127c50c30db7f32740c6 100644 (file)
@@ -83,7 +83,7 @@ static char StrokeTextureShader___doc__[] =
 "   :arg stroke: A Stroke object.\n"
 "   :type stroke: :class:`Stroke`\n";
 
-static int StrokeTextureShader___init__(BPy_StrokeTextureShaderself, PyObject *args, PyObject *kwds)
+static int StrokeTextureShader___init__(BPy_StrokeTextureShader *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"texture_file", "medium_type", "tips", NULL};
        const char *s1;
index 09c92547f245d390b5c276c16e1636c6665b28f7..3b4027e900d145bb6d24b0d85ed794f1a90e1938 100644 (file)
@@ -76,7 +76,7 @@ static char TextureAssignerShader___doc__[] =
 "   :arg stroke: A Stroke object.\n"
 "   :type stroke: :class:`Stroke`\n";
 
-static int TextureAssignerShader___init__(BPy_TextureAssignerShaderself, PyObject *args, PyObject *kwds)
+static int TextureAssignerShader___init__(BPy_TextureAssignerShader *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"preset", NULL};
        int i;