diff options
Diffstat (limited to 'navit/geom.h')
| -rw-r--r-- | navit/geom.h | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/navit/geom.h b/navit/geom.h index 9de2e6d86..5969d86ef 100644 --- a/navit/geom.h +++ b/navit/geom.h @@ -32,21 +32,23 @@ extern "C" { #define sq(x) ((double)(x)*(x)) -struct rect {struct coord l,h;}; +struct rect { + struct coord l,h; +}; enum geom_poly_segment_type { - geom_poly_segment_type_none, - geom_poly_segment_type_way_inner, - geom_poly_segment_type_way_outer, - geom_poly_segment_type_way_left_side, - geom_poly_segment_type_way_right_side, - geom_poly_segment_type_way_unknown, + geom_poly_segment_type_none, + geom_poly_segment_type_way_inner, + geom_poly_segment_type_way_outer, + geom_poly_segment_type_way_left_side, + geom_poly_segment_type_way_right_side, + geom_poly_segment_type_way_unknown, }; struct geom_poly_segment { - enum geom_poly_segment_type type; - struct coord *first,*last; + enum geom_poly_segment_type type; + struct coord *first,*last; }; /* prototypes */ void geom_coord_copy(struct coord *from, struct coord *to, int count, int reverse); @@ -56,8 +58,9 @@ long long geom_poly_area(struct coord *c, int count); int geom_poly_centroid(struct coord *c, int count, struct coord *r); int geom_poly_point_inside(struct coord *cp, int count, struct coord *c); int geom_poly_closest_point(struct coord *pl, int count, struct coord *p, struct coord *c); -GList *geom_poly_segments_insert(GList *list, struct geom_poly_segment *first, struct geom_poly_segment *second, struct geom_poly_segment *third); -void geom_poly_segment_destroy(struct geom_poly_segment *seg); +GList *geom_poly_segments_insert(GList *list, struct geom_poly_segment *first, struct geom_poly_segment *second, + struct geom_poly_segment *third); +void geom_poly_segment_destroy(struct geom_poly_segment *seg, void * unused); GList *geom_poly_segments_remove(GList *list, struct geom_poly_segment *seg); int geom_poly_segment_compatible(struct geom_poly_segment *s1, struct geom_poly_segment *s2, int dir); GList *geom_poly_segments_sort(GList *in, enum geom_poly_segment_type type); |
