http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=28043

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index 4b0cac041814afbd1a3290bc6d1ee43c25bea2c0..5b374d9eb95528190d12b4181023b88a453598f4 100644 (file)
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -3515,7 +3515,8 @@ MagickExport Image *SpreadImage(const Image *image,const double radius,
 
       point.x=GetPseudoRandomValue(random_info[id]);
       point.y=GetPseudoRandomValue(random_info[id]);
-      status=InterpolatePixelChannels(image,image_view,spread_image,method,
+      status=InterpolatePixelChannels(image,image_view,spread_image,
+        method == UndefinedInterpolatePixel ? NearestInterpolatePixel : method,
         (double) x+width*(point.x-0.5),(double) y+width*(point.y-0.5),q,
         exception);
       q+=GetPixelChannels(spread_image);

diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h
index f48256d7297406546e514621853d8f9a2746feb1..c77d76fbcc984eae035eedab67fc4eb20692c080 100644 (file)
--- a/MagickCore/pixel-accessor.h
+++ b/MagickCore/pixel-accessor.h
@@ -288,10 +288,11 @@ static inline MagickRealType GetPixelLuminance(const Image *restrict image,
         0.072186f*pixel[image->channel_map[BluePixelChannel].offset];
       return(intensity);
     }
-  intensity=0.212656f*DecodePixelGamma(
+  intensity=0.212656f*DecodePixelGamma((MagickRealType)
     pixel[image->channel_map[RedPixelChannel].offset])+0.715158f*
-    DecodePixelGamma(pixel[image->channel_map[GreenPixelChannel].offset])+
-    0.072186f*DecodePixelGamma(
+    DecodePixelGamma((MagickRealType)
+    pixel[image->channel_map[GreenPixelChannel].offset])+0.072186f*
+    DecodePixelGamma((MagickRealType)
     pixel[image->channel_map[BluePixelChannel].offset]);
   return(intensity);
 }

diff --git a/configure b/configure
index 42aaf8917dc6207a6b22b55f17905f069635bd26..710f6dda8786571db70af4045220d0c93dc5b6d3 100755 (executable)
--- a/configure
+++ b/configure
@@ -4379,7 +4379,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=19325:19327
+MAGICK_SVN_REVISION=Unversioned
 
 
 # Substitute library versioning