(no commit message)

diff --git a/MagickCore/fourier.c b/MagickCore/fourier.c
index a76f2d502851e5192f5a602c84fc6f6ba6878141..a1adbb0eb1ac3359928702f9ffb2bb389d901ade 100644 (file)
--- a/MagickCore/fourier.c
+++ b/MagickCore/fourier.c
@@ -116,19 +116,19 @@ typedef struct _FourierInfo
 %  The format of the ComplexImages method is:
 %
 %      MagickBooleanType ComplexImages(Image *images,
-%        const ComplexOperator operator,ExceptionInfo *exception)
+%        const ComplexOperator op,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
 %    o image: the image.
 %
-%    o operator: A complex operator.
+%    o op: A complex op.
 %
 %    o exception: return any errors or warnings in this structure.
 %
 */
-MagickExport Image *ComplexImages(const Image *images,
-  const ComplexOperator operator,ExceptionInfo *exception)
+MagickExport Image *ComplexImages(const Image *images,const ComplexOperator op,
+  ExceptionInfo *exception)
 {
 #define ComplexImageTag  "Complex/Image"
 
@@ -269,7 +269,7 @@ MagickExport Image *ComplexImages(const Image *images,
 
       for (i=0; i < (ssize_t) GetPixelChannels(images); i++)
       {
-        switch (operator)
+        switch (op)
         {
           case AddComplexOperator:
           {

diff --git a/MagickCore/identify.c b/MagickCore/identify.c
index 8cfea236fcbe5124fa8e8fc1aacec57a002472b8..0464063143375a1c47e582dcbc61546d206419c9 100644 (file)
--- a/MagickCore/identify.c
+++ b/MagickCore/identify.c
@@ -354,7 +354,7 @@ static ssize_t PrintChannelLocations(FILE *file,const Image *image,
       match=fabs((double) p[offset]-target) < 0.5 ? MagickTrue : MagickFalse;
       if (match != MagickFalse)
         {
-          if ((max_locations != 0) && (n >= max_locations))
+          if ((max_locations != 0) && (n >= (ssize_t) max_locations))
             break;
           (void) FormatLocaleFile(file," %.20g,%.20g",(double) x,(double) y);
           n++;

diff --git a/MagickCore/property.c b/MagickCore/property.c
index 6331a11043620ae823960a15b62b7189b1644dca..1bcecc355b0f87fc28b07c450e0917d8e049f03f 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -3807,7 +3807,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image,
             value);
           if (colorspace < 0)
             return(MagickFalse); /* FUTURE: value exception?? */
-          return(SetImageColorspace(image,colorspace,exception));
+          return(SetImageColorspace(image,(ColorspaceType) colorspace,exception));
         }
       if (LocaleCompare("compose",property) == 0)
         {

diff --git a/MagickCore/version.h b/MagickCore/version.h
index e55d6956101820be80df8ce69fef3144b04e10d5..b427dfe2d07b88d50c283f48c9be69eaa605703c 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -48,7 +48,7 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  1
 #define MagickppLibMinInterface  1
-#define MagickReleaseDate  "2013-11-24"
+#define MagickReleaseDate  "2013-11-27"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

diff --git a/MagickWand/drawing-wand.c b/MagickWand/drawing-wand.c
index b358c4228eb95c686a66ad36941049350181b6f5..1b3f92f0d43286716cac80ce5b7dd607045dfb4d 100644 (file)
--- a/MagickWand/drawing-wand.c
+++ b/MagickWand/drawing-wand.c
@@ -4302,7 +4302,7 @@ WandExport MagickBooleanType DrawRender(DrawingWand *wand)
     ThrowDrawException(WandError,"ContainsNoImages",wand->name);
   status=DrawImage(wand->image,CurrentContext,wand->exception);
   CurrentContext->primitive=(char *) NULL;
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*

diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c
index 0489625810fa651ad892597d7e9f564513c338c4..dd2654c5bc5d1da14ef06a1d372c62b7866e0ab3 100644 (file)
--- a/MagickWand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -626,7 +626,7 @@ WandExport MagickBooleanType MagickAnnotateImage(MagickWand *wand,
   (void) CloneString(&draw_info->geometry,geometry);
   status=AnnotateImage(wand->images,draw_info,wand->exception);
   draw_info=DestroyDrawInfo(draw_info);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -666,7 +666,7 @@ WandExport MagickBooleanType MagickAnimateImages(MagickWand *wand,
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
   (void) CloneString(&wand->image_info->server_name,server_name);
   status=AnimateImages(wand->image_info,wand->images,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -754,7 +754,7 @@ WandExport MagickBooleanType MagickAutoGammaImage(MagickWand *wand)
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=AutoGammaImage(wand->images,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -792,7 +792,7 @@ WandExport MagickBooleanType MagickAutoLevelImage(MagickWand *wand)
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=AutoLevelImage(wand->images,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -842,7 +842,7 @@ WandExport MagickBooleanType MagickBlackThresholdImage(MagickWand *wand,
     PixelGetRedQuantum(threshold),PixelGetGreenQuantum(threshold),
     PixelGetBlueQuantum(threshold),PixelGetAlphaQuantum(threshold));
   status=BlackThresholdImage(wand->images,thresholds,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -1045,7 +1045,7 @@ WandExport MagickBooleanType MagickBrightnessContrastImage(
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=BrightnessContrastImage(wand->images,brightness,contrast,
     wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -1281,7 +1281,7 @@ WandExport MagickBooleanType MagickClipImage(MagickWand *wand)
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=ClipImage(wand->images,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -1329,7 +1329,7 @@ WandExport MagickBooleanType MagickClipImagePath(MagickWand *wand,
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=ClipImagePath(wand->images,pathname,inside,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -1372,7 +1372,7 @@ WandExport MagickBooleanType MagickClutImage(MagickWand *wand,
   if ((wand->images == (Image *) NULL) || (clut_wand->images == (Image *) NULL))
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=ClutImage(wand->images,clut_wand->images,method,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -1476,7 +1476,7 @@ WandExport MagickBooleanType MagickColorDecisionListImage(MagickWand *wand,
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=ColorDecisionListImage(wand->images,color_correction_collection,
     wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -1685,7 +1685,7 @@ WandExport MagickBooleanType MagickCommentImage(MagickWand *wand,
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=SetImageProperty(wand->images,"comment",comment,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -1847,7 +1847,7 @@ WandExport MagickBooleanType MagickCompositeImage(MagickWand *wand,
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=CompositeImage(wand->images,source_wand->images,compose,clip_to_self,
     x,y,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -1919,7 +1919,7 @@ WandExport MagickBooleanType MagickCompositeLayers(MagickWand *wand,
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   CompositeLayers(wand->images,compose,source_wand->images,x,y,wand->exception);
   status=MagickTrue;  /* FUTURE: determine status from exceptions */
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -1963,7 +1963,7 @@ WandExport MagickBooleanType MagickContrastImage(MagickWand *wand,
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=ContrastImage(wand->images,sharpen,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -2010,7 +2010,7 @@ WandExport MagickBooleanType MagickContrastStretchImage(MagickWand *wand,
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=ContrastStretchImage(wand->images,black_point,white_point,
     wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -2156,7 +2156,7 @@ WandExport MagickBooleanType MagickCycleColormapImage(MagickWand *wand,
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=CycleColormapImage(wand->images,displace,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -2469,7 +2469,7 @@ WandExport MagickBooleanType MagickDisplayImage(MagickWand *wand,
   (void) CloneString(&wand->image_info->server_name,server_name);
   status=DisplayImages(wand->image_info,image,wand->exception);
   image=DestroyImage(image);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -2509,7 +2509,7 @@ WandExport MagickBooleanType MagickDisplayImages(MagickWand *wand,
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
   (void) CloneString(&wand->image_info->server_name,server_name);
   status=DisplayImages(wand->image_info,wand->images,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -2646,7 +2646,7 @@ WandExport MagickBooleanType MagickDrawImage(MagickWand *wand,
   draw_info->primitive=primitive;
   status=DrawImage(wand->images,draw_info,wand->exception);
   draw_info=DestroyDrawInfo(draw_info);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -2859,7 +2859,7 @@ WandExport MagickBooleanType MagickEqualizeImage(MagickWand *wand)
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=EqualizeImage(wand->images,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -2926,7 +2926,7 @@ WandExport MagickBooleanType MagickEvaluateImage(MagickWand *wand,
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=EvaluateImage(wand->images,op,value,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -2996,7 +2996,7 @@ WandExport MagickBooleanType MagickExportImagePixels(MagickWand *wand,
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=ExportImagePixels(wand->images,x,y,columns,rows,map,
     storage,pixels,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -3170,7 +3170,7 @@ WandExport MagickBooleanType MagickFloodfillPaintImage(MagickWand *wand,
   status=FloodfillPaintImage(wand->images,draw_info,&target,x,y,invert,
     wand->exception);
   draw_info=DestroyDrawInfo(draw_info);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -3382,7 +3382,7 @@ WandExport MagickBooleanType MagickFunctionImage(MagickWand *wand,
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=FunctionImage(wand->images,function,number_arguments,arguments,
     wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -3470,7 +3470,7 @@ WandExport MagickBooleanType MagickGammaImage(MagickWand *wand,
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=GammaImage(wand->images,gamma,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -3955,7 +3955,7 @@ WandExport MagickBooleanType MagickGetImageKurtosis(MagickWand *wand,
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=GetImageKurtosis(wand->images,kurtosis,skewness,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -4001,7 +4001,7 @@ WandExport MagickBooleanType MagickGetImageMean(MagickWand *wand,double *mean,
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=GetImageMean(wand->images,mean,standard_deviation,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -4044,7 +4044,7 @@ WandExport MagickBooleanType MagickGetImageRange(MagickWand *wand,
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=GetImageRange(wand->images,minima,maxima,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -4474,7 +4474,7 @@ WandExport MagickBooleanType MagickGetImageDistortion(MagickWand *wand,
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=GetImageDistortion(wand->images,reference->images,metric,distortion,
     wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -5813,7 +5813,7 @@ WandExport MagickBooleanType MagickHaldClutImage(MagickWand *wand,
   if ((wand->images == (Image *) NULL) || (hald_wand->images == (Image *) NULL))
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=HaldClutImage(wand->images,hald_wand->images,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -6066,7 +6066,7 @@ WandExport MagickBooleanType MagickImportImagePixels(MagickWand *wand,
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=ImportImagePixels(wand->images,x,y,columns,rows,map,storage,pixels,
     wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -6215,7 +6215,7 @@ WandExport MagickBooleanType MagickLabelImage(MagickWand *wand,
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=SetImageProperty(wand->images,"label",label,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -6274,7 +6274,7 @@ WandExport MagickBooleanType MagickLevelImage(MagickWand *wand,
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=LevelImage(wand->images,black_point,white_point,gamma,
     wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -6321,7 +6321,7 @@ WandExport MagickBooleanType MagickLinearStretchImage(MagickWand *wand,
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=LinearStretchImage(wand->images,black_point,white_point,
     wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -6572,7 +6572,7 @@ WandExport MagickBooleanType MagickModulateImage(MagickWand *wand,
   (void) FormatLocaleString(modulate,MaxTextExtent,"%g,%g,%g",
     brightness,saturation,hue);
   status=ModulateImage(wand->images,modulate,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -6883,7 +6883,7 @@ WandExport MagickBooleanType MagickNegateImage(MagickWand *wand,
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=NegateImage(wand->images,gray,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -7033,7 +7033,7 @@ WandExport MagickBooleanType MagickNormalizeImage(MagickWand *wand)
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=NormalizeImage(wand->images,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -7144,7 +7144,7 @@ WandExport MagickBooleanType MagickOpaquePaintImage(MagickWand *wand,
   wand->images->fuzz=fuzz;
   status=OpaquePaintImage(wand->images,&target_pixel,&fill_pixel,invert,
     wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -7287,7 +7287,7 @@ WandExport MagickBooleanType MagickOrderedPosterizeImage(MagickWand *wand,
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=OrderedPosterizeImage(wand->images,threshold_map,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -7537,7 +7537,7 @@ WandExport MagickBooleanType MagickPosterizeImage(MagickWand *wand,
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=PosterizeImage(wand->images,levels,dither,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -7720,7 +7720,7 @@ WandExport MagickBooleanType MagickQuantizeImage(MagickWand *wand,
   quantize_info->measure_error=measure_error;
   status=QuantizeImage(quantize_info,wand->images,wand->exception);
   quantize_info=DestroyQuantizeInfo(quantize_info);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -7798,7 +7798,7 @@ WandExport MagickBooleanType MagickQuantizeImages(MagickWand *wand,
   quantize_info->measure_error=measure_error;
   status=QuantizeImages(quantize_info,wand->images,wand->exception);
   quantize_info=DestroyQuantizeInfo(quantize_info);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -7898,7 +7898,7 @@ WandExport MagickBooleanType MagickRaiseImage(MagickWand *wand,
   raise_info.x=x;
   raise_info.y=y;
   status=RaiseImage(wand->images,&raise_info,raise,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -8138,7 +8138,7 @@ WandExport MagickBooleanType MagickRemapImage(MagickWand *wand,
   status=RemapImage(quantize_info,wand->images,remap_wand->images,
     wand->exception);
   quantize_info=DestroyQuantizeInfo(quantize_info);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -8585,7 +8585,7 @@ MagickExport MagickBooleanType MagickSegmentImage(MagickWand *wand,
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=SegmentImage(wand->images,colorspace,verbose,cluster_threshold,
     smooth_threshold,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -9898,7 +9898,7 @@ WandExport MagickBooleanType MagickSetImageAlpha(MagickWand *wand,
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=SetImageAlpha(wand->images,ClampToQuantum(QuantumRange*alpha),
     wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -10713,7 +10713,7 @@ WandExport MagickBooleanType MagickSigmoidalContrastImage(
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=SigmoidalContrastImage(wand->images,sharpen,alpha,beta,
     wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -10920,7 +10920,7 @@ WandExport MagickBooleanType MagickSolarizeImage(MagickWand *wand,
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=SolarizeImage(wand->images,threshold,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -11432,7 +11432,7 @@ WandExport MagickBooleanType MagickThresholdImage(MagickWand *wand,
     status;
 
   status=MagickThresholdImageChannel(wand,DefaultChannels,threshold);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 
 WandExport MagickBooleanType MagickThresholdImageChannel(MagickWand *wand,
@@ -11448,7 +11448,7 @@ WandExport MagickBooleanType MagickThresholdImageChannel(MagickWand *wand,
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=BilevelImage(wand->images,threshold,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -11733,7 +11733,7 @@ WandExport MagickBooleanType MagickTransparentPaintImage(MagickWand *wand,
   wand->images->fuzz=fuzz;
   status=TransparentPaintImage(wand->images,&target_pixel,ClampToQuantum(
     QuantumRange*alpha),invert,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -12167,7 +12167,7 @@ WandExport MagickBooleanType MagickWriteImage(MagickWand *wand,
   status=WriteImage(write_info,image,wand->exception);
   image=DestroyImage(image);
   write_info=DestroyImageInfo(write_info);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -12221,7 +12221,7 @@ WandExport MagickBooleanType MagickWriteImageFile(MagickWand *wand,FILE *file)
   status=WriteImage(write_info,image,wand->exception);
   write_info=DestroyImageInfo(write_info);
   image=DestroyImage(image);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -12270,7 +12270,7 @@ WandExport MagickBooleanType MagickWriteImages(MagickWand *wand,
   write_info->adjoin=adjoin;
   status=WriteImages(write_info,wand->images,filename,wand->exception);
   write_info=DestroyImageInfo(write_info);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -12317,5 +12317,5 @@ WandExport MagickBooleanType MagickWriteImagesFile(MagickWand *wand,FILE *file)
   status=WriteImages(write_info,wand->images,(const char *) NULL,
     wand->exception);
   write_info=DestroyImageInfo(write_info);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }

diff --git a/MagickWand/magick-property.c b/MagickWand/magick-property.c
index a24cffaab730ce45e436c3c7c63b73ed4699db25..41710cd4f917b104bcfea9d0f66ca69dfd190c59 100644 (file)
--- a/MagickWand/magick-property.c
+++ b/MagickWand/magick-property.c
@@ -2251,7 +2251,7 @@ WandExport MagickBooleanType MagickSetGravity(MagickWand *wand,
 
   status=SetImageOption(wand->image_info,"gravity",CommandOptionToMnemonic(
     MagickGravityOptions,(ssize_t) type));
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -2346,7 +2346,7 @@ WandExport MagickBooleanType MagickSetImageProfile(MagickWand *wand,
   SetStringInfoDatum(profile_info,(unsigned char *) profile);
   status=SetImageProfile(wand->images,name,profile_info,wand->exception);
   profile_info=DestroyStringInfo(profile_info);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -2390,7 +2390,7 @@ WandExport MagickBooleanType MagickSetImageProperty(MagickWand *wand,
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   status=SetImageProperty(wand->images,property,value,wand->exception);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -2469,7 +2469,7 @@ WandExport MagickBooleanType MagickSetInterpolateMethod(MagickWand *wand,
 
   status=SetImageOption(wand->image_info,"interpolate",
     CommandOptionToMnemonic(MagickInterpolateOptions,(ssize_t) method));
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 4d9d3aa842b3a42c835cf809f12b5282822f88a7..c2cbdd6c8cc6fc45ea73f27c4dcea2fcdf7547f4 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -183,7 +183,7 @@ WandExport MagickBooleanType MagickCommandGenesis(ImageInfo *image_info,
             (void) fputs(*metadata,stdout);
             *metadata=DestroyString(*metadata);
           }
-      return(status == MagickFalse ? 0 : 1);
+      return(status);
     }
   number_threads=GetOpenMPMaximumThreads();
   serial=0.0;
@@ -277,7 +277,7 @@ WandExport MagickBooleanType MagickCommandGenesis(ImageInfo *image_info,
       60.0)),(unsigned long) (1000.0*(parallel-floor(parallel))+0.5));
     timer=DestroyTimerInfo(timer);
   }
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 76eb5aaf454febc50b66465bace2591c97ccc063..34fbea5214e1c3c99f5421bbe6e01570461b6bef 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -4327,10 +4327,10 @@ WandPrivate MagickBooleanType CLIListOperatorImages(MagickCLI *cli_wand,
 
   /* if new image list generated, replace existing image list */
   if (new_images == (Image *) NULL)
-    return(status == MagickFalse ? 0 : 1);
+    return(status);
   _images=DestroyImageList(_images);
   _images=GetFirstImageInList(new_images);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 
 #undef _image_info
 #undef _images

diff --git a/MagickWand/pixel-wand.c b/MagickWand/pixel-wand.c
index 843533263c271ca25bf4b0cef1a9d201a4417a28..5cce5c07ecc15a25b82363f4479cd8bb55302cbf 100644 (file)
--- a/MagickWand/pixel-wand.c
+++ b/MagickWand/pixel-wand.c
@@ -1699,7 +1699,7 @@ WandExport MagickBooleanType PixelSetColor(PixelWand *wand,const char *color)
   status=QueryColorCompliance(color,AllCompliance,&pixel,wand->exception);
   if (status != MagickFalse)
     wand->pixel=pixel;
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*

diff --git a/MagickWand/wand-view.c b/MagickWand/wand-view.c
index 54cfbc2ce221ba3c4d0abab0231b4499b646ed03..af1c074cd0ec34665be3042a0d786fc42d7e3814 100644 (file)
--- a/MagickWand/wand-view.c
+++ b/MagickWand/wand-view.c
@@ -381,7 +381,7 @@ WandExport MagickBooleanType DuplexTransferWandViewIterator(WandView *source,
           status=MagickFalse;
       }
   }
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -588,7 +588,7 @@ WandExport MagickBooleanType GetWandViewIterator(WandView *source,
           status=MagickFalse;
       }
   }
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -998,7 +998,7 @@ WandExport MagickBooleanType SetWandViewIterator(WandView *destination,
           status=MagickFalse;
       }
   }
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -1160,7 +1160,7 @@ WandExport MagickBooleanType TransferWandViewIterator(WandView *source,
           status=MagickFalse;
       }
   }
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -1293,5 +1293,5 @@ WandExport MagickBooleanType UpdateWandViewIterator(WandView *source,
           status=MagickFalse;
       }
   }
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }

diff --git a/MagickWand/wandcli.c b/MagickWand/wandcli.c
index 4ddc85699dc1b0a08bb2d472f2c837c104cbc919..79b41b9b032d68870e47b9b3d63d923ae1f0c187 100644 (file)
--- a/MagickWand/wandcli.c
+++ b/MagickWand/wandcli.c
@@ -253,7 +253,7 @@ WandExport MagickBooleanType CLICatchException(MagickCLI *cli_wand,
   if ( IfMagickFalse(status) || IfMagickTrue(all_exceptions) )
     CatchException(cli_wand->wand.exception); /* output and clear exceptions */
 
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -299,7 +299,7 @@ WandExport MagickBooleanType CLILogEvent(MagickCLI *cli_wand,
   va_end(operands);
 
 
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }
 \f
 /*
@@ -349,5 +349,5 @@ WandExport MagickBooleanType CLIThrowException(MagickCLI *cli_wand,
               module,function,line,
               severity,tag,new_format,operands);
   va_end(operands);
-  return(status == MagickFalse ? 0 : 1);
+  return(status);
 }