summaryrefslogtreecommitdiff
path: root/staging/qt3/qt3-png14.patch
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2011-12-18 15:46:12 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2011-12-18 15:46:12 +0100
commit82e56b34417677fc5ad8718a516874fb5351e60f (patch)
tree2f157396a89875f5f3543c62e7f4d5f9042cfb94 /staging/qt3/qt3-png14.patch
parente63aad93b3e68c372e525d86c3277b2fa4bddb24 (diff)
parent146025aa1c838c12fa7b4873414da73816bfb6bd (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/python2-pymongo/PKGBUILD extra/clamav/PKGBUILD extra/claws-mail-extra-plugins/PKGBUILD extra/lcms2/PKGBUILD extra/libxi/PKGBUILD extra/xorg-server/PKGBUILD multilib/wine/PKGBUILD
Diffstat (limited to 'staging/qt3/qt3-png14.patch')
-rw-r--r--staging/qt3/qt3-png14.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/staging/qt3/qt3-png14.patch b/staging/qt3/qt3-png14.patch
new file mode 100644
index 000000000..e8a194529
--- /dev/null
+++ b/staging/qt3/qt3-png14.patch
@@ -0,0 +1,33 @@
+--- src/kernel/qpngio.cpp.orig 2010-01-16 22:02:41.000000000 +0100
++++ src/kernel/qpngio.cpp 2010-01-16 22:03:56.000000000 +0100
+@@ -159,7 +159,7 @@
+ image.setColor( i, qRgba(c,c,c,0xff) );
+ }
+ if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
+- const int g = info_ptr->trans_values.gray;
++ const int g = info_ptr->trans_color.gray;
+ if (g < ncols) {
+ image.setAlphaBuffer(TRUE);
+ image.setColor(g, image.color(g) & RGB_MASK);
+@@ -187,7 +187,7 @@
+ info_ptr->palette[i].red,
+ info_ptr->palette[i].green,
+ info_ptr->palette[i].blue,
+- info_ptr->trans[i]
++ info_ptr->trans_alpha[i]
+ )
+ );
+ i++;
+@@ -321,9 +321,9 @@
+ png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)
+ if (image.depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
+ QRgb trans = 0xFF000000 | qRgb(
+- (info_ptr->trans_values.red << 8 >> bit_depth)&0xff,
+- (info_ptr->trans_values.green << 8 >> bit_depth)&0xff,
+- (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff);
++ (info_ptr->trans_color.red << 8 >> bit_depth)&0xff,
++ (info_ptr->trans_color.green << 8 >> bit_depth)&0xff,
++ (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff);
+ for (uint y=0; y<height; y++) {
+ for (uint x=0; x<info_ptr->width; x++) {
+ if (((uint**)jt)[y][x] == trans) {