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

+ cleanup/formatting

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/mapnik/svg/svg_parser.hpp
View file

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

4
include/mapnik/wkt/wkt_grammar.hpp
View file

@ -135,7 +135,7 @@ struct wkt_grammar : qi::grammar<Iterator, geometry_type*(), ascii::space_type>
}; };
template <typename Iterator> 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()
: wkt_collection_grammar::base_type(start) : 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(")")); >> (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; wkt_grammar<Iterator> wkt;
}; };