From d8af6b79ab624a323319cd3fe1454813fb2ecf7c Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 9 Jun 2014 09:29:41 +0100 Subject: Don't use typecasted NULL definitions. (Removed in libpng 1.4.0) Use plain NULL instead. --- src/alphagen.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/alphagen.c b/src/alphagen.c index a60368e..d37b36c 100644 --- a/src/alphagen.c +++ b/src/alphagen.c @@ -287,8 +287,7 @@ bool image_read_png(char *file_name, struct image *img) info_ptr = png_create_info_struct(png_ptr); if (info_ptr == NULL) { fclose(fp); - png_destroy_read_struct(&png_ptr, png_infopp_NULL, - png_infopp_NULL); + png_destroy_read_struct(&png_ptr, NULL, NULL); return false; } @@ -297,7 +296,7 @@ bool image_read_png(char *file_name, struct image *img) if (setjmp(png_jmpbuf(png_ptr))) { /* Free all of the memory associated with the png_ptr and * info_ptr */ - png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); fclose(fp); /* If we get here, we had a problem reading the file */ return false; @@ -310,7 +309,7 @@ bool image_read_png(char *file_name, struct image *img) png_set_sig_bytes(png_ptr, sig_read); /* Read in the entire image at once */ - png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_PACKING, png_voidp_NULL); + png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_PACKING, NULL); width = png_get_image_width(png_ptr, info_ptr); height = png_get_image_height(png_ptr, info_ptr); @@ -331,7 +330,7 @@ bool image_read_png(char *file_name, struct image *img) } /* clean up after the read, and free any memory allocated */ - png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); /* close the file */ fclose(fp); @@ -387,7 +386,7 @@ bool image_write_png(char *file_name, struct image *img) info_ptr = png_create_info_struct(png_ptr); if (info_ptr == NULL) { fclose(fp); - png_destroy_write_struct(&png_ptr, png_infopp_NULL); + png_destroy_write_struct(&png_ptr, NULL); return false; } /* Set error handling, needed because I gave NULLs to -- cgit v1.2.3