From 7455cbf47e046e3d5ab0a6bd78b0b746c6cfd77b Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 24 Nov 2011 14:40:36 -0600 Subject: [PATCH] [libpng16] Update internal version numbering and SO-numbers --- ANNOUNCE | 2 +- CHANGES | 2 +- CMakeLists.txt | 8 +- LICENSE | 4 +- README | 2 +- contrib/gregbook/Makefile.sgi | 6 +- contrib/gregbook/Makefile.unx | 8 +- contrib/pngminus/makefile.std | 6 +- example.c | 162 ++++++++++++++++++++- libpng-manual.txt | 6 +- libpng.3 | 14 +- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 +- png.h | 4 +- pngconf.h | 2 +- pngread.c | 2 +- projects/visualc71/libpng.vcproj | 6 +- projects/visualc71/pngtest.vcproj | 2 +- projects/vstudio/libpng/libpng.vcxproj | 12 +- projects/vstudio/pngtest/pngtest.vcxproj | 8 +- projects/vstudio/pngvalid/pngvalid.vcxproj | 8 +- projects/vstudio/readme.txt | 4 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 12 +- scripts/libpng.pc.in | 4 +- scripts/makefile.32sunu | 10 +- scripts/makefile.64sunu | 12 +- scripts/makefile.aix | 6 +- scripts/makefile.beos | 12 +- scripts/makefile.cegcc | 6 +- scripts/makefile.darwin | 14 +- scripts/makefile.dec | 8 +- scripts/makefile.elf | 24 +-- scripts/makefile.freebsd | 2 +- scripts/makefile.hp64 | 10 +- scripts/makefile.hpgcc | 12 +- scripts/makefile.hpux | 10 +- scripts/makefile.linux | 16 +- scripts/makefile.ne12bsd | 4 +- scripts/makefile.netbsd | 4 +- scripts/makefile.openbsd | 2 +- scripts/makefile.sco | 10 +- scripts/makefile.sggcc | 12 +- scripts/makefile.sgi | 14 +- scripts/makefile.so9 | 10 +- scripts/makefile.solaris | 12 +- scripts/makefile.solaris-x86 | 12 +- scripts/pnglibconf.h.prebuilt | 2 +- 49 files changed, 336 insertions(+), 182 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 8df916f8d..87a50f284 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -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 diff --git a/CHANGES b/CHANGES index 2125aa07d..9ee9c54d0 100644 --- a/CHANGES +++ b/CHANGES @@ -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) diff --git a/LICENSE b/LICENSE index e54e5d2ae..cd6d349a1 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.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 diff --git a/README b/README index 94c20caf3..169ec985a 100644 --- a/README +++ b/README @@ -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 diff --git a/example.c b/example.c index 105078b9e..6343f21af 100644 --- a/example.c +++ b/example.c @@ -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 +#include +#include +#include +#include -#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); + } + + 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 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) 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 /* 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 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. diff --git a/libpng.3 b/libpng.3 index 27a176b9a..5cb6aca58 100644 --- a/libpng.3 +++ b/libpng.3 @@ -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 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) diff --git a/png.5 b/png.5 index 3375375fd..b70ae1c32 100644 --- a/png.5 +++ b/png.5 @@ -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 diff --git a/png.c b/png.c index 4b0e78adf..59123e7bb 100644 --- a/png.c +++ b/png.c @@ -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."; diff --git a/png.h b/png.h index ced8dcbca..1f5444057 100644 --- a/png.h +++ b/png.h @@ -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 diff --git a/pngconf.h b/pngconf.h index bbf16f8de..b27ec3015 100644 --- a/pngconf.h +++ b/pngconf.h @@ -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) diff --git a/pngread.c b/pngread.c index 758383121..345154f49 100644 --- a/pngread.c +++ b/pngread.c @@ -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"/> @@ -78,7 +78,7 @@ Name="VCCustomBuildTool"/> @@ -126,7 +126,7 @@ Name="VCCustomBuildTool"/> 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"/> false - $(ProjectName)15 + $(ProjectName)16 false - $(ProjectName)15 + $(ProjectName)16 false - $(ProjectName)15 + $(ProjectName)16 false - $(ProjectName)15 + $(ProjectName)16 @@ -106,7 +106,7 @@ Windows true zlib.lib - 15 + 16 $(OutDir) @@ -163,7 +163,7 @@ true true zlib.lib - 15 + 16 $(OutDir) 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 @@ Console true - libpng15.lib + libpng16.lib $(OutDir) @@ -128,7 +128,7 @@ Console true - libpng15.lib;zlib.lib + libpng16.lib;zlib.lib $(OutDir) @@ -163,7 +163,7 @@ true true UseLinkTimeCodeGeneration - libpng15.lib + libpng16.lib $(OutDir) @@ -198,7 +198,7 @@ true true true - libpng15.lib;zlib.lib + libpng16.lib;zlib.lib UseLinkTimeCodeGeneration $(OutDir) 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 @@ Console true - libpng15.lib;zlib.lib + libpng16.lib;zlib.lib $(OutDir) @@ -128,7 +128,7 @@ Console true - libpng15.lib;zlib.lib + libpng16.lib;zlib.lib $(OutDir) @@ -162,7 +162,7 @@ true true true - libpng15.lib;zlib.lib + libpng16.lib;zlib.lib $(OutDir) UseLinkTimeCodeGeneration @@ -198,7 +198,7 @@ true true true - libpng15.lib;zlib.lib + libpng16.lib;zlib.lib $(OutDir) UseLinkTimeCodeGeneration 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 @@