[master] Bump to version 1.4.5rc04

6916ec5f · Glenn Randers-Pehrson · acb4822f · 6916ec5f · 6916ec5f · 6916ec5f
26 changed file
--- a/ANNOUNCE
+++ b/ANNOUNCE

-Libpng 1.4.5rc03 - December 3, 2010
+Libpng 1.4.5rc04 - December 9, 2010

 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,20 +9,20 @@ Files available for download:
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script

-   1.4.5rc03.tar.xz (LZMA-compressed, recommended)
-   1.4.5rc03.tar.gz
-   1.4.5rc03.tar.bz2
+   1.4.5rc04.tar.xz (LZMA-compressed, recommended)
+   1.4.5rc04.tar.gz
+   1.4.5rc04.tar.bz2

 Source files with CRLF line endings (for Windows), without the
 "configure" script

-   lp145r03.zip
-   lp145r03.7z
+   lp145r04.zip
+   lp145r04.7z

 Other information:

-   1.4.5rc03-README.txt
-   1.4.5rc03-LICENSE.txt
+   1.4.5rc04-README.txt
+   1.4.5rc04-LICENSE.txt

 Changes since the last public release (1.4.4):

@@ -46,7 +46,7 @@ version 1.4.5beta04 [November 8, 2010]
 version 1.4.5rc01 [November 19, 2010]
  No changes.

-version 1.4.5beta05 [December 3, 2010]
+version 1.4.5beta05 [December 9, 2010]
  Removed some extraneous parentheses that appeared in pngrutil.c of
    libpng-1.4.3beta01
  Revised png_get_uint_32, png_get_int_32, png_get_uint_16 (Cosmin)
@@ -77,12 +77,9 @@ version 1.4.5beta07 [November 25, 2010]
 version 1.4.5rc02 [December 2, 2010]
  No changes.

-version 1.4.5rc03 [December 3, 2010]
+version 1.4.5rc03 [December 9, 2010]
  Added missing vstudio/*/*.vcxproj files to the zip and 7z distributions.

-version 1.4.5rc04 [December 8, 2010]
-  Removed PNG_NO_WRITE_GAMMA from pngminim/encoder/pngusr.h
-
 Send comments/corrections/commendations to glennrp at users.sourceforge.net
 or to png-mng-implement at lists.sf.net (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement).

--- a/CHANGES
+++ b/CHANGES
@@ -2729,10 +2729,10 @@ version 1.4.5beta07 [November 25, 2010]
 version 1.4.5rc02 [December 2, 2010]
  No changes.

-version 1.4.5rc03 [December 3, 2010]
+version 1.4.5rc03 [December 9, 2010]
  Added missing vstudio/*/*.vcxproj files to the zip and 7z distributions.

-version 1.4.5rc04 [December 8, 2010]
+version 1.4.5rc03-cos [December 8, 2010]
  Removed PNG_NO_WRITE_GAMMA from pngminim/encoder/pngusr.h

 Send comments/corrections/commendations to glennrp at users.sourceforge.net

--- a/contrib/pngminim/decoder/pngusr.h
+++ b/contrib/pngminim/decoder/pngusr.h
@@ -38,6 +38,7 @@
 #define PNG_NO_READ_gAMA
 #define PNG_NO_READ_hIST
 #define PNG_NO_READ_iCCP
+#define PNG_NO_READ_oFFs
 #define PNG_NO_READ_pCAL
 #define PNG_NO_READ_pHYs
 #define PNG_NO_READ_sBIT
@@ -51,7 +52,6 @@
 #define PNG_NO_READ_EMPTY_PLTE
 #define PNG_NO_READ_OPT_PLTE
 #define PNG_NO_READ_STRIP_ALPHA
-#define PNG_NO_READ_oFFs

 #define PNG_NO_WRITE_SUPPORTED


--- a/contrib/pngminim/encoder/pngusr.h
+++ b/contrib/pngminim/encoder/pngusr.h
@@ -23,7 +23,6 @@

 #define PNG_NO_WRITE_BACKGROUND
 #define PNG_NO_WRITE_BGR
-#define PNG_NO_WRITE_GAMMA
 #define PNG_NO_WRITE_QUANTIZE
 #define PNG_NO_WRITE_INVERT
 #define PNG_NO_WRITE_SHIFT

--- a/contrib/pngminim/preader/pngusr.h
+++ b/contrib/pngminim/preader/pngusr.h
@@ -34,6 +34,7 @@
 #define PNG_NO_READ_cHRM
 #define PNG_NO_READ_hIST
 #define PNG_NO_READ_iCCP
+#define PNG_NO_READ_oFFs
 #define PNG_NO_READ_pCAL
 #define PNG_NO_READ_pHYs
 #define PNG_NO_READ_sBIT
@@ -46,7 +47,6 @@
 #define PNG_NO_READ_EMPTY_PLTE
 #define PNG_NO_READ_OPT_PLTE
 #define PNG_NO_READ_STRIP_ALPHA
-#define PNG_NO_READ_oFFs

 #define PNG_NO_WRITE_SUPPORTED


--- a/png.c
+++ b/png.c
@@ -17,7 +17,7 @@
 #include "pngpriv.h"

 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_4_5rc03 Your_png_h_is_not_version_1_4_5rc03;
+typedef version_1_4_5rc04 Your_png_h_is_not_version_1_4_5rc04;

 /* 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,13 +547,13 @@ png_get_copyright(png_structp png_ptr)
 #else
 #ifdef __STDC__
   return ((png_charp) PNG_STRING_NEWLINE \
-     "libpng version 1.4.5rc03 - December 3, 2010" PNG_STRING_NEWLINE \
+     "libpng version 1.4.5rc04 - December 9, 2010" PNG_STRING_NEWLINE \
     "Copyright (c) 1998-2010 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 ((png_charp) "libpng version 1.4.5rc03 - December 3, 2010\
+      return ((png_charp) "libpng version 1.4.5rc04 - December 9, 2010\
      Copyright (c) 1998-2010 Glenn Randers-Pehrson\
      Copyright (c) 1996-1997 Andreas Dilger\
      Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");

--- a/png.h
+++ b/png.h

 /* png.h - header file for PNG reference library
 *
- * libpng version 1.4.5rc03 - December 3, 2010
+ * libpng version 1.4.5rc04 - December 9, 2010
 * Copyright (c) 1998-2010 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.4.5rc03 - December 3, 2010: Glenn
+ *  libpng versions 0.97, January 1998, through 1.4.5rc04 - December 9, 2010: Glenn
 *  See also "Contributing Authors", below.
 *
 * Note about libpng version numbers:
@@ -151,7 +151,7 @@
 *    1.4.5beta01-04          14    10405  14.so.14.5[.0]
 *    1.4.5rc01               14    10405  14.so.14.5[.0]
 *    1.4.5beta05-07          14    10405  14.so.14.5[.0]
- *    1.4.5rc02               14    10405  14.so.14.5[.0]
+ *    1.4.5rc02-04            14    10405  14.so.14.5[.0]
 *
 *    Henceforth the source version will match the shared-library major
 *    and minor numbers; the shared-library major version number will be
@@ -183,7 +183,7 @@
 *
 * This code is released under the libpng license.
 *
- * libpng versions 1.2.6, August 15, 2004, through 1.4.5rc03, December 3, 2010, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.4.5rc04, December 9, 2010, are
 * Copyright (c) 2004, 2006-2010 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:
@@ -295,13 +295,13 @@
 * Y2K compliance in libpng:
 * =========================
 *
- *    December 3, 2010
+ *    December 9, 2010
 *
 *    Since the PNG Development group is an ad-hoc body, we can't make
 *    an official declaration.
 *
 *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.4.5rc03 are Y2K compliant.  It is my belief that earlier
+ *    upward through 1.4.5rc04 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
@@ -357,9 +357,9 @@
 */

 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.4.5rc03"
+#define PNG_LIBPNG_VER_STRING "1.4.5rc04"
 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.4.5rc03 - December 3, 2010\n"
+   " libpng version 1.4.5rc04 - December 9, 2010\n"

 #define PNG_LIBPNG_VER_SONUM   14
 #define PNG_LIBPNG_VER_DLLNUM  14
@@ -372,7 +372,7 @@
 * PNG_LIBPNG_VER_STRING, omitting any leading zero:
 */

-#define PNG_LIBPNG_VER_BUILD  03
+#define PNG_LIBPNG_VER_BUILD  04

 /* Release Status */
 #define PNG_LIBPNG_BUILD_ALPHA    1
@@ -1481,7 +1481,7 @@ struct png_struct_def
 /* This triggers a compiler error in png.c, if png.c and png.h
 * do not agree upon the version number.
 */
-typedef png_structp version_1_4_5rc03;
+typedef png_structp version_1_4_5rc04;

 typedef png_struct FAR * FAR * png_structpp;


--- a/pngconf.h
+++ b/pngconf.h

 /* pngconf.h - machine configurable file for libpng
 *
- * libpng version 1.4.5rc03 - December 3, 2010
+ * libpng version 1.4.5rc04 - December 9, 2010
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2010 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

--- a/pngpriv.h
+++ b/pngpriv.h

 /* pngpriv.h - private declarations for use inside libpng
 *
- * libpng version 1.4.5rc03 - December 3, 2010
+ * libpng version 1.4.5rc04 - December 9, 2010
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2010 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

--- a/pngread.c
+++ b/pngread.c

 /* pngread.c - read a PNG file
 *
- * Last changed in libpng 1.4.5 [December 3, 2010]
+ * Last changed in libpng 1.4.5 [December 9, 2010]
 * Copyright (c) 1998-2010 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.)

--- a/pngrio.c
+++ b/pngrio.c

 /* pngrio.c - functions for data input
 *
- * Last changed in libpng 1.4.5 [December 3, 2010]
+ * Last changed in libpng 1.4.5 [December 9, 2010]
 * Copyright (c) 1998-2010 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.)

--- a/pngrtran.c
+++ b/pngrtran.c

 /* pngrtran.c - transforms the data in a row for PNG readers
 *
- * Last changed in libpng 1.4.5 [December 3, 2010]
+ * Last changed in libpng 1.4.5 [December 9, 2010]
 * Copyright (c) 1998-2010 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.)

--- a/pngrutil.c
+++ b/pngrutil.c

 /* pngrutil.c - utilities to read a PNG file
 *
- * Last changed in libpng 1.4.5 [December 3, 2010]
+ * Last changed in libpng 1.4.5 [December 9, 2010]
 * Copyright (c) 1998-2010 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.)

--- a/pngset.c
+++ b/pngset.c

 /* pngset.c - storage of image information into info struct
 *
- * Last changed in libpng 1.4.5 [December 3, 2010]
+ * Last changed in libpng 1.4.5 [December 9, 2010]
 * Copyright (c) 1998-2010 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.)

--- a/pngtest.c
+++ b/pngtest.c

 /* pngtest.c - a simple test program to test libpng
 *
- * Last changed in libpng 1.4.5 [December 3, 2010]
+ * Last changed in libpng 1.4.5 [December 9, 2010]
 * Copyright (c) 1998-2010 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.)
@@ -1687,4 +1687,4 @@ main(int argc, char *argv[])
 }

 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_4_5rc03 your_png_h_is_not_version_1_4_5rc03;
+typedef version_1_4_5rc04 your_png_h_is_not_version_1_4_5rc04;
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt

 VisualStudio instructions

-libpng version 1.4.5rc03 - December 3, 2010
+libpng version 1.4.5rc04 - December 9, 2010

 Copyright (c) 1998-2010 Glenn Randers-Pehrson


--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
 <!--
 * zlib.props - location of zlib source and build
 *
- * libpng version 1.4.5rc03 - December 3, 2010
+ * libpng version 1.4.5rc04 - December 9, 2010
 *
 * Copyright (c) 1998-2010 Glenn Randers-Pehrson
 *

--- a/scripts/README.txt
+++ b/scripts/README.txt

-Makefiles for  libpng version 1.4.5rc03 - December 3, 2010
+Makefiles for  libpng version 1.4.5rc04 - December 9, 2010

 makefile.linux    =>  Linux/ELF makefile
-                       (gcc, creates libpng14.so.14.1.4.5rc03)
+                       (gcc, creates libpng14.so.14.1.4.5rc04)
 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 @@ Makefiles for  libpng version 1.4.5rc03 - December 3, 2010
 makefile.dec      =>  DEC Alpha UNIX makefile
 makefile.dj2      =>  DJGPP 2 makefile
 makefile.elf      =>  Linux/ELF makefile symbol versioning,
-                       (gcc, creates libpng14.so.14.1.4.5rc03)
+                       (gcc, creates libpng14.so.14.1.4.5rc04)
 makefile.freebsd  =>  FreeBSD makefile
 makefile.gcc      =>  Generic gcc makefile
 makefile.hpgcc    =>  HPUX makefile using gcc
@@ -36,12 +36,12 @@ Makefiles for  libpng version 1.4.5rc03 - December 3, 2010
 makefile.os2      =>  OS/2 Makefile (gcc and emx, requires pngos2.def)
 makefile.sco      =>  For SCO OSr5  ELF and Unixware 7 with Native cc
 makefile.sggcc    =>  Silicon Graphics (gcc,
-                       creates libpng14.so.14.1.4.5rc03)
+                       creates libpng14.so.14.1.4.5rc04)
 makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
 makefile.solaris  =>  Solaris 2.X makefile (gcc,
-                       creates libpng14.so.14.1.4.5rc03)
+                       creates libpng14.so.14.1.4.5rc04)
 makefile.so9      =>  Solaris 9 makefile (gcc,
-                       creates libpng14.so.14.1.4.5rc03)
+                       creates libpng14.so.14.1.4.5rc04)
 makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a)
 makefile.sunos    =>  Sun makefile
 makefile.32sunu   =>  Sun Ultra 32-bit makefile

--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -11,7 +11,7 @@

 # Modeled after libxml-config.

-version=1.4.5rc03
+version=1.4.5rc04
 prefix=""
 libdir=""
 libs=""

--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng14

 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.4.5rc03
+Version: 1.4.5rc04
 Libs: -L${libdir} -lpng14
 Cflags: -I${includedir}
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng14

 LIB=	png14
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.4.5rc03
+SHLIB_MINOR=	1.4.5rc04
 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

--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include

 LIB=	png
 SHLIB_MAJOR=	3
-SHLIB_MINOR=	1.4.5rc03
+SHLIB_MINOR=	1.4.5rc04
 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

--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -11,7 +11,7 @@ LIBDIR=	${PREFIX}/lib
 MANDIR= ${PREFIX}/man/cat

 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.4.5rc03
+SHLIB_MINOR=	1.4.5rc04

 LIB=	png
 SRCS=	png.c pngerror.c pngget.c pngmem.c pngpread.c \

--- a/scripts/png32ce.def
+++ b/scripts/png32ce.def
@@ -15,7 +15,7 @@ LIBRARY lpngce
 png_get_int_32

 EXPORTS
-;Version 1.4.5rc03
+;Version 1.4.5rc04
  png_build_grayscale_palette  @1
 ;  png_check_sig        @2
  png_chunk_error      @3

--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
 ; PNG.LIB module definition file for OS/2
 ;----------------------------------------

-; Version 1.4.5rc03
+; Version 1.4.5rc04

 LIBRARY		PNG
 DESCRIPTION	"PNG image compression library for OS/2"

--- a/scripts/pngwin.def
+++ b/scripts/pngwin.def
@@ -5,7 +5,7 @@
 LIBRARY

 EXPORTS
-;Version 1.4.5rc03
+;Version 1.4.5rc04
  png_build_grayscale_palette
  png_chunk_error
  png_chunk_warning