From 590fb8c481e5a36b7a0826b157cbe8415d1b33a9 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 10 Jun 2011 20:25:49 -0500 Subject: [PATCH] [devel] Removed #ifdef in png.c that caused sCAL handler to leak memory. --- png.c | 6 ++---- png.h | 12 ++++++------ pngconf.h | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/png.c b/png.c index ef6e59bb6..d5c696292 100644 --- a/png.c +++ b/png.c @@ -346,12 +346,10 @@ png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 mask, /* Free any sCAL entry */ if ((mask & PNG_FREE_SCAL) & info_ptr->free_me) { -#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED) png_free(png_ptr, info_ptr->scal_s_width); png_free(png_ptr, info_ptr->scal_s_height); info_ptr->scal_s_width = NULL; info_ptr->scal_s_height = NULL; -#endif info_ptr->valid &= ~PNG_INFO_sCAL; } #endif @@ -619,13 +617,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.3rc03 - June 8, 2011" PNG_STRING_NEWLINE \ + "libpng version 1.5.3rc03 - June 11, 2011" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2011 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE; # else - return "libpng version 1.5.3rc03 - June 8, 2011\ + return "libpng version 1.5.3rc03 - June 11, 2011\ Copyright (c) 1998-2011 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; diff --git a/png.h b/png.h index 3c6d34cad..1c126f38c 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.3rc03 - June 8, 2011 + * libpng version 1.5.3rc03 - June 11, 2011 * Copyright (c) 1998-2011 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.5.3rc03 - June 8, 2011: Glenn + * libpng versions 0.97, January 1998, through 1.5.3rc03 - June 11, 2011: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -151,7 +151,7 @@ * 1.5.2rc01-03 15 10502 15.so.15.2[.0] * 1.5.2 15 10502 15.so.15.2[.0] * 1.5.3beta01-10 15 10503 15.so.15.3[.0] - * 1.5.3rc01 15 10503 15.so.15.3[.0] + * 1.5.3rc01-03 15 10503 15.so.15.3[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -183,7 +183,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.3rc03, June 8, 2011, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.3rc03, June 11, 2011, are * Copyright (c) 2004, 2006-2011 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: @@ -295,7 +295,7 @@ * Y2K compliance in libpng: * ========================= * - * June 8, 2011 + * June 11, 2011 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -358,7 +358,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.5.3rc03" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.3rc03 - June 8, 2011\n" + " libpng version 1.5.3rc03 - June 11, 2011\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 diff --git a/pngconf.h b/pngconf.h index 261fd50de..39c29f8e9 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.3rc03 - June 8, 2011 + * libpng version 1.5.3rc03 - June 11, 2011 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) -- GitLab