[libpng17] Finished merging with libpng16 (pngrutil.c and pnglibconf.dfa)

This commit is contained in:
John Bowler
2013-11-23 08:20:39 -06:00
committed by Glenn Randers-Pehrson
parent 158c947ce2
commit f70f2fcf48
2 changed files with 9 additions and 1 deletions

View File

@@ -864,7 +864,7 @@ option READ_CHECK_FOR_INVALID_INDEX requires READ disabled
option WRITE_CHECK_FOR_INVALID_INDEX requires WRITE disabled
# added at libpng-1.5.15
option GET_PALETTE_MAX enables READ_GET_PALETTE_MAX, WRITE_GET_PALETTE_MAX
option GET_PALETTE_MAX enables READ_GET_PALETTE_MAX WRITE_GET_PALETTE_MAX
option READ_GET_PALETTE_MAX requires READ_CHECK_FOR_INVALID_INDEX disabled
option WRITE_GET_PALETTE_MAX requires WRITE_CHECK_FOR_INVALID_INDEX disabled
@@ -893,6 +893,9 @@ option SIMPLIFIED_READ,
option SIMPLIFIED_READ_AFIRST enables FORMAT_AFIRST,
requires SIMPLIFIED_READ READ_SWAP_ALPHA
option SIMPLIFIED_READ_BGR enables FORMAT_BGR,
requires SIMPLIFIED_READ READ_BGR
# Write:
option SIMPLIFIED_WRITE,
requires WRITE STDIO, SETJMP, WRITE_SWAP, WRITE_PACK,