diff options
| author | aavit <qt_aavit@ovi.com> | 2012-04-11 10:12:38 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-12 15:51:30 +0200 |
| commit | 597d5f2288354772d9b8d02e8a6445ad7af10586 (patch) | |
| tree | 0a3697cb378c6f4f821faf4b361a63a6104f11a5 /src/3rdparty/libpng/pnglibconf.h | |
| parent | a3f9dfbe3bda60e09769f7a065f4dceea3ccef6e (diff) | |
| download | qt4-tools-597d5f2288354772d9b8d02e8a6445ad7af10586.tar.gz | |
Upgrading libpng: Adding clean copy of libpng 1.5.10
This commit removes the previous version of the bundled
libpng (1.5.4), as well as all local modifications to it.
It adds an unmodified copy of the official libpng
source distribution, except that various extraneous
files have been removed, as usual.
The patches required to build it in Qt will follow in
separate commit(s).
Change-Id: I0cfc782a1c1b7f06b92eb1b38992bd8a0e6de08d
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 | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/3rdparty/libpng/pnglibconf.h b/src/3rdparty/libpng/pnglibconf.h index bf4b104d57..6facf39aab 100644 --- a/src/3rdparty/libpng/pnglibconf.h +++ b/src/3rdparty/libpng/pnglibconf.h @@ -3,9 +3,9 @@ /* pnglibconf.h - library build configuration */ -/* libpng version 1.5.4 - last changed on June 22, 2011 */ +/* Libpng 1.5.10 - March 29, 2012 */ -/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */ +/* Copyright (c) 1998-2012 Glenn Randers-Pehrson */ /* This code is released under the libpng license. */ /* For conditions of distribution and use, see the disclaimer */ @@ -31,10 +31,6 @@ #define PNG_QUANTIZE_GREEN_BITS 5 #define PNG_QUANTIZE_RED_BITS 5 #define PNG_sCAL_PRECISION 5 -#define PNG_USER_CHUNK_CACHE_MAX 0 -#define PNG_USER_CHUNK_MALLOC_MAX 0 -#define PNG_USER_HEIGHT_MAX 1000000L -#define PNG_USER_WIDTH_MAX 1000000L #define PNG_WEIGHT_SHIFT 8 #define PNG_ZBUF_SIZE 8192 /* end of settings */ @@ -45,11 +41,10 @@ #define PNG_bKGD_SUPPORTED #define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED #define PNG_CHECK_cHRM_SUPPORTED +#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 @@ -76,6 +71,7 @@ #define PNG_READ_BACKGROUND_SUPPORTED #define PNG_READ_BGR_SUPPORTED #define PNG_READ_bKGD_SUPPORTED +#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED #define PNG_READ_cHRM_SUPPORTED #define PNG_READ_COMPOSITE_NODIV_SUPPORTED #define PNG_READ_COMPRESSED_TEXT_SUPPORTED @@ -147,6 +143,7 @@ #define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED #define PNG_WRITE_BGR_SUPPORTED #define PNG_WRITE_bKGD_SUPPORTED +#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED #define PNG_WRITE_cHRM_SUPPORTED #define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED #define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED |