[mapserver-commits] r12586 - branches/branch-5-6/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-09-25 06:10:06 -0700 (Sun, 25 Sep 2011)
New Revision: 12586

Modified:
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/maprgbapng.c
Log:
define Z_BEST_COMPRESSION for newer libpng versions (#4033)

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2011-09-24 22:50:37 UTC (rev 12585)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2011-09-25 13:10:06 UTC (rev 12586)
@@ -14,7 +14,7 @@
 Version 5.6.8 (SVN branch-5-6):
 ---------------------------
 
-- ...
+- define Z_BEST_COMPRESSION for newer libpng versions (#4033)
 
 Version 5.6.7 (2011-07-12):
 ---------------------------

Modified: branches/branch-5-6/mapserver/maprgbapng.c
===================================================================
--- branches/branch-5-6/mapserver/maprgbapng.c	2011-09-24 22:50:37 UTC (rev 12585)
+++ branches/branch-5-6/mapserver/maprgbapng.c	2011-09-25 13:10:06 UTC (rev 12586)
@@ -105,6 +105,14 @@
     longjmp(ms_ptr->jmpbuf, 1);
 }
 
+
+/* newer versions of libpng do not include zlib.h, so we
+ * define the compression value here
+ */
+#ifndef Z_BEST_COMPRESSION
+#define Z_BEST_COMPRESSION       9
+#endif
+
 int ms_png_write_image_init(gdIOCtx *ctx, ms_png_info *ms_ptr)
 {
     png_structp png_ptr;       /* note:  temporary variables! */