GerbilSoft/rom-properties
1
Fork 0
mirror of https://github.com/GerbilSoft/rom-properties.git synced 2025-06-18 11:35:38 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[libpng] Fix incorrect signatures for the APNG functions.

Browse Source 
png_structp -> png_structrp
png_infop -> png_inforp

TODO: Re-apply the APNG patch now that it's been rebased to 1.6.47.
This commit is contained in:
David Korth 2025-03-31 21:42:46 -04:00
parent e3a427f6c2
commit 3be503184b
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
extlib/libpng/pngpriv.h vendored
View File

@ -1662,36 +1662,36 @@ PNG_INTERNAL_FUNCTION(void,png_ensure_fcTL_is_valid,(png_structp png_ptr,
png_byte dispose_op, png_byte blend_op), PNG_EMPTY);
#ifdef PNG_READ_APNG_SUPPORTED
PNG_INTERNAL_FUNCTION(png_handle_result_code,png_handle_acTL,(png_structp png_ptr, png_infop info_ptr,
PNG_INTERNAL_FUNCTION(png_handle_result_code,png_handle_acTL,(png_structrp png_ptr, png_inforp info_ptr,
png_uint_32 length),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(png_handle_result_code,png_handle_fcTL,(png_structp png_ptr, png_infop info_ptr,
PNG_INTERNAL_FUNCTION(png_handle_result_code,png_handle_fcTL,(png_structrp png_ptr, png_inforp info_ptr,
png_uint_32 length),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(png_handle_result_code,png_handle_fdAT,(png_structp png_ptr, png_infop info_ptr,
PNG_INTERNAL_FUNCTION(png_handle_result_code,png_handle_fdAT,(png_structrp png_ptr, png_inforp info_ptr,
png_uint_32 length),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(void,png_have_info,(png_structp png_ptr, png_infop info_ptr),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(png_handle_result_code,png_ensure_sequence_number,(png_structp png_ptr,
PNG_INTERNAL_FUNCTION(void,png_have_info,(png_structrp png_ptr, png_inforp info_ptr),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(png_handle_result_code,png_ensure_sequence_number,(png_structrp png_ptr,
png_uint_32 length),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(void,png_read_reset,(png_structp png_ptr),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(void,png_read_reinit,(png_structp png_ptr,
PNG_INTERNAL_FUNCTION(void,png_read_reset,(png_structrp png_ptr),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(void,png_read_reinit,(png_structrp png_ptr,
png_infop info_ptr),PNG_EMPTY);
#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
PNG_INTERNAL_FUNCTION(void,png_progressive_read_reset,(png_structp png_ptr),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(void,png_progressive_read_reset,(png_structrp png_ptr),PNG_EMPTY);
#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
#endif /* PNG_READ_APNG_SUPPORTED */
#ifdef PNG_WRITE_APNG_SUPPORTED
PNG_INTERNAL_FUNCTION(void,png_write_acTL,(png_structp png_ptr,
PNG_INTERNAL_FUNCTION(void,png_write_acTL,(png_structrp png_ptr,
png_uint_32 num_frames, png_uint_32 num_plays),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(void,png_write_fcTL,(png_structp png_ptr,
PNG_INTERNAL_FUNCTION(void,png_write_fcTL,(png_structrp png_ptr,
png_uint_32 width, png_uint_32 height,
png_uint_32 x_offset, png_uint_32 y_offset,
png_uint_16 delay_num, png_uint_16 delay_den,
png_byte dispose_op, png_byte blend_op),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(void,png_write_fdAT,(png_structp png_ptr,
PNG_INTERNAL_FUNCTION(void,png_write_fdAT,(png_structrp png_ptr,
png_const_bytep data, png_size_t length),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(void,png_write_reset,(png_structp png_ptr),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(void,png_write_reinit,(png_structp png_ptr,
png_infop info_ptr, png_uint_32 width, png_uint_32 height),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(void,png_write_reset,(png_structrp png_ptr),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(void,png_write_reinit,(png_structrp png_ptr,
png_inforp info_ptr, png_uint_32 width, png_uint_32 height),PNG_EMPTY);
#endif /* PNG_WRITE_APNG_SUPPORTED */
#endif /* PNG_APNG_SUPPORTED */

8
extlib/libpng/pngrutil.c vendored
View File

@ -3000,7 +3000,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
#ifdef PNG_READ_APNG_SUPPORTED
// FIXME: Not static due to use in pngread.c, png_read_frame_head().
png_handle_result_code /* PRIVATE */
png_handle_acTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
png_handle_acTL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
{
png_byte data[8];
png_uint_32 num_frames;
@ -3048,7 +3048,7 @@ png_handle_acTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
}
png_handle_result_code /* PRIVATE */
png_handle_fcTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
png_handle_fcTL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
{
png_byte data[22];
png_uint_32 width;
@ -3142,7 +3142,7 @@ png_have_info(png_structp png_ptr, png_infop info_ptr)
}
png_handle_result_code /* PRIVATE */
png_handle_fdAT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
png_handle_fdAT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
{
png_ensure_sequence_number(png_ptr, length);
@ -3158,7 +3158,7 @@ png_handle_fdAT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
}
png_handle_result_code /* PRIVATE */
png_ensure_sequence_number(png_structp png_ptr, png_uint_32 length)
png_ensure_sequence_number(png_structrp png_ptr, png_uint_32 length)
{
png_byte data[4];
png_uint_32 sequence_number;

10
extlib/libpng/pngwutil.c vendored
View File

@ -1995,7 +1995,7 @@ png_write_tIME(png_structrp png_ptr, png_const_timep mod_time)
#ifdef PNG_WRITE_APNG_SUPPORTED
void /* PRIVATE */
png_write_acTL(png_structp png_ptr,
png_write_acTL(png_structrp png_ptr,
png_uint_32 num_frames, png_uint_32 num_plays)
{
png_byte buf[8];
@ -2014,7 +2014,7 @@ png_write_acTL(png_structp png_ptr,
}
void /* PRIVATE */
png_write_fcTL(png_structp png_ptr, png_uint_32 width, png_uint_32 height,
png_write_fcTL(png_structrp png_ptr, png_uint_32 width, png_uint_32 height,
png_uint_32 x_offset, png_uint_32 y_offset,
png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
png_byte blend_op)
@ -2051,7 +2051,7 @@ png_write_fcTL(png_structp png_ptr, png_uint_32 width, png_uint_32 height,
}
void /* PRIVATE */
png_write_fdAT(png_structp png_ptr,
png_write_fdAT(png_structrp png_ptr,
png_const_bytep data, png_size_t length)
{
png_byte buf[4];
@ -2925,7 +2925,7 @@ png_write_filtered_row(png_structrp png_ptr, png_bytep filtered_row,
#ifdef PNG_WRITE_APNG_SUPPORTED
void /* PRIVATE */
png_write_reset(png_structp png_ptr)
png_write_reset(png_structrp png_ptr)
{
png_ptr->row_number = 0;
png_ptr->pass = 0;
@ -2933,7 +2933,7 @@ png_write_reset(png_structp png_ptr)
}
void /* PRIVATE */
png_write_reinit(png_structp png_ptr, png_infop info_ptr,
png_write_reinit(png_structrp png_ptr, png_inforp info_ptr,
png_uint_32 width, png_uint_32 height)
{
if (png_ptr->num_frames_written == 0 &&