1 --- src/media_tools/img.c.orig 2008-12-01 18:39:36.000000000 +0100
2 +++ src/media_tools/img.c 2012-04-24 23:00:42.000000000 +0200
5 /*include png.h before setjmp.h, otherwise we get compilation errors*/
9 #endif /*GPAC_HAS_PNG*/
13 static void user_error_fn(png_structp png_ptr,png_const_charp error_msg)
15 - longjmp(png_ptr->jmpbuf, 1);
16 + longjmp(png_jmpbuf(png_ptr), 1);
21 png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
24 - if (setjmp(png_ptr->jmpbuf)) {
25 + if (setjmp(png_jmpbuf(png_ptr))) {
26 png_destroy_info_struct(png_ptr,(png_infopp) & info_ptr);
27 png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
30 /* Allocate/initialize the image information data. REQUIRED */
31 info_ptr = png_create_info_struct(png_ptr);
32 if (info_ptr == NULL) {
33 - png_destroy_write_struct(&png_ptr, png_infopp_NULL);
34 + png_destroy_write_struct(&png_ptr, (png_infopp)NULL);