diff --git a/include/mapnik/feature_style_processor.hpp b/include/mapnik/feature_style_processor.hpp index 6a652150c..cbabce091 100644 --- a/include/mapnik/feature_style_processor.hpp +++ b/include/mapnik/feature_style_processor.hpp @@ -98,16 +98,16 @@ private: * \brief prepare features for rendering asynchronously. */ void prepare_layer(layer_rendering_material & mat, - feature_style_context_map & ctx_map, - Processor & p, - projection const& proj0, - double scale, - double scale_denom, - unsigned width, - unsigned height, - box2d const& extent, - int buffer_size, - std::set& names); + feature_style_context_map & ctx_map, + Processor & p, + projection const& proj0, + double scale, + double scale_denom, + unsigned width, + unsigned height, + box2d const& extent, + int buffer_size, + std::set& names); /*! * \brief render features list queued when they are available. diff --git a/include/mapnik/feature_style_processor_impl.hpp b/include/mapnik/feature_style_processor_impl.hpp index 2bd7fda97..6c6965c90 100644 --- a/include/mapnik/feature_style_processor_impl.hpp +++ b/include/mapnik/feature_style_processor_impl.hpp @@ -45,7 +45,6 @@ #include #include - // boost #include #include @@ -519,9 +518,9 @@ void feature_style_processor::prepare_layer(layer_rendering_material template void feature_style_processor::render_material(layer_rendering_material & mat, Processor & p ) { - std::vector & active_styles = mat.active_styles_; - std::vector & featureset_ptr_list = mat.featureset_ptr_list_; - if (featureset_ptr_list.empty()) + std::vector & active_styles = mat.active_styles_; + std::vector & featureset_ptr_list = mat.featureset_ptr_list_; + if (featureset_ptr_list.empty()) { // The datasource wasn't querried because of early return // but we have to apply compositing operations on styles @@ -530,7 +529,6 @@ void feature_style_processor::render_material(layer_rendering_materia p.start_style_processing(*style); p.end_style_processing(*style); } - return; } diff --git a/tests/python_tests/webp_encoding_test.py b/tests/python_tests/webp_encoding_test.py index 7b1f6462e..685ce461c 100644 --- a/tests/python_tests/webp_encoding_test.py +++ b/tests/python_tests/webp_encoding_test.py @@ -18,9 +18,9 @@ if mapnik.has_webp(): os.makedirs(tmp_dir) opts = [ - 'webp', - 'webp:quality=64', - 'webp:alpha=false' + 'webp', + 'webp:quality=64', + 'webp:alpha=false' ] diff --git a/tests/visual_tests/styles/list.xml b/tests/visual_tests/styles/list.xml index 50a189bd1..d1332be80 100644 --- a/tests/visual_tests/styles/list.xml +++ b/tests/visual_tests/styles/list.xml @@ -15,8 +15,8 @@ [name] - 'S'+[nr] - [nr] + 'S'+[nr] + [nr]