diff --git a/ANNOUNCE b/ANNOUNCE index 9819dc542..1d328d140 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -62,6 +62,9 @@ Version 1.7.0alpha01 [December 15, 2012] Rebuilt Makefile.in, configure, etc., with autoconf-2.69 and automake-1.12.5. Version 1.7.0alpha02 [December 15, 2012] + Removed functions that were deprecated in libpng-1.6.0: + png_reset_zstream(), png_info_init_3(), and png_data_freer() and its + associated flags. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 26f7a0456..66ee09efc 100644 --- a/CHANGES +++ b/CHANGES @@ -4347,6 +4347,9 @@ Version 1.7.0alpha01 [December 15, 2012] Rebuilt Makefile.in, configure, etc., with autoconf-2.69 and automake-1.12.5. Version 1.7.0alpha02 [December 15, 2012] + Removed functions that were deprecated in libpng-1.6.0: + png_reset_zstream(), png_info_init_3(), and png_data_freer() and its + associated flags. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/libpng-manual.txt b/libpng-manual.txt index 9ea2b0e90..a42aaea8d 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -3083,8 +3083,8 @@ tEXt chunk use RFC 1123 format dates (e.g. "22 May 1997 18:07:10 GMT"), although this isn't a requirement. Unlike the tIME chunk, the "Creation Time" tEXt chunk is not expected to be automatically changed by the software. To facilitate the use of RFC 1123 dates, a function -png_convert_to_rfc1123_buffer(buffer, png_timep) is provided to convert -from PNG time to an RFC 1123 format string. The caller must provide +png_convert_to_rfc1123_buffer(png_ptr, buffer, png_timep) is provided to +convert from PNG time to an RFC 1123 format string. The caller must provide a writeable buffer of at least 29 bytes. Writing unknown chunks @@ -4933,7 +4933,7 @@ The following API are now DEPRECATED: png_malloc_default() png_free_default() -The following has been removed: +The following have been removed: png_get_io_chunk_name(), which has been replaced with png_get_io_chunk_type(). The new function returns a 32-bit integer instead of diff --git a/libpng.3 b/libpng.3 index 809ad1faf..0feb229a1 100644 --- a/libpng.3 +++ b/libpng.3 @@ -44,7 +44,7 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0alpha02 \fI\fB -\fBpng_charp png_convert_to_rfc1123 (png_structp \fP\fIpng_ptr\fP\fB, png_timep \fIptime\fP\fB);\fP +\fBpng_charp png_convert_to_rfc1123_buffer (png_structp \fP\fIpng_ptr\fP\fB, char \fP\fIout[29]\fP\fB, png_timep \fIptime\fP\fB);\fP \fI\fB @@ -68,10 +68,6 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0alpha02 \fI\fB -\fBvoid png_data_freer (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fP\fIfreer\fP\fB, png_uint_32 \fImask)\fP\fB);\fP - -\fI\fB - \fBvoid png_destroy_info_struct (png_structp \fP\fIpng_ptr\fP\fB, png_infopp \fIinfo_ptr_ptr\fP\fB);\fP \fI\fB @@ -456,10 +452,6 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0alpha02 \fI\fB -\fBvoid png_info_init_3 (png_infopp \fP\fIinfo_ptr\fP\fB, png_size_t \fIpng_info_struct_size\fP\fB);\fP - -\fI\fB - \fBvoid png_init_io (png_structp \fP\fIpng_ptr\fP\fB, FILE \fI*fp\fP\fB);\fP \fI\fB @@ -528,10 +520,6 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0alpha02 \fI\fB -\fBint png_reset_zstream (png_structp \fIpng_ptr\fP\fB);\fP - -\fI\fB - \fBvoid png_save_int_32 (png_bytep \fP\fIbuf\fP\fB, png_int_32 \fIi\fP\fB);\fP \fI\fB @@ -4080,8 +4068,8 @@ tEXt chunk use RFC 1123 format dates (e.g. "22 May 1997 18:07:10 GMT"), although this isn't a requirement. Unlike the tIME chunk, the "Creation Time" tEXt chunk is not expected to be automatically changed by the software. To facilitate the use of RFC 1123 dates, a function -png_convert_to_rfc1123_buffer(buffer, png_timep) is provided to convert -from PNG time to an RFC 1123 format string. The caller must provide +png_convert_to_rfc1123_buffer(png_ptr, buffer, png_timep) is provided to +convert from PNG time to an RFC 1123 format string. The caller must provide a writeable buffer of at least 29 bytes. .SS Writing unknown chunks @@ -5931,7 +5919,7 @@ The following API are now DEPRECATED: png_malloc_default() png_free_default() -The following has been removed: +The following have been removed: png_get_io_chunk_name(), which has been replaced with png_get_io_chunk_type(). The new function returns a 32-bit integer instead of diff --git a/png.c b/png.c index a75936a15..ef2ad418c 100644 --- a/png.c +++ b/png.c @@ -430,26 +430,6 @@ png_info_init_3,(png_infopp ptr_ptr, png_size_t png_info_struct_size), memset(info_ptr, 0, (sizeof *info_ptr)); } -/* The following API is not called internally */ -void PNGAPI -png_data_freer(png_const_structrp png_ptr, png_inforp info_ptr, - int freer, png_uint_32 mask) -{ - png_debug(1, "in png_data_freer"); - - if (png_ptr == NULL || info_ptr == NULL) - return; - - if (freer == PNG_DESTROY_WILL_FREE_DATA) - info_ptr->free_me |= mask; - - else if (freer == PNG_USER_WILL_FREE_DATA) - info_ptr->free_me &= ~mask; - - else - png_error(png_ptr, "Unknown freer parameter in png_data_freer"); -} - void PNGAPI png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask, int num) @@ -860,19 +840,6 @@ png_chunk_unknown_handling(png_const_structrp png_ptr, png_uint_32 chunk_name) #endif /* READ_UNKNOWN_CHUNKS */ #endif /* SET_UNKNOWN_CHUNKS */ -#ifdef PNG_READ_SUPPORTED -/* This function, added to libpng-1.0.6g, is untested. */ -int PNGAPI -png_reset_zstream(png_structrp png_ptr) -{ - if (png_ptr == NULL) - return Z_STREAM_ERROR; - - /* WARNING: this resets the window bits to the maximum! */ - return (inflateReset(&png_ptr->zstream)); -} -#endif /* PNG_READ_SUPPORTED */ - /* This function was added to libpng-1.0.7 */ png_uint_32 PNGAPI png_access_version_number(void) @@ -881,8 +848,6 @@ png_access_version_number(void) return((png_uint_32)PNG_LIBPNG_VER); } - - #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) /* Ensure that png_ptr->zstream.msg holds some appropriate error message string. * If it doesn't 'ret' is used to set it to something appropriate, even in cases