stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-18 23:42:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'apng-conditional-disable' into 'master'

Browse source 
Disable the APNG code if the version of libpng is greater than 1.4.

See merge request STJr/SRB2!457
This commit is contained in:
Alam Ed Arias 2019-01-20 17:00:50 -05:00
commit b8b605a9c7
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/m_misc.c
View file

@ -93,7 +93,9 @@ typedef off_t off64_t;
#ifdef PNG_WRITE_SUPPORTED #ifdef PNG_WRITE_SUPPORTED
#define USE_PNG // Only actually use PNG if write is supported. #define USE_PNG // Only actually use PNG if write is supported.
#if defined (PNG_WRITE_APNG_SUPPORTED) //|| !defined(PNG_STATIC) #if defined (PNG_WRITE_APNG_SUPPORTED) //|| !defined(PNG_STATIC)
#define USE_APNG #if (PNG_LIBPNG_VER_MAJOR) == 1 && (PNG_LIBPNG_VER_MINOR <= 4) // Supposedly, the current APNG code can't work on newer versions as is
#define USE_APNG
#endif
#endif #endif
// See hardware/hw_draw.c for a similar check to this one. // See hardware/hw_draw.c for a similar check to this one.
#endif #endif