From d2b61344a0de5037bc3451cec524620528a5c32e Mon Sep 17 00:00:00 2001 From: Cristy Date: Sun, 5 May 2019 12:07:47 -0400 Subject: [PATCH] ... --- MagickCore/fx.c | 16 ++++++++-------- configure | 30 ++++++++++++++++-------------- configure.ac | 6 ++++-- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/MagickCore/fx.c b/MagickCore/fx.c index 3af0bb736..ee4c4086c 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -5647,6 +5647,9 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude, *canvas_image_view, *wave_view; + float + *sine_map; + Image *canvas_image, *wave_image; @@ -5657,9 +5660,6 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude, MagickOffsetType progress; - double - *sine_map; - register ssize_t i; @@ -5697,17 +5697,17 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude, /* Allocate sine map. */ - sine_map=(double *) AcquireQuantumMemory((size_t) wave_image->columns, + sine_map=(float *) AcquireQuantumMemory((size_t) wave_image->columns, sizeof(*sine_map)); - if (sine_map == (double *) NULL) + if (sine_map == (float *) NULL) { canvas_image=DestroyImage(canvas_image); wave_image=DestroyImage(wave_image); ThrowImageException(ResourceLimitError,"MemoryAllocationFailed"); } for (i=0; i < (ssize_t) wave_image->columns; i++) - sine_map[i]=fabs(amplitude)+amplitude*sin((double) ((2.0*MagickPI*i)/ - wave_length)); + sine_map[i]=(float) fabs(amplitude)+amplitude*sin((double) + ((2.0*MagickPI*i)/wave_length)); /* Wave image. */ @@ -5772,7 +5772,7 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude, wave_view=DestroyCacheView(wave_view); canvas_image_view=DestroyCacheView(canvas_image_view); canvas_image=DestroyImage(canvas_image); - sine_map=(double *) RelinquishMagickMemory(sine_map); + sine_map=(float *) RelinquishMagickMemory(sine_map); if (status == MagickFalse) wave_image=DestroyImage(wave_image); return(wave_image); diff --git a/configure b/configure index cd948d8f8..5d1ea3b26 100755 --- a/configure +++ b/configure @@ -4570,7 +4570,7 @@ MAGICK_PATCHLEVEL_VERSION=45 MAGICK_VERSION=7.0.8-45 -MAGICK_GIT_REVISION=15605:776fe2936:20190504 +MAGICK_GIT_REVISION=15608:eea7cf511:20190505 # Substitute library versioning @@ -26860,19 +26860,6 @@ $as_echo "#define HAVE_SOCKET 1" >>confdefs.h fi -for ac_func in acosh _aligned_malloc asinh atanh atoll atexit cabs carg cimag creal clock clock_getres clock_gettime ctime_r directio erf _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r isnan 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 realpath select seekdir sendfile setlocale socket sqrt setvbuf stat strchr 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" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - # # Check for clock_gettime(). # @@ -33841,6 +33828,21 @@ fi +# Check for functions +# +for ac_func in acosh _aligned_malloc asinh atanh atoll atexit cabs carg cimag creal clock clock_getres clock_gettime ctime_r directio erf _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r isnan 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 realpath select seekdir sendfile setlocale socket sqrt setvbuf stat strchr 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" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + # Substitute compiler name to build/link PerlMagick # diff --git a/configure.ac b/configure.ac index dae85bc88..411798a1e 100644 --- a/configure.ac +++ b/configure.ac @@ -1220,8 +1220,6 @@ AC_SEARCH_LIBS(socket, socket, MAGICK_FEATURES="DPC $MAGICK_FEATURES" ]) -AC_CHECK_FUNCS([acosh _aligned_malloc asinh atanh atoll atexit cabs carg cimag creal clock clock_getres clock_gettime ctime_r directio erf _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r isnan 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 realpath select seekdir sendfile setlocale socket sqrt setvbuf stat strchr 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(). # @@ -2960,6 +2958,10 @@ AC_SUBST(XML_LIBS) dnl =========================================================================== +# Check for functions +# +AC_CHECK_FUNCS([acosh _aligned_malloc asinh atanh atoll atexit cabs carg cimag creal clock clock_getres clock_gettime ctime_r directio erf _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r isnan 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 realpath select seekdir sendfile setlocale socket sqrt setvbuf stat strchr 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]) + # Substitute compiler name to build/link PerlMagick # AC_SUBST([PERLMAINCC]) -- 2.40.0