Removed IfMagickTrue
diff --git a/MagickCore/display.c b/MagickCore/display.c
index 25b1434..a9e921d 100644
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -1676,7 +1676,7 @@
assert(image_info->signature == MagickCoreSignature);
assert(images != (Image *) NULL);
assert(images->signature == MagickCoreSignature);
- if (IfMagickTrue(images->debug) )
+ if (images->debug != MagickFalse )
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
display=XOpenDisplay(image_info->server_name);
if (display == (Display *) NULL)
@@ -1921,7 +1921,7 @@
state=DefaultState;
do
{
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
/*
Display pointer position.
@@ -2014,7 +2014,7 @@
break;
transparent_pen=pen_number == (MaxNumberPens-2) ? MagickTrue :
MagickFalse;
- if (IfMagickTrue(transparent_pen) )
+ if (transparent_pen != MagickFalse )
break;
if (pen_number == (MaxNumberPens-1))
{
@@ -2059,7 +2059,7 @@
break;
transparent_box=pen_number == (MaxNumberPens-2) ? MagickTrue :
MagickFalse;
- if (IfMagickTrue(transparent_box) )
+ if (transparent_box != MagickFalse )
break;
if (pen_number == (MaxNumberPens-1))
{
@@ -2210,7 +2210,7 @@
*/
x=event.xmotion.x;
y=event.xmotion.y;
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
if ((x < (int) (windows->info.x+windows->info.width)) &&
(y < (int) (windows->info.y+windows->info.height)))
@@ -2813,7 +2813,7 @@
background_resources.backdrop=status != 0 ? MagickTrue : MagickFalse;
status=XDisplayBackgroundImage(display,&background_resources,*image,
exception);
- if (IfMagickTrue(status))
+ if (status != MagickFalse)
XClientMessage(display,windows->image.id,windows->im_protocols,
windows->im_retain_colors,CurrentTime);
XSetCursorState(display,windows,MagickFalse);
@@ -2933,7 +2933,7 @@
(void) ResetMagickMemory(&segment_info,0,sizeof(segment_info));
do
{
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
/*
Display pointer position.
@@ -3072,7 +3072,7 @@
*/
x=event.xmotion.x;
y=event.xmotion.y;
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
if ((x < (int) (windows->info.x+windows->info.width)) &&
(y < (int) (windows->info.y+windows->info.height)))
@@ -3118,7 +3118,7 @@
windows->image.highlight_context,&segment_info);
}
else
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
(void) XWithdrawWindow(display,windows->info.id,windows->info.screen);
/*
Wait for next event.
@@ -3375,7 +3375,7 @@
state=DefaultState;
do
{
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
/*
Display pointer position.
@@ -3667,7 +3667,7 @@
*/
x=event.xmotion.x;
y=event.xmotion.y;
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
if ((x < (int) (windows->info.x+windows->info.width)) &&
(y < (int) (windows->info.y+windows->info.height)))
@@ -4010,7 +4010,7 @@
state=DefaultState;
do
{
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
/*
Display pointer position.
@@ -4124,7 +4124,7 @@
{
case ButtonPress:
{
- if (IfMagickTrue(image->debug) )
+ if (image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Button Press: 0x%lx %u +%d+%d",event.xbutton.window,
event.xbutton.button,event.xbutton.x,event.xbutton.y);
@@ -4144,7 +4144,7 @@
}
case ButtonRelease:
{
- if (IfMagickTrue(image->debug) )
+ if (image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Button Release: 0x%lx %u +%d+%d",event.xbutton.window,
event.xbutton.button,event.xbutton.x,event.xbutton.y);
@@ -4184,7 +4184,7 @@
length=XLookupString((XKeyEvent *) &event.xkey,command,(int)
sizeof(command),&key_symbol,(XComposeStatus *) NULL);
*(command+length)='\0';
- if (IfMagickTrue(image->debug) )
+ if (image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Key press: 0x%lx (%s)",(unsigned long) key_symbol,command);
switch ((int) key_symbol)
@@ -4226,7 +4226,7 @@
*/
x=event.xmotion.x;
y=event.xmotion.y;
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
if ((x < (int) (windows->info.x+windows->info.width)) &&
(y < (int) (windows->info.y+windows->info.height)))
@@ -4243,7 +4243,7 @@
}
default:
{
- if (IfMagickTrue(image->debug) )
+ if (image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),"Event type: %d",
event.type);
break;
@@ -4422,7 +4422,7 @@
*/
width=(unsigned int) windows->image.window_changes.width;
height=(unsigned int) windows->image.window_changes.height;
- if (IfMagickTrue(image->debug) )
+ if (image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Configure Image: %dx%d=>%.20gx%.20g",windows->image.ximage->width,
windows->image.ximage->height,(double) width,(double) height);
@@ -4483,7 +4483,7 @@
/*
Update Magnify window configuration.
*/
- if (IfMagickTrue(windows->magnify.mapped) )
+ if (windows->magnify.mapped != MagickFalse )
XMakeMagnifyImage(display,windows,exception);
windows->pan.crop_geometry=windows->image.crop_geometry;
XBestIconSize(display,&windows->pan,image);
@@ -4681,7 +4681,7 @@
state=DefaultState;
do
{
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
/*
Display pointer position.
@@ -4828,7 +4828,7 @@
*/
x=event.xmotion.x;
y=event.xmotion.y;
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
if ((x < (int) (windows->info.x+windows->info.width)) &&
(y < (int) (windows->info.y+windows->info.height)))
@@ -4889,7 +4889,7 @@
windows->image.highlight_context,&highlight_info);
}
else
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
(void) XWithdrawWindow(display,windows->info.id,windows->info.screen);
/*
Wait for next event.
@@ -4969,7 +4969,7 @@
(void) XMapWindow(display,windows->info.id);
do
{
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
/*
Display pointer position.
@@ -5234,7 +5234,7 @@
*/
x=event.xmotion.x;
y=event.xmotion.y;
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
if ((x < (int) (windows->info.x+windows->info.width)) &&
(y < (int) (windows->info.y+windows->info.height)))
@@ -5529,7 +5529,7 @@
state=DefaultState;
do
{
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
/*
Display pointer position.
@@ -5608,7 +5608,7 @@
break;
transparent=pen_number == (MaxNumberPens-2) ? MagickTrue :
MagickFalse;
- if (IfMagickTrue(transparent) )
+ if (transparent != MagickFalse )
{
draw_info.stencil=TransparentStencil;
break;
@@ -5889,7 +5889,7 @@
*/
x=event.xmotion.x;
y=event.xmotion.y;
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
if ((x < (int) (windows->info.x+windows->info.width)) &&
(y < (int) (windows->info.y+windows->info.height)))
@@ -5962,7 +5962,7 @@
windows->image.highlight_context,&line_info);
}
else
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
(void) XWithdrawWindow(display,windows->info.id,
windows->info.screen);
break;
@@ -5984,7 +5984,7 @@
windows->image.highlight_context,&rectangle_info);
}
else
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
(void) XWithdrawWindow(display,windows->info.id,
windows->info.screen);
break;
@@ -6008,7 +6008,7 @@
windows->image.highlight_context,&rectangle_info);
}
else
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
(void) XWithdrawWindow(display,windows->info.id,
windows->info.screen);
break;
@@ -6034,7 +6034,7 @@
windows->image.highlight_context,&line_info);
}
else
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
(void) XWithdrawWindow(display,windows->info.id,
windows->info.screen);
break;
@@ -6481,7 +6481,7 @@
redo_image=(*image);
*image=cache_image->list;
cache_image=DestroyImage(cache_image);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
return;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -6647,7 +6647,7 @@
*image=DestroyImage(*image);
*image=redo_image;
redo_image=NewImageList();
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
return;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -7251,7 +7251,7 @@
if (*filename == '\0')
break;
status=ShredFile(filename);
- if (IfMagickTrue(status) )
+ if (status != MagickFalse )
XNoticeWidget(display,windows,"Unable to delete image file:",filename);
break;
}
@@ -7532,7 +7532,7 @@
(void) FormatLocaleString(windows->image.crop_geometry,MagickPathExtent,
"%ux%u%+d%+d",width,height,(int) (*image)->columns-(int) width-x,y);
}
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
(void) XConfigureImage(display,resource_info,windows,*image,exception);
break;
@@ -7567,7 +7567,7 @@
(void) FormatLocaleString(windows->image.crop_geometry,MagickPathExtent,
"%ux%u%+d%+d",width,height,x,(int) (*image)->rows-(int) height-y);
}
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
(void) XConfigureImage(display,resource_info,windows,*image,exception);
break;
@@ -7653,7 +7653,7 @@
}
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
windows->image.window_changes.width=(int) (*image)->columns;
windows->image.window_changes.height=(int) (*image)->rows;
@@ -7694,7 +7694,7 @@
}
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
windows->image.window_changes.width=(int) (*image)->columns;
windows->image.window_changes.height=(int) (*image)->rows;
@@ -7750,7 +7750,7 @@
MagickPathExtent);
(void) ModulateImage(*image,modulate_factors,exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -7778,7 +7778,7 @@
MagickPathExtent);
(void) ModulateImage(*image,modulate_factors,exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -7805,7 +7805,7 @@
MagickPathExtent);
(void) ModulateImage(*image,modulate_factors,exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -7830,7 +7830,7 @@
XCheckRefreshWindows(display,windows);
(void) GammaImage(*image,strtod(factor,(char **) NULL),exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -7845,7 +7845,7 @@
XCheckRefreshWindows(display,windows);
(void) ContrastImage(*image,MagickTrue,exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -7860,7 +7860,7 @@
XCheckRefreshWindows(display,windows);
(void) ContrastImage(*image,MagickFalse,exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -7899,7 +7899,7 @@
(void) ContrastStretchImage(*image,black_point,white_point,
exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -7936,7 +7936,7 @@
(void) SigmoidalContrastImage(*image,MagickTrue,geometry_info.rho,
geometry_info.sigma,exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -7951,7 +7951,7 @@
XCheckRefreshWindows(display,windows);
(void) NormalizeImage(*image,exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -7966,7 +7966,7 @@
XCheckRefreshWindows(display,windows);
(void) EqualizeImage(*image,exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -7981,7 +7981,7 @@
XCheckRefreshWindows(display,windows);
(void) NegateImage(*image,MagickFalse,exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -7997,7 +7997,7 @@
(void) SetImageType(*image,(*image)->alpha_trait == UndefinedPixelTrait ?
GrayscaleType : GrayscaleAlphaType,exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8031,7 +8031,7 @@
}
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8062,7 +8062,7 @@
NoDitherMethod;
(void) QuantizeImage(&quantize_info,*image,exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8086,7 +8086,7 @@
}
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8124,7 +8124,7 @@
}
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8160,7 +8160,7 @@
}
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8200,7 +8200,7 @@
}
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8236,7 +8236,7 @@
}
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8272,7 +8272,7 @@
}
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8301,7 +8301,7 @@
threshold=StringToDoubleInterval(factor,(double) QuantumRange+1.0);
(void) BilevelImage(*image,threshold,exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8336,7 +8336,7 @@
}
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8371,7 +8371,7 @@
}
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8412,7 +8412,7 @@
}
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8440,7 +8440,7 @@
exception);
(void) RaiseImage(*image,&page_geometry,MagickTrue,exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8469,7 +8469,7 @@
(void) SegmentImage(*image,sRGBColorspace,MagickFalse,geometry_info.rho,
geometry_info.sigma,exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8507,7 +8507,7 @@
}
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8536,7 +8536,7 @@
threshold=StringToDoubleInterval(factor,(double) QuantumRange+1.0);
(void) SolarizeImage(*image,threshold,exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8572,7 +8572,7 @@
}
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8608,7 +8608,7 @@
}
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8651,7 +8651,7 @@
}
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8689,7 +8689,7 @@
}
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8725,7 +8725,7 @@
}
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8765,7 +8765,7 @@
}
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
XConfigureImageColormap(display,resource_info,windows,*image,exception);
(void) XConfigureImage(display,resource_info,windows,*image,exception);
@@ -8880,7 +8880,7 @@
}
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
windows->image.window_changes.width=(int) (*image)->columns;
windows->image.window_changes.height=(int) (*image)->rows;
@@ -8936,7 +8936,7 @@
}
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
break;
windows->image.window_changes.width=(int) (*image)->columns;
windows->image.window_changes.height=(int) (*image)->rows;
@@ -9045,7 +9045,7 @@
/*
Zoom image.
*/
- if (IfMagickTrue(windows->magnify.mapped) )
+ if (windows->magnify.mapped != MagickFalse )
(void) XRaiseWindow(display,windows->magnify.id);
else
{
@@ -9359,7 +9359,7 @@
/*
Map and unmap Info widget as text cursor crosses its boundaries.
*/
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
if ((x < (int) (windows->info.x+windows->info.width)) &&
(y < (int) (windows->info.y+windows->info.height)))
@@ -9369,7 +9369,7 @@
if ((x > (int) (windows->info.x+windows->info.width)) ||
(y > (int) (windows->info.y+windows->info.height)))
(void) XMapWindow(display,windows->info.id);
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
/*
Display pointer position.
@@ -9737,7 +9737,7 @@
state=DefaultState;
do
{
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
/*
Display pointer position.
@@ -10025,7 +10025,7 @@
*/
x=event.xmotion.x;
y=event.xmotion.y;
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
if ((x < (int) (windows->info.x+windows->info.width)) &&
(y < (int) (windows->info.y+windows->info.height)))
@@ -10681,7 +10681,7 @@
state=DefaultState;
do
{
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
/*
Display pointer position.
@@ -10755,7 +10755,7 @@
{
case ButtonPress:
{
- if (IfMagickTrue(image->debug) )
+ if (image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Button Press: 0x%lx %u +%d+%d",event.xbutton.window,
event.xbutton.button,event.xbutton.x,event.xbutton.y);
@@ -10784,7 +10784,7 @@
}
case ButtonRelease:
{
- if (IfMagickTrue(image->debug) )
+ if (image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Button Release: 0x%lx %u +%d+%d",event.xbutton.window,
event.xbutton.button,event.xbutton.x,event.xbutton.y);
@@ -10824,7 +10824,7 @@
length=XLookupString((XKeyEvent *) &event.xkey,command,(int)
sizeof(command),&key_symbol,(XComposeStatus *) NULL);
*(command+length)='\0';
- if (IfMagickTrue(image->debug) )
+ if (image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Key press: 0x%lx (%s)",(long) key_symbol,command);
switch ((int) key_symbol)
@@ -10866,7 +10866,7 @@
*/
x=event.xmotion.x;
y=event.xmotion.y;
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
if ((x < (int) (windows->info.x+windows->info.width)) &&
(y < (int) (windows->info.y+windows->info.height)))
@@ -10883,7 +10883,7 @@
}
default:
{
- if (IfMagickTrue(image->debug) )
+ if (image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),"Event type: %d",
event.type);
break;
@@ -11327,7 +11327,7 @@
state=DefaultState;
do
{
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
/*
Display pointer position.
@@ -11437,7 +11437,7 @@
*/
x=event.xmotion.x;
y=event.xmotion.y;
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
if ((x < (int) (windows->info.x+windows->info.width)) &&
(y < (int) (windows->info.y+windows->info.height)))
@@ -11498,7 +11498,7 @@
windows->image.highlight_context,&highlight_info);
}
else
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
(void) XWithdrawWindow(display,windows->info.id,windows->info.screen);
/*
Wait for next event.
@@ -11583,7 +11583,7 @@
(void) XMapWindow(display,windows->info.id);
do
{
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
/*
Display pointer position.
@@ -11905,7 +11905,7 @@
*/
x=event.xmotion.x;
y=event.xmotion.y;
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
if ((x < (int) (windows->info.x+windows->info.width)) &&
(y < (int) (windows->info.y+windows->info.height)))
@@ -12314,7 +12314,7 @@
windows->image.highlight_context,&rotate_info);
}
else
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
(void) XWithdrawWindow(display,windows->info.id,
windows->info.screen);
/*
@@ -12449,7 +12449,7 @@
}
}
}
- if (IfMagickTrue(windows->image.orphan) )
+ if (windows->image.orphan != MagickFalse )
return(MagickTrue);
if (normalized_degrees != 0.0)
{
@@ -12560,7 +12560,7 @@
XFileBrowserWidget(display,windows,"Save",filename);
if (*filename == '\0')
return(MagickTrue);
- if (IfMagickTrue(IsPathAccessible(filename)) )
+ if (IsPathAccessible(filename != MagickFalse) )
{
int
status;
@@ -12634,7 +12634,7 @@
*/
(void) CopyMagickString(save_image->filename,filename,MagickPathExtent);
status=WriteImage(image_info,save_image,exception);
- if (IfMagickTrue(status) )
+ if (status != MagickFalse )
image->taint=MagickFalse;
save_image=DestroyImage(save_image);
image_info=DestroyImageInfo(image_info);
@@ -12873,7 +12873,7 @@
{
while (XCheckMaskEvent(display,ButtonMotionMask,event)) ;
if (event->xmotion.window == windows->image.id)
- if (IfMagickTrue(windows->magnify.mapped) )
+ if (windows->magnify.mapped != MagickFalse )
{
/*
Update magnified image.
@@ -12964,7 +12964,7 @@
height,
width;
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
{
/*
Display info on cropping rectangle.
@@ -13211,7 +13211,7 @@
if (status <= 0)
break;
status=ShredFile(filename);
- if (IfMagickTrue(status) )
+ if (status != MagickFalse )
{
XNoticeWidget(display,windows,"Unable to delete image file:",
filename);
@@ -13248,7 +13248,7 @@
q++;
(void) CopyMagickString(filename,p,(size_t) (q-p+1));
p=q;
- if (IfMagickTrue(IsPathAccessible(filename)) )
+ if (IsPathAccessible(filename != MagickFalse) )
{
tile++;
continue;
@@ -13818,7 +13818,7 @@
*/
assert(image != (Image *) NULL);
assert(image->signature == MagickCoreSignature);
- if (IfMagickTrue(image->debug) )
+ if (image->debug != MagickFalse )
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
resources=(*resource_info);
window_info.id=(Window) NULL;
@@ -13933,7 +13933,7 @@
image->filename);
window_info.x=0;
window_info.y=0;
- if (IfMagickTrue(image->debug) )
+ if (image->debug != MagickFalse )
{
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Image: %s[%.20g] %.20gx%.20g ",image->filename,(double) image->scene,
@@ -13948,7 +13948,7 @@
*/
width=(int) window_info.width;
height=(int) window_info.height;
- if (IfMagickTrue(resources.backdrop) )
+ if (resources.backdrop != MagickFalse )
{
/*
Center image on window.
@@ -14513,7 +14513,7 @@
assert(image != (Image **) NULL);
assert((*image)->signature == MagickCoreSignature);
- if (IfMagickTrue((*image)->debug) )
+ if ((*image != MagickFalse->debug) )
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",(*image)->filename);
display_image=(*image);
warning_handler=(WarningHandler) NULL;
@@ -14586,7 +14586,7 @@
manager_hints=windows->manager_hints;
root_window=XRootWindow(display,visual_info->screen);
nexus=NewImageList();
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
{
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Image: %s[%.20g] %.20gx%.20g ",display_image->filename,
@@ -14615,7 +14615,7 @@
manager_hints->initial_state=WithdrawnState;
XMakeWindow(display,root_window,argv,argc,class_hints,manager_hints,
&windows->context);
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Window id: 0x%lx (context)",windows->context.id);
context_values.background=pixel->background_color.pixel;
@@ -14666,7 +14666,7 @@
manager_hints->initial_state=IconicState;
XMakeWindow(display,root_window,argv,argc,class_hints,manager_hints,
&windows->icon);
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),"Window id: 0x%lx (icon)",
windows->icon.id);
/*
@@ -14767,7 +14767,7 @@
NormalState;
XMakeWindow(display,root_window,argv,argc,class_hints,manager_hints,
&windows->backdrop);
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Window id: 0x%lx (backdrop)",windows->backdrop.id);
(void) XMapWindow(display,windows->backdrop.id);
@@ -14799,7 +14799,7 @@
manager_hints->flags|=WindowGroupHint;
manager_hints->window_group=windows->group_leader.id;
(void) XSelectInput(display,windows->group_leader.id,StructureNotifyMask);
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Window id: 0x%lx (group leader)",windows->group_leader.id);
}
@@ -14811,7 +14811,7 @@
if (windows->group_leader.id != (Window) NULL)
(void) XSetTransientForHint(display,windows->image.id,
windows->group_leader.id);
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),"Window id: 0x%lx (image)",
windows->image.id);
/*
@@ -14839,9 +14839,9 @@
windows->info.shadow_stipple=XCreateBitmapFromData(display,
windows->info.id,(char *) ShadowBitmap,ShadowWidth,ShadowHeight);
(void) XSetTransientForHint(display,windows->info.id,windows->image.id);
- if (IfMagickTrue(windows->image.mapped) )
+ if (windows->image.mapped != MagickFalse )
(void) XWithdrawWindow(display,windows->info.id,windows->info.screen);
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),"Window id: 0x%lx (info)",
windows->info.id);
/*
@@ -14873,9 +14873,9 @@
windows->command.shadow_stipple=XCreateBitmapFromData(display,
windows->command.id,(char *) ShadowBitmap,ShadowWidth,ShadowHeight);
(void) XSetTransientForHint(display,windows->command.id,windows->image.id);
- if (IfMagickTrue(windows->command.mapped) )
+ if (windows->command.mapped != MagickFalse )
(void) XMapRaised(display,windows->command.id);
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Window id: 0x%lx (command)",windows->command.id);
/*
@@ -14904,7 +14904,7 @@
windows->widget.shadow_stipple=XCreateBitmapFromData(display,
windows->widget.id,(char *) ShadowBitmap,ShadowWidth,ShadowHeight);
(void) XSetTransientForHint(display,windows->widget.id,windows->image.id);
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Window id: 0x%lx (widget)",windows->widget.id);
/*
@@ -14928,7 +14928,7 @@
windows->popup.shadow_stipple=XCreateBitmapFromData(display,
windows->popup.id,(char *) ShadowBitmap,ShadowWidth,ShadowHeight);
(void) XSetTransientForHint(display,windows->popup.id,windows->image.id);
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Window id: 0x%lx (pop up)",windows->popup.id);
/*
@@ -14970,7 +14970,7 @@
manager_hints->window_group=windows->image.id;
XMakeWindow(display,root_window,argv,argc,class_hints,manager_hints,
&windows->magnify);
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Window id: 0x%lx (magnify)",windows->magnify.id);
(void) XSetTransientForHint(display,windows->magnify.id,windows->image.id);
@@ -14999,11 +14999,11 @@
manager_hints->window_group=windows->image.id;
XMakeWindow(display,root_window,argv,argc,class_hints,manager_hints,
&windows->pan);
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),"Window id: 0x%lx (pan)",
windows->pan.id);
(void) XSetTransientForHint(display,windows->pan.id,windows->image.id);
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
(void) XWithdrawWindow(display,windows->info.id,windows->info.screen);
if (IfMagickFalse(windows->image.mapped) ||
(windows->backdrop.id != (Window) NULL))
@@ -15039,9 +15039,9 @@
if (IfMagickFalse(status))
ThrowXWindowFatalException(XServerFatalError,"UnableToCreateXImage",
display_image->filename);
- if (IfMagickTrue(windows->magnify.mapped) )
+ if (windows->magnify.mapped != MagickFalse )
(void) XMapRaised(display,windows->magnify.id);
- if (IfMagickTrue(windows->pan.mapped) )
+ if (windows->pan.mapped != MagickFalse )
(void) XMapRaised(display,windows->pan.id);
windows->image.window_changes.width=(int) display_image->columns;
windows->image.window_changes.height=(int) display_image->rows;
@@ -15054,7 +15054,7 @@
delay=display_image->delay/MagickMax(display_image->ticks_per_second,1L);
timer=time((time_t *) NULL)+(delay == 0 ? 1 : delay)+1;
update_time=0;
- if (IfMagickTrue(resource_info->update) )
+ if (resource_info->update != MagickFalse )
{
MagickBooleanType
status;
@@ -15063,7 +15063,7 @@
Determine when file data was last modified.
*/
status=GetPathAttributes(display_image->filename,&attributes);
- if (IfMagickTrue(status) )
+ if (status != MagickFalse )
update_time=attributes.st_mtime;
}
*state&=(~FormerImageState);
@@ -15074,7 +15074,7 @@
/*
Handle a window event.
*/
- if (IfMagickTrue(windows->image.mapped) )
+ if (windows->image.mapped != MagickFalse )
if ((display_image->delay != 0) || (resource_info->update != 0))
{
if (timer < time((time_t *) NULL))
@@ -15090,7 +15090,7 @@
Determine if image file was modified.
*/
status=GetPathAttributes(display_image->filename,&attributes);
- if (IfMagickTrue(status) )
+ if (status != MagickFalse )
if (update_time != attributes.st_mtime)
{
/*
@@ -15160,7 +15160,7 @@
{
case ButtonPress:
{
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Button Press: 0x%lx %u +%d+%d",event.xbutton.window,
event.xbutton.button,event.xbutton.x,event.xbutton.y);
@@ -15200,7 +15200,7 @@
/*
Map/unmap Command widget.
*/
- if (IfMagickTrue(windows->command.mapped) )
+ if (windows->command.mapped != MagickFalse )
(void) XWithdrawWindow(display,windows->command.id,
windows->command.screen);
else
@@ -15355,7 +15355,7 @@
}
case ButtonRelease:
{
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Button Release: 0x%lx %u +%d+%d",event.xbutton.window,
event.xbutton.button,event.xbutton.x,event.xbutton.y);
@@ -15363,7 +15363,7 @@
}
case ClientMessage:
{
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Client Message: 0x%lx 0x%lx %d 0x%lx",event.xclient.window,
event.xclient.message_type,event.xclient.format,(unsigned long)
@@ -15409,7 +15409,7 @@
(unsigned long) magick_windows[i]->mask,
&magick_windows[i]->attributes);
}
- if (IfMagickTrue(windows->pan.mapped) )
+ if (windows->pan.mapped != MagickFalse )
{
(void) XSetWindowBackgroundPixmap(display,windows->pan.id,
windows->pan.pixmap);
@@ -15526,7 +15526,7 @@
}
case ConfigureNotify:
{
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Configure Notify: 0x%lx %dx%d+%d+%d %d",event.xconfigure.window,
event.xconfigure.width,event.xconfigure.height,event.xconfigure.x,
@@ -15611,8 +15611,8 @@
windows->image.x=vid_info.x;
windows->image.y=vid_info.y;
}
- if (IfMagickTrue(windows->image.mapped) &&
- IfMagickTrue(windows->image.stasis) )
+ if (windows->image.mapped != MagickFalse &&
+ windows->image.stasis != MagickFalse )
{
/*
Update image window configuration.
@@ -15632,7 +15632,7 @@
XDrawPanRectangle(display,windows);
}
else
- if (IfMagickTrue(windows->pan.mapped) )
+ if (windows->pan.mapped != MagickFalse )
(void) XWithdrawWindow(display,windows->pan.id,
windows->pan.screen);
break;
@@ -15665,8 +15665,8 @@
&window_changes);
break;
}
- if (IfMagickTrue(windows->magnify.mapped) &&
- IfMagickTrue(windows->magnify.stasis) )
+ if (windows->magnify.mapped != MagickFalse &&
+ windows->magnify.stasis != MagickFalse )
{
status=XMakeImage(display,resource_info,&windows->magnify,
display_image,windows->magnify.width,windows->magnify.height,
@@ -15675,7 +15675,7 @@
}
break;
}
- if (IfMagickTrue(windows->magnify.mapped) &&
+ if (windows->magnify.mapped != MagickFalse &&
(event.xconfigure.window == windows->pan.id))
{
/*
@@ -15706,7 +15706,7 @@
/*
Group leader has exited.
*/
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Destroy Notify: 0x%lx",event.xdestroywindow.window);
if (event.xdestroywindow.window == windows->group_leader.id)
@@ -15728,7 +15728,7 @@
}
case Expose:
{
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Expose: 0x%lx %dx%d+%d+%d",event.xexpose.window,
event.xexpose.width,event.xexpose.height,event.xexpose.x,
@@ -15737,7 +15737,7 @@
Refresh windows that are now exposed.
*/
if ((event.xexpose.window == windows->image.id) &&
- IfMagickTrue(windows->image.mapped) )
+ windows->image.mapped != MagickFalse )
{
XRefreshWindow(display,&windows->image,&event);
delay=display_image->delay/MagickMax(
@@ -15746,7 +15746,7 @@
break;
}
if ((event.xexpose.window == windows->magnify.id) &&
- IfMagickTrue(windows->magnify.mapped))
+ windows->magnify.mapped != MagickFalse)
{
XMakeMagnifyImage(display,windows,exception);
break;
@@ -15774,7 +15774,7 @@
length=XLookupString((XKeyEvent *) &event.xkey,command,(int)
sizeof(command),&key_symbol,(XComposeStatus *) NULL);
*(command+length)='\0';
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Key press: %d 0x%lx (%s)",event.xkey.state,(unsigned long)
key_symbol,command);
@@ -15813,7 +15813,7 @@
*/
(void) XLookupString((XKeyEvent *) &event.xkey,command,(int)
sizeof(command),&key_symbol,(XComposeStatus *) NULL);
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Key release: 0x%lx (%c)",(unsigned long) key_symbol,*command);
break;
@@ -15830,7 +15830,7 @@
}
case MapNotify:
{
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),"Map Notify: 0x%lx",
event.xmap.window);
if (event.xmap.window == windows->backdrop.id)
@@ -15938,7 +15938,7 @@
after,
length;
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Property Notify: 0x%lx 0x%lx %d",event.xproperty.window,
event.xproperty.atom,event.xproperty.state);
@@ -15970,7 +15970,7 @@
}
case ReparentNotify:
{
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Reparent Notify: 0x%lx=>0x%lx",event.xreparent.parent,
event.xreparent.window);
@@ -15978,7 +15978,7 @@
}
case UnmapNotify:
{
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),
"Unmap Notify: 0x%lx",event.xunmap.window);
if (event.xunmap.window == windows->backdrop.id)
@@ -16041,7 +16041,7 @@
}
default:
{
- if (IfMagickTrue(display_image->debug) )
+ if (display_image->debug != MagickFalse )
(void) LogMagickEvent(X11Event,GetMagickModule(),"Event type: %d",
event.type);
break;
@@ -16052,13 +16052,13 @@
(void) XMagickCommand(display,resource_info,windows,FreeBuffersCommand,
&display_image,exception);
else
- if (IfMagickTrue(resource_info->confirm_edit) )
+ if (resource_info->confirm_edit != MagickFalse )
{
/*
Query user if image has changed.
*/
if (IfMagickFalse(resource_info->immutable) &&
- IfMagickTrue(display_image->taint))
+ display_image->taint != MagickFalse)
{
int
status;
@@ -16080,16 +16080,16 @@
/*
Withdraw pan and Magnify window.
*/
- if (IfMagickTrue(windows->info.mapped) )
+ if (windows->info.mapped != MagickFalse )
(void) XWithdrawWindow(display,windows->info.id,windows->info.screen);
- if (IfMagickTrue(windows->magnify.mapped) )
+ if (windows->magnify.mapped != MagickFalse )
(void) XWithdrawWindow(display,windows->magnify.id,
windows->magnify.screen);
- if (IfMagickTrue(windows->command.mapped) )
+ if (windows->command.mapped != MagickFalse )
(void) XWithdrawWindow(display,windows->command.id,
windows->command.screen);
}
- if (IfMagickTrue(windows->pan.mapped) )
+ if (windows->pan.mapped != MagickFalse )
(void) XWithdrawWindow(display,windows->pan.id,windows->pan.screen);
if (IfMagickFalse(resource_info->backdrop) )
if (windows->backdrop.mapped)
@@ -16189,7 +16189,7 @@
assert(image != (Image *) NULL);
assert(image->signature == MagickCoreSignature);
(void) image_info;
- if (IfMagickTrue(image->debug) )
+ if (image->debug != MagickFalse )
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
(void) ThrowMagickException(exception,GetMagickModule(),MissingDelegateError,
"DelegateLibrarySupportNotBuiltIn","'%s' (X11)",image->filename);
