summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2015-08-19 12:18:18 -0500
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2015-08-19 12:54:24 -0500
commit75318bc7459d55813894aec7ce8598ae8a19ac3e (patch)
tree620b1443f4bd1ce61c7086c8850960658ad75eb9 /scripts
parentc357fb70b5de63862a9737c645a83e2d980c2e75 (diff)
downloadlibpng-75318bc7459d55813894aec7ce8598ae8a19ac3e.tar.gz
[libpng15] Imported from libpng-1.5.24beta01.tarv1.5.24beta01
Diffstat (limited to 'scripts')
-rw-r--r--scripts/README.txt2
-rw-r--r--scripts/pnglibconf.dfa9
-rw-r--r--scripts/pnglibconf.h.prebuilt4
3 files changed, 3 insertions, 12 deletions
diff --git a/scripts/README.txt b/scripts/README.txt
index a9596d39c..7c3afe96f 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.5.24beta01 - July 24, 2015
+Makefiles for libpng version 1.5.24beta01 - August 19, 2015
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
diff --git a/scripts/pnglibconf.dfa b/scripts/pnglibconf.dfa
index a0d9d4ee3..9f28a2897 100644
--- a/scripts/pnglibconf.dfa
+++ b/scripts/pnglibconf.dfa
@@ -409,9 +409,7 @@ option WRITE_USER_TRANSFORM requires WRITE_TRANSFORMS
option WRITE_INTERLACING requires WRITE
-# The following depends, internally, on WEIGHT_SHIFT and COST_SHIFT
-# where are set below.
-
+# Deprecated, will be removed.
option WRITE_WEIGHTED_FILTER requires WRITE
option WRITE_FLUSH requires WRITE
@@ -511,11 +509,6 @@ setting MAX_GAMMA_8 default 11
setting GAMMA_THRESHOLD_FIXED default 5000
-# Scaling factor for filter heuristic weighting calculations
-
-setting WEIGHT_SHIFT default 8
-setting COST_SHIFT default 3
-
# Precision to use when converting a floating point value to a PNG
# extension format string in an sCAL chunk (only relevant if the
# floating point API is enabled)
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index 1feafe08a..c39c2104e 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -1,7 +1,7 @@
/* 1.5.24beta01 STANDARD API DEFINITION */
/* pnglibconf.h - library build configuration */
-/* libpng version 1.5.24beta01 - July 24, 2015 */
+/* libpng version 1.5.24beta01 - August 19, 2015 */
/* Copyright (c) 1998-2013 Glenn Randers-Pehrson */
@@ -171,7 +171,6 @@
/* end of options */
/* settings */
#define PNG_API_RULE 0
-#define PNG_COST_SHIFT 3
#define PNG_DEFAULT_READ_MACROS 1
#define PNG_GAMMA_THRESHOLD_FIXED 5000
#define PNG_MAX_GAMMA_8 11
@@ -182,7 +181,6 @@
#define PNG_USER_CHUNK_MALLOC_MAX 8000000
#define PNG_USER_HEIGHT_MAX 1000000
#define PNG_USER_WIDTH_MAX 1000000
-#define PNG_WEIGHT_SHIFT 8
#define PNG_ZBUF_SIZE 8192
#define PNG_sCAL_PRECISION 5
/* end of settings */