diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-18 21:12:15 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-18 21:12:15 -0300 |
| commit | 437136a9d1b78ff4eea10589099d343c305b9d43 (patch) | |
| tree | 603d509651d3c9f5115b3e1c074d9f8d3d3fa6e0 /staging/qt3/qt3-png14.patch | |
| parent | 1b06975999d3c939ca811b49b6e731a4955a4684 (diff) | |
| parent | 1a6ff4080dd35e884270c93c1cb270ce3a1d0919 (diff) | |
Merge branch 'master' of ssh://gparabola/abslibre-mips64el
Diffstat (limited to 'staging/qt3/qt3-png14.patch')
| -rw-r--r-- | staging/qt3/qt3-png14.patch | 33 |
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) { |