Imported from libpng-1.2.2beta6.tar

This commit is contained in:
Glenn Randers-Pehrson
2002-03-31 07:33:55 -06:00
parent 73d57cb97b
commit 25228abdc1
58 changed files with 126 additions and 107 deletions

15
png.c
View File

@@ -1,7 +1,7 @@
/* png.c - location for general purpose libpng functions
*
* libpng version 1.2.2beta5 - March 26, 2002
* libpng version 1.2.2beta6 - March 31, 2002
* Copyright (c) 1998-2002 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.)
@@ -13,14 +13,14 @@
#include "png.h"
/* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_2_2beta5 Your_png_h_is_not_version_1_2_2beta5;
typedef version_1_2_2beta6 Your_png_h_is_not_version_1_2_2beta6;
/* Version information for C files. This had better match the version
* string defined in png.h. */
#ifdef PNG_USE_GLOBAL_ARRAYS
/* png_libpng_ver was changed to a function in version 1.0.5c */
const char png_libpng_ver[18] = "1.2.2beta5";
const char png_libpng_ver[18] = "1.2.2beta6";
/* png_sig was changed to a function in version 1.0.5c */
/* Place to hold the signature string for a PNG file. */
@@ -148,6 +148,9 @@ png_zalloc(voidpf png_ptr, uInt items, uInt size)
p->flags=save_flags;
#ifndef PNG_NO_ZALLOC_ZERO
if (ptr == NULL)
return ((voidpf)ptr);
if (num_bytes > (png_uint_32)0x8000L)
{
png_memset(ptr, 0, (png_size_t)0x8000L);
@@ -660,7 +663,7 @@ png_charp PNGAPI
png_get_copyright(png_structp png_ptr)
{
if (png_ptr != NULL || png_ptr == NULL) /* silence compiler warning */
return ((png_charp) "\n libpng version 1.2.2beta5 - March 26, 2002\n\
return ((png_charp) "\n libpng version 1.2.2beta6 - March 31, 2002\n\
Copyright (c) 1998-2002 Glenn Randers-Pehrson\n\
Copyright (c) 1996-1997 Andreas Dilger\n\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");
@@ -678,8 +681,8 @@ png_get_libpng_ver(png_structp png_ptr)
{
/* Version of *.c files used when building libpng */
if(png_ptr != NULL) /* silence compiler warning about unused png_ptr */
return((png_charp) "1.2.2beta5");
return((png_charp) "1.2.2beta5");
return((png_charp) "1.2.2beta6");
return((png_charp) "1.2.2beta6");
}
png_charp PNGAPI