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

remove stderr for real

Browse source
This commit is contained in:
artemp 2016-04-11 13:08:19 +02:00
parent fa717bc698
commit b24ade9a1c
3 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/text/placement_finder.cpp
View file

@ -65,10 +65,8 @@ placement_finder::placement_finder(feature_impl const& feature,
bool placement_finder::next_position() bool placement_finder::next_position()
{ {
std::cerr << "next_position()" << std::endl;
if (info_.next()) if (info_.next())
{ {
std::cerr << "info_.next()" << std::endl;
// parent layout, has top-level ownership of a new evaluated_format_properties_ptr (TODO is this good enough to stay in scope???) // parent layout, has top-level ownership of a new evaluated_format_properties_ptr (TODO is this good enough to stay in scope???)
// but does not take ownership of the text_symbolizer_properties (info_.properties) // but does not take ownership of the text_symbolizer_properties (info_.properties)
text_layout_ptr layout = std::make_shared<text_layout>(font_manager_, text_layout_ptr layout = std::make_shared<text_layout>(font_manager_,

2
src/text/placements/list.cpp
View file

@ -34,7 +34,6 @@ namespace mapnik
bool text_placement_info_list::next() const bool text_placement_info_list::next() const
{ {
std::cerr << " state=" << state << " next()" << std::endl;
if (state == 0) if (state == 0)
{ {
properties = parent_->defaults; properties = parent_->defaults;
@ -96,7 +95,6 @@ text_placements_ptr text_placements_list::from_xml(xml_node const& node, fontset
{ {
auto list = std::make_shared<text_placements_list>(); auto list = std::make_shared<text_placements_list>();
list->defaults.from_xml(node, fontsets, is_shield); list->defaults.from_xml(node, fontsets, is_shield);
int count = 0;
for( auto const& child : node) for( auto const& child : node)
{ {
if (child.is_text() || !child.is("Placement")) continue; if (child.is_text() || !child.is("Placement")) continue;

7
src/text/symbolizer_helpers.cpp
View file

@ -351,7 +351,6 @@ bool text_symbolizer_helper::next_line_placement() const
if (geo_itr_ == geometries_to_process_.end()) if (geo_itr_ == geometries_to_process_.end())
{ {
//Just processed the last geometry. Try next placement. //Just processed the last geometry. Try next placement.
std::cerr << "Just processed the last geometry. Try next placement." << std::endl;
if (!finder_.next_position()) return false; //No more placements if (!finder_.next_position()) return false; //No more placements
//Start again from begin of list //Start again from begin of list
geo_itr_ = geometries_to_process_.begin(); geo_itr_ = geometries_to_process_.begin();
@ -361,14 +360,10 @@ bool text_symbolizer_helper::next_line_placement() const
if (mapnik::util::apply_visitor(apply_line_placement_visitor(converter_, adapter_), *geo_itr_)) if (mapnik::util::apply_visitor(apply_line_placement_visitor(converter_, adapter_), *geo_itr_))
{ {
//Found a placement //Found a placement
std::cerr << "Found placement!" << std::endl;
geo_itr_ = geometries_to_process_.erase(geo_itr_); geo_itr_ = geometries_to_process_.erase(geo_itr_);
return true; return true;
} }
else
{
std::cerr << "ELSE?" << std::endl;
}
// No placement for this geometry. Keep it in geometries_to_process_ for next try. // No placement for this geometry. Keep it in geometries_to_process_ for next try.
++geo_itr_; ++geo_itr_;
} }