From cc76ac4c6a74aadab42cb89f99064c443496199e Mon Sep 17 00:00:00 2001 From: artemp Date: Thu, 28 Aug 2014 09:57:24 +0100 Subject: [PATCH] c++ style - avoid implicit bool conversions in comparison + make note re:scale_denom *= p.scale_factor(); --- include/mapnik/feature_style_processor_impl.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/mapnik/feature_style_processor_impl.hpp b/include/mapnik/feature_style_processor_impl.hpp index ae31a2ef4..b684b9652 100644 --- a/include/mapnik/feature_style_processor_impl.hpp +++ b/include/mapnik/feature_style_processor_impl.hpp @@ -162,7 +162,7 @@ void feature_style_processor::apply(double scale_denom) projection proj(m_.srs(),true); if (scale_denom <= 0.0) scale_denom = mapnik::scale_denominator(m_.scale(),proj.is_geographic()); - scale_denom *= p.scale_factor(); + scale_denom *= p.scale_factor(); // FIXME - we might want to comment this out // Asynchronous query supports: // This is a two steps process, @@ -293,7 +293,7 @@ void feature_style_processor::prepare_layer(layer_rendering_material std::vector const& style_names = lay.styles(); unsigned int num_styles = style_names.size(); - if (! num_styles) + if (num_styles == 0) { MAPNIK_LOG_DEBUG(feature_style_processor) << "feature_style_processor: No style for layer=" << lay.name(); @@ -301,7 +301,7 @@ void feature_style_processor::prepare_layer(layer_rendering_material } mapnik::datasource_ptr ds = lay.datasource(); - if (! ds) + if (!ds) { MAPNIK_LOG_DEBUG(feature_style_processor) << "feature_style_processor: No datasource for layer=" << lay.name();