summaryrefslogtreecommitdiff
path: root/extra/wesnoth/wesnoth-libpng-1.4.0.patch
blob: 338f467aff9d73fa16f4d08b9033db9c3572bab1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
diff -Nur wesnoth-1.8.orig/src/tools/exploder_utils.cpp wesnoth-1.8/src/tools/exploder_utils.cpp
--- wesnoth-1.8.orig/src/tools/exploder_utils.cpp	2010-01-01 15:16:49.000000000 +0200
+++ wesnoth-1.8/src/tools/exploder_utils.cpp	2010-04-08 17:38:03.066201123 +0300
@@ -174,8 +174,8 @@
 	//TODO: review whether providing NULL error handlers is something
 	//sensible
 	png_struct* png_ptr = png_create_write_struct
-		(PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(png_voidp_NULL),
-		 png_error_ptr_NULL, png_error_ptr_NULL);
+		(PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(NULL),
+		 NULL, NULL);
 	if(!png_ptr)
 		throw exploder_failure("Unable to initialize the png write structure");
 
--- wesnoth-1.8.orig/src/tools/exploder_utils.cpp.libpng 2011-11-06 14:44:26.618711420 -0600
+++ wesnoth-1.8/src/tools/exploder_utils.cpp 2011-11-06 14:57:12.150006511 -0600
@@ -15,6 +15,7 @@
 #include "exploder_utils.hpp"
 #include "game_config.hpp"
 #include "serialization/string_utils.hpp"
+#include <zlib.h>
 #include <png.h>

 exploder_point::exploder_point(const std::string &s)