(no commit message)

diff --git a/MagickCore/animate.c b/MagickCore/animate.c
index aba1d86e5440f0692c731c7d4fd5334d4487982d..a76471308aaaf0d85221cea6ceb4e7769bfe74dc 100644 (file)
--- a/MagickCore/animate.c
+++ b/MagickCore/animate.c
@@ -314,6 +314,10 @@ MagickExport MagickBooleanType AnimateImages(const ImageInfo *image_info,
   resource_info.immutable=MagickTrue;
   argv[0]=AcquireString(GetClientName());
   (void) XAnimateImages(display,&resource_info,argv,1,images,exception);
+  SetErrorHandler((ErrorHandler) NULL);
+  SetWarningHandler((WarningHandler) NULL);
+  SetErrorHandler((ErrorHandler) NULL);
+  SetWarningHandler((WarningHandler) NULL);
   argv[0]=DestroyString(argv[0]);
   (void) XCloseDisplay(display);
   XDestroyResourceInfo(&resource_info);

diff --git a/MagickCore/display.c b/MagickCore/display.c
index 1c93b078d35dc4976c60b0439fef52d8716eee0f..85c4583db061caf1639b228fe114c4961649ea1e 100644 (file)
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -1695,6 +1695,8 @@ MagickExport MagickBooleanType DisplayImages(const ImageInfo *image_info,
     image=GetImageFromList(images,i % GetImageListLength(images));
     (void) XDisplayImage(display,&resource_info,argv,1,&image,&state,exception);
   }
+  SetErrorHandler((ErrorHandler) NULL);
+  SetWarningHandler((WarningHandler) NULL);
   argv[0]=DestroyString(argv[0]);
   (void) XCloseDisplay(display);
   XDestroyResourceInfo(&resource_info);

diff --git a/MagickCore/stream.c b/MagickCore/stream.c
index d29bc4209b9d8b6eaa660eff79995afc120fd570..99a13e21efc3acf810331d574eb59d8a2c3f17b0 100644 (file)
--- a/MagickCore/stream.c
+++ b/MagickCore/stream.c
@@ -489,15 +489,17 @@ static MagickBooleanType GetOneVirtualPixelFromStream(const Image *image,
   PixelPacket *pixel,ExceptionInfo *exception)
 {
   const Quantum
-    *q;
+    *p;
 
   assert(image != (Image *) NULL);
   assert(image->signature == MagickSignature);
   *pixel=image->background_color;
-  q=GetVirtualPixelStream(image,virtual_pixel_method,x,y,1,1,exception);
-  if (q != (const Quantum *) NULL)
+  p=GetVirtualPixelStream(image,virtual_pixel_method,x,y,1,1,exception);
+  if (p == (const Quantum *) NULL)
     return(MagickFalse);
-  GetPixelPacket(image,q,pixel);
+  GetPixelPacket(image,p,pixel);
+  if (image->colorspace == CMYKColorspace)
+    pixel->black=GetPixelBlack(image,p);
   return(MagickTrue);
 }
 \f