From 842e4bebe61bf156c9b2c2dae7e473d708b7cfc4 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Mon, 16 Feb 2015 18:48:14 -0800
Subject: [PATCH] start fixing windows compile - refs #2708

---
 include/mapnik/image_util.hpp | 29 -----------------------------
 src/image_util.cpp            | 12 ++++++------
 2 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/include/mapnik/image_util.hpp b/include/mapnik/image_util.hpp
index b2b723e8b..e59b8f086 100644
--- a/include/mapnik/image_util.hpp
+++ b/include/mapnik/image_util.hpp
@@ -409,35 +409,6 @@ void add_border(T & image)
     }
 }
 
-#ifdef _MSC_VER
-
-template MAPNIK_DECL void save_to_stream<image_rgba8>(
-    image_rgba8 const& image,
-    std::ostream & stream,
-    std::string const& type,
-    rgba_palette const& palette
-);
-
-template MAPNIK_DECL void save_to_stream<image_rgba8>(
-    image_rgba8 const& image,
-    std::ostream & stream,
-    std::string const& type
-);
-
-template MAPNIK_DECL void save_to_stream<image_view_rgba8> (
-    image_view_rgba8 const& image,
-    std::ostream & stream,
-    std::string const& type,
-    rgba_palette const& palette
-);
-
-template MAPNIK_DECL void save_to_stream<image_view_rgba8> (
-    image_view_rgba8 const& image,
-    std::ostream & stream,
-    std::string const& type
-);
-#endif
-
 }
 
 #endif // MAPNIK_IMAGE_UTIL_HPP
diff --git a/src/image_util.cpp b/src/image_util.cpp
index bfe1246e6..0a861f128 100644
--- a/src/image_util.cpp
+++ b/src/image_util.cpp
@@ -613,7 +613,7 @@ struct visitor_set_alpha
 
     void operator() (image_rgba8 & data)
     {
-        using pixel_type = typename image_rgba8::pixel_type;
+        using pixel_type = image_rgba8::pixel_type;
         for (unsigned int y = 0; y < data.height(); ++y)
         {
             pixel_type* row_to =  data.getRow(y);
@@ -689,7 +689,7 @@ struct visitor_set_grayscale_to_alpha
 {
     void operator() (image_rgba8 & data)
     {
-        using pixel_type = typename image_rgba8::pixel_type;
+        using pixel_type = image_rgba8::pixel_type;
         for (unsigned int y = 0; y < data.height(); ++y)
         {
             pixel_type* row_from = data.getRow(y);
@@ -722,7 +722,7 @@ struct visitor_set_grayscale_to_alpha_c
 
     void operator() (image_rgba8 & data)
     {
-        using pixel_type = typename image_rgba8::pixel_type;
+        using pixel_type = image_rgba8::pixel_type;
         for (unsigned int y = 0; y < data.height(); ++y)
         {
             pixel_type* row_from = data.getRow(y);
@@ -834,7 +834,7 @@ struct visitor_set_color_to_alpha
 
     void operator() (image_rgba8 & data)
     {
-        using pixel_type = typename image_rgba8::pixel_type;
+        using pixel_type = image_rgba8::pixel_type;
         for (unsigned y = 0; y < data.height(); ++y)
         {
             pixel_type* row_from = data.getRow(y);
@@ -942,7 +942,7 @@ struct visitor_fill<color>
     
     void operator() (image_rgba8 & data)
     {
-        using pixel_type = typename image_rgba8::pixel_type;
+        using pixel_type = image_rgba8::pixel_type;
         pixel_type val = static_cast<pixel_type>(val_.rgba());
         data.set(val);
         data.set_premultiplied(val_.get_premultiplied());
@@ -1198,7 +1198,7 @@ struct visitor_set_rectangle
 
     void operator()(image_rgba8 & dst)
     {
-        using pixel_type = typename image_rgba8::pixel_type;
+        using pixel_type = image_rgba8::pixel_type;
         image_rgba8 src = util::get<image_rgba8>(src_);
         box2d<int> ext0(0,0,dst.width(),dst.height());
         box2d<int> ext1(x0_,y0_,x0_+src.width(),y0_+src.height());