From ad5c768fc8b93e22201fb557561b2edd4fcdc26b Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 7 Dec 2015 14:53:22 +0100 Subject: Update bundled libpng to version 1.6.19 Merged in the upstream version, which obsoleted some local patches. The remaining diff to clean 1.6.19 is archived in the qtpatches.diff file. Change-Id: I676df2dab2c52c7fe576de284d472d70206f0a8c Reviewed-by: Konstantin Ritt Reviewed-by: aavit --- src/3rdparty/libpng/pnglibconf.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/3rdparty/libpng/pnglibconf.h') diff --git a/src/3rdparty/libpng/pnglibconf.h b/src/3rdparty/libpng/pnglibconf.h index f0fdcf8068..8b6da9eb2c 100644 --- a/src/3rdparty/libpng/pnglibconf.h +++ b/src/3rdparty/libpng/pnglibconf.h @@ -1,8 +1,6 @@ -/* libpng 1.6.17 STANDARD API DEFINITION */ - /* pnglibconf.h - library build configuration */ -/* Libpng version 1.6.17 - March 26, 2015 */ +/* libpng version 1.6.19, July 23, 2015 */ /* Copyright (c) 1998-2014 Glenn Randers-Pehrson */ @@ -196,6 +194,10 @@ #define PNG_GAMMA_THRESHOLD_FIXED 5000 #define PNG_IDAT_READ_SIZE PNG_ZBUF_SIZE #define PNG_INFLATE_BUF_SIZE 1024 +#define PNG_LINKAGE_API extern +#define PNG_LINKAGE_CALLBACK extern +#define PNG_LINKAGE_DATA extern +#define PNG_LINKAGE_FUNCTION extern #define PNG_MAX_GAMMA_8 11 #define PNG_QUANTIZE_BLUE_BITS 5 #define PNG_QUANTIZE_GREEN_BITS 5 -- cgit v1.2.3