[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 0aa5704e469cd9cb99cdb21ebd9ed3bd7f2eb94d
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Fri Feb 11 13:35:30 2005 +1100

    Cosmetics
    
    darcs-hash:20050211023530-fbd8f-e7f19367045ed2fc1abe0c17ab9ccb9f4974fcaf.gz

diff --git a/src/solid.c b/src/solid.c
index dbda478..2e5e019 100644
--- a/src/solid.c
+++ b/src/solid.c
@@ -54,17 +54,17 @@ static gdouble segment_triangle_intersection (GtsPoint * E, GtsPoint * D,
 					      GtsTriangle * t,
 					      gboolean * inside)
 {
+  GtsVertex * vA, * vB, * vC;
   GtsPoint * A, * B, * C;
   gint ABCE, ABCD, ADCE, ABDE, BCDE;
   GtsEdge * AB, * BC, * CA;
   gdouble a, b;
   gboolean reversed = FALSE;
 
-  gts_triangle_vertices_edges (t, NULL, 
-			       (GtsVertex **) &A, 
-			       (GtsVertex **) &B, 
-			       (GtsVertex **) &C, 
-			       &AB, &BC, &CA);
+  gts_triangle_vertices_edges (t, NULL, &vA, &vB, &vC, &AB, &BC, &CA);
+  A = GTS_POINT (vA);
+  B = GTS_POINT (vB);
+  C = GTS_POINT (vC);
   ABCE = gts_point_orientation_3d_sos (A, B, C, E);
   ABCD = gts_point_orientation_3d_sos (A, B, C, D);
   if (ABCE < 0 || ABCD > 0) {

-- 
Gerris Flow Solver