From 3f28d97b1a7fe891394a20940a0bf76c502aede5 Mon Sep 17 00:00:00 2001 From: dinoex Date: Mon, 29 Mar 2010 06:18:50 +0000 Subject: - fix build for png-1.4.1 PR: 145157 --- .../files/patch-ksplash-ksplashx-qpngio.cpp | 33 ++++++++++++++++++++++ .../files/patch-ksplash-ksplashx-qpngio.cpp | 33 ++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 x11/kde4-workspace/files/patch-ksplash-ksplashx-qpngio.cpp create mode 100644 x11/kdebase4-workspace/files/patch-ksplash-ksplashx-qpngio.cpp (limited to 'x11') diff --git a/x11/kde4-workspace/files/patch-ksplash-ksplashx-qpngio.cpp b/x11/kde4-workspace/files/patch-ksplash-ksplashx-qpngio.cpp new file mode 100644 index 00000000000..ec72475697a --- /dev/null +++ b/x11/kde4-workspace/files/patch-ksplash-ksplashx-qpngio.cpp @@ -0,0 +1,33 @@ +--- ksplash/ksplashx/qpngio.cpp.orig 2008-01-05 00:55:38.000000000 +0100 ++++ ksplash/ksplashx/qpngio.cpp 2010-03-29 07:49:55.000000000 +0200 +@@ -151,7 +151,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); +@@ -179,7 +179,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++; +@@ -307,9 +307,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; ywidth; x++) { + if (((uint**)jt)[y][x] == trans) { diff --git a/x11/kdebase4-workspace/files/patch-ksplash-ksplashx-qpngio.cpp b/x11/kdebase4-workspace/files/patch-ksplash-ksplashx-qpngio.cpp new file mode 100644 index 00000000000..ec72475697a --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-ksplash-ksplashx-qpngio.cpp @@ -0,0 +1,33 @@ +--- ksplash/ksplashx/qpngio.cpp.orig 2008-01-05 00:55:38.000000000 +0100 ++++ ksplash/ksplashx/qpngio.cpp 2010-03-29 07:49:55.000000000 +0200 +@@ -151,7 +151,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); +@@ -179,7 +179,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++; +@@ -307,9 +307,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; ywidth; x++) { + if (((uint**)jt)[y][x] == trans) { -- cgit