From 51a50fdf92bbf7d80ac26e77abc34ba52f430506 Mon Sep 17 00:00:00 2001
From: Daniel Patterson <danpat@danpat.net>
Date: Wed, 17 Jun 2015 17:16:59 -0700
Subject: [PATCH] Realize template functions so that we can actually link.

---
 src/svg/svg_parser.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/svg/svg_parser.cpp b/src/svg/svg_parser.cpp
index e2e6a84e9..1acedf287 100644
--- a/src/svg/svg_parser.cpp
+++ b/src/svg/svg_parser.cpp
@@ -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);
+
+
 
 }}