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

Fix build errors introduced by 4e3e5cb0b0.

Browse source
This commit is contained in:
Hermann Kraus 2012-07-29 01:31:10 +02:00
parent 3a16d2749a
commit 9cdb9a7bf3
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bindings/python/mapnik_shield_symbolizer.cpp
View file

@ -60,8 +60,8 @@ tuple get_shield_displacement(const shield_symbolizer& s)
void set_shield_displacement(shield_symbolizer & s, boost::python::tuple arg) void set_shield_displacement(shield_symbolizer & s, boost::python::tuple arg)
{ {
s.get_placement_options()->defaults.displacement.first = extract<double>(arg[0]); s.get_placement_options()->defaults.displacement.x = extract<double>(arg[0]);
s.get_placement_options()->defaults.displacement.second = extract<double>(arg[1]); s.get_placement_options()->defaults.displacement.y = extract<double>(arg[1]);
} }
tuple get_text_displacement(const shield_symbolizer& t) tuple get_text_displacement(const shield_symbolizer& t)

1
include/mapnik/map.hpp
View file

@ -30,6 +30,7 @@
#include <mapnik/layer.hpp> #include <mapnik/layer.hpp>
#include <mapnik/metawriter/properties.hpp> #include <mapnik/metawriter/properties.hpp>
#include <mapnik/params.hpp> #include <mapnik/params.hpp>
#include <mapnik/ctrans.hpp>
// boost // boost
#include <boost/optional/optional.hpp> #include <boost/optional/optional.hpp>

6
src/save_map.cpp
View file

@ -204,10 +204,10 @@ public:
set_attr(sym_node, "unlock-image", sym.get_unlock_image()); set_attr(sym_node, "unlock-image", sym.get_unlock_image());
} }
if (sym.get_placement_options()->defaults.format.text_opacity != if (sym.get_placement_options()->defaults.format->text_opacity !=
dfl.get_placement_options()->defaults.format.text_opacity || explicit_defaults_) dfl.get_placement_options()->defaults.format->text_opacity || explicit_defaults_)
{ {
set_attr(sym_node, "text-opacity", sym.get_placement_options()->defaults.format.text_opacity); set_attr(sym_node, "text-opacity", sym.get_placement_options()->defaults.format->text_opacity);
} }
pixel_position displacement = sym.get_shield_displacement(); pixel_position displacement = sym.get_shield_displacement();
if (displacement.x != dfl.get_shield_displacement().x || explicit_defaults_) if (displacement.x != dfl.get_shield_displacement().x || explicit_defaults_)