From 81fdf8aca116248c7848958d9d4226fa03ea7d51 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 7 Apr 2000 10:34:56 -0500 Subject: [PATCH] Imported from libpng-1.0.6d.tar --- ANNOUNCE | 4 ++-- CHANGES | 2 +- INSTALL | 12 ++++++------ KNOWNBUG | 14 +++++++------- LICENSE | 4 ++-- README | 10 +++++----- Y2KINFO | 4 ++-- configure | 2 +- libpng.3 | 35 ++++++++++++++++++----------------- libpng.txt | 6 +++--- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 22 +++++++++++----------- png.h | 33 ++++++++++++++++----------------- pngasmrd.h | 2 +- pngconf.h | 2 +- pngerror.c | 2 +- pnggccrd.c | 2 +- pngget.c | 2 +- pngmem.c | 2 +- pngpread.c | 2 +- pngread.c | 6 +++--- pngrio.c | 2 +- pngrtran.c | 2 +- pngrutil.c | 2 +- pngset.c | 2 +- pngtest.c | 4 ++-- pngtrans.c | 2 +- pngvcrd.c | 2 +- pngwio.c | 2 +- pngwrite.c | 2 +- pngwtran.c | 2 +- pngwutil.c | 2 +- scripts/makefile.beos | 2 +- scripts/makefile.dec | 2 +- scripts/makefile.gcmmx | 2 +- scripts/makefile.linux | 2 +- scripts/makefile.sco | 2 +- scripts/makefile.sggcc | 4 ++-- scripts/makefile.solaris | 2 +- scripts/pngdef.pas | 2 +- 41 files changed, 108 insertions(+), 108 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 7582ece5..250ceb4c 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,12 +1,12 @@ -Libpng 1.0.6a - April 2, 2000 +Libpng 1.0.6d - April 7, 2000 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. Changes since the last public release (1.0.6): -version 1.0.6a [April 2, 2000] +version 1.0.6d [April 7, 2000] Changed sprintf() to strcpy() in png_write_sCAL_s() to work without STDIO Added data_length parameter to png_decompress_chunk() function Revised documentation to remove reference to abandoned png_free_chnk functions diff --git a/CHANGES b/CHANGES index a2f106cf..f7e8b8f1 100644 --- a/CHANGES +++ b/CHANGES @@ -660,7 +660,7 @@ version 1.0.5v [March 11, 2000] version 1.0.6 [March 20, 2000] Minor revisions of makefile.bor, libpng.txt, and gregbook/rpng2-win.c Added makefile.sggcc (SGI IRIX with gcc) -version 1.0.6a [April 2, 2000] +version 1.0.6d [April 7, 2000] Changed sprintf() to strcpy() in png_write_sCAL_s() to work without STDIO Added data_length parameter to png_decompress_chunk() function Revised documentation to remove reference to abandoned png_free_chnk functions diff --git a/INSTALL b/INSTALL index 0a512b43..7527b40f 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.0.6a - April 2, 2000 +Installing libpng version 1.0.6d - April 7, 2000 Before installing libpng, you must first install zlib. zlib can usually be found wherever you got libpng. zlib can be @@ -10,7 +10,7 @@ zlib.h and zconf.h include files that correspond to the version of zlib that's installed. You can rename the directories that you downloaded (they -might be called "libpng-1.0.6a" or "lpng106" and "zlib-1.1.3" +might be called "libpng-1.0.6d" or "lpng106" and "zlib-1.1.3" or "zlib113") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -47,8 +47,8 @@ The files that are presently available in the scripts directory include makefile.std => Generic UNIX makefile (cc, creates static libpng.a) - makefile.linux => Linux/ELF makefile (gcc, creates libpng.so.2.1.0.6a) - makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng.so.2.1.0.6a, + makefile.linux => Linux/ELF makefile (gcc, creates libpng.so.2.1.0.6d) + makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng.so.2.1.0.6d, uses assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -59,9 +59,9 @@ include makefile.ibmc => IBM C/C++ version 3.x for Win32 and OS/2 (static) libpng.icc => Project file for IBM VisualAge/C++ version 4.0 or later makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) - makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.0.6a) + makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.0.6d) makefile.sunos => Sun makefile - makefile.solaris => Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.6a) + makefile.solaris => Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.6d) makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.mips => MIPS makefile makefile.acorn => Acorn makefile diff --git a/KNOWNBUG b/KNOWNBUG index 921d9aa1..64e2cfe1 100644 --- a/KNOWNBUG +++ b/KNOWNBUG @@ -7,7 +7,7 @@ Known bugs and suggested enhancements in libpng-1.0.6 the info_ptr->text and its members might free the same memory that is also free'ed by libpng during the png_destroy_struct process. - Fixed in libpng-1.0.6-patch-c and libpng-1.0.6a. The PNG_FREE_TEXT flag + Fixed in libpng-1.0.6-patch-03 and libpng-1.0.6d. The PNG_FREE_TEXT flag bit in info_ptr->free_me is now checked to make sure libpng is responsible for freeing the memory. @@ -16,21 +16,21 @@ Known bugs and suggested enhancements in libpng-1.0.6 The non-ISO-C "strdup()" function is used in png.c STATUS: The function has been simplified and no longer uses strdup() - in libpng-1.0.6-patch-c and libpng-1.0.6a. + in libpng-1.0.6-patch-03 and libpng-1.0.6d. 3. March 24, 2000 -- BUG The png_set_rgb_to_gray_fixed() function is setting incorrect weighting factors. - STATUS: Fixed in libpng-1.0.6-patch-b and libpng-1.0.6a. + STATUS: Fixed in libpng-1.0.6-patch-02 and libpng-1.0.6d. 4. March 22, 2000 -- BUG There are some printf() and fprintf() statements active in pngwutil.c when PNG_NO_STDIO and PNG_sCAL_SUPPORTED are both defined. - STATUS: Fixed in libpng-1.0.6-patch-a and libpng-1.0.6a. The strcpy() + STATUS: Fixed in libpng-1.0.6-patch-01 and libpng-1.0.6d. The strcpy() function is used instead. 5. March 22, 2000 -- BUG @@ -38,8 +38,8 @@ Known bugs and suggested enhancements in libpng-1.0.6 The length of the iCCP chunk data is calculated incorrectly; because it can contain zeroes, strlen() doesn't work. - STATUS: Fixed in libpng-1.0.6-patch-a by adding a data_length parameter - to the png_decompress_chunk() function. + STATUS: Fixed in libpng-1.0.6-patch-01 and libpng-1.0.6d by adding a + data_length parameter to the png_decompress_chunk() function. 6. March 15, 1998 -- OPTIMIZATION -- Kevin Bracey @@ -73,7 +73,7 @@ Known bugs and suggested enhancements in libpng-1.0.6 It should be possible to use libpng without floating-point aritmetic. STATUS: Under investigation, implementation postponed until after - libpng-1.0.5. The application interface will change because replacements + libpng-1.0.6. The application interface will change because replacements for the png_set_gAMA(), png_set_cHRM(), and corresponding png_get_() functions will be needed. diff --git a/LICENSE b/LICENSE index f74c2067..62edb6c1 100644 --- a/LICENSE +++ b/LICENSE @@ -5,7 +5,7 @@ Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. Copyright (c) 1996, 1997 Andreas Dilger (libpng versions 0.90, December 1996, through 0.96, May 1997) Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson -(libpng versions 0.97, January 1998, through 1.0.6a, April 2, 2000) +(libpng versions 0.97, January 1998, through 1.0.6d, April 7, 2000) For the purposes of this copyright and license, "Contributing Authors" is defined as the following set of individuals: @@ -68,4 +68,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson randeg@alum.rpi.edu -April 2, 2000 +April 7, 2000 diff --git a/README b/README index 1dac4f21..ae314d4c 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng 1.0.6a - April 2, 2000 (shared library 2.1) +README for libpng 1.0.6d - April 7, 2000 (shared library 2.1) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -172,9 +172,9 @@ Files in this distribution: descrip.mms => VMS makefile for MMS or MMK makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.linux => Linux/ELF makefile - (gcc, creates libpng.so.2.1.0.6a) + (gcc, creates libpng.so.2.1.0.6d) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng.so.2.1.0.6a, uses assembler code + libpng.so.2.1.0.6d, uses assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -185,10 +185,10 @@ Files in this distribution: makefile.ibmc => IBM C/C++ version 3.x for Win32 and OS/2 (static) libpng.icc => Project file, IBM VisualAge/C++ 4.0 or later makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) - makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.0.6a) + makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.0.6d) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng.so.2.1.0.6a) + (gcc, creates libpng.so.2.1.0.6d) makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.mips => MIPS makefile makefile.acorn => Acorn makefile diff --git a/Y2KINFO b/Y2KINFO index 1a468e9d..0eb30788 100644 --- a/Y2KINFO +++ b/Y2KINFO @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - April 2, 2000 + April 7, 2000 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and - upward through 1.0.6a are Y2K compliant. It is my belief that earlier + upward through 1.0.6d are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer diff --git a/configure b/configure index 61da8bee..ac7714e8 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ echo " - There is no \"configure\" script for Libpng-1.0.6a. Instead, please + There is no \"configure\" script for Libpng-1.0.6d. Instead, please copy the appropriate makefile for your system from the \"scripts\" directory. Read the INSTALL file for more details. " diff --git a/libpng.3 b/libpng.3 index fd8ae513..ea8a91b7 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "April 2, 2000" +.TH LIBPNG 3 "April 7, 2000" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.6a +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.6d .SH SYNOPSIS \fI\fB @@ -713,7 +713,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.0.6a - April 2, 2000 + libpng version 1.0.6d - April 7, 2000 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson @@ -3108,13 +3108,13 @@ the old method. .SH VII. Y2K Compliance in libpng -April 2, 2000 +April 7, 2000 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.0.6a are Y2K compliant. It is my belief that earlier +upward through 1.0.6d are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that @@ -3193,20 +3193,21 @@ the first widely used release: 1.0.3a-d 1.0.3a-d 10004 2.1.0.3a-d 1.0.4 1.0.4 10004 2.1.0.4 1.0.4a-f 1.0.4a-f 10005 2.1.0.4a-f - 1.0.5 1.0.5 10005 2.1.0.5 + 1.0.5 (+ 2 patches) 1.0.5 10005 2.1.0.5 1.0.5a-d 1.0.5a-d 10006 2.1.0.5a-d 1.0.5e-r 1.0.5e-r 10100 2.1.0.5e-r (not compatible) 1.0.5s-v 1.0.5s-v 10006 2.1.0.5s-v (compatible) - 1.0.6 1.0.6 10006 2.1.0.6 - 1.0.6a 1.0.6a 10007 2.1.0.6a - 1.3.0 1.3.0 10300 3.1.3.0 + 1.0.6 (+ 3 patches) 1.0.6 10006 2.1.0.6 + 1.0.6d 1.0.6d 10007 2.1.0.6d + 1.0.7 1.0.7 10007 2.1.0.7 (still compatible) -Henceforth the source version will match the shared-library -minor and patch numbers; the shared-library major version number will be -used for changes in backward compatibility, as it is intended. -The PNG_PNGLIB_VER macro, which is not used within libpng but -is available for applications, is an unsigned integer of the form -xyyzz corresponding to the source version x.y.z (leading zeros in y and z). + Henceforth the source version will match the shared-library minor + and patch numbers; the shared-library major version number will be + used for changes in backward compatibility, as it is intended. The + PNG_PNGLIB_VER macro, which is not used within libpng but is available + for applications, is an unsigned integer of the form xyyzz corresponding + to the source version x.y.z (leading zeros in y and z). Beta versions + are given the previous public release number plus a letter or two. .SH "SEE ALSO" libpngpf(3), png(5) @@ -3254,7 +3255,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.0.6a - April 2, 2000: +Libpng version 1.0.6d - April 7, 2000: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu). @@ -3269,7 +3270,7 @@ Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. Copyright (c) 1996, 1997 Andreas Dilger (libpng versions 0.89c, May 1996, through 0.96, May 1997) Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson -(libpng versions 0.97, January 1998, through 1.0.6a, April 2, 2000) +(libpng versions 0.97, January 1998, through 1.0.6d, April 7, 2000) For the purposes of this copyright and license, "Contributing Authors" is defined as the following set of individuals: diff --git a/libpng.txt b/libpng.txt index 178e5759..95949527 100644 --- a/libpng.txt +++ b/libpng.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.0.6a - April 2, 2000 + libpng version 1.0.6d - April 7, 2000 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson @@ -2395,13 +2395,13 @@ the old method. VII. Y2K Compliance in libpng -April 2, 2000 +April 7, 2000 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.0.6a are Y2K compliant. It is my belief that earlier +upward through 1.0.6d are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that diff --git a/libpngpf.3 b/libpngpf.3 index 2adc4e8c..f131cbe2 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 April 2, 2000 +.TH LIBPNGPF 3 April 7, 2000 .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.6a +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.6d (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.5 b/png.5 index 93b8723b..b2c0843a 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "April 2, 2000" +.TH PNG 5 "April 7, 2000" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 35bb9aef..c5f8537d 100644 --- a/png.c +++ b/png.c @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * libpng version 1.0.6a - April 2, 2000 + * libpng version 1.0.6d - April 7, 2000 * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson @@ -14,14 +14,14 @@ #include "png.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_0_6a Your_png_h_is_not_version_1_0_6a; +typedef version_1_0_6d Your_png_h_is_not_version_1_0_6d; /* 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 */ -char png_libpng_ver[12] = "1.0.6a"; +char png_libpng_ver[12] = "1.0.6d"; /* png_sig was changed to a function in version 1.0.5c */ /* Place to hold the signature string for a PNG file. */ @@ -269,7 +269,7 @@ png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 mask, int num #if defined(PNG_TEXT_SUPPORTED) /* free text item num or (if num == -1) all text items */ -if (mask & PNG_FREE_TEXT & info_ptr->free_me & PNG_FREE_TEXT) +if (mask & info_ptr->free_me & PNG_FREE_TEXT) { if (num != -1) { @@ -531,20 +531,20 @@ png_convert_to_rfc1123(png_structp png_ptr, png_timep ptime) } #endif /* PNG_TIME_RFC1123_SUPPORTED */ +#if 0 /* Signature string for a PNG file. */ png_bytep -png_sig_bytes(png_structp png_ptr) +png_sig_bytes(void) { - if (png_ptr != NULL || png_ptr == NULL) /* silence compiler warning */ - return ("\212\120\116\107\015\012\032\012"); - return (""); + return ((png_bytep)"\211\120\116\107\015\012\032\012"); } +#endif png_charp png_get_copyright(png_structp png_ptr) { if (png_ptr != NULL || png_ptr == NULL) /* silence compiler warning */ - return ("\n libpng version 1.0.6a - April 2, 2000\n\ + return ("\n libpng version 1.0.6d - April 7, 2000\n\ Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.\n\ Copyright (c) 1996, 1997 Andreas Dilger\n\ Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson\n"); @@ -562,8 +562,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("1.0.6a"); - return("1.0.6a"); + return("1.0.6d"); + return("1.0.6d"); } png_charp diff --git a/png.h b/png.h index ae3ac813..d34ef1fa 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.0.6a - April 2, 2000 + * libpng version 1.0.6d - April 7, 2000 * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson @@ -9,7 +9,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.0.6a - April 2, 2000: Glenn + * libpng versions 0.97, January 1998, through 1.0.6d - April 7, 2000: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -42,22 +42,21 @@ * 1.0.3a-d 1.0.3a-d 10004 2.1.0.3a-d * 1.0.4 1.0.4 10004 2.1.0.4 * 1.0.4a-f 1.0.4a-f 10005 2.1.0.4a-f - * 1.0.5 1.0.5 10005 2.1.0.5 + * 1.0.5 (+ 2 patches) 1.0.5 10005 2.1.0.5 * 1.0.5a-d 1.0.5a-d 10006 2.1.0.5a-d * 1.0.5e-r 1.0.5e-r 10100 2.1.0.5e-r (not compatible) * 1.0.5s-v 1.0.5s-v 10006 2.1.0.5s-v (compatible) - * 1.0.6 1.0.6 10006 2.1.0.6 - * 1.0.6a 1.0.6a 10007 2.1.0.6a - * 1.3.0 1.3.0 10300 3.1.3.0 + * 1.0.6 (+ 3 patches) 1.0.6 10006 2.1.0.6 + * 1.0.6d 1.0.6d 10007 2.1.0.6d + * 1.0.7 1.0.7 10007 2.1.0.7 (still compatible) * * Henceforth the source version will match the shared-library minor * and patch numbers; the shared-library major version number will be * used for changes in backward compatibility, as it is intended. The * PNG_PNGLIB_VER macro, which is not used within libpng but is available * for applications, is an unsigned integer of the form xyyzz corresponding - * to the source version x.y.z (leading zeros in y and z). Internal - * png-group beta versions (x.y.z[a-z]) will be given the next higher - * number. + * to the source version x.y.z (leading zeros in y and z). Beta versions + * are given the previous public release number plus a letter or two. * * See libpng.txt or libpng.3 for more information. The PNG specification * is available as RFC 2083 @@ -74,7 +73,7 @@ * Copyright (c) 1996, 1997 Andreas Dilger * (libpng versions 0.89c, June 1996, through 0.96, May 1997) * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson - * (libpng versions 0.97, January 1998, through 1.0.6a, April 2, 2000) + * (libpng versions 0.97, January 1998, through 1.0.6d, April 7, 2000) * * For the purposes of this copyright and license, "Contributing Authors" * is defined as the following set of individuals: @@ -149,13 +148,13 @@ * Y2K compliance in libpng: * ========================= * - * April 2, 2000 + * April 7, 2000 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.0.6a are Y2K compliant. It is my belief that earlier + * upward through 1.0.6d are Y2K compliant. It is my belief that earlier * versions were also Y2K compliant. * * Libpng only has three year fields. One is a 2-byte unsigned integer @@ -233,7 +232,7 @@ extern "C" { */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.0.6a" +#define PNG_LIBPNG_VER_STRING "1.0.6d" /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -1058,9 +1057,9 @@ struct png_struct_def }; /* This prevents a compiler error in png_get_copyright() in png.c if png.c -and png.h are both at * version 1.0.6a +and png.h are both at * version 1.0.6d */ -typedef png_structp version_1_0_6a; +typedef png_structp version_1_0_6d; typedef png_struct FAR * FAR * png_structpp; @@ -2025,7 +2024,7 @@ extern PNG_EXPORT(void, png_write_png) PNGARG((png_structp png_ptr, #define png_debug2(l, m, p1, p2) #endif -extern PNG_EXPORT(png_bytep,png_sig_bytes) PNGARG((png_structp png_ptr)); +extern PNG_EXPORT(png_bytep,png_sig_bytes) PNGARG((void)); extern PNG_EXPORT(png_charp,png_get_copyright) PNGARG((png_structp png_ptr)); extern PNG_EXPORT(png_charp,png_get_header_ver) PNGARG((png_structp png_ptr)); @@ -2033,7 +2032,7 @@ extern PNG_EXPORT(png_charp,png_get_header_version) PNGARG((png_structp png_ptr) extern PNG_EXPORT(png_charp,png_get_libpng_ver) PNGARG((png_structp png_ptr)); #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.0.6a - April 2, 2000 (header)\n" + " libpng version 1.0.6d - April 7, 2000 (header)\n" #ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED /* With these routines we avoid an integer divide, which will be slower on diff --git a/pngasmrd.h b/pngasmrd.h index 1edc763b..16565ffd 100644 --- a/pngasmrd.h +++ b/pngasmrd.h @@ -1,6 +1,6 @@ /* pngasmrd.h - assembler version of utilities to read a PNG file * - * libpng 1.0.6a - April 2, 2000 + * libpng 1.0.6d - April 7, 2000 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1999, 2000 Glenn Randers-Pehrson * diff --git a/pngconf.h b/pngconf.h index 0fc59523..a0b4354f 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng 1.0.6a - April 2, 2000 + * libpng 1.0.6d - April 7, 2000 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/pngerror.c b/pngerror.c index 845ddb39..053794ae 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.0.6a - April 2, 2000 + * libpng 1.0.6d - April 7, 2000 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/pnggccrd.c b/pnggccrd.c index f1608b75..2c60d7f6 100644 --- a/pnggccrd.c +++ b/pnggccrd.c @@ -6,7 +6,7 @@ * and http://www.intel.com/drg/pentiumII/appnotes/923/923.htm * for Intel's performance analysis of the MMX vs. non-MMX code. * - * libpng 1.0.6a - April 2, 2000 + * libpng 1.0.6d - April 7, 2000 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998, Intel Corporation * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson diff --git a/pngget.c b/pngget.c index 0f0dd77c..6e320fd7 100644 --- a/pngget.c +++ b/pngget.c @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * libpng 1.0.6a - April 2, 2000 + * libpng 1.0.6d - April 7, 2000 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/pngmem.c b/pngmem.c index a5960f91..f8a7e405 100644 --- a/pngmem.c +++ b/pngmem.c @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * libpng 1.0.6a - April 2, 2000 + * libpng 1.0.6d - April 7, 2000 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/pngpread.c b/pngpread.c index 75b1ca5f..abd39160 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.0.6a - April 2, 2000 + * libpng 1.0.6d - April 7, 2000 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/pngread.c b/pngread.c index 5915a67f..a24e7dac 100644 --- a/pngread.c +++ b/pngread.c @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * libpng 1.0.6a - April 2, 2000 + * libpng 1.0.6d - April 7, 2000 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger @@ -641,7 +641,7 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row) * not called png_set_interlace_handling(), the display_row buffer will * be ignored, so pass NULL to it. * - * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.6a. + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.6d. */ void @@ -690,7 +690,7 @@ png_read_rows(png_structp png_ptr, png_bytepp row, * only call this function once. If you desire to have an image for * each pass of a interlaced image, use png_read_rows() instead. * - * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.6a. + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.6d. */ void png_read_image(png_structp png_ptr, png_bytepp image) diff --git a/pngrio.c b/pngrio.c index a0afa59a..f95859ca 100644 --- a/pngrio.c +++ b/pngrio.c @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * libpng 1.0.6a - April 2, 2000 + * libpng 1.0.6d - April 7, 2000 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/pngrtran.c b/pngrtran.c index 02b1025c..f0c6d112 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * libpng 1.0.6a - April 2, 2000 + * libpng 1.0.6d - April 7, 2000 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/pngrutil.c b/pngrutil.c index 36d90ed4..3d637dc6 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.0.6a - April 2, 2000 + * libpng 1.0.6d - April 7, 2000 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/pngset.c b/pngset.c index fb88eb5e..b740afa7 100644 --- a/pngset.c +++ b/pngset.c @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * libpng 1.0.6a - April 2, 2000 + * libpng 1.0.6d - April 7, 2000 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/pngtest.c b/pngtest.c index eab586e2..b44085c3 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * libpng 1.0.6a - April 2, 2000 + * libpng 1.0.6d - April 7, 2000 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger @@ -1344,4 +1344,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_0_6a your_png_h_is_not_version_1_0_6a; +typedef version_1_0_6d your_png_h_is_not_version_1_0_6d; diff --git a/pngtrans.c b/pngtrans.c index 0c4ce231..19d2b232 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,7 +1,7 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * libpng 1.0.6a - April 2, 2000 + * libpng 1.0.6d - April 7, 2000 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/pngvcrd.c b/pngvcrd.c index 4a46c13e..ff0f7336 100644 --- a/pngvcrd.c +++ b/pngvcrd.c @@ -2,7 +2,7 @@ * * For Intel x86 CPU and Microsoft Visual C++ compiler * - * libpng 1.0.6a - April 2, 2000 + * libpng 1.0.6d - April 7, 2000 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998, Intel Corporation * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson diff --git a/pngwio.c b/pngwio.c index 6e989174..a4262523 100644 --- a/pngwio.c +++ b/pngwio.c @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * libpng 1.0.6a - April 2, 2000 + * libpng 1.0.6d - April 7, 2000 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/pngwrite.c b/pngwrite.c index acc2a284..f66bb317 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.0.6a - April 2, 2000 + * libpng 1.0.6d - April 7, 2000 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/pngwtran.c b/pngwtran.c index 10410779..a1f12cff 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,7 +1,7 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * libpng 1.0.6a - April 2, 2000 + * libpng 1.0.6d - April 7, 2000 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/pngwutil.c b/pngwutil.c index 8affe2ab..0306f950 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.0.6a - April 2, 2000 + * libpng 1.0.6d - April 7, 2000 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/scripts/makefile.beos b/scripts/makefile.beos index ef014922..cd9ab658 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -31,7 +31,7 @@ RANLIB=ranlib # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.6a +PNGMIN = 1.0.6d PNGVER = $(PNGMAJ).$(PNGMIN) # where make install puts libpng.a, libpng.so*, and png.h diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 83f857a6..8e29c8a6 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -14,7 +14,7 @@ ZLIBINC=../zlib # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.6a +PNGMIN = 1.0.6d PNGVER = $(PNGMAJ).$(PNGMIN) CC=cc diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index f6104a73..581252a9 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -34,7 +34,7 @@ RANLIB=ranlib # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.6a +PNGMIN = 1.0.6d PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 5a8aad7d..ad506ca5 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -34,7 +34,7 @@ RANLIB=ranlib # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.6a +PNGMIN = 1.0.6d PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 5284b0ab..98433018 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -25,7 +25,7 @@ RANLIB=echo # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.6a +PNGMIN = 1.0.6d PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 408aa0c1..6853d24d 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -19,8 +19,8 @@ CFLAGS=-I$(ZLIBINC) -O2 $(WARNMORE) -fPIC -mabi=n32 # -g -DPNG_DEBUG=5 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm LDSHARED=gcc -shared -VER=1.0.6a -LIBS=libpng.so.1.0.6a +VER=1.0.6d +LIBS=libpng.so.1.0.6d SHAREDLIB=libpng.so libdir=$(prefix)/lib32 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 9f5c06df..df82e4bb 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -31,7 +31,7 @@ RANLIB=echo # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.6a +PNGMIN = 1.0.6d PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas index bd7cb908..31642ab4 100644 --- a/scripts/pngdef.pas +++ b/scripts/pngdef.pas @@ -3,7 +3,7 @@ unit pngdef; interface const - PNG_LIBPNG_VER_STRING = '1.0.6a'; + PNG_LIBPNG_VER_STRING = '1.0.6d'; PNG_LIBPNG_VER = 10007; type