+ cleanup/formatting

This commit is contained in:
Artem Pavlenko 2011-05-09 09:11:49 +00:00
parent 1b1bd4b02e
commit 7b620a9f71
2 changed files with 5 additions and 6 deletions

View file

@ -40,10 +40,9 @@ namespace mapnik { namespace svg {
class svg_parser : private boost::noncopyable
{
public:
explicit svg_parser(svg_converter_type & path);
~svg_parser();
void parse(std::string const& filename);
explicit svg_parser(svg_converter_type & path);
~svg_parser();
void parse(std::string const& filename);
private:
void process_node(xmlTextReaderPtr reader);
void start_element(xmlTextReaderPtr reader);

View file

@ -135,7 +135,7 @@ struct wkt_grammar : qi::grammar<Iterator, geometry_type*(), ascii::space_type>
};
template <typename Iterator>
struct wkt_collection_grammar : qi::grammar<Iterator, boost::ptr_vector<mapnik::geometry_type>(), ascii::space_type>
struct wkt_collection_grammar : qi::grammar<Iterator, boost::ptr_vector<geometry_type>(), ascii::space_type>
{
wkt_collection_grammar()
: wkt_collection_grammar::base_type(start)
@ -148,7 +148,7 @@ struct wkt_collection_grammar : qi::grammar<Iterator, boost::ptr_vector<mapnik::
>> (lit("(") >> *wkt[push_back(_val,_1)] % lit(",") >> lit(")"));
}
qi::rule<Iterator,boost::ptr_vector<mapnik::geometry_type>(),ascii::space_type> start;
qi::rule<Iterator,boost::ptr_vector<geometry_type>(),ascii::space_type> start;
wkt_grammar<Iterator> wkt;
};