1 --- gdal-1.8.0/frmts/png/pngdataset.cpp.orig 2011-01-14 06:19:04.000000000 +0100
2 +++ gdal-1.8.0/frmts/png/pngdataset.cpp 2012-01-16 19:36:37.513649497 +0100
4 * instead of an int, which is what fread() actually returns.
6 check = (png_size_t)VSIFReadL(data, (png_size_t)1, length,
7 - (VSILFILE*)png_ptr->io_ptr);
8 + (VSILFILE*)png_get_io_ptr(png_ptr));
11 png_error(png_ptr, "Read Error");
16 - check = VSIFWriteL(data, 1, length, (VSILFILE*)(png_ptr->io_ptr));
17 + check = VSIFWriteL(data, 1, length, (VSILFILE*)png_get_io_ptr(png_ptr));
20 png_error(png_ptr, "Write Error");
22 /************************************************************************/
23 static void png_vsi_flush(png_structp png_ptr)
25 - VSIFFlushL( (VSILFILE*)(png_ptr->io_ptr) );
26 + VSIFFlushL( (VSILFILE*)png_get_io_ptr(png_ptr) );
29 /************************************************************************/
31 // libpng is generally not built as C++ and so won't honour unwind
34 - jmp_buf* psSetJmpContext = (jmp_buf*) png_ptr->error_ptr;
35 + jmp_buf* psSetJmpContext = (jmp_buf*) png_get_error_ptr(png_ptr);
38 longjmp( *psSetJmpContext, 1 );