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

Realize template functions so that we can actually link.

Browse source
This commit is contained in:
Daniel Patterson 2015-06-17 17:16:59 -07:00
parent fb289417e5
commit 51a50fdf92
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/svg/svg_parser.cpp
View file

@ -57,7 +57,6 @@
namespace mapnik { namespace svg {
bool parse_reader(svg_parser & parser,xmlTextReaderPtr reader);
void process_node(svg_parser & parser,xmlTextReaderPtr reader);
void start_element(svg_parser & parser,xmlTextReaderPtr reader);
void end_element(svg_parser & parser,xmlTextReaderPtr reader);
@ -1093,13 +1092,13 @@ void svg_parser::parse_from_string(std::string const& svg)
}
template <typename T>
int xmlInputReadCallback(boost::iostreams::stream<T> * stream, char * buffer, int len) {
int _xmlInputReadCallback(boost::iostreams::stream<T> * stream, char * buffer, int len) {
stream->read(buffer,len);
return stream->gcount();
}
template <typename T>
int xmlInputCloseCallback(boost::iostreams::stream<T> * stream)
int _xmlInputCloseCallback(boost::iostreams::stream<T> * stream)
{
if(stream->close())
{
@ -1111,9 +1110,9 @@ int xmlInputCloseCallback(boost::iostreams::stream<T> * stream)
template <typename T>
void svg_parser::parse_from_stream(boost::iostreams::stream<T> const& svg_stream)
{
xmlTextReaderPtr reader = xmlReaderForIO(xmlInputReadCallback<T>,
xmlInputCloseCallback<T>
&svg_stream,
xmlTextReaderPtr reader = xmlReaderForIO(_xmlInputReadCallback<T>,
_xmlInputCloseCallback<T>,
reinterpret_cast<const void *>(&svg_stream),
nullptr,
nullptr,
(XML_PARSE_NOBLANKS | XML_PARSE_NOCDATA | XML_PARSE_NOERROR | XML_PARSE_NOWARNING));
@ -1127,5 +1126,9 @@ void svg_parser::parse_from_stream(boost::iostreams::stream<T> const& svg_stream
}
}
template void svg_parser::parse_from_stream(boost::iostreams::stream<boost::iostreams::file_source> const& svg_stream);
template void svg_parser::parse_from_stream(boost::iostreams::stream<boost::iostreams::array_source> const& svg_stream);
}}