(no commit message)

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index d70533439be10fd176c12fe290138d409e9bb649..87b31c7021a020038b69408f24ef1ea67cb4952b 100644 (file)
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -892,7 +892,7 @@ MagickExport Image *BlurImage(const Image *image,const double radius,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickSignature);
-  blur_image=CloneImage(image,0,0,MagickTrue,exception);
+  blur_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
   if (blur_image == (Image *) NULL)
     return((Image *) NULL);
   if (fabs(sigma) <= MagickEpsilon)
@@ -944,7 +944,7 @@ MagickExport Image *BlurImage(const Image *image,const double radius,
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(dynamic,4) shared(progress,status)
 #endif
-  for (y=0; y < (ssize_t) blur_image->rows; y++)
+  for (y=0; y < (ssize_t) image->rows; y++)
   {
     register const Quantum
       *restrict p;
@@ -1066,7 +1066,7 @@ MagickExport Image *BlurImage(const Image *image,const double radius,
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(dynamic,4) shared(progress,status)
 #endif
-  for (x=0; x < (ssize_t) blur_image->columns; x++)
+  for (x=0; x < (ssize_t) image->columns; x++)
   {
     register const Quantum
       *restrict p;

diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index aecd19c41a5da698a8df0fd24d92e82b3589bef5..0a617a88634e5a166419dbf8ca028638df860d85 100644 (file)
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -4926,7 +4926,8 @@ MagickExport void SetPixelChannelMap(Image *image,
       GetChannelBit(channel_mask,i) != 0 ? UpdatePixelTrait : CopyPixelTrait);
   for ( ; i < MaxPixelChannels; i++)
     SetPixelChannelMapTraits(image,(PixelChannel) i,UndefinedPixelTrait);
-  SetPixelChannelMapTraits(image,IndexPixelChannel,CopyPixelTrait);
+  if (image->storage_class == PseudoClass)
+    SetPixelChannelMapTraits(image,IndexPixelChannel,CopyPixelTrait);
 }
 \f
 /*