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

[libpng17] Imported from libpng-1.7.0beta34.tar

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2014-03-17 10:28:56 -05:00
parent 0fb41f05df
commit b407af6503
23 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
INSTALL
View File

@ -12,10 +12,10 @@ Contents
VII. Building with makefiles VII. Building with makefiles
VIII. Configuring libpng for 16-bit platforms VIII. Configuring libpng for 16-bit platforms
IX. Configuring for DOS IX. Configuring for DOS
X. Configuring for Medium Model X. Configuring for Medium Model
XI. Prepending a prefix to exported symbols XI. Prepending a prefix to exported symbols
XII. Configuring for compiler xxx: XII. Configuring for compiler xxx:
XIII Removing unwanted object code XIII. Removing unwanted object code
XIV. Changes to the build and configuration of libpng in libpng-1.5.x XIV. Changes to the build and configuration of libpng in libpng-1.5.x
XV. Configuring libpng for multiprocessing XV. Configuring libpng for multiprocessing
XVI. Other sources of information about libpng: XVI. Other sources of information about libpng:

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.7.0beta34, February 27, 2014, are libpng versions 1.2.6, August 15, 2004, through 1.7.0beta34, March 17, 2014, are
Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are Copyright (c) 2004, 2006-2014 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
February 27, 2014 March 17, 2014

4
Makefile.am
View File

@ -145,8 +145,8 @@ config.sub configure depcomp install-sh ltmain.sh missing
PNG_COPTS = @PNG_COPTS@ PNG_COPTS = @PNG_COPTS@
AM_CFLAGS = ${PNG_COPTS} AM_CFLAGS = ${PNG_COPTS}
# DFNCPP is normally just CPP - the C preprocessor - but on Solaris and maybe # DFNCPP is normally just "CPP -E" - the C preprocessor - but on Solaris and
# other operating systems (NeXT?) the C preprocessor selected by configure # maybe other operating systems (NeXT?) the C preprocessor selected by configure
# checks input tokens for validity - effectively it performs part of the ANSI-C # checks input tokens for validity - effectively it performs part of the ANSI-C
# parsing - and therefore fails with the .df files. configure.ac has special # parsing - and therefore fails with the .df files. configure.ac has special
# checks for this and sets DFNCPP appropriately. # checks for this and sets DFNCPP appropriately.

2
README
View File

@ -1,4 +1,4 @@
README for libpng version 1.7.0beta34 - February 27, 2014 (shared library 17.0) README for libpng version 1.7.0beta34 - March 17, 2014 (shared library 17.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.

1
TODO
View File

@ -6,6 +6,7 @@ Better C++ wrapper/full C++ implementation?
Fix problem with C++ and EXTERN "C". Fix problem with C++ and EXTERN "C".
cHRM transformation. cHRM transformation.
Remove setjmp/longjmp usage in favor of returning error codes. Remove setjmp/longjmp usage in favor of returning error codes.
Palette creation.
Add "grayscale->palette" transformation and "palette->grayscale" detection. Add "grayscale->palette" transformation and "palette->grayscale" detection.
Improved dithering. Improved dithering.
Multi-lingual error and warning message support. Multi-lingual error and warning message support.

2
arm/arm_init.c
View File

@ -22,7 +22,7 @@
/* WARNING: it is strongly recommended that you do not build libpng with /* WARNING: it is strongly recommended that you do not build libpng with
* run-time checks for CPU features if at all possible. In the case of the ARM * run-time checks for CPU features if at all possible. In the case of the ARM
* NEON instructions there is no processor-specific way of detecting the * NEON instructions there is no processor-specific way of detecting the
* presense of the required support, therefore run-time detectioon is extremely * presence of the required support, therefore run-time detection is extremely
* OS specific. * OS specific.
* *
* You may set the macro PNG_ARM_NEON_FILE to the file name of file containing * You may set the macro PNG_ARM_NEON_FILE to the file name of file containing

4
configure.ac
View File

@ -79,7 +79,7 @@ fi
# This is a remnant of the old cc -E validation, where it may have been # This is a remnant of the old cc -E validation, where it may have been
# necessary to use a different preprocessor for .dfn files # necessary to use a different preprocessor for .dfn files
DFNCPP="$CPP" DFNCPP="$CPP -E"
AC_SUBST(DFNCPP) AC_SUBST(DFNCPP)
# -Werror cannot be passed to GCC in CFLAGS because configure will fail (it # -Werror cannot be passed to GCC in CFLAGS because configure will fail (it
@ -294,7 +294,7 @@ AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
if test "$have_ld_version_script" = "yes"; then if test "$have_ld_version_script" = "yes"; then
AC_MSG_CHECKING([for symbol prefix]) AC_MSG_CHECKING([for symbol prefix])
SYMBOL_PREFIX=`echo "PREFIX=__USER_LABEL_PREFIX__" \ SYMBOL_PREFIX=`echo "PREFIX=__USER_LABEL_PREFIX__" \
| ${CPP-${CC-gcc} -E} - 2>&1 \ | ${DFNCPP-${CC-gcc -E}} - 2>&1 \
| ${EGREP-grep} "^PREFIX=" \ | ${EGREP-grep} "^PREFIX=" \
| ${SED-sed} -e "s:^PREFIX=::" -e "s:__USER_LABEL_PREFIX__::"` | ${SED-sed} -e "s:^PREFIX=::" -e "s:__USER_LABEL_PREFIX__::"`
AC_SUBST(SYMBOL_PREFIX) AC_SUBST(SYMBOL_PREFIX)

2
contrib/arm-neon/android-ndk.c
View File

@ -2,7 +2,7 @@
* *
* Copyright (c) 2014 Glenn Randers-Pehrson * Copyright (c) 2014 Glenn Randers-Pehrson
* Written by John Bowler, 2014. * Written by John Bowler, 2014.
* Last changed in libpng 1.6.10 [(PENDING RELEASE)] * Last changed in libpng 1.6.10 [March 6, 2014]
* *
* This code is released under the libpng license. * This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer * For conditions of distribution and use, see the disclaimer

2
contrib/arm-neon/linux-auxv.c
View File

@ -2,7 +2,7 @@
* *
* Copyright (c) 2014 Glenn Randers-Pehrson * Copyright (c) 2014 Glenn Randers-Pehrson
* Written by Mans Rullgard, 2011. * Written by Mans Rullgard, 2011.
* Last changed in libpng 1.6.10 [(PENDING RELEASE)] * Last changed in libpng 1.6.10 [March 6, 2014]
* *
* This code is released under the libpng license. * This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer * For conditions of distribution and use, see the disclaimer

2
contrib/arm-neon/linux.c
View File

@ -2,7 +2,7 @@
* *
* Copyright (c) 2014 Glenn Randers-Pehrson * Copyright (c) 2014 Glenn Randers-Pehrson
* Written by John Bowler, 2014. * Written by John Bowler, 2014.
* Last changed in libpng 1.6.10 [(PENDING RELEASE)] * Last changed in libpng 1.6.10 [March 6, 2014]
* *
* This code is released under the libpng license. * This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer * For conditions of distribution and use, see the disclaimer

2
contrib/libtests/pngimage.c
View File

@ -2,7 +2,7 @@
* *
* Copyright (c) 2014 John Cunningham Bowler * Copyright (c) 2014 John Cunningham Bowler
* *
* Last changed in libpng 1.6.10 [(PENDING RELEASE)] * Last changed in libpng 1.6.10 [March 6, 2014]
* *
* This code is released under the libpng license. * This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer * For conditions of distribution and use, see the disclaimer

2
contrib/libtests/pngunknown.c
View File

@ -1,7 +1,7 @@
/* pngunknown.c - test the read side unknown chunk handling /* pngunknown.c - test the read side unknown chunk handling
* *
* Last changed in libpng 1.6.10 [(PENDING RELEASE)] * Last changed in libpng 1.6.10 [March 6, 2014]
* Copyright (c) 2014 Glenn Randers-Pehrson * Copyright (c) 2014 Glenn Randers-Pehrson
* Written by John Cunningham Bowler * Written by John Cunningham Bowler
* *

2
contrib/tools/pngfix.c
View File

@ -2,7 +2,7 @@
* *
* Copyright (c) 2014 John Cunningham Bowler * Copyright (c) 2014 John Cunningham Bowler
* *
* Last changed in libpng 1.6.10 [(PENDING RELEASE)] * Last changed in libpng 1.6.10 [March 6, 2014]
* *
* This code is released under the libpng license. * This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer * For conditions of distribution and use, see the disclaimer

2
libpngpf.3
View File

@ -1,4 +1,4 @@
.TH LIBPNGPF 3 "February 27, 2014" .TH LIBPNGPF 3 "March 17, 2014"
.SH NAME .SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta34 libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta34
(private functions) (private functions)

2
png.5
View File

@ -1,4 +1,4 @@
.TH PNG 5 "February 27, 2014" .TH PNG 5 "March 17, 2014"
.SH NAME .SH NAME
png \- Portable Network Graphics (PNG) format png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION .SH DESCRIPTION

4
png.c
View File

@ -696,13 +696,13 @@ png_get_copyright(png_const_structrp png_ptr)
#else #else
# ifdef __STDC__ # ifdef __STDC__
return PNG_STRING_NEWLINE \ return PNG_STRING_NEWLINE \
"libpng version 1.7.0beta34 - March 8, 2014" PNG_STRING_NEWLINE \ "libpng version 1.7.0beta34 - March 17, 2014" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2014 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2014 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.7.0beta34 - March 8, 2014\ return "libpng version 1.7.0beta34 - March 17, 2014\
Copyright (c) 1998-2014 Glenn Randers-Pehrson\ Copyright (c) 1998-2014 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.";

10
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.7.0beta34 - February 27, 2014 * libpng version 1.7.0beta34 - March 17, 2014
* Copyright (c) 1998-2013 Glenn Randers-Pehrson * Copyright (c) 1998-2013 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.7.0beta34 - February 27, 2014: Glenn * libpng versions 0.97, January 1998, through 1.7.0beta34 - March 17, 2014: Glenn
* See also "Contributing Authors", below. * See also "Contributing Authors", below.
* *
* Note about libpng version numbers: * Note about libpng version numbers:
@ -200,7 +200,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.7.0beta34, February 27, 2014, are * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta34, March 17, 2014, are
* Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are * Copyright (c) 2004, 2006-2013 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:
@ -312,7 +312,7 @@
* Y2K compliance in libpng: * Y2K compliance in libpng:
* ========================= * =========================
* *
* February 27, 2014 * March 17, 2014
* *
* 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.
@ -380,7 +380,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.7.0beta34" #define PNG_LIBPNG_VER_STRING "1.7.0beta34"
#define PNG_HEADER_VERSION_STRING \ #define PNG_HEADER_VERSION_STRING \
" libpng version 1.7.0beta34 - February 27, 2014\n" " libpng version 1.7.0beta34 - March 17, 2014\n"
#define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_SONUM 17
#define PNG_LIBPNG_VER_DLLNUM 17 #define PNG_LIBPNG_VER_DLLNUM 17

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.7.0beta34 - February 27, 2014 * libpng version 1.7.0beta34 - March 17, 2014
* *
* Copyright (c) 1998-2013 Glenn Randers-Pehrson * Copyright (c) 1998-2013 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

2
projects/vstudio/readme.txt
View File

@ -1,7 +1,7 @@
VisualStudio instructions VisualStudio instructions
libpng version 1.7.0beta34 - February 27, 2014 libpng version 1.7.0beta34 - March 17, 2014
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.7.0beta34 - March 9, 2014 * libpng version 1.7.0beta34 - March 17, 2014
* *
* 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.7.0beta34 - February 27, 2014 Makefiles for libpng version 1.7.0beta34 - March 17, 2014
pnglibconf.h.prebuilt => Stores configuration settings pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile makefile.linux => Linux/ELF makefile

20
scripts/dfn.awk
View File

@ -1,9 +1,9 @@
#!/bin/awk -f #!/bin/awk -f
# scripts/dfn.awk - process a .dfn file # scripts/dfn.awk - process a .dfn file
# #
# last changed in libpng version 1.5.14 - February 4, 2013 # last changed in libpng version 1.5.19 - $RDATE%
# #
# Copyright (c) 2013-2013 Glenn Randers-Pehrson # Copyright (c) 2013-2014 Glenn Randers-Pehrson
# #
# This code is released under the libpng license. # This code is released under the libpng license.
# For conditions of distribution and use, see the disclaimer # For conditions of distribution and use, see the disclaimer
@ -25,7 +25,7 @@ BEGIN{
# The output file must be specified before any input: # The output file must be specified before any input:
NR==1 && out == "/dev/null" { NR==1 && out == "/dev/null" {
print "out=output.file must be given on the command line" print "out=output.file must be given on the command line"
# but continue without setting the error code, this allows the # but continue without setting the error code; this allows the
# script to be checked easily # script to be checked easily
} }
@ -61,14 +61,14 @@ $1 ~ /^PNG_DFN_END_SORT/{
} }
/^[^"]*PNG_DFN *".*"[^"]*$/{ /^[^"]*PNG_DFN *".*"[^"]*$/{
# A definition line, apparently correctly formated, extract the # A definition line, apparently correctly formatted; extract the
# definition then replace any doubled "" that remain with a single # definition then replace any doubled "" that remain with a single
# double quote. Notice that the original doubled double quotes # double quote. Notice that the original doubled double quotes
# may have been split by tokenization # may have been split by tokenization
# #
# Sometimes GCC splits the PNG_DFN lines, we know this has happened # Sometimes GCC splits the PNG_DFN lines; we know this has happened
# if the quotes aren't closed and must read another line. In this # if the quotes aren't closed and must read another line. In this
# case it is essential to reject lines that start '#' because those # case it is essential to reject lines that start with '#' because those
# are introduced #line directives. # are introduced #line directives.
orig=$0 orig=$0
line=$0 line=$0
@ -126,13 +126,13 @@ $1 ~ /^PNG_DFN_END_SORT/{
else while (1) { else while (1) {
if (getline nextline) { if (getline nextline) {
# If the line starts with '#' it is a preprocesor line directive # If the line starts with '#' it is a preprocesor line directive
# from cc -E, skip it: # from cc -E; skip it:
if (nextline !~ /^#/) { if (nextline !~ /^#/) {
line = line " " nextline line = line " " nextline
break break
} }
} else { } else {
# This is end-of-input - probably a missig "@ on the first line: # This is end-of-input - probably a missing "@ on the first line:
print "line", lineno ": unbalanced @\" ... \"@ pair" print "line", lineno ": unbalanced @\" ... \"@ pair"
err=1 err=1
next next
@ -144,7 +144,7 @@ $1 ~ /^PNG_DFN_END_SORT/{
} }
# Attempt to remove a trailing " (not preceded by '@') - if this can # Attempt to remove a trailing " (not preceded by '@') - if this can
# be done stop now, if not assume a split line again # be done, stop now; if not assume a split line again
if (sub(/"[^"]*$/, "", line)) if (sub(/"[^"]*$/, "", line))
break break
@ -189,7 +189,7 @@ $1 ~ /^PNG_DFN_END_SORT/{
} }
/PNG_DFN/{ /PNG_DFN/{
print "line", NR, "incorrectly formated PNG_DFN line:" print "line", NR, "incorrectly formatted PNG_DFN line:"
print $0 print $0
err = 1 err = 1
} }

2
scripts/pnglibconf.h.prebuilt
View File

@ -2,7 +2,7 @@
/* pnglibconf.h - library build configuration */ /* pnglibconf.h - library build configuration */
/* Libpng version 1.7.0beta34 - March 7, 2014 */ /* Libpng version 1.7.0beta34 - March 17, 2014 */
/* Copyright (c) 1998-2013 Glenn Randers-Pehrson */ /* Copyright (c) 1998-2013 Glenn Randers-Pehrson */