diff --git a/Fltk/GUI_Projection.cpp b/Fltk/GUI_Projection.cpp index 7a3335edc8af8ad70fad5cf1f1946fad5e7cae52..638ee24d811bbfcb8bf6936c3a06048c91ac61e8 100644 --- a/Fltk/GUI_Projection.cpp +++ b/Fltk/GUI_Projection.cpp @@ -995,8 +995,6 @@ void delete_fourier(GFace *gf) void blend_cb(Fl_Widget *w, void *data) { - projectionEditor *e = (projectionEditor*)data; - std::vector<GFace*> faces; std::vector<FM::Patch*> patches; @@ -1011,8 +1009,8 @@ void blend_cb(Fl_Widget *w, void *data) patches.push_back(tf->GetPatch()); } FM::BlendOperator* blendOp = new FM::BlendOperator(patches); - for (int i = 0; i < patches.size(); i++) { - FM::BlendedPatch* patch = new FM::BlendedPatch(i,blendOp); + for (unsigned int i = 0; i < patches.size(); i++) { + FM::BlendedPatch* patch = new FM::BlendedPatch(i, blendOp); makeGFace(patch); } for(unsigned int i = 0; i < faces.size(); i++) { diff --git a/Mesh/DivideAndConquer.cpp b/Mesh/DivideAndConquer.cpp index fcff7b0e35bf09956c62f5af9810c3189413082e..66da06851507ad6daee5bbded0f0badfda9b4236 100644 --- a/Mesh/DivideAndConquer.cpp +++ b/Mesh/DivideAndConquer.cpp @@ -1,4 +1,4 @@ -// $Id: DivideAndConquer.cpp,v 1.14 2008-02-17 08:48:00 geuzaine Exp $ +// $Id: DivideAndConquer.cpp,v 1.15 2008-02-21 19:27:58 geuzaine Exp $ // // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle // @@ -357,7 +357,7 @@ int DelaunayAndVoronoi(DocPeek doc) // This routine insert the point 'newPoint' in the list dlist, // respecting the clock-wise orientation -int DListInsert(DListRecord ** dlist, MPoint center, PointNumero newPoint) +int DListInsert(DListRecord **dlist, MPoint center, PointNumero newPoint) { DListRecord *p, *newp; double alpha1, alpha, beta, xx, yy; @@ -427,7 +427,7 @@ int Insert(PointNumero a, PointNumero b) return rslt; } -int DListDelete(DListPeek * dlist, PointNumero oldPoint) +int DListDelete(DListPeek *dlist, PointNumero oldPoint) { DListPeek p; @@ -469,7 +469,7 @@ int Delete(PointNumero a, PointNumero b) } // compte les points sur le polygone convexe -int CountPointsOnHull(int n, PointRecord * pPointArray) +int CountPointsOnHull(int n, PointRecord *pPointArray) { PointNumero p, p2, temp; int i; @@ -488,7 +488,7 @@ int CountPointsOnHull(int n, PointRecord * pPointArray) return (i <= n) ? i : -1; } -PointNumero *ConvertDlistToArray(DListPeek * dlist, int *n) +PointNumero *ConvertDlistToArray(DListPeek *dlist, int *n) { DListPeek p, temp; int i, max = 0; @@ -515,8 +515,8 @@ PointNumero *ConvertDlistToArray(DListPeek * dlist, int *n) return ptr; } -void filldel(Delaunay * deladd, int aa, int bb, int cc, - PointRecord * points) +void filldel(Delaunay *deladd, int aa, int bb, int cc, + PointRecord *points) { deladd->t.a = aa; deladd->t.b = bb; @@ -581,7 +581,7 @@ int Conversion(DocPeek doc) } // Cette routine efface toutes les listes d'adjacence du pPointArray -void remove_all_dlist(int n, PointRecord * pPointArray) +void remove_all_dlist(int n, PointRecord *pPointArray) { int i; DListPeek p, temp; @@ -598,8 +598,7 @@ void remove_all_dlist(int n, PointRecord * pPointArray) } } -void Make_Mesh_With_Points(DocRecord * ptr, PointRecord * Liste, - int Numpoints) +void Make_Mesh_With_Points(DocRecord *ptr, PointRecord *Liste, int Numpoints) { ptr->numTriangles = 0; ptr->points = Liste; diff --git a/Mesh/DivideAndConquer.h b/Mesh/DivideAndConquer.h index eaad42b2bee13adf773d9c0dbdad480ea75d8b14..44511c488b255204a465d6dd8003c2ba72642a48 100644 --- a/Mesh/DivideAndConquer.h +++ b/Mesh/DivideAndConquer.h @@ -83,6 +83,6 @@ struct _DELAUNAY{ Voronoi v; }; -void Make_Mesh_With_Points(DocRecord * ptr, PointRecord * Liste, int Numpoints); +void Make_Mesh_With_Points(DocRecord *ptr, PointRecord *Liste, int Numpoints); #endif