Merge pull request #1503 from joto/fix-sign-conversions2

Fix more sign conversions

Author: lonvia

src/expire-tiles.cpp

@@ -116,13 +116,13 @@ void expire_tiles::expire_tile(uint32_t x, uint32_t y)
     }
 }
 
-int expire_tiles::normalise_tile_x_coord(int x)
+uint32_t expire_tiles::normalise_tile_x_coord(int x)
 {
     x %= map_width;
     if (x < 0) {
         x = (map_width - x) + 1;
     }
-    return x;
+    return static_cast<uint32_t>(x);
 }
 
 void expire_tiles::coords_to_tile(double lon, double lat, double *tilex,
@@ -200,10 +200,12 @@ void expire_tiles::from_line(double lon_a, double lat_a, double lon_b,
         }
         for (int x = x1 - TILE_EXPIRY_LEEWAY; x <= x2 + TILE_EXPIRY_LEEWAY;
              ++x) {
-            int const norm_x = normalise_tile_x_coord(x);
+            uint32_t const norm_x = normalise_tile_x_coord(x);
             for (int y = y1 - TILE_EXPIRY_LEEWAY; y <= y2 + TILE_EXPIRY_LEEWAY;
                  ++y) {
-                expire_tile(norm_x, y);
+                if (y >= 0) {
+                    expire_tile(norm_x, static_cast<uint32_t>(y));
+                }
             }
         }
     }
@@ -256,10 +258,10 @@ int expire_tiles::from_bbox(double min_lon, double min_lat, double max_lon,
         max_tile_y = map_width;
     }
     for (int iterator_x = min_tile_x; iterator_x <= max_tile_x; ++iterator_x) {
-        int const norm_x = normalise_tile_x_coord(iterator_x);
+        uint32_t const norm_x = normalise_tile_x_coord(iterator_x);
         for (int iterator_y = min_tile_y; iterator_y <= max_tile_y;
              ++iterator_y) {
-            expire_tile(norm_x, iterator_y);
+            expire_tile(norm_x, static_cast<uint32_t>(iterator_y));
         }
     }
     return 0;

src/expire-tiles.hpp

@@ -178,7 +178,7 @@ struct expire_tiles
      * \param y y index of the tile to be expired.
      */
     void expire_tile(uint32_t x, uint32_t y);
-    int normalise_tile_x_coord(int x);
+    uint32_t normalise_tile_x_coord(int x);
     void from_line(double lon_a, double lat_a, double lon_b, double lat_b);
 
     void from_wkb_point(ewkb::parser_t *wkb);

src/node-locations.cpp

@@ -34,7 +34,11 @@ bool node_locations_t::set(osmid_t id, osmium::Location location)
         m_index.add(id, m_data.size());
     }
 
-    protozero::add_varint_to_buffer(&m_data, m_did.update(id));
+    auto const delta = m_did.update(id);
+    // Always true because ids in input must be unique and ordered
+    assert(delta > 0);
+    protozero::add_varint_to_buffer(&m_data, static_cast<uint64_t>(delta));
+
     protozero::add_varint_to_buffer(
         &m_data, protozero::encode_zigzag64(m_dx.update(location.x())));
     protozero::add_varint_to_buffer(
@@ -62,7 +66,8 @@ osmium::Location node_locations_t::get(osmid_t id) const
     osmium::DeltaDecode<int64_t> dy;
 
     for (std::size_t n = 0; n < block_size && begin != end; ++n) {
-        auto const bid = did.update(protozero::decode_varint(&begin, end));
+        auto const bid = did.update(
+            static_cast<int64_t>(protozero::decode_varint(&begin, end)));
         int32_t const x = dx.update(
             protozero::decode_zigzag64(protozero::decode_varint(&begin, end)));
         int32_t const y = dy.update(

src/options.cpp

@@ -318,6 +318,24 @@ static osmium::Box parse_bbox(char const *bbox)
     return osmium::Box{minx, miny, maxx, maxy};
 }
 
+static unsigned int number_of_threads(char const *arg)
+{
+    int num = atoi(arg);
+    if (num < 1) {
+        log_warn("--number-processes must be at least 1. Using 1.");
+        num = 1;
+    } else if (num > 32) {
+        // The threads will open up database connections which will
+        // run out at some point. It depends on the number of tables
+        // how many connections there are. The number 32 is way beyond
+        // anything that will make sense here.
+        log_warn("--number-processes too large. Set to 32.");
+        num = 32;
+    }
+
+    return static_cast<unsigned int>(num);
+}
+
 options_t::options_t(int argc, char *argv[]) : options_t()
 {
     // If there are no command line arguments at all, show help.
@@ -503,18 +521,7 @@ options_t::options_t(int argc, char *argv[]) : options_t()
             log_warn("Deprecated option --cache-strategy ignored");
             break;
         case 205:
-            num_procs = atoi(optarg);
-            if (num_procs < 1) {
-                log_warn("--number-processes must be at least 1. Using 1.");
-                num_procs = 1;
-            } else if (num_procs > 32) {
-                // The threads will open up database connections which will
-                // run out at some point. It depends on the number of tables
-                // how many connections there are. The number 32 is way beyond
-                // anything that will make sense here.
-                log_warn("--number-processes too large. Set to 32.");
-                num_procs = 32;
-            }
+            num_procs = number_of_threads(optarg);
             break;
         case 206:
             droptemp = true;

src/osmdata.cpp

@@ -347,8 +347,7 @@ class multithreaded_processor
 
 void osmdata_t::process_dependents() const
 {
-    multithreaded_processor proc{m_conninfo, m_mid, m_output,
-                                 (std::size_t)m_num_procs};
+    multithreaded_processor proc{m_conninfo, m_mid, m_output, m_num_procs};
 
     // stage 1b processing: process parents of changed objects
     if (m_dependency_manager->has_pending()) {

src/osmdata.hpp

@@ -98,7 +98,7 @@ class osmdata_t : public osmium::handler::Handler
     // imported).
     osmium::Box m_bbox;
 
-    int m_num_procs;
+    unsigned int m_num_procs;
     bool m_append;
     bool m_droptemp;
     bool m_parallel_indexing;

src/pgsql-helper.cpp

@@ -10,9 +10,12 @@
 #include "format.hpp"
 #include "pgsql-helper.hpp"
 
+#include <cassert>
+
 idlist_t get_ids_from_result(pg_result_t const &result) {
     idlist_t ids;
-    ids.reserve(result.num_tuples());
+    assert(result.num_tuples() >= 0);
+    ids.reserve(static_cast<std::size_t>(result.num_tuples()));
 
     for (int i = 0; i < result.num_tuples(); ++i) {
         ids.push_back(osmium::string_to_object_id(result.get_value(i, 0)));

src/reprojection.cpp

@@ -9,6 +9,7 @@
 
 #include <osmium/geom/mercator_projection.hpp>
 
+#include "format.hpp"
 #include "reprojection.hpp"
 
 namespace {
@@ -82,5 +83,9 @@ std::shared_ptr<reprojection> reprojection::create_projection(int srs)
         break;
     }
 
+    if (srs <= 0) {
+        throw std::runtime_error{"Invalid projection SRID '{}'."_format(srs)};
+    }
+
     return make_generic_projection(srs);
 }

src/wkb.hpp

@@ -102,7 +102,10 @@ inline std::string create_point(double x, double y, uint32_t srid = 4326)
 class writer_t
 {
 public:
-    explicit writer_t(uint32_t srid) : m_srid(srid) {}
+    explicit writer_t(int srid) : m_srid(static_cast<uint32_t>(srid))
+    {
+        assert(srid > 0);
+    }
 
     void add_sub_geometry(std::string const &part)
     {