diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2011-08-15 16:26:08 (GMT) |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2011-08-16 12:51:25 (GMT) |
| commit | 182b10dbad23e9da310c0d600095f17c41dd0d3c (patch) | |
| tree | 8492d888551ddd6a5a098f35f920b886d9129d56 /src | |
| parent | fef1ae94b31762cd97ad76f2c5a45e9259ef1c6c (diff) | |
| download | Qt-182b10dbad23e9da310c0d600095f17c41dd0d3c.zip Qt-182b10dbad23e9da310c0d600095f17c41dd0d3c.tar.gz Qt-182b10dbad23e9da310c0d600095f17c41dd0d3c.tar.bz2 | |
Fix build with the Clang compiler
http://llvm.org/bugs/show_bug.cgi?id=10338
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
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 f7d07a5..812c450 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_jmpbuf(png_ptr))) { + if (setjmp((*png_set_longjmp_fn((png_ptr), (png_longjmp_ptr)longjmp, sizeof(jmp_buf))))) { 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_jmpbuf(png_ptr))) { + if (setjmp((*png_set_longjmp_fn((png_ptr), (png_longjmp_ptr)longjmp, sizeof(jmp_buf))))) { 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_jmpbuf(png_ptr))) { + if (setjmp((*png_set_longjmp_fn((png_ptr), (png_longjmp_ptr)longjmp, sizeof(jmp_buf))))) { png_destroy_write_struct(&png_ptr, &info_ptr); return false; } |