Reformatted several "if () statment;"
and "else statement;" into two lines.
This commit is contained in:
parent
2d21d91abd
commit
c1dd118d2c
51
ANNOUNCE
51
ANNOUNCE
@ -1,75 +1,66 @@
|
|||||||
|
|
||||||
Libpng 1.2.37rc01 - May 27, 2009
|
Libpng 1.2.37 - May 31, 2009
|
||||||
|
|
||||||
This is not intended to be a public release. It will be replaced
|
This is a public release of libpng, intended for use in production codes.
|
||||||
within a few weeks by a public version or by another test version.
|
|
||||||
|
|
||||||
Files available for download:
|
Files available for download:
|
||||||
|
|
||||||
Source files with LF line endings (for Unix/Linux) and with a
|
Source files with LF line endings (for Unix/Linux) and with a
|
||||||
"configure" script
|
"configure" script
|
||||||
|
|
||||||
libpng-1.2.37rc01.tar.gz
|
libpng-1.2.37.tar.gz
|
||||||
libpng-1.2.37rc01.tar.lzma
|
libpng-1.2.37.tar.lzma
|
||||||
(Get the lzma codec from <http://tukaani.org/lzma>).
|
(Get the lzma codec from <http://tukaani.org/lzma>).
|
||||||
libpng-1.2.37rc01.tar.bz2
|
libpng-1.2.37.tar.bz2
|
||||||
|
|
||||||
Source files with LF line endings (for Unix/Linux) without the
|
Source files with LF line endings (for Unix/Linux) without the
|
||||||
"configure" script
|
"configure" script
|
||||||
|
|
||||||
libpng-1.2.37rc01-no-config.tar.gz
|
libpng-1.2.37-no-config.tar.gz
|
||||||
libpng-1.2.37rc01-no-config.tar.lzma
|
libpng-1.2.37-no-config.tar.lzma
|
||||||
libpng-1.2.37rc01-no-config.tar.bz2
|
libpng-1.2.37-no-config.tar.bz2
|
||||||
|
|
||||||
Source files with CRLF line endings (for Windows), without the
|
Source files with CRLF line endings (for Windows), without the
|
||||||
"configure" script
|
"configure" script
|
||||||
|
|
||||||
lp1237r01.zip
|
lpng1237.zip
|
||||||
lp1237r01.7z
|
lpng1237.7z
|
||||||
lp1237r01.tar.bz2
|
lpng1237.tar.bz2
|
||||||
|
|
||||||
Project files
|
Project files
|
||||||
|
|
||||||
libpng-1.2.37rc01-project-netware.zip
|
libpng-1.2.37-project-netware.zip
|
||||||
libpng-1.2.37rc01-project-wince.zip
|
libpng-1.2.37-project-wince.zip
|
||||||
|
|
||||||
Other information:
|
Other information:
|
||||||
|
|
||||||
libpng-1.2.37rc01-README.txt
|
libpng-1.2.37-README.txt
|
||||||
libpng-1.2.37rc01-KNOWNBUGS.txt
|
libpng-1.2.37-KNOWNBUGS.txt
|
||||||
libpng-1.2.37rc01-LICENSE.txt
|
libpng-1.2.37-LICENSE.txt
|
||||||
libpng-1.2.37rc01-Y2K-compliance.txt
|
libpng-1.2.37-Y2K-compliance.txt
|
||||||
libpng-1.2.37rc01-[previous version]-diff.txt
|
libpng-1.2.37-[previous version]-diff.txt
|
||||||
|
|
||||||
Changes since the last public release (1.2.36):
|
Changes since the last public release (1.2.36):
|
||||||
|
|
||||||
version 1.2.37beta01 [May 14, 2009]
|
version 1.2.37 [May 31, 2009]
|
||||||
|
|
||||||
Fixed inconsistency in pngrutil.c, introduced in libpng-1.2.36. The
|
Fixed inconsistency in pngrutil.c, introduced in libpng-1.2.36. The
|
||||||
memset() was using "png_ptr->rowbytes" instead of "row_bytes", which
|
memset() was using "png_ptr->rowbytes" instead of "row_bytes", which
|
||||||
the corresponding png_malloc() uses (Joe Drew).
|
the corresponding png_malloc() uses (Joe Drew).
|
||||||
Clarified usage of sig_bit versus sig_bit_p in example.c (Vincent Torri)
|
Clarified usage of sig_bit versus sig_bit_p in example.c (Vincent Torri)
|
||||||
Updated some of the makefiles in the scripts directory (merged with
|
Updated some of the makefiles in the scripts directory.
|
||||||
those in libpng-1.4.0beta57).
|
|
||||||
|
|
||||||
version 1.2.37beta02 [May 19, 2009]
|
|
||||||
Fixed typo in libpng documentation (FILTER_AVE should be FILTER_AVG)
|
Fixed typo in libpng documentation (FILTER_AVE should be FILTER_AVG)
|
||||||
Relocated misplaced #endif in pngwrite.c, sCAL chunk handler.
|
Relocated misplaced #endif in pngwrite.c, sCAL chunk handler.
|
||||||
Conditionally compile png_read_finish_row() which is not used by
|
Conditionally compile png_read_finish_row() which is not used by
|
||||||
progressive readers.
|
progressive readers.
|
||||||
Added contrib/pngminim/preader to demonstrate building minimal progressive
|
Added contrib/pngminim/preader to demonstrate building minimal progressive
|
||||||
decoder, based on contrib/gregbook with embedded libpng and zlib.
|
decoder, based on contrib/gregbook with embedded libpng and zlib.
|
||||||
|
|
||||||
version 1.2.37beta03 [May 20, 2009]
|
|
||||||
In contrib/pngminim/*, renamed "makefile.std" to "makefile", since there
|
In contrib/pngminim/*, renamed "makefile.std" to "makefile", since there
|
||||||
is only one makefile in those directories, and revised the README files
|
is only one makefile in those directories, and revised the README files
|
||||||
accordingly.
|
accordingly.
|
||||||
Reformated sources in libpng style (3-space indentation, comment format)
|
Reformated sources in libpng style (3-space indentation, comment format)
|
||||||
|
|
||||||
version 1.2.37rc01 [May 27, 2009]
|
|
||||||
No changes.
|
|
||||||
|
|
||||||
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
||||||
|
|
||||||
(subscription required; visit
|
(subscription required; visit
|
||||||
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
|
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
|
||||||
to subscribe) or to glennrp at users.sourceforge.net
|
to subscribe) or to glennrp at users.sourceforge.net
|
||||||
|
4
CHANGES
4
CHANGES
@ -2393,6 +2393,10 @@ version 1.2.37beta03 [May 20, 2009]
|
|||||||
version 1.2.37rc01 [May 27, 2009]
|
version 1.2.37rc01 [May 27, 2009]
|
||||||
No changes.
|
No changes.
|
||||||
|
|
||||||
|
version 1.2.37 [May 31, 2009]
|
||||||
|
Reformatted several remaining "else statement;" and "if () statment;" into
|
||||||
|
two lines.
|
||||||
|
|
||||||
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
||||||
(subscription required; visit
|
(subscription required; visit
|
||||||
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
|
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
|
||||||
|
23
pngget.c
23
pngget.c
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngget.c - retrieval of values from info struct
|
/* pngget.c - retrieval of values from info struct
|
||||||
*
|
*
|
||||||
* Last changed in libpng 1.2.37 [May 27, 2009]
|
* Last changed in libpng 1.2.37 [May 31, 2009]
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 1998-2009 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2009 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
@ -121,7 +121,8 @@ png_get_x_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
|
|||||||
if (info_ptr->phys_unit_type != PNG_RESOLUTION_METER)
|
if (info_ptr->phys_unit_type != PNG_RESOLUTION_METER)
|
||||||
return (0);
|
return (0);
|
||||||
|
|
||||||
else return (info_ptr->x_pixels_per_unit);
|
else
|
||||||
|
return (info_ptr->x_pixels_per_unit);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
return (0);
|
return (0);
|
||||||
@ -141,7 +142,8 @@ png_get_y_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
|
|||||||
if (info_ptr->phys_unit_type != PNG_RESOLUTION_METER)
|
if (info_ptr->phys_unit_type != PNG_RESOLUTION_METER)
|
||||||
return (0);
|
return (0);
|
||||||
|
|
||||||
else return (info_ptr->y_pixels_per_unit);
|
else
|
||||||
|
return (info_ptr->y_pixels_per_unit);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
return (0);
|
return (0);
|
||||||
@ -162,7 +164,8 @@ png_get_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
|
|||||||
info_ptr->x_pixels_per_unit != info_ptr->y_pixels_per_unit)
|
info_ptr->x_pixels_per_unit != info_ptr->y_pixels_per_unit)
|
||||||
return (0);
|
return (0);
|
||||||
|
|
||||||
else return (info_ptr->x_pixels_per_unit);
|
else
|
||||||
|
return (info_ptr->x_pixels_per_unit);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
return (0);
|
return (0);
|
||||||
@ -206,7 +209,8 @@ png_get_x_offset_microns(png_structp png_ptr, png_infop info_ptr)
|
|||||||
if (info_ptr->offset_unit_type != PNG_OFFSET_MICROMETER)
|
if (info_ptr->offset_unit_type != PNG_OFFSET_MICROMETER)
|
||||||
return (0);
|
return (0);
|
||||||
|
|
||||||
else return (info_ptr->x_offset);
|
else
|
||||||
|
return (info_ptr->x_offset);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
return (0);
|
return (0);
|
||||||
@ -227,7 +231,8 @@ png_get_y_offset_microns(png_structp png_ptr, png_infop info_ptr)
|
|||||||
if (info_ptr->offset_unit_type != PNG_OFFSET_MICROMETER)
|
if (info_ptr->offset_unit_type != PNG_OFFSET_MICROMETER)
|
||||||
return (0);
|
return (0);
|
||||||
|
|
||||||
else return (info_ptr->y_offset);
|
else
|
||||||
|
return (info_ptr->y_offset);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
return (0);
|
return (0);
|
||||||
@ -248,7 +253,8 @@ png_get_x_offset_pixels(png_structp png_ptr, png_infop info_ptr)
|
|||||||
if (info_ptr->offset_unit_type != PNG_OFFSET_PIXEL)
|
if (info_ptr->offset_unit_type != PNG_OFFSET_PIXEL)
|
||||||
return (0);
|
return (0);
|
||||||
|
|
||||||
else return (info_ptr->x_offset);
|
else
|
||||||
|
return (info_ptr->x_offset);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
return (0);
|
return (0);
|
||||||
@ -269,7 +275,8 @@ png_get_y_offset_pixels(png_structp png_ptr, png_infop info_ptr)
|
|||||||
if (info_ptr->offset_unit_type != PNG_OFFSET_PIXEL)
|
if (info_ptr->offset_unit_type != PNG_OFFSET_PIXEL)
|
||||||
return (0);
|
return (0);
|
||||||
|
|
||||||
else return (info_ptr->y_offset);
|
else
|
||||||
|
return (info_ptr->y_offset);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
return (0);
|
return (0);
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngread.c - read a PNG file
|
/* pngread.c - read a PNG file
|
||||||
*
|
*
|
||||||
* Last changed in libpng 1.2.37 [May 27, 2009]
|
* Last changed in libpng 1.2.37 [May 31, 2009]
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 1998-2009 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2009 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
@ -192,7 +192,8 @@ png_read_init_2(png_structp png_ptr, png_const_charp user_png_ver,
|
|||||||
png_size_t png_struct_size, png_size_t png_info_size)
|
png_size_t png_struct_size, png_size_t png_info_size)
|
||||||
{
|
{
|
||||||
/* We only come here via pre-1.0.12-compiled applications */
|
/* We only come here via pre-1.0.12-compiled applications */
|
||||||
if (png_ptr == NULL) return;
|
if (png_ptr == NULL)
|
||||||
|
return;
|
||||||
#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
|
#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
|
||||||
if (png_sizeof(png_struct) > png_struct_size ||
|
if (png_sizeof(png_struct) > png_struct_size ||
|
||||||
png_sizeof(png_info) > png_info_size)
|
png_sizeof(png_info) > png_info_size)
|
||||||
@ -246,7 +247,8 @@ png_read_init_3(png_structpp ptr_ptr, png_const_charp user_png_ver,
|
|||||||
|
|
||||||
png_structp png_ptr=*ptr_ptr;
|
png_structp png_ptr=*ptr_ptr;
|
||||||
|
|
||||||
if (png_ptr == NULL) return;
|
if (png_ptr == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
|
8
pngwio.c
8
pngwio.c
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngwio.c - functions for data output
|
/* pngwio.c - functions for data output
|
||||||
*
|
*
|
||||||
* Last changed in libpng 1.2.37 [May 27, 2009]
|
* Last changed in libpng 1.2.37 [May 31, 2009]
|
||||||
* For conditions of distribution and use, see copyright notice in png.h
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
* Copyright (c) 1998-2009 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2009 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
@ -47,7 +47,8 @@ png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
|
|||||||
{
|
{
|
||||||
png_uint_32 check;
|
png_uint_32 check;
|
||||||
|
|
||||||
if (png_ptr == NULL) return;
|
if (png_ptr == NULL)
|
||||||
|
return;
|
||||||
#if defined(_WIN32_WCE)
|
#if defined(_WIN32_WCE)
|
||||||
if ( !WriteFile((HANDLE)(png_ptr->io_ptr), data, length, &check, NULL) )
|
if ( !WriteFile((HANDLE)(png_ptr->io_ptr), data, length, &check, NULL) )
|
||||||
check = 0;
|
check = 0;
|
||||||
@ -73,7 +74,8 @@ png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
|
|||||||
png_byte *near_data; /* Needs to be "png_byte *" instead of "png_bytep" */
|
png_byte *near_data; /* Needs to be "png_byte *" instead of "png_bytep" */
|
||||||
png_FILE_p io_ptr;
|
png_FILE_p io_ptr;
|
||||||
|
|
||||||
if (png_ptr == NULL) return;
|
if (png_ptr == NULL)
|
||||||
|
return;
|
||||||
/* Check if data really is near. If so, use usual code. */
|
/* Check if data really is near. If so, use usual code. */
|
||||||
near_data = (png_byte *)CVT_PTR_NOCHECK(data);
|
near_data = (png_byte *)CVT_PTR_NOCHECK(data);
|
||||||
io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
|
io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
|
||||||
|
Reference in New Issue
Block a user