diff options
| author | aavit <qt_aavit@ovi.com> | 2012-03-02 10:09:10 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-12 15:51:42 +0200 |
| commit | ed881474111d635bb90d3e08e9fb70c06d19d48b (patch) | |
| tree | cd231b241f3e4c2e0901862bf0fffe395a8a8253 /src/3rdparty/libpng/pnglibconf.h | |
| parent | 597d5f2288354772d9b8d02e8a6445ad7af10586 (diff) | |
| download | qt4-tools-ed881474111d635bb90d3e08e9fb70c06d19d48b.tar.gz | |
Upgrading libpng: Patches to libpng 1.5.10 for Qt usage
This is the collection of those earlier patches to libpng
in Qt that are still relevant, updated as required:
d6ba0e805fd2b17e2e0cbbce32e218551505d91f
91bf025444f13eb269ece6bb430a841638bb32a8
125dae45c5c8e09a58409095f6661ab65ea1e71f
d6947bcbed97889d7d56d400f81eb1691a3f18e1
Change-Id: I06603041b5971ade4742f600dbea4cca98ff95a5
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Diffstat (limited to 'src/3rdparty/libpng/pnglibconf.h')
| -rw-r--r-- | src/3rdparty/libpng/pnglibconf.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/libpng/pnglibconf.h b/src/3rdparty/libpng/pnglibconf.h index 6facf39aab..aa82b574a8 100644 --- a/src/3rdparty/libpng/pnglibconf.h +++ b/src/3rdparty/libpng/pnglibconf.h @@ -44,7 +44,9 @@ #define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED #define PNG_cHRM_SUPPORTED #define PNG_CONSOLE_IO_SUPPORTED +#ifndef _WIN32_WCE #define PNG_CONVERT_tIME_SUPPORTED +#endif #define PNG_EASY_ACCESS_SUPPORTED /*#undef PNG_ERROR_NUMBERS_SUPPORTED*/ #define PNG_ERROR_TEXT_SUPPORTED @@ -183,4 +185,5 @@ #define PNG_WRITE_zTXt_SUPPORTED #define PNG_zTXt_SUPPORTED /* end of options */ +#define PNG_SAFE_LIMITS_SUPPORTED #endif /* PNGLCONF_H */ |