From 32d6a74293dc2aaada715d2d3b563cffdf8076b7 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 4 Feb 2013 20:07:43 -0600 Subject: [PATCH] [libpng16] Imported from libpng-1.6.0rc02.tar --- CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- configure.ac | 4 ++-- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 6 +++--- png.h | 24 +++++++++++++----------- pngconf.h | 2 +- pngget.c | 11 +++++++++++ pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 12 ++++++------ scripts/def.dfn | 2 +- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- 21 files changed, 53 insertions(+), 40 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f7f667b5..b94dffa3a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -260,7 +260,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 16.${PNGLIB_RELEASE}.1.6.0rc01 +# VERSION 16.${PNGLIB_RELEASE}.1.6.0rc02 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 34fba0572..50e6ba71b 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.0rc01, January 26, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0rc02, February 5, 2013, are Copyright (c) 2004, 2006-2012 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 -January 26, 2013 +February 5, 2013 diff --git a/README b/README index dec2ad7ad..7f2c5ec55 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.0rc01 - January 26, 2013 (shared library 16.0) +README for libpng version 1.6.0rc02 - February 5, 2013 (shared library 16.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. diff --git a/configure.ac b/configure.ac index 5935685f3..55fda4452 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.0rc01],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.0rc02],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -37,7 +37,7 @@ dnl automake, so the following is not necessary (and is not defined anyway): dnl AM_PREREQ([1.11.2]) dnl stop configure from automagically running automake -PNGLIB_VERSION=1.6.0rc01 +PNGLIB_VERSION=1.6.0rc02 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=0 diff --git a/libpngpf.3 b/libpngpf.3 index 0b28a0f21..0fc8a8f6e 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "January 26, 2013" +.TH LIBPNGPF 3 "February 5, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0rc02 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 713d382f1..b571ef7db 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "January 26, 2013" +.TH PNG 5 "February 5, 2013" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index bcb12e3c7..c4f612acd 100644 --- a/png.c +++ b/png.c @@ -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_6_0rc01 Your_png_h_is_not_version_1_6_0rc01; +typedef png_libpng_version_1_6_0rc02 Your_png_h_is_not_version_1_6_0rc02; /* 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 @@ -768,13 +768,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.0rc01 - January 26, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.6.0rc02 - February 5, 2013" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2013 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.6.0rc01 - January 26, 2013\ + return "libpng version 1.6.0rc02 - February 5, 2013\ Copyright (c) 1998-2013 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; diff --git a/png.h b/png.h index 60b09bcd8..40eab7a27 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.0rc01 - January 26, 2013 + * libpng version 1.6.0rc02 - February 5, 2013 * Copyright (c) 1998-2013 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.6.0rc01 - January 26, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.6.0rc02 - February 5, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -167,7 +167,7 @@ * 1.5.7rc01-03 15 10507 15.so.15.7[.0] * 1.5.7 15 10507 15.so.15.7[.0] * 1.6.0beta01-40 16 10600 16.so.16.0[.0] - * 1.6.0rc01 16 10600 16.so.16.0[.0] + * 1.6.0rc01-02 16 10600 16.so.16.0[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -199,7 +199,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.0rc01, January 26, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.0rc02, February 5, 2013, are * Copyright (c) 2004, 2006-2013 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: @@ -311,13 +311,13 @@ * Y2K compliance in libpng: * ========================= * - * January 26, 2013 + * February 5, 2013 * * 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.6.0rc01 are Y2K compliant. It is my belief that + * upward through 1.6.0rc02 are Y2K compliant. It is my belief that * earlier versions were also Y2K compliant. * * Libpng only has two year fields. One is a 2-byte unsigned integer @@ -377,9 +377,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.0rc01" +#define PNG_LIBPNG_VER_STRING "1.6.0rc02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.0rc01 - January 26, 2013\n" + " libpng version 1.6.0rc02 - February 5, 2013\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -393,7 +393,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 01 +#define PNG_LIBPNG_VER_BUILD 02 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -523,7 +523,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_6_0rc01; +typedef char* png_libpng_version_1_6_0rc02; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * @@ -3203,6 +3203,8 @@ PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file, defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED) PNG_EXPORT(242, void, png_set_check_for_invalid_index, (png_structrp png_ptr, int allowed)); +PNG_EXPORT(243, void, png_get_palette_max, (png_structp png_ptr, + png_const_infop info_ptr)); #endif /* Maintainer: Put new public prototypes here ^, in libpng.3, and project @@ -3214,7 +3216,7 @@ PNG_EXPORT(242, void, png_set_check_for_invalid_index, * scripts/symbols.def as well. */ #ifdef PNG_EXPORT_LAST_ORDINAL - PNG_EXPORT_LAST_ORDINAL(242); + PNG_EXPORT_LAST_ORDINAL(243); #endif #ifdef __cplusplus diff --git a/pngconf.h b/pngconf.h index d785078e8..18ab7b43e 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.0rc01 - January 26, 2013 + * libpng version 1.6.0rc02 - February 5, 2013 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngget.c b/pngget.c index c2632f5b5..8f605b3cb 100644 --- a/pngget.c +++ b/pngget.c @@ -1161,4 +1161,15 @@ png_get_io_chunk_type (png_const_structrp png_ptr) } #endif /* ?PNG_IO_STATE_SUPPORTED */ +#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED +int PNGAPI +png_get_max_palette_index(png_const_structp png_ptr, png_const_infop info_ptr) +{ + if (png_ptr != NULL && info_ptr != NULL) + return png_ptr->num_palette_max; + + return (-1); +} +#endif + #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ diff --git a/pngtest.c b/pngtest.c index be0104587..7290741c4 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1949,4 +1949,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_0rc01 Your_png_h_is_not_version_1_6_0rc01; +typedef png_libpng_version_1_6_0rc02 Your_png_h_is_not_version_1_6_0rc02; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 07d08f249..3a5a292e8 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.0rc01 - January 26, 2013 +libpng version 1.6.0rc02 - February 5, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index f81368313..74c76e045 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@