From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 6 Sep 2011 00:04:19 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~7074
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1685e7216ce4e5fac701834cd7db6eee6d426234;p=imagemagick

---

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index d70533439..87b31c702 100644
--- 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 aecd19c41..0a617a886 100644
--- 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);
 }
 
 /*