From af855e415d541ac2bc3a6730fc0019a13fc37274 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 7 May 2011 10:52:49 -0500 Subject: [PATCH] [devel] Remove some trailing blanks. --- ANNOUNCE | 4 +- CHANGES | 2 +- LICENSE | 4 +- README | 2 +- contrib/gregbook/Makefile.w32 | 2 +- contrib/gregbook/README | 2 +- contrib/gregbook/makevms.com | 4 +- contrib/gregbook/rpng-x.c | 4 +- contrib/pngminim/decoder/README | 2 +- contrib/pngminim/encoder/README | 2 +- contrib/pngminim/preader/README | 6 +- contrib/pngminus/png2pnm.c | 2 +- contrib/pngsuite/README | 8 +-- contrib/visupng/PngFile.c | 114 ++++++++++++++++---------------- contrib/visupng/README.txt | 4 +- contrib/visupng/VisualPng.c | 40 +++++------ contrib/visupng/resource.h | 2 +- libpng-manual.txt | 6 +- libpng.3 | 14 ++-- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 6 +- png.h | 16 +++-- pngconf.h | 2 +- pngpriv.h | 2 +- pngwrite.c | 6 ++ projects/visualc71/PRJ0041.mak | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/options.awk | 4 +- scripts/pnglibconf.dfa | 10 +-- scripts/pnglibconf.h.prebuilt | 2 +- scripts/pnglibconf.mak | 2 +- 34 files changed, 149 insertions(+), 137 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 279d712a6..6d7110bcb 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.3beta06 - May 6, 2011 +Libpng 1.5.3beta06 - May 7, 2011 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. @@ -97,7 +97,7 @@ Version 1.5.3beta05 [May 6, 2011] the code more robust. Also deflateEnd checking is added - previously libpng would ignore an error at the end of the stream. -Version 1.5.3beta06 [May 6, 2011] +Version 1.5.3beta06 [May 7, 2011] Removed the -D_ALL_SOURCE from definitions for AIX in CMakeLists.txt Send comments/corrections/commendations to png-mng-implement at lists.sf.net: diff --git a/CHANGES b/CHANGES index 0c5146bba..5cb562605 100644 --- a/CHANGES +++ b/CHANGES @@ -3356,7 +3356,7 @@ Version 1.5.3beta05 [May 6, 2011] the code more robust. Also deflateEnd checking is added - previously libpng would ignore an error at the end of the stream. -Version 1.5.3beta06 [May 6, 2011] +Version 1.5.3beta06 [May 7, 2011] Removed the -D_ALL_SOURCE from definitions for AIX in CMakeLists.txt Send comments/corrections/commendations to png-mng-implement at lists.sf.net diff --git a/LICENSE b/LICENSE index 45bf8ff68..7e12d1e95 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.5.3beta06, May 6, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.3beta06, May 7, 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 -May 6, 2011 +May 7, 2011 diff --git a/README b/README index c92b4bb5f..07607acd8 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.3beta06 - May 6, 2011 (shared library 15.0) +README for libpng version 1.5.3beta06 - May 7, 2011 (shared library 15.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.w32 b/contrib/gregbook/Makefile.w32 index 3c0808593..41cfb231a 100644 --- a/contrib/gregbook/Makefile.w32 +++ b/contrib/gregbook/Makefile.w32 @@ -18,7 +18,7 @@ # "c:\windows\command.com /e:4096" as the program command line and set the # working directory to this directory. Then double-click to open the new # DOS-prompt window with a bigger environment and retry the commands above. -# +# # This makefile assumes libpng and zlib have already been built or downloaded # and are in subdirectories at the same level as the current subdirectory # (as indicated by the PNGPATH and ZPATH macros below). Edit as appropriate. diff --git a/contrib/gregbook/README b/contrib/gregbook/README index 6f8e079f2..7b1f6a3ea 100644 --- a/contrib/gregbook/README +++ b/contrib/gregbook/README @@ -104,7 +104,7 @@ BUILD INSTRUCTIONS unpacked the source code. For MSVC, set up the necessary environment variables by invoking - + %devstudio%\vc\bin\vcvars32.bat where where %devstudio% is the installation directory for MSVC / diff --git a/contrib/gregbook/makevms.com b/contrib/gregbook/makevms.com index bd37dc0d7..f32bcaba7 100644 --- a/contrib/gregbook/makevms.com +++ b/contrib/gregbook/makevms.com @@ -20,13 +20,13 @@ $ if zpath .eqs. "" $ then $ write sys$output "zlib include not found. Exiting..." $ exit 2 -$ endif +$ endif $! $ if pngpath .eqs. "" $ then $ write sys$output "libpng include not found. Exiting..." $ exit 2 -$ endif +$ endif $! $! Look for the compiler used. $! diff --git a/contrib/gregbook/rpng-x.c b/contrib/gregbook/rpng-x.c index e821cfb3d..6d10e1b84 100644 --- a/contrib/gregbook/rpng-x.c +++ b/contrib/gregbook/rpng-x.c @@ -252,8 +252,8 @@ int main(int argc, char **argv) else { bgstr = *argv; if (strlen(bgstr) != 7 || bgstr[0] != '#') - ++error; - else + ++error; + else have_bg = TRUE; } } else { diff --git a/contrib/pngminim/decoder/README b/contrib/pngminim/decoder/README index 5618cb78a..fa979fcb7 100644 --- a/contrib/pngminim/decoder/README +++ b/contrib/pngminim/decoder/README @@ -7,4 +7,4 @@ Specify the location of the zlib source (1.2.1 or later) as ZLIBSRC on the make command line. If you prefer to use the shared libraries, go to contrib/pngminus -and build the png2pnm application there. +and build the png2pnm application there. diff --git a/contrib/pngminim/encoder/README b/contrib/pngminim/encoder/README index 04fd27f44..ff9aa4597 100644 --- a/contrib/pngminim/encoder/README +++ b/contrib/pngminim/encoder/README @@ -7,4 +7,4 @@ Specify the location of the zlib source (1.2.1 or later) as ZLIBSRC on the make command line. If you prefer to use the shared libraries, go to contrib/pngminus -and build the pnm2png application there. +and build the pnm2png application there. diff --git a/contrib/pngminim/preader/README b/contrib/pngminim/preader/README index 6bf1db05c..faa83560a 100644 --- a/contrib/pngminim/preader/README +++ b/contrib/pngminim/preader/README @@ -8,8 +8,8 @@ on the make command line. Edit makefile if required, to find your X library and include files, then - + make ZLIBSRC=directory - + If you prefer to use the shared libraries, go to contrib/gregbook -and build the rpng2-x application there. +and build the rpng2-x application there. diff --git a/contrib/pngminus/png2pnm.c b/contrib/pngminus/png2pnm.c index a95acfa95..9c2c8f848 100644 --- a/contrib/pngminus/png2pnm.c +++ b/contrib/pngminus/png2pnm.c @@ -403,7 +403,7 @@ BOOL png2pnm (FILE *png_file, FILE *pnm_file, FILE *alpha_file, BOOL raw, BOOL a if (bit_depth == 16){ dep_16 = (long) *pix_ptr++; fprintf (alpha_file, "%ld ", (dep_16 << 8) + (long) *pix_ptr++); - } + } else fprintf (alpha_file, "%ld ", (long) *pix_ptr++); } diff --git a/contrib/pngsuite/README b/contrib/pngsuite/README index 714baff2b..b2b1537db 100644 --- a/contrib/pngsuite/README +++ b/contrib/pngsuite/README @@ -6,9 +6,9 @@ pngsuite Permission to use, copy, modify, and distribute these images for any purpose and without fee is hereby granted. -The 15 "bas*.png" images are part of the much larger PngSuite test-set of -images, available for developers of PNG supporting software. The -complete set, available at http:/www.schaik.com/pngsuite/, contains +The 15 "bas*.png" images are part of the much larger PngSuite test-set of +images, available for developers of PNG supporting software. The +complete set, available at http:/www.schaik.com/pngsuite/, contains a variety of images to test interlacing, gamma settings, ancillary chunks, etc. @@ -48,7 +48,7 @@ can use them to test the proper functioning of PNG software. ftbwn3p08.png 8-bit paletted, white bKGD ftbyn3p08.png 8-bit paletted, yellow bKGD ftp0n0g08.png 8-bit grayscale, opaque - ftp0n2c08.png 8-bit truecolor, opaque + ftp0n2c08.png 8-bit truecolor, opaque ftp0n3p08.png 8-bit paletted, opaque ftp1n3p08.png 8-bit paletted, no bKGD diff --git a/contrib/visupng/PngFile.c b/contrib/visupng/PngFile.c index db0219e35..e741319e2 100644 --- a/contrib/visupng/PngFile.c +++ b/contrib/visupng/PngFile.c @@ -152,29 +152,29 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData, Try { - + // initialize the png structure - + #ifdef PNG_STDIO_SUPPORTED png_init_io(png_ptr, pfFile); #else png_set_read_fn(png_ptr, (png_voidp)pfFile, png_read_data); #endif - + png_set_sig_bytes(png_ptr, 8); - + // read all PNG info up to image data - + png_read_info(png_ptr, info_ptr); - + // get width, height, bit-depth and color-type - + png_get_IHDR(png_ptr, info_ptr, piWidth, piHeight, &iBitDepth, &iColorType, NULL, NULL, NULL); - + // expand images of all color-type and bit-depth to 3x8 bit RGB images // let the library process things like alpha, transparency, background - + if (iBitDepth == 16) png_set_strip_16(png_ptr); if (iColorType == PNG_COLOR_TYPE_PALETTE) @@ -186,7 +186,7 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData, if (iColorType == PNG_COLOR_TYPE_GRAY || iColorType == PNG_COLOR_TYPE_GRAY_ALPHA) png_set_gray_to_rgb(png_ptr); - + // set the background color to draw transparent and alpha images over. if (png_get_bKGD(png_ptr, info_ptr, &pBackground)) { @@ -199,30 +199,30 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData, { pBkgColor = NULL; } - + // if required set gamma conversion if (png_get_gAMA(png_ptr, info_ptr, &dGamma)) png_set_gamma(png_ptr, (double) 2.2, dGamma); - + // after the transformations have been registered update info_ptr data - + png_read_update_info(png_ptr, info_ptr); - + // get again width, height and the new bit-depth and color-type - + png_get_IHDR(png_ptr, info_ptr, piWidth, piHeight, &iBitDepth, &iColorType, NULL, NULL, NULL); - - + + // row_bytes is the width x number of channels - + ulRowBytes = png_get_rowbytes(png_ptr, info_ptr); ulChannels = png_get_channels(png_ptr, info_ptr); - + *piChannels = ulChannels; - + // now we can allocate memory to store the image - + if (pbImageData) { free (pbImageData); @@ -234,33 +234,33 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData, png_error(png_ptr, "Visual PNG: out of memory"); } *ppbImageData = pbImageData; - + // and allocate memory for an array of row-pointers - + if ((ppbRowPointers = (png_bytepp) malloc((*piHeight) * sizeof(png_bytep))) == NULL) { png_error(png_ptr, "Visual PNG: out of memory"); } - + // set the individual row-pointers to point at the correct offsets - + for (i = 0; i < (*piHeight); i++) ppbRowPointers[i] = pbImageData + i * ulRowBytes; - + // now we can go ahead and just read the whole image - + png_read_image(png_ptr, ppbRowPointers); - + // read the additional chunks in the PNG file (not really needed) - + png_read_end(png_ptr, NULL); - + // and we're done - + free (ppbRowPointers); ppbRowPointers = NULL; - + // yepp, done } @@ -269,7 +269,7 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData, png_destroy_read_struct(&png_ptr, &info_ptr, NULL); *ppbImageData = pbImageData = NULL; - + if(ppbRowPointers) free (ppbRowPointers); @@ -323,58 +323,58 @@ BOOL PngSaveImage (PTSTR pstrFileName, png_byte *pDiData, Try { // initialize the png structure - + #ifdef PNG_STDIO_SUPPORTED png_init_io(png_ptr, pfFile); #else png_set_write_fn(png_ptr, (png_voidp)pfFile, png_write_data, png_flush); #endif - + // we're going to write a very simple 3x8 bit RGB image - + png_set_IHDR(png_ptr, info_ptr, iWidth, iHeight, ciBitDepth, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - + // write the file header information - + png_write_info(png_ptr, info_ptr); - + // swap the BGR pixels in the DiData structure to RGB - + png_set_bgr(png_ptr); - + // row_bytes is the width x number of channels - + ulRowBytes = iWidth * ciChannels; - + // we can allocate memory for an array of row-pointers - + if ((ppbRowPointers = (png_bytepp) malloc(iHeight * sizeof(png_bytep))) == NULL) Throw "Visualpng: Out of memory"; - + // set the individual row-pointers to point at the correct offsets - + for (i = 0; i < iHeight; i++) ppbRowPointers[i] = pDiData + i * (((ulRowBytes + 3) >> 2) << 2); - + // write out the entire image data in one call - + png_write_image (png_ptr, ppbRowPointers); - + // write the additional chunks to the PNG file (not really needed) - + png_write_end(png_ptr, info_ptr); - + // and we're done - + free (ppbRowPointers); ppbRowPointers = NULL; - + // clean up after the write, and free any memory allocated - + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); - + // yepp, done } @@ -389,9 +389,9 @@ BOOL PngSaveImage (PTSTR pstrFileName, png_byte *pDiData, return FALSE; } - + fclose (pfFile); - + return TRUE; } diff --git a/contrib/visupng/README.txt b/contrib/visupng/README.txt index 4047119a5..72c5cba17 100644 --- a/contrib/visupng/README.txt +++ b/contrib/visupng/README.txt @@ -8,8 +8,8 @@ For conditions of distribution and use, see the disclaimer and license in png.h As a PNG .dll demo VisualPng is finished. More features would only hinder -the program's objective. However, further extensions (like support for other -graphics formats) are in development. To get these, or for pre-compiled +the program's objective. However, further extensions (like support for other +graphics formats) are in development. To get these, or for pre-compiled binaries, go to "http://www.schaik.com/png/visualpng.html". ------------------------------------------------------------------------ diff --git a/contrib/visupng/VisualPng.c b/contrib/visupng/VisualPng.c index 2018999a0..cb8ad7f3a 100644 --- a/contrib/visupng/VisualPng.c +++ b/contrib/visupng/VisualPng.c @@ -302,23 +302,23 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam, { if (strcmp (szImgPathName, "") == 0) return 0; - + // load the image from file - + if (!LoadImageFile (hwnd, szImgPathName, &pbImage, &cxImgSize, &cyImgSize, &cImgChannels, &bkgColor)) return 0; - + // invalidate the client area for later update - + InvalidateRect (hwnd, NULL, TRUE); - + // display the PNG into the DIBitmap - + DisplayImage (hwnd, &pDib, &pDiData, cxWinSize, cyWinSize, pbImage, cxImgSize, cyImgSize, cImgChannels, bStretched); } - + return 0; case IDM_FILE_PREVIOUS: @@ -328,22 +328,22 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam, if (SearchPngList (pPngFileList, iPngFileCount, &iPngFileIndex, szImgPathName, NULL)) { - + if (strcmp (szImgPathName, "") == 0) return 0; - + // load the image from file - + if (!LoadImageFile (hwnd, szImgPathName, &pbImage, &cxImgSize, &cyImgSize, &cImgChannels, &bkgColor)) return 0; - + // invalidate the client area for later update - + InvalidateRect (hwnd, NULL, TRUE); - + // display the PNG into the DIBitmap - + DisplayImage (hwnd, &pDib, &pDiData, cxWinSize, cyWinSize, pbImage, cxImgSize, cyImgSize, cImgChannels, bStretched); } @@ -619,29 +619,29 @@ BOOL SearchPngList ( if (FileCount > 0) { // get previous entry - + if (pstrPrevName != NULL) { if (*pFileIndex > 0) *pFileIndex -= 1; else *pFileIndex = FileCount - 1; - + strcpy (pstrPrevName, pFileList + (*pFileIndex * MAX_PATH)); } - + // get next entry - + if (pstrNextName != NULL) { if (*pFileIndex < FileCount - 1) *pFileIndex += 1; else *pFileIndex = 0; - + strcpy (pstrNextName, pFileList + (*pFileIndex * MAX_PATH)); } - + return TRUE; } else diff --git a/contrib/visupng/resource.h b/contrib/visupng/resource.h index 611dd035f..b62176d1d 100644 --- a/contrib/visupng/resource.h +++ b/contrib/visupng/resource.h @@ -12,7 +12,7 @@ #define IDM_HELP_ABOUT 40008 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 113 diff --git a/libpng-manual.txt b/libpng-manual.txt index eea7ec819..23ef707a3 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.5.3beta06 - May 6, 2011 + libpng version 1.5.3beta06 - May 7, 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.5.3beta06 - May 6, 2011 + libpng versions 0.97, January 1998, through 1.5.3beta06 - May 7, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -4193,7 +4193,7 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -May 6, 2011 +May 7, 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 87812d011..55f423597 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "May 6, 2011" +.TH LIBPNG 3 "May 7, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.3beta06 .SH SYNOPSIS @@ -943,7 +943,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.5.3beta06 - May 6, 2011 + libpng version 1.5.3beta06 - May 7, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -954,7 +954,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.3beta06 - May 6, 2011 + libpng versions 0.97, January 1998, through 1.5.3beta06 - May 7, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5136,7 +5136,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -May 6, 2011 +May 7, 2011 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5388,7 +5388,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.3beta06 - May 6, 2011: +Libpng version 1.5.3beta06 - May 7, 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). @@ -5411,7 +5411,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.3beta06, May 6, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.3beta06, May 7, 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 @@ -5510,7 +5510,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 6, 2011 +May 7, 2011 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 1a08fc3c2..2a91850da 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "May 6, 2011" +.TH LIBPNGPF 3 "May 7, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.3beta06 (private functions) diff --git a/png.5 b/png.5 index 3448a6667..f2f4a24fa 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "May 6, 2011" +.TH PNG 5 "May 7, 2011" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 3ae570c0b..47ec42eec 100644 --- a/png.c +++ b/png.c @@ -585,7 +585,7 @@ png_convert_to_rfc1123(png_structp png_ptr, png_const_timep ptime) # define APPEND(ch)\ if (pos < (sizeof png_ptr->time_buffer)-1)\ png_ptr->time_buffer[pos++] = (ch) - + APPEND_NUMBER(PNG_NUMBER_FORMAT_u, ptime->day % 32); APPEND(' '); APPEND_STRING(short_months[(ptime->month - 1) % 12]); @@ -619,13 +619,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.3beta06 - May 6, 2011" PNG_STRING_NEWLINE \ + "libpng version 1.5.3beta06 - May 7, 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.5.3beta06 - May 6, 2011\ + return "libpng version 1.5.3beta06 - May 7, 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 8f68032b5..312956de0 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.3beta06 - May 6, 2011 + * libpng version 1.5.3beta06 - May 7, 2011 * Copyright (c) 1998-2011 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.5.3beta06 - May 6, 2011: Glenn + * libpng versions 0.97, January 1998, through 1.5.3beta06 - May 7, 2011: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -182,7 +182,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.3beta06, May 6, 2011, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.3beta06, May 7, 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: @@ -294,7 +294,7 @@ * Y2K compliance in libpng: * ========================= * - * May 6, 2011 + * May 7, 2011 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -357,7 +357,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.5.3beta06" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.3beta06 - May 6, 2011\n" + " libpng version 1.5.3beta06 - May 7, 2011\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -1411,6 +1411,9 @@ PNG_EXPORT(70, void, png_set_compression_mem_level, (png_structp png_ptr, PNG_EXPORT(71, void, png_set_compression_strategy, (png_structp png_ptr, int strategy)); +/* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a + * smaller value of window_bits if it can do so safely. + */ PNG_EXPORT(72, void, png_set_compression_window_bits, (png_structp png_ptr, int window_bits)); @@ -1429,6 +1432,9 @@ PNG_EXPORT(223, void, png_set_text_compression_mem_level, (png_structp png_ptr, PNG_EXPORT(224, void, png_set_text_compression_strategy, (png_structp png_ptr, int strategy)); +/* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a + * smaller value of window_bits if it can do so safely. + */ PNG_EXPORT(225, void, png_set_text_compression_window_bits, (png_structp png_ptr, int window_bits)); diff --git a/pngconf.h b/pngconf.h index f761e6009..1e4fe2ec0 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.3beta06 - May 6, 2011 + * libpng version 1.5.3beta06 - May 7, 2011 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpriv.h b/pngpriv.h index abf3a2edc..9c3a369b7 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -128,7 +128,7 @@ typedef PNG_CONST png_uint_16p FAR * png_const_uint_16pp; # define png_warning_parameter_unsigned(p,number,format,value) ((void)0) # define png_warning_parameter_signed(p,number,format,value) ((void)0) # define png_formatted_warning(pp,p,message) ((void)(pp)) -# define PNG_WARNING_PARAMETERS(p) +# define PNG_WARNING_PARAMETERS(p) #endif #ifndef PNG_ERROR_TEXT_SUPPORTED # define png_error(s1,s2) png_err(s1) diff --git a/pngwrite.c b/pngwrite.c index 1a9ecb76f..3e854cb1f 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1410,6 +1410,9 @@ png_set_compression_strategy(png_structp png_ptr, int strategy) png_ptr->zlib_strategy = strategy; } +/* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a + * smaller value of window_bits if it can do so safely. + */ void PNGAPI png_set_compression_window_bits(png_structp png_ptr, int window_bits) { @@ -1488,6 +1491,9 @@ png_set_text_compression_strategy(png_structp png_ptr, int strategy) png_ptr->zlib_text_strategy = strategy; } +/* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a + * smaller value of window_bits if it can do so safely. + */ void PNGAPI png_set_text_compression_window_bits(png_structp png_ptr, int window_bits) { diff --git a/projects/visualc71/PRJ0041.mak b/projects/visualc71/PRJ0041.mak index e15e12b55..c7a68b503 100644 --- a/projects/visualc71/PRJ0041.mak +++ b/projects/visualc71/PRJ0041.mak @@ -9,7 +9,7 @@ all: $(IntDir)\alloc.h \ $(IntDir)\strings.h \ $(IntDir)\unistd.h \ $(IntDir)\unixio.h - + $(IntDir)\alloc.h \ $(IntDir)\fp.h \ $(IntDir)\m68881.h \ diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 28617393f..4c632127b 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.3beta06 - May 6, 2011 +libpng version 1.5.3beta06 - May 7, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 3124398f9..0e8da31ed 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@