Fix a fatal error in the cluster object, and calm the compiler

diff --git a/poly2tri-c/refine/cdt.c b/poly2tri-c/refine/cdt.c
index 381450931ce5595d6e750b010a6baec236d863e5..8a5cd6b9c58409e368d6d73dad2b41bd08cd5f06 100644 (file)
--- a/poly2tri-c/refine/cdt.c
+++ b/poly2tri-c/refine/cdt.c
@@ -102,7 +102,7 @@ p2tr_cdt_new (P2tCDT *cdt)
     for (j = 0; j < 3; j++)
       {
         P2tPoint *cdt_pt = p2t_triangle_get_point(cdt_tri, j);
-        P2trPoint *new_pt = g_hash_table_lookup (point_map, cdt_pt);
+        P2trPoint *new_pt = (P2trPoint*) g_hash_table_lookup (point_map, cdt_pt);
 
         if (new_pt == NULL)
           {
@@ -124,8 +124,8 @@ p2tr_cdt_new (P2tCDT *cdt)
         P2tPoint *end = p2t_triangle_get_point (cdt_tri, (j + 1) % 3);
         int edge_index = p2t_triangle_edge_index (cdt_tri, start, end);
 
-        P2trPoint *start_new = g_hash_table_lookup (point_map, start);
-        P2trPoint *end_new = g_hash_table_lookup (point_map, end);
+        P2trPoint *start_new = (P2trPoint*) g_hash_table_lookup (point_map, start);
+        P2trPoint *end_new = (P2trPoint*) g_hash_table_lookup (point_map, end);
 
         if (! p2tr_point_has_edge_to (start_new, end_new))
           {
@@ -150,9 +150,9 @@ p2tr_cdt_new (P2tCDT *cdt)
   {
     P2tTriangle *cdt_tri = triangle_index (cdt_tris, i);
 
-    P2trPoint *pt1 = g_hash_table_lookup (point_map, p2t_triangle_get_point (cdt_tri, 0));
-    P2trPoint *pt2 = g_hash_table_lookup (point_map, p2t_triangle_get_point (cdt_tri, 1));
-    P2trPoint *pt3 = g_hash_table_lookup (point_map, p2t_triangle_get_point (cdt_tri, 2));
+    P2trPoint *pt1 = (P2trPoint*) g_hash_table_lookup (point_map, p2t_triangle_get_point (cdt_tri, 0));
+    P2trPoint *pt2 = (P2trPoint*) g_hash_table_lookup (point_map, p2t_triangle_get_point (cdt_tri, 1));
+    P2trPoint *pt3 = (P2trPoint*) g_hash_table_lookup (point_map, p2t_triangle_get_point (cdt_tri, 2));
 
     P2trTriangle *new_tri = p2tr_mesh_new_triangle (rmesh->mesh,
         p2tr_point_get_edge_to(pt1, pt2, FALSE),

diff --git a/poly2tri-c/refine/cluster.c b/poly2tri-c/refine/cluster.c
index eafe195bcc4ac3e77495293039d88e0c61f99a16..12fe25d7af2e80aca7eb185a60cbafb53b3a198f 100644 (file)
--- a/poly2tri-c/refine/cluster.c
+++ b/poly2tri-c/refine/cluster.c
@@ -48,7 +48,7 @@ p2tr_cluster_shortest_edge_length (P2trCluster *self)
   gdouble min_length_sq = G_MAXDOUBLE, temp;
   GList *iter;
   
-  for (iter = g_queue_peek_head(&self->edges); iter != NULL; iter = iter->next)
+  for (iter = self->edges.head; iter != NULL; iter = iter->next)
     {
       temp = p2tr_edge_get_length_squared ((P2trEdge*)iter->data);
       min_length_sq = MIN(min_length_sq, temp);
@@ -133,7 +133,7 @@ p2tr_cluster_free (P2trCluster *self)
 {
   GList *iter;
   
-  for (iter = g_queue_peek_head(&self->edges); iter != NULL; iter = iter->next)
+  for (iter = self->edges.head; iter != NULL; iter = iter->next)
     p2tr_edge_unref ((P2trEdge*)iter->data);
 
   g_queue_clear (&self->edges);

diff --git a/poly2tri-c/refine/delaunay-terminator.c b/poly2tri-c/refine/delaunay-terminator.c
index 9a5e5472229db034e532939c78e2a2b27faa105a..95d305c19a395fdb8018cd53d39a7225be05de5f 100644 (file)
--- a/poly2tri-c/refine/delaunay-terminator.c
+++ b/poly2tri-c/refine/delaunay-terminator.c
@@ -209,7 +209,7 @@ p2tr_dt_dequeue_tri (P2trDelaunayTerminator *self)
     return NULL;
   else
     {
-      P2trTriangle *ret = g_sequence_get (first);
+      P2trTriangle *ret = (P2trTriangle*) g_sequence_get (first);
       g_sequence_remove (first);
       return ret;
     }
@@ -232,7 +232,7 @@ p2tr_dt_dequeue_segment (P2trDelaunayTerminator *self)
   if (g_queue_is_empty (&self->Qs))
     return NULL;
   else
-    return g_queue_pop_head (&self->Qs);
+    return (P2trEdge*) g_queue_pop_head (&self->Qs);
 }
 
 static gboolean