From 87544ac62be7d29561270b85271125353e281aba Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 13 Jan 1999 22:06:39 -0600 Subject: [PATCH] Imported from libpng-1.0.3.tar --- ANNOUNCE | 20 +++++++++---- CHANGES | 5 +++- INSTALL | 5 ++-- KNOWNBUG | 64 ++--------------------------------------- README | 3 +- Y2KINFO | 52 +++++++++++++++++++++++++++++++++ libpng.3 | 64 +++++++++++++++++++++++++++++++++++++---- libpng.txt | 56 ++++++++++++++++++++++++++++++++++-- libpngpf.3 | 4 +-- png.5 | 2 +- png.c | 8 +++--- png.h | 63 ++++++++++++++++++++++++++++++++++++---- pngconf.h | 4 +-- pngerror.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 | 2 +- pngtrans.c | 2 +- pngwio.c | 2 +- pngwrite.c | 2 +- pngwtran.c | 2 +- pngwutil.c | 2 +- scripts/makefile.dec | 2 +- scripts/makefile.hux | 68 ++++++++++++++++++++++++++++++++++++++++++++ scripts/makefile.lnx | 2 +- scripts/makefile.s2x | 2 +- scripts/makefile.sco | 2 +- scripts/pngdef.pas | 2 +- 34 files changed, 347 insertions(+), 115 deletions(-) create mode 100644 Y2KINFO create mode 100644 scripts/makefile.hux diff --git a/ANNOUNCE b/ANNOUNCE index 16d03005f..77eea6eb2 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,12 +1,12 @@ -Libpng 1.0.2b - January 6, 1999 +Libpng 1.0.3 - January 14, 1999 -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. +This is a public release of libpng, intended for use in production codes. -Changes since the last public release: +Changes since the previous public release (1.0.2): + +libpng-1.0.3: -version 1.0.2a [December 30, 1998] Replaced and extended code that was removed from png_set_filler() in 1.0.1a. Fixed a bug in png_do_filler() that made it fail to write filler bytes in the left-most pixel of each row (Kevin Bracey). @@ -32,14 +32,22 @@ version 1.0.2a [December 30, 1998] Removed lines after Dynamic Dependencies" in makefile.aco . Revised makefile.dec to make a shared library (Jeremie Petit). Removed trailing blanks from all files. -version 1.0.2b [January 6, 1999] Removed misplaced #endif and #ifdef PNG_NO_EXTERN near the end of png.h Added "if" tests to silence complaints about unused png_ptr in png.h and png.c Changed "check_if_png" function in example.c to return true (nonzero) if PNG. Changed libpng.txt to demonstrate png_sig_cmp() instead of png_check_sig() which is obsolete. + Added makefile.hux, for Hewlett Packard HPUX 10.20 and 11.00 (Jim Rice) + Added a statement of Y2K compliance in png.h, libpng.1, and Y2KINFO. Send comments/corrections/commendations to png-implement@dworkin.wustl.edu or to randeg@alumni.rpi.edu Glenn R-P + +Send comments/corrections/commendations to +png-implement@dworkin.wustl.edu or to randeg@alumni.rpi.edu + +Glenn Randers-Pehrson +libpng maintainer +PNG Development Group diff --git a/CHANGES b/CHANGES index acdb89b84..d2dcde3ae 100644 --- a/CHANGES +++ b/CHANGES @@ -378,9 +378,12 @@ version 1.0.2a [December 30, 1998] Removed lines after Dynamic Dependencies" in makefile.aco . Revised makefile.dec to make a shared library (Jeremie Petit). Removed trailing blanks from all files. -version 1.0.2b [January 6, 1999] +version 1.0.2a [January 6, 1999] Removed misplaced #endif and #ifdef PNG_NO_EXTERN near the end of png.h Added "if" tests to silence complaints about unused png_ptr in png.h and png.c Changed "check_if_png" function in example.c to return true (nonzero) if PNG. Changed libpng.txt to demonstrate png_sig_cmp() instead of png_check_sig() which is obsolete. +version 1.0.3 [January 14, 1999] + Added makefile.hux, for Hewlett Packard HPUX 10.20 and 11.00 (Jim Rice) + Added a statement of Y2K compliance in png.h, libpng.1, and Y2KINFO. diff --git a/INSTALL b/INSTALL index 15b194d04..554b77194 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.0.2b - January 6, 1999 +Installing libpng version 1.0.3 - January 14, 1999 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.2b" or "lpng103" and "zlib-1.1.3" +might be called "libpng-1.0.3" or "lpng103" and "zlib-1.1.3" or "zlib113") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -42,6 +42,7 @@ include makefile.std => Generic UNIX makefile makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr makefile.dec => DEC Alpha UNIX makefile + makefile.hux => HPUX (10.20 and 11.00) makefile makefile.sgi => Silicon Graphics IRIX makefile makefile.sun => Sun makefile makefile.s2x => Solaris 2.X makefile (gcc, creates libpng.so.2.1.0) diff --git a/KNOWNBUG b/KNOWNBUG index 4b601d31b..2238908a0 100644 --- a/KNOWNBUG +++ b/KNOWNBUG @@ -1,5 +1,5 @@ -Known bugs and suggested enhancements in libpng-1.0.2 +Known bugs and suggested enhancements in libpng-1.0.3 1. March 15, 1998 -- OPTIMIZATION -- Kevin Bracey @@ -14,33 +14,10 @@ Known bugs and suggested enhancements in libpng-1.0.2 Question whether i-- or --i is better. STATUS: Under investigation, postponed until after - libpng-1.0.2. About 160 loops will be turned around + libpng-1.0.3. About 160 loops will be turned around in libpng-1.0.Nn, for testing. -2. June 15, 1998 -- BUG -- Evan Light - - Under some conditions, 16-bit grayscale images aren't properly - expanded to rgb, because png_read_start_row() returns too small a - value of max_pixel_depth when png_set_filler() has also been called. - - STATUS: Fixed in libpng-1.0.2a - -3. June 16, 1998 -- BUG -- Matt McConnell - - When reading interlaced images with a progressive reader, in some - cases (interlaced images less than 3 pixels high) some passes are - not skipped that should be. - - STATUS: Fixed in libpng-1.0.2a - -4. July 3, 1998 -- ENHANCEMENT -- Glenn R-P - - Added png_set_rgb_to_gray() and png_get_rgb_to_gray_status() functions. - - STATUS: Done in libpng-1.0.2a, awaiting comment on resulting test - images. - -5. July 4, 1998 -- ENHANCEMENT -- Glenn R-P +2. July 4, 1998 -- ENHANCEMENT -- Glenn R-P libpng-1.0.2 and earlier transform colors to gamma=1.0 space for merging with background, and then back to the image's gamma. The @@ -52,39 +29,4 @@ Known bugs and suggested enhancements in libpng-1.0.2 STATUS: under development. -6. August 20, 1998 -- BUG -- Kevin Bracey - - When using the filler transformation, the filler isn't written - into the leftmost pixel of each row. - - Also, the filler operation isn't being done right when writing - files. Some code that was removed from png_set_filler() in - libpng 1.0.1a shouldn't have been removed. - - STATUS: Fixed in libpng-1.0.2a - -7. August 23, 1998 -- BUG -- Duncan Simpson - - "static pngcharp tIME_string" should be changed to - "static char tIME_string[30]" in pngtest.c - - Also -- December 30, 1998 -- there are some misplaced brackets in - pngtest.c that cause pngtest to try to write a tIME chunk - even when no tIME chunk was present in the source file. - - STATUS: Fixed in libpng-1.0.2a - -8. August 24, 1998 -- BUG -- John Cromer - - Order of byte-swap and shift operations seems to be incorrect in - png_do_write_transformations() - - STATUS: Under investigation. - -9. September 11, 1998 -- ENHANCEMENT -- L. Peter Deutsch - - The PNG_NO_STDIO macro should be split into PNG_NO_STDIO - and PNG_NO_CONSOLE_STDIO. - - STATUS: Done in libpng-1.0.2a diff --git a/README b/README index ee3c2d986..3bd089325 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng 1.0.2b - January 6, 1999 (shared library 2.1) +README for libpng 1.0.3 - January 14, 1999 (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. @@ -159,6 +159,7 @@ Files in this distribution: makefile.std => Generic UNIX makefile makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr makefile.dec => DEC Alpha UNIX makefile + makefile.hux => HPUX (10.20 and 11.00) makefile makefile.sgi => Silicon Graphics IRIX makefile makefile.sun => Sun makefile makefile.s2x => Solaris 2.X makefile (gcc, creates libpng.so.2.1.0) diff --git a/Y2KINFO b/Y2KINFO new file mode 100644 index 000000000..bf41676ff --- /dev/null +++ b/Y2KINFO @@ -0,0 +1,52 @@ + Y2K compliance in libpng: + ========================= + + January 13, 1999 + + 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.81 and + upward 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 will hold years up to 65535. The other two hold the date in text + format, and will hold years up to 9999. + + The integer is + "png_uint_16 year" in png_time_struct. + + The strings are + "png_charp time_buffer" in png_struct and + "near_time_buffer", which is a local character string in png.c. + + There are seven time-related functions: + + png_convert_to_rfc_1123() in png.c + (formerly png_convert_to_rfc_1152() in error) + png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c + png_convert_from_time_t() in pngwrite.c + png_get_tIME() in pngget.c + png_handle_tIME() in pngrutil.c, called in pngread.c + png_set_tIME() in pngset.c + png_write_tIME() in pngwutil.c, called in pngwrite.c + + All appear to handle dates properly in a Y2K environment. The + png_convert_from_time_t() function calls gmtime() to convert from system + clock time, which returns (year - 1900), which we properly convert to + the full 4-digit year. There is a possibility that applications using + libpng are not passing 4-digit years into the png_convert_to_rfc_1123() + function, or incorrectly passing only a 2-digit year instead of + "year - 1900" into the png_convert_from_struct_tm() function, but this + is not under our control. The libpng documentation has always stated + that it works with 4-digit years, and the APIs have been documented as + such. + + The tIME chunk itself is also Y2K compliant. It uses a 2-byte unsigned + integer to hold the year, and can hold years as large as 65535. + + + Glenn Randers-Pehrson + libpng maintainer + PNG Development Group diff --git a/libpng.3 b/libpng.3 index 3464d5839..f97073609 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "January 6, 1999" +.TH LIBPNG 3 "January 14, 1999" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.2b - January 6, 1999 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.3 - January 14, 1999 .SH SYNOPSIS #include @@ -423,10 +423,10 @@ 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.2b - January 6, 1999 + libpng version 1.0.3 - January 14, 1999 Updated and distributed by Glenn Randers-Pehrson - Copyright (c) 1998, 1999, Glenn Randers-Pehrson + Copyright (c) 1998, 1999 Glenn Randers-Pehrson For conditions of distribution and use, see copyright notice in png.h. @@ -2437,6 +2437,58 @@ png_set_error_fn(), which is essentially the same function, but with a new name to force compilation errors with applications that try to use the old method. +.SH VII. Y2K Compliance in libpng + +January 13, 1999 + +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.81 and +upward 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 +will hold years up to 65535. The other two hold the date in text +format, and will hold years up to 9999. + +The integer is + "png_uint_16 year" in png_time_struct. + +The strings are + "png_charp time_buffer" in png_struct and + "near_time_buffer", which is a local character string in png.c. + +There are seven time-related functions: + + png_convert_to_rfc_1123() in png.c + (formerly png_convert_to_rfc_1152() in error) + png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c + png_convert_from_time_t() in pngwrite.c + png_get_tIME() in pngget.c + png_handle_tIME() in pngrutil.c, called in pngread.c + png_set_tIME() in pngset.c + png_write_tIME() in pngwutil.c, called in pngwrite.c + +All appear to handle dates properly in a Y2K environment. The +png_convert_from_time_t() function calls gmtime() to convert from system +clock time, which returns (year - 1900), which we properly convert to +the full 4-digit year. There is a possibility that applications using +libpng are not passing 4-digit years into the png_convert_to_rfc_1123() +function, or incorrectly passing only a 2-digit year instead of +"year - 1900" into the png_convert_from_struct_tm() function, but this +is not under our control. The libpng documentation has always stated +that it works with 4-digit years, and the APIs have been documented as +such. + +The tIME chunk itself is also Y2K compliant. It uses a 2-byte unsigned +integer to hold the year, and can hold years as large as 65535. + + + Glenn Randers-Pehrson + libpng maintainer + PNG Development Group + .SH NOTE Note about libpng version numbers: @@ -2522,7 +2574,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.0.2b - January 6, 1999: +Libpng version 1.0.3 - January 14, 1999: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (randeg@alumni.rpi.edu). @@ -2534,7 +2586,7 @@ Supported by the PNG development group Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. Copyright (c) 1996, 1997 Andreas Dilger -Copyright (c) 1998, 1999, Glenn Randers-Pehrson +Copyright (c) 1998, 1999 Glenn Randers-Pehrson The PNG Reference Library (libpng) is supplied "AS IS". The Contributing Authors and Group 42, Inc. disclaim all warranties, expressed or implied, diff --git a/libpng.txt b/libpng.txt index d52fc99db..1a30a9f2c 100644 --- a/libpng.txt +++ b/libpng.txt @@ -1,9 +1,9 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.0.2b - January 6, 1999 + libpng version 1.0.3 - January 14, 1999 Updated and distributed by Glenn Randers-Pehrson - Copyright (c) 1998, 1999, Glenn Randers-Pehrson + Copyright (c) 1998, 1999 Glenn Randers-Pehrson For conditions of distribution and use, see copyright notice in png.h. @@ -2013,3 +2013,55 @@ to set the error callbacks AFTER png_read_init(), or to change them with png_set_error_fn(), which is essentially the same function, but with a new name to force compilation errors with applications that try to use the old method. + +VII. Y2K Compliance in libpng + +January 13, 1999 + +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.81 and +upward 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 +will hold years up to 65535. The other two hold the date in text +format, and will hold years up to 9999. + +The integer is + "png_uint_16 year" in png_time_struct. + +The strings are + "png_charp time_buffer" in png_struct and + "near_time_buffer", which is a local character string in png.c. + +There are seven time-related functions: + + png_convert_to_rfc_1123() in png.c + (formerly png_convert_to_rfc_1152() in error) + png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c + png_convert_from_time_t() in pngwrite.c + png_get_tIME() in pngget.c + png_handle_tIME() in pngrutil.c, called in pngread.c + png_set_tIME() in pngset.c + png_write_tIME() in pngwutil.c, called in pngwrite.c + +All appear to handle dates properly in a Y2K environment. The +png_convert_from_time_t() function calls gmtime() to convert from system +clock time, which returns (year - 1900), which we properly convert to +the full 4-digit year. There is a possibility that applications using +libpng are not passing 4-digit years into the png_convert_to_rfc_1123() +function, or incorrectly passing only a 2-digit year instead of +"year - 1900" into the png_convert_from_struct_tm() function, but this +is not under our control. The libpng documentation has always stated +that it works with 4-digit years, and the APIs have been documented as +such. + +The tIME chunk itself is also Y2K compliant. It uses a 2-byte unsigned +integer to hold the year, and can hold years as large as 65535. + + + Glenn Randers-Pehrson + libpng maintainer + PNG Development Group diff --git a/libpngpf.3 b/libpngpf.3 index 4fb69157e..c2654e7f8 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "January 6, 1999" +.TH LIBPNGPF 3 "January 14, 1999" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.2b - January 6, 1999 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.3 - January 14, 1999 (private functions) .SH SYNOPSIS #include diff --git a/png.5 b/png.5 index b04195660..2c0fcde12 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "January 6, 1999" +.TH PNG 5 "January 14, 1999" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index acab1cf68..e42233218 100644 --- a/png.c +++ b/png.c @@ -1,10 +1,10 @@ /* png.c - location for general purpose libpng functions * - * libpng version 1.0.2b - January 6, 1999 + * libpng version 1.0.3 - January 14, 1999 * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger - * Copyright (c) 1998, 1999, Glenn Randers-Pehrson + * Copyright (c) 1998, 1999 Glenn Randers-Pehrson * */ @@ -16,7 +16,7 @@ * string defined in png.h. */ -char png_libpng_ver[12] = "1.0.2b"; +char png_libpng_ver[12] = "1.0.3"; /* Place to hold the signature string for a PNG file. */ png_byte FARDATA png_sig[8] = {137, 80, 78, 71, 13, 10, 26, 10}; @@ -352,7 +352,7 @@ png_get_copyright(png_structp png_ptr) { if(png_ptr == NULL) /* silence compiler warning about unused png_ptr */ ; - return("\n libpng version 1.0.2b - January 6, 1999\n\ + return("\n libpng version 1.0.3 - January 14, 1999\n\ Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.\n\ Copyright (c) 1996, 1997 Andreas Dilger\n\ Copyright (c) 1998, 1999, Glenn Randers-Pehrson\n"); diff --git a/png.h b/png.h index b1298f5c7..b48e1507e 100644 --- a/png.h +++ b/png.h @@ -1,13 +1,65 @@ /* png.h - header file for PNG reference library * - * libpng version 1.0.2b - January 6, 1999 + * libpng version 1.0.3 - January 14, 1999 * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, 1999 Glenn Randers-Pehrson * + * Y2K compliance in libpng: + * ========================= + * + * January 13, 1999 + * + * 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.81 and + * upward 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 will hold years up to 65535. The other two hold the date in text + * format, and will hold years up to 9999. + * + * The integer is + * "png_uint_16 year" in png_time_struct. + * + * The strings are + * "png_charp time_buffer" in png_struct and + * "near_time_buffer", which is a local character string in png.c. + * + * There are seven time-related functions: + * png.c: png_convert_to_rfc_1123() in png.c + * (formerly png_convert_to_rfc_1152() in error) + * png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c + * png_convert_from_time_t() in pngwrite.c + * png_get_tIME() in pngget.c + * png_handle_tIME() in pngrutil.c, called in pngread.c + * png_set_tIME() in pngset.c + * png_write_tIME() in pngwutil.c, called in pngwrite.c + * + * All handle dates properly in a Y2K environment. The + * png_convert_from_time_t() function calls gmtime() to convert from system + * clock time, which returns (year - 1900), which we properly convert to + * the full 4-digit year. There is a possibility that applications using + * libpng are not passing 4-digit years into the png_convert_to_rfc_1123() + * function, or incorrectly passing only a 2-digit year instead of + * "year - 1900" into the png_convert_from_struct_tm() function, but this + * is not under our control. The libpng documentation has always stated + * that it works with 4-digit years, and the APIs have been documented as + * such. + * + * The tIME chunk itself is also Y2K compliant. It uses a 2-byte unsigned + * integer to hold the year, and can hold years as large as 65535. + * + * + * Glenn Randers-Pehrson + * libpng maintainer + * PNG Development Group + * * Note about libpng version numbers: - * + * * Due to various miscommunications, unforeseen code incompatibilities * and occasional factors outside the authors' control, version numbering * on the library has not always been consistent and straightforward. @@ -31,7 +83,7 @@ * 1.0.1 1.0.1 10001 2.1.0 * 1.0.1a-e 1.0.1a-e 10002 2.1.0.1a-e * 1.0.2 1.0.2 10002 2.1.0.2 - * 1.0.2a 1.0.2a 10003 2.1.0.2a + * 1.0.2a-c 1.0.2a 10003 2.1.0.2a-c * 1.0.3 1.0.3 10003 2.1.0.3 * * Henceforth the source version will match the shared-library minor @@ -93,6 +145,7 @@ * appreciated. */ + #ifndef _PNG_H #define _PNG_H @@ -119,7 +172,7 @@ extern "C" { */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.0.2b" +#define PNG_LIBPNG_VER_STRING "1.0.3" /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -1499,7 +1552,7 @@ png_get_header_version(png_structp png_ptr) { if(png_ptr == NULL) /* silence compiler warning about unused png_ptr */ ; - return("\n libpng version 1.0.2b - January 6, 1999 (header)\n"); + return("\n libpng version 1.0.3 - January 14, 1999 (header)\n"); } #endif diff --git a/pngconf.h b/pngconf.h index a19d8faf4..028f2a1a7 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,11 +1,11 @@ /* pngconf.h - machine configurable file for libpng * - * libpng 1.0.2b - January 6, 1999 + * libpng 1.0.3 - January 14, 1999 * 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 - * Copyright (c) 1998, 1999, Glenn Randers-Pehrson + * Copyright (c) 1998, 1999 Glenn Randers-Pehrson */ /* Any machine specific code is near the front of this file, so if you diff --git a/pngerror.c b/pngerror.c index 34a3e7b6e..c591000d1 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.0.2b - January 6, 1999 + * libpng 1.0.3 - January 14, 1999 * 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/pngget.c b/pngget.c index 7128f00b8..484a0117c 100644 --- a/pngget.c +++ b/pngget.c @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * libpng 1.0.2b - January 6, 1999 + * libpng 1.0.3 - January 14, 1999 * 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 73ca2548e..06c4c1b7e 100644 --- a/pngmem.c +++ b/pngmem.c @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * libpng 1.0.2b - January 6, 1999 + * libpng 1.0.3 - January 14, 1999 * 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 23476e90c..b44651801 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.0.2b - January 6, 1999 + * libpng 1.0.3 - January 14, 1999 * 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 14f8e53c2..01613b164 100644 --- a/pngread.c +++ b/pngread.c @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * libpng 1.0.2b - January 6, 1999 + * libpng 1.0.3 - January 14, 1999 * 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 @@ -530,7 +530,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.2b. + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.3. */ void @@ -579,7 +579,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.2b. + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.3. */ void png_read_image(png_structp png_ptr, png_bytepp image) diff --git a/pngrio.c b/pngrio.c index 665cb0c2c..23bbb2b66 100644 --- a/pngrio.c +++ b/pngrio.c @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * libpng 1.0.2b - January 6, 1999 + * libpng 1.0.3 - January 14, 1999 * 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 296bd1467..ce486bd06 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.2b - January 6, 1999 + * libpng 1.0.3 - January 14, 1999 * 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 4d71fef70..9320a7107 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.0.2b - January 6, 1999 + * libpng 1.0.3 - January 14, 1999 * 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 cf1462689..320083638 100644 --- a/pngset.c +++ b/pngset.c @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * libpng 1.0.2b - January 6, 1999 + * libpng 1.0.3 - January 14, 1999 * 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 55b31dfa1..a1ba8ec2e 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * libpng 1.0.2b -January 6, 1999 + * libpng 1.0.3 -January 14, 1999 * 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/pngtrans.c b/pngtrans.c index beb7ab0bc..397c988f0 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.2b - January 6, 1999 + * libpng 1.0.3 - January 14, 1999 * 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/pngwio.c b/pngwio.c index 63e5e3cac..84b5b2869 100644 --- a/pngwio.c +++ b/pngwio.c @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * libpng 1.0.2b - January 6, 1999 + * libpng 1.0.3 - January 14, 1999 * 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 2618e10c7..3b533e58c 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.0.2b - January 6, 1999 + * libpng 1.0.3 - January 14, 1999 * 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 45a94063f..76cf3a3e5 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.2b - January 6, 1999 + * libpng 1.0.3 - January 14, 1999 * 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 f257b5e32..4736361d2 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.0.2b - January 6, 1999 + * libpng 1.0.3 - January 14, 1999 * 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.dec b/scripts/makefile.dec index d5cbc8be2..9db3a4fab 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.2b +PNGMIN = 1.0.3 PNGVER = $(PNGMAJ).$(PNGMIN) CC=cc diff --git a/scripts/makefile.hux b/scripts/makefile.hux new file mode 100644 index 000000000..0ae187bb5 --- /dev/null +++ b/scripts/makefile.hux @@ -0,0 +1,68 @@ +=========================================================================== +# makefile for libpng, HPUX (10.20 and 11.00) +# Copyright (C) 1995 Guy Eric Schalnat, Group 42 +# Copyright (C) 1999 Glenn Randers-Pehrson +# contributed by Jim Rice, Hewlett Packard +# For conditions of distribution and use, see copyright notice in png.h + +# Where the zlib library and include files are located +ZLIBLIB=/opt/zlib/lib +ZLIBINC=/opt/zlib/include + +CC=cc +CFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 +CCFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 +LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm + +RANLIB=ranlib + +# where make install puts libpng.a and png.h +prefix=/opt/libpng/ + +OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ + pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ + pngwtran.o pngmem.o pngerror.o pngpread.o + +all: libpng.a pngtest + +libpng.a: $(OBJS) + ar rc $@ $(OBJS) + $(RANLIB) $@ + +pngtest: pngtest.o libpng.a + $(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS) + +test: pngtest + ./pngtest + +install: libpng.a + -@mkdir $(prefix)/include + -@mkdir $(prefix)/lib + cp png.h $(prefix)/include + cp pngconf.h $(prefix)/include + chmod 644 $(prefix)/include/png.h + chmod 644 $(prefix)/include/pngconf.h + cp libpng.a $(prefix)/lib + chmod 644 $(prefix)/lib/libpng.a + +clean: + rm -f *.o libpng.a pngtest pngout.png + +# DO NOT DELETE THIS LINE -- make depend depends on it. + +png.o: png.h pngconf.h +pngerror.o: png.h pngconf.h +pngrio.o: png.h pngconf.h +pngwio.o: png.h pngconf.h +pngmem.o: png.h pngconf.h +pngset.o: png.h pngconf.h +pngget.o: png.h pngconf.h +pngread.o: png.h pngconf.h +pngrtran.o: png.h pngconf.h +pngrutil.o: png.h pngconf.h +pngtest.o: png.h pngconf.h +pngtrans.o: png.h pngconf.h +pngwrite.o: png.h pngconf.h +pngwtran.o: png.h pngconf.h +pngwutil.o: png.h pngconf.h +pngpread.o: png.h pngconf.h diff --git a/scripts/makefile.lnx b/scripts/makefile.lnx index c85d9e20c..33b896b36 100644 --- a/scripts/makefile.lnx +++ b/scripts/makefile.lnx @@ -32,7 +32,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.2b +PNGMIN = 1.0.3 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.s2x b/scripts/makefile.s2x index 8c3aa9b5b..e874a5ad2 100644 --- a/scripts/makefile.s2x +++ b/scripts/makefile.s2x @@ -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.2b +PNGMIN = 1.0.3 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.sco b/scripts/makefile.sco index ca70185b4..f97b8b657 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.2b +PNGMIN = 1.0.3 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas index d0e9d4d2a..787f43c44 100644 --- a/scripts/pngdef.pas +++ b/scripts/pngdef.pas @@ -3,7 +3,7 @@ unit pngdef; interface const - PNG_LIBPNG_VER_STRING = '1.0.2b'; + PNG_LIBPNG_VER_STRING = '1.0.3'; PNG_LIBPNG_VER = 10001; type