Blob Blame History Raw
diff -ur widelands-build16-src/src/graphic/SDL_mng.cc widelands-build16-src.new/src/graphic/SDL_mng.cc
--- widelands-build16-src/src/graphic/SDL_mng.cc	2011-04-15 20:40:26.000000000 +0200
+++ widelands-build16-src.new/src/graphic/SDL_mng.cc	2011-12-06 14:55:36.196284293 +0100
@@ -276,7 +276,11 @@
 	 * the normal method of doing things with libpng).  REQUIRED unless you
 	 * set up your own error handlers in png_create_read_struct() earlier.
 	 */
+#ifndef LIBPNG_VERSION_12
+	if (setjmp(png_jmpbuf(png_ptr))) {
+#else
 	if (setjmp(png_ptr->jmpbuf)) {
+#endif
 		SDL_SetError("Error reading the PNG file.");
 		goto done;
 	}
@@ -360,9 +360,12 @@
 			Rmask = 0x000000FF;
 			Gmask = 0x0000FF00;
 			Bmask = 0x00FF0000;
-			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
+			Amask = (png_get_channels(png_ptr, info_ptr) == 4) ?
+				0xFF000000 : 0;
 		} else {
-			int const s = (info_ptr->channels == 4) ? 0 : 8;
+			int const s =
+				(png_get_channels(png_ptr, info_ptr) == 4) ?
+				0 : 8;
 			Rmask = 0xFF000000 >> s;
 			Gmask = 0x00FF0000 >> s;
 			Bmask = 0x0000FF00 >> s;
@@ -373,7 +376,7 @@
 		SDL_AllocSurface
 			(SDL_SWSURFACE,
 			 width, height,
-			 bit_depth * info_ptr->channels,
+			 bit_depth * png_get_channels(png_ptr, info_ptr),
 			 Rmask, Gmask, Bmask, Amask);
 	if (not surface) {
 		SDL_SetError("Out of memory");
@@ -413,6 +416,9 @@
 
 	/* Load the palette, if any */
 	if ((palette = surface->format->palette)) {
+		int png_num_palette;
+		png_colorp png_palette;
+		png_get_PLTE(png_ptr, info_ptr, &png_palette, &png_num_palette);
 		if (color_type == PNG_COLOR_TYPE_GRAY) {
 			palette->ncolors = 256;
 			for (uint16_t i = 0; i < 256; ++i) {
@@ -420,12 +426,12 @@
 				palette->colors[i].g = i;
 				palette->colors[i].b = i;
 			}
-		} else if (info_ptr->num_palette > 0) {
-			palette->ncolors = info_ptr->num_palette;
-			for (uint32_t i = 0; i < info_ptr->num_palette; ++i) {
-				palette->colors[i].b = info_ptr->palette[i].blue;
-				palette->colors[i].g = info_ptr->palette[i].green;
-				palette->colors[i].r = info_ptr->palette[i].red;
+		} else if (png_num_palette > 0) {
+			palette->ncolors = png_num_palette;
+			for (uint32_t i = 0; i < png_num_palette; ++i) {
+				palette->colors[i].b = png_palette[i].blue;
+				palette->colors[i].g = png_palette[i].green;
+				palette->colors[i].r = png_palette[i].red;
 			}
 		}
 	}