diff options
| -rw-r--r-- | CHANGES | 7 | ||||
| -rw-r--r-- | INSTALL | 4 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | libpng.3 | 49 | ||||
| -rw-r--r-- | libpng.txt | 2 | ||||
| -rw-r--r-- | libpngpf.3 | 2 | ||||
| -rw-r--r-- | lpng100a | 0 | ||||
| -rw-r--r-- | png.5 | 2 | ||||
| -rw-r--r-- | png.c | 6 | ||||
| -rw-r--r-- | png.h | 52 | ||||
| -rw-r--r-- | pngconf.h | 4 | ||||
| -rw-r--r-- | pngerror.c | 4 | ||||
| -rw-r--r-- | pngget.c | 4 | ||||
| -rw-r--r-- | pngmem.c | 4 | ||||
| -rw-r--r-- | pngpread.c | 4 | ||||
| -rw-r--r-- | pngread.c | 6 | ||||
| -rw-r--r-- | pngrio.c | 4 | ||||
| -rw-r--r-- | pngrtran.c | 83 | ||||
| -rw-r--r-- | pngrutil.c | 4 | ||||
| -rw-r--r-- | pngset.c | 4 | ||||
| -rw-r--r-- | pngtest.c | 4 | ||||
| -rw-r--r-- | pngtrans.c | 4 | ||||
| -rw-r--r-- | pngwio.c | 4 | ||||
| -rw-r--r-- | pngwrite.c | 8 | ||||
| -rw-r--r-- | pngwtran.c | 4 | ||||
| -rw-r--r-- | pngwutil.c | 8 |
26 files changed, 159 insertions, 120 deletions
@@ -271,3 +271,10 @@ version 1.00 [March 7, 1998] version 1.0.0 [March 8, 1998] Changed name from 1.00 to 1.0.0 (Adam Costello) Added smakefile.ppc (with SCOPTIONS.ppc) for Amiga PPC (Andreas Kleinert) +version 1.0.0a [March 9, 1998] + Fixed three bugs in pngrtran.c to make gamma+background handling consistent + (Greg Roelofs) + Changed format of the PNG_LIBPNG_VER integer to xyyzz instead of xyz + for major, minor, and bugfix releases. This is 10001. (Adam Costello, + Tom Lane) + Make months range from 1-12 in png_convert_to_rfc1123 @@ -1,5 +1,5 @@ -Installing libpng version 1.0.0 March 8, 1998 +Installing libpng version 1.0.0a March 9, 1998 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.0 or "lpng100" and "zlib-1.1.1" +might be called "libpng-1.0.0a or "lpng100" and "zlib-1.1.1" or "zlib111") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -1,4 +1,4 @@ -README for libpng 1.0.0 (shared library 2.1) +README for libpng 1.0.0a (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. @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "March 8, 1998" +.TH LIBPNG 3 "March 9, 1998" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library .SH SYNOPSIS @@ -396,7 +396,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.0 March 8, 1998 + libpng version 1.0.0a March 9, 1998 Updated and distributed by Glenn Randers-Pehrson <randeg@alumni.rpi.edu> Copyright (c) 1998, Glenn Randers-Pehrson @@ -2291,28 +2291,29 @@ on the library has not always been consistent and straightforward. The following table summarizes matters since version 0.89c, which was the first widely used release: - source png.h shared-lib - version string version - ------- ------ ---------- - 0.89c ("1.0 beta 3") 0.89 1.0.89 - 0.90 ("1.0 beta 4") 0.90 0.90 - [should have been 2.0.90] - 0.95 ("1.0 beta 5") 0.95 0.95 - [should have been 2.0.95] - 0.96 ("1.0 beta 6") 0.96 0.96 - [should have been 2.0.96] - 0.97b ("1.00.97 beta 7") 1.00.97 1.0.0 - [should have been 2.0.97] - 0.97c 0.97 2.0.97 - 0.98 0.98 2.0.98 - 0.99 0.99 2.0.99 - 0.99a-m 0.99 2.0.99 - 1.0.0 1.00 2.1.0 - -Henceforth the source version will match the shared-library minor -and patch numbers; the shared-library major version number will be + source png.h png.h shared-lib + version string int version + ------- ------ ------ ---------- + 0.89c 0.89 89 1.0.89 + 0.90 0.90 90 0.90 [should be 2.0.90] + 0.95 0.95 95 0.95 [should be 2.0.95] + 0.96 0.96 96 0.96 [should be 2.0.96] + 0.97b 7") 1.00.97 97 1.0.1 [should be 2.0.97] + 0.97c 0.97 97 2.0.97 + 0.98 0.98 98 2.0.98 + 0.99 0.99 98 2.0.99 + 0.99a-m 0.99 99 2.0.99 + 1.00 1.00 100 2.1.0 [should be 10000] + 1.0.0 1.0.0 100 2.1.0 [should be 10000] + 1.0.1 1.0.1 10001 2.1.0 + +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) + .SH "SEE ALSO" libpngpf(3), png(5) .LP @@ -2365,7 +2366,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.0.0 (March 8, 1998): +Libpng version 1.0.0a March 9, 1998: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (randeg@alumni.rpi.edu). diff --git a/libpng.txt b/libpng.txt index 6ce69ed4c..602efd872 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.0 March 8, 1998 + libpng version 1.0.0a March 9, 1998 Updated and distributed by Glenn Randers-Pehrson <randeg@alumni.rpi.edu> Copyright (c) 1998, Glenn Randers-Pehrson diff --git a/libpngpf.3 b/libpngpf.3 index d187aad07..00730b90c 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "March 8, 1998" +.TH LIBPNGPF 3 "March 9, 1998" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library (private functions) diff --git a/lpng100a b/lpng100a new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/lpng100a @@ -1,4 +1,4 @@ -.TH PNG 5 "March 8, 1998" +.TH PNG 5 "March 9, 1998" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -1,12 +1,12 @@ /* png.c - location for general purpose libpng functions * - * libpng 1.0.0 + * libpng 1.0.0a * 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, Glenn Randers-Pehrson - * March 8, 1998 + * March 9, 1998 */ #define PNG_INTERNAL @@ -16,7 +16,7 @@ /* Version information for C files. This had better match the version * string defined in png.h. */ -char png_libpng_ver[6] = "1.0.0"; +char png_libpng_ver[12] = "1.0.0a"; /* Place to hold the signature string for a PNG file. */ png_byte FARDATA png_sig[8] = {137, 80, 78, 71, 13, 10, 26, 10}; @@ -1,12 +1,12 @@ /* png.h - header file for PNG reference library * - * libpng 1.0.0 + * libpng 1.0.0a * For conditions of distribution and use, see the COPYRIGHT NOTICE below. * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998 Glenn Randers-Pehrson - * March 8, 1998 + * March 9, 1998 * * Note about libpng version numbers: * @@ -16,23 +16,29 @@ * The following table summarizes matters since version 0.89c, which was * the first widely used release: * - * source png.h shared-lib - * version string version - * ------- ------ ---------- - * 0.89c ("1.0 beta 3") 0.89 1.0.89 - * 0.90 ("1.0 beta 4") 0.90 0.90 [should have been 2.0.90] - * 0.95 ("1.0 beta 5") 0.95 0.95 [should have been 2.0.95] - * 0.96 ("1.0 beta 6") 0.96 0.96 [should have been 2.0.96] - * 0.97b ("1.00.97 beta 7") 1.00.97 1.0.0 [should have been 2.0.97] - * 0.97c 0.97 2.0.97 - * 0.98 0.98 2.0.98 - * 0.99 0.99 2.0.99 - * 0.99a-m 0.99 2.0.99 - * 1.0.0 1.00 2.1.0 + * source png.h png.h shared-lib + * version string int version + * ------- ------ ------ ---------- + * 0.89c ("1.0 beta 3") 0.89 89 1.0.89 + * 0.90 ("1.0 beta 4") 0.90 90 0.90 [should have been 2.0.90] + * 0.95 ("1.0 beta 5") 0.95 95 0.95 [should have been 2.0.95] + * 0.96 ("1.0 beta 6") 0.96 96 0.96 [should have been 2.0.96] + * 0.97b ("1.00.97 beta 7") 1.00.97 97 1.0.1 [should have been 2.0.97] + * 0.97c 0.97 97 2.0.97 + * 0.98 0.98 98 2.0.98 + * 0.99 0.99 98 2.0.99 + * 0.99a-m 0.99 99 2.0.99 + * 1.00 1.00 100 2.1.0 [int should be 10000] + * 1.0.0 1.0.0 100 2.1.0 [int should be 10000] + * 1.0.1 1.0.1 10001 2.1.0 * * 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) + * * * See libpng.txt for more information. The PNG specification is available * as RFC 2083 <ftp://ftp.uu.net/graphics/png/documents/> @@ -112,19 +118,21 @@ extern "C" { */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.0.0" +#define PNG_LIBPNG_VER_STRING "1.0.0a" -/* careful here. At one time, I wanted to use 082, but that would be octal. - * Version 1.0.0 will be 100 here, etc. - */ -#define PNG_LIBPNG_VER 100 +/* Gareful here. At one time, Guy wanted to use 082, but that would be octal. + * We must not include leading zeroes. + * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only + * version 1.0.0 was mis-numbered 100 instead of 10000). From + * version 1.0.1 it's xxyyzz, where x=major, y=minor, z-bugfix*/ +#define PNG_LIBPNG_VER 10001 /* variables declared in png.c - only it needs to define PNG_NO_EXTERN */ #if !defined(PNG_NO_EXTERN) || defined(PNG_ALWAYS_EXTERN) /* Version information for C files, stored in png.c. This had better match * the version above. */ -extern char png_libpng_ver[6]; +extern char png_libpng_ver[12]; /* need room for 99.99.99aa */ /* Structures to facilitate easy interlacing. See png.c for more details */ extern int FARDATA png_pass_start[7]; @@ -1834,7 +1842,7 @@ PNG_EXTERN void png_do_strip_filler PNGARG((png_row_infop row_info, PNG_EXTERN void png_do_swap PNGARG((png_row_infop row_info, png_bytep row)); #endif -#if defined(PNG_READ_PACKSWAP_SUPPORTED) || defined(PNG_WRITE_PACKSWAP_SUPPOR) +#if defined(PNG_READ_PACKSWAP_SUPPORTED) || defined(PNG_WRITE_PACKSWAP_SUPPORTED) PNG_EXTERN void png_do_packswap PNGARG((png_row_infop row_info, png_bytep row)); #endif @@ -1,12 +1,12 @@ /* pngconf.h - machine configurable file for libpng * - * libpng 1.0.0 + * libpng 1.0.0a * 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, Glenn Randers-Pehrson - * March 8, 1998 + * March 9, 1998 */ /* Any machine specific code is near the front of this file, so if you diff --git a/pngerror.c b/pngerror.c index 98827a90b..3358d400d 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,12 +1,12 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.0.0 + * libpng 1.0.0a * 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, Glenn Randers-Pehrson - * March 8, 1998 + * March 9, 1998 * * This file provides a location for all error handling. Users which * need special error handling are expected to write replacement functions @@ -1,12 +1,12 @@ /* pngget.c - retrieval of values from info struct * - * libpng 1.0.0 + * libpng 1.0.0a * 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, Glenn Randers-Pehrson - * March 8, 1998 + * March 9, 1998 */ #define PNG_INTERNAL @@ -1,12 +1,12 @@ /* pngmem.c - stub functions for memory allocation * - * libpng 1.0.0 + * libpng 1.0.0a * 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, Glenn Randers-Pehrson - * March 8, 1998 + * March 9, 1998 * * This file provides a location for all memory allocation. Users which * need special memory handling are expected to modify the code in this file diff --git a/pngpread.c b/pngpread.c index 47ece54e1..c8b488798 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,12 +1,12 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.0.0 + * libpng 1.0.0a * 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, Glenn Randers-Pehrson - * March 8, 1998 + * March 9, 1998 */ #define PNG_INTERNAL @@ -1,12 +1,12 @@ /* pngread.c - read a PNG file * - * libpng 1.0.0 + * libpng 1.0.0a * 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, Glenn Randers-Pehrson - * March 8, 1998 + * March 9, 1998 * * This file contains routines that an application calls directly to * read a PNG file or stream. @@ -719,10 +719,8 @@ png_read_destroy(png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr #endif if (png_ptr->flags & PNG_FLAG_FREE_PALETTE) png_zfree(png_ptr, png_ptr->palette); -#if defined(PNG_READ_BACKGROUND_SUPPORTED) && defined(PNG_READ_bKGD_SUPPORTED) if (png_ptr->flags & PNG_FLAG_FREE_TRANS) png_free(png_ptr, png_ptr->trans); -#endif #if defined(PNG_READ_hIST_SUPPORTED) if (png_ptr->flags & PNG_FLAG_FREE_HIST) png_free(png_ptr, png_ptr->hist); @@ -1,12 +1,12 @@ /* pngrio.c - functions for data input * - * libpng 1.0.0 + * libpng 1.0.0a * 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, Glenn Randers-Pehrson - * March 8, 1998 + * March 9, 1998 * * This file provides a location for all input. Users which need * special handling are expected to write a function which has the same diff --git a/pngrtran.c b/pngrtran.c index 88ab9028b..9f02191cd 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,12 +1,12 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * libpng 1.0.0 + * libpng 1.0.0a * 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, Glenn Randers-Pehrson - * March 8, 1998 + * March 9, 1998 * * This file contains functions optionally called by an application * in order to tell libpng how to handle data when reading a PNG. @@ -665,7 +665,8 @@ png_init_read_transformations(png_structp png_ptr) if (png_ptr->transformations & PNG_INVERT_ALPHA) { #if defined(PNG_READ_EXPAND_SUPPORTED) - if (png_ptr->transformations & !PNG_EXPAND) + /* GRR BUG #1: was (png_ptr->transformations & !PNG_EXPAND) */ + if (!(png_ptr->transformations & PNG_EXPAND)) #endif { /* invert the alpha channel (in tRNS) unless the pixels are @@ -712,41 +713,65 @@ png_init_read_transformations(png_structp png_ptr) } else { - double g; + double g, gs; - g = 1.0 / (png_ptr->background_gamma * png_ptr->screen_gamma); +/* + GRR BUG #3: inconsistent with handling of full RGBA below + g = 1.0 / png_ptr->background_gamma; + gs = 1.0 / (png_ptr->background_gamma * png_ptr->screen_gamma); + */ + switch (png_ptr->background_gamma_type) + { + case PNG_BACKGROUND_GAMMA_SCREEN: + g = (png_ptr->screen_gamma); + gs = 1.0; + break; + case PNG_BACKGROUND_GAMMA_FILE: + g = 1.0 / (png_ptr->gamma); + gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma); + break; + case PNG_BACKGROUND_GAMMA_UNIQUE: + g = 1.0 / (png_ptr->background_gamma); + gs = 1.0 / (png_ptr->background_gamma * + png_ptr->screen_gamma); + break; + default: + g = 1.0; /* back_1 */ + gs = 1.0; /* back */ + } - if (png_ptr->background_gamma_type==PNG_BACKGROUND_GAMMA_SCREEN|| - fabs(g - 1.0) < PNG_GAMMA_THRESHOLD) + if ( +/* + GRR BUG #2: This creates self-inconsistent images--fully + transparent and fully opaque look fine, but translucent + pixels are wrong (too bright if XV's code can be trusted). + Commenting it out makes an internally self-consistent + image, but still not consistent with RGBA version of same + thing (again, too bright in XV). + png_ptr->background_gamma_type==PNG_BACKGROUND_GAMMA_SCREEN|| + */ + fabs(gs - 1.0) < PNG_GAMMA_THRESHOLD) { - back.red = (png_byte)png_ptr->background.red; + back.red = (png_byte)png_ptr->background.red; back.green = (png_byte)png_ptr->background.green; - back.blue = (png_byte)png_ptr->background.blue; + back.blue = (png_byte)png_ptr->background.blue; } else { - back.red = - (png_byte)(pow((double)png_ptr->background.red/255, g) * - 255.0 + 0.5); - back.green = - (png_byte)(pow((double)png_ptr->background.green/255, g) * - 255.0 + 0.5); - back.blue = - (png_byte)(pow((double)png_ptr->background.blue/255, g) * - 255.0 + 0.5); + back.red = (png_byte)(pow( + (double)png_ptr->background.red/255, gs) * 255.0 + .5); + back.green = (png_byte)(pow( + (double)png_ptr->background.green/255, gs) * 255.0 + .5); + back.blue = (png_byte)(pow( + (double)png_ptr->background.blue/255, gs) * 255.0 + .5); } - g = 1.0 / png_ptr->background_gamma; - - back_1.red = - (png_byte)(pow((double)png_ptr->background.red/255, g) * - 255.0 + 0.5); - back_1.green = - (png_byte)(pow((double)png_ptr->background.green/255, g) * - 255.0 + 0.5); - back_1.blue = - (png_byte)(pow((double)png_ptr->background.blue/255, g) * - 255.0 + 0.5); + back_1.red = (png_byte)(pow( + (double)png_ptr->background.red/255, g) * 255.0 + .5); + back_1.green = (png_byte)(pow( + (double)png_ptr->background.green/255, g) * 255.0 + .5); + back_1.blue = (png_byte)(pow( + (double)png_ptr->background.blue/255, g) * 255.0 + .5); } for (i = 0; i < num_palette; i++) diff --git a/pngrutil.c b/pngrutil.c index ea5b26ae6..7394e152a 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,12 +1,12 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.0.0 + * libpng 1.0.0a * 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, Glenn Randers-Pehrson - * March 8, 1998 + * March 9, 1998 * * This file contains routines which are only called from within * libpng itself during the course of reading an image. @@ -1,12 +1,12 @@ /* pngset.c - storage of image information into info struct * - * libpng 1.0.0 + * libpng 1.0.0a * 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, Glenn Randers-Pehrson - * March 8, 1998 + * March 9, 1998 * * The functions here are used during reads to store data from the file * into the info struct, and during writes to store application data @@ -1,12 +1,12 @@ /* pngtest.c - a simple test program to test libpng * - * libpng 1.0.0 + * libpng 1.0.0a * 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, Glenn Randers-Pehrson - * March 8, 1998 + * March 9, 1998 * * This program reads in a PNG image, writes it out again, and then * compares the two files. If the files are identical, this shows that diff --git a/pngtrans.c b/pngtrans.c index 7d8a5b2fd..c6b4ff0d7 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,12 +1,12 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * libpng 1.0.0 + * libpng 1.0.0a * 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, Glenn Randers-Pehrson - * March 8, 1998 + * March 9, 1998 */ #define PNG_INTERNAL @@ -1,12 +1,12 @@ /* pngwio.c - functions for data output * - * libpng 1.0.0 + * libpng 1.0.0a * 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, Glenn Randers-Pehrson - * March 8, 1998 + * March 9, 1998 * * This file provides a location for all output. Users which need * special handling are expected to write functions which have the same diff --git a/pngwrite.c b/pngwrite.c index 1cdc9c397..4a9a41347 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,12 +1,12 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.0.0 + * libpng 1.0.0a * 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, Glenn Randers-Pehrson - * March 8, 1998 + * March 9, 1998 */ /* get internal access to png.h */ @@ -239,7 +239,7 @@ png_convert_to_rfc1123(png_structp png_ptr, png_timep ptime) { char near_time_buf[29]; sprintf(near_time_buf, "%d %s %d %02d:%02d:%02d +0000", - ptime->day % 31, short_months[ptime->month], + ptime->day % 31, short_months[ptime->month - 1], ptime->year, ptime->hour % 24, ptime->minute % 60, ptime->second % 61); png_memcpy(png_ptr->time_buffer, near_time_buf, @@ -247,7 +247,7 @@ png_convert_to_rfc1123(png_structp png_ptr, png_timep ptime) } #else sprintf(png_ptr->time_buffer, "%d %s %d %02d:%02d:%02d +0000", - ptime->day % 31, short_months[ptime->month], + ptime->day % 31, short_months[ptime->month - 1], ptime->year, ptime->hour % 24, ptime->minute % 60, ptime->second % 61); #endif diff --git a/pngwtran.c b/pngwtran.c index 0effc3974..fbf268985 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,12 +1,12 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * libpng 1.0.0 + * libpng 1.0.0a * 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, Glenn Randers-Pehrson - * March 8, 1998 + * March 9, 1998 */ #define PNG_INTERNAL diff --git a/pngwutil.c b/pngwutil.c index 459c932b5..2a76304e1 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,12 +1,12 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.0.0 + * libpng 1.0.0a * 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, Glenn Randers-Pehrson - * March 8, 1998 + * March 9, 1998 */ #define PNG_INTERNAL @@ -340,7 +340,7 @@ png_write_gAMA(png_structp png_ptr, double file_gamma) png_byte buf[4]; png_debug(1, "in png_write_gAMA\n"); - /* file_gamma is saved in 1/100,000ths */ + /* file_gamma is saved in 1/1000000ths */ igamma = (png_uint_32)(file_gamma * 100000.0 + 0.5); png_save_uint_32(buf, igamma); png_write_chunk(png_ptr, png_gAMA, buf, (png_size_t)4); @@ -426,7 +426,7 @@ png_write_cHRM(png_structp png_ptr, double white_x, double white_y, png_byte buf[32]; png_debug(1, "in png_write_cHRM\n"); - /* each value is saved int 1/100,000ths */ + /* each value is saved int 1/1000000ths */ if (white_x < 0 || white_x > 0.8 || white_y < 0 || white_y > 0.8 || white_x + white_y > 1.0) { |