Revert "Revert "Upgrade ImageMagick to '00c6fca4eccc3377114cc17346a77a096d00c9db'""

This reverts commit 321c3aad9f897c6e6041d3b8fa5b3a2efc930445.

4 files changed, 72 insertions, 112 deletions

diff --git a/config/Makefile.am b/config/Makefile.am
index 079c12187..b226467d5 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,4 +1,4 @@
-#  Copyright 1999-2019 ImageMagick Studio LLC, a non-profit organization
+#  Copyright 1999-2020 ImageMagick Studio LLC, a non-profit organization
 #  dedicated to making software imaging solutions freely available.
 #
 #  You may not use this file except in compliance with the License.  You may
@@ -18,56 +18,56 @@
 # (share/ImageMagick-version)
 configsharedir = $(SHARE_PATH)
 configshare_DATA = \
-	config/english.xml \
-	config/francais.xml \
-	config/locale.xml
+  config/english.xml \
+  config/francais.xml \
+  config/locale.xml
 
 # Where architecture-dependent configuration files get installed
 # (share/arch/ImageMagick-version)
 configsharearchdir = $(SHAREARCH_PATH)
 configsharearch_DATA = \
-	config/configure.xml
+  config/configure.xml
 
 # Where architecture-dependent configuration files get installed
 # (share/ImageMagick-version)
 configlibdir =  $(CONFIGURE_PATH)
 configlib_DATA = \
-	config/colors.xml \
-	config/delegates.xml \
-	config/log.xml \
-	config/mime.xml \
-	config/policy.xml \
-	config/quantization-table.xml \
-	config/thresholds.xml \
-	config/type.xml \
-	config/type-apple.xml \
-	config/type-dejavu.xml \
-	config/type-ghostscript.xml \
-	config/type-urw-base35.xml \
-	config/type-windows.xml
+  config/colors.xml \
+  config/delegates.xml \
+  config/log.xml \
+  config/mime.xml \
+  config/policy.xml \
+  config/quantization-table.xml \
+  config/thresholds.xml \
+  config/type.xml \
+  config/type-apple.xml \
+  config/type-dejavu.xml \
+  config/type-ghostscript.xml \
+  config/type-urw-base35.xml \
+  config/type-windows.xml
 
 CONFIG_EXTRA_DIST = \
-	config/cmyk.icm \
-	config/colors.xml \
-	config/config.h.in \
-	config/delegates.xml.in \
-	config/english.xml \
-	config/francais.xml \
-	config/ImageMagick.rc \
-	config/ImageMagick.rdf.in \
-	config/install-sh \
-	config/lndir.sh \
-	config/locale.md \
-	config/locale.xml \
-	config/log.xml \
-	config/mime.xml \
-	config/policy.xml \
-	config/quantization-table.xml \
-	config/sRGB.icm \
-	config/thresholds.xml \
-	config/type-apple.xml.in \
-	config/type-dejavu.xml.in \
-	config/type-ghostscript.xml.in \
-	config/type-urw-base35.xml.in \
-	config/type-windows.xml.in \
-	config/type.xml.in
+  config/cmyk.icm \
+  config/colors.xml \
+  config/config.h.in \
+  config/delegates.xml.in \
+  config/english.xml \
+  config/francais.xml \
+  config/ImageMagick.rc \
+  config/ImageMagick.rdf.in \
+  config/install-sh \
+  config/lndir.sh \
+  config/locale.md \
+  config/locale.xml \
+  config/log.xml \
+  config/mime.xml \
+  config/policy.xml \
+  config/quantization-table.xml \
+  config/sRGB.icm \
+  config/thresholds.xml \
+  config/type-apple.xml.in \
+  config/type-dejavu.xml.in \
+  config/type-ghostscript.xml.in \
+  config/type-urw-base35.xml.in \
+  config/type-windows.xml.in \
+  config/type.xml.in
diff --git a/config/config.h.in b/config/config.h.in
index b061b73aa..fe1ef4d06 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -164,9 +164,6 @@
 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
 #undef HAVE_DOPRNT
 
-/* Define to 1 if the system has the type `double_t'. */
-#undef HAVE_DOUBLE_T
-
 /* Define to 1 if you have the `erf' function. */
 #undef HAVE_ERF
 
@@ -182,9 +179,6 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
-/* Define to 1 if the system has the type `float_t'. */
-#undef HAVE_FLOAT_T
-
 /* Define to 1 if you have the `floor' function. */
 #undef HAVE_FLOOR
 
@@ -272,19 +266,9 @@
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H
 
-/* Define to 1 if the system has the type `locale_t'. */
-#undef HAVE_LOCALE_T
-
 /* Define to 1 if you have the `localtime_r' function. */
 #undef HAVE_LOCALTIME_R
 
-/* Define to 1 if the system has the type `long double'. */
-#undef HAVE_LONG_DOUBLE
-
-/* Define to 1 if the type `long double' works and has more range or precision
-   than `double'. */
-#undef HAVE_LONG_DOUBLE_WIDER
-
 /* Define to 1 if the system has the type `long long int'. */
 #undef HAVE_LONG_LONG_INT
 
@@ -456,6 +440,9 @@
 /* Define to 1 if you have the `strcasecmp' function. */
 #undef HAVE_STRCASECMP
 
+/* Define to 1 if you have the `strcasestr' function. */
+#undef HAVE_STRCASESTR
+
 /* Define to 1 if you have the `strchr' function. */
 #undef HAVE_STRCHR
 
@@ -575,6 +562,9 @@
 /* Define to 1 if you have the <sys/wait.h> header file. */
 #undef HAVE_SYS_WAIT_H
 
+/* Define if you have the tcmalloc memory allocation library */
+#undef HAVE_TCMALLOC
+
 /* Define to 1 if you have the `telldir' function. */
 #undef HAVE_TELLDIR
 
@@ -628,6 +618,9 @@
 /* Define to 1 if you have the `ulltostr' function. */
 #undef HAVE_ULLTOSTR
 
+/* Define if you have umem memory allocation library */
+#undef HAVE_UMEM
+
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
@@ -724,9 +717,6 @@
 /* Define if you have jemalloc memory allocation library */
 #undef HasJEMALLOC
 
-/* Define if you have umem memory allocation library */
-#undef HasUMEM
-
 /* Directory where ImageMagick architecture headers live. */
 #undef INCLUDEARCH_PATH
 
@@ -742,6 +732,9 @@
 /* Define if you have JPEG library */
 #undef JPEG_DELEGATE
 
+/* Define if you have brunsli library */
+#undef JXL_DELEGATE
+
 /* Define if you have LCMS library */
 #undef LCMS_DELEGATE
 
@@ -854,9 +847,6 @@
 /* Define if you have LIBRAW library */
 #undef RAW_R_DELEGATE
 
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
 /* Define if you have RSVG library */
 #undef RSVG_DELEGATE
 
@@ -897,41 +887,11 @@
 /* The size of `long double', as computed by sizeof. */
 #undef SIZEOF_LONG_DOUBLE
 
-/* The size of `off_t', as computed by sizeof. */
-#undef SIZEOF_OFF_T
-
-/* The size of `signed int', as computed by sizeof. */
-#undef SIZEOF_SIGNED_INT
-
-/* The size of `signed long', as computed by sizeof. */
-#undef SIZEOF_SIGNED_LONG
-
-/* The size of `signed long long', as computed by sizeof. */
-#undef SIZEOF_SIGNED_LONG_LONG
-
-/* The size of `signed short', as computed by sizeof. */
-#undef SIZEOF_SIGNED_SHORT
-
-/* The size of `size_t', as computed by sizeof. */
-#undef SIZEOF_SIZE_T
-
-/* The size of `ssize_t', as computed by sizeof. */
-#undef SIZEOF_SSIZE_T
-
-/* The size of `unsigned int', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_INT
-
-/* The size of `unsigned int*', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_INTP
-
-/* The size of `unsigned long', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_LONG
-
 /* The size of `unsigned long long', as computed by sizeof. */
 #undef SIZEOF_UNSIGNED_LONG_LONG
 
-/* The size of `unsigned short', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_SHORT
+/* The size of `void *', as computed by sizeof. */
+#undef SIZEOF_VOID_P
 
 /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
 #undef STAT_MACROS_BROKEN
diff --git a/config/configure.xml b/config/configure.xml
index 67ed96e10..879172bb3 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,41 +10,41 @@
   ImageMagick build configuration.
 -->
 <configuremap>
-  <configure name="CC" value="/usr/local/google/home/hhb/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang"/>
+  <configure name="CC" value="/src/ndk/out/android-ndk-r22-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang"/>
   <configure name="CFLAGS" value=" -fopenmp -fPIE -fPIC -Wall -fexceptions -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16"/>
-  <configure name="CODER_PATH" value="/usr/local/lib/ImageMagick-7.0.8/modules-Q16HDRI/coders"/>
+  <configure name="CODER_PATH" value="/usr/local/lib/ImageMagick-7.0.9/modules-Q16HDRI/coders"/>
   <configure name="CONFIGURE_PATH" value="/usr/local/etc/ImageMagick-7/"/>
-  <configure name="CONFIGURE" value="./configure  '--host=x86_64-linux-android' '--without-zlib' 'host_alias=x86_64-linux-android' 'CC=/usr/local/google/home/hhb/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang' 'CFLAGS=-fPIE -fPIC' 'LDFLAGS=-pie' 'CXX=/usr/local/google/home/hhb/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang++'"/>
-  <configure name="COPYRIGHT" value="Copyright (C) 1999-2019 ImageMagick Studio LLC"/>
+  <configure name="CONFIGURE" value="./configure  '--host=x86_64-linux-android' '--without-zlib' 'host_alias=x86_64-linux-android' 'CC=/src/ndk/out/android-ndk-r22-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang' 'CFLAGS=-fPIE -fPIC' 'LDFLAGS=-pie' 'CXX=/src/ndk/out/android-ndk-r22-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang++'"/>
+  <configure name="COPYRIGHT" value="Copyright (C) 1999-2020 ImageMagick Studio LLC"/>
   <configure name="CPPFLAGS" value="-I/usr/local/include/ImageMagick-7"/>
   <configure name="CXXFLAGS" value="-g -O2 -pthread"/>
-  <configure name="CXX" value="/usr/local/google/home/hhb/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang++"/>
+  <configure name="CXX" value="/src/ndk/out/android-ndk-r22-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang++"/>
   <configure name="DEFS" value="-DHAVE_CONFIG_H"/>
   <configure name="DELEGATES" value="mpeg ps"/>
-  <configure name="DISTCHECK_CONFIG_FLAGS" value="'CC=/usr/local/google/home/hhb/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang' 'CFLAGS=-fPIE -fPIC' 'CXX=/usr/local/google/home/hhb/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang++' 'LDFLAGS=-pie'  --disable-deprecated  --with-quantum-depth=16  --with-jemalloc=no  --with-umem=no  --with-zlib=no  --with-autotrace=no  --with-gslib=no  --with-fontpath=  --with-rsvg=no  --with-perl=no "/>
+  <configure name="DISTCHECK_CONFIG_FLAGS" value="'CC=/src/ndk/out/android-ndk-r22-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang' 'CFLAGS=-fPIE -fPIC' 'CXX=/src/ndk/out/android-ndk-r22-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang++' 'LDFLAGS=-pie'  --disable-deprecated  --with-quantum-depth=16  --with-jemalloc=no  --with-umem=no  --with-zlib=no  --with-autotrace=no  --with-gslib=no  --with-fontpath=  --with-rsvg=no  --with-perl=no "/>
   <configure name="DOCUMENTATION_PATH" value="/usr/local/share/doc/ImageMagick-7"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
   <configure name="EXECUTABLE_PATH" value="/usr/local/bin"/>
   <configure name="FEATURES" value="DPC HDRI Cipher OpenMP"/>
-  <configure name="FILTER_PATH" value="/usr/local/lib/ImageMagick-7.0.8/modules-Q16HDRI/filters"/>
-  <configure name="GIT_REVISION" value="15992:baab586bc:20190804" />
+  <configure name="FILTER_PATH" value="/usr/local/lib/ImageMagick-7.0.9/modules-Q16HDRI/filters"/>
+  <configure name="GIT_REVISION" value="16549:6da7143d9:20191222" />
   <configure name="HOST" value="x86_64-pc-linux-android"/>
   <configure name="INCLUDE_PATH" value="/usr/local/include/ImageMagick-7"/>
   <configure name="LDFLAGS" value="-L/usr/local/lib -pie"/>
-  <configure name="LIBRARY_PATH" value="/usr/local/lib/ImageMagick-7.0.8"/>
-  <configure name="LIBS" value="                                       -lm     "/>
-  <configure name="LIB_VERSION_NUMBER" value="7,0,8,60"/>
-  <configure name="LIB_VERSION" value="0x708"/>
+  <configure name="LIBRARY_PATH" value="/usr/local/lib/ImageMagick-7.0.9"/>
+  <configure name="LIBS" value="                                        -lm      "/>
+  <configure name="LIB_VERSION_NUMBER" value="7,0,9,11"/>
+  <configure name="LIB_VERSION" value="0x709"/>
   <configure name="NAME" value="ImageMagick"/>
   <configure name="PCFLAGS" value="-fopenmp -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16"/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="QuantumDepth" value="16"/>
-  <configure name="RELEASE_DATE" value="2019-08-07"/>
-  <configure name="SHAREARCH_PATH" value="/usr/local/lib/ImageMagick-7.0.8/config-Q16HDRI"/>
+  <configure name="RELEASE_DATE" value="2019-12-23"/>
+  <configure name="SHAREARCH_PATH" value="/usr/local/lib/ImageMagick-7.0.9/config-Q16HDRI"/>
   <configure name="SHARE_PATH" value="/usr/local/share/ImageMagick-7"/>
   <configure name="TARGET_CPU" value="x86_64"/>
   <configure name="TARGET_OS" value="linux-android"/>
   <configure name="TARGET_VENDOR" value="pc"/>
-  <configure name="VERSION" value="7.0.8"/>
+  <configure name="VERSION" value="7.0.9"/>
   <configure name="WEBSITE" value="https://imagemagick.org"/>
 </configuremap>
diff --git a/config/configure.xml.in b/config/configure.xml.in
index b218e1158..caa0ce5d6 100644
--- a/config/configure.xml.in
+++ b/config/configure.xml.in
@@ -15,7 +15,7 @@
   <configure name="CODER_PATH" value="@CODER_PATH@"/>
   <configure name="CONFIGURE_PATH" value="@CONFIGURE_PATH@"/>
   <configure name="CONFIGURE" value="@CONFIGURE_ARGS@"/>
-  <configure name="COPYRIGHT" value="Copyright (C) 1999-2019 ImageMagick Studio LLC"/>
+  <configure name="COPYRIGHT" value="Copyright (C) 1999-2020 ImageMagick Studio LLC"/>
   <configure name="CPPFLAGS" value="@MAGICK_CPPFLAGS@"/>
   <configure name="CXXFLAGS" value="@CXXFLAGS@"/>
   <configure name="CXX" value="@CXX@"/>