diff options
| author | Cristy <mikayla-grace@urban-warrior.org> | 2019-05-05 12:07:47 -0400 |
|---|---|---|
| committer | Cristy <mikayla-grace@urban-warrior.org> | 2019-05-05 12:07:47 -0400 |
| commit | d2b61344a0de5037bc3451cec524620528a5c32e (patch) | |
| tree | 4a829069f7ce1dcb4cb79e1c9756135d31573e8a /MagickCore | |
| parent | eea7cf511077473d6ae32b71fc50b7cad724b53a (diff) | |
| download | ImageMagick-d2b61344a0de5037bc3451cec524620528a5c32e.tar.gz | |
...
Diffstat (limited to 'MagickCore')
| -rw-r--r-- | MagickCore/fx.c | 16 |
1 files changed, 8 insertions, 8 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); |