Branch :
$OpenBSD: patch-src_ppgltk_images_png_reader_cpp,v 1.1.1.1 2011/08/31 19:46:37 jasper Exp $
Adapt to new png; fix from Gentoo:
https://bugs.gentoo.org/attachment.cgi?id=222839&action=diff
--- src/ppgltk/images/png_reader.cpp.orig Thu Aug 11 14:41:38 2011
+++ src/ppgltk/images/png_reader.cpp Thu Aug 11 14:43:54 2011
@@ -77,7 +77,7 @@ ReaderPNG::ReaderPNG(const char *fileName)
png_get_IHDR(png_ptr, info_ptr, &width, &height,
- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
+ &bit_depth, &color_type, &interlace_type,(int *)NULL, (int *)NULL);
if(bit_depth == 16)
png_set_strip_16(png_ptr);
@@ -88,7 +88,7 @@ ReaderPNG::ReaderPNG(const char *fileName)
png_set_expand(png_ptr);
png_read_update_info(png_ptr, info_ptr);
png_get_IHDR(png_ptr, info_ptr, &width, &height,
- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
+ &bit_depth, &color_type, &interlace_type,(int *)NULL, (int *)NULL);
}
if( color_type == PNG_COLOR_TYPE_GRAY ||
@@ -96,7 +96,7 @@ ReaderPNG::ReaderPNG(const char *fileName)
png_set_gray_to_rgb(png_ptr);
png_read_update_info(png_ptr, info_ptr);
png_get_IHDR(png_ptr, info_ptr, &width, &height,
- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
+ &bit_depth, &color_type, &interlace_type,(int *)NULL, (int *)NULL);
}
this->width=width;
@@ -114,7 +114,7 @@ ReaderPNG::ReaderPNG(const char *fileName)
}
png_read_end(png_ptr, info_ptr);
- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
fclose(fp);
}