diff options
author | wiz <wiz@pkgsrc.org> | 2011-03-25 15:28:26 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2011-03-25 15:28:26 +0000 |
commit | 924ea6d8b7714062533bbcde23c315d735e8ff15 (patch) | |
tree | 5ea1c93c76749aa40f955864e454ef35cd6d16b4 | |
parent | 35006a6b9aa75a4c911de70889d987c91bd7b7ef (diff) | |
download | pkgsrc-924ea6d8b7714062533bbcde23c315d735e8ff15.tar.gz |
Fix sbit handling in png patch.
From Marko Schütz Schmuck on pkgsrc-users, fixing core dumps
in kmymoney and kphotoalbum.
Bump PKGREVISION.
-rw-r--r-- | x11/qt3-libs/Makefile | 4 | ||||
-rw-r--r-- | x11/qt3-libs/distinfo | 4 | ||||
-rw-r--r-- | x11/qt3-libs/patches/patch-as | 29 |
3 files changed, 18 insertions, 19 deletions
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index 705ea61bd35..48997b6f7b7 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.79 2011/03/18 15:36:17 wiz Exp $ +# $NetBSD: Makefile,v 1.80 2011/03/25 15:28:26 wiz Exp $ PKGNAME= qt3-libs-${QTVERSION} -PKGREVISION= 16 +PKGREVISION= 17 MAINTAINER= adam@NetBSD.org COMMENT= C++ X GUI toolkit diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo index 3a40901e849..7be2dc3c296 100644 --- a/x11/qt3-libs/distinfo +++ b/x11/qt3-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.56 2011/03/18 15:36:01 wiz Exp $ +$NetBSD: distinfo,v 1.57 2011/03/25 15:28:26 wiz Exp $ SHA1 (qt-x11-free-3.3.8.tar.bz2) = 91b192cb8e80679607d24ae35d6e20ed68d149d7 RMD160 (qt-x11-free-3.3.8.tar.bz2) = 7b8e4e35f49014eac4fcfe91b7ec0a45c5569cf4 @@ -21,7 +21,7 @@ SHA1 (patch-ao) = 3aacba05b27314cadab7dceba3c21d65bab608d3 SHA1 (patch-ap) = 5040628324d271abfc662c5a6eeb4f1ecf0d4758 SHA1 (patch-aq) = c17ff8b42901ae9a3cc51c33cffe4cffa64b4e4d SHA1 (patch-ar) = 84c0d7153feabcab6558ba84fbaa723f1c238e40 -SHA1 (patch-as) = 498cbb7732ec756f08b8b80ee8b36f8b7f651863 +SHA1 (patch-as) = 2a43d917c918dd616870b0829396114b2a9faddb SHA1 (patch-bb) = b6a15a4b2b7b83b89bd3610cf2e48c242dbce2e5 SHA1 (patch-bc) = d8a84e1b66bf1953b53df57ae81d2c98cce69c41 SHA1 (patch-bd) = a116ecf305ee5b5338bf84cb908d695f3baea830 diff --git a/x11/qt3-libs/patches/patch-as b/x11/qt3-libs/patches/patch-as index c7232e36b0a..e64fea36a48 100644 --- a/x11/qt3-libs/patches/patch-as +++ b/x11/qt3-libs/patches/patch-as @@ -1,6 +1,6 @@ -$NetBSD: patch-as,v 1.4 2011/03/18 15:36:01 wiz Exp $ +$NetBSD: patch-as,v 1.5 2011/03/25 15:28:26 wiz Exp $ ---- src/kernel/qpngio.cpp.orig 2007-02-02 14:01:15.000000000 +0000 +--- src/kernel/qpngio.cpp.orig 2007-02-02 10:01:15.000000000 -0400 +++ src/kernel/qpngio.cpp @@ -43,6 +43,7 @@ #include "qiodevice.h" @@ -128,16 +128,15 @@ $NetBSD: patch-as,v 1.4 2011/03/18 15:36:01 wiz Exp $ png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(), image.depth() == 1 ? 1 : 8 /* per channel */, -@@ -504,11 +526,13 @@ bool QPNGImageWriter::writeImage(const Q +@@ -504,11 +526,12 @@ bool QPNGImageWriter::writeImage(const Q : PNG_COLOR_TYPE_RGB : PNG_COLOR_TYPE_PALETTE, 0, 0, 0); -+ png_color_8p sig_bit; -+ png_get_sBIT(png_ptr, info_ptr, &sig_bit); -+ sig_bit->red = 8; -+ sig_bit->green = 8; -+ sig_bit->blue = 8; -+ png_set_sBIT(png_ptr, info_ptr, sig_bit); ++ png_color_8 sig_bit; ++ sig_bit.red = 8; ++ sig_bit.green = 8; ++ sig_bit.blue = 8; ++ png_set_sBIT(png_ptr, info_ptr, &sig_bit); - //png_set_sBIT(png_ptr, info_ptr, 8); - info_ptr->sig_bit.red = 8; @@ -146,7 +145,7 @@ $NetBSD: patch-as,v 1.4 2011/03/18 15:36:01 wiz Exp $ if (image.depth() == 1 && image.bitOrder() == QImage::LittleEndian) png_set_packswap(png_ptr); -@@ -522,11 +546,14 @@ bool QPNGImageWriter::writeImage(const Q +@@ -522,11 +545,14 @@ bool QPNGImageWriter::writeImage(const Q png_set_PLTE(png_ptr, info_ptr, palette, num_palette); int* trans = new int[num_palette]; int num_trans = 0; @@ -164,7 +163,7 @@ $NetBSD: patch-as,v 1.4 2011/03/18 15:36:01 wiz Exp $ if (image.hasAlphaBuffer()) { trans[i] = rgb >> 24; if (trans[i] < 255) { -@@ -534,6 +561,7 @@ bool QPNGImageWriter::writeImage(const Q +@@ -534,6 +560,7 @@ bool QPNGImageWriter::writeImage(const Q } } } @@ -172,7 +171,7 @@ $NetBSD: patch-as,v 1.4 2011/03/18 15:36:01 wiz Exp $ if (num_trans) { copy_trans = new png_byte[num_trans]; for (int i=0; i<num_trans; i++) -@@ -544,7 +572,10 @@ bool QPNGImageWriter::writeImage(const Q +@@ -544,7 +571,10 @@ bool QPNGImageWriter::writeImage(const Q } if ( image.hasAlphaBuffer() ) { @@ -184,7 +183,7 @@ $NetBSD: patch-as,v 1.4 2011/03/18 15:36:01 wiz Exp $ } // Swap ARGB to RGBA (normal PNG format) before saving on -@@ -1030,7 +1061,7 @@ int QPNGFormat::decode(QImage& img, QIma +@@ -1030,7 +1060,7 @@ int QPNGFormat::decode(QImage& img, QIma return -1; } @@ -193,7 +192,7 @@ $NetBSD: patch-as,v 1.4 2011/03/18 15:36:01 wiz Exp $ png_destroy_read_struct(&png_ptr, &info_ptr, 0); image = 0; return -1; -@@ -1057,7 +1088,7 @@ int QPNGFormat::decode(QImage& img, QIma +@@ -1057,7 +1087,7 @@ int QPNGFormat::decode(QImage& img, QIma if ( !png_ptr ) return 0; @@ -202,7 +201,7 @@ $NetBSD: patch-as,v 1.4 2011/03/18 15:36:01 wiz Exp $ png_destroy_read_struct(&png_ptr, &info_ptr, 0); image = 0; state = MovieStart; -@@ -1117,7 +1148,7 @@ void QPNGFormat::end(png_structp png, pn +@@ -1117,7 +1147,7 @@ void QPNGFormat::end(png_structp png, pn consumer->frameDone(QPoint(offx,offy),r); consumer->end(); state = FrameStart; |