Lines 36-42
my_png_read_stream(png_structp png_ptr,
Link Here
|
36 |
{ |
36 |
{ |
37 |
png_uint_32 check; |
37 |
png_uint_32 check; |
38 |
|
38 |
|
39 |
SplashStream * stream = (SplashStream*)png_ptr->io_ptr; |
39 |
SplashStream * stream = (SplashStream*)png_get_io_ptr(png_ptr); |
40 |
check = stream->read(stream, data, length); |
40 |
check = stream->read(stream, data, length); |
41 |
if (check != length) |
41 |
if (check != length) |
42 |
png_error(png_ptr, "Read Error"); |
42 |
png_error(png_ptr, "Read Error"); |
Lines 71-82
SplashDecodePng(Splash * splash, png_rw_
Link Here
|
71 |
goto done; |
71 |
goto done; |
72 |
} |
72 |
} |
73 |
|
73 |
|
74 |
if (setjmp(png_ptr->jmpbuf)) { |
74 |
if (setjmp(png_jmpbuf(png_ptr))) { |
75 |
goto done; |
75 |
goto done; |
76 |
} |
76 |
} |
77 |
|
77 |
|
78 |
png_ptr->io_ptr = io_ptr; |
78 |
png_set_read_fn(png_ptr, io_ptr, read_func); |
79 |
png_ptr->read_data_fn = read_func; |
|
|
80 |
|
79 |
|
81 |
png_set_sig_bytes(png_ptr, SIG_BYTES); /* we already read the 8 signature bytes */ |
80 |
png_set_sig_bytes(png_ptr, SIG_BYTES); /* we already read the 8 signature bytes */ |
82 |
|
81 |
|