[devel] Imported from libpng-1.5.1beta11.tar

argument names file_gamma, int_file_gamma, and srgb_intent consistently.

ANNOUNCE

@@ -1,5 +1,5 @@
 
-Libpng 1.5.0rc01 - December 27, 2010
+Libpng 1.5.1beta11 - January 28, 2011
 
 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.
@@ -9,477 +9,111 @@ Files available for download:
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script
 
-   1.5.0rc01.tar.xz (LZMA-compressed, recommended)
-   1.5.0rc01.tar.gz
-   1.5.0rc01.tar.bz2
+   1.5.1beta11.tar.xz (LZMA-compressed, recommended)
+   1.5.1beta11.tar.gz
+   1.5.1beta11.tar.bz2
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lp150r01.7z  (LZMA-compressed, recommended)
-   lp150r01.zip
+   lp151b11.7z  (LZMA-compressed, recommended)
+   lp151b11.zip
 
 Other information:
 
-   1.5.0rc01-README.txt
-   1.5.0rc01-LICENSE.txt
+   1.5.1beta11-README.txt
+   1.5.1beta11-LICENSE.txt
 
-Changes since the last public release (1.4.1):
+Changes since the last public release (1.5.0):
 
-version 1.5.0beta01 [February 7, 2010]
-  Moved declaration of png_struct into private pngstruct.h and png_info
-    into pnginfo.h
+version 1.5.1beta01 [January 8, 2011]
+  Added description of png_set_crc_action() to the manual.
+  Added a note in the manual that the type of the iCCP profile was changed
+    from png_charpp to png_bytepp in png_get_iCCP().  This change happened
+    in version 1.5.0beta36 but is not noted in the CHANGES.  Similarly,
+    it was changed from png_charpp to png_const_bytepp in png_set_iCCP().
+  Ensure that png_rgb_to_gray ignores palette mapped images, if libpng
+    internally happens to call it with one.
+  Fixed the failure to handle palette mapped images correctly.
 
-version 1.5.0beta02 [February 7, 2010]
-  Reverted to original png_push_save_buffer() code.
+Version 1.5.1beta02 [January 14, 2011]
+  Fixed a bug in handling of interlaced images (bero at arklinux.org).
+  Updated CMakeLists.txt (Clifford Yapp)
 
-version 1.5.0beta03 [February 8, 2010]
-  Return allocated "old_buffer" in png_push_save_buffer() before
-    calling png_error().
-  Updated configure script to use SO number 15.
+Version 1.5.1beta03 [January 14, 2011]
+  Fixed typecasting of some png_debug() statements (Cosmin)
 
-version 1.5.0beta04 [February 9, 2010]
-  Removed malformed "incomplete struct declaration" of png_info from png.h
+Version 1.5.1beta04 [January 16, 2011]
+  Updated documentation of png_set|get_tRNS() (Thomas Klausner).
+  Mentioned in the documentation that applications must #include "zlib.h"
+    if they need access to anything in zlib.h, and that a number of
+    macros such as png_memset() are no longer accessible by applications.
+  Corrected pngvalid gamma test "sample" function to access all of the color
+    samples of each pixel, instead of sampling the red channel three times.
+  Prefixed variable names index, div, exp, gamma with "png_" to avoid "shadow"
+    warnings.
 
-version 1.5.0beta05 [February 12, 2010]
-  Removed PNG_DEPSTRUCT markup in pngstruct.h and pnginfo.h, and undid the
-    linewrapping that it entailed.
-  Revised comments in pngstruct.h and pnginfo.h and added pointers to
-    the libpng license.
-  Changed PNG_INTERNAL to PNG_EXPOSE_INTERNAL_STRUCTURES
-  Removed the cbuilder5 project, which has not been updated to 1.4.0.
+Version 1.5.1beta05 [January 16, 2011]
+  Changed variable names png_index, png_div, png_exp, and png_gamma to
+    char_index, divisor, exp_b10, and gamma_val, respectively, and
+    changed exp() back to png_exp().
 
-version 1.4.1beta12 and 1.5.0beta06 [February 14, 2010]
-  Fixed type declaration of png_get_chunk_malloc_max() in pngget.c (Daisuke
-    Nishikawa)
+Version 1.5.1beta06 [January 20, 2011]
+  Prevent png_push_crc_skip() from hanging while reading an unknown chunk
+    or an over-large compressed zTXt chunk with the progressive reader.
+  Eliminated more GCC "shadow" warnings.
+  Revised png_fixed() in png.c to avoid compiler warning about reaching the
+    end without returning anything.
 
-version 1.5.0beta07 [omitted]
+Version 1.5.1beta07 [January 22, 2011]
+  In the manual, describe the png_get_IHDR() arguments in the correct order.
+  Added const_png_structp and const_png_infop types, and used them in
+    prototypes for most png_get_*() functions.
 
-version 1.5.0beta08 [February 19, 2010]
-  Changed #ifdef PNG_NO_STDIO_SUPPORTED to #ifdef PNG_NO_CONSOLE_IO_SUPPORTED
-    wherever png_snprintf() is used to construct error and warning messages.
-  Noted in scripts/makefile.mingw that it expects to be run under MSYS.
-  Removed obsolete unused MMX-querying support from contrib/gregbook
-  Added exported png_longjmp() function.
-  Removed the AIX redefinition of jmpbuf in png.h
-  Added -D_ALLSOURCE in configure.ac, makefile.aix, and CMakeLists.txt
-    when building on AIX.
+Version 1.5.1beta08 [January 23, 2011]
+  Added png_get_io_chunk_type() and deprecated png_get_io_chunk_name()
+  Added synopses for the IO_STATE functions and other missing synopses
+    to the manual. Removed the synopses from libpngpf.3 because they
+    were out of date and no longer useful.  Better information can be
+    obtained by reading the prototypes and comments in pngpriv.h
+  Attempted to fix cpp on Solaris with S. Studio 12 cc, fix build
+    Added a make macro DFNCPP that is a CPP that will accept the tokens in
+    a .dfn file and adds configure stuff to test for such a CPP.  ./configure
+    should fail if one is not available.
+  Corrected const_png_ in png.h to png_const_ to avoid polluting the namespace.
+  Added png_get_current_row_number and png_get_current_pass_number for the
+    benefit of the user transform callback.
+  Added png_process_data_pause and png_process_data_skip for the benefit of
+    progressive readers that need to stop data processing or want to optimize
+    skipping of unread data (e.g. if the reader marks a chunk to be skipped.)
 
-version 1.5.0beta09 [February 19, 2010]
-  Removed -D_ALLSOURCE from configure.ac, makefile.aix, and CMakeLists.txt.
-  Changed the name of png_ptr->jmpbuf to png_ptr->png_jmpbuf in pngstruct.h
+Version 1.5.1beta09 [January 24, 2011]
+  Enhanced pngvalid, corrected an error in gray_to_rgb, corrected doc error.
+    pngvalid contains tests of transforms, which tests are currently disabled
+    because they are incompletely tested.  gray_to_rgb was failing to expand
+    the bit depth for smaller bit depth images; this seems to be a long
+    standing error and resulted, apparently, in invalid output.  The
+    documentation did not accurately describe what libpng really does when
+    converting RGB to gray.
 
-version 1.5.0beta10 [February 25, 2010]
-  Removed unused gzio.c from contrib/pngminim gather and makefile scripts
-  Removed replacement error handlers from contrib/gregbook.  Because of
-    the new png_longjmp() function they are no longer needed.
+Version 1.5.1beta10 [January 27, 2010]
+  Fixed incorrect examples of callback prototypes in the manual, that were
+    introduced in libpng-1.0.0.
+  In addition the order of the png_get_uint macros with respect to the
+    relevant function definitions has been reversed.  This helps the
+    preprocessing of the symbol files be more robust.  Furthermore, the
+    symbol file preprocessing now uses -DPNG_NO_USE_READ_MACROS even when
+    the library may actually be built with PNG_USE_READ_MACROS; this stops
+    the read macros interfering with the symbol file format.
+  Made the manual, synopses, and function prototypes use the function
+    argument names file_gamma, int_file_gamma, and srgb_intent consistently.
 
-version 1.5.0beta11 [March 6, 2010]
-  Removed checking for already-included setjmp.h from pngconf.h
-  Fixed inconsistent indentations and made numerous cosmetic changes.
-  Revised the "SEE ALSO" style of libpng.3, libpngpf.3, and png.5
-
-version 1.5.0beta12 [March 9, 2010]
-  Moved "#include png.h" inside pngpriv.h and removed "#include png.h" from
-    the source files, along with "#define PNG_EXPOSE_INTERNAL_STRUCTURES"
-    and "#define PNG_NO_PEDANTIC_WARNINGS" (John Bowler).
-  Created new pngdebug.h and moved debug definitions there.
-
-version 1.5.0beta13 [March 10, 2010]
-  Protect pngstruct.h, pnginfo.h, and pngdebug.h from being included twice.
-  Revise the "#ifdef" blocks in png_inflate() so it will compile when neither
-    PNG_USER_CHUNK_MALLOC_MAX nor PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
-    is defined.
-  Removed unused png_measure_compressed_chunk() from pngpriv.h and libpngpf.3
-  Moved the 'config.h' support from pngconf.h to pngpriv.h
-  Removed PNGAPI from the png_longjmp_ptr typedef.
-  Eliminated dependence of pngtest.c on the private pngdebug.h file.
-  Make all png_debug macros into *unterminated* statements or
-    expressions (i.e. a trailing ';' must always be added) and correct
-    the format statements in various png_debug messages.
-
-version 1.5.0beta14 [March 14, 2010]
-  Removed direct access to png_ptr->io_ptr from the Windows code in pngtest.c
-  Revised Makefile.am to account for recent additions and replacements.
-  Corrected CE and OS/2 DEF files (scripts/png*def) for symbols removed and
-    added ordinal numbers to the Windows DEF file and corrected the duplicated
-    ordinal numbers on CE symbols that are commented out.
-  Added back in export symbols that can be present in the Windows build but
-    are disabled by default.
-  PNG_EXPORT changed to include an 'ordinal' field for DEF file generation.
-    PNG_CALLBACK added to make callback definitions uniform.  PNGAPI split
-    into PNGCAPI (base C form), PNGAPI (exports) and PNGCBAPI (callbacks),
-    and appropriate changes made to all files.  Cygwin builds re-hinged to
-    allow procedure call standard changes and to remove the need for the DEF
-    file (fixes build on Cygwin).
-  Enabled 'attribute' warnings that are relevant to library APIs and callbacks.
-  Changed rules for generation of the various symbol files and added a new
-    rule for a DEF file (which is also added to the distribution).
-  Updated the symbol file generation to stop it adding spurious spaces
-    to EOL (coming from preprocessor macro expansion).  Added a facility
-    to join tokens in the output and rewrite *.dfn to use this.
-  Eliminated scripts/*.def in favor of libpng.def; updated projects/visualc71
-    and removed scripts/makefile.cygwin.
-  Made PNG_BUILD_DLL safe: it can be set whenever a DLL is being built.
-  Removed the include of sys/types.h - apparently unnecessary now on the
-    platforms on which it happened (all but Mac OS and RISC OS).
-  Moved the Mac OS test into pngpriv.h (the only place it is used.)
-
-version 1.5.0beta15 [March 17, 2010]
-  Added symbols.chk target to Makefile.am to validate the symbols in png.h
-    against the new DEF file scripts/symbols.def.
-  Changed the default DEF file back to pngwin.def.
-  Removed makefile.mingw.
-  Eliminated PNG_NO_EXTERN and PNG_ALL_EXTERN
-
-version 1.5.0beta16 [April 1, 2010]
-  Made png_text_struct independent of PNG_iTXt_SUPPORTED, so that
-    fields are initialized in all configurations.  The READ/WRITE
-    macros (PNG_(READ|WRITE)_iTXt_SUPPORTED) still function as
-    before to disable code to actually read or write iTXt chunks
-    and iTXt_SUPPORTED can be used to detect presence of either
-    read or write support (but it is probably better to check for
-    the one actually required - read or write.)
-  Combined multiple png_warning() calls for a single error.
-  Restored the macro definition of png_check_sig().
-
-version 1.5.0beta17 [April 17, 2010]
-  Documented the fact that png_set_dither() was disabled since libpng-1.4.0.
-  Reenabled png_set_dither() but renamed it to png_set_quantize() to reflect
-    more accurately what it actually does.  At the same time, renamed
-    the PNG_DITHER_[RED,GREEN_BLUE]_BITS macros to
-    PNG_QUANTIZE_[RED,GREEN,BLUE]_BITS.
-  Added some "(long)" typecasts to printf calls in png_handle_cHRM().
-  Freeze build-time only configuration in the build.
-    In all prior versions of libpng most configuration options
-    controlled by compiler #defines had to be repeated by the
-    application code that used libpng.  This patch changes this
-    so that compilation options that can only be changed at build
-    time are frozen in the build.  Options that are compiler
-    dependent (and those that are system dependent) are evaluated
-    each time - pngconf.h holds these.  Options that can be changed
-    per-file in the application are in png.h.  Frozen options are
-    in the new installed header file pnglibconf.h (John Bowler)
-  Removed the xcode project because it has not been updated to work
-    with libpng-1.5.0.
-
-version 1.5.0beta18 [April 17, 2010]
-  Restored the ability to include optional pngusr.h
-  Moved replacements for png_error() and png_warning() from the
-    contrib/pngminim project to pngerror.c, for use when warnings or
-    errors are disabled via PNG_NO_WARN or PNG_NO_ERROR_TEXT, to avoid
-    storing unneeded error/warning text.
-  Updated contrib/pngminim project to work with the new pnglibconf.h
-  Added some PNG_NO_* defines to contrib/pngminim/*/pngusr.h to save space.
-
-version 1.5.0beta19 [April 24, 2010]
-  Added PNG_{READ,WRITE}_INT_FUNCTIONS_SUPPORTED.  This allows the functions
-    to read and write ints to be disabled independently of PNG_USE_READ_MACROS,
-    which allows libpng to be built with the functions even though the default
-    is to use the macros - this allows applications to choose at app build
-    time whether or not to use macros (previously impossible because the
-    functions weren't in the default build.)
-  Changed Windows calling convention back to __cdecl for API functions.
-    For Windows/x86 platforms only:
-      __stdcall is no longer needed for Visual Basic, so libpng-1.5.0 uses
-      __cdecl throughout (both API functions and callbacks) on Windows/x86
-      platforms.
-  Replaced visualc6 and visualc71 projects with new vstudio project
-  Relaxed the overly-restrictive permissions of some files.
-
-version 1.5.0beta20 [April 24, 2010]
-  Relaxed more overly-restrictive permissions of some files.
-
-version 1.5.0beta21 [April 27, 2010]
-  Removed some unwanted binary bytes and changed CRLF to NEWLINE in the new
-    vstudio project files, and some trivial editing of some files in the
-    scripts directory.
-  Set PNG_NO_READ_BGR, PNG_NO_IO_STATE, and PNG_NO_TIME_RFC1123 in
-    contrib/pngminim/decoder/pngusr.h to make a smaller decoder application.
-
-version 1.5.0beta22 [April 28, 2010]
-  Fixed dependencies of GET_INT_32 - it does not require READ_INT_FUNCTIONS
-    because it has a macro equivalent.
-  Improved the options.awk script; added an "everything off" option.
-  Revised contrib/pngminim to use the "everything off" option in pngusr.dfa.
-
-version 1.5.0beta23 [April 29, 2010]
-  Corrected PNG_REMOVED macro to take five arguments.
-    The macro was documented with two arguments (name,ordinal), however
-    the symbol checking .dfn files assumed five arguments.  The five
-    argument form seems more useful so it is changed to that.
-  Corrected PNG_UNKNOWN_CHUNKS_SUPPORTED to PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-    in gregbook/readpng2.c
-  Corrected protection of png_get_user_transform_ptr. The API declaration in
-    png.h is removed if both READ and WRITE USER_TRANSFORM are turned off
-    but was left defined in pngtrans.c
-  Added logunsupported=1 to cause pnglibconf.h to document disabled options.
-    This makes the installed pnglibconf.h more readable but causes no
-    other change.  The intention is that users of libpng will find it
-    easier to understand if an API they need is missing.
-  Include png_reset_zstream() in png.c only when PNG_READ_SUPPORTED is defined.
-  Removed dummy_inflate.c from contrib/pngminim/encoder
-  Removed contrib/pngminim/*/gather.sh; gathering is now done in the makefile.
-
-version 1.5.0beta24 [May 7, 2010]
-  Use bitwise "&" instead of arithmetic mod in pngrutil.c calculation of the
-    offset of the png_ptr->rowbuf pointer into png_ptr->big_row_buf.
-  Added more blank lines for readability.
-
-version 1.5.0beta25 [December 27, 2010]
-  In pngpread.c: png_push_have_row() add check for new_row > height
-  Removed the now-redundant check for out-of-bounds new_row from example.c
-
-version 1.5.0beta26 [June 18, 2010]
-  In pngpread.c: png_push_process_row() add check for too many rows.
-
-version 1.5.0beta27 [June 18, 2010]
-  Removed the check added in beta25 as it is now redundant.
-
-version 1.5.0beta28 [June 19, 2010]
-  Rewrote png_process_IDAT_data to consistently treat extra data as warnings
-    and handle end conditions more cleanly.
-  Removed the new (beta26) check in png_push_process_row().
-
-version 1.5.0beta29 [June 21, 2010]
-  Revised scripts/options.awk to work on Sunos (but still doesn't work)
-  Added comment to options.awk and contrib/pngminim/*/makefile to try nawk.
-
-version 1.5.0beta30 [June 22, 2010]
-  Stop memory leak when reading a malformed sCAL chunk.
-
-version 1.5.0beta31 [June 26, 2010]
-  Revised pngpread.c patch of beta28 to avoid an endless loop.
-  Removed some trailing blanks.
-
-version 1.5.0beta32 [June 26, 2010]
-  Removed leftover scripts/options.patch and scripts/options.rej
-
-version 1.5.0beta33 [July 6, 2010]
-  Made FIXED and FLOATING options consistent in the APIs they enable and
-    disable.  Corrected scripts/options.awk to handle both command line
-    options and options specified in the .dfa files.
-  Changed char *msg to PNG_CONST char *msg in pngrutil.c
-  Make png_set_sRGB_gAMA_and_cHRM set values using either the fixed or
-    floating point APIs, but not both.
-  Reversed patch to remove error handler when the jmp_buf is stored in the
-    main program structure, not the png_struct.
-    The error handler is needed because the default handler in libpng will
-    always use the jmp_buf in the library control structure; this is never
-    set.  The gregbook code is a useful example because, even though it
-    uses setjmp/longjmp, it shows how error handling can be implemented
-    using control mechanisms not directly supported by libpng.  The
-    technique will work correctly with mechanisms such as Microsoft
-    Structure Exceptions or C++ exceptions (compiler willing - note that gcc
-    does not by default support interworking of C and C++ error handling.)
-  Reverted changes to call png_longjmp in contrib/gregbook where it is not
-    appropriate.  If mainprog->jmpbuf is used by setjmp, then png_longjmp
-    cannot be used.
-  Changed "extern PNG_EXPORT" to "PNG_EXPORT" in png.h (Jan Nijtmans)
-  Changed "extern" to "PNG_EXTERN" in pngpriv.h (except for the 'extern "C" {')
-
-version 1.5.0beta34 [July 12, 2010]
-  Put #ifndef PNG_EXTERN, #endif around the define PNG_EXTERN in pngpriv.h
-
-version 1.5.0beta35 [July 24, 2010]
-  Removed some newly-added TAB characters.
-  Added -DNO_PNG_SNPRINTF to CFLAGS in scripts/makefile.dj2
-  Moved the definition of png_snprintf() outside of the enclosing
-    #ifdef blocks in pngconf.h
-
-version 1.5.0beta36 [July 29, 2010]
-  Patches by John Bowler:
-  Fixed point APIs are now supported throughout (no missing APIs).
-  Internal fixed point arithmetic support exists for all internal floating
-    point operations.
-  sCAL validates the floating point strings it is passed.
-  Safe, albeit rudimentary, Watcom support is provided by PNG_API_RULE==2
-  Two new APIs exist to get the number of passes without turning on the
-    PNG_INTERLACE transform and to get the number of rows in the current
-    pass.
-  A new test program, pngvalid.c, validates the gamma code.
-  Errors in the 16 bit gamma correction (overflows) have been corrected.
-  cHRM chunk testing is done consistently (previously the floating point
-    API bypassed it, because the test really didn't work on FP, now the test
-    is performed on the actual values to be stored in the PNG file so it
-    works in the FP case too.)
-  Most floating point APIs now simply call the fixed point APIs after
-    converting the values to the fixed point form used in the PNG file.
-  The standard headers no longer include zlib.h, which is currently only
-    required for pngstruct.h and can therefore be internal.
-  Revised png_get_int_32 to undo the PNG two's complement representation of
-    negative numbers.
-
-version 1.5.0beta37 [July 30, 2010]
-  Added a typecast in png_get_int_32() in png.h and pngrutil.h to avoid
-    a compiler warning.
-  Replaced oFFs 0,0 with oFFs -10,20 in pngtest.png
-
-version 1.5.0beta38 [July 31, 2010]
-  Implemented remaining "_fixed" functions.
-  Corrected a number of recently introduced warnings mostly resulting from
-    safe but uncast assignments to shorter integers.  Also added a zlib
-    VStudio release library project because the latest zlib Official Windows
-    build does not include such a thing.
-  Revised png_get_int_16() to be similar to png_get_int_32().
-  Restored projects/visualc71.
-
-version 1.5.0beta39 [August 2, 2010]
-  VisualC/GCC warning fixes, VisualC build fixes
-  The changes include support for function attributes in VC in addition to
-    those already present in GCC - necessary because without these some
-    warnings are unavoidable.  Fixes include signed/unsigned fixes in
-    pngvalid and checks with gcc -Wall -Wextra -Wunused.
-  VC requires function attributes on function definitions as well as
-    declarations, PNG_FUNCTION has been added to enable this and the
-    relevant function definitions changed.
-
-version 1.5.0beta40 [August 6, 2010]
-  Correct use of _WINDOWS_ in pngconf.h
-  Removed png_mem_ #defines; they are no longer used.
-  Added the sRGB chunk to pngtest.png
-
-version 1.5.0beta41 [August 11, 2010]
-  Added the cHRM chunk to pngtest.png
-  Don't try to use version-script with cygwin/mingw.
-  Revised contrib/gregbook to work under cygwin/mingw.
-
-version 1.5.0beta42 [August 18, 2010]
-  Add .dll.a to the list of extensions to be symlinked by Makefile.am (Yaakov)
-  Made all API functions that have const arguments and constant string
-    literal pointers declare them (John Bowler).
-
-Version 1.5.0beta43 [August 20, 2010]
-  Removed spurious tabs, shorten long lines (no source change)
-    Also added scripts/chkfmt to validate the format of all the files that can
-    reasonably be validated (it is suggested to run "make distclean" before
-    checking, because some machine generated files have long lines.)
-  Reformatted the CHANGES file to be more consistent throughout.
-  Made changes to address various issues identified by GCC, mostly
-    signed/unsigned and shortening problems on assignment but also a few
-    difficult to optimize (for GCC) loops.
-  Fixed non-GCC fixed point builds.  In png.c a declaration was misplaced
-    in an earlier update.  Fixed to declare the auto variables at the head.
-  Use cexcept.h in pngvalid.c.
-
-Version 1.5.0beta44 [August 24, 2010]
-  Updated CMakeLists.txt to use CMAKE_INSTALL_LIBDIR variable; useful for
-    installing libpng in /usr/lib64 (Funda Wang).
-  Revised CMakeLists.txt to put the man pages in share/man/man* not man/man*
-  Revised CMakeLists.txt to make symlinks instead of copies when installing.
-  Changed PNG_LIB_NAME from pngNN to libpngNN in CMakeLists.txt (Philip Lowman)
-  Implemented memory checks within pngvalid
-  Reformatted/rearranged pngvalid.c to assist use of progressive reader.
-  Check interlaced images in pngvalid
-  Clarified pngusr.h comments in pnglibconf.dfa
-  Simplified the pngvalid error-handling code now that cexcept.h is in place.
-  Implemented progressive reader in pngvalid.c for standard tests
-  Implemented progressive read in pngvalid.c gamma tests
-  Turn on progressive reader in pngvalid.c by default and tidy code.
-
-Version 1.5.0beta45 [August 26, 2010]
-  Added an explicit make step to projects/vstudio for pnglibconf.h
-    Also corrected zlib.vcxproj into which Visual Studio had introduced
-    what it calls an "authoring error".  The change to make pnglibconf.h
-    simply copies the file; in the future it may actually generate the
-    file from scripts/pnglibconf.dfa as the other build systems do.
-  Changed pngvalid to work when floating point APIs are disabled
-  Renamed the prebuilt scripts/pnglibconf.h to scripts/pnglibconf.h.prebuilt
-  Supply default values for PNG_USER_PRIVATEBUILD and PNG_USER_DLLFNAME_POSTFIX
-    in pngpriv.h in case the user neglected to define them in their pngusr.h
-
-Version 1.5.0beta46 [August 28, 2010]
-  Added new private header files to libpng_sources in CMakeLists.txt
-  Added PNG_READ_16BIT, PNG_WRITE_16BIT, and PNG_16BIT options.
-  Added reference to scripts/pnglibconf.h.prebuilt in the visualc71 project.
-
-Version 1.5.0beta47 [September 11, 2010]
-  Fixed a number of problems with 64-bit compilation reported by Visual
-    Studio 2010 (John Bowler).
-
-Version 1.5.0beta48 [October 4, 2010]
-  Updated CMakeLists.txt (Philip Lowman).
-  Revised autogen.sh to recognize and use $AUTOCONF, $AUTOMAKE, $AUTOHEADER,
-    $AUTOPOINT, $ACLOCAL and $LIBTOOLIZE
-  Fixed problem with symbols creation in Makefile.am which was assuming that
-    all versions of ccp write to standard output by default (Martin Banky). The
-    bug was introduced in libpng-1.2.9beta5.
-
-Version 1.5.0beta49 [October 8, 2010]
-  Undid Makefile.am revision of 1.5.0beta48.
-
-Version 1.5.0beta50 [October 14, 2010]
-  Revised Makefile.in to account for mkinstalldirs being removed.
-  Added some "(unsigned long)" typecasts in printf statements in pngvalid.c.
-  Suppressed a compiler warning in png_handle_sPLT().
-  Check for out-of-range text compression mode in png_set_text().
-
-Version 1.5.0beta51 [October 15, 2010]
-  Changed embedded dates to "(PENDING RELEASE) in beta releases (and future
-    rc releases) to minimize the difference between releases.
-
-Version 1.5.0beta52 [October 16, 2010]
-  Restored some of the embedded dates (in png.h, png.c, documentation, etc.)
-
-Version 1.5.0beta53 [October 18, 2010]
-  Updated INSTALL to mention using "make maintainer-clean" and to remove
-    obsolete statement about a custom ltmain.sh
-  Disabled "color-tests" by default in Makefile.am so it will work with
-    automake versions earlier than 1.11.1
-  Use document name "libpng-manual.txt" instead of "libpng-<version>.txt"
-    to simplify version differences.
-  Removed obsolete remarks about setjmp handling from INSTALL.
-  Revised and renamed the typedef in png.h and png.c that was designed
-    to catch library and header mismatch.
-
-Version 1.5.0beta54 [November 10, 2010]
-  Require 48 bytes, not 64 bytes, for big_row_buf in overflow checks.
-  Used a consistent structure for the pngget.c functions.
-
-Version 1.5.0beta55 [November 21, 2010]
-  Revised png_get_uint_32, png_get_int_32, png_get_uint_16 (Cosmin)
-  Moved reading of file signature into png_read_sig (Cosmin)
-  Fixed atomicity of chunk header serialization (Cosmin)
-  Added test for io_state in pngtest.c (Cosmin)
-  Added "#!/bin/sh" at the top of contrib/pngminim/*/gather.sh scripts.
-  Changes to remove gcc warnings (John Bowler)
-    Certain optional gcc warning flags resulted in warnings in libpng code.
-    With these changes only -Wconversion and -Wcast-qual cannot be turned on.
-    Changes are trivial rearrangements of code.  -Wconversion is not possible
-    for pngrutil.c (because of the widespread use of += et al on variables
-    smaller than (int) or (unsigned int)) and -Wcast-qual is not possible
-    with pngwio.c and pngwutil.c because the 'write' callback and zlib
-    compression both fail to declare their input buffers with 'const'.
-
-Version 1.5.0beta56 [December 7, 2010]
-  Added the private PNG_UNUSED() macro definition in pngpriv.h.
-  Added some commentary about PNG_EXPORT in png.h and pngconf.h
-  Revised PNG_EXPORT() macro and added PNG_EXPORTA() macro, with the
-    objective of simplifying and improving the cosmetic appearance of png.h.
-  Fixed some incorrect "=" macro names in pnglibconf.dfa
-  Included documentation of changes in 1.5.0 from 1.4.x in libpng-manual.txt
-
-Version 1.5.0beta57 [December 9, 2010]
-  Documented the pngvalid gamma error summary with additional comments and
-    print statements.
-  Improved missing symbol handling in checksym.awk; symbols missing in both
-    the old and new files can now be optionally ignored, treated as errors
-    or warnings.
-  Removed references to pngvcrd.c and pnggccrd.c from the vstudio project.
-  Updated "libpng14" to "libpng15" in the visualc71 project.
-  Enabled the strip16 tests in pngvalid.`
-  Don't display test results (except PASS/FAIL) when running "make test".
-    Instead put them in pngtest-log.txt
-  Added "--with-zprefix=<string>" to configure.ac
-  Updated the prebuilt configuration files to autoconf version 2.68
-
-Version 1.5.0beta58 [December 19, 2010]
-  Fixed interlace image handling and add test cases (John Bowler)
-  Fixed the clean rule in Makefile.am to remove pngtest-log.txt
-  Made minor changes to work around warnings in gcc 3.4
-
-Version 1.5.0rc01 [December 27, 2010]
-  No changes.
+Version 1.5.1beta11 [January 28, 2011]
+  Changed PNG_UNUSED from "param=param;" to "{if(param){}}".
+  Corrected local variable type in new API png_process_data_skip()
+    The type was self-evidently incorrect but only causes problems on 64 bit
+    architectures.
+  Added transform tests to pngvalid and simplified the arguments.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
 (subscription required; visit

CHANGES

@@ -3119,6 +3119,118 @@ Version 1.5.0beta58 [December 19, 2010]
 Version 1.5.0rc01 [December 27, 2010]
   No changes.
 
+Version 1.5.0rc02 [December 27, 2010]
+  Eliminated references to the scripts/*.def files in project/visualc71.
+
+Version 1.5.0rc03 [December 28, 2010]
+  Eliminated scripts/*.def and revised Makefile.am accordingly
+
+Version 1.5.0rc04 [December 29, 2010]
+  Fixed bug in background transformation handling in pngrtran.c (it was
+    looking for the flag in png_ptr->transformations instead of in
+    png_ptr->flags) (David Raymond).
+
+Version 1.5.0rc05 [December 31, 2010]
+  Fixed typo in a comment in CMakeLists.txt (libpng14 => libpng15) (Cosmin)
+
+Version 1.5.0rc06 [January 4, 2011]
+  Changed the new configure option "zprefix=string" to "zlib-prefix=string"
+
+Version 1.5.0rc07 [January 4, 2011]
+  Updated copyright year.
+
+Version 1.5.0 [January 6, 2011]
+  No changes.
+
+version 1.5.1beta01 [January 8, 2011]
+  Added description of png_set_crc_action() to the manual.
+  Added a note in the manual that the type of the iCCP profile was changed
+    from png_charpp to png_bytepp in png_get_iCCP().  This change happened
+    in version 1.5.0beta36 but is not noted in the CHANGES.  Similarly,
+    it was changed from png_charpp to png_const_bytepp in png_set_iCCP().
+  Ensure that png_rgb_to_gray ignores palette mapped images, if libpng
+    internally happens to call it with one.
+  Fixed a failure to handle palette mapped images correctly.
+
+Version 1.5.1beta02 [January 14, 2011]
+  Fixed a bug in handling of interlaced images (bero at arklinux.org).
+  Updated CMakeLists.txt (Clifford Yapp)
+
+Version 1.5.1beta03 [January 14, 2011]
+  Fixed typecasting of some png_debug() statements (Cosmin)
+
+Version 1.5.1beta04 [January 16, 2011]
+  Updated documentation of png_set|get_tRNS() (Thomas Klausner).
+  Mentioned in the documentation that applications must #include "zlib.h"
+    if they need access to anything in zlib.h, and that a number of
+    macros such as png_memset() are no longer accessible by applications.
+  Corrected pngvalid gamma test "sample" function to access all of the color
+    samples of each pixel, instead of sampling the red channel three times.
+  Prefixed variable names index, div, exp, gamma with "png_" to avoid "shadow"
+    warnings, and (mistakenly) changed png_exp() to exp().
+
+Version 1.5.1beta05 [January 16, 2011]
+  Changed variable names png_index, png_div, png_exp, and png_gamma to
+    char_index, divisor, exp_b10, and gamma_val, respectively, and
+    changed exp() back to png_exp().
+
+Version 1.5.1beta06 [January 20, 2011]
+  Prevent png_push_crc_skip() from hanging while reading an unknown chunk
+    or an over-large compressed zTXt chunk with the progressive reader.
+  Eliminated more GCC "shadow" warnings.
+  Revised png_fixed() in png.c to avoid compiler warning about reaching the
+    end without returning anything.
+
+Version 1.5.1beta07 [January 22, 2011]
+  In the manual, describe the png_get_IHDR() arguments in the correct order.
+  Added const_png_structp and const_png_infop types, and used them in
+    prototypes for most png_get_*() functions.
+
+Version 1.5.1beta08 [January 23, 2011]
+  Added png_get_io_chunk_type() and deprecated png_get_io_chunk_name()
+  Added synopses for the IO_STATE functions and other missing synopses
+    to the manual. Removed the synopses from libpngpf.3 because they
+    were out of date and no longer useful.  Better information can be
+    obtained by reading the prototypes and comments in pngpriv.h
+  Attempted to fix cpp on Solaris with S. Studio 12 cc, fix build
+    Added a make macro DFNCPP that is a CPP that will accept the tokens in
+    a .dfn file and adds configure stuff to test for such a CPP.  ./configure
+    should fail if one is not available.
+  Corrected const_png_ in png.h to png_const_ to avoid polluting the namespace.
+  Added png_get_current_row_number and png_get_current_pass_number for the
+    benefit of the user transform callback.
+  Added png_process_data_pause and png_process_data_skip for the benefit of
+    progressive readers that need to stop data processing or want to optimize
+    skipping of unread data (e.g., if the reader marks a chunk to be skipped.)
+
+Version 1.5.1beta09 [January 24, 2011]
+  Enhanced pngvalid, corrected an error in gray_to_rgb, corrected doc error.
+    pngvalid contains tests of transforms, which tests are currently disabled
+    because they are incompletely tested.  gray_to_rgb was failing to expand
+    the bit depth for smaller bit depth images; this seems to be a long
+    standing error and resulted, apparently, in invalid output.  The
+    documentation did not accurately describe what libpng really does when
+    converting RGB to gray.
+
+Version 1.5.1beta10 [January 27, 2010]
+  Fixed incorrect examples of callback prototypes in the manual, that were
+    introduced in libpng-1.0.0.
+  In addition the order of the png_get_uint macros with respect to the
+    relevant function definitions has been reversed.  This helps the
+    preprocessing of the symbol files be more robust.  Furthermore, the
+    symbol file preprocessing now uses -DPNG_NO_USE_READ_MACROS even when
+    the library may actually be built with PNG_USE_READ_MACROS; this stops
+    the read macros interfering with the symbol file format.
+  Made the manual, synopses, and function prototypes use the function
+    argument names file_gamma, int_file_gamma, and srgb_intent consistently.
+
+Version 1.5.1beta11 [January 28, 2011]
+  Changed PNG_UNUSED from "param=param;" to "{if(param){}}".
+  Corrected local variable type in new API png_process_data_skip()
+    The type was self-evidently incorrect but only causes problems on 64 bit
+    architectures.
+  Added transform tests to pngvalid and simplified the arguments.
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement

CMakeLists.txt

@@ -25,7 +25,7 @@ endif()
 project(libpng C)
 enable_testing()
 
-# Copyright (C) 2007-2010 Glenn Randers-Pehrson
+# Copyright (C) 2007-2011 Glenn Randers-Pehrson
 
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
@@ -33,7 +33,7 @@ enable_testing()
 
 set(PNGLIB_MAJOR 1)
 set(PNGLIB_MINOR 5)
-set(PNGLIB_RELEASE 0)
+set(PNGLIB_RELEASE 1)
 set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
 set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
 
@@ -240,28 +240,31 @@ endmacro()
 # CREATE PKGCONFIG FILES
 # we use the same files like ./configure, so we have to set its vars
 if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-  set(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib)
+  set(CMAKE_INSTALL_LIBDIR lib)
 endif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
 set(prefix      ${CMAKE_INSTALL_PREFIX})
 set(exec_prefix ${CMAKE_INSTALL_PREFIX})
-set(libdir      ${CMAKE_INSTALL_LIBDIR})
+set(libdir      ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
 set(includedir  ${CMAKE_INSTALL_PREFIX}/include)
 set(LIBS        "-lz -lm")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in
   ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY)
-_png_generate_symlink_code(PNG_PC_INSTALL_CODE ${PNGLIB_NAME}.pc libpng.pc)
+_png_generate_symlink_code(PNG_PC_INSTALL_CODE
+  ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc
+  ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc)
 install(CODE ${PNG_PC_INSTALL_CODE})
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in
   ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY)
-_png_generate_symlink_code(PNG_CONFIG_INSTALL_CODE ${PNGLIB_NAME}-config
-  libpng-config)
+_png_generate_symlink_code(PNG_CONFIG_INSTALL_CODE
+  ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config
+  ${CMAKE_CURRENT_BINARY_DIR}/libpng-config)
 install(CODE ${PNG_CONFIG_INSTALL_CODE})
 
 # SET UP LINKS
 if(PNG_SHARED)
   set_target_properties(${PNG_LIB_NAME} PROPERTIES
-#   VERSION 15.${PNGLIB_RELEASE}.1.5.0rc01
+#   VERSION 15.${PNGLIB_RELEASE}.1.5.1beta11
     VERSION 15.${PNGLIB_RELEASE}.0
     SOVERSION 15
     CLEAN_DIRECT_OUTPUT 1)
@@ -295,7 +298,7 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
-    # Create a symlink for libpng.dll.a => libpng14.dll.a on Cygwin
+    # Create a symlink for libpng.dll.a => libpng15.dll.a on Cygwin
     if(CYGWIN)
       _png_generate_symlink_code(PNG_SHARED_IMPLIB_INSTALL_CODE
         ${PNGLIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}
@@ -307,13 +310,23 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
     endif()
 
     if(NOT WIN32)
-      _png_generate_symlink_code(PNG_SHARED_INSTALL_CODE
-            ${PNGLIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
-            libpng${CMAKE_SHARED_LIBRARY_SUFFIX})
-      install(CODE ${PNG_SHARED_INSTALL_CODE})
-      install(FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}
-        DESTINATION ${CMAKE_INSTALL_LIBDIR})
+      IF(CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+        _png_generate_symlink_code(PNG_SHARED_INSTALL_CODE
+ ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${PNGLIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
+ ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libpng${CMAKE_SHARED_LIBRARY_SUFFIX})
+                install(CODE ${PNG_SHARED_INSTALL_CODE})
+                install(FILES
+ ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}
+                DESTINATION ${CMAKE_INSTALL_LIBDIR})
+      ELSE(CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+        _png_generate_symlink_code(PNG_SHARED_INSTALL_CODE
+           ${PNGLIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
+           libpng${CMAKE_SHARED_LIBRARY_SUFFIX})
+        install(CODE ${PNG_SHARED_INSTALL_CODE})
+        install(FILES
+           ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}
+                DESTINATION ${CMAKE_INSTALL_LIBDIR})
+      ENDIF(CMAKE_LIBRARY_OUTPUT_DIRECTORY)
     endif()
   endif()
 
@@ -323,13 +336,23 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
             LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
     if(NOT WIN32 OR CYGWIN)
-      _png_generate_symlink_code(PNG_STATIC_INSTALL_CODE
-            ${PNGLIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
-            libpng${CMAKE_STATIC_LIBRARY_SUFFIX})
-      install(CODE ${PNG_STATIC_INSTALL_CODE})
-      install(FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}
-        DESTINATION ${CMAKE_INSTALL_LIBDIR})
+      IF(CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
+         _png_generate_symlink_code(PNG_STATIC_INSTALL_CODE
+${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${PNGLIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+        ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/libpng${CMAKE_STATIC_LIBRARY_SUFFIX})
+        install(CODE ${PNG_STATIC_INSTALL_CODE})
+        install(FILES
+          ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}
+             DESTINATION ${CMAKE_INSTALL_LIBDIR})
+      ELSE(CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
+        _png_generate_symlink_code(PNG_STATIC_INSTALL_CODE
+           ${PNGLIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+           libpng${CMAKE_STATIC_LIBRARY_SUFFIX})
+        install(CODE ${PNG_STATIC_INSTALL_CODE})
+        install(FILES
+          ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}
+                     DESTINATION ${CMAKE_INSTALL_LIBDIR})
+      ENDIF(CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
     endif()
   endif()
 endif()
@@ -367,7 +390,7 @@ if(PNG_EXPORT_RULE AND NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL )
   install(EXPORT libpng DESTINATION lib/libpng FILE lib${PNG_LIB_NAME}.cmake)
 endif()
 
-# what's with libpng-manual.txt and all the extra files?
+# what's with libpng-$VER%.txt and all the extra files?
 
 
 # UNINSTALL

LICENSE

@@ -10,8 +10,8 @@ this sentence.
 
 This code is released under the libpng license.
 
-libpng versions 1.2.6, August 15, 2004, through 1.5.0rc01, December 27, 2010, are
-Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are
+libpng versions 1.2.6, August 15, 2004, through 1.5.1beta11, January 28, 2011, are
+Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
 
@@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-December 27, 2010
+January 28, 2011

Makefile.am

@@ -75,12 +75,19 @@ SCRIPT_CLEANFILES=scripts/*.out scripts/*.chk scripts/pnglibconf.dfn
 
 CLEANFILES= dfn.c dfn?.out pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc \
 	libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers libpng.sym \
-	pngwin.def check.new pnglibconf.* symbols.new pngtest-log.txt \
+	check.new pnglibconf.* symbols.new pngtest-log.txt \
 	$(SCRIPT_CLEANFILES)
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
 config.sub configure depcomp install-sh ltmain.sh missing
 
+# DFNCPP is normally just CPP - the C preprocessor - but on Solaris and maybe
+# other operating systems (NeXT?) the C preprocessor selected by configure
+# checks input tokens for validity - effectively it performs part of the ANSI-C
+# parsing - and therefore fails with the .df files.  configure.ac has special
+# checks for this and sets DFNCPP appropriately.
+DFNCPP = @DFNCPP@
+
 SUFFIXES = .chk .dfn .out
 
 $(PNGLIB_BASENAME).pc: libpng.pc
@@ -90,7 +97,7 @@ $(PNGLIB_BASENAME)-config: libpng-config
 	cp libpng-config $@
 
 scripts/sym.out scripts/vers.out: png.h pngconf.h pnglibconf.h
-scripts/symbols.out scripts/pngwin.out: png.h pngconf.h scripts/pnglibconf.h.prebuilt
+scripts/symbols.out: png.h pngconf.h scripts/pnglibconf.h.prebuilt
 
 libpng.sym: scripts/sym.out
 	rm -f $@
@@ -98,9 +105,6 @@ libpng.sym: scripts/sym.out
 libpng.vers: scripts/vers.out
 	rm -f $@
 	cp $? $@
-pngwin.def: scripts/pngwin.out
-	rm -f $@
-	cp $? $@
 pnglibconf.h: pnglibconf.out
 	rm -f $@
 	cp $? $@
@@ -114,15 +118,19 @@ scripts/pnglibconf.h.prebuilt:
 # 'make test' is the first thing the user does.)
 pngvalid.o pngtest.o: pnglibconf.h
 
+# We must use -DPNG_NO_USE_READ_MACROS here even when the library may actually
+# be built with PNG_USE_READ_MACROS; this stops the read macros interfering
+# with the symbol file format.
 SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\
 		-DPNGLIB_VERSION='@PNGLIB_VERSION@'\
-		-DSYMBOL_PREFIX='$(SYMBOL_PREFIX)'
+		-DSYMBOL_PREFIX='$(SYMBOL_PREFIX)'\
+		-DPNG_NO_USE_READ_MACROS
 
 .dfn.out:
 	rm -f $@ dfn.c dfn?.out
 	test -d scripts || mkdir scripts
 	echo '#include "$<"' >dfn.c
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) @LIBPNG_DEFINES@\
+	$(DFNCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) @LIBPNG_DEFINES@\
 	    $(CPPFLAGS) $(SYMBOL_CFLAGS) dfn.c > dfn1.out
 	$(SED) -n -e 's|^.*PNG_DEFN_MAGIC-\(.*\)-PNG_DEFN_END.*$$|\1|p'\
 	    dfn1.out >dfn2.out
@@ -140,7 +148,6 @@ pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk
 	mv dfn2.out $@
 
 # Symbol checks (.def and .out files should match)
-scripts/pngwin.chk: scripts/checksym.awk scripts/pngwin.def scripts/pngwin.out
 scripts/symbols.chk: scripts/checksym.awk scripts/symbols.def scripts/symbols.out
 .out.chk:
 	rm -f $@ symbols.new
@@ -166,7 +173,7 @@ $(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS): png.h pngconf.h \
 test: check-am
 
 # Extra checks
-check: scripts/symbols.chk scripts/pngwin.chk
+check: scripts/symbols.chk
 
 # Don't distribute the generated script files
 dist-hook:

Makefile.in

@@ -177,6 +177,13 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+
+# DFNCPP is normally just CPP - the C preprocessor - but on Solaris and maybe
+# other operating systems (NeXT?) the C preprocessor selected by configure
+# checks input tokens for validity - effectively it performs part of the ANSI-C
+# parsing - and therefore fails with the .df files.  configure.ac has special
+# checks for this and sets DFNCPP appropriately.
+DFNCPP = @DFNCPP@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -341,16 +348,21 @@ EXTRA_DIST = \
 SCRIPT_CLEANFILES = scripts/*.out scripts/*.chk scripts/pnglibconf.dfn
 CLEANFILES = dfn.c dfn?.out pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc \
 	libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers libpng.sym \
-	pngwin.def check.new pnglibconf.* symbols.new pngtest-log.txt \
+	check.new pnglibconf.* symbols.new pngtest-log.txt \
 	$(SCRIPT_CLEANFILES)
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
 config.sub configure depcomp install-sh ltmain.sh missing
 
 SUFFIXES = .chk .dfn .out
+
+# We must use -DPNG_NO_USE_READ_MACROS here even when the library may actually
+# be built with PNG_USE_READ_MACROS; this stops the read macros interfering
+# with the symbol file format.
 SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\
 		-DPNGLIB_VERSION='@PNGLIB_VERSION@'\
-		-DSYMBOL_PREFIX='$(SYMBOL_PREFIX)'
+		-DSYMBOL_PREFIX='$(SYMBOL_PREFIX)'\
+		-DPNG_NO_USE_READ_MACROS
 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -1253,7 +1265,7 @@ $(PNGLIB_BASENAME)-config: libpng-config
 	cp libpng-config $@
 
 scripts/sym.out scripts/vers.out: png.h pngconf.h pnglibconf.h
-scripts/symbols.out scripts/pngwin.out: png.h pngconf.h scripts/pnglibconf.h.prebuilt
+scripts/symbols.out: png.h pngconf.h scripts/pnglibconf.h.prebuilt
 
 libpng.sym: scripts/sym.out
 	rm -f $@
@@ -1261,9 +1273,6 @@ libpng.sym: scripts/sym.out
 libpng.vers: scripts/vers.out
 	rm -f $@
 	cp $? $@
-pngwin.def: scripts/pngwin.out
-	rm -f $@
-	cp $? $@
 pnglibconf.h: pnglibconf.out
 	rm -f $@
 	cp $? $@
@@ -1281,7 +1290,7 @@ pngvalid.o pngtest.o: pnglibconf.h
 	rm -f $@ dfn.c dfn?.out
 	test -d scripts || mkdir scripts
 	echo '#include "$<"' >dfn.c
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) @LIBPNG_DEFINES@\
+	$(DFNCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) @LIBPNG_DEFINES@\
 	    $(CPPFLAGS) $(SYMBOL_CFLAGS) dfn.c > dfn1.out
 	$(SED) -n -e 's|^.*PNG_DEFN_MAGIC-\(.*\)-PNG_DEFN_END.*$$|\1|p'\
 	    dfn1.out >dfn2.out
@@ -1299,7 +1308,6 @@ pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk
 	mv dfn2.out $@
 
 # Symbol checks (.def and .out files should match)
-scripts/pngwin.chk: scripts/checksym.awk scripts/pngwin.def scripts/pngwin.out
 scripts/symbols.chk: scripts/checksym.awk scripts/symbols.def scripts/symbols.out
 .out.chk:
 	rm -f $@ symbols.new
@@ -1325,7 +1333,7 @@ $(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS): png.h pngconf.h \
 test: check-am
 
 # Extra checks
-check: scripts/symbols.chk scripts/pngwin.chk
+check: scripts/symbols.chk
 
 # Don't distribute the generated script files
 dist-hook:

README

@@ -1,4 +1,4 @@
-README for libpng version 1.5.0rc01 - December 27, 2010 (shared library 15.0)
+README for libpng version 1.5.1beta11 - January 28, 2011 (shared library 15.0)
 See the note about version numbers near the top of png.h
 
 See INSTALL for instructions on how to install libpng.

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libpng-1.5.0rc01
+# Generated by GNU Autoconf 2.68 for libpng 1.5.1beta11.
 #
 # Report bugs to <png-mng-implement@lists.sourceforge.net>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libpng'
 PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.5.0rc01'
-PACKAGE_STRING='1.5.0rc01'
+PACKAGE_VERSION='1.5.1beta11'
+PACKAGE_STRING='libpng 1.5.1beta11'
 PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -627,6 +627,7 @@ HAVE_LD_VERSION_SCRIPT_TRUE
 LIBPNG_DEFINES
 LIBOBJS
 POW_LIB
+DFNCPP
 OTOOL64
 OTOOL
 LIPO
@@ -750,7 +751,7 @@ with_pic
 enable_fast_install
 with_sysroot
 enable_libtool_lock
-with_zprefix
+with_zlib_prefix
 with_pkgconfigdir
 with_binconfigs
 '
@@ -1306,7 +1307,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libpng 1.5.0rc01 to adapt to many kinds of systems.
+\`configure' configures libpng 1.5.1beta11 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1376,7 +1377,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libpng 1.5.0rc01:";;
+     short | recursive ) echo "Configuration of libpng 1.5.1beta11:";;
    esac
   cat <<\_ACEOF
 
@@ -1402,7 +1403,7 @@ Optional Packages:
                           both]
   --with-sysroot=DIR Search for dependent libraries within DIR
                         (or the compiler's sysroot if not specified).
-  --with-zprefix          prefix that may have been used in installed zlib
+  --with-zlib-prefix      prefix that may have been used in installed zlib
   --with-pkgconfigdir     Use the specified pkgconfig dir (default is
                           libdir/pkgconfig)
   --with-binconfigs       Generate shell libpng-config scripts as well as
@@ -1484,7 +1485,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libpng configure 1.5.0rc01
+libpng configure 1.5.1beta11
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1907,7 +1908,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libpng $as_me 1.5.0rc01, which was
+It was created by libpng $as_me 1.5.1beta11, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2722,7 +2723,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libpng'
- VERSION='1.5.0rc01'
+ VERSION='1.5.1beta11'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2786,10 +2787,10 @@ fi
 
 
 
-PNGLIB_VERSION=1.5.0rc01
+PNGLIB_VERSION=1.5.1beta11
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=5
-PNGLIB_RELEASE=0
+PNGLIB_RELEASE=1
 
 
 
@@ -2797,6 +2798,12 @@ ac_config_headers="$ac_config_headers config.h"
 
 
 # Checks for programs.
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -11809,6 +11816,46 @@ CC="$lt_save_CC"
 
 
 
+# On Solaris 10 and 12 CPP gets set to cc -E, however this still
+# does some input parsing.  We need strict ANSI-C style tokenization,
+# check this:
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a C preprocessor that does not parse its input" >&5
+$as_echo_n "checking for a C preprocessor that does not parse its input... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+1.5.0 16BIT
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  DFNCPP="$CPP"
+else
+  DFNCPP=""
+   sav_CPP="$CPP"
+   for CPP in "${CC-cc} -E" "${CC-cc} -E -traditional-cpp" "/lib/cpp" "cpp"; do
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+1.5.0 16BIT
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  DFNCPP="$CPP"
+         break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+   done
+   CPP="$sav_CPP"
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+if test -n "$DFNCPP"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DFNCPP" >&5
+$as_echo "$DFNCPP" >&6; }
+
+else
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 1 "not found
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
 # Checks for header files.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
@@ -12251,11 +12298,11 @@ fi
 done
 
 
-# Check whether --with-zprefix was given.
-if test "${with_zprefix+set}" = set; then :
-  withval=$with_zprefix; zprefix=${withval}
+# Check whether --with-zlib-prefix was given.
+if test "${with_zlib_prefix+set}" = set; then :
+  withval=$with_zlib_prefix; ZPREFIX=${withval}
 else
-  zprefix='z_'
+  ZPREFIX='z_'
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlibVersion in -lz" >&5
@@ -12302,9 +12349,9 @@ _ACEOF
   LIBS="-lz $LIBS"
 
 else
-  as_ac_Lib=`$as_echo "ac_cv_lib_z_${zprefix}zlibVersion" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${zprefix}zlibVersion in -lz" >&5
-$as_echo_n "checking for ${zprefix}zlibVersion in -lz... " >&6; }
+  as_ac_Lib=`$as_echo "ac_cv_lib_z_${ZPREFIX}zlibVersion" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ZPREFIX}zlibVersion in -lz" >&5
+$as_echo_n "checking for ${ZPREFIX}zlibVersion in -lz... " >&6; }
 if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -12319,11 +12366,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char ${zprefix}zlibVersion ();
+char ${ZPREFIX}zlibVersion ();
 int
 main ()
 {
-return ${zprefix}zlibVersion ();
+return ${ZPREFIX}zlibVersion ();
   ;
   return 0;
 }
@@ -12365,7 +12412,7 @@ $as_echo_n "checking if libraries can be versioned... " >&6; }
 # support for version-script, but doesn't actually
 # DO anything with it.
 case $host in
-*cygwin* | *mingw32* )
+*cygwin* | *mingw32* | *interix* )
     have_ld_version_script=no
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -12993,7 +13040,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libpng $as_me 1.5.0rc01, which was
+This file was extended by libpng $as_me 1.5.1beta11, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13059,7 +13106,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libpng config.status 1.5.0rc01
+libpng config.status 1.5.1beta11
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -18,15 +18,15 @@ AC_PREREQ(2.59)
 
 dnl Version number stuff here:
 
-AC_INIT([libpng], [1.5.0rc01], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.5.1beta11], [png-mng-implement@lists.sourceforge.net])
 AM_INIT_AUTOMAKE
 dnl stop configure from automagically running automake
 AM_MAINTAINER_MODE
 
-PNGLIB_VERSION=1.5.0rc01
+PNGLIB_VERSION=1.5.1beta11
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=5
-PNGLIB_RELEASE=0
+PNGLIB_RELEASE=1
 
 dnl End of version number stuff
 
@@ -34,6 +34,7 @@ AC_CONFIG_SRCDIR([pngget.c])
 AM_CONFIG_HEADER(config.h)
 
 # Checks for programs.
+AC_LANG([C])
 AC_PROG_CC
 AC_PROG_LD
 AC_PROG_CPP
@@ -44,6 +45,28 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 LT_INIT([win32-dll])
 
+# On Solaris 10 and 12 CPP gets set to cc -E, however this still
+# does some input parsing.  We need strict ANSI-C style tokenization,
+# check this:
+AC_REQUIRE_CPP
+AC_MSG_CHECKING([for a C preprocessor that does not parse its input])
+AC_TRY_CPP([1.5.0 16BIT],
+   [DFNCPP="$CPP"],
+   [DFNCPP=""
+   sav_CPP="$CPP"
+   for CPP in "${CC-cc} -E" "${CC-cc} -E -traditional-cpp" "/lib/cpp" "cpp"; do
+      AC_TRY_CPP([1.5.0 16BIT],
+         [DFNCPP="$CPP"]
+         [break],,)
+   done
+   CPP="$sav_CPP"])
+if test -n "$DFNCPP"; then
+   AC_MSG_RESULT([$DFNCPP])
+   AC_SUBST(DFNCPP)
+else
+   AC_MSG_FAILURE([not found], 1)
+fi
+
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([malloc.h stdlib.h string.h strings.h])
@@ -57,13 +80,13 @@ AC_STRUCT_TM
 AC_FUNC_STRTOD
 AC_CHECK_FUNCS([memset], , AC_ERROR([memset not found in libc]))
 AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_ERROR([cannot find pow])) )
-AC_ARG_WITH(zprefix,
-   AC_HELP_STRING([--with-zprefix],
+AC_ARG_WITH(zlib-prefix,
+   AC_HELP_STRING([--with-zlib-prefix],
                   [prefix that may have been used in installed zlib]),
-                  [zprefix=${withval}],
-                  [zprefix='z_'])
+                  [ZPREFIX=${withval}],
+                  [ZPREFIX='z_'])
 AC_CHECK_LIB(z, zlibVersion, ,
-    AC_CHECK_LIB(z, ${zprefix}zlibVersion, ,
+    AC_CHECK_LIB(z, ${ZPREFIX}zlibVersion, ,
                  AC_ERROR([zlib not installed])))
 
 
@@ -76,7 +99,7 @@ AC_MSG_CHECKING([if libraries can be versioned])
 # support for version-script, but doesn't actually
 # DO anything with it.
 case $host in
-*cygwin* | *mingw32* )
+*cygwin* | *mingw32* | *interix* )
     have_ld_version_script=no
     AC_MSG_RESULT(no)
 ;;

contrib/pngminim/decoder/pngusr.dfa

@@ -1,6 +1,6 @@
 # pngminim/decoder/pngusr.dfa
 #
-# Copyright (c) 2010 Glenn Randers-Pehrson
+# Copyright (c) 2010-2011 Glenn Randers-Pehrson
 #
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer

contrib/pngminim/decoder/pngusr.h

@@ -1,6 +1,6 @@
 /* minrdpngconf.h: headers to make a minimal png-read-only library
  *
- * Copyright (c) 2007, 2010 Glenn Randers-Pehrson
+ * Copyright (c) 2007, 2010-2011 Glenn Randers-Pehrson
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer

contrib/pngminim/encoder/pngusr.dfa

@@ -1,6 +1,6 @@
 # pngminim/encoder/pngusr.dfa
 #
-# Copyright (c) 2010 Glenn Randers-Pehrson
+# Copyright (c) 2010-2011 Glenn Randers-Pehrson
 #
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer

contrib/pngminim/encoder/pngusr.h

@@ -1,6 +1,6 @@
 /* minwrpngconf.h: headers to make a minimal png-write-only library
  *
- * Copyright (c) 2007, 2010 Glenn Randers-Pehrson
+ * Copyright (c) 2007, 2010-2011 Glenn Randers-Pehrson
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer

contrib/pngminim/preader/pngusr.dfa

@@ -1,6 +1,6 @@
 # pngminim/preader/pngusr.dfa
 #
-# Copyright (c) 2010 Glenn Randers-Pehrson
+# Copyright (c) 2010-2011 Glenn Randers-Pehrson
 #
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer

contrib/pngminim/preader/pngusr.h

@@ -1,6 +1,6 @@
 /* minrdpngconf.h: headers to make a minimal png-read-only library
  *
- * Copyright (c) 2009, 2010 Glenn Randers-Pehrson
+ * Copyright (c) 2009, 2010-2011 Glenn Randers-Pehrson
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer

example.c

@@ -2,9 +2,9 @@
 #if 0 /* in case someone actually tries to compile this */
 
 /* example.c - an example of using libpng
- * Last changed in libpng 1.5.0 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.0 [January 6, 2011]
  * This file has been placed in the public domain by the authors.
- * Maintained 1998-2010 Glenn Randers-Pehrson
+ * Maintained 1998-2011 Glenn Randers-Pehrson
  * Maintained 1996, 1997 Andreas Dilger)
  * Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  */

libpngpf.3

@@ -1,908 +1,24 @@
-.TH LIBPNGPF 3 "December 27, 2010"
+.TH LIBPNGPF 3 "January 28, 2011"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0rc01
+libpng \- Portable Network Graphics (PNG) Reference Library 1.5.1beta11
 (private functions)
 .SH SYNOPSIS
 \fB#include \fI"pngpriv.h"
 
 \fI\fB
 
-\fBvoid png_64bit_product (long \fP\fIv1\fP\fB, long \fP\fIv2\fP\fB, unsigned long \fP\fI*hi_product\fP\fB, unsigned long \fI*lo_product\fP\fB);\fP
+\fBAs of libpng version \fP\fI1.5.1\fP\fB, this section is no longer \fP\fImaintained\fP\fB, now \fIthat
 
-\fI\fB
+\fBthe private function prototypes are hidden in pngpriv.h and not \fIaccessible
 
-\fI\fB
+\fBto applications. Look in pngpriv.h for the prototypes and a short \fIdescription
 
-\fBvoid png_ascii_from_fp (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIascii\fP\fB, png_size_t \fP\fIsize\fP\fB, double \fP\fIfp\fP\fB, unsigned \fIprecision\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_build_gamma_table (png_structp \fP\fIpng_ptr\fP\fB, png_byte \fIbit_depth\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_build_grayscale_palette (int \fP\fIbit_depth\fP\fB, png_colorp \fIpalette\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_calculate_crc (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIptr\fP\fB, png_size_t \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBint png_check_cHRM_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_fixed_point \fP\fIint_white_x\fP\fB, png_fixed_point \fP\fIint_white_y\fP\fB, png_fixed_point \fP\fIint_red_x\fP\fB, png_fixed_point \fP\fIint_red_y\fP\fB, png_fixed_point \fP\fIint_green_x\fP\fB, png_fixed_point \fP\fIint_green_y\fP\fB, png_fixed_point \fP\fIint_blue_x\fP\fB, png_fixed_point \fIint_blue_y\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_check_chunk_name (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIchunk_name\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBint png_check_fp_number (png_charp \fP\fIstring\fP\fB, png_size_t \fP\fIsize\fP\fB, int* \fP\fIstatep\fP\fB, png_size_tp \fIwhereami\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fBint png_check_fp_string (png_charp \fP\fIstring\fP\fB, png_size_t \fIsize\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fBpng_size_t png_check_keyword (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIkey\fP\fB, png_charpp \fInew_key\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_check_IHDR (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIwidth\fP\fB, png_uint_32 \fP\fIheight\fP\fB, int \fP\fIbit_depth\fP\fB, int \fP\fIcolor_type\fP\fB, int \fP\fIinterlace_type\fP\fB, int \fP\fIcompression_type\fP\fB, int \fIfilter_type\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_combine_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fImask\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_correct_palette (png_structp \fP\fIpng_ptr\fP\fB, png_colorp \fP\fIpalette\fP\fB, int \fInum_palette\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBint png_crc_error (png_structp \fIpng_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBint png_crc_finish (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIskip\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_crc_read (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuf\fP\fB, png_size_t \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBpng_voidp png_create_struct (int \fItype\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBpng_voidp png_create_struct_2 (int \fP\fItype\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_voidp \fImem_ptr\fP\fB);\fP
-
-\fI\fB
-
-\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_decompress_chunk (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIcomp_type\fP\fB, png_size_t \fP\fIchunklength\fP\fB, png_size_t \fP\fIprefix_length\fP\fB, png_size_t \fI*data_length\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_destroy_struct (png_voidp \fIstruct_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_destroy_struct_2 (png_voidp \fP\fIstruct_ptr\fP\fB, png_free_ptr \fP\fIfree_fn\fP\fB, png_voidp \fImem_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_background (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_16p \fP\fItrans_color\fP\fB, png_color_16p \fP\fIbackground\fP\fB, png_color_16p \fP\fIbackground_1\fP\fB, png_bytep \fP\fIgamma_table\fP\fB, png_bytep \fP\fIgamma_from_1\fP\fB, png_bytep \fP\fIgamma_to_1\fP\fB, png_uint_16pp \fP\fIgamma_16\fP\fB, png_uint_16pp \fP\fIgamma_16_from_1\fP\fB, png_uint_16pp \fP\fIgamma_16_to_1\fP\fB, int \fIgamma_shift\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_bgr (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_chop (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-
-\fI\fB
-
-\fBvoid png_do_expand (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_16p \fItrans_value\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_expand_palette (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_colorp \fP\fIpalette\fP\fB, png_bytep \fP\fItrans\fP\fB, int \fInum_trans\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_gamma (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fP\fIgamma_table\fP\fB, png_uint_16pp \fP\fIgamma_16_table\fP\fB, int \fIgamma_shift\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_gray_to_rgb (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_invert (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_pack (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_uint_32 \fIbit_depth\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_packswap (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_quantize (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fP\fIpalette_lookup\fP\fB, png_bytep \fIquantize_lookup\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_read_filler (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_uint_32 \fP\fIfiller\fP\fB, png_uint_32 \fIflags\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_read_interlace (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fP\fIpass\fP\fB, png_uint_32 \fItransformations\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_read_invert_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-
-\fI\fB
-
-\fBvoid png_do_read_swap_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_read_transformations (png_structp \fIpng_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBint png_do_rgb_to_gray (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_shift (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_8p \fIbit_depth\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_strip_filler (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_uint_32 \fIflags\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_swap (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_unpack (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_unshift (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_8p \fIsig_bits\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_write_interlace (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fIpass\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_write_invert_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_write_swap_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_do_write_transformations (png_structp \fIpng_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid *png_far_to_near (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIptr\fP\fB, int \fIcheck\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_fixed_error (png_structp \fP\fIpng_ptr\fP\fB, \fIpng_const_charp
-
-\fBname, double \fIvalue\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_flush (png_structp \fIpng_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBint png_gamma_significant (png_fixed_point \fIgamma\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fBpng_uint_16 png_gamma_16bit_correct (png_structp \fP\fIpng_ptr\fP\fB, unsigned \fP\fIvalue\fP\fB, png_fixed_point \fIgamma\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fBpng_byte png_gamma_8bit_correct (png_structp \fP\fIpng_ptr\fP\fB, unsigned \fP\fIvalue\fP\fB, png_fixed_point \fIgamma\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_handle_bKGD (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_handle_cHRM (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_handle_gAMA (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_handle_hIST (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_handle_IEND (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_handle_IHDR (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_handle_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_handle_iTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_handle_oFFs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_handle_pCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_handle_pHYs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_handle_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_handle_sBIT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_handle_sCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_handle_sPLT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_handle_sRGB (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_handle_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_handle_tIME (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_handle_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_handle_unknown (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_handle_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_info_destroy (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_init_mmx_flags (png_structp \fIpng_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_init_read_transformations (png_structp \fIpng_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBint png_muldiv (png_fixed_point_p \fP\fIres\fP\fB, png_fixed_point \fP\fIa\fP\fB, png_int_32 \fP\fItimes\fP\fB, png_int_32 \fIdiv\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fBpng_fixed_point png_muldiv_warn (png_structp \fP\fIpng_ptr\fP\fB, png_fixed_point \fP\fIa\fP\fB, png_int_32 \fP\fItimes\fP\fB, png_int_32 \fIdiv\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_process_IDAT_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIbuffer_length\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_process_some_data (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_push_check_crc (png_structp \fIpng_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_push_crc_finish (png_structp \fIpng_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_push_crc_skip (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_push_fill_buffer (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_push_handle_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_push_handle_unknown (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_push_handle_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_push_have_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_push_have_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_push_have_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIrow\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_push_process_row (png_structp \fIpng_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_push_read_chunk (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_push_read_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_push_read_IDAT (png_structp \fIpng_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_push_read_sig (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_push_read_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_push_read_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_push_restore_buffer (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIbuffer_length\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_push_save_buffer (png_structp \fIpng_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_read_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\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_filter_row (png_structp \fP\fIpng_ptr\fP\fB, png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fP\fIprev_row\fP\fB, int \fIfilter\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_read_finish_row (png_structp \fIpng_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fBvoid png_read_push_finish_row (png_structp \fIpng_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fBvoid png_read_start_row (png_structp \fIpng_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fBvoid png_read_sig (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fBvoid png_read_transform_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fBpng_fixed_point png_reciprocal (png_fixed_point \fIa\fP\fB);\fP
-
-\fI\fB
-
-\fBpng_fixed_point png_reciprocal2 (png_fixed_point \fP\fIa\fP\fB, png_fixed_point \fIb\fP\fB);\fP
-
-\fI\fB
-
-\fBvoid png_reset_crc (png_structp \fIpng_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fBint png_set_text_2 (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_textp \fP\fItext_ptr\fP\fB, int \fInum_text\fP\fB);\fP
-
-\fI\fB
-
-\fBvoid png_write_cHRM (png_structp \fP\fIpng_ptr\fP\fB, double \fP\fIwhite_x\fP\fB, double \fP\fIwhite_y\fP\fB, double \fP\fIred_x\fP\fB, double \fP\fIred_y\fP\fB, double \fP\fIgreen_x\fP\fB, double \fP\fIgreen_y\fP\fB, double \fP\fIblue_x\fP\fB, double \fIblue_y\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_cHRM_fixed (png_structp \fP\fIpng_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
-
-\fI\fB
-
-\fBvoid png_write_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fBvoid png_write_destroy (png_structp \fIpng_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fBvoid png_write_filtered_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIfiltered_row\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_find_filter (png_structp \fP\fIpng_ptr\fP\fB, png_row_infop \fIrow_info\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_finish_row (png_structp \fIpng_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_gAMA (png_structp \fP\fIpng_ptr\fP\fB, double \fIfile_gamma\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_gAMA_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIint_file_gamma\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_hIST (png_structp \fP\fIpng_ptr\fP\fB, png_uint_16p \fP\fIhist\fP\fB, int \fInum_hist\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIname\fP\fB, int \fP\fIcompression_type\fP\fB, png_charp \fP\fIprofile\fP\fB, int \fIproflen\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_IDAT (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_IEND (png_structp \fIpng_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_IHDR (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIwidth\fP\fB, png_uint_32 \fP\fIheight\fP\fB, int \fP\fIbit_depth\fP\fB, int \fP\fIcolor_type\fP\fB, int \fP\fIcompression_type\fP\fB, int \fP\fIfilter_type\fP\fB, int \fIinterlace_type\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_iTXt (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIcompression\fP\fB, png_charp \fP\fIkey\fP\fB, png_charp \fP\fIlang\fP\fB, png_charp \fP\fItranslated_key\fP\fB, png_charp \fItext\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_oFFs (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIx_offset\fP\fB, png_uint_32 \fP\fIy_offset\fP\fB, int \fIunit_type\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_pCAL (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIpurpose\fP\fB, png_int_32 \fP\fIX0\fP\fB, png_int_32 \fP\fIX1\fP\fB, int \fP\fItype\fP\fB, int \fP\fInparams\fP\fB, png_charp \fP\fIunits\fP\fB, png_charpp \fIparams\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_pHYs (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIx_pixels_per_unit\fP\fB, png_uint_32 \fP\fIy_pixels_per_unit\fP\fB, int \fIunit_type\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_colorp \fP\fIpalette\fP\fB, png_uint_32 \fInum_pal\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_sBIT (png_structp \fP\fIpng_ptr\fP\fB, png_color_8p \fP\fIsbit\fP\fB, int \fIcolor_type\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_sCAL (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIunit\fP\fB, double \fP\fIwidth\fP\fB, double \fIheight\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_sCAL_s (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIunit\fP\fB, png_charp \fP\fIwidth\fP\fB, png_charp \fIheight\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_sRGB (png_structp \fP\fIpng_ptr\fP\fB, int \fIintent\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_sPLT (png_structp \fP\fIpng_ptr\fP\fB, png_spalette_p \fIpalette\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_start_row (png_structp \fIpng_ptr\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIkey\fP\fB, png_charp \fP\fItext\fP\fB, png_size_t \fItext_len\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_tIME (png_structp \fP\fIpng_ptr\fP\fB, png_timep \fImod_time\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fItrans\fP\fB, png_color_16p \fP\fIvalues\fP\fB, int \fP\fInumber\fP\fB, int \fIcolor_type\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_write_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIkey\fP\fB, png_charp \fP\fItext\fP\fB, png_size_t \fP\fItext_len\fP\fB, int \fIcompression\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoidpf png_zalloc (voidpf \fP\fIpng_ptr\fP\fB, uInt \fP\fIitems\fP\fB, uInt \fIsize\fP\fB);\fP
-
-\fI\fB
-
-\fI\fB
-
-\fBvoid png_zfree (voidpf \fP\fIpng_ptr\fP\fB, voidpf \fIptr\fP\fB);\fP
-
-\fI\fB
-
-\fBvoid png_fixed_error (png_structp \fP\fIpng_ptr\fP\fB, png_const_charp \fP\fIname\fP\fB, double \fIvalue\fP\fB);\fP
+\fBof each \fIfunction.
 
 \fI\fB
 
 .SH DESCRIPTION
-The functions listed above are used privately by libpng
+The functions previously listed here are  used privately by libpng
 and are not recommended for use by applications.  They are
 not "exported" to applications using shared libraries.  They
 are listed alphabetically here as an aid to libpng maintainers.

png.5

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

png.c

@@ -1,8 +1,8 @@
 
 /* png.c - location for general purpose libpng functions
  *
- * Last changed in libpng 1.5.0 [(PENDING RELEASE)]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.1 [(PENDING RELEASE)]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -14,7 +14,7 @@
 #include "pngpriv.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_5_0rc01 Your_png_h_is_not_version_1_5_0rc01;
+typedef png_libpng_version_1_5_1beta11 Your_png_h_is_not_version_1_5_1beta11;
 
 /* Tells libpng that we have already handled the first "num_bytes" bytes
  * of the PNG file signature.  If the PNG data is embedded into another
@@ -547,7 +547,7 @@ png_convert_to_rfc1123(png_structp png_ptr, png_const_timep ptime)
 #endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
 
 png_const_charp PNGAPI
-png_get_copyright(png_structp png_ptr)
+png_get_copyright(png_const_structp png_ptr)
 {
    PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */
 #ifdef PNG_STRING_COPYRIGHT
@@ -555,14 +555,14 @@ png_get_copyright(png_structp png_ptr)
 #else
 #  ifdef __STDC__
    return PNG_STRING_NEWLINE \
-     "libpng version 1.5.0rc01 - December 27, 2010" PNG_STRING_NEWLINE \
-     "Copyright (c) 1998-2010 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
+     "libpng version 1.5.1beta11 - January 28, 2011" PNG_STRING_NEWLINE \
+     "Copyright (c) 1998-2011 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
      "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
      "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
      PNG_STRING_NEWLINE;
 #  else
-      return "libpng version 1.5.0rc01 - December 27, 2010\
-      Copyright (c) 1998-2010 Glenn Randers-Pehrson\
+      return "libpng version 1.5.1beta11 - January 28, 2011\
+      Copyright (c) 1998-2011 Glenn Randers-Pehrson\
       Copyright (c) 1996-1997 Andreas Dilger\
       Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
 #  endif
@@ -578,14 +578,14 @@ png_get_copyright(png_structp png_ptr)
  * it is guaranteed that png.c uses the correct version of png.h.
  */
 png_const_charp PNGAPI
-png_get_libpng_ver(png_structp png_ptr)
+png_get_libpng_ver(png_const_structp png_ptr)
 {
    /* Version of *.c files used when building libpng */
    return png_get_header_ver(png_ptr);
 }
 
 png_const_charp PNGAPI
-png_get_header_ver(png_structp png_ptr)
+png_get_header_ver(png_const_structp png_ptr)
 {
    /* Version of *.h files used when building libpng */
    PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */
@@ -593,7 +593,7 @@ png_get_header_ver(png_structp png_ptr)
 }
 
 png_const_charp PNGAPI
-png_get_header_version(png_structp png_ptr)
+png_get_header_version(png_const_structp png_ptr)
 {
    /* Returns longer string containing both version and date */
    PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */
@@ -1031,10 +1031,10 @@ int
 png_check_fp_string(png_const_charp string, png_size_t size)
 {
    int        state=0;
-   png_size_t index=0;
+   png_size_t char_index=0;
 
-   return png_check_fp_number(string, size, &state, &index) &&
-      (index == size || string[index] == 0);
+   return png_check_fp_number(string, size, &state, &char_index) &&
+      (char_index == size || string[char_index] == 0);
 }
 #endif /* pCAL or sCAL */
 
@@ -1108,46 +1108,46 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
 
       if (fp >= DBL_MIN && fp <= DBL_MAX)
       {
-         int exp;       /* A base 10 exponent */
-         double base;   /* 10^exp */
+         int exp_b10;       /* A base 10 exponent */
+         double base;   /* 10^exp_b10 */
 
          /* First extract a base 10 exponent of the number,
           * the calculation below rounds down when converting
           * from base 2 to base 10 (multiply by log10(2) -
-          * 0.3010, but 77/256 is 0.3008, so exp needs to
+          * 0.3010, but 77/256 is 0.3008, so exp_b10 needs to
           * be increased.  Note that the arithmetic shift
           * performs a floor() unlike C arithmetic - using a
           * C multiply would break the following for negative
           * exponents.
           */
-         (void)frexp(fp, &exp); /* exponent to base 2 */
+         (void)frexp(fp, &exp_b10); /* exponent to base 2 */
 
-         exp = (exp * 77) >> 8; /* <= exponent to base 10 */
+         exp_b10 = (exp_b10 * 77) >> 8; /* <= exponent to base 10 */
 
          /* Avoid underflow here. */
-         base = png_pow10(exp); /* May underflow */
+         base = png_pow10(exp_b10); /* May underflow */
 
          while (base < DBL_MIN || base < fp)
          {
             /* And this may overflow. */
-            double test = png_pow10(exp+1);
+            double test = png_pow10(exp_b10+1);
 
             if (test <= DBL_MAX)
-               ++exp, base = test;
+               ++exp_b10, base = test;
 
             else
                break;
          }
 
-         /* Normalize fp and correct exp, after this fp is in the
-          * range [.1,1) and exp is both the exponent and the digit
+         /* Normalize fp and correct exp_b10, after this fp is in the
+          * range [.1,1) and exp_b10 is both the exponent and the digit
           * *before* which the decimal point should be inserted
           * (starting with 0 for the first digit).  Note that this
-          * works even if 10^exp is out of range because of the
+          * works even if 10^exp_b10 is out of range because of the
           * test on DBL_MAX above.
           */
          fp /= base;
-         while (fp >= 1) fp /= 10, ++exp;
+         while (fp >= 1) fp /= 10, ++exp_b10;
 
          /* Because of the code above fp may, at this point, be
           * less than .1, this is ok because the code below can
@@ -1162,10 +1162,10 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
             /* Allow up to two leading zeros - this will not lengthen
              * the number compared to using E-n.
              */
-            if (exp < 0 && exp > -3) /* PLUS 3 TOTAL 4 */
+            if (exp_b10 < 0 && exp_b10 > -3) /* PLUS 3 TOTAL 4 */
             {
-               czero = -exp; /* PLUS 2 digits: TOTAL 3 */
-               exp = 0;      /* Dot added below before first output. */
+               czero = -exp_b10; /* PLUS 2 digits: TOTAL 3 */
+               exp_b10 = 0;      /* Dot added below before first output. */
             }
             else
                czero = 0;    /* No zeros to add */
@@ -1207,17 +1207,17 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
                         {
                            int ch = *--ascii;
 
-                           if (exp != (-1))
-                              ++exp;
+                           if (exp_b10 != (-1))
+                              ++exp_b10;
 
                            else if (ch == 46)
                            {
                               ch = *--ascii, ++size;
-                              /* Advance exp to '1', so that the
+                              /* Advance exp_b10 to '1', so that the
                                * decimal point happens after the
                                * previous digit.
                                */
-                              exp = 1;
+                              exp_b10 = 1;
                            }
 
                            --cdigits;
@@ -1230,7 +1230,7 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
                          */
                         if (d > 9)  /* cdigits == 0 */
                         {
-                           if (exp == (-1))
+                           if (exp_b10 == (-1))
                            {
                               /* Leading decimal point (plus zeros?), if
                                * we lose the decimal point here it must
@@ -1239,14 +1239,14 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
                               int ch = *--ascii;
 
                               if (ch == 46)
-                                 ++size, exp = 1;
+                                 ++size, exp_b10 = 1;
 
-                              /* Else lost a leading zero, so 'exp' is
+                              /* Else lost a leading zero, so 'exp_b10' is
                                * still ok at (-1)
                                */
                            }
                            else
-                              ++exp;
+                              ++exp_b10;
 
                            /* In all cases we output a '1' */
                            d = 1;
@@ -1269,23 +1269,24 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
 
                   while (czero > 0)
                   {
-                     /* exp == (-1) means we just output the decimal
-                      * place - after the DP don't adjust 'exp' any
+                     /* exp_b10 == (-1) means we just output the decimal
+                      * place - after the DP don't adjust 'exp_b10' any
                       * more!
                       */
-                     if (exp != (-1))
+                     if (exp_b10 != (-1))
                      {
-                        if (exp == 0) *ascii++ = 46, --size;
+                        if (exp_b10 == 0) *ascii++ = 46, --size;
                         /* PLUS 1: TOTAL 4 */
-                        --exp;
+                        --exp_b10;
                      }
                      *ascii++ = 48, --czero;
                   }
 
-                  if (exp != (-1))
+                  if (exp_b10 != (-1))
                   {
-                     if (exp == 0) *ascii++ = 46, --size; /* counted above */
-                     --exp;
+                     if (exp_b10 == 0) *ascii++ = 46, --size; /* counted
+                                                                 above */
+                     --exp_b10;
                   }
                   *ascii++ = (char)(48 + (int)d), ++cdigits;
                }
@@ -1296,12 +1297,12 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
 
             /* Check for an exponent, if we don't need one we are
              * done and just need to terminate the string.  At
-             * this point exp==(-1) is effectively if flag - it got
+             * this point exp_b10==(-1) is effectively if flag - it got
              * to '-1' because of the decrement after outputing
              * the decimal point above (the exponent required is
              * *not* -1!)
              */
-            if (exp >= (-1) && exp <= 2)
+            if (exp_b10 >= (-1) && exp_b10 <= 2)
             {
                /* The following only happens if we didn't output the
                 * leading zeros above for negative exponent, so this
@@ -1310,7 +1311,7 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
                 * zeros were *not* output, so this doesn't increase
                 * the output count.
                 */
-               while (--exp >= 0) *ascii++ = 48;
+               while (--exp_b10 >= 0) *ascii++ = 48;
 
                *ascii = 0;
 
@@ -1329,18 +1330,18 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
             size -= cdigits;
 
             *ascii++ = 69, --size;    /* 'E': PLUS 1 TOTAL 2+precision*/
-            if (exp < 0)
+            if (exp_b10 < 0)
             {
                *ascii++ = 45, --size; /* '-': PLUS 1 TOTAL 3+precision */
-               exp = -exp;
+               exp_b10 = -exp_b10;
             }
 
             cdigits = 0;
 
-            while (exp > 0)
+            while (exp_b10 > 0)
             {
-               exponent[cdigits++] = (char)(48 + exp % 10);
-               exp /= 10;
+               exponent[cdigits++] = (char)(48 + exp_b10 % 10);
+               exp_b10 /= 10;
             }
 
             /* Need another size check here for the exponent digits, so
@@ -1459,11 +1460,10 @@ png_fixed(png_structp png_ptr, double fp, png_const_charp text)
 {
    double r = floor(100000 * fp + .5);
 
-   if (r <= 2147483647. && r >= -2147483648.)
-      return (png_fixed_point)r;
+   if (r > 2147483647. || r < -2147483648.)
+      png_fixed_error(png_ptr, text);
 
-   png_fixed_error(png_ptr, text);
-   /*NOT REACHED*/
+   return (png_fixed_point)r;
 }
 #endif
 
@@ -1477,10 +1477,10 @@ png_fixed(png_structp png_ptr, double fp, png_const_charp text)
  */
 int
 png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times,
-    png_int_32 div)
+    png_int_32 divisor)
 {
-   /* Return a * times / div, rounded. */
-   if (div != 0)
+   /* Return a * times / divisor, rounded. */
+   if (divisor != 0)
    {
       if (a == 0 || times == 0)
       {
@@ -1492,7 +1492,7 @@ png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times,
 #ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
          double r = a;
          r *= times;
-         r /= div;
+         r /= divisor;
          r = floor(r+.5);
 
          /* A png_fixed_point is a 32 bit integer. */
@@ -1516,10 +1516,10 @@ png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times,
          else
             T = times;
 
-         if (div < 0)
-            negative = !negative, D = -div;
+         if (divisor < 0)
+            negative = !negative, D = -divisor;
          else
-            D = div;
+            D = divisor;
 
          /* Following can't overflow because the arguments only
           * have 31 bits each, however the result may be 32 bits.
@@ -1596,11 +1596,11 @@ png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times,
  */
 png_fixed_point
 png_muldiv_warn(png_structp png_ptr, png_fixed_point a, png_int_32 times,
-    png_int_32 div)
+    png_int_32 divisor)
 {
    png_fixed_point result;
 
-   if (png_muldiv(&result, a, times, div))
+   if (png_muldiv(&result, a, times, divisor))
       return result;
 
    png_warning(png_ptr, "fixed point overflow ignored");
@@ -1791,7 +1791,7 @@ png_8bit_l2[128] =
 static png_int_32
 png_log8bit(unsigned int x)
 {
-   unsigned int log = 0;
+   unsigned int lg2 = 0;
    /* Each time 'x' is multiplied by 2, 1 must be subtracted off the final log,
     * because the log is actually negate that means adding 1.  The final
     * returned value thus has the range 0 (for 255 input) to 7.994 (for 1
@@ -1802,16 +1802,16 @@ png_log8bit(unsigned int x)
       return 0xffffffff;
 
    if ((x & 0xf0) == 0)
-      log  = 4, x <<= 4;
+      lg2  = 4, x <<= 4;
 
    if ((x & 0xc0) == 0)
-      log += 2, x <<= 2;
+      lg2 += 2, x <<= 2;
 
    if ((x & 0x80) == 0)
-      log += 1, x <<= 1;
+      lg2 += 1, x <<= 1;
 
    /* result is at most 19 bits, so this cast is safe: */
-   return (png_int_32)((log << 16) + ((png_8bit_l2[x-128]+32768)>>16));
+   return (png_int_32)((lg2 << 16) + ((png_8bit_l2[x-128]+32768)>>16));
 }
 
 /* The above gives exact (to 16 binary places) log2 values for 8 bit images,
@@ -1847,29 +1847,29 @@ png_log8bit(unsigned int x)
 static png_int_32
 png_log16bit(png_uint_32 x)
 {
-   unsigned int log = 0;
+   unsigned int lg2 = 0;
 
    /* As above, but now the input has 16 bits. */
    if ((x &= 0xffff) == 0)
       return 0xffffffff;
 
    if ((x & 0xff00) == 0)
-      log  = 8, x <<= 8;
+      lg2  = 8, x <<= 8;
 
    if ((x & 0xf000) == 0)
-      log += 4, x <<= 4;
+      lg2 += 4, x <<= 4;
 
    if ((x & 0xc000) == 0)
-      log += 2, x <<= 2;
+      lg2 += 2, x <<= 2;
 
    if ((x & 0x8000) == 0)
-      log += 1, x <<= 1;
+      lg2 += 1, x <<= 1;
 
    /* Calculate the base logarithm from the top 8 bits as a 28 bit fractional
     * value.
     */
-   log <<= 28;
-   log += (png_8bit_l2[(x>>8)-128]+8) >> 4;
+   lg2 <<= 28;
+   lg2 += (png_8bit_l2[(x>>8)-128]+8) >> 4;
 
    /* Now we need to interpolate the factor, this requires a division by the top
     * 8 bits.  Do this with maximum precision.
@@ -1880,19 +1880,19 @@ png_log16bit(png_uint_32 x)
     * the value at 1<<16 (ignoring this) will be 0 or 1; this gives us exactly
     * 16 bits to interpolate to get the low bits of the result.  Round the
     * answer.  Note that the end point values are scaled by 64 to retain overall
-    * precision and that 'log' is current scaled by an extra 12 bits, so adjust
+    * precision and that 'lg2' is current scaled by an extra 12 bits, so adjust
     * the overall scaling by 6-12.  Round at every step.
     */
    x -= 1U << 24;
 
    if (x <= 65536U) /* <= '257' */
-      log += ((23591U * (65536U-x)) + (1U << (16+6-12-1))) >> (16+6-12);
+      lg2 += ((23591U * (65536U-x)) + (1U << (16+6-12-1))) >> (16+6-12);
 
    else
-      log -= ((23499U * (x-65536U)) + (1U << (16+6-12-1))) >> (16+6-12);
+      lg2 -= ((23499U * (x-65536U)) + (1U << (16+6-12-1))) >> (16+6-12);
 
    /* Safe, because the result can't have more than 20 bits: */
-   return (png_int_32)((log + 2048) >> 12);
+   return (png_int_32)((lg2 + 2048) >> 12);
 }
 
 /* The 'exp()' case must invert the above, taking a 20 bit fixed point
@@ -1987,10 +1987,10 @@ png_exp(png_fixed_point x)
 }
 
 static png_byte
-png_exp8bit(png_fixed_point log)
+png_exp8bit(png_fixed_point lg2)
 {
    /* Get a 32 bit value: */
-   png_uint_32 x = png_exp(log);
+   png_uint_32 x = png_exp(lg2);
 
    /* Convert the 32 bit value to 0..255 by multiplying by 256-1, note that the
     * second, rounding, step can't overflow because of the first, subtraction,
@@ -2001,10 +2001,10 @@ png_exp8bit(png_fixed_point log)
 }
 
 static png_uint_16
-png_exp16bit(png_fixed_point log)
+png_exp16bit(png_fixed_point lg2)
 {
    /* Get a 32 bit value: */
-   png_uint_32 x = png_exp(log);
+   png_uint_32 x = png_exp(lg2);
 
    /* Convert the 32 bit value to 0..65535 by multiplying by 65536-1: */
    x -= x >> 16;
@@ -2013,18 +2013,18 @@ png_exp16bit(png_fixed_point log)
 #endif /* FLOATING_ARITHMETIC */
 
 png_byte
-png_gamma_8bit_correct(unsigned int value, png_fixed_point gamma)
+png_gamma_8bit_correct(unsigned int value, png_fixed_point gamma_val)
 {
    if (value > 0 && value < 255)
    {
 #     ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-         double r = floor(255*pow(value/255.,gamma*.00001)+.5);
+         double r = floor(255*pow(value/255.,gamma_val*.00001)+.5);
          return (png_byte)r;
 #     else
-         png_int_32 log = png_log8bit(value);
+         png_int_32 lg2 = png_log8bit(value);
          png_fixed_point res;
 
-         if (png_muldiv(&res, gamma, log, PNG_FP_1))
+         if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1))
             return png_exp8bit(res);
 
          /* Overflow. */
@@ -2036,18 +2036,18 @@ png_gamma_8bit_correct(unsigned int value, png_fixed_point gamma)
 }
 
 png_uint_16
-png_gamma_16bit_correct(unsigned int value, png_fixed_point gamma)
+png_gamma_16bit_correct(unsigned int value, png_fixed_point gamma_val)
 {
    if (value > 0 && value < 65535)
    {
 #     ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-         double r = floor(65535*pow(value/65535.,gamma*.00001)+.5);
+         double r = floor(65535*pow(value/65535.,gamma_val*.00001)+.5);
          return (png_uint_16)r;
 #     else
-         png_int_32 log = png_log16bit(value);
+         png_int_32 lg2 = png_log16bit(value);
          png_fixed_point res;
 
-         if (png_muldiv(&res, gamma, log, PNG_FP_1))
+         if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1))
             return png_exp16bit(res);
 
          /* Overflow. */
@@ -2065,23 +2065,23 @@ png_gamma_16bit_correct(unsigned int value, png_fixed_point gamma)
  */
 png_uint_16 /* PRIVATE */
 png_gamma_correct(png_structp png_ptr, unsigned int value,
-    png_fixed_point gamma)
+    png_fixed_point gamma_val)
 {
    if (png_ptr->bit_depth == 8)
-      return png_gamma_8bit_correct(value, gamma);
+      return png_gamma_8bit_correct(value, gamma_val);
 
    else
-      return png_gamma_16bit_correct(value, gamma);
+      return png_gamma_16bit_correct(value, gamma_val);
 }
 
 /* This is the shared test on whether a gamma value is 'significant' - whether
  * it is worth doing gamma correction.
  */
 int /* PRIVATE */
-png_gamma_significant(png_fixed_point gamma)
+png_gamma_significant(png_fixed_point gamma_val)
 {
-   return gamma < PNG_FP_1 - PNG_GAMMA_THRESHOLD_FIXED ||
-       gamma > PNG_FP_1 + PNG_GAMMA_THRESHOLD_FIXED;
+   return gamma_val < PNG_FP_1 - PNG_GAMMA_THRESHOLD_FIXED ||
+       gamma_val > PNG_FP_1 + PNG_GAMMA_THRESHOLD_FIXED;
 }
 
 /* Internal function to build a single 16 bit table - the table consists of
@@ -2094,7 +2094,7 @@ png_gamma_significant(png_fixed_point gamma)
  */
 static void
 png_build_16bit_table(png_structp png_ptr, png_uint_16pp *ptable,
-   PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma)
+   PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)
 {
    /* Various values derived from 'shift': */
    PNG_CONST unsigned int num = 1U << (8U - shift);
@@ -2113,7 +2113,7 @@ png_build_16bit_table(png_structp png_ptr, png_uint_16pp *ptable,
       /* The 'threshold' test is repeated here because it can arise for one of
        * the 16 bit tables even if the others don't hit it.
        */
-      if (png_gamma_significant(gamma))
+      if (png_gamma_significant(gamma_val))
       {
          /* The old code would overflow at the end and this would cause the
           * 'pow' function to return a result >1, resulting in an
@@ -2129,13 +2129,13 @@ png_build_16bit_table(png_structp png_ptr, png_uint_16pp *ptable,
             png_uint_32 ig = (j << (8-shift)) + i;
 #           ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
                /* Inline the 'max' scaling operation: */
-               double d = floor(65535*pow(ig/(double)max, gamma*.00001)+.5);
+               double d = floor(65535*pow(ig/(double)max, gamma_val*.00001)+.5);
                sub_table[j] = (png_uint_16)d;
 #           else
                if (shift)
                   ig = (ig * 65535U + max_by_2)/max;
 
-               sub_table[j] = png_gamma_16bit_correct(ig, gamma);
+               sub_table[j] = png_gamma_16bit_correct(ig, gamma_val);
 #           endif
          }
       }
@@ -2162,7 +2162,7 @@ png_build_16bit_table(png_structp png_ptr, png_uint_16pp *ptable,
  */
 static void
 png_build_16to8_table(png_structp png_ptr, png_uint_16pp *ptable,
-   PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma)
+   PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)
 {
    PNG_CONST unsigned int num = 1U << (8U - shift);
    PNG_CONST unsigned int max = (1U << (16U - shift))-1U;
@@ -2180,7 +2180,7 @@ png_build_16to8_table(png_structp png_ptr, png_uint_16pp *ptable,
       table[i] = (png_uint_16p)png_malloc(png_ptr,
           256 * png_sizeof(png_uint_16));
 
-   /* 'gamma' is set to the reciprocal of the value calculated above, so
+   /* 'gamma_val' is set to the reciprocal of the value calculated above, so
     * pow(out,g) is an *input* value.  'last' is the last input value set.
     *
     * In the loop 'i' is used to find output values.  Since the output is 8
@@ -2203,7 +2203,7 @@ png_build_16to8_table(png_structp png_ptr, png_uint_16pp *ptable,
       png_uint_16 out = (png_uint_16)(i * 257U); /* 16 bit output value */
 
       /* Find the boundary value in 16 bits: */
-      png_uint_32 bound = png_gamma_16bit_correct(out+128U, gamma);
+      png_uint_32 bound = png_gamma_16bit_correct(out+128U, gamma_val);
 
       /* Adjust (round) to (16-shift) bits: */
       bound = (bound * max + 32768U)/65535U + 1U;
@@ -2229,13 +2229,13 @@ png_build_16to8_table(png_structp png_ptr, png_uint_16pp *ptable,
  */
 static void
 png_build_8bit_table(png_structp png_ptr, png_bytepp ptable,
-   PNG_CONST png_fixed_point gamma)
+   PNG_CONST png_fixed_point gamma_val)
 {
    unsigned int i;
    png_bytep table = *ptable = (png_bytep)png_malloc(png_ptr, 256);
 
-   if (png_gamma_significant(gamma)) for (i=0; i<256; i++)
-      table[i] = png_gamma_8bit_correct(i, gamma);
+   if (png_gamma_significant(gamma_val)) for (i=0; i<256; i++)
+      table[i] = png_gamma_8bit_correct(i, gamma_val);
 
    else for (i=0; i<256; ++i)
       table[i] = (png_byte)i;

png.h

@@ -1,8 +1,8 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.5.0rc01 - December 27, 2010
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * libpng version 1.5.1beta11 - January 28, 2011
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -11,7 +11,7 @@
  * Authors and maintainers:
  *   libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
  *   libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- *   libpng versions 0.97, January 1998, through 1.5.0rc01 - December 27, 2010: Glenn
+ *   libpng versions 0.97, January 1998, through 1.5.1beta11 - January 28, 2011: Glenn
  *   See also "Contributing Authors", below.
  *
  * Note about libpng version numbers:
@@ -142,7 +142,10 @@
  *    1.4.3                   14    10403  14.so.14.3[.0]
  *    1.4.4                   14    10404  14.so.14.4[.0]
  *    1.5.0beta01-58          15    10500  15.so.15.0[.0]
- *    1.5.0rc01               15    10500  15.so.15.0[.0]
+ *    1.5.0rc01-07            15    10500  15.so.15.0[.0]
+ *    1.5.0                   15    10500  15.so.15.0[.0]
+ *    1.5.1beta01-10          15    10501  15.so.15.1[.0]
+ *    1.5.1rc01               15    10501  15.so.15.1[.0]
  *
  *   Henceforth the source version will match the shared-library major
  *   and minor numbers; the shared-library major version number will be
@@ -174,8 +177,8 @@
  *
  * This code is released under the libpng license.
  *
- * libpng versions 1.2.6, August 15, 2004, through 1.5.0rc01, December 27, 2010, are
- * Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are
+ * libpng versions 1.2.6, August 15, 2004, through 1.5.1beta11, January 28, 2011, are
+ * Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
  * distributed according to the same disclaimer and license as libpng-1.2.5
  * with the following individual added to the list of Contributing Authors:
  *
@@ -286,13 +289,13 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    December 27, 2010
+ *    January 28, 2011
  *
  *    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.5.0rc01 are Y2K compliant.  It is my belief that
+ *    upward through 1.5.1beta11 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
@@ -348,9 +351,9 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.5.0rc01"
+#define PNG_LIBPNG_VER_STRING "1.5.1beta11"
 #define PNG_HEADER_VERSION_STRING \
-     " libpng version 1.5.0rc01 - December 27, 2010\n"
+     " libpng version 1.5.1beta11 - January 28, 2011\n"
 
 #define PNG_LIBPNG_VER_SONUM   15
 #define PNG_LIBPNG_VER_DLLNUM  15
@@ -358,12 +361,12 @@
 /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
 #define PNG_LIBPNG_VER_MAJOR   1
 #define PNG_LIBPNG_VER_MINOR   5
-#define PNG_LIBPNG_VER_RELEASE 0
+#define PNG_LIBPNG_VER_RELEASE 1
 /* This should match the numeric part of the final component of
  * PNG_LIBPNG_VER_STRING, omitting any leading zero:
  */
 
-#define PNG_LIBPNG_VER_BUILD  01
+#define PNG_LIBPNG_VER_BUILD  11
 
 /* Release Status */
 #define PNG_LIBPNG_BUILD_ALPHA    1
@@ -388,7 +391,7 @@
  * version 1.0.0 was mis-numbered 100 instead of 10000).  From
  * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release
  */
-#define PNG_LIBPNG_VER 10500 /* 1.5.0 */
+#define PNG_LIBPNG_VER 10501 /* 1.5.1 */
 
 /* Library configuration: these options cannot be changed after
  * the library has been built.
@@ -505,7 +508,7 @@ extern "C" {
 /* This triggers a compiler error in png.c, if png.c and png.h
  * do not agree upon the version number.
  */
-typedef char* png_libpng_version_1_5_0rc01;
+typedef char* png_libpng_version_1_5_1beta11;
 
 /* Three color definitions.  The order of the red, green, and blue, (and the
  * exact size) is not important, although the size of the fields need to
@@ -661,6 +664,7 @@ typedef png_unknown_chunk FAR * FAR * png_unknown_chunkpp;
 
 typedef struct png_info_def png_info;
 typedef png_info FAR * png_infop;
+typedef PNG_CONST png_info FAR * png_const_infop;
 typedef png_info FAR * FAR * png_infopp;
 
 /* Maximum positive integer used in PNG is (2^31)-1 */
@@ -788,6 +792,7 @@ typedef png_row_info FAR * FAR * png_row_infopp;
  * expected to return the read data in the buffer.
  */
 typedef struct png_struct_def png_struct;
+typedef PNG_CONST png_struct FAR * png_const_structp;
 typedef png_struct FAR * png_structp;
 
 typedef PNG_CALLBACK(void, *png_error_ptr, (png_structp, png_const_charp), );
@@ -943,7 +948,7 @@ PNG_EXPORTA(5, png_structp, png_create_write_struct,
     PNG_ALLOCATED);
 
 PNG_EXPORT(6, png_size_t, png_get_compression_buffer_size,
-    (png_structp png_ptr));
+    (png_const_structp png_ptr));
 
 PNG_EXPORT(7, void, png_set_compression_buffer_size, (png_structp png_ptr, 
     png_size_t size));
@@ -1063,14 +1068,17 @@ PNG_EXPORT(30, void, png_set_bgr, (png_structp png_ptr));
 #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
 /* Expand the grayscale to 24-bit RGB if necessary. */
 PNG_EXPORT(31, void, png_set_gray_to_rgb, (png_structp png_ptr));
+#endif
 
+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
 /* Reduce RGB to grayscale. */
 PNG_FP_EXPORT(32, void, png_set_rgb_to_gray, (png_structp png_ptr,
     int error_action, double red, double green));
 PNG_FIXED_EXPORT(33, void, png_set_rgb_to_gray_fixed, (png_structp png_ptr, 
     int error_action, png_fixed_point red, png_fixed_point green));
 
-PNG_EXPORT(34, png_byte, png_get_rgb_to_gray_status, (png_structp png_ptr));
+PNG_EXPORT(34, png_byte, png_get_rgb_to_gray_status, (png_const_structp
+    png_ptr));
 #endif
 
 PNG_EXPORT(35, void, png_build_grayscale_palette, (int bit_depth, 
@@ -1407,7 +1415,7 @@ PNG_EXPORT(75, void, png_set_error_fn,
     png_error_ptr error_fn, png_error_ptr warning_fn));
 
 /* Return the user pointer associated with the error functions */
-PNG_EXPORT(76, png_voidp, png_get_error_ptr, (png_structp png_ptr));
+PNG_EXPORT(76, png_voidp, png_get_error_ptr, (png_const_structp png_ptr));
 
 /* Replace the default data output functions with a user supplied one(s).
  * If buffered output is not used, then output_flush_fn can be set to NULL.
@@ -1440,7 +1448,7 @@ PNG_EXPORT(81, void, png_set_write_status_fn, (png_structp png_ptr,
 PNG_EXPORT(82, void, png_set_mem_fn, (png_structp png_ptr, png_voidp mem_ptr, 
     png_malloc_ptr malloc_fn, png_free_ptr free_fn));
 /* Return the user pointer associated with the memory functions */
-PNG_EXPORT(83, png_voidp, png_get_mem_ptr, (png_structp png_ptr));
+PNG_EXPORT(83, png_voidp, png_get_mem_ptr, (png_const_structp png_ptr));
 #endif
 
 #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
@@ -1453,19 +1461,31 @@ PNG_EXPORT(85, void, png_set_write_user_transform_fn, (png_structp png_ptr,
     png_user_transform_ptr write_user_transform_fn));
 #endif
 
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
 PNG_EXPORT(86, void, png_set_user_transform_info, (png_structp png_ptr, 
     png_voidp user_transform_ptr, int user_transform_depth, 
     int user_transform_channels));
 /* Return the user pointer associated with the user transform functions */
-PNG_EXPORT(87, png_voidp, png_get_user_transform_ptr, (png_structp png_ptr));
+PNG_EXPORT(87, png_voidp, png_get_user_transform_ptr,
+    (png_const_structp png_ptr));
+#endif
+
+#ifdef PNG_USER_TRANSFORM_INFO_SUPPORTED
+/* Return information about the row currently being processed.  Note that these
+ * APIs do not fail but will return unexpected results if called outside a user
+ * transform callback.  Also note that when transforming an interlaced image the
+ * row number is still the row in the final, de-interlaced, image but the row
+ * only contains the data of the current pass - consult png_row_info for the
+ * actual width of the row!
+ */
+PNG_EXPORT(217, png_uint_32, png_get_current_row_number, (png_const_structp));
+PNG_EXPORT(218, png_byte, png_get_current_pass_number, (png_const_structp));
 #endif
 
 #ifdef PNG_USER_CHUNKS_SUPPORTED
 PNG_EXPORT(88, void, png_set_read_user_chunk_fn, (png_structp png_ptr, 
     png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));
-PNG_EXPORT(89, png_voidp, png_get_user_chunk_ptr, (png_structp png_ptr));
+PNG_EXPORT(89, png_voidp, png_get_user_chunk_ptr, (png_const_structp png_ptr));
 #endif
 
 #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
@@ -1477,13 +1497,30 @@ PNG_EXPORT(90, void, png_set_progressive_read_fn, (png_structp png_ptr,
     png_progressive_row_ptr row_fn, png_progressive_end_ptr end_fn));
 
 /* Returns the user pointer associated with the push read functions */
-PNG_EXPORT(91, png_voidp, png_get_progressive_ptr, (png_structp png_ptr));
+PNG_EXPORT(91, png_voidp, png_get_progressive_ptr, (png_const_structp png_ptr));
 
 /* Function to be called when data becomes available */
 PNG_EXPORT(92, void, png_process_data,
     (png_structp png_ptr, png_infop info_ptr, 
     png_bytep buffer, png_size_t buffer_size));
 
+/* A function which may be called *only* within png_process_data to stop the
+ * processing of any more data.  The function returns the number of bytes
+ * remaining, excluding any that libpng has cached internally.  A subsequent
+ * call to png_process_data must supply these bytes again.  If the argument
+ * 'save' is set to true the routine will first save all the pending data and
+ * will always return 0.
+ */
+PNG_EXPORT(219, png_size_t, png_process_data_pause, (png_structp, int save));
+
+/* A function which may be called *only* outside (after) a call to
+ * png_process_data.  It returns the number of bytes of data to skip in the
+ * input.  Normally it will return 0, but if it returns a non-zero value the
+ * application must skip than number of bytes of input data and pass the
+ * following data to the next call to png_process_data.
+ */
+PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structp));
+
 /* Function that combines rows.  'new_row' is a flag that should come from
  * the callback and be non-NULL if anything needs to be done; the library
  * stores its own version of the new data internally and ignores the passed
@@ -1603,92 +1640,92 @@ PNG_EXPORT(109, void, png_set_benign_errors,
  */
 /* Returns "flag" if chunk data is valid in info_ptr. */
 PNG_EXPORT(110, png_uint_32, png_get_valid,
-    (png_structp png_ptr, png_infop info_ptr, 
+    (png_const_structp png_ptr, png_const_infop info_ptr, 
     png_uint_32 flag));
 
 /* Returns number of bytes needed to hold a transformed row. */
-PNG_EXPORT(111, png_size_t, png_get_rowbytes, (png_structp png_ptr, 
-    png_infop info_ptr));
+PNG_EXPORT(111, png_size_t, png_get_rowbytes, (png_const_structp png_ptr, 
+    png_const_infop info_ptr));
 
 #ifdef PNG_INFO_IMAGE_SUPPORTED
 /* Returns row_pointers, which is an array of pointers to scanlines that was
  * returned from png_read_png().
  */
 PNG_EXPORT(112, png_bytepp, png_get_rows,
-    (png_structp png_ptr, png_infop info_ptr));
+    (png_const_structp png_ptr, png_const_infop info_ptr));
 /* Set row_pointers, which is an array of pointers to scanlines for use
  * by png_write_png().
  */
-PNG_EXPORT(113, void, png_set_rows, (png_structp png_ptr, png_infop info_ptr, 
-    png_bytepp row_pointers));
+PNG_EXPORT(113, void, png_set_rows, (png_structp png_ptr,
+    png_infop info_ptr, png_bytepp row_pointers));
 #endif
 
 /* Returns number of color channels in image. */
 PNG_EXPORT(114, png_byte, png_get_channels,
-    (png_structp png_ptr, png_infop info_ptr));
+    (png_const_structp png_ptr, png_const_infop info_ptr));
 
 #ifdef PNG_EASY_ACCESS_SUPPORTED
 /* Returns image width in pixels. */
-PNG_EXPORT(115, png_uint_32, png_get_image_width, (png_structp png_ptr, 
-    png_infop info_ptr));
+PNG_EXPORT(115, png_uint_32, png_get_image_width, (png_const_structp png_ptr, 
+    png_const_infop info_ptr));
 
 /* Returns image height in pixels. */
-PNG_EXPORT(116, png_uint_32, png_get_image_height, (png_structp png_ptr, 
-    png_infop info_ptr));
+PNG_EXPORT(116, png_uint_32, png_get_image_height, (png_const_structp png_ptr, 
+    png_const_infop info_ptr));
 
 /* Returns image bit_depth. */
 PNG_EXPORT(117, png_byte, png_get_bit_depth,
-    (png_structp png_ptr, png_infop info_ptr));
+    (png_const_structp png_ptr, png_const_infop info_ptr));
 
 /* Returns image color_type. */
-PNG_EXPORT(118, png_byte, png_get_color_type, (png_structp png_ptr, 
-    png_infop info_ptr));
+PNG_EXPORT(118, png_byte, png_get_color_type, (png_const_structp png_ptr, 
+    png_const_infop info_ptr));
 
 /* Returns image filter_type. */
-PNG_EXPORT(119, png_byte, png_get_filter_type, (png_structp png_ptr, 
-    png_infop info_ptr));
+PNG_EXPORT(119, png_byte, png_get_filter_type, (png_const_structp png_ptr, 
+    png_const_infop info_ptr));
 
 /* Returns image interlace_type. */
-PNG_EXPORT(120, png_byte, png_get_interlace_type, (png_structp png_ptr, 
-    png_infop info_ptr));
+PNG_EXPORT(120, png_byte, png_get_interlace_type, (png_const_structp png_ptr, 
+    png_const_infop info_ptr));
 
 /* Returns image compression_type. */
-PNG_EXPORT(121, png_byte, png_get_compression_type, (png_structp png_ptr, 
-    png_infop info_ptr));
+PNG_EXPORT(121, png_byte, png_get_compression_type, (png_const_structp png_ptr, 
+    png_const_infop info_ptr));
 
 /* Returns image resolution in pixels per meter, from pHYs chunk data. */
-PNG_EXPORT(122, png_uint_32, png_get_pixels_per_meter, (png_structp png_ptr, 
-    png_infop info_ptr));
-PNG_EXPORT(123, png_uint_32, png_get_x_pixels_per_meter, (png_structp png_ptr, 
-    png_infop info_ptr));
-PNG_EXPORT(124, png_uint_32, png_get_y_pixels_per_meter, (png_structp png_ptr, 
-    png_infop info_ptr));
+PNG_EXPORT(122, png_uint_32, png_get_pixels_per_meter,
+    (png_const_structp png_ptr, png_const_infop info_ptr));
+PNG_EXPORT(123, png_uint_32, png_get_x_pixels_per_meter,
+    (png_const_structp png_ptr, png_const_infop info_ptr));
+PNG_EXPORT(124, png_uint_32, png_get_y_pixels_per_meter,
+    (png_const_structp png_ptr, png_const_infop info_ptr));
 
 /* Returns pixel aspect ratio, computed from pHYs chunk data.  */
-PNG_FP_EXPORT(125, float, png_get_pixel_aspect_ratio, (png_structp png_ptr, 
-    png_infop info_ptr));
+PNG_FP_EXPORT(125, float, png_get_pixel_aspect_ratio,
+    (png_const_structp png_ptr, png_const_infop info_ptr));
 PNG_FIXED_EXPORT(210, png_fixed_point, png_get_pixel_aspect_ratio_fixed, 
-    (png_structp png_ptr, png_infop info_ptr));
+    (png_const_structp png_ptr, png_const_infop info_ptr));
 
 /* Returns image x, y offset in pixels or microns, from oFFs chunk data. */
-PNG_EXPORT(126, png_int_32, png_get_x_offset_pixels, (png_structp png_ptr, 
-    png_infop info_ptr));
-PNG_EXPORT(127, png_int_32, png_get_y_offset_pixels, (png_structp png_ptr, 
-    png_infop info_ptr));
-PNG_EXPORT(128, png_int_32, png_get_x_offset_microns, (png_structp png_ptr, 
-    png_infop info_ptr));
-PNG_EXPORT(129, png_int_32, png_get_y_offset_microns, (png_structp png_ptr, 
-    png_infop info_ptr));
+PNG_EXPORT(126, png_int_32, png_get_x_offset_pixels,
+    (png_const_structp png_ptr, png_const_infop info_ptr));
+PNG_EXPORT(127, png_int_32, png_get_y_offset_pixels,
+    (png_const_structp png_ptr, png_const_infop info_ptr));
+PNG_EXPORT(128, png_int_32, png_get_x_offset_microns,
+    (png_const_structp png_ptr, png_const_infop info_ptr));
+PNG_EXPORT(129, png_int_32, png_get_y_offset_microns,
+    (png_const_structp png_ptr, png_const_infop info_ptr));
 
 #endif /* PNG_EASY_ACCESS_SUPPORTED */
 
 /* Returns pointer to signature string read from PNG header */
-PNG_EXPORT(130, png_const_bytep, png_get_signature, (png_structp png_ptr, 
-    png_infop info_ptr));
+PNG_EXPORT(130, png_const_bytep, png_get_signature,
+    (png_const_structp png_ptr, png_infop info_ptr));
 
 #ifdef PNG_bKGD_SUPPORTED
 PNG_EXPORT(131, png_uint_32, png_get_bKGD,
-    (png_structp png_ptr, png_infop info_ptr, 
+    (png_const_structp png_ptr, png_infop info_ptr, 
     png_color_16p *background));
 #endif
 
@@ -1698,13 +1735,14 @@ PNG_EXPORT(132, void, png_set_bKGD, (png_structp png_ptr, png_infop info_ptr,
 #endif
 
 #ifdef PNG_cHRM_SUPPORTED
-PNG_FP_EXPORT(133, png_uint_32, png_get_cHRM, (png_structp png_ptr, 
-    png_infop info_ptr, double *white_x, double *white_y, double *red_x, 
+PNG_FP_EXPORT(133, png_uint_32, png_get_cHRM, (png_const_structp png_ptr, 
+   png_const_infop info_ptr, double *white_x, double *white_y, double *red_x, 
     double *red_y, double *green_x, double *green_y, double *blue_x, 
     double *blue_y));
 #ifdef PNG_FIXED_POINT_SUPPORTED /* Otherwise not implemented */
-PNG_FIXED_EXPORT(134, png_uint_32, png_get_cHRM_fixed, (png_structp png_ptr, 
-    png_infop info_ptr, png_fixed_point *int_white_x, 
+PNG_FIXED_EXPORT(134, png_uint_32, png_get_cHRM_fixed,
+    (png_const_structp png_ptr, 
+    png_const_infop info_ptr, png_fixed_point *int_white_x, 
     png_fixed_point *int_white_y, png_fixed_point *int_red_x, 
     png_fixed_point *int_red_y, png_fixed_point *int_green_x, 
     png_fixed_point *int_green_y, png_fixed_point *int_blue_x, 
@@ -1727,28 +1765,29 @@ PNG_FIXED_EXPORT(136, void, png_set_cHRM_fixed, (png_structp png_ptr,
 
 #ifdef PNG_gAMA_SUPPORTED
 PNG_FP_EXPORT(137, png_uint_32, png_get_gAMA,
-    (png_structp png_ptr, png_infop info_ptr, 
+    (png_const_structp png_ptr, png_const_infop info_ptr, 
     double *file_gamma));
-PNG_FIXED_EXPORT(138, png_uint_32, png_get_gAMA_fixed, (png_structp png_ptr, 
-    png_infop info_ptr, png_fixed_point *int_file_gamma));
+PNG_FIXED_EXPORT(138, png_uint_32, png_get_gAMA_fixed,
+    (png_const_structp png_ptr, png_const_infop info_ptr,
+    png_fixed_point *int_file_gamma));
 #endif
 
 #ifdef PNG_gAMA_SUPPORTED
-PNG_FP_EXPORT(139, void, png_set_gAMA, (png_structp png_ptr, png_infop info_ptr, 
-    double file_gamma));
+PNG_FP_EXPORT(139, void, png_set_gAMA, (png_structp png_ptr,
+    png_infop info_ptr, double file_gamma));
 PNG_FIXED_EXPORT(140, void, png_set_gAMA_fixed, (png_structp png_ptr, 
     png_infop info_ptr, png_fixed_point int_file_gamma));
 #endif
 
 #ifdef PNG_hIST_SUPPORTED
 PNG_EXPORT(141, png_uint_32, png_get_hIST,
-    (png_structp png_ptr, png_infop info_ptr, 
+    (png_const_structp png_ptr, png_const_infop info_ptr, 
     png_uint_16p *hist));
 #endif
 
 #ifdef PNG_hIST_SUPPORTED
-PNG_EXPORT(142, void, png_set_hIST, (png_structp png_ptr, png_infop info_ptr, 
-    png_const_uint_16p hist));
+PNG_EXPORT(142, void, png_set_hIST, (png_structp png_ptr,
+    png_infop info_ptr, png_const_uint_16p hist));
 #endif
 
 PNG_EXPORT(143, png_uint_32, png_get_IHDR,
@@ -1763,7 +1802,7 @@ PNG_EXPORT(144, void, png_set_IHDR,
 
 #ifdef PNG_oFFs_SUPPORTED
 PNG_EXPORT(145, png_uint_32, png_get_oFFs,
-    (png_structp png_ptr, png_infop info_ptr, 
+    (png_const_structp png_ptr, png_const_infop info_ptr, 
     png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type));
 #endif
 
@@ -1775,21 +1814,22 @@ PNG_EXPORT(146, void, png_set_oFFs,
 
 #ifdef PNG_pCAL_SUPPORTED
 PNG_EXPORT(147, png_uint_32, png_get_pCAL,
-    (png_structp png_ptr, png_infop info_ptr, 
+    (png_const_structp png_ptr, png_const_infop info_ptr, 
     png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type,
     int *nparams, 
     png_charp *units, png_charpp *params));
 #endif
 
 #ifdef PNG_pCAL_SUPPORTED
-PNG_EXPORT(148, void, png_set_pCAL, (png_structp png_ptr, png_infop info_ptr, 
+PNG_EXPORT(148, void, png_set_pCAL, (png_structp png_ptr,
+    png_infop info_ptr, 
     png_const_charp purpose, png_int_32 X0, png_int_32 X1, int type, 
     int nparams, png_const_charp units, png_charpp params));
 #endif
 
 #ifdef PNG_pHYs_SUPPORTED
 PNG_EXPORT(149, png_uint_32, png_get_pHYs,
-    (png_structp png_ptr, png_infop info_ptr, 
+    (png_const_structp png_ptr, png_const_infop info_ptr, 
     png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
 #endif
 
@@ -1800,7 +1840,7 @@ PNG_EXPORT(150, void, png_set_pHYs,
 #endif
 
 PNG_EXPORT(151, png_uint_32, png_get_PLTE,
-    (png_structp png_ptr, png_infop info_ptr, 
+    (png_const_structp png_ptr, png_const_infop info_ptr, 
     png_colorp *palette, int *num_palette));
 
 PNG_EXPORT(152, void, png_set_PLTE,
@@ -1809,7 +1849,7 @@ PNG_EXPORT(152, void, png_set_PLTE,
 
 #ifdef PNG_sBIT_SUPPORTED
 PNG_EXPORT(153, png_uint_32, png_get_sBIT,
-    (png_structp png_ptr, png_infop info_ptr, 
+    (png_const_structp png_ptr, png_infop info_ptr, 
     png_color_8p *sig_bit));
 #endif
 
@@ -1819,20 +1859,20 @@ PNG_EXPORT(154, void, png_set_sBIT,
 #endif
 
 #ifdef PNG_sRGB_SUPPORTED
-PNG_EXPORT(155, png_uint_32, png_get_sRGB,
-    (png_structp png_ptr, png_infop info_ptr, int *intent));
+PNG_EXPORT(155, png_uint_32, png_get_sRGB, (png_const_structp png_ptr,
+    png_const_infop info_ptr, int *file_srgb_intent));
 #endif
 
 #ifdef PNG_sRGB_SUPPORTED
 PNG_EXPORT(156, void, png_set_sRGB,
-    (png_structp png_ptr, png_infop info_ptr, int intent));
+    (png_structp png_ptr, png_infop info_ptr, int srgb_intent));
 PNG_EXPORT(157, void, png_set_sRGB_gAMA_and_cHRM, (png_structp png_ptr, 
-    png_infop info_ptr, int intent));
+    png_infop info_ptr, int srgb_intent));
 #endif
 
 #ifdef PNG_iCCP_SUPPORTED
 PNG_EXPORT(158, png_uint_32, png_get_iCCP,
-    (png_structp png_ptr, png_infop info_ptr, 
+    (png_const_structp png_ptr, png_const_infop info_ptr, 
     png_charpp name, int *compression_type, png_bytepp profile, 
     png_uint_32 *proflen));
 #endif
@@ -1846,7 +1886,7 @@ PNG_EXPORT(159, void, png_set_iCCP,
 
 #ifdef PNG_sPLT_SUPPORTED
 PNG_EXPORT(160, png_uint_32, png_get_sPLT,
-    (png_structp png_ptr, png_infop info_ptr, 
+    (png_const_structp png_ptr, png_const_infop info_ptr, 
     png_sPLT_tpp entries));
 #endif
 
@@ -1859,7 +1899,7 @@ PNG_EXPORT(161, void, png_set_sPLT,
 #ifdef PNG_TEXT_SUPPORTED
 /* png_get_text also returns the number of text chunks in *num_text */
 PNG_EXPORT(162, png_uint_32, png_get_text,
-    (png_structp png_ptr, png_infop info_ptr, 
+    (png_const_structp png_ptr, png_const_infop info_ptr, 
     png_textp *text_ptr, int *num_text));
 #endif
 
@@ -1878,7 +1918,7 @@ PNG_EXPORT(163, void, png_set_text,
 
 #ifdef PNG_tIME_SUPPORTED
 PNG_EXPORT(164, png_uint_32, png_get_tIME,
-    (png_structp png_ptr, png_infop info_ptr, png_timep *mod_time));
+    (png_const_structp png_ptr, png_infop info_ptr, png_timep *mod_time));
 #endif
 
 #ifdef PNG_tIME_SUPPORTED
@@ -1888,7 +1928,7 @@ PNG_EXPORT(165, void, png_set_tIME,
 
 #ifdef PNG_tRNS_SUPPORTED
 PNG_EXPORT(166, png_uint_32, png_get_tRNS,
-    (png_structp png_ptr, png_infop info_ptr, 
+    (png_const_structp png_ptr, png_infop info_ptr, 
     png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color));
 #endif
 
@@ -1901,7 +1941,7 @@ PNG_EXPORT(167, void, png_set_tRNS,
 
 #ifdef PNG_sCAL_SUPPORTED
 PNG_FP_EXPORT(168, png_uint_32, png_get_sCAL,
-    (png_structp png_ptr, png_infop info_ptr, 
+    (png_const_structp png_ptr, png_const_infop info_ptr, 
     int *unit, double *width, double *height));
 #ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
 /* NOTE: this API is currently implemented using floating point arithmetic, 
@@ -1909,13 +1949,14 @@ PNG_FP_EXPORT(168, png_uint_32, png_get_sCAL,
  * In any case the range of values supported by png_fixed_point is small and it
  * is highly recommended that png_get_sCAL_s be used instead.
  */
-PNG_FIXED_EXPORT(214, png_uint_32, png_get_sCAL_fixed, (png_structp png_ptr, 
-    png_infop info_ptr, int *unit, png_fixed_point *width, 
+PNG_FIXED_EXPORT(214, png_uint_32, png_get_sCAL_fixed,
+    (png_structp png_ptr, png_const_infop info_ptr, int *unit,
+    png_fixed_point *width, 
     png_fixed_point *height));
 #endif
 PNG_EXPORT(169, png_uint_32, png_get_sCAL_s,
-    (png_structp png_ptr, 
-    png_infop info_ptr, int *unit, png_charpp swidth, png_charpp sheight));
+    (png_const_structp png_ptr, png_const_infop info_ptr,
+    int *unit, png_charpp swidth, png_charpp sheight));
 
 PNG_FP_EXPORT(170, void, png_set_sCAL,
     (png_structp png_ptr, png_infop info_ptr, 
@@ -1946,11 +1987,12 @@ PNG_EXPORT(173, int, png_handle_as_unknown, (png_structp png_ptr,
 #endif
 #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
 PNG_EXPORT(174, void, png_set_unknown_chunks, (png_structp png_ptr, 
-    png_infop info_ptr, png_const_unknown_chunkp unknowns, int num_unknowns));
-PNG_EXPORT(175, void, png_set_unknown_chunk_location, (png_structp png_ptr, 
-    png_infop info_ptr, int chunk, int location));
-PNG_EXPORT(176, int, png_get_unknown_chunks, (png_structp png_ptr, 
-    png_infop info_ptr, png_unknown_chunkpp entries));
+    png_infop info_ptr, png_const_unknown_chunkp unknowns,
+    int num_unknowns));
+PNG_EXPORT(175, void, png_set_unknown_chunk_location,
+    (png_structp png_ptr, png_infop info_ptr, int chunk, int location));
+PNG_EXPORT(176, int, png_get_unknown_chunks, (png_const_structp png_ptr, 
+    png_const_infop info_ptr, png_unknown_chunkpp entries));
 #endif
 
 /* Png_free_data() will turn off the "valid" flag for anything it frees.
@@ -1968,10 +2010,14 @@ PNG_EXPORT(179, void, png_write_png, (png_structp png_ptr, png_infop info_ptr,
     int transforms, png_voidp params));
 #endif
 
-PNG_EXPORT(180, png_const_charp, png_get_copyright, (png_structp png_ptr));
-PNG_EXPORT(181, png_const_charp, png_get_header_ver, (png_structp png_ptr));
-PNG_EXPORT(182, png_const_charp, png_get_header_version, (png_structp png_ptr));
-PNG_EXPORT(183, png_const_charp, png_get_libpng_ver, (png_structp png_ptr));
+PNG_EXPORT(180, png_const_charp, png_get_copyright,
+    (png_const_structp png_ptr));
+PNG_EXPORT(181, png_const_charp, png_get_header_ver,
+    (png_const_structp png_ptr));
+PNG_EXPORT(182, png_const_charp, png_get_header_version,
+    (png_const_structp png_ptr));
+PNG_EXPORT(183, png_const_charp, png_get_libpng_ver,
+    (png_const_structp png_ptr));
 
 #ifdef PNG_MNG_FEATURES_SUPPORTED
 PNG_EXPORT(184, png_uint_32, png_permit_mng_features, (png_structp png_ptr, 
@@ -1997,46 +2043,49 @@ PNG_EXPORT(185, void, png_set_strip_error_numbers,
 #ifdef PNG_SET_USER_LIMITS_SUPPORTED
 PNG_EXPORT(186, void, png_set_user_limits, (png_structp png_ptr, 
     png_uint_32 user_width_max, png_uint_32 user_height_max));
-PNG_EXPORT(187, png_uint_32, png_get_user_width_max, (png_structp png_ptr));
-PNG_EXPORT(188, png_uint_32, png_get_user_height_max, (png_structp png_ptr));
+PNG_EXPORT(187, png_uint_32, png_get_user_width_max,
+    (png_const_structp png_ptr));
+PNG_EXPORT(188, png_uint_32, png_get_user_height_max,
+    (png_const_structp png_ptr));
 /* Added in libpng-1.4.0 */
 PNG_EXPORT(189, void, png_set_chunk_cache_max, (png_structp png_ptr, 
     png_uint_32 user_chunk_cache_max));
-PNG_EXPORT(190, png_uint_32, png_get_chunk_cache_max, (png_structp png_ptr));
+PNG_EXPORT(190, png_uint_32, png_get_chunk_cache_max,
+    (png_const_structp png_ptr));
 /* Added in libpng-1.4.1 */
 PNG_EXPORT(191, void, png_set_chunk_malloc_max, (png_structp png_ptr, 
     png_alloc_size_t user_chunk_cache_max));
 PNG_EXPORT(192, png_alloc_size_t, png_get_chunk_malloc_max,
-    (png_structp png_ptr));
+    (png_const_structp png_ptr));
 #endif
 
 #if defined(PNG_INCH_CONVERSIONS_SUPPORTED)
-PNG_EXPORT(193, png_uint_32, png_get_pixels_per_inch, (png_structp png_ptr, 
-    png_infop info_ptr));
+PNG_EXPORT(193, png_uint_32, png_get_pixels_per_inch,
+    (png_const_structp png_ptr, png_const_infop info_ptr));
 
-PNG_EXPORT(194, png_uint_32, png_get_x_pixels_per_inch, (png_structp png_ptr, 
-    png_infop info_ptr));
+PNG_EXPORT(194, png_uint_32, png_get_x_pixels_per_inch,
+    (png_const_structp png_ptr, png_const_infop info_ptr));
 
-PNG_EXPORT(195, png_uint_32, png_get_y_pixels_per_inch, (png_structp png_ptr, 
-    png_infop info_ptr));
+PNG_EXPORT(195, png_uint_32, png_get_y_pixels_per_inch,
+    (png_const_structp png_ptr, png_const_infop info_ptr));
 
-PNG_FP_EXPORT(196, float, png_get_x_offset_inches, (png_structp png_ptr, 
-    png_infop info_ptr));
+PNG_FP_EXPORT(196, float, png_get_x_offset_inches,
+    (png_const_structp png_ptr, png_const_infop info_ptr));
 #ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
 PNG_FIXED_EXPORT(211, png_fixed_point, png_get_x_offset_inches_fixed, 
-    (png_structp png_ptr, png_infop info_ptr));
+    (png_structp png_ptr, png_const_infop info_ptr));
 #endif
 
-PNG_FP_EXPORT(197, float, png_get_y_offset_inches, (png_structp png_ptr, 
-    png_infop info_ptr));
+PNG_FP_EXPORT(197, float, png_get_y_offset_inches, (png_const_structp png_ptr, 
+    png_const_infop info_ptr));
 #ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
 PNG_FIXED_EXPORT(212, png_fixed_point, png_get_y_offset_inches_fixed, 
-    (png_structp png_ptr, png_infop info_ptr));
+    (png_structp png_ptr, png_const_infop info_ptr));
 #endif
 
 #  ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_structp png_ptr, 
-    png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
+PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_const_structp png_ptr, 
+    png_const_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
     int *unit_type));
 #  endif /* PNG_pHYs_SUPPORTED */
 #endif  /* PNG_INCH_CONVERSIONS_SUPPORTED */
@@ -2045,7 +2094,10 @@ PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_structp png_ptr,
 #ifdef PNG_IO_STATE_SUPPORTED
 PNG_EXPORT(199, png_uint_32, png_get_io_state, (png_structp png_ptr));
 
-PNG_EXPORT(200, png_const_bytep, png_get_io_chunk_name, (png_structp png_ptr));
+PNG_EXPORTA(200, png_const_bytep, png_get_io_chunk_name,
+    (png_structp png_ptr), PNG_DEPRECATED);
+PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
+    (png_const_structp png_ptr));
 
 /* The flags returned by png_get_io_state() are the following: */
 #  define PNG_IO_NONE        0x0000   /* no I/O at this moment */
@@ -2154,31 +2206,6 @@ PNG_EXPORT(200, png_const_bytep, png_get_io_chunk_name, (png_structp png_ptr));
      (png_uint_32)32767) / (png_uint_32)65535L)
 #endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */
 
-#ifdef PNG_USE_READ_MACROS
-/* Inline macros to do direct reads of bytes from the input buffer.
- * The png_get_int_32() routine assumes we are using two's complement
- * format for negative values, which is almost certainly true.
- */
-#  define png_get_uint_32(buf) \
-     (((png_uint_32)(*(buf)) << 24) + \
-      ((png_uint_32)(*((buf) + 1)) << 16) + \
-      ((png_uint_32)(*((buf) + 2)) << 8) + \
-      ((png_uint_32)(*((buf) + 3))))
-
-   /* From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the
-    * function) incorrectly returned a value of type png_uint_32.
-    */
-#  define png_get_uint_16(buf) \
-     ((png_uint_16) \
-      (((unsigned int)(*(buf)) << 8) + \
-       ((unsigned int)(*((buf) + 1)))))
-
-#  define png_get_int_32(buf) \
-     ((png_int_32)((*(buf) & 0x80) \
-      ? -((png_int_32)((png_get_uint_32(buf) ^ 0xffffffffL) + 1)) \
-      : (png_int_32)png_get_uint_32(buf)))
-#endif
-
 #ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
 PNG_EXPORT(201, png_uint_32, png_get_uint_32, (png_const_bytep buf));
 PNG_EXPORT(202, png_uint_16, png_get_uint_16, (png_const_bytep buf));
@@ -2206,15 +2233,41 @@ PNG_EXPORT(207, void, png_save_uint_16, (png_bytep buf, unsigned int i));
 /* No png_save_int_16 -- may be added if there's a real need for it. */
 #endif
 
+#ifdef PNG_USE_READ_MACROS
+/* Inline macros to do direct reads of bytes from the input buffer.
+ * The png_get_int_32() routine assumes we are using two's complement
+ * format for negative values, which is almost certainly true.
+ */
+#  define png_get_uint_32(buf) \
+     (((png_uint_32)(*(buf)) << 24) + \
+      ((png_uint_32)(*((buf) + 1)) << 16) + \
+      ((png_uint_32)(*((buf) + 2)) << 8) + \
+      ((png_uint_32)(*((buf) + 3))))
+
+   /* From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the
+    * function) incorrectly returned a value of type png_uint_32.
+    */
+#  define png_get_uint_16(buf) \
+     ((png_uint_16) \
+      (((unsigned int)(*(buf)) << 8) + \
+       ((unsigned int)(*((buf) + 1)))))
+
+#  define png_get_int_32(buf) \
+     ((png_int_32)((*(buf) & 0x80) \
+      ? -((png_int_32)((png_get_uint_32(buf) ^ 0xffffffffL) + 1)) \
+      : (png_int_32)png_get_uint_32(buf)))
+#endif
+
 /* 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
- * one to use is one more than this.)
+ * one to use is one more than this.)  Maintainer, remember to add an entry to
+ * scripts/symbols.def as well.
  */
 #ifdef PNG_EXPORT_LAST_ORDINAL
-  PNG_EXPORT_LAST_ORDINAL(215);
+  PNG_EXPORT_LAST_ORDINAL(220);
 #endif
 
 #ifdef __cplusplus

pngconf.h

@@ -1,9 +1,9 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.5.0rc01 - (PENDING RELEASE)
+ * libpng version 1.5.1beta11 - (PENDING RELEASE)
  *
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *

pngdebug.h

@@ -1,11 +1,11 @@
 
 /* pngdebug.h - Debugging macros for libpng, also used in pngtest.c
  *
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
- * Last changed in libpng version 1.5.0 - (PENDING RELEASE)
+ * Last changed in libpng 1.5.0 [January 6, 2011]
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer

pngerror.c

@@ -1,8 +1,8 @@
 
 /* pngerror.c - stub functions for i/o and memory allocation
  *
- * Last changed in libpng 1.5.0 [(PENDING RELEASE)]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.1 [(PENDING RELEASE)]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -423,7 +423,7 @@ png_set_error_fn(png_structp png_ptr, png_voidp error_ptr,
  * pointer before png_write_destroy and png_read_destroy are called.
  */
 png_voidp PNGAPI
-png_get_error_ptr(png_structp png_ptr)
+png_get_error_ptr(png_const_structp png_ptr)
 {
    if (png_ptr == NULL)
       return NULL;

pngget.c

@@ -1,8 +1,8 @@
 
 /* pngget.c - retrieval of values from info struct
  *
- * Last changed in libpng 1.5.0 [(PENDING RELEASE)]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.1 [(PENDING RELEASE)]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -17,7 +17,8 @@
 #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
 
 png_uint_32 PNGAPI
-png_get_valid(png_structp png_ptr, png_infop info_ptr, png_uint_32 flag)
+png_get_valid(png_const_structp png_ptr, png_const_infop info_ptr,
+    png_uint_32 flag)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return(info_ptr->valid & flag);
@@ -26,7 +27,7 @@ png_get_valid(png_structp png_ptr, png_infop info_ptr, png_uint_32 flag)
 }
 
 png_size_t PNGAPI
-png_get_rowbytes(png_structp png_ptr, png_infop info_ptr)
+png_get_rowbytes(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return(info_ptr->rowbytes);
@@ -36,7 +37,7 @@ png_get_rowbytes(png_structp png_ptr, png_infop info_ptr)
 
 #ifdef PNG_INFO_IMAGE_SUPPORTED
 png_bytepp PNGAPI
-png_get_rows(png_structp png_ptr, png_infop info_ptr)
+png_get_rows(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return(info_ptr->row_pointers);
@@ -48,7 +49,7 @@ png_get_rows(png_structp png_ptr, png_infop info_ptr)
 #ifdef PNG_EASY_ACCESS_SUPPORTED
 /* Easy access to info, added in libpng-0.99 */
 png_uint_32 PNGAPI
-png_get_image_width(png_structp png_ptr, png_infop info_ptr)
+png_get_image_width(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->width;
@@ -57,7 +58,7 @@ png_get_image_width(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_uint_32 PNGAPI
-png_get_image_height(png_structp png_ptr, png_infop info_ptr)
+png_get_image_height(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->height;
@@ -66,7 +67,7 @@ png_get_image_height(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_byte PNGAPI
-png_get_bit_depth(png_structp png_ptr, png_infop info_ptr)
+png_get_bit_depth(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->bit_depth;
@@ -75,7 +76,7 @@ png_get_bit_depth(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_byte PNGAPI
-png_get_color_type(png_structp png_ptr, png_infop info_ptr)
+png_get_color_type(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->color_type;
@@ -84,7 +85,7 @@ png_get_color_type(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_byte PNGAPI
-png_get_filter_type(png_structp png_ptr, png_infop info_ptr)
+png_get_filter_type(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->filter_type;
@@ -93,7 +94,7 @@ png_get_filter_type(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_byte PNGAPI
-png_get_interlace_type(png_structp png_ptr, png_infop info_ptr)
+png_get_interlace_type(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->interlace_type;
@@ -102,7 +103,7 @@ png_get_interlace_type(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_byte PNGAPI
-png_get_compression_type(png_structp png_ptr, png_infop info_ptr)
+png_get_compression_type(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->compression_type;
@@ -111,7 +112,7 @@ png_get_compression_type(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_uint_32 PNGAPI
-png_get_x_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
+png_get_x_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
 {
 #ifdef PNG_pHYs_SUPPORTED
    if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
@@ -128,7 +129,7 @@ png_get_x_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_uint_32 PNGAPI
-png_get_y_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
+png_get_y_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
 {
 #ifdef PNG_pHYs_SUPPORTED
    if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
@@ -145,7 +146,7 @@ png_get_y_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_uint_32 PNGAPI
-png_get_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
+png_get_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
 {
 #ifdef PNG_pHYs_SUPPORTED
    if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
@@ -163,7 +164,7 @@ png_get_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
 
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 float PNGAPI
-png_get_pixel_aspect_ratio(png_structp png_ptr, png_infop info_ptr)
+png_get_pixel_aspect_ratio(png_const_structp png_ptr, png_const_infop info_ptr)
 {
 #ifdef PNG_READ_pHYs_SUPPORTED
    if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
@@ -182,7 +183,8 @@ png_get_pixel_aspect_ratio(png_structp png_ptr, png_infop info_ptr)
 
 #ifdef PNG_FIXED_POINT_SUPPORTED
 png_fixed_point PNGAPI
-png_get_pixel_aspect_ratio_fixed(png_structp png_ptr, png_infop info_ptr)
+png_get_pixel_aspect_ratio_fixed(png_const_structp png_ptr,
+    png_const_infop info_ptr)
 {
 #ifdef PNG_READ_pHYs_SUPPORTED
    if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs)
@@ -208,7 +210,7 @@ png_get_pixel_aspect_ratio_fixed(png_structp png_ptr, png_infop info_ptr)
 #endif
 
 png_int_32 PNGAPI
-png_get_x_offset_microns(png_structp png_ptr, png_infop info_ptr)
+png_get_x_offset_microns(png_const_structp png_ptr, png_const_infop info_ptr)
 {
 #ifdef PNG_oFFs_SUPPORTED
    if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
@@ -224,7 +226,7 @@ png_get_x_offset_microns(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_int_32 PNGAPI
-png_get_y_offset_microns(png_structp png_ptr, png_infop info_ptr)
+png_get_y_offset_microns(png_const_structp png_ptr, png_const_infop info_ptr)
 {
 #ifdef PNG_oFFs_SUPPORTED
    if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
@@ -240,7 +242,7 @@ png_get_y_offset_microns(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_int_32 PNGAPI
-png_get_x_offset_pixels(png_structp png_ptr, png_infop info_ptr)
+png_get_x_offset_pixels(png_const_structp png_ptr, png_const_infop info_ptr)
 {
 #ifdef PNG_oFFs_SUPPORTED
    if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
@@ -256,7 +258,7 @@ png_get_x_offset_pixels(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_int_32 PNGAPI
-png_get_y_offset_pixels(png_structp png_ptr, png_infop info_ptr)
+png_get_y_offset_pixels(png_const_structp png_ptr, png_const_infop info_ptr)
 {
 #ifdef PNG_oFFs_SUPPORTED
    if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
@@ -305,19 +307,19 @@ ppi_from_ppm(png_uint_32 ppm)
 }
 
 png_uint_32 PNGAPI
-png_get_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
+png_get_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    return ppi_from_ppm(png_get_pixels_per_meter(png_ptr, info_ptr));
 }
 
 png_uint_32 PNGAPI
-png_get_x_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
+png_get_x_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    return ppi_from_ppm(png_get_x_pixels_per_meter(png_ptr, info_ptr));
 }
 
 png_uint_32 PNGAPI
-png_get_y_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
+png_get_y_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    return ppi_from_ppm(png_get_y_pixels_per_meter(png_ptr, info_ptr));
 }
@@ -335,7 +337,8 @@ png_fixed_inches_from_microns(png_structp png_ptr, png_int_32 microns)
 }
 
 png_fixed_point PNGAPI
-png_get_x_offset_inches_fixed(png_structp png_ptr, png_infop info_ptr)
+png_get_x_offset_inches_fixed(png_structp png_ptr,
+    png_const_infop info_ptr)
 {
    return png_fixed_inches_from_microns(png_ptr,
        png_get_x_offset_microns(png_ptr, info_ptr));
@@ -344,7 +347,8 @@ png_get_x_offset_inches_fixed(png_structp png_ptr, png_infop info_ptr)
 
 #ifdef PNG_FIXED_POINT_SUPPORTED
 png_fixed_point PNGAPI
-png_get_y_offset_inches_fixed(png_structp png_ptr, png_infop info_ptr)
+png_get_y_offset_inches_fixed(png_structp png_ptr,
+    png_const_infop info_ptr)
 {
    return png_fixed_inches_from_microns(png_ptr,
        png_get_y_offset_microns(png_ptr, info_ptr));
@@ -353,7 +357,7 @@ png_get_y_offset_inches_fixed(png_structp png_ptr, png_infop info_ptr)
 
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 float PNGAPI
-png_get_x_offset_inches(png_structp png_ptr, png_infop info_ptr)
+png_get_x_offset_inches(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    /* To avoid the overflow do the conversion directly in floating
     * point.
@@ -364,7 +368,7 @@ png_get_x_offset_inches(png_structp png_ptr, png_infop info_ptr)
 
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 float PNGAPI
-png_get_y_offset_inches(png_structp png_ptr, png_infop info_ptr)
+png_get_y_offset_inches(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    /* To avoid the overflow do the conversion directly in floating
     * point.
@@ -375,7 +379,7 @@ png_get_y_offset_inches(png_structp png_ptr, png_infop info_ptr)
 
 #ifdef PNG_pHYs_SUPPORTED
 png_uint_32 PNGAPI
-png_get_pHYs_dpi(png_structp png_ptr, png_infop info_ptr,
+png_get_pHYs_dpi(png_const_structp png_ptr, png_const_infop info_ptr,
     png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
 {
    png_uint_32 retval = 0;
@@ -419,7 +423,7 @@ png_get_pHYs_dpi(png_structp png_ptr, png_infop info_ptr,
 #endif  /* PNG_EASY_ACCESS_SUPPORTED */
 
 png_byte PNGAPI
-png_get_channels(png_structp png_ptr, png_infop info_ptr)
+png_get_channels(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return(info_ptr->channels);
@@ -428,7 +432,7 @@ png_get_channels(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_const_bytep PNGAPI
-png_get_signature(png_structp png_ptr, png_infop info_ptr)
+png_get_signature(png_const_structp png_ptr, png_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return(info_ptr->signature);
@@ -438,7 +442,7 @@ png_get_signature(png_structp png_ptr, png_infop info_ptr)
 
 #ifdef PNG_bKGD_SUPPORTED
 png_uint_32 PNGAPI
-png_get_bKGD(png_structp png_ptr, png_infop info_ptr,
+png_get_bKGD(png_const_structp png_ptr, png_infop info_ptr,
    png_color_16p *background)
 {
    if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD)
@@ -457,7 +461,7 @@ png_get_bKGD(png_structp png_ptr, png_infop info_ptr,
 #ifdef PNG_cHRM_SUPPORTED
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
 png_uint_32 PNGAPI
-png_get_cHRM(png_structp png_ptr, png_infop info_ptr,
+png_get_cHRM(png_const_structp png_ptr, png_const_infop info_ptr,
     double *white_x, double *white_y, double *red_x, double *red_y,
     double *green_x, double *green_y, double *blue_x, double *blue_y)
 {
@@ -490,7 +494,7 @@ png_get_cHRM(png_structp png_ptr, png_infop info_ptr,
 
 #  ifdef PNG_FIXED_POINT_SUPPORTED
 png_uint_32 PNGAPI
-png_get_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,
+png_get_cHRM_fixed(png_const_structp png_ptr, png_const_infop info_ptr,
     png_fixed_point *white_x, png_fixed_point *white_y, png_fixed_point *red_x,
     png_fixed_point *red_y, png_fixed_point *green_x, png_fixed_point *green_y,
     png_fixed_point *blue_x, png_fixed_point *blue_y)
@@ -525,7 +529,7 @@ png_get_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_gAMA_SUPPORTED
 png_uint_32 PNGFAPI
-png_get_gAMA_fixed(png_structp png_ptr, png_infop info_ptr,
+png_get_gAMA_fixed(png_const_structp png_ptr, png_const_infop info_ptr,
     png_fixed_point *file_gamma)
 {
    png_debug1(1, "in %s retrieval function", "gAMA");
@@ -541,7 +545,8 @@ png_get_gAMA_fixed(png_structp png_ptr, png_infop info_ptr,
 }
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
 png_uint_32 PNGAPI
-png_get_gAMA(png_structp png_ptr, png_infop info_ptr, double *file_gamma)
+png_get_gAMA(png_const_structp png_ptr, png_const_infop info_ptr,
+    double *file_gamma)
 {
    png_fixed_point igamma;
    png_uint_32 ok = png_get_gAMA_fixed(png_ptr, info_ptr, &igamma);
@@ -557,7 +562,8 @@ png_get_gAMA(png_structp png_ptr, png_infop info_ptr, double *file_gamma)
 
 #ifdef PNG_sRGB_SUPPORTED
 png_uint_32 PNGAPI
-png_get_sRGB(png_structp png_ptr, png_infop info_ptr, int *file_srgb_intent)
+png_get_sRGB(png_const_structp png_ptr, png_const_infop info_ptr,
+    int *file_srgb_intent)
 {
    png_debug1(1, "in %s retrieval function", "sRGB");
 
@@ -574,7 +580,7 @@ png_get_sRGB(png_structp png_ptr, png_infop info_ptr, int *file_srgb_intent)
 
 #ifdef PNG_iCCP_SUPPORTED
 png_uint_32 PNGAPI
-png_get_iCCP(png_structp png_ptr, png_infop info_ptr,
+png_get_iCCP(png_const_structp png_ptr, png_const_infop info_ptr,
     png_charpp name, int *compression_type,
     png_bytepp profile, png_uint_32 *proflen)
 {
@@ -599,7 +605,7 @@ png_get_iCCP(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_sPLT_SUPPORTED
 png_uint_32 PNGAPI
-png_get_sPLT(png_structp png_ptr, png_infop info_ptr,
+png_get_sPLT(png_const_structp png_ptr, png_const_infop info_ptr,
     png_sPLT_tpp spalettes)
 {
    if (png_ptr != NULL && info_ptr != NULL && spalettes != NULL)
@@ -614,7 +620,8 @@ png_get_sPLT(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_hIST_SUPPORTED
 png_uint_32 PNGAPI
-png_get_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_16p *hist)
+png_get_hIST(png_const_structp png_ptr, png_const_infop info_ptr,
+    png_uint_16p *hist)
 {
    png_debug1(1, "in %s retrieval function", "hIST");
 
@@ -670,7 +677,7 @@ png_get_IHDR(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_oFFs_SUPPORTED
 png_uint_32 PNGAPI
-png_get_oFFs(png_structp png_ptr, png_infop info_ptr,
+png_get_oFFs(png_const_structp png_ptr, png_const_infop info_ptr,
     png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type)
 {
    png_debug1(1, "in %s retrieval function", "oFFs");
@@ -690,7 +697,7 @@ png_get_oFFs(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_pCAL_SUPPORTED
 png_uint_32 PNGAPI
-png_get_pCAL(png_structp png_ptr, png_infop info_ptr,
+png_get_pCAL(png_const_structp png_ptr, png_const_infop info_ptr,
     png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type, int *nparams,
     png_charp *units, png_charpp *params)
 {
@@ -718,7 +725,7 @@ png_get_pCAL(png_structp png_ptr, png_infop info_ptr,
 #  ifdef PNG_FIXED_POINT_SUPPORTED
 #    ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
 png_uint_32 PNGAPI
-png_get_sCAL_fixed(png_structp png_ptr, png_infop info_ptr,
+png_get_sCAL_fixed(png_structp png_ptr, png_const_infop info_ptr,
     int *unit, png_fixed_point *width, png_fixed_point *height)
 {
    if (png_ptr != NULL && info_ptr != NULL &&
@@ -738,7 +745,7 @@ png_get_sCAL_fixed(png_structp png_ptr, png_infop info_ptr,
 #  endif /* FIXED_POINT */
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
 png_uint_32 PNGAPI
-png_get_sCAL(png_structp png_ptr, png_infop info_ptr,
+png_get_sCAL(png_const_structp png_ptr, png_const_infop info_ptr,
     int *unit, double *width, double *height)
 {
    if (png_ptr != NULL && info_ptr != NULL &&
@@ -754,7 +761,7 @@ png_get_sCAL(png_structp png_ptr, png_infop info_ptr,
 }
 #  endif /* FLOATING POINT */
 png_uint_32 PNGAPI
-png_get_sCAL_s(png_structp png_ptr, png_infop info_ptr,
+png_get_sCAL_s(png_const_structp png_ptr, png_const_infop info_ptr,
     int *unit, png_charpp width, png_charpp height)
 {
    if (png_ptr != NULL && info_ptr != NULL &&
@@ -772,7 +779,7 @@ png_get_sCAL_s(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_pHYs_SUPPORTED
 png_uint_32 PNGAPI
-png_get_pHYs(png_structp png_ptr, png_infop info_ptr,
+png_get_pHYs(png_const_structp png_ptr, png_const_infop info_ptr,
     png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
 {
    png_uint_32 retval = 0;
@@ -806,8 +813,8 @@ png_get_pHYs(png_structp png_ptr, png_infop info_ptr,
 #endif /* pHYs */
 
 png_uint_32 PNGAPI
-png_get_PLTE(png_structp png_ptr, png_infop info_ptr, png_colorp *palette,
-    int *num_palette)
+png_get_PLTE(png_const_structp png_ptr, png_const_infop info_ptr,
+    png_colorp *palette, int *num_palette)
 {
    png_debug1(1, "in %s retrieval function", "PLTE");
 
@@ -825,7 +832,8 @@ png_get_PLTE(png_structp png_ptr, png_infop info_ptr, png_colorp *palette,
 
 #ifdef PNG_sBIT_SUPPORTED
 png_uint_32 PNGAPI
-png_get_sBIT(png_structp png_ptr, png_infop info_ptr, png_color_8p *sig_bit)
+png_get_sBIT(png_const_structp png_ptr, png_infop info_ptr,
+    png_color_8p *sig_bit)
 {
    png_debug1(1, "in %s retrieval function", "sBIT");
 
@@ -842,8 +850,8 @@ png_get_sBIT(png_structp png_ptr, png_infop info_ptr, png_color_8p *sig_bit)
 
 #ifdef PNG_TEXT_SUPPORTED
 png_uint_32 PNGAPI
-png_get_text(png_structp png_ptr, png_infop info_ptr, png_textp *text_ptr,
-    int *num_text)
+png_get_text(png_const_structp png_ptr, png_const_infop info_ptr,
+    png_textp *text_ptr, int *num_text)
 {
    if (png_ptr != NULL && info_ptr != NULL && info_ptr->num_text > 0)
    {
@@ -869,7 +877,7 @@ png_get_text(png_structp png_ptr, png_infop info_ptr, png_textp *text_ptr,
 
 #ifdef PNG_tIME_SUPPORTED
 png_uint_32 PNGAPI
-png_get_tIME(png_structp png_ptr, png_infop info_ptr, png_timep *mod_time)
+png_get_tIME(png_const_structp png_ptr, png_infop info_ptr, png_timep *mod_time)
 {
    png_debug1(1, "in %s retrieval function", "tIME");
 
@@ -886,7 +894,7 @@ png_get_tIME(png_structp png_ptr, png_infop info_ptr, png_timep *mod_time)
 
 #ifdef PNG_tRNS_SUPPORTED
 png_uint_32 PNGAPI
-png_get_tRNS(png_structp png_ptr, png_infop info_ptr,
+png_get_tRNS(png_const_structp png_ptr, png_infop info_ptr,
     png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color)
 {
    png_uint_32 retval = 0;
@@ -931,7 +939,7 @@ png_get_tRNS(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
 int PNGAPI
-png_get_unknown_chunks(png_structp png_ptr, png_infop info_ptr,
+png_get_unknown_chunks(png_const_structp png_ptr, png_const_infop info_ptr,
     png_unknown_chunkpp unknowns)
 {
    if (png_ptr != NULL && info_ptr != NULL && unknowns != NULL)
@@ -946,7 +954,7 @@ png_get_unknown_chunks(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
 png_byte PNGAPI
-png_get_rgb_to_gray_status (png_structp png_ptr)
+png_get_rgb_to_gray_status (png_const_structp png_ptr)
 {
    return (png_byte)(png_ptr ? png_ptr->rgb_to_gray_status : 0);
 }
@@ -954,14 +962,14 @@ png_get_rgb_to_gray_status (png_structp png_ptr)
 
 #ifdef PNG_USER_CHUNKS_SUPPORTED
 png_voidp PNGAPI
-png_get_user_chunk_ptr(png_structp png_ptr)
+png_get_user_chunk_ptr(png_const_structp png_ptr)
 {
    return (png_ptr ? png_ptr->user_chunk_ptr : NULL);
 }
 #endif
 
 png_size_t PNGAPI
-png_get_compression_buffer_size(png_structp png_ptr)
+png_get_compression_buffer_size(png_const_structp png_ptr)
 {
    return (png_ptr ? png_ptr->zbuf_size : 0L);
 }
@@ -971,27 +979,27 @@ png_get_compression_buffer_size(png_structp png_ptr)
 /* These functions were added to libpng 1.2.6 and were enabled
  * by default in libpng-1.4.0 */
 png_uint_32 PNGAPI
-png_get_user_width_max (png_structp png_ptr)
+png_get_user_width_max (png_const_structp png_ptr)
 {
    return (png_ptr ? png_ptr->user_width_max : 0);
 }
 
 png_uint_32 PNGAPI
-png_get_user_height_max (png_structp png_ptr)
+png_get_user_height_max (png_const_structp png_ptr)
 {
    return (png_ptr ? png_ptr->user_height_max : 0);
 }
 
 /* This function was added to libpng 1.4.0 */
 png_uint_32 PNGAPI
-png_get_chunk_cache_max (png_structp png_ptr)
+png_get_chunk_cache_max (png_const_structp png_ptr)
 {
    return (png_ptr ? png_ptr->user_chunk_cache_max : 0);
 }
 
 /* This function was added to libpng 1.4.1 */
 png_alloc_size_t PNGAPI
-png_get_chunk_malloc_max (png_structp png_ptr)
+png_get_chunk_malloc_max (png_const_structp png_ptr)
 {
    return (png_ptr ? png_ptr->user_chunk_malloc_max : 0);
 }
@@ -1005,6 +1013,15 @@ png_get_io_state (png_structp png_ptr)
    return png_ptr->io_state;
 }
 
+png_uint_32 PNGAPI
+png_get_io_chunk_type (png_const_structp png_ptr)
+{
+   return ((png_ptr->chunk_name[0] << 24) +
+           (png_ptr->chunk_name[1] << 16) +
+           (png_ptr->chunk_name[2] <<  8) +
+           (png_ptr->chunk_name[3]));
+}
+
 png_const_bytep PNGAPI
 png_get_io_chunk_name (png_structp png_ptr)
 {

pnginfo.h

@@ -1,11 +1,11 @@
 
 /* pnginfo.h - header file for PNG reference library
  *
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
- * Last changed in libpng version 1.5.0 - (PENDING RELEASE)
+ * Last changed in libpng 1.5.0 [January 6, 2011]
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer

pngmem.c

@@ -1,8 +1,8 @@
 
 /* pngmem.c - stub functions for memory allocation
  *
- * Last changed in libpng 1.5.0 [(PENDING RELEASE)]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.1 [(PENDING RELEASE)]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -647,7 +647,7 @@ png_set_mem_fn(png_structp png_ptr, png_voidp mem_ptr, png_malloc_ptr
  * pointer before png_write_destroy and png_read_destroy are called.
  */
 png_voidp PNGAPI
-png_get_mem_ptr(png_structp png_ptr)
+png_get_mem_ptr(png_const_structp png_ptr)
 {
    if (png_ptr == NULL)
       return (NULL);

pngpread.c

@@ -1,8 +1,8 @@
 
 /* pngpread.c - read a png file in push mode
  *
- * Last changed in libpng 1.5.0 [(PENDING RELEASE)]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.1 [(PENDING RELEASE)]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -41,6 +41,64 @@ png_process_data(png_structp png_ptr, png_infop info_ptr,
    }
 }
 
+png_size_t PNGAPI
+png_process_data_pause(png_structp png_ptr, int save)
+{
+   if (png_ptr != NULL)
+   {
+      /* It's easiest for the caller if we do the save, then the caller doesn't
+       * have to supply the same data again:
+       */
+      if (save)
+         png_push_save_buffer(png_ptr);
+      else
+      {
+         /* This includes any pending saved bytes: */
+         png_size_t remaining = png_ptr->buffer_size;
+         png_ptr->buffer_size = 0;
+
+         /* So subtract the saved buffer size, unless all the data
+          * is actually 'saved', in which case we just return 0
+          */
+         if (png_ptr->save_buffer_size < remaining)
+            return remaining - png_ptr->save_buffer_size;
+      }
+   }
+
+   return 0;
+}
+
+png_uint_32 PNGAPI
+png_process_data_skip(png_structp png_ptr)
+{
+   png_uint_32 remaining = 0;
+
+   if (png_ptr != NULL && png_ptr->process_mode == PNG_SKIP_MODE &&
+      png_ptr->skip_length > 0)
+   {
+      /* At the end of png_process_data the buffer size must be 0 (see the loop
+       * above) so we can detect a broken call here:
+       */
+      if (png_ptr->buffer_size != 0)
+         png_error(png_ptr,
+            "png_process_data_skip called inside png_process_data");
+
+      /* If is impossible for there to be a saved buffer at this point -
+       * otherwise we could not be in SKIP mode.  This will also happen if
+       * png_process_skip is called inside png_process_data (but only very
+       * rarely.)
+       */
+      if (png_ptr->save_buffer_size != 0)
+         png_error(png_ptr, "png_process_data_skip called with saved data");
+
+      remaining = png_ptr->skip_length;
+      png_ptr->skip_length = 0;
+      png_ptr->process_mode = PNG_READ_CHUNK_MODE;
+   }
+
+   return remaining;
+}
+
 /* What we do with the incoming data depends on what we were previously
  * doing before we ran out of data...
  */
@@ -582,10 +640,10 @@ png_push_crc_finish(png_structp png_ptr)
 {
    if (png_ptr->skip_length && png_ptr->save_buffer_size)
    {
-      png_size_t save_size = png_ptr->current_buffer_size;
+      png_size_t save_size = png_ptr->save_buffer_size;
       png_uint_32 skip_length = png_ptr->skip_length;
 
-      /* We want the smaller of 'skip_length' and 'current_buffer_size', but
+      /* We want the smaller of 'skip_length' and 'save_buffer_size', but
        * they are of different types and we don't know which variable has the
        * fewest bits.  Carefully select the smaller and cast it to the type of
        * the larger - this cannot overflow.  Do not cast in the following test
@@ -609,10 +667,8 @@ png_push_crc_finish(png_structp png_ptr)
       png_size_t save_size = png_ptr->current_buffer_size;
       png_uint_32 skip_length = png_ptr->skip_length;
 
-      /* We want the smaller of 'skip_length' and 'current_buffer_size', but
-       * they are of different types and we don't know which variable has the
-       * fewest bits.  Carefully select the smaller and cast it to the type of
-       * the larger - this cannot overflow.
+      /* We want the smaller of 'skip_length' and 'current_buffer_size', here,
+       * the same problem exists as above and the same solution.
        */
       if (skip_length < save_size)
          save_size = (png_size_t)skip_length;
@@ -1788,7 +1844,7 @@ png_set_progressive_read_fn(png_structp png_ptr, png_voidp progressive_ptr,
 }
 
 png_voidp PNGAPI
-png_get_progressive_ptr(png_structp png_ptr)
+png_get_progressive_ptr(png_const_structp png_ptr)
 {
    if (png_ptr == NULL)
       return (NULL);

pngpriv.h

@@ -1,12 +1,13 @@
 
 /* pngpriv.h - private declarations for use inside libpng
  *
- * libpng version 1.5.0rc01 - (PENDING RELEASE)
  * For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
+ * Last changed in libpng 1.5.0 [January 6, 2011]
+ *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer
  * and license in png.h
@@ -85,11 +86,28 @@ typedef PNG_CONST png_uint_16p FAR * png_const_uint_16pp;
 /* Unused formal parameter errors are removed using the following macro
  * which is expected to have no bad effects on performance.  Note that
  * if you replace it with something other than whitespace, you must include
- * the terminating semicolon.
+ * the terminating semicolon.  Also note that some of these might not
+ * work when "param" is a structure, but that is never the case in libpng.
  */
-#ifndef PNG_UNUSED
-#  define PNG_UNUSED(param) param = param;
-#endif
+#define PNG_UNUSED(param) {if(param){}}
+
+#if 0 /* Possibilities discussed on png-mng-implement, starting 27 Jan 2011 */
+#ifndef PNG_UNUSED                                 /* "best" but complex */
+ #if defined(__GNUC__) || defined(_MSC_VER)
+ #  define PNG_UNUSED(param) (void)param;
+ #else
+ #  define PNG_UNUSED(param)
+ #endif
+#define PNG_UNUSED(param) param = param;            /* What we used before */
+#define PNG_UNUSED(param) {(void)param;}            /* Visual C complains */
+#define PNG_UNUSED(param) if(param);                /* gcc-4.2 complains */
+#define PNG_UNUSED(param) if(param){}               /* more brackets nicer */
+#define PNG_UNUSED(param) ((void)(param ? 0 : 0));  /* 0:0 might be seen */
+#define PNG_UNUSED(param) {if(&param){}}            /* gcc-4 complains */
+#define PNG_UNUSED(param) {if(&param-&param){}}     /* No comment. */
+#define PNG_UNUSED(param) /* generates smallest (no) code but emits warning */
+#endif /* 0 */
+#endif /* PNG_UNUSED */
 
 /* Just a little check that someone hasn't tried to define something
  * contradictory.

pngread.c

@@ -1,8 +1,8 @@
 
 /* pngread.c - read a PNG file
  *
- * Last changed in libpng 1.5.0 [(PENDING RELEASE)]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.1 [$RDATE%]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -841,7 +841,7 @@ png_read_image(png_structp png_ptr, png_bytepp image)
    }
    else
    {
-      if (!(png_ptr->transformations & PNG_INTERLACE))
+      if (png_ptr->interlaced && !(png_ptr->transformations & PNG_INTERLACE))
       {
          /* Caller called png_start_read_image or png_read_update_info without
           * first turning on the PNG_INTERLACE transform.  We can fix this here,

pngrio.c

@@ -1,8 +1,8 @@
 
 /* pngrio.c - functions for data input
  *
- * Last changed in libpng 1.5.0 [(PENDING RELEASE)]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.0 [January 6, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *

pngrtran.c

@@ -1,8 +1,8 @@
 
 /* pngrtran.c - transforms the data in a row for PNG readers
  *
- * Last changed in libpng 1.5.0 [(PENDING RELEASE)]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.1 [(PENDING RELEASE)]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -692,8 +692,13 @@ png_set_gray_to_rgb(png_structp png_ptr)
 {
    png_debug(1, "in png_set_gray_to_rgb");
 
-   png_ptr->transformations |= PNG_GRAY_TO_RGB;
-   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
+   if (png_ptr != NULL)
+   {
+      /* Because rgb must be 8 bits or more: */
+      png_set_expand_gray_1_2_4_to_8(png_ptr);
+      png_ptr->transformations |= PNG_GRAY_TO_RGB;
+      png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
+   }
 }
 #endif
 
@@ -1068,7 +1073,7 @@ png_init_read_transformations(png_structp png_ptr)
              */
             png_ptr->transformations &= ~PNG_BACKGROUND;
             png_ptr->transformations &= ~PNG_GAMMA;
-            png_ptr->transformations |= PNG_STRIP_ALPHA;
+            png_ptr->flags |= PNG_FLAG_STRIP_ALPHA;
          }
 
          /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */
@@ -1202,7 +1207,7 @@ png_init_read_transformations(png_structp png_ptr)
 
       /* Handled alpha, still need to strip the channel. */
       png_ptr->transformations &= ~PNG_BACKGROUND;
-      png_ptr->transformations |= PNG_STRIP_ALPHA;
+      png_ptr->flags |= PNG_FLAG_STRIP_ALPHA;
    }
 #endif /* PNG_READ_BACKGROUND_SUPPORTED */
 
@@ -2427,7 +2432,7 @@ png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)
 
    png_debug(1, "in png_do_rgb_to_gray");
 
-   if (
+   if (!(row_info->color_type & PNG_COLOR_MASK_PALETTE) &&
        (row_info->color_type & PNG_COLOR_MASK_COLOR))
    {
       png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff;
@@ -3778,7 +3783,7 @@ png_do_expand_palette(png_row_infop row_info, png_bytep row,
          row_info->rowbytes = row_width;
       }
 
-      else if (row_info->bit_depth == 8)
+      if (row_info->bit_depth == 8)
       {
          {
             if (trans_alpha != NULL)

pngrutil.c

@@ -1,8 +1,8 @@
 
 /* pngrutil.c - utilities to read a PNG file
  *
- * Last changed in libpng 1.5.0 [(PENDING RELEASE)]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.1 [(PENDING RELEASE)]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -608,7 +608,7 @@ png_handle_IHDR(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->width);
    png_debug1(3, "bit_depth = %d", png_ptr->bit_depth);
    png_debug1(3, "channels = %d", png_ptr->channels);
-   png_debug1(3, "rowbytes = %u", png_ptr->rowbytes);
+   png_debug1(3, "rowbytes = %lu", (unsigned long)png_ptr->rowbytes);
    png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth,
        color_type, interlace_type, compression_type, filter_type);
 }
@@ -1248,7 +1248,9 @@ png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 
          png_snprintf2(umsg, 80,
              "Ignoring iCCP chunk with declared size = %u "
-              "and actual length = %u", profile_size, profile_length);
+              "and actual length = %u",
+              (unsigned int) profile_size,
+              (unsigned int) profile_length);
          png_warning(png_ptr, umsg);
       }
 #else
@@ -1960,7 +1962,7 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 void /* PRIVATE */
 png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 {
-   png_size_t slength, index;
+   png_size_t slength, i;
    int state;
 
    png_debug(1, "in png_handle_sCAL");
@@ -2017,21 +2019,21 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    /* Validate the ASCII numbers, need two ASCII numbers separated by
     * a '\0' and they need to fit exactly in the chunk data.
     */
-   index = 0;
+   i = 0;
    state = 0;
 
    if (png_ptr->chunkdata[1] == 45 /* negative width */ ||
-       !png_check_fp_number(png_ptr->chunkdata, slength, &state, &index) ||
-       index >= slength || png_ptr->chunkdata[index++] != 0)
+       !png_check_fp_number(png_ptr->chunkdata, slength, &state, &i) ||
+       i >= slength || png_ptr->chunkdata[i++] != 0)
       png_warning(png_ptr, "Invalid sCAL chunk ignored: bad width format");
 
    else
    {
-      png_size_t heighti = index;
+      png_size_t heighti = i;
 
-      if (png_ptr->chunkdata[index] == 45 /* negative height */ ||
-          !png_check_fp_number(png_ptr->chunkdata, slength, &state, &index) ||
-          index != slength)
+      if (png_ptr->chunkdata[i] == 45 /* negative height */ ||
+          !png_check_fp_number(png_ptr->chunkdata, slength, &state, &i) ||
+          i != slength)
          png_warning(png_ptr, "Invalid sCAL chunk ignored: bad height format");
 
       else
@@ -3605,9 +3607,9 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
    png_debug1(3, "height = %u,", png_ptr->height);
    png_debug1(3, "iwidth = %u,", png_ptr->iwidth);
    png_debug1(3, "num_rows = %u,", png_ptr->num_rows);
-   png_debug1(3, "rowbytes = %u,", png_ptr->rowbytes);
-   png_debug1(3, "irowbytes = %u",
-       PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->iwidth) + 1);
+   png_debug1(3, "rowbytes = %lu,", (unsigned long)png_ptr->rowbytes);
+   png_debug1(3, "irowbytes = %lu",
+       (unsigned long)PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->iwidth) + 1);
 
    png_ptr->flags |= PNG_FLAG_ROW_INIT;
 }

pngset.c

@@ -1,8 +1,8 @@
 
 /* pngset.c - storage of image information into info struct
  *
- * Last changed in libpng 1.5.0 [(PENDING RELEASE)]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.1 [(PENDING RELEASE)]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -87,7 +87,7 @@ png_set_cHRM(png_structp png_ptr, png_infop info_ptr,
 #ifdef PNG_gAMA_SUPPORTED
 void PNGFAPI
 png_set_gAMA_fixed(png_structp png_ptr, png_infop info_ptr, png_fixed_point
-    gamma)
+    file_gamma)
 {
    png_debug1(1, "in %s storage function", "gAMA");
 
@@ -98,15 +98,15 @@ png_set_gAMA_fixed(png_structp png_ptr, png_infop info_ptr, png_fixed_point
     * wrong, therefore storing them (and setting PNG_INFO_gAMA)
     * must be wrong too.
     */
-   if (gamma > (png_fixed_point)PNG_UINT_31_MAX)
+   if (file_gamma > (png_fixed_point)PNG_UINT_31_MAX)
       png_warning(png_ptr, "Gamma too large, ignored");
 
-   else if (gamma <= 0)
+   else if (file_gamma <= 0)
       png_warning(png_ptr, "Negative or zero gamma ignored");
 
    else
    {
-      info_ptr->gamma = gamma;
+      info_ptr->gamma = file_gamma;
       info_ptr->valid |= PNG_INFO_gAMA;
    }
 }
@@ -352,7 +352,7 @@ png_set_sCAL_s(png_structp png_ptr, png_infop info_ptr,
 
    ++lengthw;
 
-   png_debug1(3, "allocating unit for info (%u bytes)", lengthw);
+   png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthw);
 
    info_ptr->scal_s_width = (png_charp)png_malloc_warn(png_ptr, lengthw);
 
@@ -366,7 +366,7 @@ png_set_sCAL_s(png_structp png_ptr, png_infop info_ptr,
 
    ++lengthh;
 
-   png_debug1(3, "allocating unit for info (%u bytes)", lengthh);
+   png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthh);
 
    info_ptr->scal_s_height = (png_charp)png_malloc_warn(png_ptr, lengthh);
 
@@ -522,27 +522,27 @@ png_set_sBIT(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_sRGB_SUPPORTED
 void PNGAPI
-png_set_sRGB(png_structp png_ptr, png_infop info_ptr, int intent)
+png_set_sRGB(png_structp png_ptr, png_infop info_ptr, int srgb_intent)
 {
    png_debug1(1, "in %s storage function", "sRGB");
 
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
-   info_ptr->srgb_intent = (png_byte)intent;
+   info_ptr->srgb_intent = (png_byte)srgb_intent;
    info_ptr->valid |= PNG_INFO_sRGB;
 }
 
 void PNGAPI
 png_set_sRGB_gAMA_and_cHRM(png_structp png_ptr, png_infop info_ptr,
-    int intent)
+    int srgb_intent)
 {
    png_debug1(1, "in %s storage function", "sRGB_gAMA_and_cHRM");
 
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
-   png_set_sRGB(png_ptr, info_ptr, intent);
+   png_set_sRGB(png_ptr, info_ptr, srgb_intent);
 
 #  ifdef PNG_gAMA_SUPPORTED
    png_set_gAMA_fixed(png_ptr, info_ptr, 45455L);
@@ -751,10 +751,10 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr,
       if (textp->key == NULL)
          return(1);
 
-      png_debug2(2, "Allocated %lu bytes at %x in png_set_text",
+      png_debug2(2, "Allocated %lu bytes at %p in png_set_text",
           (unsigned long)(png_uint_32)
           (key_len + lang_len + lang_key_len + text_length + 4),
-          (int)textp->key);
+          textp->key);
 
       png_memcpy(textp->key, text_ptr[i].key,(png_size_t)(key_len));
       *(textp->key + key_len) = '\0';

pngstruct.h

@@ -1,11 +1,11 @@
 
 /* pngstruct.h - header file for PNG reference library
  *
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
- * Last changed in libpng version 1.5.0 - (PENDING RELEASE)
+ * Last changed in libpng 1.5.0 [January 6, 2011]
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer

pngtest.c

@@ -1,8 +1,8 @@
 
 /* pngtest.c - a simple test program to test libpng
  *
- * Last changed in libpng 1.5.0 [(PENDING RELEASE)]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.0 [January 6, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -1784,4 +1784,4 @@ main(int argc, char *argv[])
 }
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_5_0rc01 Your_png_h_is_not_version_1_5_0rc01;
+typedef png_libpng_version_1_5_1beta11 Your_png_h_is_not_version_1_5_1beta11;

pngtrans.c

@@ -1,8 +1,8 @@
 
 /* pngtrans.c - transforms the data in a row (used by both readers and writers)
  *
- * Last changed in libpng 1.5.0 [(PENDING RELEASE)]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.1 [(PENDING RELEASE)]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -672,6 +672,7 @@ png_do_bgr(png_row_infop row_info, png_bytep row)
 
 #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
     defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
 void PNGAPI
 png_set_user_transform_info(png_structp png_ptr, png_voidp
    user_transform_ptr, int user_transform_depth, int user_transform_channels)
@@ -680,33 +681,42 @@ png_set_user_transform_info(png_structp png_ptr, png_voidp
 
    if (png_ptr == NULL)
       return;
-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
    png_ptr->user_transform_ptr = user_transform_ptr;
    png_ptr->user_transform_depth = (png_byte)user_transform_depth;
    png_ptr->user_transform_channels = (png_byte)user_transform_channels;
-#else
-   if (user_transform_ptr || user_transform_depth || user_transform_channels)
-      png_warning(png_ptr,
-        "This version of libpng does not support user transform info");
-#endif
 }
+#endif
 
 /* This function returns a pointer to the user_transform_ptr associated with
  * the user transform functions.  The application should free any memory
  * associated with this pointer before png_write_destroy and png_read_destroy
  * are called.
  */
+#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
 png_voidp PNGAPI
-png_get_user_transform_ptr(png_structp png_ptr)
+png_get_user_transform_ptr(png_const_structp png_ptr)
 {
    if (png_ptr == NULL)
       return (NULL);
 
-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
    return ((png_voidp)png_ptr->user_transform_ptr);
-#else
-   return (NULL);
+}
 #endif
+
+png_uint_32 PNGAPI
+png_get_current_row_number(png_const_structp png_ptr)
+{
+   if (png_ptr != NULL)
+      return png_ptr->row_number;
+   return PNG_UINT_32_MAX; /* help the app not to fail silently */
+}
+
+png_byte PNGAPI
+png_get_current_pass_number(png_const_structp png_ptr)
+{
+   if (png_ptr != NULL)
+      return png_ptr->pass;
+   return 8; /* invalid */
 }
 #endif /* PNG_READ_USER_TRANSFORM_SUPPORTED ||
           PNG_WRITE_USER_TRANSFORM_SUPPORTED */

pngwio.c

@@ -1,8 +1,8 @@
 
 /* pngwio.c - functions for data output
  *
- * Last changed in libpng 1.5.0 [(PENDING RELEASE)]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.0 [January 6, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *

pngwrite.c

@@ -1,8 +1,8 @@
 
 /* pngwrite.c - general routines to write a PNG file
  *
- * Last changed in libpng 1.5.0 [(PENDING RELEASE)]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.1 [(PENDING RELEASE)]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -783,7 +783,8 @@ png_write_row(png_structp png_ptr, png_const_bytep row)
    png_debug1(3, "row_info->channels = %d", png_ptr->row_info.channels);
    png_debug1(3, "row_info->bit_depth = %d", png_ptr->row_info.bit_depth);
    png_debug1(3, "row_info->pixel_depth = %d", png_ptr->row_info.pixel_depth);
-   png_debug1(3, "row_info->rowbytes = %u", png_ptr->row_info.rowbytes);
+   png_debug1(3, "row_info->rowbytes = %lu",
+       (unsigned long)png_ptr->row_info.rowbytes);
 
    /* Copy user's row into buffer, leaving room for filter byte. */
    png_memcpy(png_ptr->row_buf + 1, row, png_ptr->row_info.rowbytes);

pngwtran.c

@@ -1,8 +1,8 @@
 
 /* pngwtran.c - transforms the data in a row for PNG writers
  *
- * Last changed in libpng 1.5.0 [(PENDING RELEASE)]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.0 [January 6, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *

pngwutil.c

@@ -1,8 +1,8 @@
 
 /* pngwutil.c - utilities to write a PNG file
  *
- * Last changed in libpng 1.5.0 [(PENDING RELEASE)]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.0 [January 6, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *

projects/visualc71/libpng.vcproj

@@ -31,8 +31,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)/libpng15.dll"
-				LinkIncremental="1"
-				ModuleDefinitionFile="..\..\scripts\pngwin.def"/>
+				LinkIncremental="1"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
@@ -80,7 +79,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)/libpng15d.dll"
-				ModuleDefinitionFile="..\..\scripts\pngwin.def"
 				GenerateDebugInformation="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -340,27 +338,6 @@
 			<File
 				RelativePath="..\..\pngtrans.c">
 			</File>
-			<File
-				RelativePath="..\..\scripts\pngwin.def">
-				<FileConfiguration
-					Name="DLL VB|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCustomBuildTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="LIB Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCustomBuildTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="LIB Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCustomBuildTool"/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\..\pngwio.c">
 			</File>

projects/vstudio/readme.txt

@@ -1,7 +1,7 @@
 
 VisualStudio instructions
 
-libpng version 1.5.0rc01 - December 27, 2010
+libpng version 1.5.1beta11 - January 28, 2011
 
 Copyright (c) 1998-2010 Glenn Randers-Pehrson
 

projects/vstudio/zlib.props

@@ -2,7 +2,7 @@
 <!--
  * zlib.props - location of zlib source
  *
- * libpng version 1.5.0rc01 - December 27, 2010
+ * libpng version 1.5.1beta11 - January 28, 2011
  *
  * Copyright (c) 1998-2010 Glenn Randers-Pehrson
  *

scripts/README.txt

@@ -1,9 +1,9 @@
 
-Makefiles for  libpng version 1.5.0rc01 - December 27, 2010
+Makefiles for  libpng version 1.5.1beta11 - January 28, 2011
 
 pnglibconf.h.prebuilt       =>  Stores configuration settings
  makefile.linux    =>  Linux/ELF makefile
-                       (gcc, creates libpng15.so.15.1.5.0rc01)
+                       (gcc, creates libpng15.so.15.1.5.1beta11)
  makefile.gcc      =>  Generic makefile (gcc, creates static libpng.a)
  makefile.knr      =>  Archaic UNIX Makefile that converts files with
                        ansi2knr (Requires ansi2knr.c from
@@ -20,7 +20,7 @@ pnglibconf.h.prebuilt       =>  Stores configuration settings
  makefile.dec      =>  DEC Alpha UNIX makefile
  makefile.dj2      =>  DJGPP 2 makefile
  makefile.elf      =>  Linux/ELF makefile symbol versioning,
-                       (gcc, creates libpng15.so.15.1.5.0rc01)
+                       (gcc, creates libpng15.so.15.1.5.1beta11)
  makefile.freebsd  =>  FreeBSD makefile
  makefile.gcc      =>  Generic gcc makefile
  makefile.hpgcc    =>  HPUX makefile using gcc
@@ -35,12 +35,12 @@ pnglibconf.h.prebuilt       =>  Stores configuration settings
  makefile.os2      =>  OS/2 Makefile (gcc and emx, requires libpng.def)
  makefile.sco      =>  For SCO OSr5  ELF and Unixware 7 with Native cc
  makefile.sggcc    =>  Silicon Graphics (gcc,
-                       creates libpng15.so.15.1.5.0rc01)
+                       creates libpng15.so.15.1.5.1beta11)
  makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
  makefile.solaris  =>  Solaris 2.X makefile (gcc,
-                       creates libpng15.so.15.1.5.0rc01)
+                       creates libpng15.so.15.1.5.1beta11)
  makefile.so9      =>  Solaris 9 makefile (gcc,
-                       creates libpng15.so.15.1.5.0rc01)
+                       creates libpng15.so.15.1.5.1beta11)
  makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a)
  makefile.sunos    =>  Sun makefile
  makefile.32sunu   =>  Sun Ultra 32-bit makefile

scripts/def.dfn

@@ -0,0 +1,38 @@
+/* def.dfn - define format of libpng.def
+ *
+ * Last changed in libpng version 1.5.0 [(PENDING RELEASE)]
+ * Copyright (c) 2010-2011 Glenn Randers-Pehrson
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ */
+
+/* These macros exist to make the header and trailer shorter below: */
+#define S PNG_DEFN_MAGIC
+#define E PNG_DEFN_END
+
+/* Write the export file header: */
+S-;---------------------------------------------------------------E
+S-; LIBPNG module definition file for OS/2-E
+S-;---------------------------------------------------------------E
+S--E
+S-; If you give the library an explicit name one or other files-E
+S-; may need modifying to support the new name on one or more-E
+S-; systems.-E
+S-LIBRARY-E
+S-OS2 DESCRIPTION "PNG image compression library"-E
+S-OS2 CODE PRELOAD MOVEABLE DISCARDABLE-E
+S--E
+S-EXPORTS-E
+S-;Version 1.5.0beta58-E
+
+/* NOTE: @@@ is interpreted by the calling script as a signal to
+ * join the two things on either side, so we can do symbol
+ * substitution within the name, regular C ## joins the pp-tokens,
+ * not their final values.
+ */
+#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
+	PNG_DEFN_MAGIC- SYMBOL_PREFIX @@@ name-PNG_DEFN_END
+
+#include "../png.h"

scripts/libpng-config-head.in

@@ -11,7 +11,7 @@
 
 # Modeled after libxml-config.
 
-version=1.5.0rc01
+version=1.5.1beta11
 prefix=""
 libdir=""
 libs=""

scripts/libpng.pc.in

@@ -5,6 +5,6 @@ includedir=@includedir@/libpng15
 
 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.5.0rc01
+Version: 1.5.1beta11
 Libs: -L${libdir} -lpng15
 Cflags: -I${includedir}

scripts/makefile.32sunu

@@ -1,6 +1,6 @@
 # makefile for libpng on Solaris 2.x with cc
 # Contributed by William L. Sebok, based on makefile.linux
-# Copyright (C) 2002, 2006, 2010 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006, 2010-2011 Glenn Randers-Pehrson
 # Copyright (C) 1998 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
 

scripts/makefile.64sunu

@@ -1,6 +1,6 @@
 # makefile for libpng on Solaris 2.x with cc
 # Contributed by William L. Sebok, based on makefile.linux
-# Copyright (C) 2002, 2006, 2010 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006, 2010-2011 Glenn Randers-Pehrson
 # Copyright (C) 1998 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
 

scripts/makefile.beos

@@ -1,6 +1,6 @@
 # makefile for libpng on BeOS x86 ELF with gcc
 # modified from makefile.linux by Sander Stoks
-# Copyright (C) 2002, 2006, 2008, 2010 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006, 2008, 2010-2011 Glenn Randers-Pehrson
 # Copyright (C) 1999 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
 #

scripts/makefile.cegcc

@@ -23,7 +23,7 @@
 
 VERMAJ = 1
 VERMIN = 5
-VERMIC = 0
+VERMIC = 1
 VER = $(VERMAJ).$(VERMIN).$(VERMIC)
 NAME = libpng
 PACKAGE = $(NAME)-$(VER)

scripts/makefile.darwin

@@ -1,5 +1,5 @@
 # makefile for libpng on Darwin / Mac OS X
-# Copyright (C) 2002, 2004, 2006, 2008, 2010 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2004, 2006, 2008, 2010-2011 Glenn Randers-Pehrson
 # Copyright (C) 2001 Christoph Pfisterer
 # derived from makefile.linux:
 #  Copyright (C) 1998, 1999 Greg Roelofs

scripts/makefile.dec

@@ -1,5 +1,5 @@
 # makefile for libpng on DEC Alpha Unix
-# Copyright (C) 2000-2002, 2006, 2010 Glenn Randers-Pehrson
+# Copyright (C) 2000-2002, 2006, 2010-2011 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the libpng license.

scripts/makefile.dj2

@@ -1,5 +1,5 @@
 # DJGPP (DOS gcc) makefile for libpng
-# Copyright (C) 2002, 2006, 2009-2010 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006, 2009-2010-2011 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the libpng license.

scripts/makefile.elf

@@ -1,5 +1,5 @@
 # makefile for libpng.a and libpng15.so on Linux ELF with gcc
-# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010 Greg Roelofs
+# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010-2011 Greg Roelofs
 # and Glenn Randers-Pehrson
 # Copyright (C) 1996, 1997 Andreas Dilger
 #

scripts/makefile.hp64

@@ -1,5 +1,5 @@
 # makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product.
-# Copyright (C) 1999-2002, 2006, 2009, 2010 Glenn Randers-Pehrson
+# Copyright (C) 1999-2002, 2006, 2009, 2010-2011 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42
 # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
 #

scripts/makefile.hpgcc

@@ -1,5 +1,5 @@
 # makefile for libpng on HP-UX using GCC with the HP ANSI/C linker.
-# Copyright (C) 2002, 2006-2008, 2010 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006-2008, 2010-2011 Glenn Randers-Pehrson
 # Copyright (C) 2001, Laurent faillie
 # Copyright (C) 1998, 1999 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger

scripts/makefile.hpux

@@ -1,5 +1,5 @@
 # makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product.
-# Copyright (C) 1999-2002, 2006, 2010 Glenn Randers-Pehrson
+# Copyright (C) 1999-2002, 2006, 2010-2011 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42
 # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
 #

scripts/makefile.linux

@@ -1,5 +1,5 @@
 # makefile for libpng.a and libpng15.so on Linux ELF with gcc
-# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010 Greg Roelofs and
+# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010-2011 Greg Roelofs and
 # Glenn Randers-Pehrson
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
@@ -10,7 +10,7 @@
 # Library name:
 LIBNAME = libpng15
 PNGMAJ = 15
-RELEASE = 0
+RELEASE = 1
 
 # Shared library names:
 LIBSO=$(LIBNAME).so

scripts/makefile.ne12bsd

@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng15
 
 LIB=	png15
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.5.0rc01
+SHLIB_MINOR=	1.5.1beta11
 SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 	pngwtran.c pngmem.c pngerror.c pngpread.c

scripts/makefile.netbsd

@@ -16,8 +16,8 @@ MANDIR= ${LOCALBASE}/man
 INCSDIR=${LOCALBASE}/include
 
 LIB=	png
-SHLIB_MAJOR=	3
-SHLIB_MINOR=	1.5.0rc01
+SHLIB_MAJOR=	15
+SHLIB_MINOR=	1.5.1beta11
 SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 	pngwtran.c pngmem.c pngerror.c pngpread.c

scripts/makefile.openbsd

@@ -10,8 +10,8 @@ PREFIX?= /usr/local
 LIBDIR=	${PREFIX}/lib
 MANDIR= ${PREFIX}/man/cat
 
-SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.5.0rc01
+SHLIB_MAJOR=	15
+SHLIB_MINOR=	1.5.1beta11
 
 LIB=	png
 SRCS=	png.c pngerror.c pngget.c pngmem.c pngpread.c \

scripts/makefile.os2

@@ -1,77 +0,0 @@
-# makefile for libpng on OS/2 with gcc
-#
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-# Related files: scripts/pngwin.def
-
-CC=gcc -Zomf -s
-
-# Where the zlib library and include files are located
-ZLIBLIB=../zlib
-ZLIBINC=../zlib
-
-WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
-	-Wmissing-declarations -Wtraditional -Wcast-align \
-	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion
-CFLAGS=-I$(ZLIBINC) -W -Wall -O6 -funroll-loops -malign-loops=2 \
-	-malign-functions=2 #$(WARNMORE) -g -DPNG_DEBUG=5
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lzdll -Zcrtdll
-AR=emxomfar
-
-PNGLIB=png.lib
-IMPLIB=emximp
-SHAREDLIB=png.dll
-SHAREDLIBIMP=pngdll.lib
-
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
-	pngwtran.o pngmem.o pngerror.o pngpread.o
-
-.SUFFIXES:      .c .o
-
-all: $(PNGLIB) $(SHAREDLIB) $(SHAREDLIBIMP)
-
-# see scripts/pnglibconf.mak for more options
-pnglibconf.h: scripts/pnglibconf.h.prebuilt
-	cp scripts/pnglibconf.h.prebuilt $@
-
-$(PNGLIB): $(OBJS)
-	$(AR) rc $@ $(OBJS)
-
-$(SHAREDLIB): $(OBJS) scripts/pngwin.def
-	$(CC) $(LDFLAGS) -Zdll -o $@ $^
-
-$(SHAREDLIBIMP): scripts/pngwin.def
-	$(IMPLIB) -o $@ $^
-
-pngtest.exe: pngtest.o png.dll pngdll.lib
-	$(CC) -o $@ $(CFLAGS) $< $(LDFLAGS)
-
-test: pngtest.exe
-	./pngtest.exe
-
-clean:
-	rm -f *.o $(PNGLIB) png.dll pngdll.lib pngtest.exe pngout.png \
-	pnglibconf.h
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-
-pngtest.o: png.h pngconf.h pnglibconf.h

scripts/makefile.sco

@@ -1,7 +1,7 @@
 # makefile for SCO OSr5  ELF and Unixware 7 with Native cc
 # Contributed by Mike Hopkirk (hops@sco.com) modified from Makefile.lnx
 #   force ELF build dynamic linking, SONAME setting in lib and RPATH in app
-# Copyright (C) 2002, 2006, 2010 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006, 2010-2011 Glenn Randers-Pehrson
 # Copyright (C) 1998 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
 #

scripts/makefile.sggcc

@@ -1,5 +1,5 @@
 # makefile for libpng.a and libpng15.so, SGI IRIX with 'cc'
-# Copyright (C) 2001-2002, 2006, 2010 Glenn Randers-Pehrson
+# Copyright (C) 2001-2002, 2006, 2010-2011 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the libpng license.

scripts/makefile.sgi

@@ -1,5 +1,5 @@
 # makefile for libpng.a and libpng15.so, SGI IRIX with 'cc'
-# Copyright (C) 2001-2002, 2006, 2007, 2010 Glenn Randers-Pehrson
+# Copyright (C) 2001-2002, 2006, 2007, 2010-2011 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the libpng license.

scripts/makefile.so9

@@ -1,7 +1,7 @@
 # makefile for libpng on Solaris 9 (beta) with Forte cc
 # Updated by Chad Schrock for Solaris 9
 # Contributed by William L. Sebok, based on makefile.linux
-# Copyright (C) 2002, 2006, 2008, 2010 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006, 2008, 2010-2011 Glenn Randers-Pehrson
 # Copyright (C) 1998-2001 Greg Roelofs
 # Copyright (C) 1996-1997 Andreas Dilger
 #

scripts/makefile.solaris

@@ -1,5 +1,5 @@
 # makefile for libpng on Solaris 2.x with gcc
-# Copyright (C) 2004, 2006-2008, 2010 Glenn Randers-Pehrson
+# Copyright (C) 2004, 2006-2008, 2010-2011 Glenn Randers-Pehrson
 # Contributed by William L. Sebok, based on makefile.linux
 # Copyright (C) 1998 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger

scripts/makefile.solaris-x86

@@ -1,5 +1,5 @@
 # makefile for libpng on Solaris 2.x with gcc
-# Copyright (C) 2004, 2006-2008, 2010 Glenn Randers-Pehrson
+# Copyright (C) 2004, 2006-2008, 2010-2011 Glenn Randers-Pehrson
 # Contributed by William L. Sebok, based on makefile.linux
 # Copyright (C) 1998 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger

scripts/options.awk

@@ -1,9 +1,9 @@
 #!/bin/awk -f
 # scripts/options.awk - library build configuration control
 #
-# last changed in libpng version 1.5.0 - (PENDING RELEASE)
+# last changed in libpng version 1.5.0 - January 6, 2011
 #
-# Copyright (c) 1998-2010 Glenn Randers-Pehrson
+# Copyright (c) 1998-2011 Glenn Randers-Pehrson
 #
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer

scripts/pnglibconf.dfa

@@ -6,9 +6,9 @@
 #
 com pnglibconf.h - library build configuration
 com
-com libpng version 1.5.0 - (PENDING RELEASE)
+com libpng version 1.5.0 - January 6, 2011
 com
-com Copyright (c) 1998-2010 Glenn Randers-Pehrson
+com Copyright (c) 1998-2011 Glenn Randers-Pehrson
 com
 com This code is released under the libpng license.
 com For conditions of distribution and use, see the disclaimer
@@ -380,8 +380,10 @@ option WRITE_WEIGHTED_FILTER requires WRITE
 
 option WRITE_FLUSH requires WRITE
 
-# Note: this can be turned off explicitly, is this correct?
+# Note: these can be turned off explicitly if not required by the
+# apps implementing the user transforms
 option USER_TRANSFORM_PTR if READ_USER_TRANSFORM WRITE_USER_TRANSFORM
+option USER_TRANSFORM_INFO if READ_USER_TRANSFORM WRITE_USER_TRANSFORM
 
 # Any chunks you are not interested in, you can undef here.  The
 # ones that allocate memory may be expecially important (hIST,

scripts/pnglibconf.h.prebuilt

@@ -3,9 +3,9 @@
 
 /* pnglibconf.h - library build configuration */
 
-/* libpng version 1.5.0 - last changed on (PENDING RELEASE) */
+/* libpng version 1.5.0 - last changed on January 6, 2011 */
 
-/* Copyright (c) 1998-2010 Glenn Randers-Pehrson */
+/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */
 
 /* This code is released under the libpng license. */
 /* For conditions of distribution and use, see the disclaimer */
@@ -155,6 +155,7 @@
 #define PNG_WRITE_iTXt_SUPPORTED
 #define PNG_oFFs_SUPPORTED
 #define PNG_USER_TRANSFORM_PTR_SUPPORTED
+#define PNG_USER_TRANSFORM_INFO_SUPPORTED
 #define PNG_hIST_SUPPORTED
 #define PNG_iCCP_SUPPORTED
 #define PNG_sRGB_SUPPORTED

scripts/pngwin.def

@@ -1,233 +0,0 @@
-;--------------------------------------------------------------
-; LIBPNG module definition file for Windows, WindowsCE and OS/2
-; On OS/2 uncomment lines preceded by ;0S2
-;--------------------------------------------------------------
-
-; make scripts/pngwin.chk will validate this file against the
-; build of libpng, the following line tells the check code to
-; ignore symbols (ordinal values) that are missing in both
-; files.
-;missing ignore
-
-; If you give the library an explicit name one or other files
-; may need modifying to support the new name on one or more
-; systems.
-LIBRARY
-;OS2 DESCRIPTION "PNG image compression library"
-;OS2 CODE PRELOAD MOVEABLE DISCARDABLE
-
-EXPORTS
-;Version 1.5.0rc01
- png_access_version_number @1
- png_set_sig_bytes @2
- png_sig_cmp @3
- png_create_read_struct @4
- png_create_write_struct @5
- png_get_compression_buffer_size @6
- png_set_compression_buffer_size @7
- png_set_longjmp_fn @8
- png_longjmp @9
- png_reset_zstream @10
- png_create_read_struct_2 @11
- png_create_write_struct_2 @12
- png_write_sig @13
- png_write_chunk @14
- png_write_chunk_start @15
- png_write_chunk_data @16
- png_write_chunk_end @17
- png_create_info_struct @18
- png_info_init_3 @19
- png_write_info_before_PLTE @20
- png_write_info @21
- png_read_info @22
- png_convert_to_rfc1123 @23
- png_convert_from_struct_tm @24
- png_convert_from_time_t @25
- png_set_expand @26
- png_set_expand_gray_1_2_4_to_8 @27
- png_set_palette_to_rgb @28
- png_set_tRNS_to_alpha @29
- png_set_bgr @30
- png_set_gray_to_rgb @31
- png_set_rgb_to_gray @32
- png_set_rgb_to_gray_fixed @33
- png_get_rgb_to_gray_status @34
- png_build_grayscale_palette @35
- png_set_strip_alpha @36
- png_set_swap_alpha @37
- png_set_invert_alpha @38
- png_set_filler @39
- png_set_add_alpha @40
- png_set_swap @41
- png_set_packing @42
- png_set_packswap @43
- png_set_shift @44
- png_set_interlace_handling @45
- png_set_invert_mono @46
- png_set_background @47
- png_set_strip_16 @48
- png_set_quantize @49
- png_set_gamma @50
- png_set_flush @51
- png_write_flush @52
- png_start_read_image @53
- png_read_update_info @54
- png_read_rows @55
- png_read_row @56
- png_read_image @57
- png_write_row @58
- png_write_rows @59
- png_write_image @60
- png_write_end @61
- png_read_end @62
- png_destroy_info_struct @63
- png_destroy_read_struct @64
- png_destroy_write_struct @65
- png_set_crc_action @66
- png_set_filter @67
- png_set_filter_heuristics @68
- png_set_compression_level @69
- png_set_compression_mem_level @70
- png_set_compression_strategy @71
- png_set_compression_window_bits @72
- png_set_compression_method @73
- png_init_io @74
- png_set_error_fn @75
- png_get_error_ptr @76
- png_set_write_fn @77
- png_set_read_fn @78
- png_get_io_ptr @79
- png_set_read_status_fn @80
- png_set_write_status_fn @81
- png_set_mem_fn @82
- png_get_mem_ptr @83
- png_set_read_user_transform_fn @84
- png_set_write_user_transform_fn @85
- png_set_user_transform_info @86
- png_get_user_transform_ptr @87
- png_set_read_user_chunk_fn @88
- png_get_user_chunk_ptr @89
- png_set_progressive_read_fn @90
- png_get_progressive_ptr @91
- png_process_data @92
- png_progressive_combine_row @93
- png_malloc @94
- png_calloc @95
- png_malloc_warn @96
- png_free @97
- png_free_data @98
- png_data_freer @99
- png_malloc_default @100
- png_free_default @101
- png_error @102
- png_chunk_error @103
- png_warning @105
- png_chunk_warning @106
- png_benign_error @107
- png_chunk_benign_error @108
- png_set_benign_errors @109
- png_get_valid @110
- png_get_rowbytes @111
- png_get_rows @112
- png_set_rows @113
- png_get_channels @114
- png_get_image_width @115
- png_get_image_height @116
- png_get_bit_depth @117
- png_get_color_type @118
- png_get_filter_type @119
- png_get_interlace_type @120
- png_get_compression_type @121
- png_get_pixels_per_meter @122
- png_get_x_pixels_per_meter @123
- png_get_y_pixels_per_meter @124
- png_get_pixel_aspect_ratio @125
- png_get_x_offset_pixels @126
- png_get_y_offset_pixels @127
- png_get_x_offset_microns @128
- png_get_y_offset_microns @129
- png_get_signature @130
- png_get_bKGD @131
- png_set_bKGD @132
- png_get_cHRM @133
- png_get_cHRM_fixed @134
- png_set_cHRM @135
- png_set_cHRM_fixed @136
- png_get_gAMA @137
- png_get_gAMA_fixed @138
- png_set_gAMA @139
- png_set_gAMA_fixed @140
- png_get_hIST @141
- png_set_hIST @142
- png_get_IHDR @143
- png_set_IHDR @144
- png_get_oFFs @145
- png_set_oFFs @146
- png_get_pCAL @147
- png_set_pCAL @148
- png_get_pHYs @149
- png_set_pHYs @150
- png_get_PLTE @151
- png_set_PLTE @152
- png_get_sBIT @153
- png_set_sBIT @154
- png_get_sRGB @155
- png_set_sRGB @156
- png_set_sRGB_gAMA_and_cHRM @157
- png_get_iCCP @158
- png_set_iCCP @159
- png_get_sPLT @160
- png_set_sPLT @161
- png_get_text @162
- png_set_text @163
- png_get_tIME @164
- png_set_tIME @165
- png_get_tRNS @166
- png_set_tRNS @167
- png_get_sCAL @168
- png_get_sCAL_s @169
- png_set_sCAL @170
- png_set_sCAL_s @171
- png_set_keep_unknown_chunks @172
- png_handle_as_unknown @173
- png_set_unknown_chunks @174
- png_set_unknown_chunk_location @175
- png_get_unknown_chunks @176
- png_set_invalid @177
- png_read_png @178
- png_write_png @179
- png_get_copyright @180
- png_get_header_ver @181
- png_get_header_version @182
- png_get_libpng_ver @183
- png_permit_mng_features @184
- png_set_user_limits @186
- png_get_user_width_max @187
- png_get_user_height_max @188
- png_set_chunk_cache_max @189
- png_get_chunk_cache_max @190
- png_set_chunk_malloc_max @191
- png_get_chunk_malloc_max @192
- png_get_pixels_per_inch @193
- png_get_x_pixels_per_inch @194
- png_get_y_pixels_per_inch @195
- png_get_x_offset_inches @196
- png_get_y_offset_inches @197
- png_get_pHYs_dpi @198
- png_get_io_state @199
- png_get_io_chunk_name @200
- png_get_uint_32 @201
- png_get_uint_16 @202
- png_get_int_32 @203
- png_get_uint_31 @204
- png_save_uint_32 @205
- png_save_int_32 @206
- png_save_uint_16 @207
- png_set_gamma_fixed @208
- png_set_filter_heuristics_fixed @209
- png_get_pixel_aspect_ratio_fixed @210
- png_get_x_offset_inches_fixed @211
- png_get_y_offset_inches_fixed @212
- png_set_sCAL_fixed @213
- png_get_sCAL_fixed @214
- png_set_background_fixed @215

scripts/pngwin.dfn

@@ -1,38 +0,0 @@
-
-/* pngwin.dfn - define format of pngwin.def
- *
- * Last changed in libpng version 1.5.0 [(PENDING RELEASE)]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
-	PNG_DEFN_MAGIC- name @ordinal-PNG_DEFN_END
-#define PNG_REMOVED(ordinal, type, name, args, attributes)\
-	PNG_DEFN_MAGIC-; name @ordinal-PNG_DEFN_END
-#define PNG_EXPORT_LAST_ORDINAL(ordinal)\
-	PNG_DEFN_MAGIC-; @ordinal-PNG_DEFN_END
-
-PNG_DEFN_MAGIC-;---------------------------------------------------------------PNG_DEFN_END
-PNG_DEFN_MAGIC-; LIBPNG module definition file for Windows, WindowsCE and OS/2-PNG_DEFN_END
-PNG_DEFN_MAGIC-; On OS/2 uncomment lines preceded by ;0S2-PNG_DEFN_END
-PNG_DEFN_MAGIC-;---------------------------------------------------------------PNG_DEFN_END
-PNG_DEFN_MAGIC--PNG_DEFN_END
-PNG_DEFN_MAGIC-; If you give the library an explicit name one or other files-PNG_DEFN_END
-PNG_DEFN_MAGIC-; may need modifying to support the new name on one or more-PNG_DEFN_END
-PNG_DEFN_MAGIC-; systems.-PNG_DEFN_END
-PNG_DEFN_MAGIC-LIBRARY-PNG_DEFN_END
-PNG_DEFN_MAGIC-;OS2 DESCRIPTION	"PNG image compression library"-PNG_DEFN_END
-PNG_DEFN_MAGIC-;OS2 CODE		PRELOAD MOVEABLE DISCARDABLE-PNG_DEFN_END
-PNG_DEFN_MAGIC--PNG_DEFN_END
-PNG_DEFN_MAGIC-EXPORTS-PNG_DEFN_END
-PNG_DEFN_MAGIC-;Version 1.5.0rc01-PNG_DEFN_END
-
-/* Read the defaults, but use scripts/pnglibconf.h.prebuilt; the 'standard'
- * header file.
- */
-#include "pnglibconf.h.prebuilt"
-#include "../png.h"

scripts/sym.dfn

@@ -1,8 +1,8 @@
 
 /* sym.dfn - define format of libpng.sym
  *
- * Last changed in libpng version 1.5.0 [(PENDING RELEASE)]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng version 1.5.0 [January 6, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer

scripts/symbols.def

@@ -5,7 +5,7 @@
 LIBRARY
 
 EXPORTS
-;Version 1.5.0rc01
+;Version 1.5.1beta11
  png_access_version_number @1
  png_set_sig_bytes @2
  png_sig_cmp @3
@@ -221,3 +221,8 @@ EXPORTS
  png_set_sCAL_fixed @213
  png_get_sCAL_fixed @214
  png_set_background_fixed @215
+ png_get_io_chunk_type @216
+ png_get_current_row_number @217
+ png_get_current_pass_number @218
+ png_process_data_pause @219
+ png_process_data_skip @220

scripts/symbols.dfn

@@ -1,8 +1,8 @@
 
 /* symbols.dfn - find all exported symbols
  *
- * Last changed in libpng version 1.5.0 [(PENDING RELEASE)]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng version 1.5.0 [January 6, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer

scripts/vers.dfn

@@ -1,8 +1,8 @@
 
 /* vers.dfn - define format of libpng.vers
  *
- * Last changed in libpng version 1.5.0 [(PENDING RELEASE)]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng version 1.5.0 [January 6, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer

test-pngvalid-full.sh

@@ -6,20 +6,14 @@ err=0
 echo >> pngtest-log.txt
 echo "============ pngvalid-full.sh ==============" >> pngtest-log.txt
 
-echo "Running test-pngvalid-full.sh -- it's lengthy, please wait..."
+echo "Running test-pngvalid-full.sh"
 for gamma in threshold transform sbit 16-to-8
 do
-   opts=
-   test "$gamma" = threshold || opts="$opts --nogamma-threshold"
-   test "$gamma" = transform || opts="$opts --nogamma-transform"
-   test "$gamma" = sbit      || opts="$opts --nogamma-sbit"
-   test "$gamma" = 16-to-8   || opts="$opts --nogamma-16-to-8"
-
-   if ./pngvalid --nostandard $opts >> pngtest-log.txt 2>&1
+   if ./pngvalid "--gamma-$gamma" >> pngtest-log.txt 2>&1
    then
-      echo "  PASS:" pngvalid "(gamma-$gamma)"
+      echo "  PASS:" pngvalid "--gamma-$gamma"
    else
-      echo "  FAIL:" pngvalid "(gamma-$gamma)"
+      echo "  FAIL:" pngvalid "--gamma-$gamma"
       err=1
    fi
 done

test-pngvalid-simple.sh

@@ -9,18 +9,20 @@ echo "============ pngvalid-simple.sh ==============" >> pngtest-log.txt
 echo "Running test-pngvalid-simple.sh"
 # The options to test are:
 #
-# --progressive-read, --interlace on the 'transform' images
-# --progressive-read on the 'size' images
+# standard tests with and without progressive reading and interlace
+# size images with and without progressive reading
+# transform tests (standard, non-interlaced only)
 #
-for opts in "" --progressive-read --interlace \
-   "--progressive-read --interlace" "--nostandard --size" \
-   "--nostandard --size --progressive-read"
+for opts in "--standard" "--standard --progressive-read" \
+   "--standard --interlace" "--standard --progressive-read --interlace" \
+   "--size" "--size --progressive-read" \
+   "--transform"
 do
-   if ./pngvalid  --nogamma $opts >> pngtest-log.txt 2>&1
+   if ./pngvalid  $opts >> pngtest-log.txt 2>&1
    then
-      echo "  PASS:" pngvalid --nogamma $opts
+      echo "  PASS:" pngvalid $opts
    else
-      echo "  FAIL:" pngvalid --nogamma $opts
+      echo "  FAIL:" pngvalid $opts
       err=1
    fi
 done