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

Easier syntax by hiding internal data type.

Browse source
This commit is contained in:
Hermann Kraus 2012-02-03 00:34:14 +01:00
parent 1e2897b28d
commit 9c92bf713d
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/mapnik/text_placements.hpp
View file

@ -117,6 +117,7 @@ struct text_symbolizer_properties
/** Default values for char_properties. */
char_properties default_format;
private:
/** A tree of formating::nodes which contain text and formating information. */
formating::node_ptr tree_;
};
@ -133,7 +134,7 @@ public:
};
public:
processed_text(face_manager<freetype_engine> & font_manager, double scale_factor);
void push_back(processed_expression const& exp);
void push_back(char_properties const& properties, UnicodeString const& text);
unsigned size() const { return expr_list_.size(); }
unsigned empty() const { return expr_list_.empty(); }
void clear();

6
src/text_processing.cpp
View file

@ -170,7 +170,7 @@ void text_node::apply(char_properties const& p, Feature const& feature, processe
text_str = text_str.toTitle(NULL);
}
if (text_str.length() > 0) {
output.push_back(processed_text::processed_expression(p, text_str));
output.push_back(p, text_str);
} else {
#ifdef MAPNIK_DEBUG
std::cerr << "Warning: Empty expression.\n";
@ -346,9 +346,9 @@ void format_node::set_halo_radius(optional<double> radius)
/************************************************************/
void processed_text::push_back(processed_expression const& exp)
void processed_text::push_back(char_properties const& properties, UnicodeString const& text)
{
expr_list_.push_back(exp);
expr_list_.push_back(processed_expression(properties, text));
}
processed_text::expression_list::const_iterator processed_text::begin() const