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

formatting

Browse source
This commit is contained in:
Dane Springmeyer 2012-03-22 16:37:24 -07:00
parent d23a4b63b9
commit d991427737
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/agg/process_line_symbolizer.cpp
View file

@ -52,7 +52,7 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
proj_transform const& prj_trans)
{
typedef agg::renderer_base<agg::pixfmt_rgba32_plain> ren_base;
stroke const& stroke_ = sym.get_stroke();
color const& col = stroke_.get_color();
unsigned r=col.red();
@ -104,7 +104,7 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
ras_ptr->reset();
set_gamma_method(stroke_, ras_ptr);
//metawriter_with_properties writer = sym.get_metawriter();
for (unsigned i=0;i<feature->num_geometries();++i)
{
@ -145,7 +145,7 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
clipped_geometry_type clipped(geom);
clipped.clip_box(ext.minx(),ext.miny(),ext.maxx(),ext.maxy());
path_type path(t_,clipped,prj_trans);
agg::conv_dash<path_type> dash(path);
dash_array const& d = stroke_.get_dash_array();
dash_array::const_iterator itr = d.begin();
@ -191,7 +191,7 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
set_join_caps(stroke_,stroke);
stroke.generator().miter_limit(4.0);
stroke.generator().width(stroke_.get_width() * scale_factor_);
ras_ptr->add_path(stroke);
ras_ptr->add_path(stroke);
}
//if (writer.first) writer.first->add_line(path, *feature, t_, writer.second);
}

2
src/agg/process_polygon_pattern_symbolizer.cpp
View file

@ -74,7 +74,7 @@ void agg_renderer<T>::process(polygon_pattern_symbolizer const& sym,
agg::scanline_u8 sl;
ras_ptr->reset();
set_gamma_method(sym,ras_ptr);
std::string filename = path_processor_type::evaluate( *sym.get_filename(), *feature);
boost::optional<mapnik::marker_ptr> marker;
if ( !filename.empty() )

2
src/agg/process_polygon_symbolizer.cpp
View file

@ -67,7 +67,7 @@ void agg_renderer<T>::process(polygon_symbolizer const& sym,
ras_ptr->reset();
set_gamma_method(sym,ras_ptr);
//metawriter_with_properties writer = sym.get_metawriter();
box2d<double> inflated_extent = query_extent_ * 1.1;
for (unsigned i=0;i<feature->num_geometries();++i)

8
src/cairo_renderer.cpp
View file

@ -754,7 +754,7 @@ void cairo_renderer_base::start_map_processing(Map const& map)
clipped.clip_box(query_extent_.minx(),query_extent_.miny(),query_extent_.maxx(),query_extent_.maxy());
path_type path(t_,clipped,prj_trans);
context.add_path(path);
}
}
}
}
// fill polygon
@ -877,7 +877,7 @@ void cairo_renderer_base::start_map_processing(Map const& map)
{
typedef agg::conv_clip_polyline<geometry_type> clipped_geometry_type;
typedef coord_transform2<CoordTransform,clipped_geometry_type> path_type;
mapnik::stroke const& stroke_ = sym.get_stroke();
cairo_context context(context_);
context.set_color(stroke_.get_color(), stroke_.get_opacity());
@ -889,7 +889,7 @@ void cairo_renderer_base::start_map_processing(Map const& map)
{
context.set_dash(stroke_.get_dash_array());
}
for (unsigned i = 0; i < feature->num_geometries(); ++i)
{
geometry_type & geom = feature->get_geometry(i);
@ -900,7 +900,7 @@ void cairo_renderer_base::start_map_processing(Map const& map)
clipped_geometry_type clipped(geom);
clipped.clip_box(query_extent_.minx(),query_extent_.miny(),query_extent_.maxx(),query_extent_.maxy());
path_type path(t_,clipped,prj_trans);
context.add_path(path);
}
}

4
src/load_map.cpp
View file

@ -991,7 +991,7 @@ void map_parser::parse_line_pattern_symbolizer(rule & rule, xml_node const & sym
}
void map_parser::parse_polygon_pattern_symbolizer(rule & rule,
xml_node const & sym)
xml_node const & sym)
{
try
{
@ -1307,7 +1307,7 @@ void map_parser::parse_polygon_symbolizer(rule & rule, xml_node const & sym)
// smooth value
optional<double> smooth = sym.get_opt_attr<double>("smooth");
if (smooth) poly_sym.set_smooth(*smooth);
parse_metawriter_in_symbolizer(poly_sym, sym);
rule.append(poly_sym);
}

2
src/save_map.cpp
View file

@ -96,7 +96,7 @@ public:
set_attr( sym_node, "smooth", sym.smooth() );
}
}
void operator () ( line_pattern_symbolizer const& sym )
{
ptree & sym_node = rule_.push_back(