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

windows build fixes in palette and miniz_png headers

Browse source
This commit is contained in:
Dane Springmeyer 2014-06-18 17:53:33 -07:00
parent 34f1cc57c0
commit 4c4ce5a04c
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/mapnik/miniz_png.hpp
View file

@ -32,6 +32,10 @@
#include <iostream> #include <iostream>
#include <stdexcept> #include <stdexcept>
#ifdef _MSC_VER
#include <mapnik/graphics.hpp>
#endif
/* miniz.c porting issues: /* miniz.c porting issues:
- duplicate symbols in python bindings require moving miniz.c include to just cpp file - duplicate symbols in python bindings require moving miniz.c include to just cpp file
- due to http://code.google.com/p/miniz/issues/detail?id=7 - due to http://code.google.com/p/miniz/issues/detail?id=7
@ -80,6 +84,15 @@ private:
static const unsigned char IEND_tpl[]; static const unsigned char IEND_tpl[];
}; };
#ifdef _MSC_VER
template MAPNIK_DECL void PNGWriter::writeIDAT<image_data_8>(image_data_8 const& image);
template MAPNIK_DECL void PNGWriter::writeIDAT<image_view<image_data_8> >(image_view<image_data_8> const& image);
template MAPNIK_DECL void PNGWriter::writeIDAT<image_data_32>(image_data_32 const& image);
template MAPNIK_DECL void PNGWriter::writeIDAT<image_view<image_data_32> >(image_view<image_data_32> const& image);
template MAPNIK_DECL void PNGWriter::writeIDATStripAlpha<image_data_32>(image_data_32 const& image);
template MAPNIK_DECL void PNGWriter::writeIDATStripAlpha<image_view<image_data_32> >(image_view<image_data_32> const& image);
#endif
}} }}
#endif // MAPNIK_MINIZ_PNG_HPP #endif // MAPNIK_MINIZ_PNG_HPP

6
include/mapnik/palette.hpp
View file

@ -58,7 +58,7 @@ namespace mapnik {
struct rgba; struct rgba;
struct rgb { struct MAPNIK_DECL rgb {
byte r; byte r;
byte g; byte g;
byte b; byte b;
@ -72,7 +72,7 @@ struct rgb {
} }
}; };
struct rgba struct MAPNIK_DECL rgba
{ {
byte r; byte r;
byte g; byte g;
@ -103,7 +103,7 @@ struct rgba
} }
// ordering by mean(a,r,g,b), a, r, g, b // ordering by mean(a,r,g,b), a, r, g, b
struct mean_sort_cmp struct MAPNIK_DECL mean_sort_cmp
{ {
bool operator() (const rgba& x, const rgba& y) const; bool operator() (const rgba& x, const rgba& y) const;
}; };