From a69758fa7fc84e629a10a85903b4df73b6212b7d Mon Sep 17 00:00:00 2001 From: artemp Date: Tue, 11 Oct 2016 12:57:20 +0200 Subject: [PATCH] remove bogus template instantiations --- src/image.cpp | 1 - src/image_util_jpeg.cpp | 2 -- src/image_util_png.cpp | 4 ---- src/image_util_webp.cpp | 2 -- src/image_view.cpp | 2 -- 5 files changed, 11 deletions(-) diff --git a/src/image.cpp b/src/image.cpp index 5141860b7..9772fb7dc 100644 --- a/src/image.cpp +++ b/src/image.cpp @@ -88,7 +88,6 @@ template struct MAPNIK_DECL image_dimensions<65535>; } // end ns detail -template class MAPNIK_DECL image; template class MAPNIK_DECL image; template class MAPNIK_DECL image; template class MAPNIK_DECL image; diff --git a/src/image_util_jpeg.cpp b/src/image_util_jpeg.cpp index 13860fd4e..32d1979a3 100644 --- a/src/image_util_jpeg.cpp +++ b/src/image_util_jpeg.cpp @@ -119,7 +119,6 @@ void jpeg_saver::operator() (T const& image) const throw image_writer_exception("Mapnik does not support jpeg grayscale images"); } -template void jpeg_saver::operator() (image_rgba8 const& image) const; template void jpeg_saver::operator() (image_gray8 const& image) const; template void jpeg_saver::operator() (image_gray8s const& image) const; template void jpeg_saver::operator() (image_gray16 const& image) const; @@ -130,7 +129,6 @@ template void jpeg_saver::operator() (image_gray32f const& image) template void jpeg_saver::operator() (image_gray64 const& image) const; template void jpeg_saver::operator() (image_gray64s const& image) const; template void jpeg_saver::operator() (image_gray64f const& image) const; -template void jpeg_saver::operator() (image_view_rgba8 const& image) const; template void jpeg_saver::operator() (image_view_gray8 const& image) const; template void jpeg_saver::operator() (image_view_gray8s const& image) const; template void jpeg_saver::operator() (image_view_gray16 const& image) const; diff --git a/src/image_util_png.cpp b/src/image_util_png.cpp index f09d58019..322acd226 100644 --- a/src/image_util_png.cpp +++ b/src/image_util_png.cpp @@ -316,7 +316,6 @@ void png_saver_pal::operator() (T const& image) const #endif } -template void png_saver::operator() (image_rgba8 const& image) const; template void png_saver::operator() (image_gray8 const& image) const; template void png_saver::operator() (image_gray8s const& image) const; template void png_saver::operator() (image_gray16 const& image) const; @@ -327,7 +326,6 @@ template void png_saver::operator() (image_gray32f const& image) template void png_saver::operator() (image_gray64 const& image) const; template void png_saver::operator() (image_gray64s const& image) const; template void png_saver::operator() (image_gray64f const& image) const; -template void png_saver::operator() (image_view_rgba8 const& image) const; template void png_saver::operator() (image_view_gray8 const& image) const; template void png_saver::operator() (image_view_gray8s const& image) const; template void png_saver::operator() (image_view_gray16 const& image) const; @@ -338,7 +336,6 @@ template void png_saver::operator() (image_view_gray32f cons template void png_saver::operator() (image_view_gray64 const& image) const; template void png_saver::operator() (image_view_gray64s const& image) const; template void png_saver::operator() (image_view_gray64f const& image) const; -template void png_saver_pal::operator() (image_rgba8 const& image) const; template void png_saver_pal::operator() (image_gray8 const& image) const; template void png_saver_pal::operator() (image_gray8s const& image) const; template void png_saver_pal::operator() (image_gray16 const& image) const; @@ -349,7 +346,6 @@ template void png_saver_pal::operator() (image_gray32f const& ima template void png_saver_pal::operator() (image_gray64 const& image) const; template void png_saver_pal::operator() (image_gray64s const& image) const; template void png_saver_pal::operator() (image_gray64f const& image) const; -template void png_saver_pal::operator() (image_view_rgba8 const& image) const; template void png_saver_pal::operator() (image_view_gray8 const& image) const; template void png_saver_pal::operator() (image_view_gray8s const& image) const; template void png_saver_pal::operator() (image_view_gray16 const& image) const; diff --git a/src/image_util_webp.cpp b/src/image_util_webp.cpp index c7b96aca5..99e6690cc 100644 --- a/src/image_util_webp.cpp +++ b/src/image_util_webp.cpp @@ -360,7 +360,6 @@ void webp_saver::operator() (T const& image) const throw image_writer_exception("Mapnik does not support webp grayscale images"); } -template void webp_saver::operator() (image_rgba8 const& image) const; template void webp_saver::operator() (image_gray8 const& image) const; template void webp_saver::operator() (image_gray8s const& image) const; template void webp_saver::operator() (image_gray16 const& image) const; @@ -371,7 +370,6 @@ template void webp_saver::operator() (image_gray32f const& image) template void webp_saver::operator() (image_gray64 const& image) const; template void webp_saver::operator() (image_gray64s const& image) const; template void webp_saver::operator() (image_gray64f const& image) const; -template void webp_saver::operator() (image_view_rgba8 const& image) const; template void webp_saver::operator() (image_view_gray8 const& image) const; template void webp_saver::operator() (image_view_gray8s const& image) const; template void webp_saver::operator() (image_view_gray16 const& image) const; diff --git a/src/image_view.cpp b/src/image_view.cpp index 44e4d7716..345b2a5d1 100644 --- a/src/image_view.cpp +++ b/src/image_view.cpp @@ -28,8 +28,6 @@ namespace mapnik { - -template class MAPNIK_DECL image_view; template class MAPNIK_DECL image_view; template class MAPNIK_DECL image_view; template class MAPNIK_DECL image_view;