(no commit message)

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 3680c5045ea7ec21f71c20b29afa905c4f3226e8..f12de0efd16a1d021e9ad2101f3f62cd331e5f4a 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -3268,30 +3268,30 @@ MagickExport const Quantum *GetVirtualPixelsFromNexus(const Image *image,
       {
         case BlackVirtualPixelMethod:
         {
-          for (i=0; i < cache_info->number_channels; i++)
-            SetPixelChannel(image,i,0,virtual_pixel);
+          for (i=0; i < (ssize_t) cache_info->number_channels; i++)
+            SetPixelChannel(image,(PixelChannel) i,0,virtual_pixel);
           SetPixelAlpha(image,OpaqueAlpha,virtual_pixel);
           break;
         }
         case GrayVirtualPixelMethod:
         {
-          for (i=0; i < cache_info->number_channels; i++)
-            SetPixelChannel(image,i,QuantumRange/2,virtual_pixel);
+          for (i=0; i < (ssize_t) cache_info->number_channels; i++)
+            SetPixelChannel(image,(PixelChannel) i,QuantumRange/2,virtual_pixel);
           SetPixelAlpha(image,OpaqueAlpha,virtual_pixel);
           break;
         }
         case TransparentVirtualPixelMethod:
         {
-          for (i=0; i < cache_info->number_channels; i++)
-            SetPixelChannel(image,i,0,virtual_pixel);
+          for (i=0; i < (ssize_t) cache_info->number_channels; i++)
+            SetPixelChannel(image,(PixelChannel) i,0,virtual_pixel);
           SetPixelAlpha(image,TransparentAlpha,virtual_pixel);
           break;
         }
         case MaskVirtualPixelMethod:
         case WhiteVirtualPixelMethod:
         {
-          for (i=0; i < cache_info->number_channels; i++)
-            SetPixelChannel(image,i,QuantumRange,virtual_pixel);
+          for (i=0; i < (ssize_t) cache_info->number_channels; i++)
+            SetPixelChannel(image,(PixelChannel) i,QuantumRange,virtual_pixel);
           SetPixelAlpha(image,OpaqueAlpha,virtual_pixel);
           break;
         }

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index c4008e7d58d6c40f64143fac2748301916f65305..d7a2eb80c8473ea1f74f6b2514a0275098bea4b0 100644 (file)
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -1352,10 +1352,10 @@ MagickExport Image *ConvolveImage(const Image *image,
         ssize_t
           v;
 
-        traits=GetPixelChannelMapTraits(image,i);
+        traits=GetPixelChannelMapTraits(image,(PixelChannel) i);
         if (traits == UndefinedPixelTrait)
           continue;
-        channel=GetPixelChannelMapChannel(image,i);
+        channel=GetPixelChannelMapChannel(image,(PixelChannel) i);
         convolve_traits=GetPixelChannelMapTraits(convolve_image,channel);
         if (convolve_traits == UndefinedPixelTrait)
           continue;

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 9002a55f6ee8504fd986a62d36a0ca552edfb250..09772a5f860fd090fb0018c7f0dc73bca1bd483b 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -12,9 +12,7 @@
 /* #undef AUTOTRACE_DELEGATE */
 
 /* Define if coders and filters are to be built as modules. */
-#ifndef MAGICKCORE_BUILD_MODULES
-#define MAGICKCORE_BUILD_MODULES 1
-#endif
+/* #undef BUILD_MODULES */
 
 /* Define if you have the bzip2 library */
 #ifndef MAGICKCORE_BZLIB_DELEGATE
@@ -533,9 +531,7 @@
 #endif
 
 /* Define to 1 if you have a working `mmap' system call. */
-#ifndef MAGICKCORE_HAVE_MMAP_FILEIO
-#define MAGICKCORE_HAVE_MMAP_FILEIO 1
-#endif
+/* #undef HAVE_MMAP_FILEIO */
 
 /* Define to 1 if you have the `munmap' function. */
 #ifndef MAGICKCORE_HAVE_MUNMAP
@@ -1111,9 +1107,7 @@
 #endif
 
 /* Define to 1 if the system has the type `_Bool'. */
-#ifndef MAGICKCORE_HAVE__BOOL
-#define MAGICKCORE_HAVE__BOOL 1
-#endif
+/* #undef HAVE__BOOL */
 
 /* Define to 1 if you have the `_exit' function. */
 #ifndef MAGICKCORE_HAVE__EXIT
@@ -1188,9 +1182,7 @@
 #endif
 
 /* Define if using libltdl to support dynamically loadable modules */
-#ifndef MAGICKCORE_LTDL_DELEGATE
-#define MAGICKCORE_LTDL_DELEGATE 1
-#endif
+/* #undef LTDL_DELEGATE */
 
 /* Define if the OS needs help to load dependent libraries for dlopen(). */
 /* #undef LTDL_DLOPEN_DEPLIBS */

diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h
index 3799e4719c71b3a15ea28706280035eddb29b804..c6f96ab4ecdc36777f5bbb41a2753c8893004198 100644 (file)
--- a/MagickCore/pixel-accessor.h
+++ b/MagickCore/pixel-accessor.h
@@ -73,7 +73,7 @@ static inline Quantum GetPixelChannel(const Image *image,
   return(pixel[image->channel_map[image->map][channel].channel]);
 }
 
-static inline Quantum GetPixelChannelMapChannel(const Image *image,
+static inline PixelChannel GetPixelChannelMapChannel(const Image *image,
   const PixelChannel channel)
 {
   return(image->channel_map[image->map][channel].channel);

diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index 4aa006d3275f6766ec7dac85736ad26a699dbec6..8117af9671881a0d97fd5c633d79f5c941b4addf 100644 (file)
--- a/MagickCore/threshold.c
+++ b/MagickCore/threshold.c
@@ -257,10 +257,10 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image,
         ssize_t
           v;
 
-        traits=GetPixelChannelMapTraits(image,i);
+        traits=GetPixelChannelMapTraits(image,(PixelChannel) i);
         if (traits == UndefinedPixelTrait)
           continue;
-        channel=GetPixelChannelMapChannel(image,i);
+        channel=GetPixelChannelMapChannel(image,(PixelChannel) i);
         threshold_traits=GetPixelChannelMapTraits(threshold_image,channel);
         if (threshold_traits == UndefinedPixelTrait)
           continue;