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

support writing full color png with rgb only (no alpha) - closes #1559

Browse source
This commit is contained in:
Dane Springmeyer 2012-11-06 11:44:44 -05:00
parent 2874664d70
commit 211b102ec5
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
include/mapnik/png_io.hpp
View file

@ -61,14 +61,23 @@ void save_as_png(T1 & file,
T2 const& image,
int compression = Z_DEFAULT_COMPRESSION,
int strategy = Z_DEFAULT_STRATEGY,
int trans_mode = -1,
bool use_miniz = false)
{
if (use_miniz)
{
MiniZ::PNGWriter writer(compression,strategy);
writer.writeIHDR(image.width(), image.height(), 32);
writer.writeIDAT(image);
if (trans_mode == 0)
{
writer.writeIHDR(image.width(), image.height(), 24);
writer.writeIDATStripAlpha(image);
}
else
{
writer.writeIHDR(image.width(), image.height(), 32);
writer.writeIDAT(image);
}
writer.writeIEND();
writer.toStream(file);
return;
@ -107,15 +116,14 @@ void save_as_png(T1 & file,
png_set_compression_buffer_size(png_ptr, 32768);
png_set_IHDR(png_ptr, info_ptr,image.width(),image.height(),8,
PNG_COLOR_TYPE_RGB_ALPHA,PNG_INTERLACE_NONE,
(trans_mode == 0) ? PNG_COLOR_TYPE_RGB : PNG_COLOR_TYPE_RGB_ALPHA,PNG_INTERLACE_NONE,
PNG_COMPRESSION_TYPE_DEFAULT,PNG_FILTER_TYPE_DEFAULT);
png_write_info(png_ptr, info_ptr);
for (unsigned i=0;i<image.height();i++)
{
png_write_row(png_ptr,(png_bytep)image.getRow(i));
png_bytep row_pointers[image.height()];
for (unsigned int i = 0; i < image.height(); i++) {
row_pointers[i] = (png_bytep)image.getRow(i);
}
png_write_end(png_ptr, info_ptr);
png_set_rows(png_ptr, info_ptr, (png_bytepp)&row_pointers);
png_write_png(png_ptr, info_ptr, (trans_mode == 0) ? PNG_TRANSFORM_STRIP_FILLER_AFTER : PNG_TRANSFORM_IDENTITY, NULL);
png_destroy_write_struct(&png_ptr, &info_ptr);
}

7
src/image_util.cpp
View file

@ -154,9 +154,6 @@ void handle_png_options(std::string const& type,
}
else if (boost::algorithm::starts_with(t, "t="))
{
if (*colors < 0)
throw ImageWriterException("invalid trans_mode parameter: unavailable for true color images");
if (!mapnik::util::string2int(t.substr(2),*trans_mode) || *trans_mode < 0 || *trans_mode > 2)
throw ImageWriterException("invalid trans_mode parameter: " + t.substr(2));
}
@ -255,7 +252,7 @@ void save_to_stream(T const& image,
}
else if (colors < 0)
{
save_as_png(stream, image, compression, strategy, use_miniz);
save_as_png(stream, image, compression, strategy, trans_mode, use_miniz);
}
else if (use_octree)
{
@ -312,7 +309,7 @@ void save_to_stream(T const& image,
if (colors < 0)
{
save_as_png(stream, image, compression, strategy, use_miniz);
save_as_png(stream, image, compression, strategy, trans_mode, use_miniz);
}
else if (use_octree)
{