Merge branch 'master' of github.com:mapnik/mapnik

2013-07-30 14:31:43 -04:00 · 2013-07-30 14:31:43 -04:00 · dd5bb6c643
commit dd5bb6c643
parent 2ea353bce0 79d1e6e5c0
1 changed files with 1 additions and 0 deletions
--- a/include/mapnik/miniz_png.hpp
+++ b/include/mapnik/miniz_png.hpp
@ -37,6 +37,7 @@
  - avoiding including miniz.c here requires fwd declaring the two structs below
  - being able to fwd declare requires removing typedef from struct declarations in miniz.c
  - being able to fwd declare also requires using pointers to structs
+  - if updated, need to apply c++11 fix: https://github.com/mapnik/mapnik/issues/1967
 */

 // TODO: try using #define MINIZ_HEADER_FILE_ONLY