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

add parse_id_from_url method

Browse source
This commit is contained in:
artemp 2015-07-21 11:30:04 +02:00
parent f19ddf81ba
commit d7cf0d5bca
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/svg/svg_parser.cpp
View file

@ -149,6 +149,16 @@ bool parse_style (const char* str, pairs_type & v)
return phrase_parse(str, str + std::strlen(str), kv_parser, skip_type(), v);
}
bool parse_id_from_url (char const* str, std::string & id)
{
using namespace boost::spirit::qi;
using skip_type = boost::spirit::ascii::space_type;
qi::_1_type _1;
qi::char_type char_;
qi::lit_type lit;
return phrase_parse(str, str + std::strlen(str), lit("url") > "(" > "#" > *(char_ - lit(')'))[boost::phoenix::ref(id) += _1] > ")" , skip_type());
}
bool parse_reader(svg_parser & parser, xmlTextReaderPtr reader)
{
int ret = xmlTextReaderRead(reader);
@ -306,16 +316,14 @@ void parse_attr(svg_parser & parser, const xmlChar * name, const xmlChar * value
}
else if (xmlStrEqual(name, BAD_CAST "fill"))
{
std::string id;
if (xmlStrEqual(value, BAD_CAST "none"))
{
parser.path_.fill_none();
}
else if (boost::starts_with((const char*)value, "url(#"))
else if (parse_id_from_url((const char*)value, id))
{
// see if we have a known gradient fill
std::string id = std::string((const char*)&value[5]);
// get rid of the trailing )
id.erase(id.end()-1);
if (parser.gradient_map_.count(id) > 0)
{
parser.path_.add_fill_gradient(parser.gradient_map_[id]);

2
test/data

@ -1 +1 @@
Subproject commit bcaa7f2260630aaac1dc4c75db0cb877e1b6ba95
Subproject commit d1795652ab1e9fce645498b94a33ca660d3650f4