mirror of
https://git.code.sf.net/p/libpng/code.git
synced 2025-07-10 18:04:09 +02:00
[libpng17] Rearranged png.h to put the major sections in the same order as
in libpng16.
This commit is contained in:
Glenn Randers-Pehrson
parent
e1ff1cc930
commit
47b6a93924
6
ANNOUNCE
6
ANNOUNCE
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
Libpng 1.7.0beta64 - June 10, 2015
|
Libpng 1.7.0beta64 - July 26, 2015
|
||||||
|
|
||||||
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.
|
||||||
@ -835,7 +835,7 @@ Version 1.7.0beta63 [June 6, 2015]
|
|||||||
to compile them without the minimum required support enabled
|
to compile them without the minimum required support enabled
|
||||||
(suggested by Flavio Medeiros).
|
(suggested by Flavio Medeiros).
|
||||||
|
|
||||||
Version 1.7.0beta64 [June 10, 2015]
|
Version 1.7.0beta64 [July 26, 2015]
|
||||||
Removed non-working progressive reader 'skip' function. This
|
Removed non-working progressive reader 'skip' function. This
|
||||||
function has apparently never been used. It was implemented
|
function has apparently never been used. It was implemented
|
||||||
to support back-door modification of png_struct in libpng-1.4.x
|
to support back-door modification of png_struct in libpng-1.4.x
|
||||||
@ -847,6 +847,8 @@ Version 1.7.0beta64 [June 10, 2015]
|
|||||||
file handling, define PNG_USE_MKSTEMP, otherwise "tmpfile()" will
|
file handling, define PNG_USE_MKSTEMP, otherwise "tmpfile()" will
|
||||||
be used.
|
be used.
|
||||||
Removed some unused WEIGHTED_FILTER macros from png.h and pngstruct.h
|
Removed some unused WEIGHTED_FILTER macros from png.h and pngstruct.h
|
||||||
|
Rearranged png.h to put the major sections in the same order as
|
||||||
|
in libpng16.
|
||||||
|
|
||||||
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
||||||
(subscription required; visit
|
(subscription required; visit
|
||||||
|
|||||||
7
CHANGES
7
CHANGES
@ -495,7 +495,7 @@ Version 1.0.3d [September 4, 1999]
|
|||||||
Added new png_expand functions to scripts/pngdef.pas and pngos2.def
|
Added new png_expand functions to scripts/pngdef.pas and pngos2.def
|
||||||
Added a demo read_user_transform_fn that examines the row filters in pngtest.c
|
Added a demo read_user_transform_fn that examines the row filters in pngtest.c
|
||||||
|
|
||||||
Version 1.0.4 [September 24, 1999]
|
Version 1.0.4 [September 24, 1999, not distributed publicly]
|
||||||
Define PNG_ALWAYS_EXTERN in pngconf.h if __STDC__ is defined
|
Define PNG_ALWAYS_EXTERN in pngconf.h if __STDC__ is defined
|
||||||
Delete #define PNG_INTERNAL and include "png.h" from pngasmrd.h
|
Delete #define PNG_INTERNAL and include "png.h" from pngasmrd.h
|
||||||
Made several minor corrections to pngtest.c
|
Made several minor corrections to pngtest.c
|
||||||
@ -522,6 +522,7 @@ Version 1.0.4c [October 1, 1999]
|
|||||||
Added a "png_check_version" function in png.c and pngtest.c that will generate
|
Added a "png_check_version" function in png.c and pngtest.c that will generate
|
||||||
a helpful compiler error if an old png.h is found in the search path.
|
a helpful compiler error if an old png.h is found in the search path.
|
||||||
Changed type of png_user_transform_depth|channels from int to png_byte.
|
Changed type of png_user_transform_depth|channels from int to png_byte.
|
||||||
|
Added "Libpng is OSI Certified Open Source Software" statement to png.h
|
||||||
|
|
||||||
Version 1.0.4d [October 6, 1999]
|
Version 1.0.4d [October 6, 1999]
|
||||||
Changed 0.45 to 0.45455 in png_set_sRGB()
|
Changed 0.45 to 0.45455 in png_set_sRGB()
|
||||||
@ -5130,7 +5131,7 @@ Version 1.7.0beta63 [June 6, 2015]
|
|||||||
to compile them without the minimum required support enabled
|
to compile them without the minimum required support enabled
|
||||||
(suggested by Flavio Medeiros).
|
(suggested by Flavio Medeiros).
|
||||||
|
|
||||||
Version 1.7.0beta64 [June 10, 2015]
|
Version 1.7.0beta64 [July 26, 2015]
|
||||||
Removed non-working progressive reader 'skip' function. This
|
Removed non-working progressive reader 'skip' function. This
|
||||||
function has apparently never been used. It was implemented
|
function has apparently never been used. It was implemented
|
||||||
to support back-door modification of png_struct in libpng-1.4.x
|
to support back-door modification of png_struct in libpng-1.4.x
|
||||||
@ -5142,6 +5143,8 @@ Version 1.7.0beta64 [June 10, 2015]
|
|||||||
file handling, define PNG_USE_MKSTEMP, otherwise "tmpfile()" will
|
file handling, define PNG_USE_MKSTEMP, otherwise "tmpfile()" will
|
||||||
be used.
|
be used.
|
||||||
Removed some unused WEIGHTED_FILTER macros from png.h and pngstruct.h
|
Removed some unused WEIGHTED_FILTER macros from png.h and pngstruct.h
|
||||||
|
Rearranged png.h to put the major sections in the same order as
|
||||||
|
in libpng16.
|
||||||
|
|
||||||
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
||||||
(subscription required; visit
|
(subscription required; visit
|
||||||
|
|||||||
149
png.h
149
png.h
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* png.h - header file for PNG reference library
|
/* png.h - header file for PNG reference library
|
||||||
*
|
*
|
||||||
* libpng version 1.7.0beta64, June 10, 2015
|
* libpng version 1.7.0beta64, July 26, 2015
|
||||||
*
|
*
|
||||||
* Copyright (c) 1998-2015 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2015 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
@ -11,8 +11,8 @@
|
|||||||
*
|
*
|
||||||
* 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.89, June 1996, through 0.96, May 1997: Andreas Dilger
|
||||||
* libpng versions 0.97, January 1998, through 1.7.0beta64, June 10, 2015: Glenn
|
* libpng versions 0.97, January 1998, through 1.7.0beta64, July 26, 2015: Glenn
|
||||||
* See also "Contributing Authors", below.
|
* See also "Contributing Authors", below.
|
||||||
*
|
*
|
||||||
* Note about libpng version numbers:
|
* Note about libpng version numbers:
|
||||||
@ -214,7 +214,11 @@
|
|||||||
* 1.6.16rc01-02 16 10616 16.so.16.16[.0]
|
* 1.6.16rc01-02 16 10616 16.so.16.16[.0]
|
||||||
* 1.6.16 16 10616 16.so.16.16[.0]
|
* 1.6.16 16 10616 16.so.16.16[.0]
|
||||||
* 1.6.17beta01-06 16 10617 16.so.16.17[.0]
|
* 1.6.17beta01-06 16 10617 16.so.16.17[.0]
|
||||||
* 1.6.17rc01 16 10617 16.so.16.17[.0]
|
* 1.6.17rc01-06 16 10617 16.so.16.17[.0]
|
||||||
|
* 1.6.17 16 10617 16.so.16.17[.0]
|
||||||
|
* 1.6.18beta01-09 16 10618 16.so.16.18[.0]
|
||||||
|
* 1.6.18rc01-03 16 10618 16.so.16.18[.0]
|
||||||
|
* 1.6.18 16 10618 16.so.16.18[.0]
|
||||||
* 1.7.0alpha01-10 17 10700 17.so.17.0[.0]
|
* 1.7.0alpha01-10 17 10700 17.so.17.0[.0]
|
||||||
* 1.7.0beta01-64 17 10700 17.so.17.0[.0]
|
* 1.7.0beta01-64 17 10700 17.so.17.0[.0]
|
||||||
*
|
*
|
||||||
@ -248,21 +252,16 @@
|
|||||||
*
|
*
|
||||||
* 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.7.0beta64, June 10, 2015, are
|
* libpng versions 1.0.7, July 1, 2000, through 1.7.0beta64, July 26, 2015, are
|
||||||
* Copyright (c) 2004, 2006-2015 Glenn Randers-Pehrson, and are
|
* Copyright (c) 2000-2002, 2004, 2006-2015 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:
|
|
||||||
*
|
|
||||||
* Cosmin Truta
|
|
||||||
*
|
|
||||||
* libpng versions 1.0.7, July 1, 2000, through 1.2.5, October 3, 2002, are
|
|
||||||
* Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
|
|
||||||
* distributed according to the same disclaimer and license as libpng-1.0.6
|
* distributed according to the same disclaimer and license as libpng-1.0.6
|
||||||
* with the following individuals added to the list of Contributing Authors:
|
* with the following individuals added to the list of Contributing Authors:
|
||||||
*
|
*
|
||||||
* Simon-Pierre Cadieux
|
* Simon-Pierre Cadieux
|
||||||
* Eric S. Raymond
|
* Mans Rullgard
|
||||||
|
* Cosmin Truta
|
||||||
* Gilles Vollant
|
* Gilles Vollant
|
||||||
|
* James Yu
|
||||||
*
|
*
|
||||||
* and with the following additions to the disclaimer:
|
* and with the following additions to the disclaimer:
|
||||||
*
|
*
|
||||||
@ -274,17 +273,18 @@
|
|||||||
* the user.
|
* the user.
|
||||||
*
|
*
|
||||||
* libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
|
* libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
|
||||||
* Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson, and are
|
* Copyright (c) 1998-2000 Glenn Randers-Pehrson, and are distributed according
|
||||||
* distributed according to the same disclaimer and license as libpng-0.96,
|
* to the same disclaimer and license as libpng-0.96, with the following
|
||||||
* with the following individuals added to the list of Contributing Authors:
|
* individuals added to the list of Contributing Authors:
|
||||||
*
|
*
|
||||||
* Tom Lane
|
* Tom Lane
|
||||||
* Glenn Randers-Pehrson
|
* Glenn Randers-Pehrson
|
||||||
|
* Eric S. Raymond
|
||||||
* Willem van Schaik
|
* Willem van Schaik
|
||||||
*
|
*
|
||||||
* libpng versions 0.89, June 1996, through 0.96, May 1997, are
|
* libpng versions 0.89, June 1996, through 0.96, May 1997, are
|
||||||
* Copyright (c) 1996, 1997 Andreas Dilger
|
* Copyright (c) 1996-1997 Andreas Dilger, and are
|
||||||
* Distributed according to the same disclaimer and license as libpng-0.88,
|
* distributed according to the same disclaimer and license as libpng-0.88,
|
||||||
* with the following individuals added to the list of Contributing Authors:
|
* with the following individuals added to the list of Contributing Authors:
|
||||||
*
|
*
|
||||||
* John Bowler
|
* John Bowler
|
||||||
@ -295,7 +295,7 @@
|
|||||||
* Tom Tanner
|
* Tom Tanner
|
||||||
*
|
*
|
||||||
* libpng versions 0.5, May 1995, through 0.88, January 1996, are
|
* libpng versions 0.5, May 1995, through 0.88, January 1996, are
|
||||||
* Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
|
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
|
||||||
*
|
*
|
||||||
* For the purposes of this copyright and license, "Contributing Authors"
|
* For the purposes of this copyright and license, "Contributing Authors"
|
||||||
* is defined as the following set of individuals:
|
* is defined as the following set of individuals:
|
||||||
@ -323,8 +323,8 @@
|
|||||||
* 2. Altered versions must be plainly marked as such and must not
|
* 2. Altered versions must be plainly marked as such and must not
|
||||||
* be misrepresented as being the original source.
|
* be misrepresented as being the original source.
|
||||||
*
|
*
|
||||||
* 3. This Copyright notice may not be removed or altered from
|
* 3. This Copyright notice may not be removed or altered from any
|
||||||
* any source or altered source distribution.
|
* source or altered source distribution.
|
||||||
*
|
*
|
||||||
* The Contributing Authors and Group 42, Inc. specifically permit, without
|
* The Contributing Authors and Group 42, Inc. specifically permit, without
|
||||||
* fee, and encourage the use of this source code as a component to
|
* fee, and encourage the use of this source code as a component to
|
||||||
@ -344,8 +344,9 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Libpng is OSI Certified Open Source Software. OSI Certified is a
|
* Libpng is OSI Certified Open Source Software. OSI Certified Open Source is
|
||||||
* certification mark of the Open Source Initiative.
|
* a certification mark of the Open Source Initiative. OSI has not addressed
|
||||||
|
* the additional disclaimers inserted at version 1.0.7.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -360,7 +361,7 @@
|
|||||||
* Y2K compliance in libpng:
|
* Y2K compliance in libpng:
|
||||||
* =========================
|
* =========================
|
||||||
*
|
*
|
||||||
* June 10, 2015
|
* July 26, 2015
|
||||||
*
|
*
|
||||||
* 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.
|
||||||
@ -430,7 +431,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.7.0beta64"
|
#define PNG_LIBPNG_VER_STRING "1.7.0beta64"
|
||||||
#define PNG_HEADER_VERSION_STRING \
|
#define PNG_HEADER_VERSION_STRING \
|
||||||
" libpng version 1.7.0beta64 - June 10, 2015\n"
|
" libpng version 1.7.0beta64 - July 26, 2015\n"
|
||||||
|
|
||||||
#define PNG_LIBPNG_VER_SONUM 17
|
#define PNG_LIBPNG_VER_SONUM 17
|
||||||
#define PNG_LIBPNG_VER_DLLNUM 17
|
#define PNG_LIBPNG_VER_DLLNUM 17
|
||||||
@ -529,6 +530,7 @@
|
|||||||
* definitions.
|
* definitions.
|
||||||
* 4. Exported library functions.
|
* 4. Exported library functions.
|
||||||
* 5. Simplified API.
|
* 5. Simplified API.
|
||||||
|
* 6. Implementation options
|
||||||
*
|
*
|
||||||
* The library source code has additional files (principally pngpriv.h) that
|
* The library source code has additional files (principally pngpriv.h) that
|
||||||
* allow configuration of the library.
|
* allow configuration of the library.
|
||||||
@ -2855,53 +2857,6 @@ PNG_EXPORT(243, int, png_get_palette_max, (png_const_structrp png_ptr,
|
|||||||
# endif
|
# endif
|
||||||
#endif /* CHECK_FOR_INVALID_INDEX */
|
#endif /* CHECK_FOR_INVALID_INDEX */
|
||||||
|
|
||||||
/*******************************************************************************
|
|
||||||
* IMPLEMENTATION OPTIONS
|
|
||||||
*******************************************************************************
|
|
||||||
*
|
|
||||||
* Support for arbitrary implementation-specific optimizations. The API allows
|
|
||||||
* particular options to be turned on or off. 'Option' is the number of the
|
|
||||||
* option and 'onoff' is 0 (off) or non-0 (on). The value returned is given
|
|
||||||
* by the PNG_OPTION_ defines below.
|
|
||||||
*
|
|
||||||
* HARDWARE: normally hardware capabilites, such as the Intel SSE instructions,
|
|
||||||
* are detected at run time, however sometimes it may be impossible
|
|
||||||
* to do this in user mode, in which case it is necessary to discover
|
|
||||||
* the capabilities in an OS specific way. Such capabilities are
|
|
||||||
* listed here when libpng has support for them and must be turned
|
|
||||||
* ON by the application if present.
|
|
||||||
*
|
|
||||||
* SOFTWARE: sometimes software optimizations actually result in performance
|
|
||||||
* decrease on some architectures or systems, or with some sets of
|
|
||||||
* PNG images. 'Software' options allow such optimizations to be
|
|
||||||
* selected at run time.
|
|
||||||
*/
|
|
||||||
#ifdef PNG_SET_OPTION_SUPPORTED
|
|
||||||
#ifdef PNG_ARM_NEON_API_SUPPORTED
|
|
||||||
# define PNG_ARM_NEON 0 /* HARDWARE: ARM Neon SIMD instructions supported */
|
|
||||||
#endif
|
|
||||||
#define PNG_MAXIMUM_INFLATE_WINDOW 2 /* SOFTWARE: force maximum window */
|
|
||||||
#define PNG_SKIP_sRGB_CHECK_PROFILE 4 /* SOFTWARE: Check ICC profile for sRGB */
|
|
||||||
#define PNG_OPTION_NEXT 6 /* Next option - numbers must be even */
|
|
||||||
|
|
||||||
/* Return values: NOTE: there are four values and 'off' is *not* zero */
|
|
||||||
#define PNG_OPTION_UNSET 0 /* Unset - defaults to off */
|
|
||||||
#define PNG_OPTION_INVALID 1 /* Option number out of range */
|
|
||||||
#define PNG_OPTION_OFF 2
|
|
||||||
#define PNG_OPTION_ON 3
|
|
||||||
|
|
||||||
PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option,
|
|
||||||
int onoff));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*******************************************************************************
|
|
||||||
* END OF HARDWARE OPTIONS
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
/* Maintainer: Put new public prototypes here ^, in libpng.3, and project
|
|
||||||
* defs
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* Section 5: SIMPLIFIED API
|
* Section 5: SIMPLIFIED API
|
||||||
*******************************************************************************
|
*******************************************************************************
|
||||||
@ -3355,6 +3310,54 @@ PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,
|
|||||||
* END OF SIMPLIFIED API
|
* END OF SIMPLIFIED API
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
|
|
||||||
|
/*******************************************************************************
|
||||||
|
* Section 6: IMPLEMENTATION OPTIONS
|
||||||
|
*******************************************************************************
|
||||||
|
*
|
||||||
|
* Support for arbitrary implementation-specific optimizations. The API allows
|
||||||
|
* particular options to be turned on or off. 'Option' is the number of the
|
||||||
|
* option and 'onoff' is 0 (off) or non-0 (on). The value returned is given
|
||||||
|
* by the PNG_OPTION_ defines below.
|
||||||
|
*
|
||||||
|
* HARDWARE: normally hardware capabilites, such as the Intel SSE instructions,
|
||||||
|
* are detected at run time, however sometimes it may be impossible
|
||||||
|
* to do this in user mode, in which case it is necessary to discover
|
||||||
|
* the capabilities in an OS specific way. Such capabilities are
|
||||||
|
* listed here when libpng has support for them and must be turned
|
||||||
|
* ON by the application if present.
|
||||||
|
*
|
||||||
|
* SOFTWARE: sometimes software optimizations actually result in performance
|
||||||
|
* decrease on some architectures or systems, or with some sets of
|
||||||
|
* PNG images. 'Software' options allow such optimizations to be
|
||||||
|
* selected at run time.
|
||||||
|
*/
|
||||||
|
#ifdef PNG_SET_OPTION_SUPPORTED
|
||||||
|
#ifdef PNG_ARM_NEON_API_SUPPORTED
|
||||||
|
# define PNG_ARM_NEON 0 /* HARDWARE: ARM Neon SIMD instructions supported */
|
||||||
|
#endif
|
||||||
|
#define PNG_MAXIMUM_INFLATE_WINDOW 2 /* SOFTWARE: force maximum window */
|
||||||
|
#define PNG_SKIP_sRGB_CHECK_PROFILE 4 /* SOFTWARE: Check ICC profile for sRGB */
|
||||||
|
#define PNG_OPTION_NEXT 6 /* Next option - numbers must be even */
|
||||||
|
|
||||||
|
/* Return values: NOTE: there are four values and 'off' is *not* zero */
|
||||||
|
#define PNG_OPTION_UNSET 0 /* Unset - defaults to off */
|
||||||
|
#define PNG_OPTION_INVALID 1 /* Option number out of range */
|
||||||
|
#define PNG_OPTION_OFF 2
|
||||||
|
#define PNG_OPTION_ON 3
|
||||||
|
|
||||||
|
PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option,
|
||||||
|
int onoff));
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*******************************************************************************
|
||||||
|
* END OF HARDWARE OPTIONS
|
||||||
|
******************************************************************************/
|
||||||
|
|
||||||
|
/* Maintainer: Put new public prototypes here ^, in libpng.3, and project
|
||||||
|
* defs
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
/* The last ordinal number (this is the *last* one already used; the next
|
/* The last ordinal number (this is the *last* one already used; the next
|
||||||
* one to use is one more than this.) Maintainer, remember to add an entry to
|
* one to use is one more than this.) Maintainer, remember to add an entry to
|
||||||
* scripts/symbols.def as well.
|
* scripts/symbols.def as well.
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user