diff options
Diffstat (limited to 'x11-toolkits/qt33/files/patch-src-kernel-qpngio.cpp')
| -rw-r--r-- | x11-toolkits/qt33/files/patch-src-kernel-qpngio.cpp | 50 |
1 files changed, 47 insertions, 3 deletions
diff --git a/x11-toolkits/qt33/files/patch-src-kernel-qpngio.cpp b/x11-toolkits/qt33/files/patch-src-kernel-qpngio.cpp index c7f38b818d3f..11917c55197b 100644 --- a/x11-toolkits/qt33/files/patch-src-kernel-qpngio.cpp +++ b/x11-toolkits/qt33/files/patch-src-kernel-qpngio.cpp @@ -1,6 +1,14 @@ --- src/kernel/qpngio.cpp.orig 2007-02-02 15:01:15.000000000 +0100 -+++ src/kernel/qpngio.cpp 2010-03-28 14:00:46.000000000 +0200 -@@ -159,7 +159,7 @@ ++++ src/kernel/qpngio.cpp 2012-04-27 10:52:06.000000000 +0200 +@@ -43,6 +43,7 @@ + #include "qiodevice.h" + + #include <png.h> ++#include <pngpriv.h> + + + #ifdef Q_OS_TEMP +@@ -159,7 +160,7 @@ image.setColor( i, qRgba(c,c,c,0xff) ); } if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { @@ -9,7 +17,7 @@ if (g < ncols) { image.setAlphaBuffer(TRUE); image.setColor(g, image.color(g) & RGB_MASK); -@@ -187,7 +187,7 @@ +@@ -187,7 +188,7 @@ info_ptr->palette[i].red, info_ptr->palette[i].green, info_ptr->palette[i].blue, @@ -18,3 +26,39 @@ ) ); i++; +@@ -284,7 +285,7 @@ + return; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + iio->setStatus(-4); + return; +@@ -469,7 +470,7 @@ + return FALSE; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + return FALSE; + } +@@ -1030,7 +1031,7 @@ + return -1; + } + +- if (setjmp((png_ptr)->jmpbuf)) { ++ if (setjmp(png_jmpbuf((png_ptr)))) { + png_destroy_read_struct(&png_ptr, &info_ptr, 0); + image = 0; + return -1; +@@ -1057,7 +1058,7 @@ + + if ( !png_ptr ) return 0; + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, 0); + image = 0; + state = MovieStart; |