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

+ make it compile on win32

Browse source
This commit is contained in:
Artem Pavlenko 2010-01-09 14:46:38 +00:00
parent 9a9042ce84
commit 230f96b3cf
1 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
include/mapnik/png_io.hpp
View file

@ -109,18 +109,19 @@ namespace mapnik {
} }
template <typename T> template <typename T>
void reduce_8 (T const& in, ImageData8 & out, octree<rgb> trees[], unsigned limits[], std::vector<unsigned> &alpha) void reduce_8 (T const& in, ImageData8 & out, octree<rgb> trees[], unsigned limits[], std::vector<unsigned> & alpha)
{ {
unsigned width = in.width(); unsigned width = in.width();
unsigned height = in.height(); unsigned height = in.height();
unsigned alphaCount[alpha.size()]; //unsigned alphaCount[alpha.size()];
std::vector<unsigned> alphaCount(alpha.size());
for(unsigned i=0; i<alpha.size(); i++) for(unsigned i=0; i<alpha.size(); i++)
{ {
alpha[i] = 0; alpha[i] = 0;
alphaCount[i] = 0; alphaCount[i] = 0;
} }
for (unsigned y = 0; y < height; ++y) for (unsigned y = 0; y < height; ++y)
{ {
mapnik::ImageData32::pixel_type const * row = in.getRow(y); mapnik::ImageData32::pixel_type const * row = in.getRow(y);
@ -153,12 +154,13 @@ namespace mapnik {
} }
template <typename T> template <typename T>
void reduce_4 (T const& in, ImageData8 & out, octree<rgb> trees[], unsigned limits[], std::vector<unsigned> &alpha) void reduce_4 (T const& in, ImageData8 & out, octree<rgb> trees[], unsigned limits[], std::vector<unsigned> & alpha)
{ {
unsigned width = in.width(); unsigned width = in.width();
unsigned height = in.height(); unsigned height = in.height();
unsigned alphaCount[alpha.size()]; //unsigned alphaCount[alpha.size()];
std::vector<unsigned> alphaCount(alpha.size());
for(unsigned i=0; i<alpha.size(); i++) for(unsigned i=0; i<alpha.size(); i++)
{ {
alpha[i] = 0; alpha[i] = 0;
@ -200,7 +202,7 @@ namespace mapnik {
// 1-bit but only one color. // 1-bit but only one color.
template <typename T> template <typename T>
void reduce_1(T const&, ImageData8 & out, octree<rgb> trees[], unsigned limits[], std::vector<unsigned> &alpha) void reduce_1(T const&, ImageData8 & out, octree<rgb> trees[], unsigned limits[], std::vector<unsigned> & alpha)
{ {
out.set(0); // only one color!!! out.set(0); // only one color!!!
} }
@ -249,15 +251,16 @@ namespace mapnik {
// make transparent lowest indexes, so tRNS is small // make transparent lowest indexes, so tRNS is small
if (alpha.size()>0) if (alpha.size()>0)
{ {
png_byte trans[alpha.size()]; std::vector<png_byte> trans(alpha.size());
unsigned alphaSize=0;//truncate to nonopaque values unsigned alphaSize=0;//truncate to nonopaque values
for(unsigned i=0; i<alpha.size(); i++){ for(unsigned i=0; i < alpha.size(); i++)
trans[i]=alpha[i]; {
if (alpha[i]<255) trans[i]=alpha[i];
alphaSize = i+1; if (alpha[i]<255)
} alphaSize = i+1;
if (alphaSize>0) }
png_set_tRNS(png_ptr, info_ptr, (png_bytep)trans, alphaSize, NULL); if (alphaSize>0)
png_set_tRNS(png_ptr, info_ptr, (png_bytep)&trans[0], alphaSize, 0);
} }
png_write_info(png_ptr, info_ptr); png_write_info(png_ptr, info_ptr);
@ -389,8 +392,8 @@ namespace mapnik {
//transparency values per palette index //transparency values per palette index
std::vector<unsigned> alphaTable; std::vector<unsigned> alphaTable;
//alphaTable.resize(palette.size());//allow semitransparency also in almost opaque range //alphaTable.resize(palette.size());//allow semitransparency also in almost opaque range
alphaTable.resize(palette.size()-cols[TRANSPARENCY_LEVELS-1]); alphaTable.resize(palette.size() - cols[TRANSPARENCY_LEVELS-1]);
if (palette.size() > 16 ) if (palette.size() > 16 )
{ {
// >16 && <=256 colors -> write 8-bit color depth // >16 && <=256 colors -> write 8-bit color depth