--- a/tools/kpng.c +++ b/tools/kpng.c @@ -179,13 +179,13 @@ int kd_read_png8(const char *filename,int *w,int *h,int *bpp,kate_color **palett } } - png_destroy_read_struct(&png_ptr,&info_ptr,png_infopp_NULL); + png_destroy_read_struct(&png_ptr,&info_ptr,NULL); fclose(f); return 0; error: - if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:png_infopp_NULL,png_infopp_NULL); + if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:NULL,NULL); if (f) fclose(f); return -1; } @@ -224,7 +224,7 @@ int kd_read_png(const char *filename,int *w,int *h,unsigned char **pixels,size_t if (w) *w=png_get_image_width(png_ptr,info_ptr); if (h) *h=png_get_image_height(png_ptr,info_ptr); - png_destroy_read_struct(&png_ptr,&info_ptr,png_infopp_NULL); + png_destroy_read_struct(&png_ptr,&info_ptr,NULL); /* now read the whole file as a binary blob */ fseek(f,0,SEEK_END); @@ -246,7 +246,7 @@ int kd_read_png(const char *filename,int *w,int *h,unsigned char **pixels,size_t return 0; error: - if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:png_infopp_NULL,png_infopp_NULL); + if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:NULL,NULL); if (f) fclose(f); return -1; }