[patch] Patch to make vegastrike work with libpng-1.4 as well

vegastrike_libpng-1.4.patch (text/plain), 4.14 KB, created by quazgar on 2010-05-10 21:05:07 UTC

Index: src/gfx/vsimage.cpp
===================================================================
--- src/gfx/vsimage.cpp	(revision 12206)
+++ src/gfx/vsimage.cpp	(working copy)
@@ -349,7 +349,7 @@ unsigned char *	VSImage::ReadPNG()
 		png_set_palette_to_rgb(png_ptr);
 		   
 	if (this->img_color_type == PNG_COLOR_TYPE_GRAY && this->img_depth < 8)
-		png_set_gray_1_2_4_to_8(png_ptr);
+		png_set_expand_gray_1_2_4_to_8(png_ptr);
 
 	png_set_expand (png_ptr);
 	png_read_update_info (png_ptr,info_ptr);
Index: objconv/imageproc/change_channels.cpp
===================================================================
--- objconv/imageproc/change_channels.cpp	(revision 12206)
+++ objconv/imageproc/change_channels.cpp	(working copy)
@@ -85,7 +85,7 @@ unsigned char *	ReadPNG(FILE * fp, unsig
 		png_set_palette_to_rgb(png_ptr);
 		   
 	if (img_color_type == PNG_COLOR_TYPE_GRAY && img_depth < 8)
-		png_set_gray_1_2_4_to_8(png_ptr);
+		png_set_expand_gray_1_2_4_to_8(png_ptr);
 
 	png_set_expand (png_ptr);
 	png_read_update_info (png_ptr,info_ptr);
Index: objconv/imageproc/alphaextender.cpp
===================================================================
--- objconv/imageproc/alphaextender.cpp	(revision 12206)
+++ objconv/imageproc/alphaextender.cpp	(working copy)
@@ -77,7 +77,7 @@ unsigned char *	ReadPNG(FILE * fp, unsig
 		png_set_palette_to_rgb(png_ptr);
 		   
 	if (img_color_type == PNG_COLOR_TYPE_GRAY && img_depth < 8)
-		png_set_gray_1_2_4_to_8(png_ptr);
+		png_set_expand_gray_1_2_4_to_8(png_ptr);
 
 	png_set_expand (png_ptr);
 	png_read_update_info (png_ptr,info_ptr);
Index: objconv/imageproc/shrinker.cpp
===================================================================
--- objconv/imageproc/shrinker.cpp	(revision 12206)
+++ objconv/imageproc/shrinker.cpp	(working copy)
@@ -77,7 +77,7 @@ unsigned char *	ReadPNG(FILE * fp, unsig
 		png_set_palette_to_rgb(png_ptr);
 		   
 	if (img_color_type == PNG_COLOR_TYPE_GRAY && img_depth < 8)
-		png_set_gray_1_2_4_to_8(png_ptr);
+		png_set_expand_gray_1_2_4_to_8(png_ptr);
 
 	png_set_expand (png_ptr);
 	png_read_update_info (png_ptr,info_ptr);
Index: objconv/imageproc/normalmap.cpp
===================================================================
--- objconv/imageproc/normalmap.cpp	(revision 12206)
+++ objconv/imageproc/normalmap.cpp	(working copy)
@@ -77,7 +77,7 @@ unsigned char *	ReadPNG(FILE * fp, unsig
 		png_set_palette_to_rgb(png_ptr);
 		   
 	if (img_color_type == PNG_COLOR_TYPE_GRAY && img_depth < 8)
-		png_set_gray_1_2_4_to_8(png_ptr);
+		png_set_expand_gray_1_2_4_to_8(png_ptr);
 
 	png_set_expand (png_ptr);
 	png_read_update_info (png_ptr,info_ptr);
Index: objconv/imageproc/mover.cpp
===================================================================
--- objconv/imageproc/mover.cpp	(revision 12206)
+++ objconv/imageproc/mover.cpp	(working copy)
@@ -78,7 +78,7 @@ unsigned char *	ReadPNG(FILE * fp, unsig
 		png_set_palette_to_rgb(png_ptr);
 		   
 	if (img_color_type == PNG_COLOR_TYPE_GRAY && img_depth < 8)
-		png_set_gray_1_2_4_to_8(png_ptr);
+		png_set_expand_gray_1_2_4_to_8(png_ptr);
 
 	png_set_expand (png_ptr);
 	png_read_update_info (png_ptr,info_ptr);
Index: objconv/imageproc/starremover.cpp
===================================================================
--- objconv/imageproc/starremover.cpp	(revision 12206)
+++ objconv/imageproc/starremover.cpp	(working copy)
@@ -77,7 +77,7 @@ unsigned char *	ReadPNG(FILE * fp, unsig
 		png_set_palette_to_rgb(png_ptr);
 		   
 	if (img_color_type == PNG_COLOR_TYPE_GRAY && img_depth < 8)
-		png_set_gray_1_2_4_to_8(png_ptr);
+		png_set_expand_gray_1_2_4_to_8(png_ptr);
 
 	png_set_expand (png_ptr);
 	png_read_update_info (png_ptr,info_ptr);
Index: objconv/basemaker/base_maker_texture.cpp
===================================================================
--- objconv/basemaker/base_maker_texture.cpp	(revision 12206)
+++ objconv/basemaker/base_maker_texture.cpp	(working copy)
@@ -73,7 +73,7 @@ static inline bool readPng (FILE *fp, Te
 		png_set_palette_to_rgb(png_ptr);
 
 	if (ctype == PNG_COLOR_TYPE_GRAY && data->bpp < 8)
-		png_set_gray_1_2_4_to_8(png_ptr);
+		png_set_expand_gray_1_2_4_to_8(png_ptr);
 
 	png_set_expand (png_ptr);
 	png_read_update_info (png_ptr,info_ptr);