From 772c7f52fc5a6653068423b6dd8b0faf2de67548 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 12 Dec 2012 15:59:27 -0800 Subject: [PATCH] knock out some msvc compiler warnings --- include/mapnik/image_filter.hpp | 2 +- include/mapnik/markers_placement.hpp | 2 +- include/mapnik/octree.hpp | 2 +- plugins/input/gdal/gdal_featureset.cpp | 8 ++++---- src/agg/process_line_pattern_symbolizer.cpp | 2 +- src/agg/process_line_symbolizer.cpp | 2 +- src/cairo_renderer.cpp | 2 +- src/grid/process_line_symbolizer.cpp | 2 +- src/load_map.cpp | 6 +++--- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/mapnik/image_filter.hpp b/include/mapnik/image_filter.hpp index bf4af9389..d1967d504 100644 --- a/include/mapnik/image_filter.hpp +++ b/include/mapnik/image_filter.hpp @@ -114,7 +114,7 @@ namespace mapnik { namespace filter { namespace detail { -static const float blur_matrix[] = {0.1111,0.1111,0.1111,0.1111,0.1111,0.1111,0.1111,0.1111,0.1111}; +static const float blur_matrix[] = {0.1111f,0.1111f,0.1111f,0.1111f,0.1111f,0.1111f,0.1111f,0.1111f,0.1111f}; static const float emboss_matrix[] = {-2,-1,0,-1,1,1,0,1,2}; static const float sharpen_matrix[] = {0,-1,0,-1,5,-1,0,-1,0 }; static const float edge_detect_matrix[] = {0,1,0,1,-4,1,0,1,0 }; diff --git a/include/mapnik/markers_placement.hpp b/include/mapnik/markers_placement.hpp index f25cf9fe0..74b35011a 100644 --- a/include/mapnik/markers_placement.hpp +++ b/include/mapnik/markers_placement.hpp @@ -293,7 +293,7 @@ private: last_y = next_y; } } - unsigned points = round(length / s); + unsigned points = static_cast(round(length / s)); if (points == 0) return 0.0; //Path to short return length / points; } diff --git a/include/mapnik/octree.hpp b/include/mapnik/octree.hpp index 35b64c0d1..5535f2747 100644 --- a/include/mapnik/octree.hpp +++ b/include/mapnik/octree.hpp @@ -250,7 +250,7 @@ public: // select best of all reducible: unsigned red_idx = leaf_level_-1; - unsigned bestv = (*reducible_[red_idx].begin())->reduce_cost; + unsigned bestv = static_cast((*reducible_[red_idx].begin())->reduce_cost); for(unsigned i=red_idx; i>=InsertPolicy::MIN_LEVELS; i--) { if (!reducible_[i].empty()) diff --git a/plugins/input/gdal/gdal_featureset.cpp b/plugins/input/gdal/gdal_featureset.cpp index 08fef0f6b..9adc6f321 100644 --- a/plugins/input/gdal/gdal_featureset.cpp +++ b/plugins/input/gdal/gdal_featureset.cpp @@ -200,8 +200,8 @@ feature_ptr gdal_featureset::get_feature(mapnik::query const& q) // if layer-level filter_factor is set, apply it if (filter_factor_) { - im_width *= filter_factor_; - im_height *= filter_factor_; + im_width = int(im_width * filter_factor_ + 0.5); + im_height = int(im_height * filter_factor_ + 0.5); MAPNIK_LOG_DEBUG(gdal) << "gdal_featureset: Applying layer filter_factor=" << filter_factor_; } @@ -209,8 +209,8 @@ feature_ptr gdal_featureset::get_feature(mapnik::query const& q) else { double sym_downsample_factor = q.get_filter_factor(); - im_width *= sym_downsample_factor; - im_height *= sym_downsample_factor; + im_width = int(im_width * sym_downsample_factor + 0.5); + im_height = int(im_height * sym_downsample_factor + 0.5); } // case where we need to avoid upsampling so that the diff --git a/src/agg/process_line_pattern_symbolizer.cpp b/src/agg/process_line_pattern_symbolizer.cpp index c7f2a7098..29ce388b7 100644 --- a/src/agg/process_line_pattern_symbolizer.cpp +++ b/src/agg/process_line_pattern_symbolizer.cpp @@ -132,7 +132,7 @@ void agg_renderer::process(line_pattern_symbolizer const& sym, if (sym.clip()) { double padding = (double)(query_extent_.width()/pixmap_.width()); - float half_stroke = (*mark)->width()/2.0; + double half_stroke = (*mark)->width()/2.0; if (half_stroke > 1) padding *= half_stroke; clipping_extent.pad(padding); diff --git a/src/agg/process_line_symbolizer.cpp b/src/agg/process_line_symbolizer.cpp index ede7fb94e..0d99247df 100644 --- a/src/agg/process_line_symbolizer.cpp +++ b/src/agg/process_line_symbolizer.cpp @@ -89,7 +89,7 @@ void agg_renderer::process(line_symbolizer const& sym, if (sym.clip()) { double padding = (double)(query_extent_.width()/pixmap_.width()); - float half_stroke = stroke_.get_width()/2.0; + double half_stroke = stroke_.get_width()/2.0; if (half_stroke > 1) padding *= half_stroke; if (fabs(sym.offset()) > 0) diff --git a/src/cairo_renderer.cpp b/src/cairo_renderer.cpp index 32dd776a4..1b9e90540 100644 --- a/src/cairo_renderer.cpp +++ b/src/cairo_renderer.cpp @@ -1052,7 +1052,7 @@ void cairo_renderer_base::process(line_symbolizer const& sym, if (sym.clip()) { double padding = (double)(query_extent_.width()/width_); - float half_stroke = stroke_.get_width()/2.0; + double half_stroke = stroke_.get_width()/2.0; if (half_stroke > 1) padding *= half_stroke; if (fabs(sym.offset()) > 0) diff --git a/src/grid/process_line_symbolizer.cpp b/src/grid/process_line_symbolizer.cpp index b026b7544..be50bdfef 100644 --- a/src/grid/process_line_symbolizer.cpp +++ b/src/grid/process_line_symbolizer.cpp @@ -74,7 +74,7 @@ void grid_renderer::process(line_symbolizer const& sym, if (sym.clip()) { double padding = (double)(query_extent_.width()/pixmap_.width()); - float half_stroke = stroke_.get_width()/2.0; + double half_stroke = stroke_.get_width()/2.0; if (half_stroke > 1) padding *= half_stroke; if (fabs(sym.offset()) > 0) diff --git a/src/load_map.cpp b/src/load_map.cpp index 4d4e1b978..1f7efe210 100644 --- a/src/load_map.cpp +++ b/src/load_map.cpp @@ -1125,7 +1125,7 @@ void map_parser::parse_polygon_pattern_symbolizer(rule & rule, symbol.set_alignment(p_alignment); // opacity - optional opacity = sym.get_opt_attr("opacity"); + optional opacity = sym.get_opt_attr("opacity"); if (opacity) symbol.set_opacity(*opacity); // gamma @@ -1212,7 +1212,7 @@ void map_parser::parse_shield_symbolizer(rule & rule, xml_node const& sym) shield_symbol.set_shield_displacement(shield_dx,shield_dy); // opacity - optional opacity = sym.get_opt_attr("opacity"); + optional opacity = sym.get_opt_attr("opacity"); if (opacity) { shield_symbol.set_opacity(*opacity); @@ -1484,7 +1484,7 @@ void map_parser::parse_raster_symbolizer(rule & rule, xml_node const & sym) } // opacity - optional opacity = sym.get_opt_attr("opacity"); + optional opacity = sym.get_opt_attr("opacity"); if (opacity) raster_sym.set_opacity(*opacity); // filter factor