diff --git a/Mesh/2D_Mesh_Aniso.cpp b/Mesh/2D_Mesh_Aniso.cpp index 50ce7e9548f89d2052b3bf52f20c11566b279f3d..e0ad61b3e3f10cf359455bc96e132d493cf12c5e 100644 --- a/Mesh/2D_Mesh_Aniso.cpp +++ b/Mesh/2D_Mesh_Aniso.cpp @@ -1,4 +1,4 @@ -// $Id: 2D_Mesh_Aniso.cpp,v 1.40 2004-05-25 23:16:26 geuzaine Exp $ +// $Id: 2D_Mesh_Aniso.cpp,v 1.41 2004-05-26 01:29:29 geuzaine Exp $ // // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle // @@ -291,29 +291,6 @@ int Intersect_Edges_2d(Edge * a, Edge * b) return 0; } -int compareEdgePtr(const void *a, const void *b) -{ - int i1, i2, j1, j2; - Edge *q, *w; - - q = *(Edge **) a; - w = *(Edge **) b; - i1 = IMAX(q->V[0]->Num, q->V[1]->Num); - i2 = IMAX(w->V[0]->Num, w->V[1]->Num); - j1 = IMIN(q->V[0]->Num, q->V[1]->Num); - j2 = IMIN(w->V[0]->Num, w->V[1]->Num); - - if(i1 < i2) - return (1); - if(i1 > i2) - return (-1); - if(j1 < j2) - return (1); - if(j1 > j2) - return (-1); - return 0; -} - void putaindecoquille_2D(void *a, void *b) { Edge *e = (Edge *) a; diff --git a/Mesh/Edge.cpp b/Mesh/Edge.cpp index d09740dec845364b8bef0ef63d5a88db2459ceb0..5134b2da0c2767858e835349e9b8df7c72e5242b 100644 --- a/Mesh/Edge.cpp +++ b/Mesh/Edge.cpp @@ -1,4 +1,4 @@ -// $Id: Edge.cpp,v 1.17 2004-05-25 23:16:26 geuzaine Exp $ +// $Id: Edge.cpp,v 1.18 2004-05-26 01:29:29 geuzaine Exp $ // // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle // @@ -83,15 +83,12 @@ int edges_non[3] = { 2, 0, 1 }; int compareEdge(const void *a, const void *b) { - int i1, i2, j1, j2; - Edge *q, *w; - - q = (Edge *) a; - w = (Edge *) b; - i1 = IMAX(q->V[0]->Num, q->V[1]->Num); - i2 = IMAX(w->V[0]->Num, w->V[1]->Num); - j1 = IMIN(q->V[0]->Num, q->V[1]->Num); - j2 = IMIN(w->V[0]->Num, w->V[1]->Num); + Edge *q = (Edge *) a; + Edge *w = (Edge *) b; + int i1 = IMAX(q->V[0]->Num, q->V[1]->Num); + int i2 = IMAX(w->V[0]->Num, w->V[1]->Num); + int j1 = IMIN(q->V[0]->Num, q->V[1]->Num); + int j2 = IMIN(w->V[0]->Num, w->V[1]->Num); if(i1 < i2) return (1); @@ -104,12 +101,18 @@ int compareEdge(const void *a, const void *b) return 0; } -int compareEdgeAngle(const void *a, const void *b) +int compareEdgePtr(const void *a, const void *b) { - Edge *q, *w; + Edge *q = *(Edge **) a; + Edge *w = *(Edge **) b; + + return compareEdge(q, w); +} - q = (Edge *) a; - w = (Edge *) b; +int compareEdgeAngle(const void *a, const void *b) +{ + Edge *q = (Edge *) a; + Edge *w = (Edge *) b; if(q->a >= w->a) return (1); return (-1); diff --git a/Mesh/Edge.h b/Mesh/Edge.h index 75241708cc16a60c8cf8178665e3867dacd199b7..93038ca04ed441dd3ad5f3386415a62df837a0e4 100644 --- a/Mesh/Edge.h +++ b/Mesh/Edge.h @@ -79,6 +79,7 @@ class EdgesContainer void Free_Edge(void *a, void *b); int compareEdge(const void *a, const void *b); +int compareEdgePtr(const void *a, const void *b); int compareEdgeAngle(const void *a, const void *b); #endif