diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-30 08:40:03 (GMT) |
|---|---|---|
| committer | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-30 08:40:03 (GMT) |
| commit | 7f27ebb0383414f15f391151655e5b09952f8ccd (patch) | |
| tree | 8af7b866af6115924a13896013f5b6f5da686de6 /src/3rdparty/libpng/pnginfo.h | |
| parent | 3dccb66b3b81627fb70c7eeccdf32b96d8add8b7 (diff) | |
| parent | 78c5825cfb7702350636b7624bf79311dbd0dbd5 (diff) | |
| download | Qt-7f27ebb0383414f15f391151655e5b09952f8ccd.zip Qt-7f27ebb0383414f15f391151655e5b09952f8ccd.tar.gz Qt-7f27ebb0383414f15f391151655e5b09952f8ccd.tar.bz2 | |
Merge remote branch 'mainline/4.8'
Diffstat (limited to 'src/3rdparty/libpng/pnginfo.h')
| -rw-r--r-- | src/3rdparty/libpng/pnginfo.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/3rdparty/libpng/pnginfo.h b/src/3rdparty/libpng/pnginfo.h index fa19f85..a33bfab 100644 --- a/src/3rdparty/libpng/pnginfo.h +++ b/src/3rdparty/libpng/pnginfo.h @@ -138,7 +138,6 @@ defined(PNG_READ_BACKGROUND_SUPPORTED) * single color specified that should be treated as fully transparent. * Data is valid if (valid & PNG_INFO_tRNS) is non-zero. */ - png_bytep trans; /* alpha values for paletted image */ png_bytep trans_alpha; /* alpha values for paletted image */ png_color_16 trans_color; /* transparent color for non-palette image */ #endif |