You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
34 lines
1.3 KiB
34 lines
1.3 KiB
14 years ago
|
--- 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) {
|