(no commit message)

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 9a9c721228e5ad307f228190d756ae7d93c044c5..45e1de7c94af80475107b83c98a545816784a39f 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -238,6 +238,11 @@
 /* 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'. */
+#ifndef MAGICKCORE_HAVE_DOUBLE_T
+#define MAGICKCORE_HAVE_DOUBLE_T 1
+#endif
+
 /* Define to 1 if you have the <errno.h> header file. */
 #ifndef MAGICKCORE_HAVE_ERRNO_H
 #define MAGICKCORE_HAVE_ERRNO_H 1
@@ -258,6 +263,11 @@
 #define MAGICKCORE_HAVE_FCNTL_H 1
 #endif
 
+/* Define to 1 if the system has the type `float_t'. */
+#ifndef MAGICKCORE_HAVE_FLOAT_T
+#define MAGICKCORE_HAVE_FLOAT_T 1
+#endif
+
 /* Define to 1 if you have the `floor' function. */
 #ifndef MAGICKCORE_HAVE_FLOOR
 #define MAGICKCORE_HAVE_FLOOR 1

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 0c7c3fcf03520a6fab1e681676587d6686ba6ee1..4a90333b353eaff15a9823ee819e0c27ec70b4bb 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "9640:9642M"
+#define MagickSVNRevision  "9739:9757M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2012-10-16"
+#define MagickReleaseDate  "2012-10-24"
 #define MagickChangeDate   "20121005"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/config/config.h.in b/config/config.h.in
index 87405973f5a42377b53a8f1137ab4fe2ab3c2f90..746bf47bf15f63dbba6eaafb95129e6785b7fdce 100644 (file)
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -161,6 +161,9 @@
 /* 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 <errno.h> header file. */
 #undef HAVE_ERRNO_H
 
@@ -173,6 +176,9 @@
 /* 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
 

diff --git a/configure b/configure
index 94bab0618f2bf345ddacc1401b9b128511adadd7..1831c679e2742dcf2eabc2339ab286a947143622 100755 (executable)
--- a/configure
+++ b/configure
@@ -3633,7 +3633,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=9640:9642M
+MAGICK_SVN_REVISION=9739:9757M
 
 
 
@@ -22844,6 +22844,30 @@ if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
 fi
 
 
+# float_t and double_t are intended to be the the most efficient type
+ac_fn_c_check_type "$LINENO" "float_t" "ac_cv_type_float_t" "#include <math.h>
+"
+if test "x$ac_cv_type_float_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_FLOAT_T 1
+_ACEOF
+
+
+fi
+
+ac_fn_c_check_type "$LINENO" "double_t" "ac_cv_type_double_t" "#include <math.h>
+"
+if test "x$ac_cv_type_double_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DOUBLE_T 1
+_ACEOF
+
+
+fi
+
+
 # Obtain size of an 'signed short' and define as SIZEOF_SIGNED_SHORT
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects

diff --git a/configure.ac b/configure.ac
index e6390267568cafc6da6161d42b06ee6080245c1c..167ebc2f9bfe3750a37ae355e7702b56fb75f6d4 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -892,6 +892,10 @@ AC_TYPE_UNSIGNED_LONG_LONG_INT
 # C compiler predefines it.
 AC_C_CHAR_UNSIGNED
 
+# float_t and double_t are intended to be the the most efficient type
+AC_CHECK_TYPES([float_t], [], [], [[#include <math.h>]])
+AC_CHECK_TYPES([double_t], [], [], [[#include <math.h>]])
+
 # Obtain size of an 'signed short' and define as SIZEOF_SIGNED_SHORT
 AC_CHECK_SIZEOF(signed short)