FCL/sf/mw/qt: comparison src/3rdparty/libpng/libpng.3

equal deleted inserted replaced

-:93b982ccede2
+:5daf16870df6
-.TH LIBPNG 3 "September 10, 2009"
+.TH LIBPNG 3 "January 3, 2010"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.40
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0
 .SH SYNOPSIS
 \fI\fB
 \fB#include <png.h>\fP
 \fBpng_uint_32 png_access_version_number \fI(void\fP\fB);\fP
 \fI\fB
-\fBint png_check_sig (png_bytep \fP\fIsig\fP\fB, int \fInum\fP\fB);\fP
+\fBvoid png_benign_error (png_structp \fP\fIpng_ptr\fP\fB, png_const_charp \fIerror\fP\fB);\fP
+\fI\fB
+\fBvoid png_chunk_benign_error (png_structp \fP\fIpng_ptr\fP\fB, png_const_charp \fIerror\fP\fB);\fP
 \fI\fB
 \fBvoid png_chunk_error (png_structp \fP\fIpng_ptr\fP\fB, png_const_charp \fIerror\fP\fB);\fP
 \fBpng_structp png_create_write_struct_2(png_const_charp \fP\fIuser_png_ver\fP\fB, png_voidp \fP\fIerror_ptr\fP\fB, png_error_ptr \fP\fIerror_fn\fP\fB, png_error_ptr \fP\fIwarn_fn\fP\fB, png_voidp \fP\fImem_ptr\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_free_ptr \fIfree_fn\fP\fB);\fP
 \fI\fB
-\fBint png_debug(int \fP\fIlevel\fP\fB, png_const_charp \fImessage\fP\fB);\fP
-\fI\fB
-\fBint png_debug1(int \fP\fIlevel\fP\fB, png_const_charp \fP\fImessage\fP\fB, \fIp1\fP\fB);\fP
-\fI\fB
-\fBint png_debug2(int \fP\fIlevel\fP\fB, png_const_charp \fP\fImessage\fP\fB, \fP\fIp1\fP\fB, \fIp2\fP\fB);\fP
-\fI\fB
 \fBvoid png_destroy_info_struct (png_structp \fP\fIpng_ptr\fP\fB, png_infopp \fIinfo_ptr_ptr\fP\fB);\fP
 \fI\fB
 \fBvoid png_destroy_read_struct (png_structpp \fP\fIpng_ptr_ptr\fP\fB, png_infopp \fP\fIinfo_ptr_ptr\fP\fB, png_infopp \fIend_info_ptr_ptr\fP\fB);\fP
 \fBpng_uint_32 png_get_cHRM_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fI*white_x\fP\fB, png_uint_32 \fP\fI*white_y\fP\fB, png_uint_32 \fP\fI*red_x\fP\fB, png_uint_32 \fP\fI*red_y\fP\fB, png_uint_32 \fP\fI*green_x\fP\fB, png_uint_32 \fP\fI*green_y\fP\fB, png_uint_32 \fP\fI*blue_x\fP\fB, png_uint_32 \fI*blue_y\fP\fB);\fP
 \fI\fB
+\fBpng_uint_32 png_get_chunk_cache_max (png_structp \fIpng_ptr\fP\fB);\fP
+\fI\fB
 \fBpng_byte png_get_color_type (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 \fI\fB
+\fBpng_uint_32 png_get_compression_buffer_size (png_structp \fIpng_ptr\fP\fB);\fP
+\fI\fB
 \fBpng_byte png_get_compression_type (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 \fI\fB
 \fBpng_byte png_get_copyright (png_structp \fIpng_ptr\fP\fB);\fP
 \fBpng_uint_32 png_get_image_width (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 \fI\fB
-\fB#if \fI!defined(PNG_1_0_X)
 \fBpng_int_32 png_get_int_32 (png_bytep \fIbuf\fP\fB);\fP
-\fI\fB#endif
 \fI\fB
 \fBpng_byte png_get_interlace_type (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 \fI\fB
 \fBpng_uint_32 png_get_tIME (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_timep \fI*mod_time\fP\fB);\fP
 \fI\fB
-\fBpng_uint_32 png_get_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytep \fP\fI*trans\fP\fB, int \fP\fI*num_trans\fP\fB, png_color_16p \fI*trans_values\fP\fB);\fP
+\fBpng_uint_32 png_get_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytep \fP\fI*trans\fP\fB, int \fP\fI*num_trans\fP\fB, png_color_16p \fI*trans_color\fP\fB);\fP
 \fI\fB
-\fB#if \fI!defined(PNG_1_0_X)
+\fB/* This function is really an inline macro. \fI*/
 \fBpng_uint_16 png_get_uint_16 (png_bytep \fIbuf\fP\fB);\fP
 \fI\fB
 \fBpng_uint_32 png_get_uint_31 (png_bytep \fIbuf\fP\fB);\fP
 \fI\fB
+\fB/* This function is really an inline macro. \fI*/
 \fBpng_uint_32 png_get_uint_32 (png_bytep \fIbuf\fP\fB);\fP
-\fI\fB#endif
 \fI\fB
 \fBpng_uint_32 png_get_unknown_chunks (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_unknown_chunkpp \fIunknowns\fP\fB);\fP
 \fI\fB
 \fBpng_uint_32 png_get_y_pixels_per_meter (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 \fI\fB
-\fBpng_uint_32 png_get_compression_buffer_size (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
 \fBint png_handle_as_unknown (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIchunk_name\fP\fB);\fP
 \fI\fB
 \fBvoid png_init_io (png_structp \fP\fIpng_ptr\fP\fB, FILE \fI*fp\fP\fB);\fP
 \fI\fB
-\fBDEPRECATED: void png_info_init (png_infop \fIinfo_ptr\fP\fB);\fP
+\fBpng_voidp png_malloc (png_structp \fP\fIpng_ptr\fP\fB, png_alloc_size_t \fIsize\fP\fB);\fP
 \fI\fB
-\fBDEPRECATED: void png_info_init_2 (png_infopp \fP\fIptr_ptr\fP\fB, png_size_t \fIpng_info_struct_size\fP\fB);\fP
+\fBpng_voidp png_malloc_default(png_structp \fP\fIpng_ptr\fP\fB, png_alloc_size_t \fIsize\fP\fB);\fP
-\fI\fB
-\fBpng_voidp png_malloc (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIsize\fP\fB);\fP
-\fI\fB
-\fBpng_voidp png_malloc_default(png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIsize\fP\fB);\fP
 \fI\fB
 \fBvoidp png_memcpy (png_voidp \fP\fIs1\fP\fB, png_voidp \fP\fIs2\fP\fB, png_size_t \fIsize\fP\fB);\fP
 \fI\fB
-\fBpng_voidp png_memcpy_check (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIs1\fP\fB, png_voidp \fP\fIs2\fP\fB, png_uint_32 \fIsize\fP\fB);\fP
-\fI\fB
 \fBvoidp png_memset (png_voidp \fP\fIs1\fP\fB, int \fP\fIvalue\fP\fB, png_size_t \fIsize\fP\fB);\fP
 \fI\fB
-\fBpng_voidp png_memset_check (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIs1\fP\fB, int \fP\fIvalue\fP\fB, png_uint_32 \fIsize\fP\fB);\fP
-\fI\fB
-\fBDEPRECATED: void png_permit_empty_plte (png_structp \fP\fIpng_ptr\fP\fB, int \fIempty_plte_permitted\fP\fB);\fP
-\fI\fB
 \fBvoid png_process_data (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIbuffer_size\fP\fB);\fP
 \fI\fB
 \fBvoid png_progressive_combine_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIold_row\fP\fB, png_bytep \fInew_row\fP\fB);\fP
 \fI\fB
-\fBvoid png_read_destroy (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_infop \fIend_info_ptr\fP\fB);\fP
-\fI\fB
 \fBvoid png_read_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 \fI\fB
 \fBvoid png_read_image (png_structp \fP\fIpng_ptr\fP\fB, png_bytepp \fIimage\fP\fB);\fP
 \fI\fB
-\fBDEPRECATED: void png_read_init (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-\fBDEPRECATED: void png_read_init_2 (png_structpp \fP\fIptr_ptr\fP\fB, png_const_charp \fP\fIuser_png_ver\fP\fB, png_size_t \fP\fIpng_struct_size\fP\fB, png_size_t \fIpng_info_size\fP\fB);\fP
-\fI\fB
 \fBvoid png_read_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 \fI\fB
 \fBvoid png_read_png (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fP\fItransforms\fP\fB, png_voidp \fIparams\fP\fB);\fP
 \fBvoid png_read_update_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 \fI\fB
-\fB#if \fI!defined(PNG_1_0_X)
 \fBpng_save_int_32 (png_bytep \fP\fIbuf\fP\fB, png_int_32 \fIi\fP\fB);\fP
 \fI\fB
 \fBvoid png_save_uint_16 (png_bytep \fP\fIbuf\fP\fB, unsigned int \fIi\fP\fB);\fP
 \fI\fB
 \fBvoid png_set_add_alpha (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIfiller\fP\fB, int \fIflags\fP\fB);\fP
-\fI\fB#endif
 \fI\fB
 \fBvoid png_set_background (png_structp \fP\fIpng_ptr\fP\fB, png_color_16p \fP\fIbackground_color\fP\fB, int \fP\fIbackground_gamma_code\fP\fB, int \fP\fIneed_expand\fP\fB, double \fIbackground_gamma\fP\fB);\fP
 \fI\fB
 \fBvoid png_set_cHRM_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fIwhite_x\fP\fB, png_uint_32 \fP\fIwhite_y\fP\fB, png_uint_32 \fP\fIred_x\fP\fB, png_uint_32 \fP\fIred_y\fP\fB, png_uint_32 \fP\fIgreen_x\fP\fB, png_uint_32 \fP\fIgreen_y\fP\fB, png_uint_32 \fP\fIblue_x\fP\fB, png_uint_32 \fIblue_y\fP\fB);\fP
 \fI\fB
+\fBvoid png_set_chunk_cache_max (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIuser_chunk_cache_max\fP\fB);\fP
+\fI\fB
 \fBvoid png_set_compression_level (png_structp \fP\fIpng_ptr\fP\fB, int \fIlevel\fP\fB);\fP
 \fI\fB
 \fBvoid png_set_compression_mem_level (png_structp \fP\fIpng_ptr\fP\fB, int \fImem_level\fP\fB);\fP
 \fBvoid png_set_keep_unknown_chunks (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIkeep\fP\fB, png_bytep \fP\fIchunk_list\fP\fB, int \fInum_chunks\fP\fB);\fP
 \fI\fB
+\fBjmp_buf* png_set_longjmp_fn (png_structp \fP\fIpng_ptr\fP\fB, png_longjmp_ptr \fP\fIlongjmp_fn\fP\fB, size_t \fIjmp_buf_size\fP\fB);\fP
+\fI\fB
 \fBvoid png_set_mem_fn(png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fImem_ptr\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_free_ptr \fIfree_fn\fP\fB);\fP
 \fI\fB
 \fBvoid png_set_oFFs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fIoffset_x\fP\fB, png_uint_32 \fP\fIoffset_y\fP\fB, int \fIunit_type\fP\fB);\fP
 \fBvoid png_set_tIME (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_timep \fImod_time\fP\fB);\fP
 \fI\fB
-\fBvoid png_set_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytep \fP\fItrans\fP\fB, int \fP\fInum_trans\fP\fB, png_color_16p \fItrans_values\fP\fB);\fP
+\fBvoid png_set_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytep \fP\fItrans\fP\fB, int \fP\fInum_trans\fP\fB, png_color_16p \fItrans_color\fP\fB);\fP
 \fI\fB
 \fBvoid png_set_tRNS_to_alpha(png_structp \fIpng_ptr\fP\fB);\fP
 \fBvoid png_write_chunk_start (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIchunk_name\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
-\fBvoid png_write_destroy (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
 \fBvoid png_write_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 \fI\fB
 \fBvoid png_write_flush (png_structp \fIpng_ptr\fP\fB);\fP
 \fBvoid png_write_image (png_structp \fP\fIpng_ptr\fP\fB, png_bytepp \fIimage\fP\fB);\fP
 \fI\fB
-\fBDEPRECATED: void png_write_init (png_structp \fIpng_ptr\fP\fB);\fP
-\fI\fB
-\fBDEPRECATED: void png_write_init_2 (png_structpp \fP\fIptr_ptr\fP\fB, png_const_charp \fP\fIuser_png_ver\fP\fB, png_size_t \fP\fIpng_struct_size\fP\fB, png_size_t \fIpng_info_size\fP\fB);\fP
-\fI\fB
 \fBvoid png_write_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 \fI\fB
 \fBvoid png_write_info_before_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 \fBvoid png_write_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIrow\fP\fB);\fP
 \fI\fB
 \fBvoid png_write_rows (png_structp \fP\fIpng_ptr\fP\fB, png_bytepp \fP\fIrow\fP\fB, png_uint_32 \fInum_rows\fP\fB);\fP
+\fI\fB
+\fBvoid png_write_sig (png_structp \fIpng_ptr\fP\fB);\fP
 \fI\fB
 \fBvoidpf png_zalloc (voidpf \fP\fIpng_ptr\fP\fB, uInt \fP\fIitems\fP\fB, uInt \fIsize\fP\fB);\fP
 compression library.
 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.2.40 - September 10, 2009
+libpng version 1.4.0 - January 3, 2010
 Updated and distributed by Glenn Randers-Pehrson
 <glennrp at users.sourceforge.net>
 Copyright (c) 1998-2009 Glenn Randers-Pehrson
 This document is released under the libpng license.
 For conditions of distribution and use, see the disclaimer
 and license in png.h
 Based on:
-libpng versions 0.97, January 1998, through 1.2.40 - September 10, 2009
+libpng versions 0.97, January 1998, through 1.4.0 - January 3, 2010
 Updated and distributed by Glenn Randers-Pehrson
 Copyright (c) 1998-2009 Glenn Randers-Pehrson
 libpng 1.0 beta 6  version 0.96 May 28, 1997
 Updated and distributed by Andreas Dilger
 it is heavily commented and should include everything most people
 will need.  We assume that libpng is already installed; see the
 INSTALL file for instructions on how to install libpng.
 For examples of libpng usage, see the files "example.c", "pngtest.c",
-and the files in the "contrib" directory, all of which are included in the
+and the files in the "contrib" directory, all of which are included in
-libpng distribution.
+the libpng distribution.
 Libpng was written as a companion to the PNG specification, as a way
 of reducing the amount of time and effort it takes to support the PNG
 file format in application programs.
 before calling png_read_info(), png_read_png(), or png_process_data().
 If you need to retrieve the limits that are being applied, use
 width_max = png_get_user_width_max(png_ptr);
 height_max = png_get_user_height_max(png_ptr);
+The PNG specification sets no limit on the number of ancillary chunks
+allowed in a PNG datastream.  You can impose a limit on the total number
+of sPLT, tEXt, iTXt, zTXt, and unknown chunks that will be stored, with
+png_set_chunk_cache_max(png_ptr, user_chunk_cache_max);
+where 0x7fffffffL means unlimited.  You can retrieve this limit with
+chunk_cache_max = png_get_chunk_cache_max(png_ptr);
+This limit also applies to the number of buffers that can be allocated
+by png_decompress_chunk() while decompressing iTXt, zTXt, and iCCP chunks.
 .SS The high-level read interface
 At this point there are two ways to proceed; through the high-level
 read interface, or through a sequence of low-level read operations.
 PNG_TRANSFORM_SWAP_ALPHA    Flip RGBA to ARGB or GA
 to AG
 PNG_TRANSFORM_INVERT_ALPHA  Change alpha from opacity
 to transparency
 PNG_TRANSFORM_SWAP_ENDIAN   Byte-swap 16-bit samples
+PNG_TRANSFORM_GRAY_TO_RGB   Expand grayscale samples
+to RGB (or GA to RGBA)
 (This excludes setting a background color, doing gamma transformation,
 dithering, and setting filler.)  If this is the case, simply do this:
 png_read_png(png_ptr, info_ptr, png_transforms, NULL)
-where png_transforms is an integer containing the bitwise OR of
+where png_transforms is an integer containing the bitwise OR of some
-some set of transformation flags.  This call is equivalent to png_read_info(),
+set of transformation flags.  This call is equivalent to png_read_info(),
 followed the set of transformations indicated by the transform mask,
 then png_read_image(), and finally png_read_end().
 (The final parameter of this call is not yet used.  Someday it might point
 to transformation parameters required by some future input transform.)
 a MNG-1.0 datastream)
 compression_type - (must be PNG_COMPRESSION_TYPE_BASE
 for PNG 1.0)
 interlace_type - (PNG_INTERLACE_NONE or
 PNG_INTERLACE_ADAM7)
-Any or all of interlace_type, compression_type, of
+Any or all of interlace_type, compression_type, or
 filter_method can be NULL if you are
 not interested in their values.
-channels = png_get_channels(png_ptr, info_ptr);
+Note that png_get_IHDR() returns 32-bit data into
-channels       - number of channels of info for the
+the application's width and height variables.
-color type (valid values are 1 (GRAY,
+This is an unsafe situation if these are 16-bit
-PALETTE), 2 (GRAY_ALPHA), 3 (RGB),
+variables.  In such situations, the
-4 (RGB_ALPHA or RGB + filler byte))
+png_get_image_width() and png_get_image_height()
-rowbytes = png_get_rowbytes(png_ptr, info_ptr);
+functions described below are safer.
-rowbytes       - number of bytes needed to hold a row
-signature = png_get_signature(png_ptr, info_ptr);
-signature      - holds the signature read from the
-file (if any).  The data is kept in
-the same offset it would be if the
-whole signature were read (i.e. if an
-application had already read in 4
-bytes of signature before starting
-libpng, the remaining 4 bytes would
-be in signature[4] through signature[7]
-(see png_set_sig_bytes())).
 width            = png_get_image_width(png_ptr,
 info_ptr);
 height           = png_get_image_height(png_ptr,
 info_ptr);
 compression_type = png_get_compression_type(png_ptr,
 info_ptr);
 interlace_type   = png_get_interlace_type(png_ptr,
 info_ptr);
+channels = png_get_channels(png_ptr, info_ptr);
+channels       - number of channels of info for the
+color type (valid values are 1 (GRAY,
+PALETTE), 2 (GRAY_ALPHA), 3 (RGB),
+4 (RGB_ALPHA or RGB + filler byte))
+rowbytes = png_get_rowbytes(png_ptr, info_ptr);
+rowbytes       - number of bytes needed to hold a row
+signature = png_get_signature(png_ptr, info_ptr);
+signature      - holds the signature read from the
+file (if any).  The data is kept in
+the same offset it would be if the
+whole signature were read (i.e. if an
+application had already read in 4
+bytes of signature before starting
+libpng, the remaining 4 bytes would
+be in signature[4] through signature[7]
+(see png_set_sig_bytes())).
 These are also important, but their validity depends on whether the chunk
 has been read.  The png_get_valid(png_ptr, info_ptr, PNG_INFO_<chunk>) and
 png_get_<chunk>(png_ptr, info_ptr, ...) functions return non-zero if the
 data has been read, or zero if it is missing.  The parameters to the
-png_get_<chunk> are set directly if they are simple data types, or a pointer
+png_get_<chunk> are set directly if they are simple data types, or a
-into the info_ptr is returned for any complex types.
+pointer into the info_ptr is returned for any complex types.
 png_get_PLTE(png_ptr, info_ptr, &palette,
 &num_palette);
 palette        - the palette for the file
 (array of png_color)
 (PNG_INFO_sBIT) each of the gray,
 red, green, and blue channels,
 whichever are appropriate for the
 given color type (png_color_16)
-png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans,
+png_get_tRNS(png_ptr, info_ptr, &trans_alpha,
-&trans_values);
+&num_trans, &trans_color);
-trans          - array of transparent entries for
+trans_alpha    - array of alpha (transparency)
-palette (PNG_INFO_tRNS)
+entries for palette (PNG_INFO_tRNS)
-trans_values   - graylevel or color sample values of
+trans_color    - graylevel or color sample values of
 the single transparent color for
 non-paletted images (PNG_INFO_tRNS)
 num_trans      - number of transparent entries
 (PNG_INFO_tRNS)
 after decompression, 0 for tEXt/zTXt
 text_ptr[i].lang  - language of comment (empty
 string for unknown).
 text_ptr[i].lang_key  - keyword in UTF-8
 (empty string for unknown).
+Note that the itxt_length, lang, and lang_key
+members of the text_ptr structure only exist
+when the library is built with iTXt chunk support.
 num_text       - number of comments (same as
 num_comments; you can put NULL here
 to avoid the duplication)
 Note while png_set_text() will accept text, language,
 and translated keywords that can be NULL pointers, the
 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.0, 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
+the tRNS chunk is present, A means an alpha channel is present, and O
+means tRNS or alpha is present but all pixels in the image are opaque.
+FROM  01  31   0  0T  0O   2  2T  2O   3  3T  3O  4A  4O  6A  6O
+TO
+01    -
+31        -
+0    1       -
+0T                -
+0O                    -
+2           GX           -
+2T                            -
+2O                                -
+3        1                           -
+3T                                        -
+3O                                            -
+4A                T                               -
+4O                                                    -
+6A               GX         TX           TX               -
+6O                   GX                      TX               -
+Within the matrix,
+"-" means the transformation is not supported.
+"X" means the transformation is obtained by png_set_expand().
+"1" means the transformation is obtained by
+png_set_expand_gray_1_2_4_to_8
+"G" means the transformation is obtained by
+png_set_gray_to_rgb().
+"P" means the transformation is obtained by
+png_set_expand_palette_to_rgb().
+"T" means the transformation is obtained by
+png_set_tRNS_to_alpha().
 PNG can have files with 16 bits per channel.  If you only can handle
 8 bits per channel, this will strip the pixels down to 8 bit.
 if (bit_depth == 16)
 png_set_strip_16(png_ptr);
 if (bit_depth < 8)
 png_set_packing(png_ptr);
 PNG files have possible bit depths of 1, 2, 4, 8, and 16.  All pixels
 stored in a PNG image have been "scaled" or "shifted" up to the next
-higher possible bit depth (e.g. from 5 bits/sample in the range [0,31] to
+higher possible bit depth (e.g. from 5 bits/sample in the range [0,31]
-8 bits/sample in the range [0, 255]).  However, it is also possible to
+to 8 bits/sample in the range [0, 255]).  However, it is also possible
-convert the PNG pixel data back to the original bit depth of the image.
+to convert the PNG pixel data back to the original bit depth of the
-This call reduces the pixels back down to the original bit depth:
+image.  This call reduces the pixels back down to the original bit depth:
 png_color_8p sig_bit;
 if (png_get_sBIT(png_ptr, info_ptr, &sig_bit))
 png_set_shift(png_ptr, sig_bit);
 if (png_get_gAMA(png_ptr, info_ptr, &gamma))
 png_set_gamma(png_ptr, screen_gamma, gamma);
 else
 png_set_gamma(png_ptr, screen_gamma, 0.45455);
-If you need to reduce an RGB file to a paletted file, or if a paletted
-file has more entries then will fit on your screen, png_set_dither()
-will do that.  Note that this is a simple match dither that merely
-finds the closest color available.  This should work fairly well with
-optimized palettes, and fairly badly with linear color cubes.  If you
-pass a palette that is larger then maximum_colors, the file will
-reduce the number of colors in the palette so it will fit into
-maximum_colors.  If there is a histogram, it will use it to make
-more intelligent choices when reducing the palette.  If there is no
-histogram, it may not do as good a job.
-if (color_type & PNG_COLOR_MASK_COLOR)
-{
-if (png_get_valid(png_ptr, info_ptr,
-PNG_INFO_PLTE))
-{
-png_uint_16p histogram = NULL;
-png_get_hIST(png_ptr, info_ptr,
-&histogram);
-png_set_dither(png_ptr, palette, num_palette,
-max_screen_colors, histogram, 1);
-}
-else
-{
-png_color std_color_cube[MAX_SCREEN_COLORS] =
-{ ... colors ... };
-png_set_dither(png_ptr, std_color_cube,
-MAX_SCREEN_COLORS, MAX_SCREEN_COLORS,
-NULL,0);
-}
-}
 PNG files describe monochrome as black being zero and white being one.
 The following code will reverse this (make black be one and white be
 zero):
 if (bit_depth == 1 && color_type == PNG_COLOR_TYPE_GRAY)
 seq  - sequence number of item to be freed
 (-1 for all items)
 This function may be safely called when the relevant storage has
 already been freed, or has not yet been allocated, or was allocated
-by the user and not by libpng,  and will in those
+by the user and not by libpng,  and will in those cases do nothing.
-cases do nothing.  The "seq" parameter is ignored if only one item
+The "seq" parameter is ignored if only one item of the selected data
-of the selected data type, such as PLTE, is allowed.  If "seq" is not
+type, such as PLTE, is allowed.  If "seq" is not -1, and multiple items
--1, and multiple items are allowed for the data type identified in
+are allowed for the data type identified in the mask, such as text or
-the mask, such as text or sPLT, only the n'th item in the structure
+sPLT, only the n'th item in the structure is freed, where n is "seq".
-is freed, where n is "seq".
 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,
 or so that it will free data that was allocated by the user with png_malloc()
 or png_zalloc() and passed in via a png_set_*() function, with
 the key member, and png_free_data() will free only text_ptr.key.  Similarly,
 if you transfer responsibility for free'ing text_ptr from libpng to your
 application, your application must not separately free those members.
 The png_free_data() function will turn off the "valid" flag for anything
-it frees.  If you need to turn the flag off for a chunk that was freed by your
+it frees.  If you need to turn the flag off for a chunk that was freed by
-application instead of by libpng, you can use
+your application instead of by libpng, you can use
 png_set_invalid(png_ptr, info_ptr, mask);
 mask - identifies the chunks to be made invalid,
 containing the bitwise OR of one or
 more of
 speed/compression ratio. The second parameter to png_set_filter() is
 the filter method, for which the only valid values are 0 (as of the
 July 1999 PNG specification, version 1.2) or 64 (if you are writing
 a PNG datastream that is to be embedded in a MNG datastream).  The third
 parameter is a flag that indicates which filter type(s) are to be tested
-for each scanline.  See the PNG specification for details on the specific filter
+for each scanline.  See the PNG specification for details on the specific
-types.
+filter types.
 /* turn on or off filtering, and/or choose
 specific filters.  You can use either a single
 PNG_FILTER_VALUE_NAME or the bitwise OR of one
 (PNG_INFO_sBIT) each of the gray, red,
 green, and blue channels, whichever are
 appropriate for the given color type
 (png_color_16)
-png_set_tRNS(png_ptr, info_ptr, trans, num_trans,
+png_set_tRNS(png_ptr, info_ptr, trans_alpha,
-trans_values);
+num_trans, trans_color);
-trans          - array of transparent entries for
+trans_alpha    - array of alpha (transparency)
-palette (PNG_INFO_tRNS)
+entries for palette (PNG_INFO_tRNS)
-trans_values   - graylevel or color sample values
+trans_color    - graylevel or color sample values
 (in order red, green, blue) of the
 single transparent color for
 non-paletted images (PNG_INFO_tRNS)
 num_trans      - number of transparent entries
 (PNG_INFO_tRNS)
 after decompression, 0 for tEXt/zTXt
 text_ptr[i].lang  - language of comment (NULL or
 empty for unknown).
 text_ptr[i].translated_keyword  - keyword in UTF-8 (NULL
 or empty for unknown).
+Note that the itxt_length, lang, and lang_key
+members of the text_ptr structure only exist
+when the library is built with iTXt chunk support.
 num_text       - number of comments
 png_set_sPLT(png_ptr, info_ptr, &palette_ptr,
 num_spalettes);
 palette_ptr    - array of png_sPLT_struct structures
 png_write_info(png_ptr, info_ptr);
 Note that there is one transformation you may need to do before
 png_write_info().  In PNG files, the alpha channel in an image is the
-level of opacity.  If your data is supplied as a level of
+level of opacity.  If your data is supplied as a level of transparency,
-transparency, you can invert the alpha channel before you write it, so
+you can invert the alpha channel before you write it, so that 0 is
-that 0 is fully transparent and 255 (in 8-bit or paletted images) or
+fully transparent and 255 (in 8-bit or paletted images) or 65535
-65535 (in 16-bit images) is fully opaque, with
+(in 16-bit images) is fully opaque, with
 png_set_invert_alpha(png_ptr);
 This must appear before png_write_info() instead of later with the
 other transformations because in the case of paletted images the tRNS
 png_bytep row_pointer = row;
 png_write_row(png_ptr, row_pointer);
-When the file is interlaced, things can get a good deal more
+When the file is interlaced, things can get a good deal more complicated.
-complicated.  The only currently (as of the PNG Specification
+The only currently (as of the PNG Specification version 1.2, dated July
-version 1.2, dated July 1999) defined interlacing scheme for PNG files
+1999) defined interlacing scheme for PNG files is the "Adam7" interlace
-is the "Adam7" interlace scheme, that breaks down an
+scheme, that breaks down an image into seven smaller images of varying
-image into seven smaller images of varying size.  libpng will build
+size.  libpng will build these images for you, or you can do them
-these images for you, or you can do them yourself.  If you want to
+yourself.  If you want to build them yourself, see the PNG specification
-build them yourself, see the PNG specification for details of which
+for details of which pixels to write when.
-pixels to write when.
 If you don't want libpng to handle the interlacing details, just
 use png_set_interlace_handling() and call png_write_rows() the
 correct number of times to write all seven sub-images.
 writing any rows:
 number_of_passes =
 png_set_interlace_handling(png_ptr);
-This will return the number of passes needed.  Currently, this
+This will return the number of passes needed.  Currently, this is seven,
-is seven, but may change if another interlace type is added.
+but may change if another interlace type is added.
 Then write the complete image number_of_passes times.
 png_write_rows(png_ptr, row_pointers,
 number_of_rows);
-As some of these rows are not used, and thus return immediately,
+As some of these rows are not used, and thus return immediately, you may
-you may want to read about interlacing in the PNG specification,
+want to read about interlacing in the PNG specification, and only update
-and only update the rows that are actually used.
+the rows that are actually used.
 .SS Finishing a sequential write
 After you are finished writing the image, you should finish writing
 the file.  If you are interested in writing comments or time, you should
 seq   - sequence number of item to be freed
 (-1 for all items)
 This function may be safely called when the relevant storage has
 already been freed, or has not yet been allocated, or was allocated
-by the user  and not by libpng,  and will in those
+by the user  and not by libpng,  and will in those cases do nothing.
-cases do nothing.  The "seq" parameter is ignored if only one item
+The "seq" parameter is ignored if only one item of the selected data
-of the selected data type, such as PLTE, is allowed.  If "seq" is not
+type, such as PLTE, is allowed.  If "seq" is not -1, and multiple items
--1, and multiple items are allowed for the data type identified in
+are allowed for the data type identified in the mask, such as text or
-the mask, such as text or sPLT, only the n'th item in the structure
+sPLT, only the n'th item in the structure is freed, where n is "seq".
-is freed, where n is "seq".
+If you allocated data such as a palette that you passed in to libpng
-If you allocated data such as a palette that you passed
+with png_set_*, you must not free it until just before the call to
-in to libpng with png_set_*, you must not free it until just before the call to
 png_destroy_write_struct().
 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,
 or so that it will free data that was allocated by the user with png_malloc()
 All of the memory allocation, input/output, and error handling in libpng
 goes through callbacks that are user-settable.  The default routines are
 in pngmem.c, pngrio.c, pngwio.c, and pngerror.c, respectively.  To change
 these functions, call the appropriate png_set_*_fn() function.
-Memory allocation is done through the functions png_malloc()
+Memory allocation is done through the functions png_malloc(), png_calloc(),
-and png_free().  These currently just call the standard C functions.  If
+and png_free().  These currently just call the standard C functions.
-your pointers can't access more then 64K at a time, you will want to set
+png_calloc() calls png_malloc() and then png_memset() to clear the newly
-MAXSEG_64K in zlib.h.  Since it is unlikely that the method of handling
+allocated memory to zero.  If your pointers can't access more then 64K
-memory allocation on a platform will change between applications, these
+at a time, you will want to set MAXSEG_64K in zlib.h.  Since it is
-functions must be modified in the library at compile time.  If you prefer
+unlikely that the method of handling memory allocation on a platform
-to use a different method of allocating and freeing data, you can use
+will change between applications, these functions must be modified in
-png_create_read_struct_2() or png_create_write_struct_2() to register
+the library at compile time.  If you prefer to use a different method
-your own functions as described above.
+of allocating and freeing data, you can use png_create_read_struct_2() or
-These functions also provide a void pointer that can be retrieved via
+png_create_write_struct_2() to register your own functions as described
+above.  These functions also provide a void pointer that can be retrieved
+via
 mem_ptr=png_get_mem_ptr(png_ptr);
 Your replacement memory functions must have prototypes as follows:
 The motivation behind using setjmp() and longjmp() is the C++ throw and
 catch exception handling methods.  This makes the code much easier to write,
 as there is no need to check every return code of every function call.
 However, there are some uncertainties about the status of local variables
-after a longjmp, so the user may want to be careful about doing anything after
+after a longjmp, so the user may want to be careful about doing anything
-setjmp returns non-zero besides returning itself.  Consult your compiler
+after setjmp returns non-zero besides returning itself.  Consult your
-documentation for more details.  For an alternative approach, you may wish
+compiler documentation for more details.  For an alternative approach, you
-to use the "cexcept" facility (see http://cexcept.sourceforge.net).
+may wish to use the "cexcept" facility (see http://cexcept.sourceforge.net).
 .SS Custom chunks
 If you need to read or write custom chunks, you may need to get deeper
 into the libpng code.  The library now has mechanisms for storing
 for custom chunks.  However, this may not be good enough if the
 library code itself needs to know about interactions between your
 chunk and existing `intrinsic' chunks.
 If you need to write a new intrinsic chunk, first read the PNG
-specification. Acquire a first level of
+specification. Acquire a first level of understanding of how it works.
-understanding of how it works.  Pay particular attention to the
+Pay particular attention to the sections that describe chunk names,
-sections that describe chunk names, and look at how other chunks were
+and look at how other chunks were designed, so you can do things
-designed, so you can do things similarly.  Second, check out the
+similarly.  Second, check out the sections of libpng that read and
-sections of libpng that read and write chunks.  Try to find a chunk
+write chunks.  Try to find a chunk that is similar to yours and use
-that is similar to yours and use it as a template.  More details can
+it as a template.  More details can be found in the comments inside
-be found in the comments inside the code.  It is best to handle unknown
+the code.  It is best to handle unknown chunks in a generic method,
-chunks in a generic method, via callback functions, instead of by
+via callback functions, instead of by modifying libpng functions.
-modifying libpng functions.
 If you wish to write your own transformation for the data, look through
 the part of the code that does the transformations, and check out some of
 the simpler ones to get an idea of how they work.  Try to find a similar
 transformation to the one you want to add and copy off of it.  More details
 .SS Configuring for compiler xxx:
 All includes for libpng are in pngconf.h.  If you need to add, change
 or delete an include, this is the place to do it.
-The includes that are not needed outside libpng are protected by the
+The includes that are not needed outside libpng are placed in pngpriv.h,
-PNG_INTERNAL definition, which is only defined for those routines inside
+which is only used by the routines inside libpng itself.
-libpng itself.  The files in libpng proper only include png.h, which
+The files in libpng proper only include pngpriv.h and png.h, which
-includes pngconf.h.
+in turn includes pngconf.h.
 .SS Configuring zlib:
 There are special functions to configure the compression.  Perhaps the
 most useful one changes the compression level, which currently uses
 You can also turn all of the transforms and ancillary chunk capabilities
 off en masse with compiler directives that define
 PNG_NO_READ[or WRITE]_TRANSFORMS, or PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS,
 or all four,
 along with directives to turn on any of the capabilities that you do
-want.  The PNG_NO_READ[or WRITE]_TRANSFORMS directives disable
+want.  The PNG_NO_READ[or WRITE]_TRANSFORMS directives disable the extra
-the extra transformations but still leave the library fully capable of reading
+transformations but still leave the library fully capable of reading
-and writing PNG files with all known public chunks
+and writing PNG files with all known public chunks. Use of the
-Use of the PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS directive
+PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS directive produces a library
-produces a library that is incapable of reading or writing ancillary chunks.
+that is incapable of reading or writing ancillary chunks.  If you are
-If you are not using the progressive reading capability, you can
+not using the progressive reading capability, you can turn that off
-turn that off with PNG_NO_PROGRESSIVE_READ (don't confuse
+with PNG_NO_PROGRESSIVE_READ (don't confuse this with the INTERLACING
-this with the INTERLACING capability, which you'll still have).
+capability, which you'll still have).
 All the reading and writing specific code are in separate files, so the
 linker should only grab the files it needs.  However, if you want to
 make sure, or if you are building a stand alone library, all the
 reading files start with pngr and all the writing files start with
 Support for user memory management was enabled by default.  To
 accomplish this, the functions png_create_read_struct_2(),
 png_create_write_struct_2(), png_set_mem_fn(), png_get_mem_ptr(),
 png_malloc_default(), and png_free_default() were added.
+Support for the iTXt chunk has been enabled by default as of
+version 1.2.41.
 Support for certain MNG features was enabled.
 Support for numbered error messages was added.  However, we never got
 around to actually numbering the error messages.  The function
 png_set_asm_flags()
 We replaced all of these functions with simple stubs in libpng-1.2.20,
 when the Intel assembler code was removed due to a licensing issue.
-.SH IX.  (Omitted)
+These macros are deprecated:
+PNG_READ_TRANSFORMS_NOT_SUPPORTED
+PNG_PROGRESSIVE_READ_NOT_SUPPORTED
+PNG_NO_SEQUENTIAL_READ_SUPPORTED
+PNG_WRITE_TRANSFORMS_NOT_SUPPORTED
+PNG_READ_ANCILLARY_CHUNKS_NOT_SUPPORTED
+PNG_WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED
+They have been replaced, respectively, by:
+PNG_NO_READ_TRANSFORMS
+PNG_NO_PROGRESSIVE_READ
+PNG_NO_SEQUENTIAL_READ
+PNG_NO_WRITE_TRANSFORMS
+PNG_NO_READ_ANCILLARY_CHUNKS
+PNG_NO_WRITE_ANCILLARY_CHUNKS
+PNG_MAX_UINT was replaced with PNG_UINT_31_MAX.  It has been
+deprecated since libpng-1.0.16 and libpng-1.2.6.
+The function
+png_check_sig(sig, num)
+was replaced with
+!png_sig_cmp(sig, 0, num)
+It has been deprecated since libpng-0.90.
+The function
+png_set_gray_1_2_4_to_8()
+which also expands tRNS to alpha was replaced with
+png_set_expand_gray_1_2_4_to_8()
+which does not. It has been deprecated since libpng-1.0.18 and 1.2.9.
+.SH IX.  Changes to Libpng from version 1.0.x/1.2.x to 1.4.x
+Private libpng prototypes and macro definitions were moved from
+png.h and pngconf.h into a new pngpriv.h header file.
+Functions png_set_benign_errors(), png_benign_error(), and
+png_chunk_benign_error() were added.
+Support for setting the maximum amount of memory that the application
+will allocate for reading chunks was added, as a security measure.
+The functions png_set_chunk_cache_max() and png_get_chunk_cache_max()
+were added to the library.
+We implemented support for I/O states by adding png_ptr member io_state
+and functions png_get_io_chunk_name() and png_get_io_state() in pngget.c
+We added PNG_TRANSFORM_GRAY_TO_RGB to the available high-level
+input transforms.
+Checking for and reporting of errors in the IHDR chunk is more thorough.
+Support for global arrays was removed, to improve thread safety.
+Some obsolete/deprecated macros and functions have been removed.
+Typecasted NULL definitions such as
+#define png_voidp_NULL            (png_voidp)NULL
+were eliminated.  If you used these in your application, just use
+NULL instead.
+The png_struct and info_struct members "trans" and "trans_values" were
+changed to "trans_alpha" and "trans_color", respectively.
+The obsolete, unused pnggccrd.c and pngvcrd.c files and related makefiles
+were removed.
+The PNG_1_0_X and PNG_1_2_X macros were eliminated.
+The PNG_LEGACY_SUPPORTED macro was eliminated.
+Many WIN32_WCE #ifdefs were removed.
+The functions png_read_init(info_ptr), png_write_init(info_ptr),
+png_info_init(info_ptr), png_read_destroy(), and png_write_destroy()
+have been removed.  They have been deprecated since libpng-0.95.
+The png_permit_empty_plte() was removed. It has been deprecated
+since libpng-1.0.9.  Use png_permit_mng_features() instead.
+We removed the obsolete stub functions png_get_mmx_flagmask(),
+png_set_mmx_thresholds(), png_get_asm_flags(),
+png_get_mmx_bitdepth_threshold(), png_get_mmx_rowbytes_threshold(),
+png_set_asm_flags(), and png_mmx_supported()
+We removed the obsolete png_check_sig(), png_memcpy_check(), and
+png_memset_check() functions.  Instead use !png_sig_cmp(), png_memcpy(),
+and png_memset(), respectively.
+The function png_set_gray_1_2_4_to_8() was removed. It has been
+deprecated since libpng-1.0.18 and 1.2.9, when it was replaced with
+png_set_expand_gray_1_2_4_to_8() because the former function also
+expanded palette images.
+We changed the prototype for png_malloc() from
+png_malloc(png_structp png_ptr, png_uint_32 size)
+to
+png_malloc(png_structp png_ptr, png_alloc_size_t size)
+The png_calloc() function was added and is used in place of
+of "png_malloc(); png_memset();" except in the case in png_read_png()
+where the array consists of pointers; in this case a "for" loop is used
+after the png_malloc() to set the pointers to NULL, to give robust.
+behavior in case the application runs out of memory part-way through
+the process.
+We changed the prototypes of png_get_compression_buffer_size() and
+png_set_compression_buffer_size() to work with png_size_t instead of
+png_uint_32.
+Support for numbered error messages was removed by default, since we
+never got around to actually numbering the error messages. The function
+png_set_strip_error_numbers() was removed from the library by default.
+The png_zalloc() and png_zfree() functions are no longer exported.
+The png_zalloc() function no longer zeroes out the memory that it
+allocates.
+We removed the trailing '.' from the warning and error messages.
 .SH X. Detecting libpng
 The png_get_io_ptr() function has been present since libpng-0.88, has never
 changed, and is unaffected by conditional compilation macros.  It is the
 return (0);
 We use 3-space indentation, except for continued statements which
 are usually indented the same as the first line of the statement
 plus four more spaces.
+For macro definitions we use 2-space indentation, always leaving the "#"
+in the first column.
+#ifndef PNG_NO_FEATURE
+#  ifndef PNG_FEATURE_SUPPORTED
+#    define PNG_FEATURE_SUPPORTED
+#  endif
+#endif
 Comments appear with the leading "/*" at the same indentation as
 the statement that follows the comment:
 /* Single-line comment */
 body;
 }
 The prototypes for non-exported functions (except for those in
 pngtest) appear in
-the PNG_INTERNAL section of png.h
+pngpriv.h
 above the comment that says
 /* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */
 The names of all exported functions and variables begin
 put a space between a typecast and the expression being
 cast, nor do we put one between a function name and the
 left parenthesis that follows it:
 for (i = 2; i > 0; --i)
-x[i] = a(x) + (int)b;
+y[i] = a(x) + (int)b;
 We prefer #ifdef and #ifndef to #if defined() and if !defined()
 when there is only one macro being tested.
-Other rules can be inferred by inspecting the libpng
+We do not use the TAB character for indentation in the C sources.
-source.
+Lines do not exceed 80 characters.
+Other rules can be inferred by inspecting the libpng source.
 .SH XIII. Y2K Compliance in libpng
-September 10, 2009
+January 3, 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.2.40 are Y2K compliant.  It is my belief that earlier
+upward through 1.4.0 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
 will hold years up to 65535.  The other two hold the date in text
 format, and will hold years up to 9999.
 1.2.6beta1-4        13    10206  12.so.0.1.2.6beta1-4
 1.2.6rc1-5          13    10206  12.so.0.1.2.6rc1-5
 1.0.16              10    10016  10.so.0.1.0.16
 1.2.6               13    10206  12.so.0.1.2.6
 1.2.7beta1-2        13    10207  12.so.0.1.2.7beta1-2
-1.0.17rc1           10    10017  10.so.0.1.0.17rc1
+1.0.17rc1           10    10017  12.so.0.1.0.17rc1
 1.2.7rc1            13    10207  12.so.0.1.2.7rc1
-1.0.17              10    10017  10.so.0.1.0.17
+1.0.17              10    10017  12.so.0.1.0.17
 1.2.7               13    10207  12.so.0.1.2.7
 1.2.8beta1-5        13    10208  12.so.0.1.2.8beta1-5
-1.0.18rc1-5         10    10018  10.so.0.1.0.18rc1-5
+1.0.18rc1-5         10    10018  12.so.0.1.0.18rc1-5
 1.2.8rc1-5          13    10208  12.so.0.1.2.8rc1-5
-1.0.18              10    10018  10.so.0.1.0.18
+1.0.18              10    10018  12.so.0.1.0.18
 1.2.8               13    10208  12.so.0.1.2.8
 1.2.9beta1-3        13    10209  12.so.0.1.2.9beta1-3
 1.2.9beta4-11       13    10209  12.so.0.9[.0]
 1.2.9rc1            13    10209  12.so.0.9[.0]
 1.2.9               13    10209  12.so.0.9[.0]
-1.2.10beta1-8       13    10210  12.so.0.10[.0]
+1.2.10beta1-7       13    10210  12.so.0.10[.0]
-1.2.10rc1-3         13    10210  12.so.0.10[.0]
+1.2.10rc1-2         13    10210  12.so.0.10[.0]
 1.2.10              13    10210  12.so.0.10[.0]
-1.2.11beta1-4       13    10211  12.so.0.11[.0]
+1.4.0beta1-6        14    10400  14.so.0.0[.0]
-1.0.19rc1-5         10    10019  10.so.0.19[.0]
+1.2.11beta1-4       13    10210  12.so.0.11[.0]
-1.2.11rc1-5         13    10211  12.so.0.11[.0]
+1.4.0beta7-8        14    10400  14.so.0.0[.0]
-1.0.19              10    10019  10.so.0.19[.0]
 1.2.11              13    10211  12.so.0.11[.0]
-1.0.20              10    10020  10.so.0.20[.0]
 1.2.12              13    10212  12.so.0.12[.0]
-1.2.13beta1         13    10213  12.so.0.13[.0]
+1.4.0beta9-14       14    10400  14.so.0.0[.0]
-1.0.21              10    10021  10.so.0.21[.0]
 1.2.13              13    10213  12.so.0.13[.0]
-1.2.14beta1-2       13    10214  12.so.0.14[.0]
+1.4.0beta15-36      14    10400  14.so.0.0[.0]
-1.0.22rc1           10    10022  10.so.0.22[.0]
+1.4.0beta37-87      14    10400  14.so.14.0[.0]
-1.2.14rc1           13    10214  12.so.0.14[.0]
+1.4.0rc01           14    10400  14.so.14.0[.0]
-1.2.15beta1-6       13    10215  12.so.0.15[.0]
+1.4.0beta88-109     14    10400  14.so.14.0[.0]
-1.0.23rc1-5         10    10023  10.so.0.23[.0]
+1.4.0rc02-08        14    10400  14.so.14.0[.0]
-1.2.15rc1-5         13    10215  12.so.0.15[.0]
+1.4.0               14    10400  14.so.14.0[.0]
-1.0.23              10    10023  10.so.0.23[.0]
-1.2.15              13    10215  12.so.0.15[.0]
-1.2.16beta1-2       13    10216  12.so.0.16[.0]
-1.2.16rc1           13    10216  12.so.0.16[.0]
-1.0.24              10    10024  10.so.0.24[.0]
-1.2.16              13    10216  12.so.0.16[.0]
-1.2.17beta1-2       13    10217  12.so.0.17[.0]
-1.0.25rc1           10    10025  10.so.0.25[.0]
-1.2.17rc1-3         13    10217  12.so.0.17[.0]
-1.0.25              10    10025  10.so.0.25[.0]
-1.2.17              13    10217  12.so.0.17[.0]
-1.0.26              10    10026  10.so.0.26[.0]
-1.2.18              13    10218  12.so.0.18[.0]
-1.2.19beta1-31      13    10219  12.so.0.19[.0]
-1.0.27rc1-6         10    10027  10.so.0.27[.0]
-1.2.19rc1-6         13    10219  12.so.0.19[.0]
-1.0.27              10    10027  10.so.0.27[.0]
-1.2.19              13    10219  12.so.0.19[.0]
-1.2.20beta01-04     13    10220  12.so.0.20[.0]
-1.0.28rc1-6         10    10028  10.so.0.28[.0]
-1.2.20rc1-6         13    10220  12.so.0.20[.0]
-1.0.28              10    10028  10.so.0.28[.0]
-1.2.20              13    10220  12.so.0.20[.0]
-1.2.21beta1-2       13    10221  12.so.0.21[.0]
-1.2.21rc1-3         13    10221  12.so.0.21[.0]
-1.0.29              10    10029  10.so.0.29[.0]
-1.2.21              13    10221  12.so.0.21[.0]
-1.2.22beta1-4       13    10222  12.so.0.22[.0]
-1.0.30rc1           13    10030  10.so.0.30[.0]
-1.2.22rc1           13    10222  12.so.0.22[.0]
-1.0.30              10    10030  10.so.0.30[.0]
-1.2.22              13    10222  12.so.0.22[.0]
-1.2.23beta01-05     13    10223  12.so.0.23[.0]
-1.2.23rc01          13    10223  12.so.0.23[.0]
-1.2.23              13    10223  12.so.0.23[.0]
-1.2.24beta01-02     13    10224  12.so.0.24[.0]
-1.2.24rc01          13    10224  12.so.0.24[.0]
-1.2.24              13    10224  12.so.0.24[.0]
-1.2.25beta01-06     13    10225  12.so.0.25[.0]
-1.2.25rc01-02       13    10225  12.so.0.25[.0]
-1.0.31              10    10031  10.so.0.31[.0]
-1.2.25              13    10225  12.so.0.25[.0]
-1.2.26beta01-06     13    10226  12.so.0.26[.0]
-1.2.26rc01          13    10226  12.so.0.26[.0]
-1.2.26              13    10226  12.so.0.26[.0]
-1.0.32              10    10032  10.so.0.32[.0]
-1.2.27beta01-06     13    10227  12.so.0.27[.0]
-1.2.27rc01          13    10227  12.so.0.27[.0]
-1.0.33              10    10033  10.so.0.33[.0]
-1.2.27              13    10227  12.so.0.27[.0]
-1.0.34              10    10034  10.so.0.34[.0]
-1.2.28              13    10228  12.so.0.28[.0]
-1.2.29beta01-03     13    10229  12.so.0.29[.0]
-1.2.29rc01          13    10229  12.so.0.29[.0]
-1.0.35              10    10035  10.so.0.35[.0]
-1.2.29              13    10229  12.so.0.29[.0]
-1.0.37              10    10037  10.so.0.37[.0]
-1.2.30beta01-04     13    10230  12.so.0.30[.0]
-1.0.38rc01-08       10    10038  10.so.0.38[.0]
-1.2.30rc01-08       13    10230  12.so.0.30[.0]
-1.0.38              10    10038  10.so.0.38[.0]
-1.2.30              13    10230  12.so.0.30[.0]
-1.0.39rc01-03       10    10039  10.so.0.39[.0]
-1.2.31rc01-03       13    10231  12.so.0.31[.0]
-1.0.39              10    10039  10.so.0.39[.0]
-1.2.31              13    10231  12.so.0.31[.0]
-1.2.32beta01-02     13    10232  12.so.0.32[.0]
-1.0.40rc01          10    10040  10.so.0.40[.0]
-1.2.32rc01          13    10232  12.so.0.32[.0]
-1.0.40              10    10040  10.so.0.40[.0]
-1.2.32              13    10232  12.so.0.32[.0]
-1.2.33beta01-02     13    10233  12.so.0.33[.0]
-1.2.33rc01-02       13    10233  12.so.0.33[.0]
-1.0.41rc01          10    10041  10.so.0.41[.0]
-1.2.33              13    10233  12.so.0.33[.0]
-1.0.41              10    10041  10.so.0.41[.0]
-1.2.34beta01-07     13    10234  12.so.0.34[.0]
-1.0.42rc01          10    10042  10.so.0.42[.0]
-1.2.34rc01          13    10234  12.so.0.34[.0]
-1.0.42              10    10042  10.so.0.42[.0]
-1.2.34              13    10234  12.so.0.34[.0]
-1.2.35beta01-03     13    10235  12.so.0.35[.0]
-1.0.43rc01-02       10    10043  10.so.0.43[.0]
-1.2.35rc01-02       13    10235  12.so.0.35[.0]
-1.0.43              10    10043  10.so.0.43[.0]
-1.2.35              13    10235  12.so.0.35[.0]
-1.2.36beta01-05     13    10236  12.so.0.36[.0]
-1.2.36rc01          13    10236  12.so.0.36[.0]
-1.0.44              10    10044  10.so.0.44[.0]
-1.2.36              13    10236  12.so.0.36[.0]
-1.2.37beta01-03     13    10237  12.so.0.37[.0]
-1.2.37rc01          13    10237  12.so.0.37[.0]
-1.2.37              13    10237  12.so.0.37[.0]
-1.2.45              10    10045  12.so.0.45[.0]
-1.0.46              10    10046  10.so.0.46[.0]
-1.2.38beta01        13    10238  12.so.0.38[.0]
-1.2.38rc01-03       13    10238  12.so.0.38[.0]
-1.0.47              10    10047  10.so.0.47[.0]
-1.2.38              13    10238  12.so.0.38[.0]
-1.2.39beta01-05     13    10239  12.so.0.39[.0]
-1.2.39rc01          13    10239  12.so.0.39[.0]
-1.0.48              10    10048  10.so.0.48[.0]
-1.2.39              13    10239  12.so.0.39[.0]
-1.2.40rc01          13    10240  12.so.0.40[.0]
-1.0.49              10    10049  10.so.0.49[.0]
-1.2.40              13    10240  12.so.0.40[.0]
 Henceforth the source version will match the shared-library minor
 and patch numbers; the shared-library major version number will be
 used for changes in backward compatibility, as it is intended.  The
 PNG_PNGLIB_VER macro, which is not used within libpng but is available
 were given the previous public release number plus a letter, until
 version 1.0.6j; from then on they were given the upcoming public
 release number plus "betaNN" or "rcN".
 .SH "SEE ALSO"
-.IR libpngpf(3) ", " png(5)
+libpngpf(3), png(5)
 .LP
 .IR libpng :
 .IP
 http://libpng.sourceforge.net (follow the [DOWNLOAD] link)
 http://www.libpng.org/pub/png
 .IP
 (generally) at the same location as
 .I libpng
 or at
 .br
-ftp://ftp.rfc-editor.org:/in-notes/rfc2083.txt
+ftp://ds.internic.net/rfc/rfc2083.txt
 .br
 or (as a W3C Recommendation) at
 .br
 http://www.w3.org/TR/REC-png.html
 with testing, bug fixes, and patience.  This wouldn't have been
 possible without all of you.
 Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.2.40 - September 10, 2009:
+Libpng version 1.4.0 - January 3, 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).
 Supported by the PNG development group
 .br
 If you modify libpng you may insert additional notices immediately following
 this sentence.
 This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.2.40, September 10, 2009, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.0, January 3, 2010, are
-Copyright (c) 2004,2006-2008 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
 with the following individual added to the list of Contributing Authors
 Cosmin Truta
 Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is a
 certification mark of the Open Source Initiative.
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-September 10, 2009
+January 3, 2010
 .\" end of man page

branch	GCC_SURGE
changeset 31	5daf16870df6
parent 30	5dc02b23752f