packages: DevIL/libpng14.patch - adjust for DevIL-1.7.8

[lisu]

Author: lisu                         Date: Wed Apr 21 13:33:08 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adjust for DevIL-1.7.8

---- Files affected:
packages/DevIL:
   libpng14.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/DevIL/libpng14.patch
diff -u packages/DevIL/libpng14.patch:1.1 packages/DevIL/libpng14.patch:1.2
--- packages/DevIL/libpng14.patch:1.1	Wed Feb 10 00:27:57 2010
+++ packages/DevIL/libpng14.patch	Wed Apr 21 15:33:03 2010
@@ -1,6 +1,6 @@
---- DevIL-1.7.2/src-IL/src/il_png.c.orig	2010-02-07 16:59:29.208824733 +0100
-+++ DevIL-1.7.2/src-IL/src/il_png.c	2010-02-07 17:04:17.675411333 +0100
-@@ -103,7 +103,11 @@ ILboolean iIsValidPng()
+--- DevIL-1.7.8/devil-1.7.8/src-IL/src/il_png.c~	2009-03-08 08:10:09.000000000 +0100
++++ DevIL-1.7.8/devil-1.7.8/src-IL/src/il_png.c	2010-04-21 14:42:41.194560666 +0200
+@@ -105,7 +105,11 @@
  	Read = iread(Signature, 1, 8);
  	iseek(-Read, IL_SEEK_CUR);
  
@@ -12,10 +12,10 @@
  }
  
  
-@@ -278,7 +282,11 @@ ILboolean readpng_get_image(ILdouble dis
+@@ -278,7 +282,11 @@
  
  	// Expand low-bit-depth grayscale images to 8 bits
- 	if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
+ 	if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
 +#if PNG_LIBPNG_VER < 10400
  		png_set_gray_1_2_4_to_8(png_ptr);
 +#else
@@ -24,12 +24,12 @@
  	}
  
  	// Expand RGB images with transparency to full alpha channels
---- DevIL-1.7.2/src-IL/src/il_icon.c.orig	2010-02-07 17:15:17.456176881 +0100
-+++ DevIL-1.7.2/src-IL/src/il_icon.c	2010-02-07 17:15:59.942840566 +0100
-@@ -530,7 +530,11 @@
+--- DevIL-1.7.8/devil-1.7.8/src-IL/src/il_icon.c~	2009-03-08 08:10:09.000000000 +0100
++++ DevIL-1.7.8/devil-1.7.8/src-IL/src/il_icon.c	2010-04-21 15:07:23.711078866 +0200
+@@ -525,7 +525,11 @@
  
  	// Expand low-bit-depth grayscale images to 8 bits
- 	if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
+ 	if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
 +#if PNG_LIBPNG_VER < 10400
  		png_set_gray_1_2_4_to_8(ico_png_ptr);
 +#else
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/DevIL/libpng14.patch?r1=1.1&r2=1.2&f=u