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

Remove next_position_only().

Browse source
This commit is contained in:
Hermann Kraus 2012-01-22 18:28:30 +01:00
parent fdd58903f9
commit 78c4464ad7
3 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/mapnik/text_placements.hpp
View file

@ -129,7 +129,6 @@ public:
* If this functions returns false the placement data should be considered invalid!
*/
virtual bool next()=0;
virtual bool next_position_only() { return false; }
virtual ~text_placement_info() {}
void init(double scale_factor_,
unsigned w = 0, unsigned h = 0, bool has_dimensions_ = false);
@ -190,12 +189,10 @@ class MAPNIK_DECL text_placement_info_dummy : public text_placement_info
{
public:
text_placement_info_dummy(text_placements_dummy const* parent) : text_placement_info(parent),
state(0), position_state(0), parent_(parent) {}
state(0), parent_(parent) {}
bool next();
bool next_position_only();
private:
unsigned state;
unsigned position_state;
text_placements_dummy const* parent_;
};

2
include/mapnik/text_placements_simple.hpp
View file

@ -67,8 +67,8 @@ public:
text_placement_info_simple(text_placements_simple const* parent) :
text_placement_info(parent), state(0), position_state(0), parent_(parent) {}
bool next();
protected:
bool next_position_only();
private:
unsigned state;
unsigned position_state;
text_placements_simple const* parent_;

7
src/text_placements.cpp
View file

@ -347,13 +347,6 @@ bool text_placement_info_dummy::next()
return true;
}
bool text_placement_info_dummy::next_position_only()
{
if (position_state) return false;
position_state++;
return true;
}
text_placement_info_ptr text_placements_dummy::get_placement_info() const
{
return text_placement_info_ptr(new text_placement_info_dummy(this));