From 30662f5e9223acbd096d394b07ed74c5eb023f37 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 5 Jun 2013 23:25:14 -0500 Subject: [PATCH] [libpng17] Enclose the prototypes for the simplified write API in --- ANNOUNCE | 5 +++-- CHANGES | 3 ++- png.h | 12 +++++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 01eacf4bf..f4015ea76 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta14 - June 5, 2013 +Libpng 1.7.0beta14 - June 6, 2013 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -304,10 +304,11 @@ Version 1.7.0beta13 [May 12, 2013] Added information in the documentation about problems with and fixes for the bad CRC and bad iTXt chunk situations. -Version 1.7.0beta14 [June 5, 2013] +Version 1.7.0beta14 [June 6, 2013] Removed a redundant test in png_set_IHDR(). Added set(CMAKE_CONFIGURATION_TYPES ...) to CMakeLists.txt (Andrew Hundt) Deleted set(CMAKE_BUILD_TYPE) block from CMakeLists.txt + Enclose the prototypes for the simplified write API in #ifdef STDIO/#endif Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index a330706e5..9958a0bba 100644 --- a/CHANGES +++ b/CHANGES @@ -4592,10 +4592,11 @@ Version 1.7.0beta13 [May 12, 2013] Added information in the documentation about problems with and fixes for the bad CRC and bad iTXt chunk situations. -Version 1.7.0beta14 [June 5, 2013] +Version 1.7.0beta14 [June 6, 2013] Removed a redundant test in png_set_IHDR(). Added set(CMAKE_CONFIGURATION_TYPES ...) to CMakeLists.txt (Andrew Hundt) Deleted set(CMAKE_BUILD_TYPE) block from CMakeLists.txt + Enclose the prototypes for the simplified write API in #ifdef STDIO/#endif Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/png.h b/png.h index 1f89e97b1..0df8bb239 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta14 - May 13, 2013 + * libpng version 1.7.0beta14 - June 6, 2013 * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -11,7 +11,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.7.0beta14 - May 13, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.7.0beta14 - June 6, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -200,7 +200,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta14, May 13, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta14, June 6, 2013, are * Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -312,7 +312,7 @@ * Y2K compliance in libpng: * ========================= * - * May 13, 2013 + * June 6, 2013 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -380,7 +380,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.7.0beta14" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0beta14 - May 13, 2013\n" + " libpng version 1.7.0beta14 - June 6, 2013\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 @@ -3341,6 +3341,7 @@ PNG_EXPORT(238, void, png_image_free, (png_imagep image)); #endif /* PNG_SIMPLIFIED_READ_SUPPORTED */ #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED +#ifdef PNG_STDIO_SUPPORTED /* WRITE APIS * ---------- * For write you must initialize a png_image structure to describe the image to @@ -3383,6 +3384,7 @@ PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file, * * Note that the write API does not support interlacing or sub-8-bit pixels. */ +#endif /* PNG_STDIO_SUPPORTED */ #endif /* PNG_SIMPLIFIED_WRITE_SUPPORTED */ /******************************************************************************* * END OF SIMPLIFIED API