Eliminate compiler warnings

diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c
index 7269e889c2162ea81f9994dc74a37db2cfee6048..38e373197d5ada43730c108166db868de3ca33e2 100644 (file)
--- a/MagickCore/accelerate.c
+++ b/MagickCore/accelerate.c
@@ -7735,8 +7735,9 @@ MagickExport Image *AccelerateLocalContrastImage(
 }
 
 MagickExport MagickBooleanType AccelerateModulateImage(
-  Image *magick_unused(image),double magick_unused(percent_brightness),
-  double magick_unused(percent_hue),double magick_unused(percent_saturation),
+  Image *magick_unused(image),const double magick_unused(percent_brightness),
+  const double magick_unused(percent_hue),
+  const double magick_unused(percent_saturation),
   ColorspaceType magick_unused(colorspace),
   ExceptionInfo *magick_unused(exception))
 {
@@ -7825,4 +7826,4 @@ MagickExport Image *AccelerateWaveletDenoiseImage(
 
   return((Image *)NULL);
 }
-#endif /* MAGICKCORE_OPENCL_SUPPORT */
\ No newline at end of file
+#endif /* MAGICKCORE_OPENCL_SUPPORT */

diff --git a/MagickCore/accelerate.h b/MagickCore/accelerate.h
index 6a47a0e8920fcb2af75059ded5256ba4bce0f651..19e5c7db52d87d5319f7452e4c5168c6c1c0fddd 100644 (file)
--- a/MagickCore/accelerate.h
+++ b/MagickCore/accelerate.h
@@ -53,9 +53,9 @@ extern MagickExport MagickBooleanType
   AccelerateEqualizeImage(Image *,ExceptionInfo *),
   AccelerateFunctionImage(Image *,const MagickFunction,const size_t,
     const double *,ExceptionInfo *),
-  AccelerateGrayscaleImage(Image*,const PixelIntensityMethod,
+  AccelerateGrayscaleImage(Image *,const PixelIntensityMethod,
     ExceptionInfo *),
-  AccelerateModulateImage(Image*,const double,const double,const double,
+  AccelerateModulateImage(Image *,const double,const double,const double,
     const ColorspaceType, ExceptionInfo*),
   AccelerateRandomImage(Image*,ExceptionInfo*);
 

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 020a7d8d6ab47efc0680621f0a97e05429d63202..9f1fcfb7fd207775cabf54b5b09ccaf668f16146 100644 (file)
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -5937,7 +5937,7 @@ MagickExport Image *WaveletDenoiseImage(const Image *image,
 #endif
       for (x=0; x < (ssize_t) image->columns; x++)
         HatTransform(pixels+pass+x*image->rows,image->columns,image->rows,
-          1UL << level,pixels+low_pass+x);
+          (size_t) (1 << level),pixels+low_pass+x);
       /*
         Filter vertically and transpose.
       */
@@ -5947,7 +5947,7 @@ MagickExport Image *WaveletDenoiseImage(const Image *image,
 #endif
       for (y=0; y < (ssize_t) image->rows; y++)
         HatTransform(pixels+high_pass+y*image->columns,image->rows,
-          image->columns,1UL << level,pixels+pass+y);
+          image->columns,(size_t) (1 << level),pixels+pass+y);
       /*
         To threshold, each coefficient is compared to a threshold value and
         attenuated / shrunk by some factor.