[libpng17] Merged scripts/* with libpng-1.6.14beta04.
diff --git a/ANNOUNCE b/ANNOUNCE
index 427783c..bb248d6 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -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
within a few weeks by a public version or by another test version.
@@ -599,7 +599,8 @@
Updated scripts/makefiles from libpng-1.6.13beta04.
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
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index 2c9b40f..8535d36 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4888,7 +4888,8 @@
Updated scripts/makefiles from libpng-1.6.13beta04.
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
(subscription required; visit
diff --git a/scripts/README.txt b/scripts/README.txt
index ead15fe..28ac984 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -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
makefile.linux => Linux/ELF makefile
diff --git a/scripts/descrip.mms b/scripts/descrip.mms
index 99ea1ab..47d6b78 100644
--- a/scripts/descrip.mms
+++ b/scripts/descrip.mms
@@ -49,4 +49,4 @@
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
-pngtest.obj : png.h, pngconf.h
+pngtest.obj : png.h, pngconf.h, pnglibconf.h
diff --git a/scripts/dfn.awk b/scripts/dfn.awk
index 54a8ea3..675829d 100755
--- a/scripts/dfn.awk
+++ b/scripts/dfn.awk
Binary files differ
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index 25be490..e23de75 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -107,8 +107,8 @@
echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
echo L_opts=\"-L$(LIBPATH)\"; \
echo R_opts=\"-R$(LIBPATH)\"; \
- echo ccopts=\"-xtarget=ultra\"; \
- echo ldopts=\"-xtarget=ultra\"; \
+ echo ccopts=\"-fast -xtarget=ultra\"; \
+ echo ldopts=\"-fast -xtarget=ultra\"; \
echo libs=\"-lpng17 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index bde5ca6..5f06795 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -107,8 +107,8 @@
echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
echo L_opts=\"-L$(LIBPATH)\"; \
echo R_opts=\"-R$(LIBPATH)\"; \
- echo ccopts=\"-xtarget=ultra -xarch=v9\"; \
- echo ldopts=\"-xtarget=ultra -xarch=v9\"; \
+ echo ccopts=\"-fast -xtarget=ultra -xarch=v9\"; \
+ echo ldopts=\"-fast -xtarget=ultra -xarch=v9\"; \
echo libs=\"-lpng17 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index f621d07..d060373 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -106,7 +106,7 @@
( cat scripts/libpng-config-head.in; \
echo prefix=\"$(prefix)\"; \
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 libs=\"-lpng17 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index e45c9db..e0893a4 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -104,7 +104,7 @@
( cat scripts/libpng-config-head.in; \
echo prefix=\"$(prefix)\"; \
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 libs=\"-lpng17 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config
diff --git a/scripts/options.awk b/scripts/options.awk
index 9aff15d..850d90b 100755
--- a/scripts/options.awk
+++ b/scripts/options.awk
@@ -269,7 +269,7 @@
if (val != 1) { # error reading it
if (val == 0)
- print "option", opt ": ERROR: missing contination line"
+ print "option", opt ": ERROR: missing continuation line"
else
print "option", opt ": ERROR: error reading continuation line"
@@ -362,7 +362,7 @@
if (val != 1) { # error reading it
if (val == 0)
- print "chunk", opt ": ERROR: missing contination line"
+ print "chunk", opt ": ERROR: missing continuation line"
else
print "chunk", opt ": ERROR: error reading continuation line"
@@ -493,7 +493,7 @@
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
# any other format errors.
{
@@ -585,7 +585,7 @@
# If an option[opt] is 'on' then turn on all requires[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
for (opt in option) if (opt != "") {
if (option[opt] == "on" || option[opt] == "off") {
@@ -677,7 +677,7 @@
for (j=1; j<=nreqs; ++j) {
print "#ifndef PNG_" r[j] "_SUPPORTED" >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
# the requires did not work
if (option[i] == "on") {
diff --git a/scripts/pnglibconf.dfa b/scripts/pnglibconf.dfa
index 9eb0bfb..4402f94 100644
--- a/scripts/pnglibconf.dfa
+++ b/scripts/pnglibconf.dfa
@@ -8,7 +8,7 @@
com
version
com
-com Copyright (c) 1998-2013 Glenn Randers-Pehrson
+com Copyright (c) 1998-2014 Glenn Randers-Pehrson
com
com This code is released under the libpng license.
com For conditions of distribution and use, see the disclaimer
@@ -197,7 +197,7 @@
setting PREFIX
# 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
setting ZLIB_PREFIX
@@ -211,9 +211,9 @@
# 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
# png.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>
# Implementation specific control of the optimizations, enabled by those
@@ -600,22 +600,25 @@
option COLORSPACE enables GAMMA disabled
# 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
-# setting controls how much work is done during the check:
+# against known sRGB profiles if the sRGB handling is enabled. The
+# 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
-# the checks in option 1.
+# -1: Don't do any sRGB profile checking.
#
-# 1: Additionally check the length, intent and adler32 checksum of the
-# actual data. If enabled this will reject known profiles that have
-# had the rendering intent in the header changed as well as other edits
-# done without updating the checksum. See the discussion below.
+# 0: Just validate the profile MD5 signature if present, otherwise use
+# the checks in option 1.
#
-# 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.
+# 1: Additionally check the length, intent and adler32 checksum of the
+# actual data. If enabled this will reject known profiles that have
+# 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.
+# 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,
# but does not include the value in the signature. The intent is documented
@@ -744,7 +747,7 @@
chunk sBIT
chunk sCAL
chunk sPLT
-chunk sRGB enables COLORSPACE, GAMMA
+chunk sRGB enables COLORSPACE, GAMMA, SET_OPTION
chunk tEXt requires TEXT
chunk tIME
chunk tRNS
@@ -857,8 +860,8 @@
option CHECK_FOR_INVALID_INDEX enables READ_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 WRITE_CHECK_FOR_INVALID_INDEX requires WRITE disabled
+option READ_CHECK_FOR_INVALID_INDEX requires READ, CHECK_FOR_INVALID_INDEX
+option WRITE_CHECK_FOR_INVALID_INDEX requires WRITE, CHECK_FOR_INVALID_INDEX
# added at libpng-1.5.15
option GET_PALETTE_MAX enables READ_GET_PALETTE_MAX WRITE_GET_PALETTE_MAX
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index 10c4bae..7de1272 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,9 +2,9 @@
/* 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. */
/* For conditions of distribution and use, see the disclaimer */
