From cb190b747d69b577bca26a551c1227ecf2995ecb Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 31 Aug 2014 20:04:42 +0000 Subject: [PATCH] --- MagickCore/delegate.c | 4 ++-- MagickCore/enhance.c | 34 +++++++++++++++++----------------- MagickCore/property.c | 14 +++++++------- MagickWand/magick-cli.c | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c index 9c7f72205..d355fa62d 100644 --- a/MagickCore/delegate.c +++ b/MagickCore/delegate.c @@ -336,7 +336,7 @@ MagickExport char *GetDelegateCommand(const ImageInfo *image_info,Image *image, assert(image_info->signature == MagickSignature); assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); delegate_info=GetDelegateInfo(decode,encode,exception); @@ -946,7 +946,7 @@ MagickExport MagickBooleanType InvokeDelegate(ImageInfo *image_info, assert(image_info->signature == MagickSignature); assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); rights=ExecutePolicyRights; diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index 846f2d8bd..798fef69c 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -236,7 +236,7 @@ MagickExport MagickBooleanType BrightnessContrastImage(Image *image, */ assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); alpha=contrast; slope=tan((double) (MagickPI*(alpha/100.0+1.0)/4.0)); @@ -320,7 +320,7 @@ MagickExport MagickBooleanType ClutImage(Image *image,const Image *clut_image, assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(clut_image != (Image *) NULL); assert(clut_image->signature == MagickSignature); @@ -525,7 +525,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, */ assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (color_correction_collection == (const char *) NULL) return(MagickFalse); @@ -670,7 +670,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, } } ccc=DestroyXMLTree(ccc); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) { (void) LogMagickEvent(TransformEvent,GetMagickModule(), " Color Correction Collection:"); @@ -873,7 +873,7 @@ MagickExport MagickBooleanType ContrastImage(Image *image, assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); sign=IfMagickTrue(sharpen) ? 1 : -1; if (image->storage_class == PseudoClass) @@ -1030,7 +1030,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, */ assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); number_channels=GetPixelChannels(image); black=(double *) AcquireQuantumMemory(number_channels,sizeof(*black)); @@ -1322,7 +1322,7 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception) */ assert(image != (const Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickSignature); @@ -1511,7 +1511,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, */ assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); equalize_map=(double *) AcquireQuantumMemory(MaxMap+1UL, GetPixelChannels(image)*sizeof(*equalize_map)); @@ -1784,7 +1784,7 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, */ assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (gamma == 1.0) return(MagickTrue); @@ -1967,7 +1967,7 @@ MagickExport MagickBooleanType GrayscaleImage(Image *image, assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == PseudoClass) { @@ -2190,7 +2190,7 @@ MagickExport MagickBooleanType HaldClutImage(Image *image, assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(hald_image != (Image *) NULL); assert(hald_image->signature == MagickSignature); @@ -2390,7 +2390,7 @@ MagickExport MagickBooleanType LevelImage(Image *image,const double black_point, */ assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == PseudoClass) for (i=0; i < (ssize_t) image->colors; i++) @@ -2548,7 +2548,7 @@ MagickExport MagickBooleanType LevelizeImage(Image *image, */ assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == PseudoClass) for (i=0; i < (ssize_t) image->colors; i++) @@ -2688,7 +2688,7 @@ MagickExport MagickBooleanType LevelImageColors(Image *image, */ assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if( IfMagickTrue(IsGrayColorspace(image->colorspace)) && (IfMagickFalse(IsGrayColorspace(black_color->colorspace)) || @@ -3168,7 +3168,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate, */ assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (modulate == (char *) NULL) return(MagickFalse); @@ -3427,7 +3427,7 @@ MagickExport MagickBooleanType NegateImage(Image *image, assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == PseudoClass) for (i=0; i < (ssize_t) image->colors; i++) @@ -3767,7 +3767,7 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image, */ assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); /* Side effect: may clamp values unless contrastsignature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(clone_image != (const Image *) NULL); assert(clone_image->signature == MagickSignature); @@ -280,7 +280,7 @@ MagickExport MagickBooleanType DeleteImageProperty(Image *image, { assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image->filename); if (image->properties == (void *) NULL) @@ -315,7 +315,7 @@ MagickExport void DestroyImageProperties(Image *image) { assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image->filename); if (image->properties != (void *) NULL) @@ -3102,7 +3102,7 @@ MagickExport char *GetNextImageProperty(const Image *image) { assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image->filename); if (image->properties == (void *) NULL) @@ -3702,7 +3702,7 @@ MagickExport char *RemoveImageProperty(Image *image, assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image->filename); if (image->properties == (void *) NULL) @@ -3740,7 +3740,7 @@ MagickExport void ResetImagePropertyIterator(const Image *image) { assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image->filename); if (image->properties == (void *) NULL) @@ -3792,7 +3792,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image, assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if( IfMagickTrue(image->debug) ) + if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->properties == (void *) NULL) image->properties=NewSplayTree(CompareSplayTreeString, diff --git a/MagickWand/magick-cli.c b/MagickWand/magick-cli.c index 4b63fe058..5fc317e59 100644 --- a/MagickWand/magick-cli.c +++ b/MagickWand/magick-cli.c @@ -156,7 +156,7 @@ RestoreMSCWarning { MagickBooleanType status = GetScriptToken(token_info); cli_wand->line=token_info->token_line; cli_wand->column=token_info->token_column; - if( IfMagickFalse(status) ) + if (status == MagickFalse) break; /* error or end of options */ } -- 2.40.0