mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
pngrutil.c
View File

@@ -257,6 +257,10 @@ png_crc_error(png_structrp png_ptr)
return (0); return (0);
} }
#if defined(PNG_READ_iCCP_SUPPORTED) || defined(PNG_READ_iTXt_SUPPORTED) ||\
defined(PNG_READ_pCAL_SUPPORTED) || defined(PNG_READ_sCAL_SUPPORTED) ||\
defined(PNG_READ_sPLT_SUPPORTED) || defined(PNG_READ_tEXt_SUPPORTED) ||\
defined(PNG_READ_zTXt_SUPPORTED) || defined(PNG_SEQUENTIAL_READ_SUPPORTED)
/* Manage the read buffer; this simply reallocates the buffer if it is not small /* Manage the read buffer; this simply reallocates the buffer if it is not small
* enough (or if it is not allocated). The routine returns a pointer to the * enough (or if it is not allocated). The routine returns a pointer to the
* buffer; if an error occurs and 'warn' is set the routine returns NULL, else * buffer; if an error occurs and 'warn' is set the routine returns NULL, else
@@ -304,6 +308,7 @@ png_read_buffer(png_structrp png_ptr, png_alloc_size_t new_size, int warn)
return buffer; return buffer;
} }
#endif /* PNG_READ_iCCP|iTXt|pCAL|sCAL|sPLT|tEXt|zTXt|SEQUENTIAL_READ */
/* png_inflate_claim: claim the zstream for some nefarious purpose that involves /* png_inflate_claim: claim the zstream for some nefarious purpose that involves
* decompression. Returns Z_OK on success, else a zlib error code. It checks * decompression. Returns Z_OK on success, else a zlib error code. It checks

5
scripts/pnglibconf.dfa
View File

@@ -864,7 +864,7 @@ option READ_CHECK_FOR_INVALID_INDEX requires READ disabled
option WRITE_CHECK_FOR_INVALID_INDEX requires WRITE disabled option WRITE_CHECK_FOR_INVALID_INDEX requires WRITE disabled
# added at libpng-1.5.15 # 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 READ_GET_PALETTE_MAX requires READ_CHECK_FOR_INVALID_INDEX disabled
option WRITE_GET_PALETTE_MAX requires WRITE_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, option SIMPLIFIED_READ_AFIRST enables FORMAT_AFIRST,
requires SIMPLIFIED_READ READ_SWAP_ALPHA requires SIMPLIFIED_READ READ_SWAP_ALPHA
option SIMPLIFIED_READ_BGR enables FORMAT_BGR,
requires SIMPLIFIED_READ READ_BGR
# Write: # Write:
option SIMPLIFIED_WRITE, option SIMPLIFIED_WRITE,
requires WRITE STDIO, SETJMP, WRITE_SWAP, WRITE_PACK, requires WRITE STDIO, SETJMP, WRITE_SWAP, WRITE_PACK,