diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2014-03-03 19:50:26 -0600 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2014-03-03 20:26:46 -0600 |
commit | 3e5d04df37252773ec470a7e23f0a940285b01c5 (patch) | |
tree | 48adef13e174ba0b7f312f855264d1f22c5c0f2e | |
parent | 6e8ba0fab666eb6c90e929988e8fb3439449e7f9 (diff) | |
download | libpng-1.6.10rc03.tar.gz |
[libpng16] Imported from libpng-1.6.10rc03.tarv1.6.10rc03
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | LICENSE | 4 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | libpngpf.3 | 4 | ||||
-rw-r--r-- | png.5 | 2 | ||||
-rw-r--r-- | png.c | 6 | ||||
-rw-r--r-- | pngconf.h | 2 | ||||
-rw-r--r-- | pngtest.c | 2 | ||||
-rw-r--r-- | projects/vstudio/readme.txt | 2 | ||||
-rw-r--r-- | projects/vstudio/zlib.props | 2 | ||||
-rw-r--r-- | scripts/README.txt | 12 | ||||
-rw-r--r-- | scripts/def.dfn | 2 | ||||
-rw-r--r-- | scripts/dfn.awk | 20 | ||||
-rwxr-xr-x | scripts/libpng-config-head.in | 2 | ||||
-rw-r--r-- | scripts/libpng.pc.in | 2 | ||||
-rw-r--r-- | scripts/makefile.ne12bsd | 2 | ||||
-rw-r--r-- | scripts/makefile.netbsd | 2 | ||||
-rw-r--r-- | scripts/makefile.openbsd | 2 | ||||
-rw-r--r-- | scripts/pnglibconf.h.prebuilt | 4 | ||||
-rw-r--r-- | scripts/symbols.def | 2 |
21 files changed, 41 insertions, 41 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d02597db6..8274c664b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,7 +252,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.10rc02 +# VERSION 16.${PNGLIB_RELEASE}.1.6.10rc03 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) @@ -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.10rc02, February 27, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.10rc03, March 4, 2014, are Copyright (c) 2004, 2006-2014 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 -February 27, 2014 +March 4, 2014 @@ -1,4 +1,4 @@ -README for libpng version 1.6.10rc02 - February 27, 2014 (shared library 16.0) +README for libpng version 1.6.10rc03 - March 4, 2014 (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 b785e7e29..511970ee5 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.10rc02],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.10rc03],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -39,7 +39,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.10rc02 +PNGLIB_VERSION=1.6.10rc03 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=10 diff --git a/libpngpf.3 b/libpngpf.3 index 89f33b821..834af4205 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "February 27, 2014" +.TH LIBPNGPF 3 "March 4, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.10rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.10rc03 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" @@ -1,4 +1,4 @@ -.TH PNG 5 "February 27, 2014" +.TH PNG 5 "March 4, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -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_10rc02 Your_png_h_is_not_version_1_6_10rc02; +typedef png_libpng_version_1_6_10rc03 Your_png_h_is_not_version_1_6_10rc03; /* 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 @@ -773,13 +773,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.10rc02 - February 27, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.6.10rc03 - March 4, 2014" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2014 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.10rc02 - February 27, 2014\ + return "libpng version 1.6.10rc03 - March 4, 2014\ Copyright (c) 1998-2014 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.10rc02 - February 27, 2014 + * libpng version 1.6.10rc03 - March 4, 2014 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1991,4 +1991,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_10rc02 Your_png_h_is_not_version_1_6_10rc02; +typedef png_libpng_version_1_6_10rc03 Your_png_h_is_not_version_1_6_10rc03; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 9a623e28a..439d676b7 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.10rc02 - February 27, 2014 +libpng version 1.6.10rc03 - March 4, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index a5090020d..436d3f33e 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@ <!-- * zlib.props - location of zlib source * - * libpng version 1.6.10rc02 - February 27, 2014 + * libpng version 1.6.10rc03 - March 4, 2014 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * diff --git a/scripts/README.txt b/scripts/README.txt index 15266e1ad..55cf5e09a 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,9 +1,9 @@ -Makefiles for libpng version 1.6.10rc02 - February 27, 2014 +Makefiles for libpng version 1.6.10rc03 - March 4, 2014 pnglibconf.h.prebuilt => Stores configuration settings makefile.linux => Linux/ELF makefile - (gcc, creates libpng16.so.16.1.6.10rc02) + (gcc, creates libpng16.so.16.1.6.10rc03) 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 libpng16.so.16.1.6.10rc02) + (gcc, creates libpng16.so.16.1.6.10rc03) 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 libpng16.so.16.1.6.10rc02) + creates libpng16.so.16.1.6.10rc03) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng16.so.16.1.6.10rc02) + creates libpng16.so.16.1.6.10rc03) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng16.so.16.1.6.10rc02) + creates libpng16.so.16.1.6.10rc03) makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.sunos => Sun makefile makefile.32sunu => Sun Ultra 32-bit makefile diff --git a/scripts/def.dfn b/scripts/def.dfn index 6d3439463..33fe4dc8d 100644 --- a/scripts/def.dfn +++ b/scripts/def.dfn @@ -21,7 +21,7 @@ PNG_DFN "OS2 DESCRIPTION "PNG image compression library"" PNG_DFN "OS2 CODE PRELOAD MOVEABLE DISCARDABLE" PNG_DFN "" PNG_DFN "EXPORTS" -PNG_DFN ";Version 1.6.10rc02" +PNG_DFN ";Version 1.6.10rc03" #define PNG_EXPORTA(ordinal, type, name, args, attributes)\ PNG_DFN "@" SYMBOL_PREFIX "@@" name "@" diff --git a/scripts/dfn.awk b/scripts/dfn.awk index 89b92d5d9..afa498cb5 100644 --- a/scripts/dfn.awk +++ b/scripts/dfn.awk @@ -1,9 +1,9 @@ #!/bin/awk -f # scripts/dfn.awk - process a .dfn file # -# last changed in libpng version 1.5.14 - February 4, 2013 +# last changed in libpng version 1.5.19 - $RDATE% # -# Copyright (c) 2013-2013 Glenn Randers-Pehrson +# Copyright (c) 2013-2014 Glenn Randers-Pehrson # # This code is released under the libpng license. # For conditions of distribution and use, see the disclaimer @@ -25,7 +25,7 @@ BEGIN{ # The output file must be specified before any input: NR==1 && out == "/dev/null" { print "out=output.file must be given on the command line" - # but continue without setting the error code, this allows the + # but continue without setting the error code; this allows the # script to be checked easily } @@ -61,14 +61,14 @@ $1 ~ /^PNG_DFN_END_SORT/{ } /^[^"]*PNG_DFN *".*"[^"]*$/{ - # A definition line, apparently correctly formated, extract the + # A definition line, apparently correctly formatted; extract the # definition then replace any doubled "" that remain with a single # double quote. Notice that the original doubled double quotes # may have been split by tokenization # - # Sometimes GCC splits the PNG_DFN lines, we know this has happened + # Sometimes GCC splits the PNG_DFN lines; we know this has happened # if the quotes aren't closed and must read another line. In this - # case it is essential to reject lines that start '#' because those + # case it is essential to reject lines that start with '#' because those # are introduced #line directives. orig=$0 line=$0 @@ -126,13 +126,13 @@ $1 ~ /^PNG_DFN_END_SORT/{ else while (1) { if (getline nextline) { # If the line starts with '#' it is a preprocesor line directive - # from cc -E, skip it: + # from cc -E; skip it: if (nextline !~ /^#/) { line = line " " nextline break } } else { - # This is end-of-input - probably a missig "@ on the first line: + # This is end-of-input - probably a missing "@ on the first line: print "line", lineno ": unbalanced @\" ... \"@ pair" err=1 next @@ -144,7 +144,7 @@ $1 ~ /^PNG_DFN_END_SORT/{ } # Attempt to remove a trailing " (not preceded by '@') - if this can - # be done stop now, if not assume a split line again + # be done, stop now; if not assume a split line again if (sub(/"[^"]*$/, "", line)) break @@ -189,7 +189,7 @@ $1 ~ /^PNG_DFN_END_SORT/{ } /PNG_DFN/{ - print "line", NR, "incorrectly formated PNG_DFN line:" + print "line", NR, "incorrectly formatted PNG_DFN line:" print $0 err = 1 } diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index c90c03326..995671126 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.6.10rc02 +version=1.6.10rc03 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 137e3e445..213e8313e 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng16 Name: libpng Description: Loads and saves PNG files -Version: 1.6.10rc02 +Version: 1.6.10rc03 Libs: -L${libdir} -lpng16 Cflags: -I${includedir} diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 0c35a036e..90daa621c 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng16 LIB= png16 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.6.10rc02 +SHLIB_MINOR= 1.6.10rc03 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 diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index b58bc870a..a0e3a0534 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include LIB= png SHLIB_MAJOR= 16 -SHLIB_MINOR= 1.6.10rc02 +SHLIB_MINOR= 1.6.10rc03 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 diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 3efc7d54d..fba59aacf 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 16 -SHLIB_MINOR= 1.6.10rc02 +SHLIB_MINOR= 1.6.10rc03 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt index 9e82a0d45..3b80bcc81 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -1,8 +1,8 @@ -/* libpng 1.6.10rc02 STANDARD API DEFINITION */ +/* libpng 1.6.10rc03 STANDARD API DEFINITION */ /* pnglibconf.h - library build configuration */ -/* Libpng version 1.6.10rc02 - February 27, 2014 */ +/* Libpng version 1.6.10rc03 - March 4, 2014 */ /* Copyright (c) 1998-2013 Glenn Randers-Pehrson */ diff --git a/scripts/symbols.def b/scripts/symbols.def index 2166ade32..665b1fd78 100644 --- a/scripts/symbols.def +++ b/scripts/symbols.def @@ -1,4 +1,4 @@ -;Version 1.6.10rc02 +;Version 1.6.10rc03 ;-------------------------------------------------------------- ; LIBPNG symbol list as a Win32 DEF file ; Contains all the symbols that can be exported from libpng |