archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2026-02-01 17:36:36 +00:00
Code Issues Projects Releases Wiki Activity

fix -Wsign-compare warnings in topojson_utils

Browse Source
This commit is contained in:
Dane Springmeyer 2015-06-15 20:05:50 -07:00
parent 77a7eb3343
commit 8a432ade33
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/mapnik/json/topojson_utils.hpp
View File

@ -83,7 +83,7 @@ struct bounding_box_visitor
{
index_type index = line.ring;
index_type arc_index = index < 0 ? std::abs(index) - 1 : index;
if (arc_index < num_arcs_)
if (arc_index >= 0 && arc_index < static_cast<int>(num_arcs_))
{
bool first = true;
double px = 0, py = 0;
@ -121,7 +121,7 @@ struct bounding_box_visitor
for (auto index : multi_line.rings)
{
index_type arc_index = index < 0 ? std::abs(index) - 1 : index;
if (arc_index < num_arcs_)
if (arc_index >= 0 && arc_index < static_cast<int>(num_arcs_))
{
double px = 0, py = 0;
auto const& arcs = topo_.arcs[arc_index];
@ -161,7 +161,7 @@ struct bounding_box_visitor
for (auto index : ring)
{
index_type arc_index = index < 0 ? std::abs(index) - 1 : index;
if (arc_index < num_arcs_)
if (arc_index >= 0 && arc_index < static_cast<int>(num_arcs_))
{
double px = 0, py = 0;
auto const& arcs = topo_.arcs[arc_index];
@ -206,7 +206,7 @@ struct bounding_box_visitor
for (auto index : ring)
{
index_type arc_index = index < 0 ? std::abs(index) - 1 : index;
if (arc_index < num_arcs_)
if (arc_index >= 0 && arc_index < static_cast<int>(num_arcs_))
{
double px = 0, py = 0;
auto const& arcs = topo_.arcs[arc_index];