mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[devel] Remove some trailing blanks.

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2011-05-07 10:52:49 -05:00
parent 6ee0edf880
commit af855e415d
34 changed files with 149 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ANNOUNCE
View File

@ -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 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. 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 the code more robust. Also deflateEnd checking is added - previously
libpng would ignore an error at the end of the stream. 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 Removed the -D_ALL_SOURCE from definitions for AIX in CMakeLists.txt
Send comments/corrections/commendations to png-mng-implement at lists.sf.net: Send comments/corrections/commendations to png-mng-implement at lists.sf.net:

2
CHANGES
View File

@ -3356,7 +3356,7 @@ Version 1.5.3beta05 [May 6, 2011]
the code more robust. Also deflateEnd checking is added - previously the code more robust. Also deflateEnd checking is added - previously
libpng would ignore an error at the end of the stream. 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 Removed the -D_ALL_SOURCE from definitions for AIX in CMakeLists.txt
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net

4
LICENSE
View File

@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license. 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 Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5 distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors 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 Glenn Randers-Pehrson
glennrp at users.sourceforge.net glennrp at users.sourceforge.net
May 6, 2011 May 7, 2011

2
README
View File

@ -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 the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng. See INSTALL for instructions on how to install libpng.

2
contrib/gregbook/Makefile.w32
View File

@ -18,7 +18,7 @@
# "c:\windows\command.com /e:4096" as the program command line and set the # "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 # working directory to this directory. Then double-click to open the new
# DOS-prompt window with a bigger environment and retry the commands above. # DOS-prompt window with a bigger environment and retry the commands above.
# #
# This makefile assumes libpng and zlib have already been built or downloaded # This makefile assumes libpng and zlib have already been built or downloaded
# and are in subdirectories at the same level as the current subdirectory # and are in subdirectories at the same level as the current subdirectory
# (as indicated by the PNGPATH and ZPATH macros below). Edit as appropriate. # (as indicated by the PNGPATH and ZPATH macros below). Edit as appropriate.

2
contrib/gregbook/README
View File

@ -104,7 +104,7 @@ BUILD INSTRUCTIONS
unpacked the source code. unpacked the source code.
For MSVC, set up the necessary environment variables by invoking For MSVC, set up the necessary environment variables by invoking
%devstudio%\vc\bin\vcvars32.bat %devstudio%\vc\bin\vcvars32.bat
where where %devstudio% is the installation directory for MSVC / where where %devstudio% is the installation directory for MSVC /

4
contrib/gregbook/makevms.com
View File

@ -20,13 +20,13 @@ $ if zpath .eqs. ""
$ then $ then
$ write sys$output "zlib include not found. Exiting..." $ write sys$output "zlib include not found. Exiting..."
$ exit 2 $ exit 2
$ endif $ endif
$! $!
$ if pngpath .eqs. "" $ if pngpath .eqs. ""
$ then $ then
$ write sys$output "libpng include not found. Exiting..." $ write sys$output "libpng include not found. Exiting..."
$ exit 2 $ exit 2
$ endif $ endif
$! $!
$! Look for the compiler used. $! Look for the compiler used.
$! $!

4
contrib/gregbook/rpng-x.c
View File

@ -252,8 +252,8 @@ int main(int argc, char **argv)
else { else {
bgstr = *argv; bgstr = *argv;
if (strlen(bgstr) != 7 || bgstr[0] != '#') if (strlen(bgstr) != 7 || bgstr[0] != '#')
++error; ++error;
else else
have_bg = TRUE; have_bg = TRUE;
} }
} else { } else {

2
contrib/pngminim/decoder/README
View File

@ -7,4 +7,4 @@ Specify the location of the zlib source (1.2.1 or later) as ZLIBSRC
on the make command line. on the make command line.
If you prefer to use the shared libraries, go to contrib/pngminus If you prefer to use the shared libraries, go to contrib/pngminus
and build the png2pnm application there. and build the png2pnm application there.

2
contrib/pngminim/encoder/README
View File

@ -7,4 +7,4 @@ Specify the location of the zlib source (1.2.1 or later) as ZLIBSRC
on the make command line. on the make command line.
If you prefer to use the shared libraries, go to contrib/pngminus If you prefer to use the shared libraries, go to contrib/pngminus
and build the pnm2png application there. and build the pnm2png application there.

6
contrib/pngminim/preader/README
View File

@ -8,8 +8,8 @@ on the make command line.
Edit makefile if required, to find your X library and include files, Edit makefile if required, to find your X library and include files,
then then
make ZLIBSRC=directory make ZLIBSRC=directory
If you prefer to use the shared libraries, go to contrib/gregbook 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.

2
contrib/pngminus/png2pnm.c
View File

@ -403,7 +403,7 @@ BOOL png2pnm (FILE *png_file, FILE *pnm_file, FILE *alpha_file, BOOL raw, BOOL a
if (bit_depth == 16){ if (bit_depth == 16){
dep_16 = (long) *pix_ptr++; dep_16 = (long) *pix_ptr++;
fprintf (alpha_file, "%ld ", (dep_16 << 8) + (long) *pix_ptr++); fprintf (alpha_file, "%ld ", (dep_16 << 8) + (long) *pix_ptr++);
} }
else else
fprintf (alpha_file, "%ld ", (long) *pix_ptr++); fprintf (alpha_file, "%ld ", (long) *pix_ptr++);
} }

8
contrib/pngsuite/README
View File

@ -6,9 +6,9 @@ pngsuite
Permission to use, copy, modify, and distribute these images for any Permission to use, copy, modify, and distribute these images for any
purpose and without fee is hereby granted. purpose and without fee is hereby granted.
The 15 "bas*.png" images are part of the much larger PngSuite test-set of The 15 "bas*.png" images are part of the much larger PngSuite test-set of
images, available for developers of PNG supporting software. The images, available for developers of PNG supporting software. The
complete set, available at http:/www.schaik.com/pngsuite/, contains complete set, available at http:/www.schaik.com/pngsuite/, contains
a variety of images to test interlacing, gamma settings, ancillary a variety of images to test interlacing, gamma settings, ancillary
chunks, etc. chunks, etc.
@ -48,7 +48,7 @@ can use them to test the proper functioning of PNG software.
ftbwn3p08.png 8-bit paletted, white bKGD ftbwn3p08.png 8-bit paletted, white bKGD
ftbyn3p08.png 8-bit paletted, yellow bKGD ftbyn3p08.png 8-bit paletted, yellow bKGD
ftp0n0g08.png 8-bit grayscale, opaque ftp0n0g08.png 8-bit grayscale, opaque
ftp0n2c08.png 8-bit truecolor, opaque ftp0n2c08.png 8-bit truecolor, opaque
ftp0n3p08.png 8-bit paletted, opaque ftp0n3p08.png 8-bit paletted, opaque
ftp1n3p08.png 8-bit paletted, no bKGD ftp1n3p08.png 8-bit paletted, no bKGD

114
contrib/visupng/PngFile.c
View File

@ -152,29 +152,29 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
Try Try
{ {
// initialize the png structure // initialize the png structure
#ifdef PNG_STDIO_SUPPORTED #ifdef PNG_STDIO_SUPPORTED
png_init_io(png_ptr, pfFile); png_init_io(png_ptr, pfFile);
#else #else
png_set_read_fn(png_ptr, (png_voidp)pfFile, png_read_data); png_set_read_fn(png_ptr, (png_voidp)pfFile, png_read_data);
#endif #endif
png_set_sig_bytes(png_ptr, 8); png_set_sig_bytes(png_ptr, 8);
// read all PNG info up to image data // read all PNG info up to image data
png_read_info(png_ptr, info_ptr); png_read_info(png_ptr, info_ptr);
// get width, height, bit-depth and color-type // get width, height, bit-depth and color-type
png_get_IHDR(png_ptr, info_ptr, piWidth, piHeight, &iBitDepth, png_get_IHDR(png_ptr, info_ptr, piWidth, piHeight, &iBitDepth,
&iColorType, NULL, NULL, NULL); &iColorType, NULL, NULL, NULL);
// expand images of all color-type and bit-depth to 3x8 bit RGB images // expand images of all color-type and bit-depth to 3x8 bit RGB images
// let the library process things like alpha, transparency, background // let the library process things like alpha, transparency, background
if (iBitDepth == 16) if (iBitDepth == 16)
png_set_strip_16(png_ptr); png_set_strip_16(png_ptr);
if (iColorType == PNG_COLOR_TYPE_PALETTE) if (iColorType == PNG_COLOR_TYPE_PALETTE)
@ -186,7 +186,7 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
if (iColorType == PNG_COLOR_TYPE_GRAY || if (iColorType == PNG_COLOR_TYPE_GRAY ||
iColorType == PNG_COLOR_TYPE_GRAY_ALPHA) iColorType == PNG_COLOR_TYPE_GRAY_ALPHA)
png_set_gray_to_rgb(png_ptr); png_set_gray_to_rgb(png_ptr);
// set the background color to draw transparent and alpha images over. // set the background color to draw transparent and alpha images over.
if (png_get_bKGD(png_ptr, info_ptr, &pBackground)) if (png_get_bKGD(png_ptr, info_ptr, &pBackground))
{ {
@ -199,30 +199,30 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
{ {
pBkgColor = NULL; pBkgColor = NULL;
} }
// if required set gamma conversion // if required set gamma conversion
if (png_get_gAMA(png_ptr, info_ptr, &dGamma)) if (png_get_gAMA(png_ptr, info_ptr, &dGamma))
png_set_gamma(png_ptr, (double) 2.2, dGamma); png_set_gamma(png_ptr, (double) 2.2, dGamma);
// after the transformations have been registered update info_ptr data // after the transformations have been registered update info_ptr data
png_read_update_info(png_ptr, info_ptr); png_read_update_info(png_ptr, info_ptr);
// get again width, height and the new bit-depth and color-type // get again width, height and the new bit-depth and color-type
png_get_IHDR(png_ptr, info_ptr, piWidth, piHeight, &iBitDepth, png_get_IHDR(png_ptr, info_ptr, piWidth, piHeight, &iBitDepth,
&iColorType, NULL, NULL, NULL); &iColorType, NULL, NULL, NULL);
// row_bytes is the width x number of channels // row_bytes is the width x number of channels
ulRowBytes = png_get_rowbytes(png_ptr, info_ptr); ulRowBytes = png_get_rowbytes(png_ptr, info_ptr);
ulChannels = png_get_channels(png_ptr, info_ptr); ulChannels = png_get_channels(png_ptr, info_ptr);
*piChannels = ulChannels; *piChannels = ulChannels;
// now we can allocate memory to store the image // now we can allocate memory to store the image
if (pbImageData) if (pbImageData)
{ {
free (pbImageData); free (pbImageData);
@ -234,33 +234,33 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
png_error(png_ptr, "Visual PNG: out of memory"); png_error(png_ptr, "Visual PNG: out of memory");
} }
*ppbImageData = pbImageData; *ppbImageData = pbImageData;
// and allocate memory for an array of row-pointers // and allocate memory for an array of row-pointers
if ((ppbRowPointers = (png_bytepp) malloc((*piHeight) if ((ppbRowPointers = (png_bytepp) malloc((*piHeight)
* sizeof(png_bytep))) == NULL) * sizeof(png_bytep))) == NULL)
{ {
png_error(png_ptr, "Visual PNG: out of memory"); png_error(png_ptr, "Visual PNG: out of memory");
} }
// set the individual row-pointers to point at the correct offsets // set the individual row-pointers to point at the correct offsets
for (i = 0; i < (*piHeight); i++) for (i = 0; i < (*piHeight); i++)
ppbRowPointers[i] = pbImageData + i * ulRowBytes; ppbRowPointers[i] = pbImageData + i * ulRowBytes;
// now we can go ahead and just read the whole image // now we can go ahead and just read the whole image
png_read_image(png_ptr, ppbRowPointers); png_read_image(png_ptr, ppbRowPointers);
// read the additional chunks in the PNG file (not really needed) // read the additional chunks in the PNG file (not really needed)
png_read_end(png_ptr, NULL); png_read_end(png_ptr, NULL);
// and we're done // and we're done
free (ppbRowPointers); free (ppbRowPointers);
ppbRowPointers = NULL; ppbRowPointers = NULL;
// yepp, done // yepp, done
} }
@ -269,7 +269,7 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
png_destroy_read_struct(&png_ptr, &info_ptr, NULL); png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
*ppbImageData = pbImageData = NULL; *ppbImageData = pbImageData = NULL;
if(ppbRowPointers) if(ppbRowPointers)
free (ppbRowPointers); free (ppbRowPointers);
@ -323,58 +323,58 @@ BOOL PngSaveImage (PTSTR pstrFileName, png_byte *pDiData,
Try Try
{ {
// initialize the png structure // initialize the png structure
#ifdef PNG_STDIO_SUPPORTED #ifdef PNG_STDIO_SUPPORTED
png_init_io(png_ptr, pfFile); png_init_io(png_ptr, pfFile);
#else #else
png_set_write_fn(png_ptr, (png_voidp)pfFile, png_write_data, png_flush); png_set_write_fn(png_ptr, (png_voidp)pfFile, png_write_data, png_flush);
#endif #endif
// we're going to write a very simple 3x8 bit RGB image // we're going to write a very simple 3x8 bit RGB image
png_set_IHDR(png_ptr, info_ptr, iWidth, iHeight, ciBitDepth, png_set_IHDR(png_ptr, info_ptr, iWidth, iHeight, ciBitDepth,
PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,
PNG_FILTER_TYPE_BASE); PNG_FILTER_TYPE_BASE);
// write the file header information // write the file header information
png_write_info(png_ptr, info_ptr); png_write_info(png_ptr, info_ptr);
// swap the BGR pixels in the DiData structure to RGB // swap the BGR pixels in the DiData structure to RGB
png_set_bgr(png_ptr); png_set_bgr(png_ptr);
// row_bytes is the width x number of channels // row_bytes is the width x number of channels
ulRowBytes = iWidth * ciChannels; ulRowBytes = iWidth * ciChannels;
// we can allocate memory for an array of row-pointers // we can allocate memory for an array of row-pointers
if ((ppbRowPointers = (png_bytepp) malloc(iHeight * sizeof(png_bytep))) == NULL) if ((ppbRowPointers = (png_bytepp) malloc(iHeight * sizeof(png_bytep))) == NULL)
Throw "Visualpng: Out of memory"; Throw "Visualpng: Out of memory";
// set the individual row-pointers to point at the correct offsets // set the individual row-pointers to point at the correct offsets
for (i = 0; i < iHeight; i++) for (i = 0; i < iHeight; i++)
ppbRowPointers[i] = pDiData + i * (((ulRowBytes + 3) >> 2) << 2); ppbRowPointers[i] = pDiData + i * (((ulRowBytes + 3) >> 2) << 2);
// write out the entire image data in one call // write out the entire image data in one call
png_write_image (png_ptr, ppbRowPointers); png_write_image (png_ptr, ppbRowPointers);
// write the additional chunks to the PNG file (not really needed) // write the additional chunks to the PNG file (not really needed)
png_write_end(png_ptr, info_ptr); png_write_end(png_ptr, info_ptr);
// and we're done // and we're done
free (ppbRowPointers); free (ppbRowPointers);
ppbRowPointers = NULL; ppbRowPointers = NULL;
// clean up after the write, and free any memory allocated // clean up after the write, and free any memory allocated
png_destroy_write_struct(&png_ptr, (png_infopp) NULL); png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
// yepp, done // yepp, done
} }
@ -389,9 +389,9 @@ BOOL PngSaveImage (PTSTR pstrFileName, png_byte *pDiData,
return FALSE; return FALSE;
} }
fclose (pfFile); fclose (pfFile);
return TRUE; return TRUE;
} }

4
contrib/visupng/README.txt
View File

@ -8,8 +8,8 @@ For conditions of distribution and use, see the disclaimer
and license in png.h and license in png.h
As a PNG .dll demo VisualPng is finished. More features would only hinder As a PNG .dll demo VisualPng is finished. More features would only hinder
the program's objective. However, further extensions (like support for other the program's objective. However, further extensions (like support for other
graphics formats) are in development. To get these, or for pre-compiled graphics formats) are in development. To get these, or for pre-compiled
binaries, go to "http://www.schaik.com/png/visualpng.html". binaries, go to "http://www.schaik.com/png/visualpng.html".
------------------------------------------------------------------------ ------------------------------------------------------------------------

40
contrib/visupng/VisualPng.c
View File

@ -302,23 +302,23 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam,
{ {
if (strcmp (szImgPathName, "") == 0) if (strcmp (szImgPathName, "") == 0)
return 0; return 0;
// load the image from file // load the image from file
if (!LoadImageFile (hwnd, szImgPathName, &pbImage, if (!LoadImageFile (hwnd, szImgPathName, &pbImage,
&cxImgSize, &cyImgSize, &cImgChannels, &bkgColor)) &cxImgSize, &cyImgSize, &cImgChannels, &bkgColor))
return 0; return 0;
// invalidate the client area for later update // invalidate the client area for later update
InvalidateRect (hwnd, NULL, TRUE); InvalidateRect (hwnd, NULL, TRUE);
// display the PNG into the DIBitmap // display the PNG into the DIBitmap
DisplayImage (hwnd, &pDib, &pDiData, cxWinSize, cyWinSize, DisplayImage (hwnd, &pDib, &pDiData, cxWinSize, cyWinSize,
pbImage, cxImgSize, cyImgSize, cImgChannels, bStretched); pbImage, cxImgSize, cyImgSize, cImgChannels, bStretched);
} }
return 0; return 0;
case IDM_FILE_PREVIOUS: case IDM_FILE_PREVIOUS:
@ -328,22 +328,22 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam,
if (SearchPngList (pPngFileList, iPngFileCount, &iPngFileIndex, if (SearchPngList (pPngFileList, iPngFileCount, &iPngFileIndex,
szImgPathName, NULL)) szImgPathName, NULL))
{ {
if (strcmp (szImgPathName, "") == 0) if (strcmp (szImgPathName, "") == 0)
return 0; return 0;
// load the image from file // load the image from file
if (!LoadImageFile (hwnd, szImgPathName, &pbImage, &cxImgSize, if (!LoadImageFile (hwnd, szImgPathName, &pbImage, &cxImgSize,
&cyImgSize, &cImgChannels, &bkgColor)) &cyImgSize, &cImgChannels, &bkgColor))
return 0; return 0;
// invalidate the client area for later update // invalidate the client area for later update
InvalidateRect (hwnd, NULL, TRUE); InvalidateRect (hwnd, NULL, TRUE);
// display the PNG into the DIBitmap // display the PNG into the DIBitmap
DisplayImage (hwnd, &pDib, &pDiData, cxWinSize, cyWinSize, DisplayImage (hwnd, &pDib, &pDiData, cxWinSize, cyWinSize,
pbImage, cxImgSize, cyImgSize, cImgChannels, bStretched); pbImage, cxImgSize, cyImgSize, cImgChannels, bStretched);
} }
@ -619,29 +619,29 @@ BOOL SearchPngList (
if (FileCount > 0) if (FileCount > 0)
{ {
// get previous entry // get previous entry
if (pstrPrevName != NULL) if (pstrPrevName != NULL)
{ {
if (*pFileIndex > 0) if (*pFileIndex > 0)
*pFileIndex -= 1; *pFileIndex -= 1;
else else
*pFileIndex = FileCount - 1; *pFileIndex = FileCount - 1;
strcpy (pstrPrevName, pFileList + (*pFileIndex * MAX_PATH)); strcpy (pstrPrevName, pFileList + (*pFileIndex * MAX_PATH));
} }
// get next entry // get next entry
if (pstrNextName != NULL) if (pstrNextName != NULL)
{ {
if (*pFileIndex < FileCount - 1) if (*pFileIndex < FileCount - 1)
*pFileIndex += 1; *pFileIndex += 1;
else else
*pFileIndex = 0; *pFileIndex = 0;
strcpy (pstrNextName, pFileList + (*pFileIndex * MAX_PATH)); strcpy (pstrNextName, pFileList + (*pFileIndex * MAX_PATH));
} }
return TRUE; return TRUE;
} }
else else

2
contrib/visupng/resource.h
View File

@ -12,7 +12,7 @@
#define IDM_HELP_ABOUT 40008 #define IDM_HELP_ABOUT 40008
// Next default values for new objects // Next default values for new objects
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 113 #define _APS_NEXT_RESOURCE_VALUE 113

6
libpng-manual.txt
View File

@ -1,6 +1,6 @@
libpng-manual.txt - A description on how to use and modify libpng 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 Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net> <glennrp at users.sourceforge.net>
Copyright (c) 1998-2011 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: 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 Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2011 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 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 Since the PNG Development group is an ad-hoc body, we can't make
an official declaration. an official declaration.

14
libpng.3
View File

@ -1,4 +1,4 @@
.TH LIBPNG 3 "May 6, 2011" .TH LIBPNG 3 "May 7, 2011"
.SH NAME .SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.3beta06 libpng \- Portable Network Graphics (PNG) Reference Library 1.5.3beta06
.SH SYNOPSIS .SH SYNOPSIS
@ -943,7 +943,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
.SH LIBPNG.TXT .SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng 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 Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net> <glennrp at users.sourceforge.net>
Copyright (c) 1998-2011 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: 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 Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2011 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 .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 Since the PNG Development group is an ad-hoc body, we can't make
an official declaration. an official declaration.
@ -5388,7 +5388,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation. 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. Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). 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. 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 Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5 distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors 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 Glenn Randers-Pehrson
glennrp at users.sourceforge.net glennrp at users.sourceforge.net
May 6, 2011 May 7, 2011
.\" end of man page .\" end of man page

2
libpngpf.3
View File

@ -1,4 +1,4 @@
.TH LIBPNGPF 3 "May 6, 2011" .TH LIBPNGPF 3 "May 7, 2011"
.SH NAME .SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.3beta06 libpng \- Portable Network Graphics (PNG) Reference Library 1.5.3beta06
(private functions) (private functions)

2
png.5
View File

@ -1,4 +1,4 @@
.TH PNG 5 "May 6, 2011" .TH PNG 5 "May 7, 2011"
.SH NAME .SH NAME
png \- Portable Network Graphics (PNG) format png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION .SH DESCRIPTION

6
png.c
View File

@ -585,7 +585,7 @@ png_convert_to_rfc1123(png_structp png_ptr, png_const_timep ptime)
# define APPEND(ch)\ # define APPEND(ch)\
if (pos < (sizeof png_ptr->time_buffer)-1)\ if (pos < (sizeof png_ptr->time_buffer)-1)\
png_ptr->time_buffer[pos++] = (ch) png_ptr->time_buffer[pos++] = (ch)
APPEND_NUMBER(PNG_NUMBER_FORMAT_u, ptime->day % 32); APPEND_NUMBER(PNG_NUMBER_FORMAT_u, ptime->day % 32);
APPEND(' '); APPEND(' ');
APPEND_STRING(short_months[(ptime->month - 1) % 12]); APPEND_STRING(short_months[(ptime->month - 1) % 12]);
@ -619,13 +619,13 @@ png_get_copyright(png_const_structp png_ptr)
#else #else
# ifdef __STDC__ # ifdef __STDC__
return PNG_STRING_NEWLINE \ 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) 1998-2011 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
PNG_STRING_NEWLINE; PNG_STRING_NEWLINE;
# else # 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) 1998-2011 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";

16
png.h
View File

@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library /* 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 * Copyright (c) 1998-2011 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@ -11,7 +11,7 @@
* Authors and maintainers: * Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * 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.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. * See also "Contributing Authors", below.
* *
* Note about libpng version numbers: * Note about libpng version numbers:
@ -182,7 +182,7 @@
* *
* This code is released under the libpng license. * 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 * Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
* distributed according to the same disclaimer and license as libpng-1.2.5 * distributed according to the same disclaimer and license as libpng-1.2.5
* with the following individual added to the list of Contributing Authors: * with the following individual added to the list of Contributing Authors:
@ -294,7 +294,7 @@
* Y2K compliance in libpng: * Y2K compliance in libpng:
* ========================= * =========================
* *
* May 6, 2011 * May 7, 2011
* *
* Since the PNG Development group is an ad-hoc body, we can't make * Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration. * an official declaration.
@ -357,7 +357,7 @@
/* Version information for png.h - this should match the version in png.c */ /* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.5.3beta06" #define PNG_LIBPNG_VER_STRING "1.5.3beta06"
#define PNG_HEADER_VERSION_STRING \ #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_SONUM 15
#define PNG_LIBPNG_VER_DLLNUM 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, PNG_EXPORT(71, void, png_set_compression_strategy, (png_structp png_ptr,
int strategy)); 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, PNG_EXPORT(72, void, png_set_compression_window_bits, (png_structp png_ptr,
int window_bits)); 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, PNG_EXPORT(224, void, png_set_text_compression_strategy, (png_structp png_ptr,
int strategy)); 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_EXPORT(225, void, png_set_text_compression_window_bits, (png_structp
png_ptr, int window_bits)); png_ptr, int window_bits));

2
pngconf.h
View File

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng /* 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 * Copyright (c) 1998-2011 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

2
pngpriv.h
View File

@ -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_unsigned(p,number,format,value) ((void)0)
# define png_warning_parameter_signed(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_formatted_warning(pp,p,message) ((void)(pp))
# define PNG_WARNING_PARAMETERS(p) # define PNG_WARNING_PARAMETERS(p)
#endif #endif
#ifndef PNG_ERROR_TEXT_SUPPORTED #ifndef PNG_ERROR_TEXT_SUPPORTED
# define png_error(s1,s2) png_err(s1) # define png_error(s1,s2) png_err(s1)

6
pngwrite.c
View File

@ -1410,6 +1410,9 @@ png_set_compression_strategy(png_structp png_ptr, int strategy)
png_ptr->zlib_strategy = 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 void PNGAPI
png_set_compression_window_bits(png_structp png_ptr, int window_bits) 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; 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 void PNGAPI
png_set_text_compression_window_bits(png_structp png_ptr, int window_bits) png_set_text_compression_window_bits(png_structp png_ptr, int window_bits)
{ {

2
projects/visualc71/PRJ0041.mak
View File

@ -9,7 +9,7 @@ all: $(IntDir)\alloc.h \
$(IntDir)\strings.h \ $(IntDir)\strings.h \
$(IntDir)\unistd.h \ $(IntDir)\unistd.h \
$(IntDir)\unixio.h $(IntDir)\unixio.h
$(IntDir)\alloc.h \ $(IntDir)\alloc.h \
$(IntDir)\fp.h \ $(IntDir)\fp.h \
$(IntDir)\m68881.h \ $(IntDir)\m68881.h \

2
projects/vstudio/readme.txt
View File

@ -1,7 +1,7 @@
VisualStudio instructions 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 Copyright (c) 1998-2010 Glenn Randers-Pehrson

2
projects/vstudio/zlib.props
View File

@ -2,7 +2,7 @@
<!-- <!--
* zlib.props - location of zlib source * zlib.props - location of zlib source
* *
* libpng version 1.5.3beta06 - May 6, 2011 * libpng version 1.5.3beta06 - May 7, 2011
* *
* Copyright (c) 1998-2011 Glenn Randers-Pehrson * Copyright (c) 1998-2011 Glenn Randers-Pehrson
* *

2
scripts/README.txt
View File

@ -1,5 +1,5 @@
Makefiles for libpng version 1.5.3beta06 - May 6, 2011 Makefiles for libpng version 1.5.3beta06 - May 7, 2011
pnglibconf.h.prebuilt => Stores configuration settings pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile makefile.linux => Linux/ELF makefile

4
scripts/options.awk
View File

@ -48,7 +48,7 @@ BEGIN{
deb=0 # debug - set on command line deb=0 # debug - set on command line
everything="" # do not override defaults everything="" # do not override defaults
logunsupported=0 # write unsupported options too logunsupported=0 # write unsupported options too
# Precreate arrays # Precreate arrays
option[""] = "" # list of all options: default enabled/disabled option[""] = "" # list of all options: default enabled/disabled
done[""] = 1 # marks option as having been output done[""] = 1 # marks option as having been output
@ -301,7 +301,7 @@ pre != 0 && $1 == "chunk" && NF >= 2{
# macro is not defined. The default value will be re-tokenised. # macro is not defined. The default value will be re-tokenised.
# (BTW: this is somewhat restrictive, it mainly exists for the # (BTW: this is somewhat restrictive, it mainly exists for the
# support of non-standard configurations and numeric parameters, # support of non-standard configurations and numeric parameters,
# see the uses in scripts/options.dat # see the uses in scripts/options.dat
$1 == "setting" && (NF == 2 || NF >= 3 && ($3 == "requires" || $3 == "default")){ $1 == "setting" && (NF == 2 || NF >= 3 && ($3 == "requires" || $3 == "default")){
reqs = "" reqs = ""

10
scripts/pnglibconf.dfa
View File

@ -43,7 +43,7 @@ file pnglibconf.h scripts/pnglibconf.dfa PNGLCONF_H
# The following setting, option and chunk values can all be changed # The following setting, option and chunk values can all be changed
# while building libpng: # while building libpng:
# #
# setting: change 'setting' lines to fine tune library performance, # setting: change 'setting' lines to fine tune library performance,
# changes to the settings don't affect the libpng API functionally # changes to the settings don't affect the libpng API functionally
# #
@ -62,7 +62,7 @@ file pnglibconf.h scripts/pnglibconf.dfa PNGLCONF_H
# don't want in that file in that file. You can also turn on options # don't want in that file in that file. You can also turn on options
# using PNG_<option>_SUPPORTED. When you have finished rerun # using PNG_<option>_SUPPORTED. When you have finished rerun
# configure and rebuild pnglibconf.h file with -DPNG_USER_CONFIG: # configure and rebuild pnglibconf.h file with -DPNG_USER_CONFIG:
# #
# make clean # make clean
# CPPFLAGS='-DPNG_USER_CONFIG' ./configure # CPPFLAGS='-DPNG_USER_CONFIG' ./configure
# make pnglibconf.h # make pnglibconf.h
@ -73,7 +73,7 @@ file pnglibconf.h scripts/pnglibconf.dfa PNGLCONF_H
# #
# 2) Add definitions of the settings you want to change to # 2) Add definitions of the settings you want to change to
# CPPFLAGS; for example: # CPPFLAGS; for example:
# #
# -DPNG_DEFAULT_READ_MACROS=0 # -DPNG_DEFAULT_READ_MACROS=0
# #
# (This would change the default to *not* use read macros.) Be # (This would change the default to *not* use read macros.) Be
@ -193,11 +193,11 @@ option FLOATING_ARITHMETIC
option FLOATING_POINT enables ok_math option FLOATING_POINT enables ok_math
option FIXED_POINT enables ok_math option FIXED_POINT enables ok_math
# Added at libpng version 1.4.0 # Added at libpng version 1.4.0
option ERROR_TEXT option ERROR_TEXT
# The following is always on (defined empty) # The following is always on (defined empty)
setting CALLOC_SUPPORTED default setting CALLOC_SUPPORTED default

2
scripts/pnglibconf.h.prebuilt
View File

@ -17,7 +17,7 @@
/* pnglibconf.dfa with respect to the dependencies between the following */ /* pnglibconf.dfa with respect to the dependencies between the following */
/* symbols. It is much better to generate a new file using */ /* symbols. It is much better to generate a new file using */
/* scripts/libpngconf.mak */ /* scripts/libpngconf.mak */
#ifndef PNGLCONF_H #ifndef PNGLCONF_H
#define PNGLCONF_H #define PNGLCONF_H
/* settings */ /* settings */

2
scripts/pnglibconf.mak
View File

@ -1,6 +1,6 @@
#!/usr/bin/make -f #!/usr/bin/make -f
# pnglibconf.mak - standard make lines for pnglibconf.h # pnglibconf.mak - standard make lines for pnglibconf.h
# #
# These lines are copied from Makefile.am, they illustrate # These lines are copied from Makefile.am, they illustrate
# how to automate the build of pnglibconf.h from scripts/pnglibconf.dfa # how to automate the build of pnglibconf.h from scripts/pnglibconf.dfa
# given 'awk' and 'sed' # given 'awk' and 'sed'