[devel] Imported from libpng-1.5.5beta04.tar

This commit is contained in:
Glenn Randers-Pehrson 2011-07-29 12:22:38 -05:00
parent 6c98897a64
commit 99ffac0838
11 changed files with 35 additions and 24 deletions

View File

@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.5.5beta04, July 27, 2011, are
libpng versions 1.2.6, August 15, 2004, through 1.5.5beta04, July 29, 2011, are
Copyright (c) 2004, 2006-2011 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
@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
July 27, 2011
July 29, 2011

2
README
View File

@ -1,4 +1,4 @@
README for libpng version 1.5.5beta04 - July 27, 2011 (shared library 15.0)
README for libpng version 1.5.5beta04 - July 29, 2011 (shared library 15.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.

View File

@ -1,4 +1,4 @@
.TH LIBPNGPF 3 "July 27, 2011"
.TH LIBPNGPF 3 "July 29, 2011"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.5beta04
(private functions)

2
png.5
View File

@ -1,4 +1,4 @@
.TH PNG 5 "July 27, 2011"
.TH PNG 5 "July 29, 2011"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION

4
png.c
View File

@ -617,13 +617,13 @@ png_get_copyright(png_const_structp png_ptr)
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
"libpng version 1.5.5beta04 - July 27, 2011" PNG_STRING_NEWLINE \
"libpng version 1.5.5beta04 - July 29, 2011" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2011 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
PNG_STRING_NEWLINE;
# else
return "libpng version 1.5.5beta04 - July 27, 2011\
return "libpng version 1.5.5beta04 - July 29, 2011\
Copyright (c) 1998-2011 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";

10
png.h
View File

@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.5.5beta04 - July 27, 2011
* libpng version 1.5.5beta04 - July 29, 2011
* Copyright (c) 1998-2011 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.)
@ -11,7 +11,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.5.5beta04 - July 27, 2011: Glenn
* libpng versions 0.97, January 1998, through 1.5.5beta04 - July 29, 2011: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@ -189,7 +189,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.2.6, August 15, 2004, through 1.5.5beta04, July 27, 2011, are
* libpng versions 1.2.6, August 15, 2004, through 1.5.5beta04, July 29, 2011, are
* Copyright (c) 2004, 2006-2011 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:
@ -301,7 +301,7 @@
* Y2K compliance in libpng:
* =========================
*
* July 27, 2011
* July 29, 2011
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@ -364,7 +364,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.5.5beta04"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.5.5beta04 - July 27, 2011\n"
" libpng version 1.5.5beta04 - July 29, 2011\n"
#define PNG_LIBPNG_VER_SONUM 15
#define PNG_LIBPNG_VER_DLLNUM 15

View File

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.5.5beta04 - July 27, 2011
* libpng version 1.5.5beta04 - July 29, 2011
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -3066,22 +3066,33 @@ png_do_gray_to_rgb(png_row_infop row_info, png_bytep row)
#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
/* Reduce RGB files to grayscale, with or without alpha
* using the equation given in Poynton's ColorFAQ at
* <http://www.inforamp.net/~poynton/> (THIS LINK IS DEAD June 2008)
* New link:
* <http://www.poynton.com/notes/colour_and_gamma/>
* using the equation given in Poynton's ColorFAQ of 1998-01-04 at
* <http://www.inforamp.net/~poynton/> (THIS LINK IS DEAD June 2008 but
* versions dated 1998 through November 2002 have been archived at
* http://web.archive.org/web/20000816232553/http://www.inforamp.net/
* ~poynton/notes/colour_and_gamma/ColorFAQ.txt )
* Charles Poynton poynton at poynton.com
*
* Y = 0.212671 * R + 0.715160 * G + 0.072169 * B
*
* We approximate this with
*
* Y = 0.21268 * R + 0.7151 * G + 0.07217 * B
*
* which can be expressed with integers as
*
* Y = (6969 * R + 23434 * G + 2365 * B)/32768
*
* Poynton's current link (as of January 2003 through July 2011):
* <http://www.poynton.com/notes/colour_and_gamma/>
* has changed the numbers slightly:
*
* Y = 0.2126*R + 0.7152*G + 0.0722*B
*
* which can be expressed with integers as
*
* Y = (6966 * R + 23436 * G + 2366 * B)/32768
*
* We use the approximation
*
* Y = (6968 * R + 23434 * G + 2366 * B)/32768
*
* The calculation is to be done in a linear colorspace.
*
* Other integer coefficents can be used via png_set_rgb_to_gray().

View File

@ -1,7 +1,7 @@
VisualStudio instructions
libpng version 1.5.5beta04 - July 27, 2011
libpng version 1.5.5beta04 - July 29, 2011
Copyright (c) 1998-2010 Glenn Randers-Pehrson

View File

@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
* libpng version 1.5.5beta04 - July 27, 2011
* libpng version 1.5.5beta04 - July 29, 2011
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*

View File

@ -1,5 +1,5 @@
Makefiles for libpng version 1.5.5beta04 - July 27, 2011
Makefiles for libpng version 1.5.5beta04 - July 29, 2011
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile