diff --git a/ANNOUNCE b/ANNOUNCE index 0373428d4..1e467ebac 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta28 - January 14, 2014 +Libpng 1.7.0beta28 - January 20, 2014 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. @@ -489,7 +489,7 @@ Version 1.7.0beta26 [January 1, 2014] Version 1.7.0beta27 [January 10, 2014] Removed potentially misleading warning from png_check_IHDR(). -Version 1.7.0beta28 [January 14, 2014] +Version 1.7.0beta28 [January 20, 2014] Updated scripts/makefile.* to use CPPFLAGS (Cosmin). Added clang attribute support (Cosmin). diff --git a/CHANGES b/CHANGES index fc8f5eef5..b1ee32f43 100644 --- a/CHANGES +++ b/CHANGES @@ -4778,7 +4778,7 @@ Version 1.7.0beta26 [January 1, 2014] Version 1.7.0beta27 [January 10, 2014] Removed potentially misleading warning from png_check_IHDR(). -Version 1.7.0beta28 [January 14, 2014] +Version 1.7.0beta28 [January 20, 2014] Updated scripts/makefile.* to use CPPFLAGS (Cosmin). Added clang attribute support (Cosmin). diff --git a/LICENSE b/LICENSE index 4d0b18044..344329785 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.7.0beta28, January 10, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta28, January 20, 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 -January 10, 2014 +January 20, 2014 diff --git a/README b/README index 65f3678a9..c09398f86 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.7.0beta28 - January 10, 2014 (shared library 17.0) +README for libpng version 1.7.0beta28 - January 20, 2014 (shared library 17.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/contrib/gregbook/Makefile.mingw32.diff b/contrib/gregbook/Makefile.mingw32.diff new file mode 100644 index 000000000..795d18d66 --- /dev/null +++ b/contrib/gregbook/Makefile.mingw32.diff @@ -0,0 +1,13 @@ +50c50,51 +< CFLAGS = -O -Wall $(INCS) $(MINGW_CCFLAGS) +--- +> CPPFLAGS = $(INCS) +> CFLAGS = -O -Wall $(MINGW_CCFLAGS) +88c89 +< $(CC) -c $(CFLAGS) $< +--- +> $(CC) -c $(CPPFLAGS) $(CFLAGS) $< +91c92 +< $(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $< +--- +> $(CC) -c $(CPPFLAGS) $(CFLAGS) -DPNG_BUILD_DLL -o $@ $< diff --git a/contrib/gregbook/Makefile.sgi.diff b/contrib/gregbook/Makefile.sgi.diff new file mode 100644 index 000000000..9cab204fb --- /dev/null +++ b/contrib/gregbook/Makefile.sgi.diff @@ -0,0 +1,9 @@ +56c56,57 +< ABI= +--- +> ABI = +> CPPFLAGS = +76c77 +< $(CC) -c $(CFLAGS) $< +--- +> $(CC) -c $(CPPFLAGS) $(CFLAGS) $< diff --git a/contrib/gregbook/Makefile.unx.diff b/contrib/gregbook/Makefile.unx.diff new file mode 100644 index 000000000..9b0aa8221 --- /dev/null +++ b/contrib/gregbook/Makefile.unx.diff @@ -0,0 +1,9 @@ +67c67,68 +< CFLAGS = -O -Wall $(INCS) -DFEATURE_LOOP +--- +> CPPFLAGS = $(INCS) -DFEATURE_LOOP +> CFLAGS = -O -Wall +95c96 +< $(CC) -c $(CFLAGS) $< +--- +> $(CC) -c $(CPPFLAGS) $(CFLAGS) $< diff --git a/contrib/gregbook/Makefile.w32.diff b/contrib/gregbook/Makefile.w32.diff new file mode 100644 index 000000000..c2d65d0ec --- /dev/null +++ b/contrib/gregbook/Makefile.w32.diff @@ -0,0 +1,9 @@ +56c56,57 +< CFLAGS = -nologo -O -W3 $(INCS) $(cvars) +--- +> CPPFLAGS = $(INCS) +> CFLAGS = -nologo -O -W3 $(cvars) +79c80 +< $(CC) -c $(CFLAGS) $< +--- +> $(CC) -c $(CPPFLAGS) $(CFLAGS) $< diff --git a/libpng-manual.txt b/libpng-manual.txt index 4e7658826..4c03e52a2 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -1,6 +1,6 @@ libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.7.0beta28 - January 10, 2014 + libpng version 1.7.0beta28 - January 20, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.7.0beta28 - January 10, 2014 + libpng versions 0.97, January 1998, through 1.7.0beta28 - January 20, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5264,7 +5264,7 @@ Other rules can be inferred by inspecting the libpng source. XVII. Y2K Compliance in libpng -January 10, 2014 +January 20, 2014 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. diff --git a/libpng.3 b/libpng.3 index 0ea779268..c1ebd5900 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "January 10, 2014" +.TH LIBPNG 3 "January 20, 2014" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta28 .SH SYNOPSIS @@ -494,7 +494,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.7.0beta28 - January 10, 2014 + libpng version 1.7.0beta28 - January 20, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -505,7 +505,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.7.0beta28 - January 10, 2014 + libpng versions 0.97, January 1998, through 1.7.0beta28 - January 20, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5759,7 +5759,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVII. Y2K Compliance in libpng -January 10, 2014 +January 20, 2014 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -6029,7 +6029,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.7.0beta28 - January 10, 2014: +Libpng version 1.7.0beta28 - January 20, 2014: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6052,7 +6052,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.7.0beta28, January 10, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta28, January 20, 2014, are Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -6151,7 +6151,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -January 10, 2014 +January 20, 2014 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index adf2b9312..1e7278cf3 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "January 10, 2014" +.TH LIBPNGPF 3 "January 20, 2014" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta28 (private functions) diff --git a/png.5 b/png.5 index ee8b6e227..27b006633 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "January 10, 2014" +.TH PNG 5 "January 20, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 6d521afd4..7f7769025 100644 --- a/png.c +++ b/png.c @@ -696,13 +696,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta28 - January 10, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta28 - January 20, 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.7.0beta28 - January 10, 2014\ + return "libpng version 1.7.0beta28 - January 20, 2014\ Copyright (c) 1998-2014 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 a95e92602..df215da36 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta28 - January 10, 2014 + * libpng version 1.7.0beta28 - January 20, 2014 * 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.7.0beta28 - January 10, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.7.0beta28 - January 20, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -200,7 +200,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta28, January 10, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta28, January 20, 2014, 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: @@ -312,7 +312,7 @@ * Y2K compliance in libpng: * ========================= * - * January 10, 2014 + * January 20, 2014 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -380,7 +380,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.7.0beta28" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0beta28 - January 10, 2014\n" + " libpng version 1.7.0beta28 - January 20, 2014\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 diff --git a/pngconf.h b/pngconf.h index 4bd021f93..5494dee40 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0beta28 - January 19, 2014 + * libpng version 1.7.0beta28 - January 20, 2014 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index c9979e008..467f24d0d 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0beta28 - January 10, 2014 +libpng version 1.7.0beta28 - January 20, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index ef6894b3d..9aaef1872 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@