From b33454f881c5a1156ecfa9349ad01b6125595aa8 Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 3 Aug 2011 02:10:45 +0000 Subject: [PATCH] --- MagickCore/fx.c | 12 ++++++++++++ MagickCore/magick-config.h | 15 +++++++++++++++ MagickCore/version.h | 2 +- config/config.h.in | 9 +++++++++ config/configure.xml | 2 +- configure | 2 +- configure.ac | 2 +- 7 files changed, 40 insertions(+), 4 deletions(-) diff --git a/MagickCore/fx.c b/MagickCore/fx.c index ccd607dd7..0cd3ccffa 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -1901,21 +1901,27 @@ static const char *FxOperatorPrecedence(const char *expression, case 'A': case 'a': { +#if defined(MAGICKCORE_HAVE_ACOSH) if (LocaleNCompare(expression,"acosh",5) == 0) { expression+=5; break; } +#endif +#if defined(MAGICKCORE_HAVE_ASINH) if (LocaleNCompare(expression,"asinh",5) == 0) { expression+=5; break; } +#endif +#if defined(MAGICKCORE_HAVE_ATANH) if (LocaleNCompare(expression,"atanh",5) == 0) { expression+=5; break; } +#endif break; } case 'J': @@ -2342,12 +2348,14 @@ static MagickRealType FxEvaluateSubexpression(FxInfo *fx_info, exception); return((MagickRealType) fabs((double) alpha)); } +#if defined(MAGICKCORE_HAVE_ACOSH) if (LocaleNCompare(expression,"acosh",5) == 0) { alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,beta, exception); return((MagickRealType) acosh((double) alpha)); } +#endif if (LocaleNCompare(expression,"acos",4) == 0) { alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,beta, @@ -2365,12 +2373,14 @@ static MagickRealType FxEvaluateSubexpression(FxInfo *fx_info, return(gamma*gamma); } #endif +#if defined(MAGICKCORE_HAVE_ASINH) if (LocaleNCompare(expression,"asinh",5) == 0) { alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,beta, exception); return((MagickRealType) asinh((double) alpha)); } +#endif if (LocaleNCompare(expression,"asin",4) == 0) { alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,beta, @@ -2389,12 +2399,14 @@ static MagickRealType FxEvaluateSubexpression(FxInfo *fx_info, exception); return((MagickRealType) atan2((double) alpha,(double) *beta)); } +#if defined(MAGICKCORE_HAVE_ATANH) if (LocaleNCompare(expression,"atanh",5) == 0) { alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,beta, exception); return((MagickRealType) atanh((double) alpha)); } +#endif if (LocaleNCompare(expression,"atan",4) == 0) { alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,beta, diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index 6559b59c8..f21ee5d27 100644 --- a/MagickCore/magick-config.h +++ b/MagickCore/magick-config.h @@ -111,6 +111,11 @@ #define MAGICKCORE_GVC_DELEGATE 1 #endif +/* Define to 1 if you have the `acosh' function. */ +#ifndef MAGICKCORE_HAVE_ACOSH +#define MAGICKCORE_HAVE_ACOSH 1 +#endif + /* Define to 1 if you have the `argz_add' function. */ #ifndef MAGICKCORE_HAVE_ARGZ_ADD #define MAGICKCORE_HAVE_ARGZ_ADD 1 @@ -154,6 +159,16 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_ARM_LIMITS_H */ +/* Define to 1 if you have the `asinh' function. */ +#ifndef MAGICKCORE_HAVE_ASINH +#define MAGICKCORE_HAVE_ASINH 1 +#endif + +/* Define to 1 if you have the `atanh' function. */ +#ifndef MAGICKCORE_HAVE_ATANH +#define MAGICKCORE_HAVE_ATANH 1 +#endif + /* Define to 1 if you have the `atexit' function. */ #ifndef MAGICKCORE_HAVE_ATEXIT #define MAGICKCORE_HAVE_ATEXIT 1 diff --git a/MagickCore/version.h b/MagickCore/version.h index a33e8651e..ce1137774 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -34,7 +34,7 @@ extern "C" { #define MagickLibAddendum "-0" #define MagickLibInterface 5 #define MagickLibMinInterface 5 -#define MagickReleaseDate "2011-08-01" +#define MagickReleaseDate "2011-08-02" #define MagickChangeDate "20110801" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/config/config.h.in b/config/config.h.in index 3293242af..91ca1ce9f 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -76,6 +76,9 @@ /* Define if you have GVC library */ #undef GVC_DELEGATE +/* Define to 1 if you have the `acosh' function. */ +#undef HAVE_ACOSH + /* Define to 1 if you have the `argz_add' function. */ #undef HAVE_ARGZ_ADD @@ -103,6 +106,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_ARM_LIMITS_H +/* Define to 1 if you have the `asinh' function. */ +#undef HAVE_ASINH + +/* Define to 1 if you have the `atanh' function. */ +#undef HAVE_ATANH + /* Define to 1 if you have the `atexit' function. */ #undef HAVE_ATEXIT diff --git a/config/configure.xml b/config/configure.xml index facec5cbc..fa5b47441 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -11,7 +11,7 @@ - + diff --git a/configure b/configure index a713d00b9..3a42bdf41 100755 --- a/configure +++ b/configure @@ -24721,7 +24721,7 @@ fi LIBS="$MATH_LIBS $LIBS" -for ac_func in atoll atexit cabs carg cimag creal clock ctime_r directio _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink readdir_r realpath select seekdir setlocale sqrt setvbuf stat strchr strerror_r strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat +for ac_func in acosh asinh atanh atoll atexit cabs carg cimag creal clock ctime_r directio _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink readdir_r realpath select seekdir setlocale sqrt setvbuf stat strchr strerror_r strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/configure.ac b/configure.ac index 4f04fe135..fb5e5e1e4 100755 --- a/configure.ac +++ b/configure.ac @@ -1051,7 +1051,7 @@ AC_CHECK_LIB(m,sqrt,MATH_LIBS="-lm",,) LIBS="$MATH_LIBS $LIBS" AC_SUBST(MATH_LIBS) -AC_CHECK_FUNCS([atoll atexit cabs carg cimag creal clock ctime_r directio _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink readdir_r realpath select seekdir setlocale sqrt setvbuf stat strchr strerror_r strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat]) +AC_CHECK_FUNCS([acosh asinh atanh atoll atexit cabs carg cimag creal clock ctime_r directio _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink readdir_r realpath select seekdir setlocale sqrt setvbuf stat strchr strerror_r strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat]) # # Check for clock_gettime(). -- 2.40.0