diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2011-08-18 13:55:58 (GMT) |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2011-08-18 13:55:58 (GMT) |
| commit | 5ce63a6ba3f5605967b17adcf64f17ecdc875e09 (patch) | |
| tree | 647260f1e4a94cc6c7540ea807240385eba3e189 /src | |
| parent | 9db6959f8893a64146124db0cfafbcb154a9e105 (diff) | |
| download | Qt-5ce63a6ba3f5605967b17adcf64f17ecdc875e09.zip Qt-5ce63a6ba3f5605967b17adcf64f17ecdc875e09.tar.gz Qt-5ce63a6ba3f5605967b17adcf64f17ecdc875e09.tar.bz2 | |
Revert "Fix build with the Clang compiler"
This reverts commit 182b10dbad23e9da310c0d600095f17c41dd0d3c.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/image/qpnghandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp index 812c450..f7d07a5 100644 --- a/src/gui/image/qpnghandler.cpp +++ b/src/gui/image/qpnghandler.cpp @@ -420,7 +420,7 @@ bool Q_INTERNAL_WIN_NO_THROW QPngHandlerPrivate::readPngHeader() return false; } - if (setjmp((*png_set_longjmp_fn((png_ptr), (png_longjmp_ptr)longjmp, sizeof(jmp_buf))))) { + if (setjmp(png_jmpbuf(png_ptr))) { png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); png_ptr = 0; return false; @@ -449,7 +449,7 @@ bool Q_INTERNAL_WIN_NO_THROW QPngHandlerPrivate::readPngImage(QImage *outImage) } row_pointers = 0; - if (setjmp((*png_set_longjmp_fn((png_ptr), (png_longjmp_ptr)longjmp, sizeof(jmp_buf))))) { + if (setjmp(png_jmpbuf(png_ptr))) { png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); delete [] row_pointers; png_ptr = 0; @@ -723,7 +723,7 @@ bool Q_INTERNAL_WIN_NO_THROW QPNGImageWriter::writeImage(const QImage& image, in return false; } - if (setjmp((*png_set_longjmp_fn((png_ptr), (png_longjmp_ptr)longjmp, sizeof(jmp_buf))))) { + if (setjmp(png_jmpbuf(png_ptr))) { png_destroy_write_struct(&png_ptr, &info_ptr); return false; } |