From: cristy Date: Wed, 31 Aug 2011 01:05:44 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~7114 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01cdc90ac06c7346b948d317e55f93d5fc853e27;p=imagemagick --- diff --git a/MagickCore/animate.c b/MagickCore/animate.c index aba1d86e5..a76471308 100644 --- 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 1c93b078d..85c4583db 100644 --- 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 d29bc4209..99a13e21e 100644 --- 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); }