view src/devil-1-png.patch @ 4601:dc3eb553f5e9

update UPDATE rule for sourceforge projects with version directories * src/cppunit.mk, src/cunit.mk, src/expat.mk, src/freeimage.mk, src/freetype.mk, src/gnuplot.mk, src/graphicsmagick.mk, src/hunspell.mk, src/id3lib.mk, src/lcms.mk, src/libircclient.mk, src/liblo.mk, src/libmad.mk, src/libmng.mk, src/libmodplug.mk, src/libusb.mk, src/matio.mk, src/pcre.mk, src/pdcurses.mk, src/pfstools.mk, src/plotmm.mk, src/qjson.mk, src/qwt.mk, src/qwtplot3d.mk, src/sdl_pango.mk, src/sox.mk, src/tinyxml.mk, src/xmlwrapp.mk: update UPDATE rule for sourceforge projects with version directories * src/llvm.mk: update use wget not WGE so get uncompressed file)
author John D
date Mon, 29 Jan 2018 11:57:20 -0500
parents 99516e73b368
children
line wrap: on
line source

This file is part of MXE.
See index.html for further information.

diff -urN devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c
--- devil-1.7.8.orig/src-IL/src/il_icon.c	2009-03-08 08:10:09.000000000 +0100
+++ devil-1.7.8/src-IL/src/il_icon.c	2010-02-01 16:01:37.000000000 +0100
@@ -525,7 +525,7 @@
 
 	// Expand low-bit-depth grayscale images to 8 bits
 	if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
-		png_set_gray_1_2_4_to_8(ico_png_ptr);
+		png_set_expand_gray_1_2_4_to_8(ico_png_ptr);
 	}
 
 	// Expand RGB images with transparency to full alpha channels
diff -urN devil-1.7.8.orig/src-IL/src/il_png.c devil-1.7.8/src-IL/src/il_png.c
--- devil-1.7.8.orig/src-IL/src/il_png.c	2009-03-08 08:10:09.000000000 +0100
+++ devil-1.7.8/src-IL/src/il_png.c	2010-02-01 15:58:41.000000000 +0100
@@ -105,7 +105,7 @@
 	Read = iread(Signature, 1, 8);
 	iseek(-Read, IL_SEEK_CUR);
 
-	return png_check_sig(Signature, 8);
+	return !png_sig_cmp(Signature, 0, 8);
 }
 
 
@@ -278,7 +278,7 @@
 
 	// Expand low-bit-depth grayscale images to 8 bits
 	if (png_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);
 	}
 
 	// Expand RGB images with transparency to full alpha channels