mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[libpng16] Imported from libpng-1.6.11beta02.tar

Browse Source
This commit is contained in:
Glenn Randers-Pehrson
2014-03-25 10:31:12 -05:00
parent 804c76b47b
commit 6b570f11e1
16 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ANNOUNCE
View File

@@ -1,5 +1,5 @@
Libpng 1.6.11beta02 - March 22, 2014 Libpng 1.6.11beta02 - March 25, 2014
This is not intended to be a public release. It will be replaced 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. within a few weeks by a public version or by another test version.
@@ -31,7 +31,7 @@ Version 1.6.11beta01 [March 17, 2014]
Changed ZlibSrcDir from 1.2.5 to 1.2.8 in projects/vstudio. Changed ZlibSrcDir from 1.2.5 to 1.2.8 in projects/vstudio.
Moved configuration information from the manual to the INSTALL file. Moved configuration information from the manual to the INSTALL file.
Version 1.6.11beta02 [March 22, 2014] Version 1.6.11beta02 [March 25, 2014]
Removed #if/#else/#endif from inside two pow() calls in pngvalid.c because Removed #if/#else/#endif from inside two pow() calls in pngvalid.c because
they were handled improperly by Portland Group's PGI-14.1 - PGI-14.3 they were handled improperly by Portland Group's PGI-14.1 - PGI-14.3
when using its "__builtin_pow()" function. when using its "__builtin_pow()" function.

2
CHANGES
View File

@@ -4880,7 +4880,7 @@ Version 1.6.11beta01 [March 17, 2014]
Changed ZlibSrcDir from 1.2.5 to 1.2.8 in projects/vstudio. Changed ZlibSrcDir from 1.2.5 to 1.2.8 in projects/vstudio.
Moved configuration information from the manual to the INSTALL file. Moved configuration information from the manual to the INSTALL file.
Version 1.6.11beta02 [March 22, 2014] Version 1.6.11beta02 [March 25, 2014]
Removed #if/#else/#endif from inside two pow() calls in pngvalid.c because Removed #if/#else/#endif from inside two pow() calls in pngvalid.c because
they were handled improperly by Portland Group's PGI-14.1 - PGI-14.3 they were handled improperly by Portland Group's PGI-14.1 - PGI-14.3
when using its "__builtin_pow()" function. when using its "__builtin_pow()" function.

4
LICENSE
View File

@@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license. This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.6.11beta02, March 17, 2014, are libpng versions 1.2.6, August 15, 2004, through 1.6.11beta02, March 25, 2014, are
Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5 distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors 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 Glenn Randers-Pehrson
glennrp at users.sourceforge.net glennrp at users.sourceforge.net
March 17, 2014 March 25, 2014

2
README
View File

@@ -1,4 +1,4 @@
README for libpng version 1.6.11beta02 - March 17, 2014 (shared library 16.0) README for libpng version 1.6.11beta02 - March 25, 2014 (shared library 16.0)
See the note about version numbers near the top of png.h See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng. See INSTALL for instructions on how to install libpng.

28
contrib/libtests/pngvalid.c
View File

@@ -386,9 +386,9 @@ next_format(png_bytep colour_type, png_bytep bit_depth,
/* Palette images are restricted to 8 bit depth */ /* Palette images are restricted to 8 bit depth */
if (*bit_depth <= 8 if (*bit_depth <= 8
# ifdef DO_16BIT #ifdef DO_16BIT
|| (*colour_type != 3 && *bit_depth <= 16) || (*colour_type != 3 && *bit_depth <= 16)
# endif #endif
) )
return 1; return 1;
@@ -3155,10 +3155,10 @@ init_standard_palette(png_store *ps, png_structp pp, png_infop pi, int npalette,
for (; i<256; ++i) for (; i<256; ++i)
tRNS[i] = 24; tRNS[i] = 24;
# ifdef PNG_WRITE_tRNS_SUPPORTED # ifdef PNG_WRITE_tRNS_SUPPORTED
if (j > 0) if (j > 0)
png_set_tRNS(pp, pi, tRNS, j, 0/*color*/); png_set_tRNS(pp, pi, tRNS, j, 0/*color*/);
# endif # endif
} }
} }
@@ -6777,13 +6777,13 @@ image_transform_png_set_rgb_to_gray_ini(PNG_CONST image_transform *this,
* +/-(1<<(15-PNG_MAX_GAMMA_8)) in the 8-bit case. * +/-(1<<(15-PNG_MAX_GAMMA_8)) in the 8-bit case.
*/ */
that->pm->limit += that->pm->limit +=
# if PNG_MAX_GAMMA_8 < 14 # if PNG_MAX_GAMMA_8 < 14
pow((that->this.bit_depth == 16 ? 8. : pow((that->this.bit_depth == 16 ?
6. + (1<<(15-PNG_MAX_GAMMA_8)))/65535, data.gamma); 8. : 6. + (1<<(15-PNG_MAX_GAMMA_8)))/65535, data.gamma);
# else # else
pow((that->this.bit_depth == 16 ? 8. : pow((that->this.bit_depth == 16 ?
8. + (1<<(15-PNG_MAX_GAMMA_8)))/65535, data.gamma); 8. : 8. + (1<<(15-PNG_MAX_GAMMA_8)))/65535, data.gamma);
# endif # endif
} }
else else
@@ -6802,11 +6802,11 @@ image_transform_png_set_rgb_to_gray_ini(PNG_CONST image_transform *this,
* pngvalid on the output errors. * pngvalid on the output errors.
*/ */
that->pm->limit += that->pm->limit +=
# if DIGITIZE # if DIGITIZE
pow(1.1 /255, data.gamma); pow(1.1 /255, data.gamma);
# else # else
pow(1.0 /255, data.gamma); pow(1.0 /255, data.gamma);
# endif # endif
} }
} }

8
libpng-manual.txt
View File

@@ -1,6 +1,6 @@
libpng-manual.txt - A description on how to use and modify libpng libpng-manual.txt - A description on how to use and modify libpng
libpng version 1.6.11beta02 - March 17, 2014 libpng version 1.6.11beta02 - March 25, 2014
Updated and distributed by Glenn Randers-Pehrson Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net> <glennrp at users.sourceforge.net>
Copyright (c) 1998-2014 Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on: Based on:
libpng versions 0.97, January 1998, through 1.6.11beta02 - March 17, 2014 libpng versions 0.97, January 1998, through 1.6.11beta02 - March 25, 2014
Updated and distributed by Glenn Randers-Pehrson Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -4293,6 +4293,8 @@ zlib.h for more information on what these mean.
png_set_compression_method(png_ptr, method); png_set_compression_method(png_ptr, method);
This controls the size of the IDAT chunks (default 8192):
png_set_compression_buffer_size(png_ptr, size); png_set_compression_buffer_size(png_ptr, size);
As of libpng version 1.5.4, additional APIs became As of libpng version 1.5.4, additional APIs became
@@ -5260,7 +5262,7 @@ Other rules can be inferred by inspecting the libpng source.
XVI. Y2K Compliance in libpng XVI. Y2K Compliance in libpng
March 17, 2014 March 25, 2014
Since the PNG Development group is an ad-hoc body, we can't make Since the PNG Development group is an ad-hoc body, we can't make
an official declaration. an official declaration.

16
libpng.3
View File

@@ -1,4 +1,4 @@
.TH LIBPNG 3 "March 17, 2014" .TH LIBPNG 3 "March 25, 2014"
.SH NAME .SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.11beta02 libpng \- Portable Network Graphics (PNG) Reference Library 1.6.11beta02
.SH SYNOPSIS .SH SYNOPSIS
@@ -504,7 +504,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
.SH LIBPNG.TXT .SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng libpng-manual.txt - A description on how to use and modify libpng
libpng version 1.6.11beta02 - March 17, 2014 libpng version 1.6.11beta02 - March 25, 2014
Updated and distributed by Glenn Randers-Pehrson Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net> <glennrp at users.sourceforge.net>
Copyright (c) 1998-2014 Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on: Based on:
libpng versions 0.97, January 1998, through 1.6.11beta02 - March 17, 2014 libpng versions 0.97, January 1998, through 1.6.11beta02 - March 25, 2014
Updated and distributed by Glenn Randers-Pehrson Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -4797,6 +4797,8 @@ zlib.h for more information on what these mean.
png_set_compression_method(png_ptr, method); png_set_compression_method(png_ptr, method);
This controls the size of the IDAT chunks (default 8192):
png_set_compression_buffer_size(png_ptr, size); png_set_compression_buffer_size(png_ptr, size);
As of libpng version 1.5.4, additional APIs became As of libpng version 1.5.4, additional APIs became
@@ -5764,7 +5766,7 @@ Other rules can be inferred by inspecting the libpng source.
.SH XVI. Y2K Compliance in libpng .SH XVI. Y2K Compliance in libpng
March 17, 2014 March 25, 2014
Since the PNG Development group is an ad-hoc body, we can't make Since the PNG Development group is an ad-hoc body, we can't make
an official declaration. an official declaration.
@@ -6061,7 +6063,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation. Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.6.11beta02 - March 17, 2014: Libpng version 1.6.11beta02 - March 25, 2014:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -6084,7 +6086,7 @@ this sentence.
This code is released under the libpng license. This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.6.11beta02, March 17, 2014, are libpng versions 1.2.6, August 15, 2004, through 1.6.11beta02, March 25, 2014, are
Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5 distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors with the following individual added to the list of Contributing Authors
@@ -6183,7 +6185,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson Glenn Randers-Pehrson
glennrp at users.sourceforge.net glennrp at users.sourceforge.net
March 17, 2014 March 25, 2014
.\" end of man page .\" end of man page

2
libpngpf.3
View File

@@ -1,4 +1,4 @@
.TH LIBPNGPF 3 "March 17, 2014" .TH LIBPNGPF 3 "March 25, 2014"
.SH NAME .SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.11beta02 libpng \- Portable Network Graphics (PNG) Reference Library 1.6.11beta02
(private functions) (private functions)

2
png.5
View File

@@ -1,4 +1,4 @@
.TH PNG 5 "March 17, 2014" .TH PNG 5 "March 25, 2014"
.SH NAME .SH NAME
png \- Portable Network Graphics (PNG) format png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION .SH DESCRIPTION

4
png.c
View File

@@ -773,13 +773,13 @@ png_get_copyright(png_const_structrp png_ptr)
#else #else
# ifdef __STDC__ # ifdef __STDC__
return PNG_STRING_NEWLINE \ return PNG_STRING_NEWLINE \
"libpng version 1.6.11beta02 - March 22, 2014" PNG_STRING_NEWLINE \ "libpng version 1.6.11beta02 - March 25, 2014" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2014 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2014 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
PNG_STRING_NEWLINE; PNG_STRING_NEWLINE;
# else # else
return "libpng version 1.6.11beta02 - March 22, 2014\ return "libpng version 1.6.11beta02 - March 25, 2014\
Copyright (c) 1998-2014 Glenn Randers-Pehrson\ Copyright (c) 1998-2014 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; 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 /* png.h - header file for PNG reference library
* *
* libpng version 1.6.11beta02 - March 17, 2014 * libpng version 1.6.11beta02 - March 25, 2014
* Copyright (c) 1998-2014 Glenn Randers-Pehrson * Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -11,7 +11,7 @@
* Authors and maintainers: * Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * 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.89c, June 1996, through 0.96, May 1997: Andreas Dilger
* libpng versions 0.97, January 1998, through 1.6.11beta02 - March 17, 2014: Glenn * libpng versions 0.97, January 1998, through 1.6.11beta02 - March 25, 2014: Glenn
* See also "Contributing Authors", below. * See also "Contributing Authors", below.
* *
* Note about libpng version numbers: * Note about libpng version numbers:
@@ -227,7 +227,7 @@
* *
* This code is released under the libpng license. * This code is released under the libpng license.
* *
* libpng versions 1.2.6, August 15, 2004, through 1.6.11beta02, March 17, 2014, are * libpng versions 1.2.6, August 15, 2004, through 1.6.11beta02, March 25, 2014, are
* Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are * Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are
* distributed according to the same disclaimer and license as libpng-1.2.5 * distributed according to the same disclaimer and license as libpng-1.2.5
* with the following individual added to the list of Contributing Authors: * with the following individual added to the list of Contributing Authors:
@@ -339,7 +339,7 @@
* Y2K compliance in libpng: * Y2K compliance in libpng:
* ========================= * =========================
* *
* March 17, 2014 * March 25, 2014
* *
* Since the PNG Development group is an ad-hoc body, we can't make * Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration. * an official declaration.
@@ -409,7 +409,7 @@
/* Version information for png.h - this should match the version in png.c */ /* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.11beta02" #define PNG_LIBPNG_VER_STRING "1.6.11beta02"
#define PNG_HEADER_VERSION_STRING \ #define PNG_HEADER_VERSION_STRING \
" libpng version 1.6.11beta02 - March 17, 2014\n" " libpng version 1.6.11beta02 - March 25, 2014\n"
#define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16 #define PNG_LIBPNG_VER_DLLNUM 16

2
pngconf.h
View File

@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng /* pngconf.h - machine configurable file for libpng
* *
* libpng version 1.6.11beta02 - March 17, 2014 * libpng version 1.6.11beta02 - March 25, 2014
* *
* Copyright (c) 1998-2013 Glenn Randers-Pehrson * Copyright (c) 1998-2013 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

2
projects/vstudio/readme.txt
View File

@@ -1,7 +1,7 @@
VisualStudio instructions VisualStudio instructions
libpng version 1.6.11beta02 - March 17, 2014 libpng version 1.6.11beta02 - March 25, 2014
Copyright (c) 1998-2010 Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson

2
projects/vstudio/zlib.props
View File

@@ -2,7 +2,7 @@
<!-- <!--
* zlib.props - location of zlib source * zlib.props - location of zlib source
* *
* libpng version 1.6.11beta02 - March 17, 2014 * libpng version 1.6.11beta02 - March 25, 2014
* *
* Copyright (c) 1998-2011 Glenn Randers-Pehrson * Copyright (c) 1998-2011 Glenn Randers-Pehrson
* *

2
scripts/README.txt
View File

@@ -1,5 +1,5 @@
Makefiles for libpng version 1.6.11beta02 - March 22, 2014 Makefiles for libpng version 1.6.11beta02 - March 25, 2014
pnglibconf.h.prebuilt => Stores configuration settings pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile makefile.linux => Linux/ELF makefile

2
scripts/pnglibconf.h.prebuilt
View File

@@ -2,7 +2,7 @@
/* pnglibconf.h - library build configuration */ /* pnglibconf.h - library build configuration */
/* Libpng version 1.6.11beta02 - March 22, 2014 */ /* Libpng version 1.6.11beta02 - March 25, 2014 */
/* Copyright (c) 1998-2013 Glenn Randers-Pehrson */ /* Copyright (c) 1998-2013 Glenn Randers-Pehrson */