[scorched3d] Replace some more direct png struct references with accessors

[Bruno Wolff III]

commit c8336a59700e5aee1e677e979c6e4123a3d2c4d2
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sun Nov 6 10:29:46 2011 -0600

    Replace some more direct png struct references with accessors

 scorched3d-libpng15.patch |   63 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 63 insertions(+), 0 deletions(-)
---
diff --git a/scorched3d-libpng15.patch b/scorched3d-libpng15.patch
index 3b3c5b2..dcf717f 100644
--- a/scorched3d-libpng15.patch
+++ b/scorched3d-libpng15.patch
@@ -9,3 +9,66 @@
  }
  
  static void user_png_warning(png_structp png_ptr, png_const_charp msg) 
+--- src/client/client/LoadPNG.cpp.libpng	2011-11-06 10:07:17.303210932 -0600
++++ src/client/client/LoadPNG.cpp	2011-11-06 10:28:54.246045697 -0600
+@@ -24,6 +24,8 @@
+ 	Uint32 Bmask;
+ 	Uint32 Amask;
+ 	SDL_Palette *palette;
++	int num_pallet;
++	png_color[] png_pallet;
+ 	png_bytep *volatile row_pointers;
+ 	int row, i;
+ 	volatile int ckey = -1;
+@@ -127,9 +129,9 @@
+ 			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 s = (info_ptr->channels == 4) ? 0 : 8;
++		        int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
+ 			Rmask = 0xFF000000 >> s;
+ 			Gmask = 0x00FF0000 >> s;
+ 			Bmask = 0x0000FF00 >> s;
+@@ -137,7 +139,7 @@
+ 		}
+ 	}
+ 	surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
+-			bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
++			png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask);
+ 	if ( surface == NULL ) {
+ 		error = "Out of memory";
+ 		goto done;
+@@ -175,7 +177,7 @@
+ 	lib.png_read_end(png_ptr, info_ptr);
+ 	*/
+ 
+-	/* Load the palette, if any */
++	/* Load the png_palette, if any */
+ 	palette = surface->format->palette;
+ 	if ( palette ) {
+ 	    if(color_type == PNG_COLOR_TYPE_GRAY) {
+@@ -185,12 +187,15 @@
+ 		    palette->colors[i].g = i;
+ 		    palette->colors[i].b = i;
+ 		}
+-	    } else if (info_ptr->num_palette > 0 ) {
+-		palette->ncolors = info_ptr->num_palette; 
+-		for( 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 {
++		png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette);
++		if (num_palette > 0 ) {
++		    palette->ncolors = num_palette; 
++		    for( i=0; i<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;
++		    }
+ 		}
+ 	    }
+ 	}