From: cristy Date: Thu, 20 Oct 2011 18:43:18 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~6773 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6fccee1683f6c6d17f30dad4c9bd4fea48d66ca1;p=imagemagick --- diff --git a/MagickCore/blob.c b/MagickCore/blob.c index 3fbe05631..2e345af23 100644 --- a/MagickCore/blob.c +++ b/MagickCore/blob.c @@ -2424,7 +2424,7 @@ MagickExport MagickBooleanType OpenBlob(const ImageInfo *image_info, Form filename for multi-part images. */ (void) InterpretImageFilename(image_info,image,image->filename,(int) - image->scene,filename); + image->scene,filename,exception); if ((LocaleCompare(filename,image->filename) == 0) && ((GetPreviousImageInList(image) != (Image *) NULL) || (GetNextImageInList(image) != (Image *) NULL))) diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c index edd9124a0..c8aeff1cf 100644 --- a/MagickCore/constitute.c +++ b/MagickCore/constitute.c @@ -328,7 +328,7 @@ MagickExport Image *PingImages(const ImageInfo *image_info, image_info->filename); assert(exception != (ExceptionInfo *) NULL); (void) InterpretImageFilename(image_info,(Image *) NULL,image_info->filename, - (int) image_info->scene,filename); + (int) image_info->scene,filename,exception); if (LocaleCompare(filename,image_info->filename) != 0) { ExceptionInfo @@ -351,7 +351,7 @@ MagickExport Image *PingImages(const ImageInfo *image_info, for (scene=(ssize_t) read_info->scene; scene < (ssize_t) extent; scene++) { (void) InterpretImageFilename(image_info,(Image *) NULL,filename,(int) - scene,read_info->filename); + scene,read_info->filename,exception); image=PingImage(read_info,exception); if (image == (Image *) NULL) continue; @@ -840,7 +840,7 @@ MagickExport Image *ReadImages(const ImageInfo *image_info, image_info->filename); assert(exception != (ExceptionInfo *) NULL); (void) InterpretImageFilename(image_info,(Image *) NULL,image_info->filename, - (int) image_info->scene,filename); + (int) image_info->scene,filename,exception); if (LocaleCompare(filename,image_info->filename) != 0) { ExceptionInfo @@ -868,7 +868,7 @@ MagickExport Image *ReadImages(const ImageInfo *image_info, for (scene=(ssize_t) read_info->scene; scene < (ssize_t) extent; scene++) { (void) InterpretImageFilename(image_info,(Image *) NULL,filename,(int) - scene,read_info->filename); + scene,read_info->filename,exception); image=ReadImage(read_info,exception); if (image == (Image *) NULL) continue; diff --git a/MagickCore/image.c b/MagickCore/image.c index 65c7eb593..5dc96efb4 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -271,7 +271,7 @@ MagickExport Image *AcquireImage(const ImageInfo *image_info, if (image_info->cache != (void *) NULL) ClonePixelCacheMethods(image->cache,image_info->cache); (void) SetImageVirtualPixelMethod(image,image_info->virtual_pixel_method); - (void) SyncImageSettings(image_info,image); + (void) SyncImageSettings(image_info,image,exception); option=GetImageOption(image_info,"delay"); if (option != (const char *) NULL) { @@ -705,25 +705,25 @@ MagickExport MagickBooleanType ClipImagePath(Image *image,const char *pathname, property=DestroyString(property); if (value == (const char *) NULL) { - ThrowFileException(&image->exception,OptionError,"NoClipPathDefined", + ThrowFileException(exception,OptionError,"NoClipPathDefined", image->filename); return(MagickFalse); } image_info=AcquireImageInfo(); (void) CopyMagickString(image_info->filename,image->filename,MaxTextExtent); (void) ConcatenateMagickString(image_info->filename,pathname,MaxTextExtent); - clip_mask=BlobToImage(image_info,value,strlen(value),&image->exception); + clip_mask=BlobToImage(image_info,value,strlen(value),exception); image_info=DestroyImageInfo(image_info); if (clip_mask == (Image *) NULL) return(MagickFalse); if (clip_mask->storage_class == PseudoClass) { (void) SyncImage(clip_mask,exception); - if (SetImageStorageClass(clip_mask,DirectClass,&image->exception) == MagickFalse) + if (SetImageStorageClass(clip_mask,DirectClass,exception) == MagickFalse) return(MagickFalse); } if (inside == MagickFalse) - (void) NegateImage(clip_mask,MagickFalse,&image->exception); + (void) NegateImage(clip_mask,MagickFalse,exception); (void) FormatLocaleString(clip_mask->magick_filename,MaxTextExtent, "8BIM:1999,2998:%s\nPS",pathname); (void) SetImageClipMask(image,clip_mask,exception); @@ -1648,7 +1648,8 @@ MagickExport VirtualPixelMethod GetImageVirtualPixelMethod(const Image *image) % The format of the InterpretImageFilename method is: % % size_t InterpretImageFilename(const ImageInfo *image_info, -% Image *image,const char *format,int value,char *filename) +% Image *image,const char *format,int value,char *filename, +% ExceptionInfo *exception) % % A description of each parameter follows. % @@ -1663,9 +1664,12 @@ MagickExport VirtualPixelMethod GetImageVirtualPixelMethod(const Image *image) % % o filename: return the formatted filename in this character buffer. % +% o exception: return any errors or warnings in this structure. +% */ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, - Image *image,const char *format,int value,char *filename) + Image *image,const char *format,int value,char *filename, + ExceptionInfo *exception) { char *q; @@ -1760,10 +1764,10 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, value=(const char *) NULL; if ((image_info != (const ImageInfo *) NULL) && (image != (const Image *) NULL)) - value=GetMagickProperty(image_info,image,pattern,&image->exception); + value=GetMagickProperty(image_info,image,pattern,exception); else if (image != (Image *) NULL) - value=GetImageProperty(image,pattern,&image->exception); + value=GetImageProperty(image,pattern,exception); else if (image_info != (ImageInfo *) NULL) value=GetImageOption(image_info,pattern); @@ -2854,9 +2858,9 @@ MagickExport MagickBooleanType SetImageClipMask(Image *image, image->clip_mask=NewImageList(); if (clip_mask == (Image *) NULL) return(MagickTrue); - if (SetImageStorageClass(image,DirectClass,&image->exception) == MagickFalse) + if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); - image->clip_mask=CloneImage(clip_mask,0,0,MagickTrue,&image->exception); + image->clip_mask=CloneImage(clip_mask,0,0,MagickTrue,exception); if (image->clip_mask == (Image *) NULL) return(MagickFalse); return(MagickTrue); @@ -3153,7 +3157,7 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info, Test for multiple image support (e.g. image%02d.png). */ (void) InterpretImageFilename(image_info,(Image *) NULL, - image_info->filename,(int) image_info->scene,filename); + image_info->filename,(int) image_info->scene,filename,exception); if ((LocaleCompare(filename,image_info->filename) != 0) && (strchr(filename,'%') == (char *) NULL)) image_info->adjoin=MagickFalse; @@ -3355,9 +3359,9 @@ MagickExport MagickBooleanType SetImageMask(Image *image, image->mask=NewImageList(); if (mask == (Image *) NULL) return(MagickTrue); - if (SetImageStorageClass(image,DirectClass,&image->exception) == MagickFalse) + if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); - image->mask=CloneImage(mask,0,0,MagickTrue,&image->exception); + image->mask=CloneImage(mask,0,0,MagickTrue,exception); if (image->mask == (Image *) NULL) return(MagickFalse); return(MagickTrue); @@ -3500,9 +3504,9 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type, { case BilevelType: { - if (IsImageGray(image,&image->exception) == MagickFalse) + if (IsImageGray(image,exception) == MagickFalse) status=TransformImageColorspace(image,GRAYColorspace,exception); - if (IsImageMonochrome(image,&image->exception) == MagickFalse) + if (IsImageMonochrome(image,exception) == MagickFalse) { quantize_info=AcquireQuantizeInfo(image_info); quantize_info->number_colors=2; @@ -3515,14 +3519,14 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type, } case GrayscaleType: { - if (IsImageGray(image,&image->exception) == MagickFalse) + if (IsImageGray(image,exception) == MagickFalse) status=TransformImageColorspace(image,GRAYColorspace,exception); image->matte=MagickFalse; break; } case GrayscaleMatteType: { - if (IsImageGray(image,&image->exception) == MagickFalse) + if (IsImageGray(image,exception) == MagickFalse) status=TransformImageColorspace(image,GRAYColorspace,exception); if (image->matte == MagickFalse) (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception); @@ -3576,7 +3580,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type, if (IsRGBColorspace(image->colorspace) == MagickFalse) status=TransformImageColorspace(image,RGBColorspace,exception); if (image->storage_class != DirectClass) - status=SetImageStorageClass(image,DirectClass,&image->exception); + status=SetImageStorageClass(image,DirectClass,exception); image->matte=MagickFalse; break; } @@ -3585,7 +3589,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type, if (IsRGBColorspace(image->colorspace) == MagickFalse) status=TransformImageColorspace(image,RGBColorspace,exception); if (image->storage_class != DirectClass) - status=SetImageStorageClass(image,DirectClass,&image->exception); + status=SetImageStorageClass(image,DirectClass,exception); if (image->matte == MagickFalse) (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception); break; @@ -3599,7 +3603,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type, status=TransformImageColorspace(image,CMYKColorspace,exception); } if (image->storage_class != DirectClass) - status=SetImageStorageClass(image,DirectClass,&image->exception); + status=SetImageStorageClass(image,DirectClass,exception); image->matte=MagickFalse; break; } @@ -3612,7 +3616,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type, status=TransformImageColorspace(image,CMYKColorspace,exception); } if (image->storage_class != DirectClass) - status=SetImageStorageClass(image,DirectClass,&image->exception); + status=SetImageStorageClass(image,DirectClass,exception); if (image->matte == MagickFalse) status=SetImageAlphaChannel(image,OpaqueAlphaChannel,exception); break; @@ -4101,8 +4105,8 @@ MagickExport MagickBooleanType SyncImage(Image *image,ExceptionInfo *exception) } image_view=DestroyCacheView(image_view); if (range_exception != MagickFalse) - (void) ThrowMagickException(&image->exception,GetMagickModule(), - CorruptImageError,"InvalidColormapIndex","`%s'",image->filename); + (void) ThrowMagickException(exception,GetMagickModule(),CorruptImageError, + "InvalidColormapIndex","`%s'",image->filename); return(status); } @@ -4122,9 +4126,9 @@ MagickExport MagickBooleanType SyncImage(Image *image,ExceptionInfo *exception) % The format of the SyncImageSettings method is: % % MagickBooleanType SyncImageSettings(const ImageInfo *image_info, -% Image *image) +% Image *image,ExceptionInfo *exception) % MagickBooleanType SyncImagesSettings(const ImageInfo *image_info, -% Image *image) +% Image *image,ExceptionInfo *exception) % % A description of each parameter follows: % @@ -4132,10 +4136,12 @@ MagickExport MagickBooleanType SyncImage(Image *image,ExceptionInfo *exception) % % o image: the image. % +% o exception: return any errors or warnings in this structure. +% */ MagickExport MagickBooleanType SyncImagesSettings(ImageInfo *image_info, - Image *images) + Image *images,ExceptionInfo *exception) { Image *image; @@ -4148,13 +4154,13 @@ MagickExport MagickBooleanType SyncImagesSettings(ImageInfo *image_info, (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); image=images; for ( ; image != (Image *) NULL; image=GetNextImageInList(image)) - (void) SyncImageSettings(image_info,image); + (void) SyncImageSettings(image_info,image,exception); (void) DeleteImageOption(image_info,"page"); return(MagickTrue); } MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info, - Image *image) + Image *image,ExceptionInfo *exception) { char property[MaxTextExtent]; @@ -4184,7 +4190,7 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info, option=GetImageOption(image_info,"background"); if (option != (const char *) NULL) (void) QueryColorCompliance(option,AllCompliance,&image->background_color, - &image->exception); + exception); option=GetImageOption(image_info,"bias"); if (option != (const char *) NULL) image->bias=SiPrefixToDouble(option,QuantumRange); @@ -4204,7 +4210,7 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info, option=GetImageOption(image_info,"bordercolor"); if (option != (const char *) NULL) (void) QueryColorCompliance(option,AllCompliance,&image->border_color, - &image->exception); + exception); option=GetImageOption(image_info,"compose"); if (option != (const char *) NULL) image->compose=(CompositeOperator) ParseCommandOption(MagickComposeOptions, @@ -4274,7 +4280,7 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info, option=GetImageOption(image_info,"mattecolor"); if (option != (const char *) NULL) (void) QueryColorCompliance(option,AllCompliance,&image->matte_color, - &image->exception); + exception); option=GetImageOption(image_info,"orient"); if (option != (const char *) NULL) image->orientation=(OrientationType) ParseCommandOption( @@ -4323,7 +4329,7 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info, option=GetImageOption(image_info,"transparent-color"); if (option != (const char *) NULL) (void) QueryColorCompliance(option,AllCompliance,&image->transparent_color, - &image->exception); + exception); option=GetImageOption(image_info,"type"); if (option != (const char *) NULL) image->type=(ImageType) ParseCommandOption(MagickTypeOptions,MagickFalse, diff --git a/MagickCore/image.h b/MagickCore/image.h index 63da1c729..3a5ce856f 100644 --- a/MagickCore/image.h +++ b/MagickCore/image.h @@ -538,11 +538,12 @@ extern MagickExport MagickBooleanType SetImageType(Image *,const ImageType,ExceptionInfo *), StripImage(Image *,ExceptionInfo *), SyncImage(Image *,ExceptionInfo *), - SyncImageSettings(const ImageInfo *,Image *), - SyncImagesSettings(ImageInfo *,Image *); + SyncImageSettings(const ImageInfo *,Image *,ExceptionInfo *), + SyncImagesSettings(ImageInfo *,Image *,ExceptionInfo *); extern MagickExport size_t - InterpretImageFilename(const ImageInfo *,Image *,const char *,int,char *); + InterpretImageFilename(const ImageInfo *,Image *,const char *,int,char *, + ExceptionInfo *); extern MagickExport ssize_t GetImageReferenceCount(Image *); diff --git a/MagickWand/mogrify-private.h b/MagickWand/mogrify-private.h index 653330ef4..40a194ad2 100644 --- a/MagickWand/mogrify-private.h +++ b/MagickWand/mogrify-private.h @@ -24,7 +24,7 @@ extern "C" { #define AppendImageStack(images) \ { \ - (void) SyncImagesSettings(image_info,images); \ + (void) SyncImagesSettings(image_info,images,exception); \ AppendImageToList(&image_stack[k].image,images); \ image=image_stack[k].image; \ } @@ -42,7 +42,7 @@ extern "C" { if (image != (Image *) NULL) \ { \ InheritException(exception,&(image)->exception); \ - (void) SyncImagesSettings(image_info,image); \ + (void) SyncImagesSettings(image_info,image,exception); \ } \ } #define FireImageStack(postfix,advance,fire) \ diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index 7d8e0fffc..b73476e32 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -715,7 +715,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Adaptive blur image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -730,7 +730,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Adaptive resize image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) ParseRegionGeometry(*image,argv[i+1],&geometry,exception); mogrify_image=AdaptiveResizeImage(*image,geometry.width, geometry.height,interpolate_method,exception); @@ -741,7 +741,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Adaptive sharpen image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -769,7 +769,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, AlphaChannelType alpha_type; - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); alpha_type=(AlphaChannelType) ParseCommandOption(MagickAlphaOptions, MagickFalse,argv[i+1]); (void) SetImageAlphaChannel(*image,alpha_type,exception); @@ -784,7 +784,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Annotate image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); SetGeometryInfo(&geometry_info); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) @@ -832,7 +832,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Auto Adjust Gamma of image based on its mean */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) AutoGammaImage(*image,exception); break; } @@ -841,13 +841,13 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Perfectly Normalize (max/min stretch) the image */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) AutoLevelImage(*image,exception); break; } if (LocaleCompare("auto-orient",option+1) == 0) { - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); switch ((*image)->orientation) { case TopRightOrientation: @@ -901,7 +901,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Black threshold image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) BlackThresholdImage(*image,argv[i+1],exception); break; } @@ -910,7 +910,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Blue shift image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); geometry_info.rho=1.5; if (*option == '-') flags=ParseGeometry(argv[i+1],&geometry_info); @@ -922,7 +922,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Gaussian blur image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -937,7 +937,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Surround image with a border of solid color. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParsePageGeometry(*image,argv[i+1],&geometry,exception); if ((flags & SigmaValue) == 0) geometry.height=geometry.width; @@ -977,7 +977,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Brightness / contrast image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); brightness=geometry_info.rho; contrast=0.0; @@ -999,7 +999,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Color correct with a color decision list. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); color_correction_collection=FileToString(argv[i+1],~0,exception); if (color_correction_collection == (char *) NULL) break; @@ -1021,7 +1021,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Charcoal image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -1036,7 +1036,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Chop the image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) ParseGravityGeometry(*image,argv[i+1],&geometry,exception); mogrify_image=ChopImage(*image,&geometry,exception); break; @@ -1046,13 +1046,13 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Clamp image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) ClampImage(*image,exception); break; } if (LocaleCompare("clip",option+1) == 0) { - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); if (*option == '+') { (void) SetImageClipMask(*image,(Image *) NULL,exception); @@ -1078,7 +1078,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, ssize_t y; - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); if (*option == '+') { /* @@ -1122,7 +1122,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, } if (LocaleCompare("clip-path",option+1) == 0) { - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) ClipImagePath(*image,argv[i+1],*option == '-' ? MagickTrue : MagickFalse,exception); break; @@ -1132,7 +1132,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Colorize the image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); mogrify_image=ColorizeImage(*image,argv[i+1],&fill,exception); break; } @@ -1141,7 +1141,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, KernelInfo *kernel; - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); kernel=AcquireKernelInfo(argv[i+1]); if (kernel == (KernelInfo *) NULL) break; @@ -1154,7 +1154,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Reduce the number of colors in the image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); quantize_info->number_colors=StringToUnsignedLong(argv[i+1]); if (quantize_info->number_colors == 0) break; @@ -1170,7 +1170,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, ColorspaceType colorspace; - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); if (*option == '+') { (void) TransformImageColorspace(*image,RGBColorspace,exception); @@ -1183,14 +1183,14 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, } if (LocaleCompare("compose",option+1) == 0) { - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); compose=(CompositeOperator) ParseCommandOption(MagickComposeOptions, MagickFalse,argv[i+1]); break; } if (LocaleCompare("contrast",option+1) == 0) { - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) ContrastImage(*image,(*option == '-') ? MagickTrue : MagickFalse,exception); break; @@ -1207,7 +1207,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Contrast stretch image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); black_point=geometry_info.rho; white_point=(flags & SigmaValue) != 0 ? geometry_info.sigma : @@ -1228,7 +1228,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, KernelInfo *kernel_info; - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); kernel_info=AcquireKernelInfo(argv[i+1]); if (kernel_info == (KernelInfo *) NULL) break; @@ -1242,7 +1242,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Crop a image to a smaller size */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); mogrify_image=CropImageToTiles(*image,argv[i+1],exception); break; } @@ -1251,7 +1251,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Cycle an image colormap. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) CycleColormapImage(*image,(ssize_t) StringToLong(argv[i+1]), exception); break; @@ -1268,7 +1268,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Decipher pixels. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); passkey=FileToStringInfo(argv[i+1],~0,exception); if (passkey != (StringInfo *) NULL) { @@ -1287,7 +1287,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, } if (LocaleCompare("depth",option+1) == 0) { - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); if (*option == '+') { (void) SetImageDepth(*image,MAGICKCORE_QUANTUM_DEPTH,exception); @@ -1305,7 +1305,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Straighten the image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); if (*option == '+') threshold=40.0*QuantumRange/100.0; else @@ -1318,7 +1318,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Reduce the speckles within an image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); mogrify_image=DespeckleImage(*image,exception); break; } @@ -1351,7 +1351,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Distort image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); method=(DistortImageMethod) ParseCommandOption(MagickDistortOptions, MagickFalse,argv[i+1]); if ( method == ResizeDistortion ) @@ -1421,7 +1421,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Draw image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) CloneString(&draw_info->primitive,argv[i+1]); (void) DrawImage(*image,draw_info,exception); break; @@ -1435,7 +1435,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Enhance edges in the image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -1448,7 +1448,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Gaussian embossen image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -1464,7 +1464,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Encipher pixels. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); passkey=FileToStringInfo(argv[i+1],~0,exception); if (passkey != (StringInfo *) NULL) { @@ -1483,7 +1483,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Enhance image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); mogrify_image=EnhanceImage(*image,exception); break; } @@ -1492,7 +1492,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Equalize image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) EqualizeImage(*image,exception); break; } @@ -1504,7 +1504,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, MagickEvaluateOperator op; - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); op=(MagickEvaluateOperator) ParseCommandOption( MagickEvaluateOptions,MagickFalse,argv[i+1]); constant=SiPrefixToDouble(argv[i+2],QuantumRange); @@ -1516,7 +1516,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Set the image extent. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGravityGeometry(*image,argv[i+1],&geometry,exception); if (geometry.width == 0) geometry.width=(*image)->columns; @@ -1582,7 +1582,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Flip image scanlines. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); mogrify_image=FlipImage(*image,exception); break; } @@ -1594,7 +1594,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Floodfill image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) ParsePageGeometry(*image,argv[i+1],&geometry,exception); (void) QueryColorCompliance(argv[i+2],AllCompliance,&target, exception); @@ -1607,7 +1607,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Flop image scanlines. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); mogrify_image=FlopImage(*image,exception); break; } @@ -1635,7 +1635,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Surround image with an ornamental border. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParsePageGeometry(*image,argv[i+1],&geometry,exception); frame_info.width=geometry.width; frame_info.height=geometry.height; @@ -1674,7 +1674,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Function Modify Image Values */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); function=(MagickFunction) ParseCommandOption(MagickFunctionOptions, MagickFalse,argv[i+1]); arguments=InterpretImageProperties(mogrify_info,*image,argv[i+2], @@ -1719,7 +1719,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Gamma image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); if (*option == '+') (*image)->gamma=InterpretLocaleValue(argv[i+1],(char **) NULL); else @@ -1733,7 +1733,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Gaussian blur image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -1748,7 +1748,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Record Image offset, Resize last image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); if (*option == '+') { if ((*image)->geometry != (char *) NULL) @@ -1792,7 +1792,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, char *text; - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); if (format == (char *) NULL) { (void) IdentifyImage(*image,stdout,mogrify_info->verbose, @@ -1813,7 +1813,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Implode image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) ParseGeometry(argv[i+1],&geometry_info); mogrify_image=ImplodeImage(*image,geometry_info.rho, interpolate_method,exception); @@ -1865,7 +1865,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Local adaptive threshold image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & PercentValue) != 0) geometry_info.xi=(double) QuantumRange*geometry_info.xi/100.0; @@ -1887,7 +1887,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Parse levels. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); black_point=geometry_info.rho; white_point=(MagickRealType) QuantumRange; @@ -1959,7 +1959,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, MagickStatusType flags; - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); black_point=geometry_info.rho; white_point=(MagickRealType) (*image)->columns*(*image)->rows; @@ -1987,7 +1987,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Liquid rescale image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseRegionGeometry(*image,argv[i+1],&geometry,exception); if ((flags & XValue) == 0) geometry.x=1; @@ -2014,7 +2014,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Transform image colors to match this set of colors. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); if (*option == '+') break; remap_image=GetImageCache(mogrify_info,argv[i+1],exception); @@ -2029,7 +2029,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, Image *mask; - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); if (*option == '+') { /* @@ -2059,7 +2059,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Median filter image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=geometry_info.rho; @@ -2072,7 +2072,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Mode image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=geometry_info.rho; @@ -2082,7 +2082,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, } if (LocaleCompare("modulate",option+1) == 0) { - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) ModulateImage(*image,argv[i+1],exception); break; } @@ -2100,7 +2100,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, } if (LocaleCompare("monochrome",option+1) == 0) { - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) SetImageType(*image,BilevelType,exception); break; } @@ -2124,7 +2124,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Morphological Image Operation */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); p=argv[i+1]; GetMagickToken(p,&p,token); method=(MorphologyMethod) ParseCommandOption( @@ -2153,7 +2153,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Motion blur image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -2168,14 +2168,14 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, { if (LocaleCompare("negate",option+1) == 0) { - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) NegateImage(*image,*option == '+' ? MagickTrue : MagickFalse,exception); break; } if (LocaleCompare("noise",option+1) == 0) { - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); if (*option == '-') { flags=ParseGeometry(argv[i+1],&geometry_info); @@ -2197,7 +2197,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, } if (LocaleCompare("normalize",option+1) == 0) { - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) NormalizeImage(*image,exception); break; } @@ -2210,7 +2210,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, PixelInfo target; - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) QueryColorCompliance(argv[i+1],AllCompliance,&target, exception); (void) OpaquePaintImage(*image,&target,&fill,*option == '-' ? @@ -2219,7 +2219,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, } if (LocaleCompare("ordered-dither",option+1) == 0) { - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) OrderedPosterizeImage(*image,argv[i+1],exception); break; } @@ -2229,7 +2229,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, { if (LocaleCompare("paint",option+1) == 0) { - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) ParseGeometry(argv[i+1],&geometry_info); mogrify_image=OilPaintImage(*image,geometry_info.rho, geometry_info.sigma,exception); @@ -2267,7 +2267,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Simulate a Polaroid picture. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); random_info=AcquireRandomInfo(); angle=22.5*(GetPseudoRandomValue(random_info)-0.5); random_info=DestroyRandomInfo(random_info); @@ -2286,7 +2286,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Posterize image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) PosterizeImage(*image,StringToUnsignedLong(argv[i+1]), quantize_info->dither,exception); break; @@ -2299,7 +2299,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Preview image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); if (*option == '+') preview_type=UndefinedPreview; else @@ -2322,7 +2322,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, ImageInfo *profile_info; - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); if (*option == '+') { /* @@ -2397,7 +2397,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Radial blur image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); mogrify_image=RadialBlurImage(*image,geometry_info.rho, geometry_info.sigma,exception); @@ -2420,7 +2420,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Threshold image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) RandomThresholdImage(*image,argv[i+1],exception); break; } @@ -2429,7 +2429,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, KernelInfo *kernel; - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); kernel=AcquireKernelInfo(argv[i+1]); if (kernel == (KernelInfo *) NULL) break; @@ -2439,7 +2439,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, } if (LocaleCompare("region",option+1) == 0) { - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); if (region_image != (Image *) NULL) { /* @@ -2469,7 +2469,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, } if (LocaleCompare("render",option+1) == 0) { - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); draw_info->render=(*option == '+') ? MagickTrue : MagickFalse; break; } @@ -2481,7 +2481,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Transform image colors to match this set of colors. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); if (*option == '+') break; remap_image=GetImageCache(mogrify_info,argv[i+1],exception); @@ -2506,7 +2506,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Resample image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=geometry_info.rho; @@ -2519,7 +2519,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Resize image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) ParseRegionGeometry(*image,argv[i+1],&geometry,exception); mogrify_image=ResizeImage(*image,geometry.width,geometry.height, (*image)->filter,(*image)->blur,exception); @@ -2530,7 +2530,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Roll image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) ParsePageGeometry(*image,argv[i+1],&geometry,exception); mogrify_image=RollImage(*image,geometry.x,geometry.y,exception); break; @@ -2543,7 +2543,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Check for conditional image rotation. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); if (strchr(argv[i+1],'>') != (char *) NULL) if ((*image)->columns <= (*image)->rows) break; @@ -2570,7 +2570,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Sample image with pixel replication. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) ParseRegionGeometry(*image,argv[i+1],&geometry,exception); mogrify_image=SampleImage(*image,geometry.width,geometry.height, exception); @@ -2581,7 +2581,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Resize image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) ParseRegionGeometry(*image,argv[i+1],&geometry,exception); mogrify_image=ScaleImage(*image,geometry.width,geometry.height, exception); @@ -2592,7 +2592,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Selectively blur pixels within a contrast threshold. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & PercentValue) != 0) geometry_info.xi=(double) QuantumRange*geometry_info.xi/100.0; @@ -2605,7 +2605,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Break channels into separate images. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); mogrify_image=SeparateImages(*image,exception); break; } @@ -2617,7 +2617,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Sepia-tone image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); threshold=SiPrefixToDouble(argv[i+1],QuantumRange); mogrify_image=SepiaToneImage(*image,threshold,exception); break; @@ -2627,7 +2627,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Segment image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -2682,7 +2682,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Shade image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -2695,7 +2695,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Shadow image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -2713,7 +2713,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Sharpen image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -2728,7 +2728,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Shave the image edges. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParsePageGeometry(*image,argv[i+1],&geometry,exception); mogrify_image=ShaveImage(*image,&geometry,exception); break; @@ -2738,7 +2738,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Shear image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=geometry_info.rho; @@ -2751,7 +2751,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Sigmoidal non-linearity contrast control. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=(double) QuantumRange/2.0; @@ -2768,7 +2768,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Sketch image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -2781,7 +2781,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, double threshold; - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); threshold=SiPrefixToDouble(argv[i+1],QuantumRange); (void) SolarizeImage(*image,threshold,exception); break; @@ -2797,7 +2797,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Sparse Color Interpolated Gradient */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); method=(SparseColorMethod) ParseCommandOption( MagickSparseColorOptions,MagickFalse,argv[i+1]); arguments=InterpretImageProperties(mogrify_info,*image,argv[i+2], @@ -2814,7 +2814,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Splice a solid color into the image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) ParseGravityGeometry(*image,argv[i+1],&geometry,exception); mogrify_image=SpliceImage(*image,&geometry,exception); break; @@ -2824,7 +2824,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Spread an image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) ParseGeometry(argv[i+1],&geometry_info); mogrify_image=SpreadImage(*image,geometry_info.rho, interpolate_method,exception); @@ -2835,7 +2835,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, StatisticType type; - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); type=(StatisticType) ParseCommandOption(MagickStatisticOptions, MagickFalse,argv[i+1]); (void) ParseGeometry(argv[i+2],&geometry_info); @@ -2859,7 +2859,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Strip image of profiles and comments. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) StripImage(*image,exception); break; } @@ -2908,7 +2908,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Swirl image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) ParseGeometry(argv[i+1],&geometry_info); mogrify_image=SwirlImage(*image,geometry_info.rho, interpolate_method,exception); @@ -2926,7 +2926,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Threshold image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); if (*option == '+') threshold=(double) QuantumRange/2; else @@ -2939,7 +2939,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Thumbnail image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) ParseRegionGeometry(*image,argv[i+1],&geometry,exception); mogrify_image=ThumbnailImage(*image,geometry.width,geometry.height, exception); @@ -2962,7 +2962,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Tint the image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); mogrify_image=TintImage(*image,argv[i+1],&fill,exception); break; } @@ -2971,7 +2971,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Affine transform image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); mogrify_image=AffineTransformImage(*image,&draw_info->affine, exception); break; @@ -2981,7 +2981,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, PixelInfo target; - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) QueryColorCompliance(argv[i+1],AllCompliance,&target, exception); (void) TransparentPaintImage(*image,&target,(Quantum) @@ -2994,7 +2994,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Transpose image scanlines. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); mogrify_image=TransposeImage(*image,exception); break; } @@ -3003,7 +3003,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Transverse image scanlines. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); mogrify_image=TransverseImage(*image,exception); break; } @@ -3017,7 +3017,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Trim image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); mogrify_image=TrimImage(*image,exception); break; } @@ -3026,7 +3026,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, ImageType type; - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); if (*option == '+') type=UndefinedType; else @@ -3062,7 +3062,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Unique image colors. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); mogrify_image=UniqueImageColors(*image,exception); break; } @@ -3071,7 +3071,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Unsharp mask image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -3098,7 +3098,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Vignette image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -3133,7 +3133,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Wave image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -3163,7 +3163,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* White threshold image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) WhiteThresholdImage(*image,argv[i+1],exception); break; } @@ -3184,7 +3184,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, /* Composite transformed region onto image. */ - (void) SyncImageSettings(mogrify_info,*image); + (void) SyncImageSettings(mogrify_info,*image,exception); (void) CompositeImage(region_image,region_image->matte != MagickFalse ? CopyCompositeOp : OverCompositeOp,*image, region_geometry.x,region_geometry.y,exception); @@ -7293,7 +7293,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, { if (LocaleCompare("affinity",option+1) == 0) { - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); if (*option == '+') { (void) RemapImages(quantize_info,*images,(Image *) NULL, @@ -7308,7 +7308,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, Image *append_image; - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); append_image=AppendImages(*images,*option == '-' ? MagickTrue : MagickFalse,exception); if (append_image == (Image *) NULL) @@ -7328,7 +7328,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, /* Average an image sequence (deprecated). */ - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); average_image=EvaluateImages(*images,MeanEvaluateOperator, exception); if (average_image == (Image *) NULL) @@ -7364,7 +7364,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, *clut_image, *image; - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); image=RemoveFirstImageFromList(images); clut_image=RemoveFirstImageFromList(images); if (clut_image == (Image *) NULL) @@ -7383,7 +7383,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, Image *coalesce_image; - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); coalesce_image=CoalesceImages(*images,exception); if (coalesce_image == (Image *) NULL) { @@ -7399,7 +7399,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, Image *combine_image; - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); combine_image=CombineImages(*images,exception); if (combine_image == (Image *) NULL) { @@ -7420,7 +7420,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, RectangleInfo geometry; - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); image=RemoveFirstImageFromList(images); composite_image=RemoveFirstImageFromList(images); if (composite_image == (Image *) NULL) @@ -7475,7 +7475,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, Image *deconstruct_image; - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); deconstruct_image=CompareImagesLayers(*images,CompareAnyLayer, exception); if (deconstruct_image == (Image *) NULL) @@ -7532,7 +7532,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, exception); } AppendImageToList(images, duplicate_images); - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); break; } break; @@ -7547,7 +7547,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, MagickEvaluateOperator op; - (void) SyncImageSettings(mogrify_info,*images); + (void) SyncImageSettings(mogrify_info,*images,exception); op=(MagickEvaluateOperator) ParseCommandOption( MagickEvaluateOptions,MagickFalse,argv[i+1]); evaluate_image=EvaluateImages(*images,op,exception); @@ -7572,7 +7572,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, /* Implements the discrete Fourier transform (DFT). */ - (void) SyncImageSettings(mogrify_info,*images); + (void) SyncImageSettings(mogrify_info,*images,exception); fourier_image=ForwardFourierTransformImage(*images,*option == '-' ? MagickTrue : MagickFalse,exception); if (fourier_image == (Image *) NULL) @@ -7586,7 +7586,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, Image *flatten_image; - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); flatten_image=MergeImageLayers(*images,FlattenLayer,exception); if (flatten_image == (Image *) NULL) break; @@ -7599,7 +7599,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, Image *fx_image; - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); fx_image=FxImage(*images,argv[i+1],exception); if (fx_image == (Image *) NULL) { @@ -7620,7 +7620,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, *hald_image, *image; - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); image=RemoveFirstImageFromList(images); hald_image=RemoveFirstImageFromList(images); if (hald_image == (Image *) NULL) @@ -7649,7 +7649,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, /* Implements the inverse fourier discrete Fourier transform (DFT). */ - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); magnitude_image=RemoveFirstImageFromList(images); phase_image=RemoveFirstImageFromList(images); if (phase_image == (Image *) NULL) @@ -7722,7 +7722,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, ImageLayerMethod method; - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); layers=(Image *) NULL; method=(ImageLayerMethod) ParseCommandOption(MagickLayerOptions, MagickFalse,argv[i+1]); @@ -7885,7 +7885,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, { if (LocaleCompare("map",option+1) == 0) { - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); if (*option == '+') { (void) RemapImages(quantize_info,*images,(Image *) NULL, @@ -7903,7 +7903,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, /* Maximum image sequence (deprecated). */ - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); maximum_image=EvaluateImages(*images,MaxEvaluateOperator,exception); if (maximum_image == (Image *) NULL) { @@ -7922,7 +7922,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, /* Minimum image sequence (deprecated). */ - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); minimum_image=EvaluateImages(*images,MinEvaluateOperator,exception); if (minimum_image == (Image *) NULL) { @@ -7938,7 +7938,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, Image *morph_image; - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); morph_image=MorphImages(*images,StringToUnsignedLong(argv[i+1]), exception); if (morph_image == (Image *) NULL) @@ -7955,7 +7955,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, Image *mosaic_image; - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); mosaic_image=MergeImageLayers(*images,MosaicLayer,exception); if (mosaic_image == (Image *) NULL) { @@ -7975,7 +7975,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, char *string; - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); string=InterpretImageProperties(mogrify_info,*images,argv[i+1], exception); if (string == (char *) NULL) @@ -7992,7 +7992,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, j, number_arguments; - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); arguments=StringToArgv(argv[i+1],&number_arguments); if (arguments == (char **) NULL) break; @@ -8073,7 +8073,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, ssize_t offset; - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); offset=(ssize_t) StringToLong(argv[i+1]); smush_image=SmushImages(*images,*option == '-' ? MagickTrue : MagickFalse,offset,exception); @@ -8144,7 +8144,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, ImageInfo *write_info; - (void) SyncImagesSettings(mogrify_info,*images); + (void) SyncImagesSettings(mogrify_info,*images,exception); (void) FormatLocaleString(key,MaxTextExtent,"cache:%s",argv[i+1]); (void) DeleteImageRegistry(key); write_images=(*images); diff --git a/MagickWand/montage.c b/MagickWand/montage.c index 5ea266a3b..92189664f 100644 --- a/MagickWand/montage.c +++ b/MagickWand/montage.c @@ -414,7 +414,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info, Form filename for multi-part images. */ (void) InterpretImageFilename(image_info,(Image *) NULL, - image_info->filename,(int) scene,filename); + image_info->filename,(int) scene,filename,exception); if (LocaleCompare(filename,image_info->filename) == 0) (void) FormatLocaleString(filename,MaxTextExtent,"%s.%.20g", image_info->filename,(double) scene); diff --git a/MagickWand/operation.c b/MagickWand/operation.c index 8bd5a3aa9..b63e4a3bc 100644 --- a/MagickWand/operation.c +++ b/MagickWand/operation.c @@ -1600,7 +1600,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, { if (LocaleCompare("adaptive-blur",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -1615,7 +1615,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* FUTURE: this is really a "interpolate-resize" operator "adaptive-resize" uses a fixed "Mesh" interpolation */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) ParseRegionGeometry(*image,argv[1],&geometry,exception); new_image=AdaptiveResizeImage(*image,geometry.width, geometry.height,interpolate_method,exception); @@ -1626,7 +1626,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Adaptive sharpen image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -1641,7 +1641,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, AlphaChannelType alpha_type; - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); alpha_type=(AlphaChannelType) ParseCommandOption(MagickAlphaOptions, MagickFalse,argv[1]); (void) SetImageAlphaChannel(*image,alpha_type,exception); @@ -1653,7 +1653,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, *text, geometry[MaxTextExtent]; - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); SetGeometryInfo(&geometry_info); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) @@ -1683,7 +1683,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Auto Adjust Gamma of image based on its mean */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) AutoGammaImage(*image,exception); break; } @@ -1692,13 +1692,13 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Perfectly Normalize (max/min stretch) the image */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) AutoLevelImage(*image,exception); break; } if (LocaleCompare("auto-orient",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); switch ((*image)->orientation) { case TopRightOrientation: @@ -1749,13 +1749,13 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, { if (LocaleCompare("black-threshold",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) BlackThresholdImage(*image,argv[1],exception); break; } if (LocaleCompare("blue-shift",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); geometry_info.rho=1.5; if (*argv[0] == '-') flags=ParseGeometry(argv[1],&geometry_info); @@ -1765,7 +1765,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, if (LocaleCompare("blur",argv[0]+1) == 0) { /* FUTURE: use of "bias" in a blur is non-sensible */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -1791,7 +1791,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, else compose=OverCompositeOp; /* use Over not image->compose */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParsePageGeometry(*image,argv[1],&geometry,exception); if ((flags & SigmaValue) == 0) geometry.height=geometry.width; @@ -1810,7 +1810,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, MagickStatusType flags; - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); brightness=geometry_info.rho; contrast=0.0; @@ -1832,7 +1832,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Color correct with a color decision list. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); color_correction_collection=FileToString(argv[1],~0,exception); if (color_correction_collection == (char *) NULL) break; @@ -1848,7 +1848,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, } if (LocaleCompare("charcoal",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -1860,20 +1860,20 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, } if (LocaleCompare("chop",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) ParseGravityGeometry(*image,argv[1],&geometry,exception); new_image=ChopImage(*image,&geometry,exception); break; } if (LocaleCompare("clamp",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) ClampImage(*image,exception); break; } if (LocaleCompare("clip",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); if (*argv[0] == '+') { (void) SetImageClipMask(*image,(Image *) NULL,exception); @@ -1899,7 +1899,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, ssize_t y; - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); if (*argv[0] == '+') { /* Remove the write mask */ @@ -1941,14 +1941,14 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, } if (LocaleCompare("clip-path",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) ClipImagePath(*image,argv[1],*argv[0] == '-' ? MagickTrue : MagickFalse,exception); break; } if (LocaleCompare("colorize",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); new_image=ColorizeImage(*image,argv[1],draw_info->fill, exception); break; @@ -1958,7 +1958,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, KernelInfo *kernel; - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); kernel=AcquireKernelInfo(argv[1]); if (kernel == (KernelInfo *) NULL) break; @@ -1969,7 +1969,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, if (LocaleCompare("colors",argv[0]+1) == 0) { /* Reduce the number of colors in the image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); quantize_info->number_colors=StringToUnsignedLong(argv[1]); if (quantize_info->number_colors == 0) break; @@ -1988,7 +1988,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, Note that +colorspace sets "undefined" or no effect on new images, but forces images already in memory back to RGB! */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) TransformImageColorspace(*image, IfSetOption ? image_info->colorspace : RGBColorspace, exception); @@ -1996,7 +1996,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, } if (LocaleCompare("contrast",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) ContrastImage(*image,(*argv[0] == '-') ? MagickTrue : MagickFalse,exception); break; @@ -2013,7 +2013,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Contrast stretch image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); black_point=geometry_info.rho; white_point=(flags & SigmaValue) != 0 ? geometry_info.sigma : @@ -2034,7 +2034,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, KernelInfo *kernel_info; - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); kernel_info=AcquireKernelInfo(argv[1]); if (kernel_info == (KernelInfo *) NULL) break; @@ -2048,7 +2048,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Crop a image to a smaller size */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); new_image=CropImageToTiles(*image,argv[1],exception); break; } @@ -2057,7 +2057,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Cycle an image colormap. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) CycleColormapImage(*image,(ssize_t) StringToLong(argv[1]), exception); break; @@ -2074,7 +2074,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Decipher pixels. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); passkey=FileToStringInfo(argv[1],~0,exception); if (passkey != (StringInfo *) NULL) { @@ -2087,7 +2087,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, { /* the image_info->depth setting has already bee set * We just need to apply it to all images in current sequence */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) SetImageDepth(*image,image_info->depth); break; } @@ -2099,7 +2099,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Straighten the image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); if (*argv[0] == '+') threshold=40.0*QuantumRange/100.0; else @@ -2112,7 +2112,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Reduce the speckles within an image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); new_image=DespeckleImage(*image,exception); break; } @@ -2145,7 +2145,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Distort image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); method=(DistortImageMethod) ParseCommandOption(MagickDistortOptions, MagickFalse,argv[1]); if ( method == ResizeDistortion ) @@ -2198,7 +2198,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, } if (LocaleCompare("draw",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) CloneString(&draw_info->primitive,argv[1]); (void) DrawImage(*image,draw_info,exception); break; @@ -2209,7 +2209,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, { if (LocaleCompare("edge",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -2219,7 +2219,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, } if (LocaleCompare("emboss",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -2232,7 +2232,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, StringInfo *passkey; - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); passkey=FileToStringInfo(argv[1],~0,exception); if (passkey != (StringInfo *) NULL) { @@ -2243,13 +2243,13 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, } if (LocaleCompare("enhance",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); new_image=EnhanceImage(*image,exception); break; } if (LocaleCompare("equalize",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) EqualizeImage(*image,exception); break; } @@ -2261,7 +2261,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, MagickEvaluateOperator op; - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); op=(MagickEvaluateOperator) ParseCommandOption( MagickEvaluateOptions,MagickFalse,argv[1]); constant=SiPrefixToDouble(argv[2],QuantumRange); @@ -2270,7 +2270,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, } if (LocaleCompare("extent",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGravityGeometry(*image,argv[1],&geometry,exception); if (geometry.width == 0) geometry.width=(*image)->columns; @@ -2295,7 +2295,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Flip image scanlines. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); new_image=FlipImage(*image,exception); break; } @@ -2304,7 +2304,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Flop image scanlines. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); new_image=FlopImage(*image,exception); break; } @@ -2316,7 +2316,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Floodfill image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) ParsePageGeometry(*image,argv[1],&geometry,exception); (void) QueryColorCompliance(argv[2],AllCompliance,&target, exception); @@ -2339,7 +2339,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Surround image with an ornamental border. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParsePageGeometry(*image,argv[1],&geometry,exception); frame_info.width=geometry.width; frame_info.height=geometry.height; @@ -2378,7 +2378,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Function Modify Image Values */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); function=(MagickFunction) ParseCommandOption(MagickFunctionOptions, MagickFalse,argv[1]); arguments=InterpretImageProperties(image_info,*image,argv[2], @@ -2420,7 +2420,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, { if (LocaleCompare("gamma",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); if (*argv[0] == '+') (*image)->gamma=InterpretLocaleValue(argv[1],(char **) NULL); else @@ -2431,7 +2431,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, if ((LocaleCompare("gaussian-blur",argv[0]+1) == 0) || (LocaleCompare("gaussian",argv[0]+1) == 0)) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -2447,7 +2447,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, Record Image offset for composition, Resize last image. -- FUTURE depreciate this aspect */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); if (*argv[0] == '+') { if ((*image)->geometry != (char *) NULL) @@ -2480,7 +2480,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, char *text; - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); if (format == (char *) NULL) { (void) IdentifyImage(*image,stdout,image_info->verbose, @@ -2501,7 +2501,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Implode image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) ParseGeometry(argv[1],&geometry_info); new_image=ImplodeImage(*image,geometry_info.rho, interpolate_method,exception); @@ -2553,7 +2553,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Local adaptive threshold image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & PercentValue) != 0) geometry_info.xi=(double) QuantumRange*geometry_info.xi/100.0; @@ -2575,7 +2575,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Parse levels. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); black_point=geometry_info.rho; white_point=(MagickRealType) QuantumRange; @@ -2647,7 +2647,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, MagickStatusType flags; - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); black_point=geometry_info.rho; white_point=(MagickRealType) (*image)->columns*(*image)->rows; @@ -2675,7 +2675,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Liquid rescale image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseRegionGeometry(*image,argv[1],&geometry,exception); if ((flags & XValue) == 0) geometry.x=1; @@ -2702,7 +2702,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Transform image colors to match this set of colors. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); if (*argv[0] == '+') break; remap_image=GetImageCache(image_info,argv[1],exception); @@ -2717,7 +2717,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, Image *mask; - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); if (*argv[0] == '+') { /* @@ -2747,7 +2747,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Median filter image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=geometry_info.rho; @@ -2760,7 +2760,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Mode image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=geometry_info.rho; @@ -2770,7 +2770,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, } if (LocaleCompare("modulate",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) ModulateImage(*image,argv[1],exception); break; } @@ -2788,7 +2788,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, } if (LocaleCompare("monochrome",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) SetImageType(*image,BilevelType,exception); break; } @@ -2812,7 +2812,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Morphological Image Operation */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); p=argv[1]; GetMagickToken(p,&p,token); method=(MorphologyMethod) ParseCommandOption( @@ -2841,7 +2841,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Motion blur image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -2856,14 +2856,14 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, { if (LocaleCompare("negate",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) NegateImage(*image,*argv[0] == '+' ? MagickTrue : MagickFalse,exception); break; } if (LocaleCompare("noise",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); if (*argv[0] == '-') { flags=ParseGeometry(argv[1],&geometry_info); @@ -2885,7 +2885,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, } if (LocaleCompare("normalize",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) NormalizeImage(*image,exception); break; } @@ -2898,7 +2898,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, PixelInfo target; - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) QueryColorCompliance(argv[1],AllCompliance,&target, exception); (void) OpaquePaintImage(*image,&target,&fill,*argv[0] == '-' ? @@ -2907,7 +2907,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, } if (LocaleCompare("ordered-dither",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) OrderedPosterizeImage(*image,argv[1],exception); break; } @@ -2917,7 +2917,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, { if (LocaleCompare("paint",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) ParseGeometry(argv[1],&geometry_info); new_image=OilPaintImage(*image,geometry_info.rho, geometry_info.sigma,exception); @@ -2955,7 +2955,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Simulate a Polaroid picture. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); random_info=AcquireRandomInfo(); angle=22.5*(GetPseudoRandomValue(random_info)-0.5); random_info=DestroyRandomInfo(random_info); @@ -2974,7 +2974,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Posterize image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) PosterizeImage(*image,StringToUnsignedLong(argv[1]), quantize_info->dither,exception); break; @@ -2987,7 +2987,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Preview image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); if (*argv[0] == '+') preview_type=UndefinedPreview; else @@ -3010,7 +3010,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, ImageInfo *profile_info; - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); if (*argv[0] == '+') { /* @@ -3085,7 +3085,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Radial blur image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); new_image=RadialBlurImage(*image,geometry_info.rho, geometry_info.sigma,exception); @@ -3108,7 +3108,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Threshold image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) RandomThresholdImage(*image,argv[1],exception); break; } @@ -3117,7 +3117,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, KernelInfo *kernel; - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); kernel=AcquireKernelInfo(argv[1]); if (kernel == (KernelInfo *) NULL) break; @@ -3127,7 +3127,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, } if (LocaleCompare("render",argv[0]+1) == 0) { - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); draw_info->render=(*argv[0] == '+') ? MagickTrue : MagickFalse; break; } @@ -3139,7 +3139,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Transform image colors to match this set of colors. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); if (*argv[0] == '+') break; remap_image=GetImageCache(image_info,argv[1],exception); @@ -3164,7 +3164,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Resample image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=geometry_info.rho; @@ -3177,7 +3177,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Resize image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) ParseRegionGeometry(*image,argv[1],&geometry,exception); new_image=ResizeImage(*image,geometry.width,geometry.height, (*image)->filter,(*image)->blur,exception); @@ -3188,7 +3188,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Roll image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) ParsePageGeometry(*image,argv[1],&geometry,exception); new_image=RollImage(*image,geometry.x,geometry.y,exception); break; @@ -3201,7 +3201,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Check for conditional image rotation. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); if (strchr(argv[1],'>') != (char *) NULL) if ((*image)->columns <= (*image)->rows) break; @@ -3228,7 +3228,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Sample image with pixel replication. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) ParseRegionGeometry(*image,argv[1],&geometry,exception); new_image=SampleImage(*image,geometry.width,geometry.height, exception); @@ -3239,7 +3239,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Resize image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) ParseRegionGeometry(*image,argv[1],&geometry,exception); new_image=ScaleImage(*image,geometry.width,geometry.height, exception); @@ -3250,7 +3250,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Selectively blur pixels within a contrast threshold. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & PercentValue) != 0) geometry_info.xi=(double) QuantumRange*geometry_info.xi/100.0; @@ -3264,7 +3264,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, Break channels into separate images. WARNING: This can generate multiple images! */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); new_image=SeparateImages(*image,exception); break; } @@ -3276,7 +3276,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Sepia-tone image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); threshold=SiPrefixToDouble(argv[1],QuantumRange); new_image=SepiaToneImage(*image,threshold,exception); break; @@ -3286,7 +3286,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Segment image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -3337,7 +3337,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Shade image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -3350,7 +3350,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Shadow image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -3368,7 +3368,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Sharpen image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -3383,7 +3383,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Shave the image edges. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParsePageGeometry(*image,argv[1],&geometry,exception); new_image=ShaveImage(*image,&geometry,exception); break; @@ -3393,7 +3393,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Shear image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=geometry_info.rho; @@ -3406,7 +3406,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Sigmoidal non-linearity contrast control. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=(double) QuantumRange/2.0; @@ -3423,7 +3423,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Sketch image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -3436,7 +3436,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, double threshold; - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); threshold=SiPrefixToDouble(argv[1],QuantumRange); (void) SolarizeImage(*image,threshold,exception); break; @@ -3452,7 +3452,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Sparse Color Interpolated Gradient */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); method=(SparseColorMethod) ParseCommandOption( MagickSparseColorOptions,MagickFalse,argv[1]); arguments=InterpretImageProperties(image_info,*image,argv[2], @@ -3469,7 +3469,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Splice a solid color into the image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) ParseGravityGeometry(*image,argv[1],&geometry,exception); new_image=SpliceImage(*image,&geometry,exception); break; @@ -3479,7 +3479,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Spread an image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) ParseGeometry(argv[1],&geometry_info); new_image=SpreadImage(*image,geometry_info.rho, interpolate_method,exception); @@ -3490,7 +3490,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, StatisticType type; - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); type=(StatisticType) ParseCommandOption(MagickStatisticOptions, MagickFalse,argv[1]); (void) ParseGeometry(argv[2],&geometry_info); @@ -3514,7 +3514,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Strip image of profiles and comments. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) StripImage(*image,exception); break; } @@ -3562,7 +3562,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Swirl image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) ParseGeometry(argv[1],&geometry_info); new_image=SwirlImage(*image,geometry_info.rho, interpolate_method,exception); @@ -3580,7 +3580,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Threshold image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); if (*argv[0] == '+') threshold=(double) QuantumRange/2; else @@ -3593,7 +3593,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Thumbnail image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) ParseRegionGeometry(*image,argv[1],&geometry,exception); new_image=ThumbnailImage(*image,geometry.width,geometry.height, exception); @@ -3616,7 +3616,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Tint the image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); new_image=TintImage(*image,argv[1],&fill,exception); break; } @@ -3625,7 +3625,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Affine transform image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); new_image=AffineTransformImage(*image,&draw_info->affine, exception); break; @@ -3635,7 +3635,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, PixelInfo target; - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) QueryColorCompliance(argv[1],AllCompliance,&target, exception); (void) TransparentPaintImage(*image,&target,(Quantum) @@ -3648,7 +3648,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Transpose image scanlines. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); new_image=TransposeImage(*image,exception); break; } @@ -3657,7 +3657,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Transverse image scanlines. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); new_image=TransverseImage(*image,exception); break; } @@ -3671,7 +3671,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Trim image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); new_image=TrimImage(*image,exception); break; } @@ -3680,7 +3680,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, ImageType type; - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); if (*argv[0] == '+') type=UndefinedType; else @@ -3716,7 +3716,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Unique image colors. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); new_image=UniqueImageColors(*image,exception); break; } @@ -3725,7 +3725,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Unsharp mask image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -3752,7 +3752,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Vignette image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -3787,7 +3787,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* Wave image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); flags=ParseGeometry(argv[1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; @@ -3817,7 +3817,7 @@ MagickExport MagickBooleanType ApplyImageOperator(MagickWand *wand, /* White threshold image. */ - (void) SyncImageSettings(image_info,*image); + (void) SyncImageSettings(image_info,*image,exception); (void) WhiteThresholdImage(*image,argv[1],exception); break; } @@ -3904,7 +3904,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, { if (LocaleCompare("affinity",argv[0]+1) == 0) { - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); if (*argv[0] == '+') { (void) RemapImages(quantize_info,*images,(Image *) NULL, @@ -3918,7 +3918,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, Image *append_image; - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); append_image=AppendImages(*images,*argv[0] == '-' ? MagickTrue : MagickFalse,exception); if (append_image == (Image *) NULL) @@ -3938,7 +3938,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, /* Average an image sequence (deprecated). */ - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); average_image=EvaluateImages(*images,MeanEvaluateOperator, exception); if (average_image == (Image *) NULL) @@ -3974,7 +3974,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, *clut_image, *image; - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); image=RemoveFirstImageFromList(images); clut_image=RemoveFirstImageFromList(images); if (clut_image == (Image *) NULL) @@ -3993,7 +3993,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, Image *coalesce_image; - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); coalesce_image=CoalesceImages(*images,exception); if (coalesce_image == (Image *) NULL) { @@ -4009,7 +4009,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, Image *combine_image; - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); combine_image=CombineImages(*images,exception); if (combine_image == (Image *) NULL) { @@ -4053,7 +4053,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, compose=OverCompositeOp; /* use Over not image->compose */ - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); image=RemoveFirstImageFromList(images); composite_image=RemoveFirstImageFromList(images); if (composite_image == (Image *) NULL) @@ -4108,7 +4108,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, Image *deconstruct_image; - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); deconstruct_image=CompareImagesLayers(*images,CompareAnyLayer, exception); if (deconstruct_image == (Image *) NULL) @@ -4165,7 +4165,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, exception); } AppendImageToList(images, duplicate_images); - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); break; } break; @@ -4219,7 +4219,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, Image *flatten_image; - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); flatten_image=MergeImageLayers(*images,FlattenLayer,exception); if (flatten_image == (Image *) NULL) break; @@ -4232,7 +4232,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, Image *fx_image; - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); fx_image=FxImage(*images,argv[1],exception); if (fx_image == (Image *) NULL) { @@ -4253,7 +4253,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, *hald_image, *image; - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); image=RemoveFirstImageFromList(images); hald_image=RemoveFirstImageFromList(images); if (hald_image == (Image *) NULL) @@ -4282,7 +4282,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, /* Implements the inverse fourier discrete Fourier transform (DFT). */ - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); magnitude_image=RemoveFirstImageFromList(images); phase_image=RemoveFirstImageFromList(images); if (phase_image == (Image *) NULL) @@ -4355,7 +4355,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, ImageLayerMethod method; - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); layers=(Image *) NULL; method=(ImageLayerMethod) ParseCommandOption(MagickLayerOptions, MagickFalse,argv[1]); @@ -4527,7 +4527,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, { if (LocaleCompare("map",argv[0]+1) == 0) { - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); if (*argv[0] == '+') { (void) RemapImages(quantize_info,*images,(Image *) NULL, @@ -4544,7 +4544,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, /* Maximum image sequence (deprecated). */ - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); maximum_image=EvaluateImages(*images,MaxEvaluateOperator,exception); if (maximum_image == (Image *) NULL) { @@ -4563,7 +4563,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, /* Minimum image sequence (deprecated). */ - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); minimum_image=EvaluateImages(*images,MinEvaluateOperator,exception); if (minimum_image == (Image *) NULL) { @@ -4579,7 +4579,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, Image *morph_image; - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); morph_image=MorphImages(*images,StringToUnsignedLong(argv[1]), exception); if (morph_image == (Image *) NULL) @@ -4596,7 +4596,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, Image *mosaic_image; - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); mosaic_image=MergeImageLayers(*images,MosaicLayer,exception); if (mosaic_image == (Image *) NULL) { @@ -4616,7 +4616,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, char *string; - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); string=InterpretImageProperties(image_info,*images,argv[1], exception); if (string == (char *) NULL) @@ -4633,7 +4633,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, j, number_arguments; - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); arguments=StringToArgv(argv[1],&number_arguments); if (arguments == (char **) NULL) break; @@ -4714,7 +4714,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, ssize_t offset; - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); offset=(ssize_t) StringToLong(argv[1]); smush_image=SmushImages(*images,*argv[0] == '-' ? MagickTrue : MagickFalse,offset,exception); @@ -4785,7 +4785,7 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, ImageInfo *write_info; - (void) SyncImagesSettings(image_info,*images); + (void) SyncImagesSettings(image_info,*images,exception); (void) FormatLocaleString(key,MaxTextExtent,"cache:%s",argv[1]); (void) DeleteImageRegistry(key); write_images=(*images); diff --git a/coders/mpr.c b/coders/mpr.c index 993aa0fa4..4e32024c4 100644 --- a/coders/mpr.c +++ b/coders/mpr.c @@ -100,7 +100,7 @@ static Image *ReadMPRImage(const ImageInfo *image_info,ExceptionInfo *exception) image=(Image *) GetImageRegistry(ImageRegistryType,image_info->filename, exception); if (image != (Image *) NULL) - (void) SyncImageSettings(image_info,image); + (void) SyncImageSettings(image_info,image,exception); return(image); } diff --git a/coders/pdf.c b/coders/pdf.c index db9499b3a..d14ea54f2 100644 --- a/coders/pdf.c +++ b/coders/pdf.c @@ -643,7 +643,7 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception) for (i=1; ; i++) { (void) InterpretImageFilename(image_info,image,filename,(int) i, - read_info->filename); + read_info->filename,exception); if (IsPDFRendered(read_info->filename) == MagickFalse) break; (void) RelinquishUniqueFileResource(read_info->filename); @@ -652,7 +652,7 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception) for (i=1; ; i++) { (void) InterpretImageFilename(image_info,image,filename,(int) i, - read_info->filename); + read_info->filename,exception); if (IsPDFRendered(read_info->filename) == MagickFalse) break; next=ReadImage(read_info,exception); diff --git a/coders/ps.c b/coders/ps.c index 4ec4d239e..dc8d21981 100644 --- a/coders/ps.c +++ b/coders/ps.c @@ -767,7 +767,7 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) postscript_filename,input_filename); status=InvokePostscriptDelegate(read_info->verbose,command,exception); (void) InterpretImageFilename(image_info,image,filename,1, - read_info->filename); + read_info->filename,exception); if ((status == MagickFalse) || (IsPostscriptRendered(read_info->filename) == MagickFalse)) { @@ -781,7 +781,7 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) for (i=1; ; i++) { (void) InterpretImageFilename(image_info,image,filename,(int) i, - read_info->filename); + read_info->filename,exception); if (IsPostscriptRendered(read_info->filename) == MagickFalse) break; (void) RelinquishUniqueFileResource(read_info->filename); @@ -790,7 +790,7 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) for (i=1; ; i++) { (void) InterpretImageFilename(image_info,image,filename,(int) i, - read_info->filename); + read_info->filename,exception); if (IsPostscriptRendered(read_info->filename) == MagickFalse) break; next=ReadImage(read_info,exception);