sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

c++ style - avoid implicit bool conversions in comparison + make note re:scale_denom *= p.scale_factor();

Browse source
This commit is contained in:
artemp 2014-08-28 09:57:24 +01:00
parent 4628dc3ff3
commit cc76ac4c6a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/mapnik/feature_style_processor_impl.hpp
View file

@ -162,7 +162,7 @@ void feature_style_processor<Processor>::apply(double scale_denom)
projection proj(m_.srs(),true); projection proj(m_.srs(),true);
if (scale_denom <= 0.0) if (scale_denom <= 0.0)
scale_denom = mapnik::scale_denominator(m_.scale(),proj.is_geographic()); 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: // Asynchronous query supports:
// This is a two steps process, // This is a two steps process,
@ -293,7 +293,7 @@ void feature_style_processor<Processor>::prepare_layer(layer_rendering_material
std::vector<std::string> const& style_names = lay.styles(); std::vector<std::string> const& style_names = lay.styles();
unsigned int num_styles = style_names.size(); unsigned int num_styles = style_names.size();
if (! num_styles) if (num_styles == 0)
{ {
MAPNIK_LOG_DEBUG(feature_style_processor) MAPNIK_LOG_DEBUG(feature_style_processor)
<< "feature_style_processor: No style for layer=" << lay.name(); << "feature_style_processor: No style for layer=" << lay.name();
@ -301,7 +301,7 @@ void feature_style_processor<Processor>::prepare_layer(layer_rendering_material
} }
mapnik::datasource_ptr ds = lay.datasource(); mapnik::datasource_ptr ds = lay.datasource();
if (! ds) if (!ds)
{ {
MAPNIK_LOG_DEBUG(feature_style_processor) MAPNIK_LOG_DEBUG(feature_style_processor)
<< "feature_style_processor: No datasource for layer=" << lay.name(); << "feature_style_processor: No datasource for layer=" << lay.name();