cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: 'inflateValidate' is only available on macOS 10.13 or newer

Browse Source 
The warning occurs when compiling the latest wxWidgets 3.1.1 on macOS
and will cause the final application code to crash if run on macOS <
10.13. The patch fixes the issue, following this one:
8d2a287da3/external/libpng/libpng-osx.patch.1

See https://github.com/wxWidgets/libpng/pull/1
This commit is contained in:
maccy2 2018-02-19 18:21:26 +01:00 committed by Vadim Zeitlin
parent 46b17e804b
commit 3ffeff7877
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pngrutil.c
View File

@ -423,7 +423,8 @@ png_inflate_claim(png_structrp png_ptr, png_uint_32 owner)
} }
#if ZLIB_VERNUM >= 0x1290 && \ #if ZLIB_VERNUM >= 0x1290 && \
defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_IGNORE_ADLER32) defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_IGNORE_ADLER32) && \
!(defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED < 101300)
if (((png_ptr->options >> PNG_IGNORE_ADLER32) & 3) == PNG_OPTION_ON) if (((png_ptr->options >> PNG_IGNORE_ADLER32) & 3) == PNG_OPTION_ON)
/* Turn off validation of the ADLER32 checksum in IDAT chunks */ /* Turn off validation of the ADLER32 checksum in IDAT chunks */
ret = inflateValidate(&png_ptr->zstream, 0); ret = inflateValidate(&png_ptr->zstream, 0);