archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2025-12-08 20:13:09 +00:00
Code Issues Projects Releases Wiki Activity

start fixing windows compile - refs #2708

Browse Source
This commit is contained in:
Dane Springmeyer 2015-02-16 18:48:14 -08:00
parent 6418a129c1
commit 842e4bebe6
2 changed files with 6 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
include/mapnik/image_util.hpp
View File

@ -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

12
src/image_util.cpp
View File

@ -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());