From 7491d08b67c88513cc77f9c906d624b8970b4d8a Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Fri, 18 Nov 2011 15:55:27 -0800 Subject: [PATCH] silence a few msvc cast warnings --- include/mapnik/marker.hpp | 4 ++-- include/mapnik/markers_placement.hpp | 2 +- include/mapnik/svg/svg_renderer.hpp | 2 +- src/text_symbolizer.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/mapnik/marker.hpp b/include/mapnik/marker.hpp index 571180ecd..257c597cb 100644 --- a/include/mapnik/marker.hpp +++ b/include/mapnik/marker.hpp @@ -84,7 +84,7 @@ public: if (is_bitmap()) return (*bitmap_data_)->width(); else if (is_vector()) - return (*vector_data_)->bounding_box().width(); + return static_cast((*vector_data_)->bounding_box().width()); return 0; } inline unsigned height() const @@ -92,7 +92,7 @@ public: if (is_bitmap()) return (*bitmap_data_)->height(); else if (is_vector()) - return (*vector_data_)->bounding_box().height(); + return static_cast((*vector_data_)->bounding_box().height()); return 0; } diff --git a/include/mapnik/markers_placement.hpp b/include/mapnik/markers_placement.hpp index 259fd4ae4..b69ef1dd5 100644 --- a/include/mapnik/markers_placement.hpp +++ b/include/mapnik/markers_placement.hpp @@ -106,7 +106,7 @@ template double markers_placement 1) u = 1; - return u*d; + return static_cast(u*d); } private: double x1_; diff --git a/src/text_symbolizer.cpp b/src/text_symbolizer.cpp index db0e86261..00a91401d 100644 --- a/src/text_symbolizer.cpp +++ b/src/text_symbolizer.cpp @@ -105,7 +105,7 @@ text_symbolizer::text_symbolizer(expression_ptr name, std::string const& face_na max_char_angle_delta_(22.5 * M_PI/180.0), fill_(fill), halo_fill_(color(255,255,255)), - halo_radius_(0), + halo_radius_(0.0), label_p_(POINT_PLACEMENT), anchor_(0.0,0.5), avoid_edges_(false), @@ -138,7 +138,7 @@ text_symbolizer::text_symbolizer(expression_ptr name, float size, color const& f max_char_angle_delta_(22.5 * M_PI/180.0), fill_(fill), halo_fill_(color(255,255,255)), - halo_radius_(0), + halo_radius_(0.0), label_p_(POINT_PLACEMENT), anchor_(0.0,0.5), avoid_edges_(false),