Removed IfStringTrue, IsMagickNULL and IsMagickNotNULL

diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c
index 90855669844a224f727c94b56a052e24a9f1b736..7f47f2245eae9dcff210df7989021ce1d8ac264b 100644 (file)
--- a/MagickCore/delegate.c
+++ b/MagickCore/delegate.c
@@ -996,7 +996,7 @@ static MagickBooleanType IsDelegateCacheInstantiated(ExceptionInfo *exception)
         delegate_cache=AcquireDelegateCache(DelegateFilename,exception);
       UnlockSemaphoreInfo(delegate_semaphore);
     }
-  return(IsMagickNotNULL(delegate_cache));
+  return(delegate_cache != (LinkedListInfo *) NULL ? MagickTrue : MagickFalse);
 }
 \f
 /*

diff --git a/MagickCore/distort.c b/MagickCore/distort.c
index 0d92b358697346ff39101ccaa100744a5f1ec561..2ec1cd6095463ac151998dccbc0fe20a8b1020d7 100644 (file)
--- a/MagickCore/distort.c
+++ b/MagickCore/distort.c
@@ -1956,7 +1956,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
   }
 
   /* Verbose output */
-  if ( IfStringTrue(GetImageArtifact(image,"verbose")) ) {
+  if (IsStringTrue(GetImageArtifact(image,"verbose")) != MagickFalse) {
     register ssize_t
        i;
     char image_gen[MagickPathExtent];
@@ -2943,7 +2943,7 @@ MagickExport Image *SparseColorImage(const Image *image,
   }
 
   /* Verbose output */
-  if ( IfStringTrue(GetImageArtifact(image,"verbose")) ) {
+  if (IsStringTrue(GetImageArtifact(image,"verbose")) != MagickFalse) {
 
     switch (sparse_method) {
       case BarycentricColorInterpolate:

diff --git a/MagickCore/magick-type.h b/MagickCore/magick-type.h
index da553bd3de5d68f3704986f7a5c9e05f66380157..20de3bfc60ed80adf69df87e8d096e030790be2a 100644 (file)
--- a/MagickCore/magick-type.h
+++ b/MagickCore/magick-type.h
@@ -161,8 +161,6 @@ typedef enum
    IsMagickTrue()     converts a C integer boolean to a MagickBooleanType
    IsMagickFalse()    converts and is also a MagickBooleanType 'not' operation
 
-   IsMagickNULL()
-   IsMagickNotNULL()  converts C pointers tests MagickBooleanType
 */
 #if 1
 /* Fast C typing method assumes MagickBooleanType match 0,1 values */
@@ -179,9 +177,6 @@ typedef enum
 #  define IsMagickFalse(v) ((v)?MagickFalse:MagickTrue)
 #  define IsMagickNot(v)   (IfMagickTrue(v)?MagickFalse:MagickTrue)
 #endif
-#define IfStringTrue(v)       IfMagickTrue(IsStringTrue(v))
-#define IsMagickNULL(v)       (((void *)(v) == NULL)?MagickTrue:MagickFalse)
-#define IsMagickNotNULL(v)    (((void *)(v) != NULL)?MagickTrue:MagickFalse)
 
 /*
   The IsNaN and IfNan tests for special floating point numbers of

diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index b375168cd2df7d51a4e64e1f9554b3f403abee1b..972f1482dcf13551646a10471007fca70118b6ac 100644 (file)
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -4086,13 +4086,13 @@ exit_cleanup:
 %
 %  User defined settings include...
 %    * Output Bias for Convolution and correlation ("-define convolve:bias=??")
-%    * Kernel Scale/normalize settings             ("-define convolve:scale=??")
+%    * Kernel Scale/normalize settings            ("-define convolve:scale=??")
 %      This can also includes the addition of a scaled unity kernel.
-%    * Show Kernel being applied                   ("-define showkernel=1")
+%    * Show Kernel being applied            ("-define morphology:showkernel=1")
 %
 %  Other operators that do not want user supplied options interfering,
-%  especially "convolve:bias" and "showkernel" should use MorphologyApply()
-%  directly.
+%  especially "convolve:bias" and "morphology:showkernel" should use
+%  MorphologyApply() directly.
 %
 %  The format of the MorphologyImage method is:
 %
@@ -4120,17 +4120,20 @@ MagickExport Image *MorphologyImage(const Image *image,
   const MorphologyMethod method,const ssize_t iterations,
   const KernelInfo *kernel,ExceptionInfo *exception)
 {
-  KernelInfo
-    *curr_kernel;
+  const char
+    *artifact;
 
   CompositeOperator
     compose;
 
+  double
+    bias;
+
   Image
     *morphology_image;
 
-  double
-    bias;
+  KernelInfo
+    *curr_kernel;
 
   curr_kernel = (KernelInfo *) kernel;
   bias=0.0;
@@ -4173,9 +4176,8 @@ MagickExport Image *MorphologyImage(const Image *image,
     }
 
   /* display the (normalized) kernel via stderr */
-  if ( IfStringTrue(GetImageArtifact(image,"showkernel"))
-    || IfStringTrue(GetImageArtifact(image,"convolve:showkernel"))
-    || IfStringTrue(GetImageArtifact(image,"morphology:showkernel")) )
+  artifact=GetImageArtifact(image,"morphology:showkernel");
+  if (IsStringTrue(artifact) != MagickFalse)
     ShowKernelInfo(curr_kernel);
 
   /* Override the default handling of multi-kernel morphology results
@@ -4184,8 +4186,7 @@ MagickExport Image *MorphologyImage(const Image *image,
    * Otherwise merge resulting images using compose method given.
    * Default for 'HitAndMiss' is 'Lighten'.
    */
-  { const char
-      *artifact;
+  {
     ssize_t
       parse;
 
@@ -4629,7 +4630,8 @@ MagickExport void ScaleKernelInfo(KernelInfo *kernel,
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  ShowKernelInfo() outputs the details of the given kernel defination to
-%  standard error, generally due to a users 'showkernel' option request.
+%  standard error, generally due to a users 'morphology:showkernel' option
+%  request.
 %
 %  The format of the ShowKernel method is:
 %

diff --git a/MagickCore/resample.c b/MagickCore/resample.c
index b9fb95630ca89a8b7f58f63e5fca5eb31f6c1241..01cfeed3514e35b629008764de014dc19702ceec 100644 (file)
--- a/MagickCore/resample.c
+++ b/MagickCore/resample.c
@@ -1334,8 +1334,8 @@ MagickExport void SetResampleFilter(ResampleFilter *resample_filter,
   #pragma omp single
 #endif
   {
-    if (IfStringTrue(GetImageArtifact(resample_filter->image,
-             "resample:verbose")) )
+    if (IsStringTrue(GetImageArtifact(resample_filter->image,
+        "resample:verbose")) != MagickFalse)
       {
         register int
           Q;

diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index b8741ff4c064af7a955a07460c3b97d6e3a0338d..1d290a12cd157daac5e253c15f3fd8e8f4fb194d 100644 (file)
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -1117,7 +1117,7 @@ MagickPrivate ResizeFilter *AcquireResizeFilter(const Image *image,
   #pragma omp master
   {
 #endif
-    if (IfStringTrue(GetImageArtifact(image,"filter:verbose")))
+    if (IsStringTrue(GetImageArtifact(image,"filter:verbose")) != MagickFalse)
       {
         double
           support,