Annotation of ports/graphics/rawtherapee/patches/patch-rtengine_imageio_cc, Revision 1.1.1.1
1.1 yason 1: $OpenBSD$
2: --- rtengine/imageio.cc.orig Fri Oct 28 09:58:07 2011
3: +++ rtengine/imageio.cc Fri Oct 28 10:00:49 2011
4: @@ -867,7 +867,7 @@ void png_read_data(png_structp png_ptr, png_bytep data
5: /* fread() returns 0 on error, so it is OK to store this in a png_size_t
6: * instead of an int, which is what fread() actually returns.
7: */
8: - check = (png_size_t)fread(data, (png_size_t)1, length, (FILE *)png_ptr->io_ptr);
9: + check = (png_size_t)fread(data, (png_size_t)1, length, (FILE *)png_get_io_ptr(png_ptr));
10:
11: if (check != length)
12: {
13: @@ -878,7 +878,7 @@ void png_read_data(png_structp png_ptr, png_bytep data
14: void png_write_data(png_structp png_ptr, png_bytep data, png_size_t length) {
15: png_uint_32 check;
16:
17: - check = fwrite(data, 1, length, (FILE *)(png_ptr->io_ptr));
18: + check = fwrite(data, 1, length, (FILE *)png_get_io_ptr(png_ptr));
19: if (check != length)
20: {
21: png_error(png_ptr, "Write Error");
22: @@ -887,7 +887,7 @@ void png_write_data(png_structp png_ptr, png_bytep dat
23:
24: void png_flush(png_structp png_ptr) {
25: FILE *io_ptr;
26: - io_ptr = (FILE *)CVT_PTR((png_ptr->io_ptr));
27: + io_ptr = (FILE *)(png_get_io_ptr(png_ptr));
28: if (io_ptr != NULL)
29: fflush(io_ptr);
30: }
CVSweb