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

+ png_io: disble miniz for now

Browse source
This commit is contained in:
artemp 2013-04-19 09:41:42 +01:00
parent da16de55de
commit a41c83fbce
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/mapnik/png_io.hpp
View file

@ -27,7 +27,7 @@
#include <mapnik/palette.hpp>
#include <mapnik/octree.hpp>
#include <mapnik/hextree.hpp>
#include <mapnik/miniz_png.hpp>
//#include <mapnik/miniz_png.hpp>
#include <mapnik/image_data.hpp>
// zlib
@ -71,7 +71,8 @@ void save_as_png(T1 & file,
bool use_miniz = false)
{
if (use_miniz)
#if 0
if (use_miniz)
{
MiniZ::PNGWriter writer(compression,strategy);
if (trans_mode == 0)
@ -88,7 +89,7 @@ void save_as_png(T1 & file,
writer.toStream(file);
return;
}
#endif
png_voidp error_ptr=0;
png_structp png_ptr=png_create_write_struct(PNG_LIBPNG_VER_STRING,
error_ptr,0, 0);
@ -262,6 +263,7 @@ void save_as_png(T & file, std::vector<mapnik::rgb> const& palette,
std::vector<unsigned> const&alpha,
bool use_miniz)
{
#if 0
if (use_miniz)
{
MiniZ::PNGWriter writer(compression,strategy);
@ -275,7 +277,7 @@ void save_as_png(T & file, std::vector<mapnik::rgb> const& palette,
writer.toStream(file);
return;
}
#endif
png_voidp error_ptr=0;
png_structp png_ptr=png_create_write_struct(PNG_LIBPNG_VER_STRING,
error_ptr,0, 0);

1
src/build.py
View file

@ -117,7 +117,6 @@ source = Split(
well_known_srs.cpp
params.cpp
image_filter_types.cpp
miniz_png.cpp
color.cpp
css_color_grammar.cpp
conversions.cpp