From 755d7b3b8964e20acf1663374318aef0246fb1c5 Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 26 Dec 2011 01:59:14 +0000 Subject: [PATCH] --- PerlMagick/Magick.xs | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs index 8f80862c1..26594ab14 100644 --- a/PerlMagick/Magick.xs +++ b/PerlMagick/Magick.xs @@ -2575,7 +2575,7 @@ Append(ref,...) } } image=AppendImages(image,stack != 0 ? MagickTrue : MagickFalse,exception); - if ((image == (Image *) NULL) || (exception->severity >= ErrorException)) + if (image == (Image *) NULL) goto PerlException; for ( ; image; image=image->next) { @@ -2664,7 +2664,7 @@ Average(ref) goto PerlException; } image=EvaluateImages(image,MeanEvaluateOperator,exception); - if ((image == (Image *) NULL) || (exception->severity >= ErrorException)) + if (image == (Image *) NULL) goto PerlException; /* Create blessed Perl array for the returned image. @@ -2816,7 +2816,7 @@ BlobToImage(ref,...) for (i=number_images=0; i < n; i++) { image=BlobToImage(info->image_info,list[i],length[i],exception); - if ((image == (Image *) NULL) || (exception->severity >= ErrorException)) + if (image == (Image *) NULL) break; for ( ; image; image=image->next) { @@ -2928,7 +2928,7 @@ Clone(ref) for ( ; image; image=image->next) { clone=CloneImage(image,0,0,MagickTrue,exception); - if ((clone == (Image *) NULL) || (exception->severity >= ErrorException)) + if (clone == (Image *) NULL) break; AddImageToRegistry(sv,clone); rv=newRV(sv); @@ -3048,7 +3048,7 @@ Coalesce(ref) goto PerlException; } image=CoalesceImages(image,exception); - if ((image == (Image *) NULL) || (exception->severity >= ErrorException)) + if (image == (Image *) NULL) goto PerlException; for ( ; image; image=image->next) { @@ -3379,7 +3379,7 @@ CompareLayers(ref) } } image=CompareImagesLayers(image,method,exception); - if ((image == (Image *) NULL) || (exception->severity >= ErrorException)) + if (image == (Image *) NULL) goto PerlException; for ( ; image; image=image->next) { @@ -3691,7 +3691,7 @@ EvaluateImages(ref) } } image=EvaluateImages(image,op,exception); - if ((image == (Image *) NULL) || (exception->severity >= ErrorException)) + if (image == (Image *) NULL) goto PerlException; /* Create blessed Perl array for the returned image. @@ -4003,7 +4003,7 @@ Flatten(ref) } image->background_color=background_color; image=MergeImageLayers(image,FlattenLayer,exception); - if ((image == (Image *) NULL) || (exception->severity >= ErrorException)) + if (image == (Image *) NULL) goto PerlException; /* Create blessed Perl array for the returned image. @@ -4175,7 +4175,7 @@ Fx(ref,...) image=FxImage(image,expression,exception); if (image != (Image *) NULL) (void) SetPixelChannelMask(image,channel_mask); - if ((image == (Image *) NULL) || (exception->severity >= ErrorException)) + if (image == (Image *) NULL) goto PerlException; for ( ; image; image=image->next) { @@ -6870,7 +6870,7 @@ Layers(ref,...) } if (layers != (Image *) NULL) image=layers; - if ((image == (Image *) NULL) || (exception->severity >= ErrorException)) + if (image == (Image *) NULL) goto PerlException; for ( ; image; image=image->next) { @@ -11242,7 +11242,7 @@ Montage(ref,...) } image=MontageImageList(info->image_info,montage_info,image,exception); montage_info=DestroyMontageInfo(montage_info); - if ((image == (Image *) NULL) || (exception->severity >= ErrorException)) + if (image == (Image *) NULL) goto PerlException; if (transparent_color.alpha != TransparentAlpha) for (next=image; next; next=next->next) @@ -11377,7 +11377,7 @@ Morph(ref,...) } } image=MorphImages(image,number_frames,exception); - if ((image == (Image *) NULL) || (exception->severity >= ErrorException)) + if (image == (Image *) NULL) goto PerlException; for ( ; image; image=image->next) { @@ -11657,7 +11657,7 @@ Ping(ref,...) (void) CopyMagickString(package_info->image_info->filename,list[i], MaxTextExtent); image=PingImage(package_info->image_info,exception); - if ((image == (Image *) NULL) || (exception->severity >= ErrorException)) + if (image == (Image *) NULL) break; if ((package_info->image_info->file != (FILE *) NULL) || (package_info->image_info->blob != (void *) NULL)) @@ -13191,7 +13191,7 @@ Read(ref,...) MaxTextExtent); image=ReadImages(package_info->image_info,exception); } - if ((image == (Image *) NULL) || (exception->severity >= ErrorException)) + if (image == (Image *) NULL) break; for ( ; image; image=image->next) { @@ -13731,7 +13731,7 @@ Smush(ref,...) } image=SmushImages(image,stack != 0 ? MagickTrue : MagickFalse,offset, exception); - if ((image == (Image *) NULL) || (exception->severity >= ErrorException)) + if (image == (Image *) NULL) goto PerlException; for ( ; image; image=image->next) { @@ -14086,7 +14086,7 @@ Transform(ref,...) for ( ; image; image=image->next) { clone=CloneImage(image,0,0,MagickTrue,exception); - if ((clone == (Image *) NULL) || (exception->severity >= ErrorException)) + if (clone == (Image *) NULL) goto PerlException; TransformImage(&clone,crop_geometry,geometry,exception); for ( ; clone; clone=clone->next) -- 2.40.0