blob: fce010da4d7e85af4767fed3ac4c2331300ea869 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
Index: /trunk/opencv/modules/highgui/src/grfmt_png.cpp
===================================================================
--- /trunk/opencv/modules/highgui/src/grfmt_png.cpp (revision 4337)
+++ /trunk/opencv/modules/highgui/src/grfmt_png.cpp (revision 4945)
@@ -108,5 +108,5 @@
{
png_structp png_ptr = (png_structp)_png_ptr;
- PngDecoder* decoder = (PngDecoder*)(png_ptr->io_ptr);
+ PngDecoder* decoder = (PngDecoder*)(png_get_io_ptr(png_ptr));
CV_Assert( decoder );
const Mat& buf = decoder->m_buf;
@@ -139,5 +139,5 @@
if( info_ptr && end_info )
{
- if( setjmp( png_ptr->jmpbuf ) == 0 )
+ if( setjmp( png_jmpbuf( png_ptr ) ) == 0 )
{
if( !m_buf.empty() )
@@ -201,5 +201,5 @@
png_infop end_info = (png_infop)m_end_info;
- if( setjmp(png_ptr->jmpbuf) == 0 )
+ if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 )
{
int y;
@@ -285,5 +285,5 @@
return;
png_structp png_ptr = (png_structp)_png_ptr;
- PngEncoder* encoder = (PngEncoder*)(png_ptr->io_ptr);
+ PngEncoder* encoder = (PngEncoder*)(png_get_io_ptr(png_ptr));
CV_Assert( encoder && encoder->m_buf );
size_t cursz = encoder->m_buf->size();
@@ -327,5 +327,5 @@
if( info_ptr )
{
- if( setjmp( png_ptr->jmpbuf ) == 0 )
+ if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 )
{
if( m_buf )
|
GitWeb
