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

[libpng15] Imported from libpng-1.5.13beta02.tar

Browse Source
This commit is contained in:
Glenn Randers-Pehrson
2012-09-10 11:24:27 -05:00
parent 95ea04f925
commit 95dc198c1f
18 changed files with 601 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ANNOUNCE
View File

@@ -1,5 +1,5 @@
Libpng 1.5.13beta02 - August 10, 2012 Libpng 1.5.13beta02 - September 10, 2012
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.
@@ -32,7 +32,7 @@ Version 1.5.13beta01 [August 8, 2012]
Revised PNG_FP_EXPORT and PNG_FIXED_EXPORT macros to avoid generating Revised PNG_FP_EXPORT and PNG_FIXED_EXPORT macros to avoid generating
lone semicolons (patch ported from libpng-1.6.0beta11). lone semicolons (patch ported from libpng-1.6.0beta11).
Version 1.5.13beta02 [August 10, 2012] Version 1.5.13beta02 [September 10, 2012]
Corrected handling of the image array and the row_pointers array in example.c Corrected handling of the image array and the row_pointers array in example.c
When png_set_filler is used to strip a filler channel during write, the When png_set_filler is used to strip a filler channel during write, the
code prior to 1.5 would ignore the case where the output required an code prior to 1.5 would ignore the case where the output required an

2
CHANGES
View File

@@ -3902,7 +3902,7 @@ Version 1.5.13beta01 [August 8, 2012]
Revised PNG_FP_EXPORT and PNG_FIXED_EXPORT macros to avoid generating Revised PNG_FP_EXPORT and PNG_FIXED_EXPORT macros to avoid generating
lone semicolons (patch ported from libpng-1.6.0beta11). lone semicolons (patch ported from libpng-1.6.0beta11).
Version 1.5.13beta02 [August 10, 2012] Version 1.5.13beta02 [September 10, 2012]
Corrected handling of the image array and the row_pointers array in example.c Corrected handling of the image array and the row_pointers array in example.c
When png_set_filler is used to strip a filler channel during write, the When png_set_filler is used to strip a filler channel during write, the
code prior to 1.5 would ignore the case where the output required an code prior to 1.5 would ignore the case where the output required an

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.5.13beta02, August 8, 2012, are libpng versions 1.2.6, August 15, 2004, through 1.5.13beta02, September 10, 2012, are
Copyright (c) 2004, 2006-2012 Glenn Randers-Pehrson, and are Copyright (c) 2004, 2006-2012 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
August 8, 2012 September 10, 2012

2
README
View File

@@ -1,4 +1,4 @@
README for libpng version 1.5.13beta02 - August 8, 2012 (shared library 15.0) README for libpng version 1.5.13beta02 - September 10, 2012 (shared library 15.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.

54
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.5.13beta02 - August 16, 2012 libpng version 1.5.13beta02 - September 10, 2012
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-2012 Glenn Randers-Pehrson Copyright (c) 1998-2012 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.5.13beta02 - August 16, 2012 libpng versions 0.97, January 1998, through 1.5.13beta02 - September 10, 2012
Updated and distributed by Glenn Randers-Pehrson Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2012 Glenn Randers-Pehrson Copyright (c) 1998-2012 Glenn Randers-Pehrson
@@ -723,11 +723,11 @@ Libpng only supports composing onto a single color (using png_set_background;
see below). Otherwise you must do the composition yourself and, in this case, see below). Otherwise you must do the composition yourself and, in this case,
you may need to call png_set_alpha_mode: you may need to call png_set_alpha_mode:
#if PNG_LIBPNG_VER >= 10504 #if PNG_LIBPNG_VER >= 10504
png_set_alpha_mode(png_ptr, mode, screen_gamma); png_set_alpha_mode(png_ptr, mode, screen_gamma);
#else #else
png_set_gamma(png_ptr, screen_gamma, 1.0/screen_gamma); png_set_gamma(png_ptr, screen_gamma, 1.0/screen_gamma);
#endif #endif
The screen_gamma value is the same as the argument to png_set_gamma; however, The screen_gamma value is the same as the argument to png_set_gamma; however,
how it affects the output depends on the mode. png_set_alpha_mode() sets the how it affects the output depends on the mode. png_set_alpha_mode() sets the
@@ -1152,8 +1152,8 @@ gamma when combining semitransparent pixels with the background color.
int_file_gamma - 100,000 times the gamma at which the int_file_gamma - 100,000 times the gamma at which the
file is written file is written
png_get_cHRM(png_ptr, info_ptr, &white_x, &white_y, &red_x, &red_y, png_get_cHRM(png_ptr, info_ptr, &white_x, &white_y, &red_x,
&green_x, &green_y, &blue_x, &blue_y) &red_y, &green_x, &green_y, &blue_x, &blue_y)
png_get_cHRM_XYZ(png_ptr, info_ptr, &red_X, &red_Y, &red_Z, &green_X, png_get_cHRM_XYZ(png_ptr, info_ptr, &red_X, &red_Y, &red_Z, &green_X,
&green_Y, &green_Z, &blue_X, &blue_Y, &blue_Z) &green_Y, &green_Z, &blue_X, &blue_Y, &blue_Z)
png_get_cHRM_fixed(png_ptr, info_ptr, &int_white_x, &int_white_y, png_get_cHRM_fixed(png_ptr, info_ptr, &int_white_x, &int_white_y,
@@ -1164,8 +1164,9 @@ gamma when combining semitransparent pixels with the background color.
&int_blue_X, &int_blue_Y, &int_blue_Z) &int_blue_X, &int_blue_Y, &int_blue_Z)
{white,red,green,blue}_{x,y} {white,red,green,blue}_{x,y}
A color space encoding specified using the chromaticities A color space encoding specified using the
of the end points and the white point. (PNG_INFO_cHRM) chromaticities of the end points and the
white point. (PNG_INFO_cHRM)
{red,green,blue}_{X,Y,Z} {red,green,blue}_{X,Y,Z}
A color space encoding specified using the encoding end A color space encoding specified using the encoding end
@@ -1576,17 +1577,19 @@ Within the matrix,
"A" means the transformation is obtained by png_set_add_alpha(). "A" means the transformation is obtained by png_set_add_alpha().
"X" means the transformation is obtained by png_set_expand(). "X" means the transformation is obtained by png_set_expand().
"1" means the transformation is obtained by "1" means the transformation is obtained by
png_set_expand_gray_1_2_4_to_8() (and by png_set_expand() if there png_set_expand_gray_1_2_4_to_8() (and by png_set_expand()
is no transparency in the original or the final format). if there is no transparency in the original or the final
format).
"C" means the transformation is obtained by png_set_gray_to_rgb(). "C" means the transformation is obtained by png_set_gray_to_rgb().
"G" means the transformation is obtained by png_set_rgb_to_gray(). "G" means the transformation is obtained by png_set_rgb_to_gray().
"P" means the transformation is obtained by "P" means the transformation is obtained by
png_set_expand_palette_to_rgb(). png_set_expand_palette_to_rgb().
"p" means the transformation is obtained by png_set_packing(). "p" means the transformation is obtained by png_set_packing().
"Q" means the transformation is obtained by png_set_quantize(). "Q" means the transformation is obtained by png_set_quantize().
"T" means the transformation is obtained by png_set_tRNS_to_alpha(). "T" means the transformation is obtained by
"B" means the transformation is obtained by png_set_background(), or png_set_tRNS_to_alpha().
png_strip_alpha(). "B" means the transformation is obtained by
png_set_background(), or png_strip_alpha().
When an entry has multiple transforms listed all are required to cause the When an entry has multiple transforms listed all are required to cause the
right overall transformation. When two transforms are separated by a comma right overall transformation. When two transforms are separated by a comma
@@ -1671,8 +1674,8 @@ with alpha.
if (color_type == PNG_COLOR_TYPE_RGB || if (color_type == PNG_COLOR_TYPE_RGB ||
color_type == PNG_COLOR_TYPE_RGB_ALPHA) color_type == PNG_COLOR_TYPE_RGB_ALPHA)
png_set_rgb_to_gray(png_ptr, error_action, double red_weight, png_set_rgb_to_gray(png_ptr, error_action,
double green_weight); double red_weight, double green_weight);
error_action = 1: silently do the conversion error_action = 1: silently do the conversion
@@ -1694,7 +1697,8 @@ with alpha.
In the corresponding fixed point API the red_weight and green_weight values are In the corresponding fixed point API the red_weight and green_weight values are
simply scaled by 100,000: simply scaled by 100,000:
png_set_rgb_to_gray(png_ptr, error_action, png_fixed_point red_weight, png_set_rgb_to_gray(png_ptr, error_action,
png_fixed_point red_weight,
png_fixed_point green_weight); png_fixed_point green_weight);
If you have set error_action = 1 or 2, you can If you have set error_action = 1 or 2, you can
@@ -3028,8 +3032,8 @@ tEXt chunk use RFC 1123 format dates (e.g. "22 May 1997 18:07:10 GMT"),
although this isn't a requirement. Unlike the tIME chunk, the although this isn't a requirement. Unlike the tIME chunk, the
"Creation Time" tEXt chunk is not expected to be automatically changed "Creation Time" tEXt chunk is not expected to be automatically changed
by the software. To facilitate the use of RFC 1123 dates, a function by the software. To facilitate the use of RFC 1123 dates, a function
png_convert_to_rfc1123(png_timep) is provided to convert from PNG png_convert_to_rfc1123(png_ptr, png_timep) is provided to convert
time to an RFC 1123 format string. from PNG time to an RFC 1123 format string.
Writing unknown chunks Writing unknown chunks
@@ -3391,7 +3395,7 @@ png_destroy_write_struct().
The default behavior is only to free data that was allocated internally The default behavior is only to free data that was allocated internally
by libpng. This can be changed, so that libpng will not free the data, by libpng. This can be changed, so that libpng will not free the data,
or so that it will free data that was allocated by the user with png_malloc() or so that it will free data that was allocated by the user with png_malloc()
and passed in via a png_set_*() function, with or png_calloc() and passed in via a png_set_*() function, with
png_data_freer(png_ptr, info_ptr, freer, mask) png_data_freer(png_ptr, info_ptr, freer, mask)
@@ -4164,8 +4168,8 @@ A. Changes that affect users of libpng
There are no substantial API changes between the non-deprecated parts of There are no substantial API changes between the non-deprecated parts of
the 1.4.5 API and the 1.5.0 API; however, the ability to directly access the 1.4.5 API and the 1.5.0 API; however, the ability to directly access
the main libpng control structures, png_struct and png_info, deprecated members of the main libpng control structures, png_struct and png_info,
in earlier versions of libpng, has been completely removed from deprecated in earlier versions of libpng, has been completely removed from
libpng 1.5. libpng 1.5.
We no longer include zlib.h in png.h. Applications that need access We no longer include zlib.h in png.h. Applications that need access
@@ -4608,7 +4612,7 @@ Other rules can be inferred by inspecting the libpng source.
XIV. Y2K Compliance in libpng XIV. Y2K Compliance in libpng
August 16, 2012 September 10, 2012
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.

577
libpng.3
View File

File diff suppressed because it is too large Load Diff

14
libpngpf.3
View File

@@ -1,11 +1,21 @@
.TH LIBPNGPF 3 "August 16, 2012" .TH LIBPNGPF 3 "September 10, 2012"
.SH NAME .SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.13beta02 libpng \- Portable Network Graphics (PNG) Reference Library 1.5.13beta02
(private functions) (private functions)
.SH SYNOPSIS .SH SYNOPSIS
\fB#include \fI"pngpriv.h" \fB#include \fI"pngpriv.h"
\fBAs of libpng version \fP\fI1.5.1\fP\fB, this section is no longer \fP\fImaintained\fP\fB, now that the private function prototypes are hidden in pngpriv.h and not accessible to applications. Look in pngpriv.h for the prototypes and a short description of each \fIfunction. \fI\fB
\fBAs of libpng version \fP\fI1.5.1\fP\fB, this section is no longer \fP\fImaintained\fP\fB, now \fIthat
\fBthe private function prototypes are hidden in pngpriv.h and not \fIaccessible
\fBto applications. Look in pngpriv.h for the prototypes and a short \fIdescription
\fBof each \fIfunction.
\fI\fB
.SH DESCRIPTION .SH DESCRIPTION
The functions previously listed here are used privately by libpng The functions previously listed here are used privately by libpng

2
png.5
View File

@@ -1,4 +1,4 @@
.TH PNG 5 "August 8, 2012" .TH PNG 5 "September 10, 2012"
.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

@@ -655,13 +655,13 @@ png_get_copyright(png_const_structp png_ptr)
#else #else
# ifdef __STDC__ # ifdef __STDC__
return PNG_STRING_NEWLINE \ return PNG_STRING_NEWLINE \
"libpng version 1.5.13beta02 - August 8, 2012" PNG_STRING_NEWLINE \ "libpng version 1.5.13beta02 - September 10, 2012" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2012 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2012 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.5.13beta02 - August 8, 2012\ return "libpng version 1.5.13beta02 - September 10, 2012\
Copyright (c) 1998-2012 Glenn Randers-Pehrson\ Copyright (c) 1998-2012 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.5.13beta02 - August 8, 2012 * libpng version 1.5.13beta02 - September 10, 2012
* Copyright (c) 1998-2012 Glenn Randers-Pehrson * Copyright (c) 1998-2012 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.5.13beta02 - August 8, 2012: Glenn * libpng versions 0.97, January 1998, through 1.5.13beta02 - September 10, 2012: Glenn
* See also "Contributing Authors", below. * See also "Contributing Authors", below.
* *
* Note about libpng version numbers: * Note about libpng version numbers:
@@ -210,7 +210,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.5.13beta02, August 8, 2012, are * libpng versions 1.2.6, August 15, 2004, through 1.5.13beta02, September 10, 2012, are
* Copyright (c) 2004, 2006-2012 Glenn Randers-Pehrson, and are * Copyright (c) 2004, 2006-2012 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:
@@ -322,7 +322,7 @@
* Y2K compliance in libpng: * Y2K compliance in libpng:
* ========================= * =========================
* *
* August 8, 2012 * September 10, 2012
* *
* 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.
@@ -389,7 +389,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.5.13beta02" #define PNG_LIBPNG_VER_STRING "1.5.13beta02"
#define PNG_HEADER_VERSION_STRING \ #define PNG_HEADER_VERSION_STRING \
" libpng version 1.5.13beta02 - August 8, 2012\n" " libpng version 1.5.13beta02 - September 10, 2012\n"
#define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_SONUM 15
#define PNG_LIBPNG_VER_DLLNUM 15 #define PNG_LIBPNG_VER_DLLNUM 15

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.5.13beta02 - August 8, 2012 * libpng version 1.5.13beta02 - September 10, 2012
* *
* Copyright (c) 1998-2012 Glenn Randers-Pehrson * Copyright (c) 1998-2012 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.5.13beta02 - August 8, 2012 libpng version 1.5.13beta02 - September 10, 2012
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.5.13beta02 - August 8, 2012 * libpng version 1.5.13beta02 - September 10, 2012
* *
* 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.5.13beta02 - August 8, 2012 Makefiles for libpng version 1.5.13beta02 - September 10, 2012
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

@@ -3,7 +3,7 @@
/* pnglibconf.h - library build configuration */ /* pnglibconf.h - library build configuration */
/* Libpng 1.5.13beta02 - August 8, 2012 */ /* Libpng 1.5.13beta02 - September 10, 2012 */
/* Copyright (c) 1998-2012 Glenn Randers-Pehrson */ /* Copyright (c) 1998-2012 Glenn Randers-Pehrson */