mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[devel] Eliminated PNG_NO_CALLOC and PNG_CALLOC_SUPPORTED

Browse Source 
and always use png_calloc().  The macros were only there for testing,
since libpng-1.4.0beta48 and no problems have been reported.
This commit is contained in:
Glenn Randers-Pehrson
2009-09-01 10:48:04 -05:00
parent b380515c84
commit 5618e46179
9 changed files with 17 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
png.h
View File

@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.4.0beta79 - August 31, 2009
* libpng version 1.4.0beta79 - September 1, 2009
* Copyright (c) 1998-2009 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.4.0beta79 - August 31, 2009: Glenn
* libpng versions 0.97, January 1998, through 1.4.0beta79 - September 1, 2009: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -161,7 +161,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.2.6, August 15, 2004, through 1.4.0beta79, August 31, 2009, are
* libpng versions 1.2.6, August 15, 2004, through 1.4.0beta79, September 1, 2009, are
* Copyright (c) 2004, 2006-2007 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:
@@ -337,7 +337,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.4.0beta79"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.4.0beta79 - August 31, 2009\n"
" libpng version 1.4.0beta79 - September 1, 2009\n"
#define PNG_LIBPNG_VER_SONUM 14
#define PNG_LIBPNG_VER_DLLNUM 14
@@ -1899,10 +1899,8 @@ extern PNG_EXPORT(void,png_progressive_combine_row) PNGARG((png_structp png_ptr,
extern PNG_EXPORT(png_voidp,png_malloc) PNGARG((png_structp png_ptr,
png_alloc_size_t size));
/* Added at libpng version 1.4.0 */
#ifdef PNG_CALLOC_SUPPORTED
extern PNG_EXPORT(png_voidp,png_calloc) PNGARG((png_structp png_ptr,
png_alloc_size_t size));
#endif
/* Added at libpng version 1.2.4 */
extern PNG_EXPORT(png_voidp,png_malloc_warn) PNGARG((png_structp png_ptr,