diff --git a/example.c b/example.c index 8c5d87b66..b79d8413c 100644 --- a/example.c +++ b/example.c @@ -271,6 +271,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */ png_set_gamma(png_ptr, screen_gamma, 0.45455); } +#ifdef PNG_READ_DITHER_SUPPORTED /* Dither RGB files down to 8 bit palette or reduce palettes * to the number of colors available on your screen. */ @@ -299,6 +300,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */ max_screen_colors, histogram, 0); } } +#endif /* PNG_READ_DITHER_SUPPORTED */ /* Invert monochrome files to have 0 as white and 1 as black */ png_set_invert_mono(png_ptr); diff --git a/libpng-1.4.2rc01.txt b/libpng-1.4.2rc01.txt index 874c25032..6b608e764 100644 --- a/libpng-1.4.2rc01.txt +++ b/libpng-1.4.2rc01.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.2rc01 - April 10, 2010 + libpng version 1.4.2rc02 - April 14, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.2rc01 - April 10, 2010 + libpng versions 0.97, January 1998, through 1.4.2rc02 - April 14, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -899,7 +899,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.4.2rc01, not all possible expansions are supported. +As of libpng version 1.4.2rc02, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -3105,6 +3105,11 @@ The png_zalloc() and png_zfree() functions are no longer exported. The png_zalloc() function no longer zeroes out the memory that it allocates. +Support for dithering was removed by default, because it has never +been well tested and doesn't work very well. The code has not +been removed, however, and can be enabled by building libpng with +PNG_READ_DITHER_SUPPORTED defined. + We removed the trailing '.' from the warning and error messages. X. Detecting libpng @@ -3245,13 +3250,13 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -April 10, 2010 +April 14, 2010 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.4.2rc01 are Y2K compliant. It is my belief that earlier +upward through 1.4.2rc02 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/libpng.3 b/libpng.3 index a483d79f6..f8320aeca 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "April 10, 2010" +.TH LIBPNG 3 "April 14, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.2rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.2rc02 .SH SYNOPSIS \fI\fB @@ -785,7 +785,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.4.2rc01 - April 10, 2010 + libpng version 1.4.2rc02 - April 14, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -796,7 +796,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.2rc01 - April 10, 2010 + libpng versions 0.97, January 1998, through 1.4.2rc02 - April 14, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -1684,7 +1684,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.4.2rc01, not all possible expansions are supported. +As of libpng version 1.4.2rc02, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -3890,6 +3890,11 @@ The png_zalloc() and png_zfree() functions are no longer exported. The png_zalloc() function no longer zeroes out the memory that it allocates. +Support for dithering was removed by default, because it has never +been well tested and doesn't work very well. The code has not +been removed, however, and can be enabled by building libpng with +PNG_READ_DITHER_SUPPORTED defined. + We removed the trailing '.' from the warning and error messages. .SH X. Detecting libpng @@ -4030,13 +4035,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -April 10, 2010 +April 14, 2010 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.4.2rc01 are Y2K compliant. It is my belief that earlier +upward through 1.4.2rc02 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 @@ -4270,7 +4275,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.2rc01 - April 10, 2010: +Libpng version 1.4.2rc02 - April 14, 2010: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4293,7 +4298,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.2rc01, April 10, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.4.2rc02, April 14, 2010, are Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -4392,7 +4397,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 10, 2010 +April 14, 2010 .\" end of man page diff --git a/pngrtran.c b/pngrtran.c index 898152599..497f72313 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.4.1 [April 10, 2010] + * Last changed in libpng 1.4.1 [April 14, 2010] * Copyright (c) 1998-2010 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.) @@ -536,7 +536,7 @@ png_set_dither(png_structp png_ptr, png_colorp palette, png_free(png_ptr, distance); } } -#endif +#endif /* PNG_READ_DITHER_SUPPORTED */ #if defined(PNG_READ_GAMMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED) /* Transform the image from the file_gamma to the screen_gamma. We