diff options
| author | Bernhard Rosenkraenzer <br@blankpage.ch> | 2009-08-31 16:43:39 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-31 16:43:39 (GMT) |
| commit | cb2913bea73e17c4628974fa5d1f652576c2b52c (patch) | |
| tree | 7a71cb476ad7680b8104a684f97e01721888fa71 /src/gui | |
| parent | d322e54e377edf76b3ff4449659b7221349689d3 (diff) | |
| download | Qt-cb2913bea73e17c4628974fa5d1f652576c2b52c.zip Qt-cb2913bea73e17c4628974fa5d1f652576c2b52c.tar.gz Qt-cb2913bea73e17c4628974fa5d1f652576c2b52c.tar.bz2 | |
Adapt to libpng 1.4.0beta74 API change
From libpng changelog:
version 1.4.0beta74 [August 8, 2009]
Changed png_ptr and info_ptr member "trans" to "trans_alpha".
Merge-request: 1317
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qpnghandler.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp index b9dcf48..c4733cf 100644 --- a/src/gui/image/qpnghandler.cpp +++ b/src/gui/image/qpnghandler.cpp @@ -238,7 +238,11 @@ void setup_qt(QImage& image, png_structp png_ptr, png_infop info_ptr, float scre info_ptr->palette[i].red, info_ptr->palette[i].green, info_ptr->palette[i].blue, +#if PNG_LIBPNG_VER_MAJOR < 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR < 4) info_ptr->trans[i] +#else + info_ptr->trans_alpha[i] +#endif ) ); i++; |