Skip to content

Commit

Permalink
lib/vector: Fix -Wpedantic compiler warnings (OSGeo#2876)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nilason @neteler
nilason authored and neteler committed Nov 7, 2023
1 parent 2cd275f commit b41a555
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 37 deletions.
10 changes: 5 additions & 5 deletions lib/vector/Vlib/buffer2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1023,9 +1023,11 @@ void Vect_line_buffer2(const struct line_pnts *Points, double da, double db,

Vect_line_prune((struct line_pnts *)Points);

if (Points->n_points == 1)
return Vect_point_buffer2(Points->x[0], Points->y[0], da, db, dalpha,
round, tol, oPoints);
if (Points->n_points == 1) {
Vect_point_buffer2(Points->x[0], Points->y[0], da, db, dalpha, round,
tol, oPoints);
return;
}

/* initializations */
tPoints = Vect_new_line_struct();
Expand All @@ -1052,8 +1054,6 @@ void Vect_line_buffer2(const struct line_pnts *Points, double da, double db,
Vect_destroy_line_struct(outer);
destroy_lines_array(isles, isles_count);
pg_destroy_struct(pg);

return;
}

/*!
Expand Down
12 changes: 6 additions & 6 deletions lib/vector/Vlib/poly.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ struct Slink {
};

/* function prototypes */
static int comp_double(double *, double *);
static int comp_double(const void *, const void *);
static int V__within(double, double, double);
int Vect__intersect_y_line_with_poly(const struct line_pnts *, double,
struct line_pnts *);
Expand Down Expand Up @@ -93,12 +93,12 @@ int Vect_get_point_in_area(const struct Map_info *Map, int area, double *X,
return -1;
}

static int comp_double(double *i, double *j)
static int comp_double(const void *i, const void *j)
{
if (*i < *j)
if (*(const double *)i < *(const double *)j)
return -1;

return (*i > *j);
return (*(const double *)i > *(const double *)j);
}

static int V__within(double a, double x, double b)
Expand Down Expand Up @@ -577,7 +577,7 @@ int Vect_get_point_in_poly_isl(const struct line_pnts *Points,
return -1;

qsort(Intersects->x, (size_t)Intersects->n_points, sizeof(double),
(void *)comp_double);
comp_double);

max = 0;
maxpos = 0;
Expand Down Expand Up @@ -629,7 +629,7 @@ int Vect_get_point_in_poly_isl(const struct line_pnts *Points,
return -1;

qsort(Intersects->y, (size_t)Intersects->n_points, sizeof(double),
(void *)comp_double);
comp_double);

max = 0;
maxpos = 0;
Expand Down
2 changes: 1 addition & 1 deletion lib/vector/Vlib/select.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ int Vect_spatial_index_select(const struct spatial_index *si,
rect.boundary[3] = box->E;
rect.boundary[4] = box->N;
rect.boundary[5] = box->T;
RTreeSearch(si->si_tree, &rect, (void *)_add_item, list);
RTreeSearch(si->si_tree, &rect, (SearchHitCallback *)_add_item, list);

G_debug(3, "Vect_spatial_index_select(): %d items selected",
list->n_values);
Expand Down
58 changes: 33 additions & 25 deletions lib/vector/diglib/spindex.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -682,9 +682,11 @@ int dig_select_nodes(struct Plus_head *Plus, const struct bound_box *box,
rect.boundary[5] = box->T;

if (Plus->Spidx_new)
RTreeSearch(Plus->Node_spidx, &rect, (void *)_add_item, list);
RTreeSearch(Plus->Node_spidx, &rect, (SearchHitCallback *)_add_item,
list);
else
rtree_search(Plus->Node_spidx, &rect, (void *)_add_item, list, Plus);
rtree_search(Plus->Node_spidx, &rect, (SearchHitCallback *)_add_item,
list, Plus);

return (list->n_values);
}
Expand Down Expand Up @@ -728,9 +730,11 @@ int dig_find_node(struct Plus_head *Plus, double x, double y, double z)

node = 0;
if (Plus->Spidx_new)
RTreeSearch(Plus->Node_spidx, &rect, (void *)_add_node, &node);
RTreeSearch(Plus->Node_spidx, &rect, (SearchHitCallback *)_add_node,
&node);
else
rtree_search(Plus->Node_spidx, &rect, (void *)_add_node, &node, Plus);
rtree_search(Plus->Node_spidx, &rect, (SearchHitCallback *)_add_node,
&node, Plus);

return node;
}
Expand Down Expand Up @@ -769,10 +773,11 @@ int dig_select_lines(struct Plus_head *Plus, const struct bound_box *box,
rect.boundary[5] = box->T;

if (Plus->Spidx_new)
RTreeSearch(Plus->Line_spidx, &rect, (void *)_add_item_with_box, list);
RTreeSearch(Plus->Line_spidx, &rect,
(SearchHitCallback *)_add_item_with_box, list);
else
rtree_search(Plus->Line_spidx, &rect, (void *)_add_item_with_box, list,
Plus);
rtree_search(Plus->Line_spidx, &rect,
(SearchHitCallback *)_add_item_with_box, list, Plus);

return (list->n_values);
}
Expand Down Expand Up @@ -832,11 +837,12 @@ int dig_find_line_box(struct Plus_head *Plus, int line, struct bound_box *box)
box_id.box = box;

if (Plus->Spidx_new)
ret = RTreeSearch(Plus->Line_spidx, &rect, (void *)_set_item_box,
&box_id);
ret = RTreeSearch(Plus->Line_spidx, &rect,
(SearchHitCallback *)_set_item_box, &box_id);
else
ret = rtree_search(Plus->Line_spidx, &rect, (void *)_set_item_box,
&box_id, Plus);
ret =
rtree_search(Plus->Line_spidx, &rect,
(SearchHitCallback *)_set_item_box, &box_id, Plus);

return ret;
}
Expand Down Expand Up @@ -883,10 +889,11 @@ int dig_select_areas(struct Plus_head *Plus, const struct bound_box *box,
rect.boundary[5] = box->T;

if (Plus->Spidx_new)
RTreeSearch(Plus->Area_spidx, &rect, (void *)_add_item_with_box, list);
RTreeSearch(Plus->Area_spidx, &rect,
(SearchHitCallback *)_add_item_with_box, list);
else
rtree_search(Plus->Area_spidx, &rect, (void *)_add_item_with_box, list,
Plus);
rtree_search(Plus->Area_spidx, &rect,
(SearchHitCallback *)_add_item_with_box, list, Plus);

return (list->n_values);
}
Expand Down Expand Up @@ -936,11 +943,11 @@ int dig_find_area_box(struct Plus_head *Plus, int area, struct bound_box *box)
box_id.box = box;

if (Plus->Spidx_new)
ret = RTreeSearch(Plus->Area_spidx, &rect, (void *)_set_item_box,
&box_id);
ret = RTreeSearch(Plus->Area_spidx, &rect,
(SearchHitCallback *)_set_item_box, &box_id);
else
ret = rtree_search(Plus->Area_spidx, &rect, (void *)_set_item_box,
&box_id, Plus);
ret = rtree_search(Plus->Area_spidx, &rect,
(SearchHitCallback *)_set_item_box, &box_id, Plus);

return ret;
}
Expand Down Expand Up @@ -978,10 +985,11 @@ int dig_select_isles(struct Plus_head *Plus, const struct bound_box *box,
rect.boundary[5] = box->T;

if (Plus->Spidx_new)
RTreeSearch(Plus->Isle_spidx, &rect, (void *)_add_item_with_box, list);
RTreeSearch(Plus->Isle_spidx, &rect,
(SearchHitCallback *)_add_item_with_box, list);
else
rtree_search(Plus->Isle_spidx, &rect, (void *)_add_item_with_box, list,
Plus);
rtree_search(Plus->Isle_spidx, &rect,
(SearchHitCallback *)_add_item_with_box, list, Plus);

return (list->n_values);
}
Expand Down Expand Up @@ -1031,11 +1039,11 @@ int dig_find_isle_box(struct Plus_head *Plus, int isle, struct bound_box *box)
box_id.box = box;

if (Plus->Spidx_new)
ret = RTreeSearch(Plus->Isle_spidx, &rect, (void *)_set_item_box,
&box_id);
ret = RTreeSearch(Plus->Isle_spidx, &rect,
(SearchHitCallback *)_set_item_box, &box_id);
else
ret = rtree_search(Plus->Isle_spidx, &rect, (void *)_set_item_box,
&box_id, Plus);
ret = rtree_search(Plus->Isle_spidx, &rect,
(SearchHitCallback *)_set_item_box, &box_id, Plus);

return ret;
}

0 comments on commit b41a555

Please sign in to comment.