[libpng17] Merged scripts/* with libpng-1.6.14beta04.

This commit is contained in:
Glenn Randers-Pehrson 2014-09-28 12:49:42 -05:00
parent 4f8050416f
commit 35f88c1341
12 changed files with 44 additions and 39 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.7.0beta37 - September 27, 2014 Libpng 1.7.0beta37 - September 28, 2014
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.
@ -599,7 +599,8 @@ Version 1.7.0beta36 [September 27, 2014]
Updated scripts/makefiles from libpng-1.6.13beta04. Updated scripts/makefiles from libpng-1.6.13beta04.
Minor updates to pngrutil.c and the manual from libpng-1.6.14beta04. Minor updates to pngrutil.c and the manual from libpng-1.6.14beta04.
Version 1.7.0beta37 [September 27, 2014] Version 1.7.0beta37 [September 28, 2014]
Merged scripts/*, pngvalid.c and pngfix.c with libpng-1.6.14beta04.
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

View File

@ -4888,7 +4888,8 @@ Version 1.7.0beta36 [September 27, 2014]
Updated scripts/makefiles from libpng-1.6.13beta04. Updated scripts/makefiles from libpng-1.6.13beta04.
Minor updates to pngrutil.c and the manual from libpng-1.6.14beta04. Minor updates to pngrutil.c and the manual from libpng-1.6.14beta04.
Version 1.7.0beta37 [September 27, 2014] Version 1.7.0beta37 [September 28, 2014]
Merged scripts/*, pngvalid.c and pngfix.c with libpng-1.6.14beta04.
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

View File

@ -1,5 +1,5 @@
Makefiles for libpng version 1.7.0beta37 - September 27, 2014 Makefiles for libpng version 1.7.0beta37 - September 28, 2014
pnglibconf.h.prebuilt => Stores configuration settings pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile makefile.linux => Linux/ELF makefile

View File

@ -49,4 +49,4 @@ pngwrite.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h
pngwtran.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h pngwtran.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h
pngwutil.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h pngwutil.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h
pngtest.obj : png.h, pngconf.h pngtest.obj : png.h, pngconf.h, pnglibconf.h

View File

@ -1,7 +1,7 @@
#!/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.19 - (PENDING RELEASE) # last changed in libpng version 1.5.19 - August 21, 2014
# #
# Copyright (c) 2013-2014 Glenn Randers-Pehrson # Copyright (c) 2013-2014 Glenn Randers-Pehrson
# #

View File

@ -107,8 +107,8 @@ libpng-config:
echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
echo L_opts=\"-L$(LIBPATH)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \
echo R_opts=\"-R$(LIBPATH)\"; \ echo R_opts=\"-R$(LIBPATH)\"; \
echo ccopts=\"-xtarget=ultra\"; \ echo ccopts=\"-fast -xtarget=ultra\"; \
echo ldopts=\"-xtarget=ultra\"; \ echo ldopts=\"-fast -xtarget=ultra\"; \
echo libs=\"-lpng17 -lz -lm\"; \ echo libs=\"-lpng17 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config chmod +x libpng-config

View File

@ -107,8 +107,8 @@ libpng-config:
echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
echo L_opts=\"-L$(LIBPATH)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \
echo R_opts=\"-R$(LIBPATH)\"; \ echo R_opts=\"-R$(LIBPATH)\"; \
echo ccopts=\"-xtarget=ultra -xarch=v9\"; \ echo ccopts=\"-fast -xtarget=ultra -xarch=v9\"; \
echo ldopts=\"-xtarget=ultra -xarch=v9\"; \ echo ldopts=\"-fast -xtarget=ultra -xarch=v9\"; \
echo libs=\"-lpng17 -lz -lm\"; \ echo libs=\"-lpng17 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config chmod +x libpng-config

View File

@ -106,7 +106,7 @@ libpng-config:
( cat scripts/libpng-config-head.in; \ ( cat scripts/libpng-config-head.in; \
echo prefix=\"$(prefix)\"; \ echo prefix=\"$(prefix)\"; \
echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
echo ccopts=\"-Ae +DA1.1 +DS2.0\"; \ echo ccopts=\"-O -Ae -Wl,+vnocompatwarnings +DD64 +Z\"; \
echo L_opts=\"-L$(LIBPATH)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \
echo libs=\"-lpng17 -lz -lm\"; \ echo libs=\"-lpng17 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config cat scripts/libpng-config-body.in ) > libpng-config

View File

@ -104,7 +104,7 @@ libpng-config:
( cat scripts/libpng-config-head.in; \ ( cat scripts/libpng-config-head.in; \
echo prefix=\"$(prefix)\"; \ echo prefix=\"$(prefix)\"; \
echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
echo ccopts=\"-Ae +DA1.1 +DS2.0\"; \ echo ccopts=\"-O -Ae +DA1.1 +DS2.0\"; \
echo L_opts=\"-L$(LIBPATH)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \
echo libs=\"-lpng17 -lz -lm\"; \ echo libs=\"-lpng17 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config cat scripts/libpng-config-body.in ) > libpng-config

View File

@ -269,7 +269,7 @@ $1 == "option" && NF >= 2{
if (val != 1) { # error reading it if (val != 1) { # error reading it
if (val == 0) if (val == 0)
print "option", opt ": ERROR: missing contination line" print "option", opt ": ERROR: missing continuation line"
else else
print "option", opt ": ERROR: error reading continuation line" print "option", opt ": ERROR: error reading continuation line"
@ -362,7 +362,7 @@ pre != 0 && $1 == "chunk" && NF >= 2{
if (val != 1) { # error reading it if (val != 1) { # error reading it
if (val == 0) if (val == 0)
print "chunk", opt ": ERROR: missing contination line" print "chunk", opt ": ERROR: missing continuation line"
else else
print "chunk", opt ": ERROR: error reading continuation line" print "chunk", opt ": ERROR: error reading continuation line"
@ -493,7 +493,7 @@ $1 ~ /^@/{
next next
} }
# Check for unreognized lines, because of the preprocessing chunk # Check for unrecognized lines, because of the preprocessing chunk
# format errors will be detected on the first pass independent of # format errors will be detected on the first pass independent of
# any other format errors. # any other format errors.
{ {
@ -585,7 +585,7 @@ END{
# If an option[opt] is 'on' then turn on all requires[opt] # If an option[opt] is 'on' then turn on all requires[opt]
# If an option[opt] is 'off' then turn off all enabledby[opt] # If an option[opt] is 'off' then turn off all enabledby[opt]
# #
# Error out if we have to turn 'on' an 'off' option or vice versa. # Error out if we have to turn 'on' to an 'off' option or vice versa.
npending = 0 npending = 0
for (opt in option) if (opt != "") { for (opt in option) if (opt != "") {
if (option[opt] == "on" || option[opt] == "off") { if (option[opt] == "on" || option[opt] == "off") {
@ -677,7 +677,7 @@ END{
for (j=1; j<=nreqs; ++j) { for (j=1; j<=nreqs; ++j) {
print "#ifndef PNG_" r[j] "_SUPPORTED" >out print "#ifndef PNG_" r[j] "_SUPPORTED" >out
print "# undef PNG_on /*!" r[j] "*/" >out print "# undef PNG_on /*!" r[j] "*/" >out
# this error appears in the final output if something # This error appears in the final output if something
# was switched 'on' but the processing above to force # was switched 'on' but the processing above to force
# the requires did not work # the requires did not work
if (option[i] == "on") { if (option[i] == "on") {

View File

@ -8,7 +8,7 @@ com pnglibconf.h - library build configuration
com com
version version
com com
com Copyright (c) 1998-2013 Glenn Randers-Pehrson com Copyright (c) 1998-2014 Glenn Randers-Pehrson
com com
com This code is released under the libpng license. com This code is released under the libpng license.
com For conditions of distribution and use, see the disclaimer com For conditions of distribution and use, see the disclaimer
@ -197,7 +197,7 @@ setting API_RULE default 0
setting PREFIX setting PREFIX
# This says that a prefix has been added to zlib API function names; at present # This says that a prefix has been added to zlib API function names; at present
# it is informational, the builder of zlib must ensure that zlib.h contains the # it is informational. The builder of zlib must ensure that zlib.h contains the
# appropriate renames # appropriate renames
setting ZLIB_PREFIX setting ZLIB_PREFIX
@ -211,9 +211,9 @@ setting ZLIB_PREFIX
# the exported header files - so it was quite important to use "zlib.h" to # the exported header files - so it was quite important to use "zlib.h" to
# ensure that applications always got the zlib.h from the same directory as # ensure that applications always got the zlib.h from the same directory as
# png.h. # png.h.
setting ZLIB_HEADER default <zlib.h> setting ZLIB_HEADER default <zlib.h>
# include the file too, so that the defaults below are known
# Include the zlib header too, so that the defaults below are known
@# include <zlib.h> @# include <zlib.h>
# Implementation specific control of the optimizations, enabled by those # Implementation specific control of the optimizations, enabled by those
@ -600,22 +600,25 @@ option GAMMA disabled
option COLORSPACE enables GAMMA disabled option COLORSPACE enables GAMMA disabled
# When an ICC profile is read, or png_set, it will be checked for a match # When an ICC profile is read, or png_set, it will be checked for a match
# against known sRGB profiles if the sRGB handling is enabled. This # against known sRGB profiles if the sRGB handling is enabled. The
# setting controls how much work is done during the check: # PNG_sRGB_PROFILE_CHECKS setting controls how much work is done during the
# check:
# #
# 0: Just validate the profile MD5 signature if present, otherwise use # -1: Don't do any sRGB profile checking.
# the checks in option 1.
# #
# 1: Additionally check the length, intent and adler32 checksum of the # 0: Just validate the profile MD5 signature if present, otherwise use
# actual data. If enabled this will reject known profiles that have # the checks in option 1.
# had the rendering intent in the header changed as well as other edits
# done without updating the checksum. See the discussion below.
# #
# 2: Additionally checksum all the data using the ethernet CRC32 algorithm. # 1: Additionally check the length, intent and adler32 checksum of the
# This makes it more difficult to fake profiles and makes it less likely # actual data. If enabled this will reject known profiles that have
# to get a false positive on profiles with no signature, but is probably # had the rendering intent in the header changed as well as other edits
# just a waste of time since all currently approved ICC sRGB profiles have # done without updating the checksum. See the discussion below.
# a secure MD5 signature. #
# 2: Additionally checksum all the data using the ethernet CRC32 algorithm.
# This makes it more difficult to fake profiles and makes it less likely
# to get a false positive on profiles with no signature, but is probably
# just a waste of time since all currently approved ICC sRGB profiles have
# a secure MD5 signature.
# #
# The rendering intent. An ICC profile stores an intended rendering intent, # The rendering intent. An ICC profile stores an intended rendering intent,
# but does not include the value in the signature. The intent is documented # but does not include the value in the signature. The intent is documented
@ -744,7 +747,7 @@ chunk pHYs
chunk sBIT chunk sBIT
chunk sCAL chunk sCAL
chunk sPLT chunk sPLT
chunk sRGB enables COLORSPACE, GAMMA chunk sRGB enables COLORSPACE, GAMMA, SET_OPTION
chunk tEXt requires TEXT chunk tEXt requires TEXT
chunk tIME chunk tIME
chunk tRNS chunk tRNS
@ -857,8 +860,8 @@ option INFO_IMAGE
option CHECK_FOR_INVALID_INDEX enables READ_CHECK_FOR_INVALID_INDEX option CHECK_FOR_INVALID_INDEX enables READ_CHECK_FOR_INVALID_INDEX
option CHECK_FOR_INVALID_INDEX enables WRITE_CHECK_FOR_INVALID_INDEX option CHECK_FOR_INVALID_INDEX enables WRITE_CHECK_FOR_INVALID_INDEX
option READ_CHECK_FOR_INVALID_INDEX requires READ disabled option READ_CHECK_FOR_INVALID_INDEX requires READ, CHECK_FOR_INVALID_INDEX
option WRITE_CHECK_FOR_INVALID_INDEX requires WRITE disabled option WRITE_CHECK_FOR_INVALID_INDEX requires WRITE, CHECK_FOR_INVALID_INDEX
# added at libpng-1.5.15 # added at libpng-1.5.15
option GET_PALETTE_MAX enables READ_GET_PALETTE_MAX WRITE_GET_PALETTE_MAX option GET_PALETTE_MAX enables READ_GET_PALETTE_MAX WRITE_GET_PALETTE_MAX

View File

@ -2,9 +2,9 @@
/* pnglibconf.h - library build configuration */ /* pnglibconf.h - library build configuration */
/* Libpng version 1.7.0beta37 - September 27, 2014 */ /* Libpng version 1.7.0beta37 - September 28, 2014 */
/* Copyright (c) 1998-2013 Glenn Randers-Pehrson */ /* Copyright (c) 1998-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 */