[gentoo-commits] gentoo-x86 commit in games-strategy/ufo-ai/files: ufo-ai-2.2.1-libpng14.patch

[gentoo-commits] gentoo-x86 commit in games-strategy/ufo-ai/files: ufo-ai-2.2.1-libpng14.patch

[Samuli Suominen (ssuominen)]

ssuominen    10/03/10 18:37:24

  Added:                ufo-ai-2.2.1-libpng14.patch
  Log:
  Fix building with libpng14 wrt #308863 by Locke Shinseiko.
  (Portage version: 2.2_rc66/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  games-strategy/ufo-ai/files/ufo-ai-2.2.1-libpng14.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/ufo-ai/files/ufo-ai-2.2.1-libpng14.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/ufo-ai/files/ufo-ai-2.2.1-libpng14.patch?rev=1.1&content-type=text/plain

Index: ufo-ai-2.2.1-libpng14.patch
===================================================================
http://bugs.gentoo.org/308863

--- src/renderer/r_image.c
+++ src/renderer/r_image.c
@@ -207,7 +207,7 @@ static int R_LoadPNG (const char *name,
 		return 0;
 
 	/* Parse the PNG file */
-	if ((png_check_sig(PngFileBuffer.buffer, 8)) == 0) {
+	if ((png_sig_cmp(PngFileBuffer.buffer, 0, 8)) == 0) {
 		Com_Printf("LoadPNG: Not a PNG file: %s\n", name);
 		FS_FreeFile(PngFileBuffer.buffer);
 		return 0;
@@ -254,7 +254,7 @@ static int R_LoadPNG (const char *name,
 		png_set_palette_to_rgb(png_ptr);
 	/* convert 1-2-4 bits grayscale images to 8 bits grayscale */
 	if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
-		png_set_gray_1_2_4_to_8(png_ptr);
+		png_set_expand_gray_1_2_4_to_8(png_ptr);
 	if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
 		png_set_tRNS_to_alpha(png_ptr);
 

[gentoo-commits] gentoo-x86 commit in games-strategy/ufo-ai/files: ufo-ai-2.2.1-libpng14.patch

[Samuli Suominen (ssuominen)]

ssuominen    10/03/10 18:42:38

  Modified:             ufo-ai-2.2.1-libpng14.patch
  Log:
  Reverse logic
  (Portage version: 2.2_rc66/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  games-strategy/ufo-ai/files/ufo-ai-2.2.1-libpng14.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/ufo-ai/files/ufo-ai-2.2.1-libpng14.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/ufo-ai/files/ufo-ai-2.2.1-libpng14.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/ufo-ai/files/ufo-ai-2.2.1-libpng14.patch?r1=1.1&r2=1.2

Index: ufo-ai-2.2.1-libpng14.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/files/ufo-ai-2.2.1-libpng14.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ufo-ai-2.2.1-libpng14.patch	10 Mar 2010 18:37:23 -0000	1.1
+++ ufo-ai-2.2.1-libpng14.patch	10 Mar 2010 18:42:38 -0000	1.2
@@ -1,4 +1,5 @@
 http://bugs.gentoo.org/308863
+http://ufoai.svn.sourceforge.net/viewvc/ufoai/ufoai/trunk/src/client/renderer/r_image.c?r1=28392&r2=28395
 
 --- src/renderer/r_image.c
 +++ src/renderer/r_image.c
@@ -7,7 +8,7 @@
  
  	/* Parse the PNG file */
 -	if ((png_check_sig(PngFileBuffer.buffer, 8)) == 0) {
-+	if ((png_sig_cmp(PngFileBuffer.buffer, 0, 8)) == 0) {
++	if ((png_sig_cmp(PngFileBuffer.buffer, 0, 8)) != 0) {
  		Com_Printf("LoadPNG: Not a PNG file: %s\n", name);
  		FS_FreeFile(PngFileBuffer.buffer);
  		return 0;