From ae3a70351cbb582e5eed95f72e5f9aedc03ebbf5 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 21 Nov 2009 07:21:06 -0600 Subject: [PATCH] [devel] Removed png_longjmp_ptr from scripts/*.def and libpng.3 It is a pointer, not an exported function. --- ANNOUNCE | 3 ++- CHANGES | 3 ++- libpng.3 | 4 ---- scripts/png32ce.def | 3 +-- scripts/pngos2.def | 1 - scripts/pngwin.def | 1 - 6 files changed, 5 insertions(+), 10 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 4f818401f..102aa950f 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -698,13 +698,14 @@ version 1.4.0beta103 [November 21, 2009] Restored the PNG_WRITE_FLUSH_AFTER_IEND guard around the call to png_flush() after png_write_IEND(). See 1.4.0beta32, 1.4.0beta50 changes above and 1.2.30, 1.2.30rc01 and rc03 in 1.2.41 CHANGES. Someone needs this - feature but I don't remember who. + feature. Make the 'png_jmpbuf' macro expand to a call that records the correct longjmp function as well as returning a pointer to the setjmp jmp_buf buffer, and marked direct access to jmpbuf 'deprecated'. (John Bowler) version 1.4.0beta104 [November 21, 2009] + Removed png_longjmp_ptr from scripts/*.def and libpng.3 Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 165382f9a..7a5d4d557 100644 --- a/CHANGES +++ b/CHANGES @@ -2385,13 +2385,14 @@ version 1.4.0beta103 [November 21, 2009] Restored the PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED guard around the call to png_flush() after png_write_IEND(). See 1.4.0beta32, 1.4.0beta50 changes above and 1.2.30, 1.2.30rc01 and rc03 in 1.2.41 CHANGES. Someone - needs this feature but I don't remember who. + needs this feature. Make the 'png_jmpbuf' macro expand to a call that records the correct longjmp function as well as returning a pointer to the setjmp jmp_buf buffer, and marked direct access to jmpbuf 'deprecated'. (John Bowler) version 1.4.0beta104 [November 21, 2009] + Removed png_longjmp_ptr from scripts/*.def and libpng.3 Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/libpng.3 b/libpng.3 index d275d7dfa..187596392 100644 --- a/libpng.3 +++ b/libpng.3 @@ -334,10 +334,6 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta104 \fI\fB -\fBvoid png_longjmp_ptr \fP\fI(jmp_buf\fP\fB, \fIint\fP\fB);\fP - -\fI\fB - \fBpng_voidp png_malloc (png_structp \fP\fIpng_ptr\fP\fB, png_alloc_size_t \fIsize\fP\fB);\fP \fI\fB diff --git a/scripts/png32ce.def b/scripts/png32ce.def index 9d97f6964..dd08d4914 100644 --- a/scripts/png32ce.def +++ b/scripts/png32ce.def @@ -254,5 +254,4 @@ EXPORTS png_set_chunk_cache_max @216 png_check_cHRM_fixed @217 png_calloc @218 - png_longjmp_ptr @219 - png_set_longjmp_fn @220 + png_set_longjmp_fn @219 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 293f20184..ce511b2af 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -214,7 +214,6 @@ EXPORTS png_set_chunk_cache_max png_check_cHRM_fixed png_calloc - png_longjmp_ptr png_set_longjmp_fn ; These are not present when libpng is compiled with PNG_NO_GLOBAL_ARRAYS diff --git a/scripts/pngwin.def b/scripts/pngwin.def index 6313e6562..5d12cb249 100644 --- a/scripts/pngwin.def +++ b/scripts/pngwin.def @@ -209,5 +209,4 @@ EXPORTS png_set_chunk_cache_max png_check_cHRM_fixed png_calloc - png_longjmp_ptr png_set_longjmp_fn