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

remove tabs

Browse source
This commit is contained in:
Dane Springmeyer 2013-09-30 13:30:16 -07:00
parent a6ad3e6627
commit 8ebd804360
4 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
include/mapnik/feature_style_processor.hpp
View file

@ -98,16 +98,16 @@ private:
* \brief prepare features for rendering asynchronously. * \brief prepare features for rendering asynchronously.
*/ */
void prepare_layer(layer_rendering_material & mat, void prepare_layer(layer_rendering_material & mat,
feature_style_context_map & ctx_map, feature_style_context_map & ctx_map,
Processor & p, Processor & p,
projection const& proj0, projection const& proj0,
double scale, double scale,
double scale_denom, double scale_denom,
unsigned width, unsigned width,
unsigned height, unsigned height,
box2d<double> const& extent, box2d<double> const& extent,
int buffer_size, int buffer_size,
std::set<std::string>& names); std::set<std::string>& names);
/*! /*!
* \brief render features list queued when they are available. * \brief render features list queued when they are available.

8
include/mapnik/feature_style_processor_impl.hpp
View file

@ -45,7 +45,6 @@
#include <mapnik/proj_transform.hpp> #include <mapnik/proj_transform.hpp>
#include <mapnik/util/featureset_buffer.hpp> #include <mapnik/util/featureset_buffer.hpp>
// boost // boost
#include <boost/variant/apply_visitor.hpp> #include <boost/variant/apply_visitor.hpp>
#include <boost/variant/static_visitor.hpp> #include <boost/variant/static_visitor.hpp>
@ -519,9 +518,9 @@ void feature_style_processor<Processor>::prepare_layer(layer_rendering_material
template <typename Processor> template <typename Processor>
void feature_style_processor<Processor>::render_material(layer_rendering_material & mat, Processor & p ) void feature_style_processor<Processor>::render_material(layer_rendering_material & mat, Processor & p )
{ {
std::vector<feature_type_style const*> & active_styles = mat.active_styles_; std::vector<feature_type_style const*> & active_styles = mat.active_styles_;
std::vector<featureset_ptr> & featureset_ptr_list = mat.featureset_ptr_list_; std::vector<featureset_ptr> & featureset_ptr_list = mat.featureset_ptr_list_;
if (featureset_ptr_list.empty()) if (featureset_ptr_list.empty())
{ {
// The datasource wasn't querried because of early return // The datasource wasn't querried because of early return
// but we have to apply compositing operations on styles // but we have to apply compositing operations on styles
@ -530,7 +529,6 @@ void feature_style_processor<Processor>::render_material(layer_rendering_materia
p.start_style_processing(*style); p.start_style_processing(*style);
p.end_style_processing(*style); p.end_style_processing(*style);
} }
return; return;
} }

6
tests/python_tests/webp_encoding_test.py
View file

@ -18,9 +18,9 @@ if mapnik.has_webp():
os.makedirs(tmp_dir) os.makedirs(tmp_dir)
opts = [ opts = [
'webp', 'webp',
'webp:quality=64', 'webp:quality=64',
'webp:alpha=false' 'webp:alpha=false'
] ]

4
tests/visual_tests/styles/list.xml
View file

@ -15,8 +15,8 @@
<PointSymbolizer/> <PointSymbolizer/>
<TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" dy="8" fill="blue" placement-type="list">[name] <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" dy="8" fill="blue" placement-type="list">[name]
<Placement size="10" dy="-8" fill="red"/> <Placement size="10" dy="-8" fill="red"/>
<Placement fill="green">'S'+[nr]</Placement> <Placement fill="green">'S'+[nr]</Placement>
<Placement fill="orange" dy="8">[nr]</Placement> <Placement fill="orange" dy="8">[nr]</Placement>
</TextSymbolizer> </TextSymbolizer>
</Rule> </Rule>
</Style> </Style>