Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[libpng15] Imported from libpng-1.5.7beta03.tar

  • Loading branch information...
commit e0bcbfd0fd4e5b3a36f9737d3d72adba1bd2043f 1 parent 17878c6
Glenn Randers-Pehrson authored
View
4 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.7beta03, November 16, 2011, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.7beta03, November 17, 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 16, 2011
+November 17, 2011
View
11 Makefile.am
@@ -12,16 +12,19 @@ PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
AUTOMAKE_OPTIONS = foreign
# test programs - run on make check, make distcheck
-check_PROGRAMS= pngtest pngvalid pngstest
+check_PROGRAMS= pngtest pngvalid
pngtest_SOURCES = pngtest.c
pngtest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
pngvalid_SOURCES = pngvalid.c
pngvalid_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
+TESTS = test-pngtest.sh test-pngvalid-simple.sh test-pngvalid-full.sh
+TESTS_ENVIRONMENT= srcdir=$(srcdir)
+
+# Do the following only if the contrib directory is present.
+check_PROGRAMS+= pngstest
pngstest_SOURCES = contrib/libtests/pngstest.c
pngstest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
-TESTS = test-pngtest.sh test-pngvalid-simple.sh test-pngvalid-full.sh \
- test-pngstest.sh
-TESTS_ENVIRONMENT= srcdir=$(srcdir)
+TESTS += test-pngstest.sh
# man pages
dist_man_MANS= libpng.3 libpngpf.3 png.5
View
2  README
@@ -1,4 +1,4 @@
-README for libpng version 1.5.7beta03 - November 16, 2011 (shared library 15.0)
+README for libpng version 1.5.7beta03 - November 17, 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.
View
3  arm/filter_neon.S
@@ -1,7 +1,8 @@
/* filter_neon.S - NEON optimised filter functions
*
- * Copyright (c) 2011 Mans Rullgard
+ * Copyright (c) 2011 Glenn Randers-Pehrson
+ * Written by Mans Rullgard, 2011.
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
View
11 contrib/libtests/pngstest.c
@@ -18,6 +18,13 @@
#include "../sRGBtables/sRGB.h"
+/* The following is to support direct compilation of this file as C++ */
+#ifdef __cplusplus
+# define voidcast(type, value) static_cast<type>(value)
+#else
+# define voidcast(type, value) (value)
+#endif /* __cplusplus */
+
/* Math support - neither Cygwin nor Visual Studio have C99 support and we need
* a predictable rounding function, so make one here:
*/
@@ -261,7 +268,7 @@ allocbuffer(Image *image)
if (size+32 > image->bufsize)
{
freebuffer(image);
- image->buffer = malloc(size+32);
+ image->buffer = voidcast(png_bytep, malloc(size+32));
if (image->buffer == NULL)
{
fprintf(stderr,
@@ -1336,7 +1343,7 @@ read_one_file(Image *image, png_uint_32 format)
if (cb >= 0 && (unsigned long int)cb < (size_t)~(size_t)0)
{
- png_bytep b = malloc((size_t)cb);
+ png_bytep b = voidcast(png_bytep, malloc((size_t)cb));
if (b != NULL)
{
View
6 libpng-manual.txt
@@ -1,6 +1,6 @@
libpng-manual.txt - A description on how to use and modify libpng
- libpng version 1.5.7beta03 - November 16, 2011
+ libpng version 1.5.7beta03 - November 17, 2011
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on:
- libpng versions 0.97, January 1998, through 1.5.7beta03 - November 16, 2011
+ libpng versions 0.97, January 1998, through 1.5.7beta03 - November 17, 2011
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -4566,7 +4566,7 @@ Other rules can be inferred by inspecting the libpng source.
XIV. Y2K Compliance in libpng
-November 16, 2011
+November 17, 2011
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
View
14 libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "November 16, 2011"
+.TH LIBPNG 3 "November 17, 2011"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.7beta03
.SH SYNOPSIS
@@ -1037,7 +1037,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.7beta03 - November 16, 2011
+ libpng version 1.5.7beta03 - November 17, 2011
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -1048,7 +1048,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on:
- libpng versions 0.97, January 1998, through 1.5.7beta03 - November 16, 2011
+ libpng versions 0.97, January 1998, through 1.5.7beta03 - November 17, 2011
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -5604,7 +5604,7 @@ Other rules can be inferred by inspecting the libpng source.
.SH XIV. Y2K Compliance in libpng
-November 16, 2011
+November 17, 2011
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
@@ -5869,7 +5869,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.5.7beta03 - November 16, 2011:
+Libpng version 1.5.7beta03 - November 17, 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).
@@ -5892,7 +5892,7 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.5.7beta03, November 16, 2011, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.7beta03, November 17, 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
@@ -5991,7 +5991,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-November 16, 2011
+November 17, 2011
.\" end of man page
View
2  libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "November 16, 2011"
+.TH LIBPNGPF 3 "November 17, 2011"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.7beta03
(private functions)
View
2  png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "November 16, 2011"
+.TH PNG 5 "November 17, 2011"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
View
10 png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.5.7beta03 - November 16, 2011
+ * libpng version 1.5.7beta03 - November 17, 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.7beta03 - November 16, 2011: Glenn
+ * libpng versions 0.97, January 1998, through 1.5.7beta03 - November 17, 2011: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -195,7 +195,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.5.7beta03, November 16, 2011, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.5.7beta03, November 17, 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:
@@ -307,7 +307,7 @@
* Y2K compliance in libpng:
* =========================
*
- * November 16, 2011
+ * November 17, 2011
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -373,7 +373,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.5.7beta03"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.5.7beta03 - November 16, 2011\n"
+ " libpng version 1.5.7beta03 - November 17, 2011\n"
#define PNG_LIBPNG_VER_SONUM 15
#define PNG_LIBPNG_VER_DLLNUM 15
View
2  pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.5.7beta03 - November 16, 2011
+ * libpng version 1.5.7beta03 - November 17, 2011
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
View
2  projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.5.7beta03 - November 16, 2011
+libpng version 1.5.7beta03 - November 17, 2011
Copyright (c) 1998-2010 Glenn Randers-Pehrson
View
2  projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
- * libpng version 1.5.7beta03 - November 16, 2011
+ * libpng version 1.5.7beta03 - November 17, 2011
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
View
2  scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.5.7beta03 - November 16, 2011
+Makefiles for libpng version 1.5.7beta03 - November 17, 2011
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
View
2  scripts/pnglibconf.h.prebuilt
@@ -3,7 +3,7 @@
/* pnglibconf.h - library build configuration */
-/* Libpng 1.5.7beta03 - November 16, 2011 */
+/* Libpng 1.5.7beta03 - November 17, 2011 */
/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */
View
2  test-pngvalid-full.sh
@@ -18,6 +18,4 @@ do
fi
done
-echo
-
exit $err
Please sign in to comment.
Something went wrong with that request. Please try again.