diff options
49 files changed, 336 insertions, 182 deletions
@@ -110,7 +110,7 @@ Version 1.5.7beta05 [(PENDING RELEASE)] Version 1.6.0alpha01 [November 24, 2011] Added example programs for the new 'simplified' API. Moved pngvalid.c into contrib/libtests - Rebuilt Makefile.in and configure, etc., with autoconf-2.68 + Rebuilt Makefile.in, configure, etc., with autoconf-2.68 Send comments/corrections/commendations to png-mng-implement at lists.sf.net: (subscription required; visit @@ -3755,7 +3755,7 @@ Version 1.5.7beta05 [(PENDING RELEASE)] Version 1.6.0alpha01 [November 24, 2011] Added example programs for the new 'simplified' API. Moved pngvalid.c into contrib/libtests - Rebuilt Makefile.in configure with autoconf-2.68 + Rebuilt Makefile.in, configure, etc., with autoconf-2.68 Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index a30326410..d53f80435 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -229,9 +229,9 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.6.0alpha01 - VERSION 15.${PNGLIB_RELEASE}.0 - SOVERSION 15 +# VERSION 16.${PNGLIB_RELEASE}.1.6.0alpha01 + VERSION 16.${PNGLIB_RELEASE}.0 + SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) endif() if(PNG_STATIC) @@ -263,7 +263,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 => libpng15.dll.a on Cygwin + # Create a symlink for libpng.dll.a => libpng16.dll.a on Cygwin if(CYGWIN OR MINGW) get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME} LOCATION_${CMAKE_BUILD_TYPE}) get_filename_component(BUILD_TARGET_FILE ${BUILD_TARGET_LOCATION} NAME) @@ -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.0alpha01, November 23, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0alpha01, November 24, 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 -November 23, 2011 +November 24, 2011 @@ -1,4 +1,4 @@ -README for libpng version 1.6.0alpha01 - November 23, 2011 (shared library 15.0) +README for libpng version 1.6.0alpha01 - November 24, 2011 (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/contrib/gregbook/Makefile.sgi b/contrib/gregbook/Makefile.sgi index 91623acf0..6c3bdf191 100644 --- a/contrib/gregbook/Makefile.sgi +++ b/contrib/gregbook/Makefile.sgi @@ -23,9 +23,9 @@ # macros -------------------------------------------------------------------- -PNGINC = -I/usr/local/include/libpng15 -PNGLIB = -L/usr/local/lib -lpng15 # dynamically linked against libpng -#PNGLIB = /usr/local/lib/libpng15.a # statically linked against libpng +PNGINC = -I/usr/local/include/libpng16 +PNGLIB = -L/usr/local/lib -lpng16 # dynamically linked against libpng +#PNGLIB = /usr/local/lib/libpng16.a # statically linked against libpng # or: #PNGINC = -I../.. #PNGLIB = -L../.. -lpng diff --git a/contrib/gregbook/Makefile.unx b/contrib/gregbook/Makefile.unx index b52d8b6aa..d5e4f355a 100644 --- a/contrib/gregbook/Makefile.unx +++ b/contrib/gregbook/Makefile.unx @@ -26,14 +26,14 @@ # macros -------------------------------------------------------------------- #PNGDIR = /usr/local/lib -#PNGINC = -I/usr/local/include/libpng15 -#PNGLIBd = -L$(PNGDIR) -lpng15 # dynamically linked, installed libpng -#PNGLIBs = $(PNGDIR)/libpng15.a # statically linked, installed libpng +#PNGINC = -I/usr/local/include/libpng16 +#PNGLIBd = -L$(PNGDIR) -lpng16 # dynamically linked, installed libpng +#PNGLIBs = $(PNGDIR)/libpng16.a # statically linked, installed libpng # or: PNGDIR = ../..# this one is for libpng-x.y.z/contrib/gregbook builds #PNGDIR = ../libpng PNGINC = -I$(PNGDIR) -PNGLIBd = -Wl,-rpath,$(PNGDIR) -L$(PNGDIR) -lpng15 # dynamically linked +PNGLIBd = -Wl,-rpath,$(PNGDIR) -L$(PNGDIR) -lpng16 # dynamically linked PNGLIBs = $(PNGDIR)/libpng.a # statically linked, local libpng ZDIR = /usr/local/lib diff --git a/contrib/pngminus/makefile.std b/contrib/pngminus/makefile.std index fa7b5909f..30317b77d 100644 --- a/contrib/pngminus/makefile.std +++ b/contrib/pngminus/makefile.std @@ -8,9 +8,9 @@ LD=$(CC) RM=rm -f #PNGPATH = /usr/local -#PNGINC = -I$(PNGPATH)/include/libpng15 -#PNGLIB = -L$(PNGPATH)/lib -lpng15 -#PNGLIBS = $(PNGPATH)/lib/libpng15.a +#PNGINC = -I$(PNGPATH)/include/libpng16 +#PNGLIB = -L$(PNGPATH)/lib -lpng16 +#PNGLIBS = $(PNGPATH)/lib/libpng16.a PNGINC = -I../.. PNGLIB = -L../.. -lpng PNGLIBS = ../../libpng.a @@ -22,11 +22,165 @@ * see also the programs in the contrib directory. */ -#define _POSIX_SOURCE 1 /* libpng and zlib are POSIX-compliant. You may - * change this if your application uses non-POSIX - * extensions. */ +/* The simple, but restricted, approach to reading a PNG file or data stream + * just requires two function calls, as in the following complete program. + * Writing a file just needs one function call, so long as the data has an + * appropriate layout. + * + * The following code reads PNG image data from a file and writes it, in a + * potentially new format, to a new file. While this code will compile there is + * minimal (insufficient) error checking; for a more realistic version look at + * contrib/examples/pngtopng.c + */ +#include <stddef.h> +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <png.h> + +int main(int argc, const char **argv) +{ + if (argc == 3) + { + png_image image; /* The control structure used by libpng */ + + /* Initialize the 'png_image' structure. */ + memset(&image, 0, sizeof image); + + /* The first argument is the file to read: */ + if (png_image_begin_read_from_file(&image, argv[1])) + { + png_bytep buffer; + + /* Set the format in which to read the PNG file; this code chooses a + * simple sRGB format with a non-associated alpha channel, adequate to + * store most images. + */ + image.format = PNG_FORMAT_RGBA; + + /* Now allocate enough memory to hold the image in this format; the + * PNG_IMAGE_SIZE macro uses the information about the image (width, + * height and format) stored in 'image'. + */ + buffer = malloc(PNG_IMAGE_SIZE(image)); + + /* If enough memory was available read the image in the desired format + * then write the result out to the new file. 'background' is not + * necessary when reading the image because the alpha channel is + * preserved; if it were to be removed, for example if we requested + * PNG_FORMAT_RGB, then either a solid background color would have to + * be supplied or the output buffer would have to be initialized to the + * actual background of the image. + * + * The final argument to png_image_finish_read is the 'row_stride' - + * this is the number of components allocated for the image in each + * row. It has to be at least as big as the value returned by + * PNG_IMAGE_ROW_STRIDE, but if you just allocate space for the + * default, minimum, size using PNG_IMAGE_SIZE as above you can pass + * zero. + */ + if (buffer != NULL && + png_image_finish_read(&image, NULL/*background*/, buffer, + 0/*row_stride*/)) + { + /* Now write the image out to the second argument. In the write + * call 'convert_to_8bit' allows 16-bit data to be squashed down to + * 8 bits; this isn't necessary here because the original read was + * to the 8-bit format. + */ + if (png_image_write_to_file(&image, argv[2], 0/*convert_to_8bit*/, + buffer, 0/*row_stride*/)) + { + /* The image has been written successfully. */ + exit(0); + } + } + } + + /* Something went wrong reading or writing the image. libpng stores a + * textual message in the 'png_image' structure: + */ + fprintf(stderr, "pngtopng: error: %s\n", image.message); + exit (1); + } -#include "png.h" + fprintf(stderr, "pngtopng: usage: pngtopng input-file output-file\n"); + exit(1); +} + +/* That's it ;-) Of course you probably want to do more with PNG files than + * just converting them all to 32-bit RGBA PNG files; you can do that between + * the call to png_image_finish_read and png_image_write_to_file. You can also + * ask for the image data to be presented in a number of different formats. You + * do this by simply changing the 'format' parameter set before allocating the + * buffer. + * + * The format parameter consists of five flags that define various aspects of + * the image, you can simply add these together to get the format or you can use + * one of the predefined macros from png.h (as above): + * + * PNG_FORMAT_FLAG_COLOR: if set the image will have three color components per + * pixel (red, green and blue), if not set the image will just have one + * luminance (grayscale) component. + * + * PNG_FORMAT_FLAG_ALPHA: if set each pixel in the image will have an additional + * alpha value; a linear value that describes the degree the image pixel + * covers (overwrites) the contents of the existing pixel on the display. + * + * PNG_FORMAT_FLAG_LINEAR: if set the components of each pixel will be returned + * as a series of 16-bit linear values, if not set the components will be + * returned as a series of 8-bit values encoded according to the 'sRGB' + * standard. The 8-bit format is the normal format for images intended for + * direct display, because almost all display devices do the inverse of the + * sRGB transformation to the data they receive. The 16-bit format is more + * common for scientific data and image data that must be further processed; + * because it is linear simple math can be done on the component values. + * Regardless of the setting of this flag the alpha channel is always linear, + * although it will be 8 bits or 16 bits wide as specified by the flag. + * + * PNG_FORMAT_FLAG_BGR: if set the components of a color pixel will be returned + * in the order blue, then green, then red. If not set the pixel components + * are in the order red, then green, then blue. + * + * PNG_FORMAT_FLAG_AFIRST: if set the alpha channel (if present) precedes the + * color or grayscale components. If not set the alpha channel follows the + * components. + * + * You do not have to read directly from a file. You can read from memory or, + * on systems that support it, from a <stdio.h> FILE*. This is controlled by + * the particular png_image_read_from_ function you call at the start. Likewise + * on write you can write to a FILE* if your system supports it. Check the + * macro PNG_STDIO_SUPPORTED to see if stdio support has been included in your + * libpng build. + * + * If you read 16-bit (PNG_FORMAT_FLAG_LINEAR) data you may need to write it in + * the 8-bit format for display. You do this by setting the convert_to_8bit + * flag to 'true'. + * + * Don't repeatedly convert between the 8-bit and 16-bit forms. There is + * significant data loss when 16-bit data is converted to the 8-bit encoding and + * the current libpng implementation of convertion to 16-bit is also + * significantly lossy. The latter will be fixed in the future, but the former + * is unavoidable - the 8-bit format just doesn't have enough resolution. + */ + +/* If your program needs more information from the PNG data it reads, or if you + * need to do more complex transformations, or minimise transformations, on the + * data you read, then you must use one of the several lower level libpng + * interfaces. + * + * All these interfaces require that you do your own error handling - your + * program must be able to arrange for control to return to your own code any + * time libpng encounters a problem. There are several ways to do this, but the + * standard way is to use the ANSI-C (C90) <setjmp.h> interface to establish a + * return point within your own code. You must do this if you do not use the + * simplified interface (above). + * + * The first step is to include the header files you need, including the libpng + * header file. Include any standard headers and feature test macros your + * program requires before including png.h: + */ +#include <png.h> /* The png_jmpbuf() macro, used in error handling, became available in * libpng version 1.0.6. If you want to be able to run your code with older diff --git a/libpng-manual.txt b/libpng-manual.txt index fc38af8fc..478dfd88d 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.6.0alpha01 - November 23, 2011 + libpng version 1.6.0alpha01 - November 24, 2011 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2011 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.6.0alpha01 - November 23, 2011 + libpng versions 0.97, January 1998, through 1.6.0alpha01 - November 24, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -4573,7 +4573,7 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -November 23, 2011 +November 24, 2011 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "November 23, 2011" +.TH LIBPNG 3 "November 24, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0alpha01 .SH SYNOPSIS @@ -1007,7 +1007,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.6.0alpha01 - November 23, 2011 + libpng version 1.6.0alpha01 - November 24, 2011 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -1018,7 +1018,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.0alpha01 - November 23, 2011 + libpng versions 0.97, January 1998, through 1.6.0alpha01 - November 24, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5581,7 +5581,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -November 23, 2011 +November 24, 2011 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5847,7 +5847,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.0alpha01 - November 23, 2011: +Libpng version 1.6.0alpha01 - November 24, 2011: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5870,7 +5870,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.0alpha01, November 23, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0alpha01, November 24, 2011, 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 @@ -5969,7 +5969,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 23, 2011 +November 24, 2011 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 657ba6f0b..83d966faf 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "November 23, 2011" +.TH LIBPNGPF 3 "November 24, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0alpha01 (private functions) @@ -1,4 +1,4 @@ -.TH PNG 5 "November 23, 2011" +.TH PNG 5 "November 24, 2011" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -655,13 +655,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.0alpha01 - November 23, 2011" PNG_STRING_NEWLINE \ + "libpng version 1.6.0alpha01 - November 24, 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.6.0alpha01 - November 23, 2011\ + return "libpng version 1.6.0alpha01 - November 24, 2011\ Copyright (c) 1998-2011 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -376,8 +376,8 @@ #define PNG_HEADER_VERSION_STRING \ " libpng version 1.6.0alpha01 - November 24, 2011\n" -#define PNG_LIBPNG_VER_SONUM 15 -#define PNG_LIBPNG_VER_DLLNUM 15 +#define PNG_LIBPNG_VER_SONUM 16 +#define PNG_LIBPNG_VER_DLLNUM 16 /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.0alpha01 - November 23, 2011 + * libpng version 1.6.0alpha01 - November 24, 2011 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1673,7 +1673,7 @@ png_image_read_composite(png_voidp argument) /* So 'component' is scaled by 255*65535 and is * therefore appropriate for the sRGB to linear - * convertion table. + * conversion table. */ component = PNG_sRGB_FROM_LINEAR(component); } diff --git a/projects/visualc71/libpng.vcproj b/projects/visualc71/libpng.vcproj index 4c5acf94c..608ec4e6b 100644 --- a/projects/visualc71/libpng.vcproj +++ b/projects/visualc71/libpng.vcproj @@ -30,7 +30,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)/libpng15.dll" + OutputFile="$(OutDir)/libpng16.dll" LinkIncremental="1"/> <Tool Name="VCMIDLTool"/> @@ -78,7 +78,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)/libpng15d.dll" + OutputFile="$(OutDir)/libpng16d.dll" GenerateDebugInformation="TRUE"/> <Tool Name="VCMIDLTool"/> @@ -126,7 +126,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)/libpng15vb.dll" + OutputFile="$(OutDir)/libpng16vb.dll" LinkIncremental="1"/> <Tool Name="VCMIDLTool"/> diff --git a/projects/visualc71/pngtest.vcproj b/projects/visualc71/pngtest.vcproj index ff330ae35..3b48f1cf6 100644 --- a/projects/visualc71/pngtest.vcproj +++ b/projects/visualc71/pngtest.vcproj @@ -130,7 +130,7 @@ $(TargetPath) ..\..\pngtest.png $(IntDir)\pngout.png" Name="VCLinkerTool" OutputFile="$(OutDir)/pngtest.exe" LinkIncremental="1" - IgnoreDefaultLibraryNames="$(IntDir)\libpng15b.lib" + IgnoreDefaultLibraryNames="$(IntDir)\libpng16b.lib" SubSystem="1" TargetMachine="1"/> <Tool diff --git a/projects/vstudio/libpng/libpng.vcxproj b/projects/vstudio/libpng/libpng.vcxproj index c4bf04184..9054cae5d 100644 --- a/projects/vstudio/libpng/libpng.vcxproj +++ b/projects/vstudio/libpng/libpng.vcxproj @@ -63,23 +63,23 @@ <LinkIncremental>false</LinkIncremental> <CustomBuildBeforeTargets> </CustomBuildBeforeTargets> - <TargetName>$(ProjectName)15</TargetName> + <TargetName>$(ProjectName)16</TargetName> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'"> <LinkIncremental>false</LinkIncremental> <CustomBuildBeforeTargets /> - <TargetName>$(ProjectName)15</TargetName> + <TargetName>$(ProjectName)16</TargetName> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <CustomBuildBeforeTargets> </CustomBuildBeforeTargets> - <TargetName>$(ProjectName)15</TargetName> + <TargetName>$(ProjectName)16</TargetName> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'"> <LinkIncremental>false</LinkIncremental> <CustomBuildBeforeTargets /> - <TargetName>$(ProjectName)15</TargetName> + <TargetName>$(ProjectName)16</TargetName> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -106,7 +106,7 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <AdditionalDependencies>zlib.lib</AdditionalDependencies> - <Version>15</Version> + <Version>16</Version> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> @@ -163,7 +163,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <AdditionalDependencies>zlib.lib</AdditionalDependencies> - <Version>15</Version> + <Version>16</Version> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> diff --git a/projects/vstudio/pngtest/pngtest.vcxproj b/projects/vstudio/pngtest/pngtest.vcxproj index a03dca565..51b9574d5 100644 --- a/projects/vstudio/pngtest/pngtest.vcxproj +++ b/projects/vstudio/pngtest/pngtest.vcxproj @@ -95,7 +95,7 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>libpng15.lib</AdditionalDependencies> + <AdditionalDependencies>libpng16.lib</AdditionalDependencies> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> <CustomBuildStep> @@ -128,7 +128,7 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>libpng15.lib;zlib.lib</AdditionalDependencies> + <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> <CustomBuildStep> @@ -163,7 +163,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <AdditionalDependencies>libpng15.lib</AdditionalDependencies> + <AdditionalDependencies>libpng16.lib</AdditionalDependencies> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> <CustomBuildStep> @@ -198,7 +198,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>libpng15.lib;zlib.lib</AdditionalDependencies> + <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies> <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> diff --git a/projects/vstudio/pngvalid/pngvalid.vcxproj b/projects/vstudio/pngvalid/pngvalid.vcxproj index 5173cb09f..8d19c9bca 100644 --- a/projects/vstudio/pngvalid/pngvalid.vcxproj +++ b/projects/vstudio/pngvalid/pngvalid.vcxproj @@ -95,7 +95,7 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>libpng15.lib;zlib.lib</AdditionalDependencies> + <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> <CustomBuildStep> @@ -128,7 +128,7 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>libpng15.lib;zlib.lib</AdditionalDependencies> + <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> <CustomBuildStep> @@ -162,7 +162,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>libpng15.lib;zlib.lib</AdditionalDependencies> + <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> </Link> @@ -198,7 +198,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>libpng15.lib;zlib.lib</AdditionalDependencies> + <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> </Link> diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 7dd76bd35..5f1eb47b9 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.0alpha01 - November 23, 2011 +libpng version 1.6.0alpha01 - November 24, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -40,7 +40,7 @@ problems. If you don't use the Visual Studio defaults your application must still be built with the default runtime option (/MD). If, for some reason, it is not then your -application will crash inside libpng15.dll as soon as libpng tries to read +application will crash inside libpng16.dll as soon as libpng tries to read from a file handle you pass in. If you do not want to use the DLL, for example for a very small application, diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 13d458008..021aa8336 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.0alpha01 - November 23, 2011 + * libpng version 1.6.0alpha01 - November 24, 2011 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * diff --git a/scripts/README.txt b/scripts/README.txt index 4bb236286..cab85e9fc 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,9 +1,9 @@ -Makefiles for libpng version 1.6.0alpha01 - November 23, 2011 +Makefiles for libpng version 1.6.0alpha01 - November 24, 2011 pnglibconf.h.prebuilt => Stores configuration settings makefile.linux => Linux/ELF makefile - (gcc, creates libpng15.so.15.1.6.0alpha01) + (gcc, creates libpng16.so.16.1.6.0alpha01) 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.6.0alpha01) + (gcc, creates libpng16.so.16.1.6.0alpha01) 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.6.0alpha01) + creates libpng16.so.16.1.6.0alpha01) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng15.so.15.1.6.0alpha01) + creates libpng16.so.16.1.6.0alpha01) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng15.so.15.1.6.0alpha01) + creates libpng16.so.16.1.6.0alpha01) 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/libpng.pc.in b/scripts/libpng.pc.in index 6b9c61e60..107077295 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -1,10 +1,10 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/libpng15 +includedir=@includedir@/libpng16 Name: libpng Description: Loads and saves PNG files Version: 1.6.0alpha01 -Libs: -L${libdir} -lpng15 +Libs: -L${libdir} -lpng16 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index b5e5a33a0..f2195c147 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -9,8 +9,8 @@ # and license in png.h # Library name: -LIBNAME=libpng15 -PNGMAJ = 15 +LIBNAME=libpng16 +PNGMAJ = 16 # Shared library names: LIBSO=$(LIBNAME).so @@ -29,7 +29,7 @@ RM_F=/bin/rm -f SUN_CC_FLAGS=-fast -xtarget=ultra SUN_LD_FLAGS=-fast -xtarget=ultra -# where make install puts libpng.a, libpng15.so and libpng15/png.h +# where make install puts libpng.a, libpng16.so and libpng16/png.h prefix=/a exec_prefix=$(prefix) @@ -95,7 +95,7 @@ libpng.pc: -e s!@exec_prefix@!$(exec_prefix)! \ -e s!@libdir@!$(LIBPATH)! \ -e s!@includedir@!$(INCPATH)! \ - -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc + -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc libpng-config: ( cat scripts/libpng-config-head.in; \ @@ -106,7 +106,7 @@ libpng-config: echo R_opts=\"-R$(LIBPATH)\"; \ echo ccopts=\"-xtarget=ultra\"; \ echo ldopts=\"-xtarget=ultra\"; \ - echo libs=\"-lpng15 -lz -lm\"; \ + echo libs=\"-lpng16 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index a0331d670..777979c6b 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -9,8 +9,8 @@ # and license in png.h # Library name: -LIBNAME=libpng15 -PNGMAJ = 15 +LIBNAME=libpng16 +PNGMAJ = 16 # Shared library names: LIBSO=$(LIBNAME).so @@ -29,7 +29,7 @@ RM_F=/bin/rm -f SUN_CC_FLAGS=-fast -xtarget=ultra -xarch=v9 SUN_LD_FLAGS=-fast -xtarget=ultra -xarch=v9 -# where make install puts libpng.a, libpng15.so and libpng15/png.h +# where make install puts libpng.a, libpng16.so and libpng16/png.h prefix=/a exec_prefix=$(prefix) @@ -47,7 +47,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \ # $(WARNMORE) -g -DPNG_DEBUG=5 -LDFLAGS=-L. -R. $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng15 -lz -lm +LDFLAGS=-L. -R. $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng16 -lz -lm INCPATH=$(prefix)/include LIBPATH=$(exec_prefix)/lib @@ -95,7 +95,7 @@ libpng.pc: -e s!@exec_prefix@!$(exec_prefix)! \ -e s!@libdir@!$(LIBPATH)! \ -e s!@includedir@!$(INCPATH)! \ - -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc + -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc libpng-config: ( cat scripts/libpng-config-head.in; \ @@ -106,7 +106,7 @@ libpng-config: echo R_opts=\"-R$(LIBPATH)\"; \ echo ccopts=\"-xtarget=ultra -xarch=v9\"; \ echo ldopts=\"-xtarget=ultra -xarch=v9\"; \ - echo libs=\"-lpng15 -lz -lm\"; \ + echo libs=\"-lpng16 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config diff --git a/scripts/makefile.aix b/scripts/makefile.aix index bb4c40d4b..77b616040 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -21,8 +21,8 @@ RANLIB = ranlib RM_F = rm -f LN_SF = ln -f -s -LIBNAME=libpng15 -PNGMAJ = 15 +LIBNAME=libpng16 +PNGMAJ = 16 prefix=/usr/local INCPATH=$(prefix)/include @@ -47,7 +47,7 @@ CRELEASE = -O2 LDRELEASE = -s WARNMORE=-W -Wall CFLAGS = -I$(ZLIBINC) $(WARNMORE) $(CRELEASE) -LDFLAGS = -L. -L$(ZLIBLIB) -lpng15 -lz -lm $(LDRELEASE) +LDFLAGS = -L. -L$(ZLIBLIB) -lpng16 -lz -lm $(LDRELEASE) # File extensions O=.o diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 749db78ad..9a5561231 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -9,8 +9,8 @@ # and license in png.h # Library name: -LIBNAME=libpng15 -PNGMAJ = 15 +LIBNAME=libpng16 +PNGMAJ = 16 # Shared library names: LIBSO=$(LIBNAME).so @@ -45,7 +45,7 @@ CFLAGS=-I$(ZLIBINC) -W -Wall -O1 -funroll-loops \ # LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz LDFLAGS=-L. -Wl,-soname=$(LIBSOMAJ) -L$(ZLIBLIB) -lz -# where make install puts libpng.a, libpng15.so*, and png.h +# where make install puts libpng.a, libpng16.so*, and png.h prefix=/usr/local exec_prefix=$(prefix) INCPATH=$(prefix)/include @@ -91,13 +91,13 @@ libpng.pc: -e s!@exec_prefix@!$(exec_prefix)! \ -e s!@libdir@!$(LIBPATH)! \ -e s!@includedir@!$(INCPATH)! \ - -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc + -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ - echo libs=\"-lpng15 -lz \"; \ + echo libs=\"-lpng16 -lz \"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config @@ -110,7 +110,7 @@ $(LIBSOMAJ): $(OBJSDLL) $(LIBSOMAJ) $(OBJSDLL) $(LDFLAGS) pngtest: pngtest.o $(LIBSO) - $(CC) -L$(ZLIBLIB) -L. -lz -lpng15 -o pngtest pngtest.o + $(CC) -L$(ZLIBLIB) -L. -lz -lpng16 -o pngtest pngtest.o test: pngtest ./pngtest diff --git a/scripts/makefile.cegcc b/scripts/makefile.cegcc index ed7f025ea..c1bb2e6c6 100644 --- a/scripts/makefile.cegcc +++ b/scripts/makefile.cegcc @@ -28,10 +28,10 @@ VER = $(VERMAJ).$(VERMIN).$(VERMIC) NAME = libpng PACKAGE = $(NAME)-$(VER) -BIN = libpng15-0.dll -LIB = libpng15.a libpng15.dll.a libpng.a libpng.dll.a +BIN = libpng16-0.dll +LIB = libpng16.a libpng16.dll.a libpng.a libpng.dll.a INCLUDE = png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h -PC = libpng15.pc libpng.pc +PC = libpng16.pc libpng.pc MANIFESTVERBIN = "Libpng-$(VER): Binary files" MANIFESTVERDEV = "Libpng-$(VER): Developer files" diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 337a8151e..6ef13103e 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -9,7 +9,7 @@ # For conditions of distribution and use, see the disclaimer # and license in png.h -# where "make install" puts libpng.a, libpng15.dylib, png.h, pngconf.h, +# where "make install" puts libpng.a, libpng16.dylib, png.h, pngconf.h, # and pnglibconf.h prefix=/usr/local exec_prefix=$(prefix) @@ -21,8 +21,8 @@ ZLIBLIB=../zlib ZLIBINC=../zlib # Library name: -LIBNAME = libpng15 -PNGMAJ = 15 +LIBNAME = libpng16 +PNGMAJ = 16 # Shared library names: LIBSO=$(LIBNAME).dylib @@ -41,7 +41,7 @@ ARCH="-arch i386 -arch x86_64" # CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops $(ARCH) -LDFLAGS=-L. -L$(ZLIBLIB) -lpng15 -lz $(ARCH) +LDFLAGS=-L. -L$(ZLIBLIB) -lpng16 -lz $(ARCH) INCPATH=$(prefix)/include LIBPATH=$(exec_prefix)/lib @@ -89,14 +89,14 @@ libpng.pc: -e s!@exec_prefix@!$(exec_prefix)! \ -e s!@libdir@!$(LIBPATH)! \ -e s!@includedir@!$(INCPATH)! \ - -e s!-lpng15!-lpng15\ -lz! > libpng.pc + -e s!-lpng16!-lpng16\ -lz! > libpng.pc libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \ - echo libs=\"-lpng15 -lz\"; \ + echo libs=\"-lpng16 -lz\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config @@ -106,7 +106,7 @@ $(LIBSO): $(LIBSOMAJ) $(LIBSOMAJ): $(OBJSDLL) $(CC) -dynamiclib \ -install_name $(LIBPATH)/$(LIBSOMAJ) \ - -current_version 15 -compatibility_version 15 \ + -current_version 16 -compatibility_version 16 \ -o $(LIBSOMAJ) \ $(OBJSDLL) -L$(ZLIBLIB) -lz diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 5301d87d3..930de64c0 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -7,8 +7,8 @@ # and license in png.h # Library name: -PNGMAJ = 15 -LIBNAME = libpng15 +PNGMAJ = 16 +LIBNAME = libpng16 # Shared library names: LIBSO=$(LIBNAME).so @@ -75,7 +75,7 @@ libpng.pc: -e s!@exec_prefix@!$(exec_prefix)! \ -e s!@libdir@!$(LIBPATH)! \ -e s!@includedir@!$(INCPATH)! \ - -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc + -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc libpng-config: ( cat scripts/libpng-config-head.in; \ @@ -83,7 +83,7 @@ libpng-config: echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo ccopts=\"-std\"; \ echo L_opts=\"-L$(LIBPATH)\"; \ - echo libs=\"-lpng15 -lz -lm\"; \ + echo libs=\"-lpng16 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 5af43b184..8991892c6 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -1,4 +1,4 @@ -# makefile for libpng.a and libpng15.so on Linux ELF with gcc +# makefile for libpng.a and libpng16.so on Linux ELF with gcc # Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010-2011 Greg Roelofs # and Glenn Randers-Pehrson # Copyright (C) 1996, 1997 Andreas Dilger @@ -10,19 +10,19 @@ # Modified for Debian by Junichi Uekawa and Josselin Mouette # Major modifications are: # * link libpng explicitly with libz and libm -# * $(OLDSO).15 is a symlink rather than a different library +# * $(OLDSO).16 is a symlink rather than a different library # * versioned symbols # Library name: -LIBNAME = libpng15 -PNGMAJ = 15 +LIBNAME = libpng16 +PNGMAJ = 16 # Shared library names: LIBSO=$(LIBNAME).so LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) LIBSOREL=$(LIBSOMAJ).$(RELEASE) OLDSO=libpng.so -OLDSOMAJ=libpng.so.15 +OLDSOMAJ=libpng.so.16 # Utilities: AR_RC=ar rc @@ -32,8 +32,8 @@ LN_SF=ln -sf RANLIB=ranlib RM_F=/bin/rm -f -# where "make install" puts libpng15.a, libpng15.so*, -# libpng15/png.h, libpng15/pngconf.h, and libpng15/pnglibconf.h +# where "make install" puts libpng16.a, libpng16.so*, +# libpng16/png.h, libpng16/pngconf.h, and libpng16/pnglibconf.h # Prefix must be a full pathname. prefix=/usr/local exec_prefix=$(prefix) @@ -57,7 +57,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ CFLAGS=-W -Wall -D_REENTRANT -O2 \ $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 -LDFLAGS=-L. -lpng15 +LDFLAGS=-L. -lpng16 LDFLAGS_A=libpng.a -lz -lm LIBADDFLAGS=-lz -lm @@ -108,11 +108,11 @@ libpng.pc: -e s!@exec_prefix@!$(exec_prefix)! \ -e s!@libdir@!$(LIBPATH)! \ -e s!@includedir@!$(INCPATH)! \ - -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc + -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc libpng.syms: png.h pngconf.h pnglibconf.h $(CC) $(CFLAGS) -E -DPNG_BUILDSYMS -DPNG_INTERNAL png.h |\ - awk -F '[\t [\\]();]' -v PNGMAJ=$(PNGMAJ) 'BEGIN{printf("PNG15_%s {global:\n",PNGMAJ)}\ + awk -F '[\t [\\]();]' -v PNGMAJ=$(PNGMAJ) 'BEGIN{printf("PNG16_%s {global:\n",PNGMAJ)}\ { for (i=1;i+2<=NF;++i)\ if ($$(i)=="PNG_FUNCTION_EXPORT" && $$(i+2)=="END")\ print $$(i+1) ";";\ @@ -129,8 +129,8 @@ libpng-config: echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo L_opts=\"\"; \ echo R_opts=\"\"; \ - echo libs=\"-lpng15\"; \ - echo all_libs=\"-lpng15 $(LIBADDFLAGS)\"; \ + echo libs=\"-lpng16\"; \ + echo all_libs=\"-lpng16 $(LIBADDFLAGS)\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd index 994608c99..bd7ec013d 100644 --- a/scripts/makefile.freebsd +++ b/scripts/makefile.freebsd @@ -6,7 +6,7 @@ # and license in png.h PREFIX?= /usr/local -SHLIB_VER?= 15 +SHLIB_VER?= 16 LIB= png SHLIB_MAJOR= ${SHLIB_VER} diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index b5b631d11..754e03f98 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -19,8 +19,8 @@ ZLIBINC=/opt/zlib/include # SHAREDLIB=libz.sl # Library name: -LIBNAME = libpng15 -PNGMAJ = 15 +LIBNAME = libpng16 +PNGMAJ = 16 # Shared library names: LIBSO=$(LIBNAME).sl @@ -44,7 +44,7 @@ CCFLAGS=-I$(ZLIBINC) -O -Ae -Wl,+vnocompatwarnings +DD64 \ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm -# where make install puts libpng.a, libpng15.sl, and png.h +# where make install puts libpng.a, libpng16.sl, and png.h prefix=/opt/libpng exec_prefix=$(prefix) INCPATH=$(prefix)/include @@ -93,7 +93,7 @@ libpng.pc: -e s!@exec_prefix@!$(exec_prefix)! \ -e s!@libdir@!$(LIBPATH)! \ -e s!@includedir@!$(INCPATH)! \ - -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc + -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc libpng-config: ( cat scripts/libpng-config-head.in; \ @@ -101,7 +101,7 @@ libpng-config: echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo ccopts=\"-Ae +DA1.1 +DS2.0\"; \ echo L_opts=\"-L$(LIBPATH)\"; \ - echo libs=\"-lpng15 -lz -lm\"; \ + echo libs=\"-lpng16 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 3fe21177a..93b2719f9 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -9,8 +9,8 @@ # and license in png.h # Library name: -LIBNAME = libpng15 -PNGMAJ = 15 +LIBNAME = libpng16 +PNGMAJ = 16 # Shared library names: LIBSO=$(LIBNAME).sl @@ -55,8 +55,8 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \ $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 -#LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng15 -lz -lm -LDFLAGS=-L. -L$(ZLIBLIB) -lpng15 -lz -lm +#LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng16 -lz -lm +LDFLAGS=-L. -L$(ZLIBLIB) -lpng16 -lz -lm INCPATH=$(prefix)/include LIBPATH=$(exec_prefix)/lib @@ -100,13 +100,13 @@ libpng.pc: -e s!@exec_prefix@!$(exec_prefix)! \ -e s!@libdir@!$(LIBPATH)! \ -e s!@includedir@!$(INCPATH)! \ - -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc + -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ - echo libs=\"-lpng15 -lz -lm\"; \ + echo libs=\"-lpng16 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 650ab4f66..f36e8aa5e 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -19,8 +19,8 @@ ZLIBINC=/opt/zlib/include # SHAREDLIB=libz.sl # Library name: -LIBNAME = libpng15 -PNGMAJ = 15 +LIBNAME = libpng16 +PNGMAJ = 16 # Shared library names: LIBSO=$(LIBNAME).sl @@ -36,7 +36,7 @@ LN_SF=ln -sf RANLIB=ranlib RM_F=/bin/rm -f -# where make install puts libpng.a, libpng15.sl, and png.h +# where make install puts libpng.a, libpng16.sl, and png.h prefix=/opt/libpng exec_prefix=$(prefix) INCPATH=$(prefix)/include @@ -90,7 +90,7 @@ libpng.pc: -e s!@exec_prefix@!$(exec_prefix)! \ -e s!@libdir@!$(LIBPATH)! \ -e s!@includedir@!$(INCPATH)! \ - -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc + -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc libpng-config: ( cat scripts/libpng-config-head.in; \ @@ -98,7 +98,7 @@ libpng-config: echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo ccopts=\"-Ae +DA1.1 +DS2.0\"; \ echo L_opts=\"-L$(LIBPATH)\"; \ - echo libs=\"-lpng15 -lz -lm\"; \ + echo libs=\"-lpng16 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config diff --git a/scripts/makefile.linux b/scripts/makefile.linux index d7c893e31..ff60bfb12 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -1,4 +1,4 @@ -# makefile for libpng.a and libpng15.so on Linux ELF with gcc +# makefile for libpng.a and libpng16.so on Linux ELF with gcc # Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010-2011 Greg Roelofs and # Glenn Randers-Pehrson # Copyright (C) 1996, 1997 Andreas Dilger @@ -8,8 +8,8 @@ # and license in png.h # Library name: -LIBNAME = libpng15 -PNGMAJ = 15 +LIBNAME = libpng16 +PNGMAJ = 16 RELEASE = 0 # Shared library names: @@ -26,8 +26,8 @@ LN_SF=ln -sf RANLIB=ranlib RM_F=/bin/rm -f -# where "make install" puts libpng15.a, libpng15.so*, -# libpng15/png.h, libpng15/pngconf.h, and libpng15/pnglibconf.h +# where "make install" puts libpng16.a, libpng16.so*, +# libpng16/png.h, libpng16/pngconf.h, and libpng16/pnglibconf.h # Prefix must be a full pathname. prefix=/usr/local exec_prefix=$(prefix) @@ -51,7 +51,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops \ $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 -LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng15 -lz -lm +LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng16 -lz -lm LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm INCPATH=$(prefix)/include @@ -100,7 +100,7 @@ libpng.pc: -e s!@exec_prefix@!$(exec_prefix)! \ -e s!@libdir@!$(LIBPATH)! \ -e s!@includedir@!$(INCPATH)! \ - -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc + -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc libpng-config: ( cat scripts/libpng-config-head.in; \ @@ -108,7 +108,7 @@ libpng-config: echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \ echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \ - echo libs=\"-lpng15 -lz -lm\"; \ + echo libs=\"-lpng16 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index c2f10ef5d..c7fee0646 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -13,9 +13,9 @@ LOCALBASE?=/usr/local LIBDIR= ${LOCALBASE}/lib MANDIR= ${LOCALBASE}/man -INCSDIR=${LOCALBASE}/include/libpng15 +INCSDIR=${LOCALBASE}/include/libpng16 -LIB= png15 +LIB= png16 SHLIB_MAJOR= 0 SHLIB_MINOR= 1.6.0alpha01 SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index cc9aa3851..c07f95c83 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -8,7 +8,7 @@ # For conditions of distribution and use, see the disclaimer # and license in png.h -# You should also run makefile.ne15bsd +# You should also run makefile.ne16bsd LOCALBASE?=/usr/local LIBDIR= ${LOCALBASE}/lib @@ -16,7 +16,7 @@ MANDIR= ${LOCALBASE}/man INCSDIR=${LOCALBASE}/include LIB= png -SHLIB_MAJOR= 15 +SHLIB_MAJOR= 16 SHLIB_MINOR= 1.6.0alpha01 SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index ac70940c3..5e6d25186 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -10,7 +10,7 @@ PREFIX?= /usr/local LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat -SHLIB_MAJOR= 15 +SHLIB_MAJOR= 16 SHLIB_MINOR= 1.6.0alpha01 LIB= png diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 0aad789a9..3c2b6d26a 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -10,8 +10,8 @@ # and license in png.h # Library name: -LIBNAME = libpng15 -PNGMAJ = 15 +LIBNAME = libpng16 +PNGMAJ = 16 # Shared library names: LIBSO=$(LIBNAME).so @@ -38,7 +38,7 @@ ZLIBLIB=../zlib ZLIBINC=../zlib CFLAGS= -dy -belf -I$(ZLIBINC) -O3 -LDFLAGS=-L. -L$(ZLIBLIB) -lpng15 -lz -lm +LDFLAGS=-L. -L$(ZLIBLIB) -lpng16 -lz -lm INCPATH=$(prefix)/include LIBPATH=$(exec_prefix)/lib @@ -86,7 +86,7 @@ libpng.pc: -e s!@exec_prefix@!$(exec_prefix)! \ -e s!@libdir@!$(LIBPATH)! \ -e s!@includedir@!$(INCPATH)! \ - -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc + -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc libpng-config: ( cat scripts/libpng-config-head.in; \ @@ -94,7 +94,7 @@ libpng-config: echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo ccopts=\"-belf\"; \ echo L_opts=\"-L$(LIBPATH)\"; \ - echo libs=\"-lpng15 -lz -lm\"; \ + echo libs=\"-lpng16 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 1611638ba..009d2066d 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -1,4 +1,4 @@ -# makefile for libpng.a and libpng15.so, SGI IRIX with 'cc' +# makefile for libpng.a and libpng16.so, SGI IRIX with 'cc' # Copyright (C) 2001-2002, 2006, 2010-2011 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # @@ -7,8 +7,8 @@ # and license in png.h # Library name: -LIBNAME=libpng15 -PNGMAJ = 15 +LIBNAME=libpng16 +PNGMAJ = 16 # Shared library names: LIBSO=$(LIBNAME).so @@ -24,7 +24,7 @@ LN_SF=ln -sf RANLIB=echo RM_F=/bin/rm -f -# Where make install puts libpng.a, libpng15.so, and libpng15/png.h +# Where make install puts libpng.a, libpng16.so, and libpng16/png.h # Prefix must be a full pathname. prefix=/usr/local @@ -91,7 +91,7 @@ libpng.pc: -e s!@exec_prefix@!$(exec_prefix)! \ -e s!@libdir@!$(LIBPATH)! \ -e s!@includedir@!$(INCPATH)! \ - -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc + -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc libpng-config: ( cat scripts/libpng-config-head.in; \ @@ -102,7 +102,7 @@ libpng-config: echo ldopts=\"$(ABI)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \ echo libdir=\"$(LIBPATH)\"; \ - echo libs=\"-lpng15 -lz -lm\"; \ + echo libs=\"-lpng16 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 83db59f81..2fbd056ec 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -1,4 +1,4 @@ -# makefile for libpng.a and libpng15.so, SGI IRIX with 'cc' +# makefile for libpng.a and libpng16.so, SGI IRIX with 'cc' # Copyright (C) 2001-2002, 2006, 2007, 2010-2011 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # @@ -7,8 +7,8 @@ # and license in png.h # Library name: -LIBNAME=libpng15 -PNGMAJ = 15 +LIBNAME=libpng16 +PNGMAJ = 16 # Shared library names: LIBSO=$(LIBNAME).so @@ -24,7 +24,7 @@ LN_SF=ln -sf RANLIB=echo RM_F=/bin/rm -f -# Where make install puts libpng.a, libpng15.so, and libpng15/png.h +# Where make install puts libpng.a, libpng16.so, and libpng16/png.h # Prefix must be a full pathname. prefix=/usr/local @@ -46,7 +46,7 @@ WARNMORE=-fullwarn # Note: -KPIC is the default anyhow #CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC # -g -DPNG_DEBUG=5 CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng15 -lz -lm +LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng16 -lz -lm LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \ -set_version sgi$(PNGMAJ).0 @@ -92,7 +92,7 @@ libpng.pc: -e s!@exec_prefix@!$(exec_prefix)! \ -e s!@libdir@!$(LIBPATH)! \ -e s!@includedir@!$(INCPATH)! \ - -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc + -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc libpng-config: ( cat scripts/libpng-config-head.in; \ @@ -102,7 +102,7 @@ libpng-config: echo ldopts=\"$(ABI)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \ echo libdir=\"$(LIBPATH)\"; \ - echo libs=\"-lpng15 -lz -lm\"; \ + echo libs=\"-lpng16 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 615c2e345..f584cbad8 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -10,8 +10,8 @@ # and license in png.h # Library name: -PNGMAJ = 15 -LIBNAME = libpng15 +PNGMAJ = 16 +LIBNAME = libpng16 # Shared library names: LIBSO=$(LIBNAME).so @@ -48,7 +48,7 @@ ZLIBINC=/usr/include -Wstrict-prototypes -Wmissing-prototypes #-Wconversion #CFLAGS=-I$(ZLIBINC) -W -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5 -DPNG_NO_MMX_CODE CFLAGS=-I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE -LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng15 -lz -lm +LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng16 -lz -lm INCPATH=$(prefix)/include LIBPATH=$(exec_prefix)/lib @@ -96,7 +96,7 @@ libpng.pc: -e s!@exec_prefix@!$(exec_prefix)! \ -e s!@libdir@!$(LIBPATH)! \ -e s!@includedir@!$(INCPATH)! \ - -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc + -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc libpng-config: ( cat scripts/libpng-config-head.in; \ @@ -104,7 +104,7 @@ libpng-config: echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \ echo R_opts=\"-R$(LIBPATH)\"; \ - echo libs=\"-lpng15 -lz -lm\"; \ + echo libs=\"-lpng16 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 24bd61033..bca46153f 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -9,8 +9,8 @@ # and license in png.h # Library name: -LIBNAME = libpng15 -PNGMAJ = 15 +LIBNAME = libpng16 +PNGMAJ = 16 # Shared library names: LIBSO=$(LIBNAME).so @@ -26,7 +26,7 @@ LN_SF=ln -f -s RANLIB=echo RM_F=/bin/rm -f -# Where make install puts libpng.a, libpng15.so*, and png.h +# Where make install puts libpng.a, libpng16.so*, and png.h prefix=/usr/local exec_prefix=$(prefix) @@ -44,7 +44,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion CFLAGS=-I$(ZLIBINC) -W -Wall -O \ # $(WARNMORE) -g -DPNG_DEBUG=5 -LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng15 -lz -lm +LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng16 -lz -lm INCPATH=$(prefix)/include LIBPATH=$(exec_prefix)/lib @@ -92,7 +92,7 @@ libpng.pc: -e s!@exec_prefix@!$(exec_prefix)! \ -e s!@libdir@!$(LIBPATH)! \ -e s!@includedir@!$(INCPATH)! \ - -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc + -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc libpng-config: ( cat scripts/libpng-config-head.in; \ @@ -101,7 +101,7 @@ libpng-config: echo cppflags=\"\"; \ echo L_opts=\"-L$(LIBPATH)\"; \ echo R_opts=\"-R$(LIBPATH)\"; \ - echo libs=\"-lpng15 -lz -lm\"; \ + echo libs=\"-lpng16 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 76467622a..e7db43008 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -9,8 +9,8 @@ # and license in png.h # Library name: -LIBNAME = libpng15 -PNGMAJ = 15 +LIBNAME = libpng16 +PNGMAJ = 16 # Shared library names: LIBSO=$(LIBNAME).so @@ -26,7 +26,7 @@ LN_SF=ln -f -s RANLIB=echo RM_F=/bin/rm -f -# Where make install puts libpng.a, libpng15.so*, and png.h +# Where make install puts libpng.a, libpng16.so*, and png.h prefix=/usr/local exec_prefix=$(prefix) @@ -44,7 +44,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion CFLAGS=-I$(ZLIBINC) -W -Wall -O \ # $(WARNMORE) -g -DPNG_DEBUG=5 -LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng15 -lz -lm +LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng16 -lz -lm INCPATH=$(prefix)/include LIBPATH=$(exec_prefix)/lib @@ -92,7 +92,7 @@ libpng.pc: -e s!@exec_prefix@!$(exec_prefix)! \ -e s!@libdir@!$(LIBPATH)! \ -e s!@includedir@!$(INCPATH)! \ - -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc + -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc libpng-config: ( cat scripts/libpng-config-head.in; \ @@ -101,7 +101,7 @@ libpng-config: echo cppflags=\""; \ echo L_opts=\"-L$(LIBPATH)\"; \ echo R_opts=\"-R$(LIBPATH)\"; \ - echo libs=\"-lpng15 -lz -lm\"; \ + echo libs=\"-lpng16 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt index 6f83123ae..6394808ce 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -3,7 +3,7 @@ /* pnglibconf.h - library build configuration */ -/* Libpng 1.6.0alpha01 - November 23, 2011 */ +/* Libpng 1.6.0alpha01 - November 24, 2011 */ /* Copyright (c) 1998-2011 Glenn Randers-Pehrson */ |