[scorched3d] Replace another direct png reference with an accessor

Bruno Wolff III bruno at fedoraproject.org
Sun Nov 6 17:32:18 UTC 2011


commit b3ff49860ee184c67653db314bfba44609e654bb
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sun Nov 6 10:39:43 2011 -0600

    Replace another direct png reference with an accessor

 scorched3d-libpng15.patch |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/scorched3d-libpng15.patch b/scorched3d-libpng15.patch
index dcf717f..aed1ebb 100644
--- a/scorched3d-libpng15.patch
+++ b/scorched3d-libpng15.patch
@@ -9,17 +9,26 @@
  }
  
  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
+--- src/client/client/LoadPNG.cpp.libpng	2010-08-15 18:26:36.000000000 -0500
++++ src/client/client/LoadPNG.cpp	2011-11-06 10:38:18.909811556 -0600
 @@ -24,6 +24,8 @@
  	Uint32 Bmask;
  	Uint32 Amask;
  	SDL_Palette *palette;
 +	int num_pallet;
-+	png_color[] png_pallet;
++	png_color *png_pallet;
  	png_bytep *volatile row_pointers;
  	int row, i;
  	volatile int ckey = -1;
+@@ -58,7 +60,7 @@
+ 	 * the normal method of doing things with libpng).  REQUIRED unless you
+ 	 * set up your own error handlers in png_create_read_struct() earlier.
+ 	 */
+-	if ( setjmp(png_ptr->jmpbuf) ) {
++	if ( setjmp(png_jmpbuf(png_ptr)) ) {
+ 		error = "Error reading the PNG file.";
+ 		goto done;
+ 	}
 @@ -127,9 +129,9 @@
  			Rmask = 0x000000FF;
  			Gmask = 0x0000FF00;


More information about the scm-commits mailing list