- updated to 2.6.1

[packages/iv.git] / iv-libpng.patch

--- iv-2.6.1/iv/imgio_png.c.orig	2009-07-27 02:00:00.000000000 +0200
+++ iv-2.6.1/iv/imgio_png.c	2014-02-02 15:50:22.418709431 +0100
@@ -2,6 +2,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <string.h>
+#include <strings.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 /* png.h and setjmp.h may not be combined */
@@ -651,11 +653,11 @@
 
 	/* Get the PNG color type */
 	ctx->png_color_type = color_type = ((png_info_ptr != NULL) ?
-		png_info_ptr->color_type : PNG_COLOR_TYPE_GRAY
+		png_get_color_type(png_ptr, png_info_ptr) : PNG_COLOR_TYPE_GRAY
 	);
 
 	/* Get the PNG bit depth */
-	ctx->png_bit_depth = bit_depth = (png_info_ptr != NULL) ? png_info_ptr->bit_depth : 1;
+	ctx->png_bit_depth = bit_depth = (png_info_ptr != NULL) ? png_get_bit_depth(png_ptr, png_info_ptr) : 1;
 
 
 	/* Insert transformations here */