From d08f1469cb887a0598086e203f9a5b9f6db803e6 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 8 Feb 2010 06:18:54 -0600 Subject: [PATCH] [previous] Removed PNGAPI declaration of png_calloc() and png_write_sig() in 1ibpng-1.2.X, introduced by mistake in libpng-1.2.41. --- ANNOUNCE | 2 ++ CHANGES | 2 ++ pngmem.c | 2 +- pngwutil.c | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 612d1b5d..5ed50bcd 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -62,6 +62,8 @@ version 1.2.43beta04 [February 7, 2010] version 1.2.43beta05 [February 7, 2010] Reverted recent changes to png_push_save-buffer(). + Removed PNGAPI declaration of png_calloc() and png_write_sig() in + 1ibpng-1.2.X, introduced by mistake in libpng-1.2.41. version 1.0.53rc01 and 1.2.43rc01 [February 8, 2010] No changes. diff --git a/CHANGES b/CHANGES index 65483406..5ac90382 100644 --- a/CHANGES +++ b/CHANGES @@ -2664,6 +2664,8 @@ version 1.2.43beta04 [February 7, 2010] version 1.2.43beta05 [February 7, 2010] Reverted recent changes to png_push_save-buffer(). + Removed PNGAPI declaration of png_calloc() and png_write_sig() in + 1ibpng-1.2.X, introduced by mistake in libpng-1.2.41. version 1.0.53rc01 and 1.2.43rc01 [February 8, 2010] No changes. diff --git a/pngmem.c b/pngmem.c index ed279d75..0a1a8db0 100644 --- a/pngmem.c +++ b/pngmem.c @@ -115,7 +115,7 @@ png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn, * result, we would be truncating potentially larger memory requests * (which should cause a fatal error) and introducing major problems. */ -png_voidp PNGAPI +png_voidp /* PRIVATE */ png_calloc(png_structp png_ptr, png_uint_32 size) { png_voidp ret; diff --git a/pngwutil.c b/pngwutil.c index ac8a8131..72a57add 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -59,7 +59,7 @@ png_save_uint_16(png_bytep buf, unsigned int i) * we should call png_set_sig_bytes() to tell libpng how many of the * bytes have already been written. */ -void PNGAPI +void /* PRIVATE */ png_write_sig(png_structp png_ptr) { png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};