From 11d32021f6e9ca04a8d6cb978a4b163b356fddee Mon Sep 17 00:00:00 2001 From: anthony Date: Sat, 17 Nov 2012 05:31:33 +0000 Subject: [PATCH] --- MagickCore/artifact.c | 8 +- MagickCore/display.c | 478 +++++++++++++++++++++--------------------- 2 files changed, 245 insertions(+), 241 deletions(-) diff --git a/MagickCore/artifact.c b/MagickCore/artifact.c index 9a72da6c7..9620dc36c 100644 --- a/MagickCore/artifact.c +++ b/MagickCore/artifact.c @@ -293,7 +293,13 @@ MagickExport const char *GetImageArtifact(const Image *image, if (p != (const char *) NULL) return(p); } - /* if no per-image artifact - look for a global option instead */ + /* Programmer notes.... + CLI IMv7: if no per-image artifact - look for a global option instead + CLI IMv6: global options are copied into per-image artifacts + In all other cases, if image is not part of a image_info, image list this + pointer should be NULL. + */ + if ( (image->image_info != (ImageInfo *)NULL) && (image->image_info->options != (void *) NULL) ) p=(const char *) GetValueFromSplayTree((SplayTreeInfo *) diff --git a/MagickCore/display.c b/MagickCore/display.c index 03a13e9c7..ffcf7eae4 100644 --- a/MagickCore/display.c +++ b/MagickCore/display.c @@ -1675,7 +1675,7 @@ MagickExport MagickBooleanType DisplayImages(const ImageInfo *image_info, assert(image_info->signature == MagickSignature); assert(images != (Image *) NULL); assert(images->signature == MagickSignature); - if (images->debug != MagickFalse) + if( IfMagickTrue(images->debug) ) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); display=XOpenDisplay(image_info->server_name); if (display == (Display *) NULL) @@ -1765,7 +1765,7 @@ MagickExport MagickBooleanType RemoteDisplayCommand(const ImageInfo *image_info, (void) XSetErrorHandler(XError); status=XRemoteCommand(display,window,filename); (void) XCloseDisplay(display); - return(status != 0 ? MagickTrue : MagickFalse); + return(IsMagickTrue(status)); } /* @@ -1934,7 +1934,7 @@ static MagickBooleanType XAnnotateEditImage(Display *display, state=DefaultState; do { - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { /* Display pointer position. @@ -2027,7 +2027,7 @@ static MagickBooleanType XAnnotateEditImage(Display *display, break; transparent_pen=pen_number == (MaxNumberPens-2) ? MagickTrue : MagickFalse; - if (transparent_pen != MagickFalse) + if( IfMagickTrue(transparent_pen) ) break; if (pen_number == (MaxNumberPens-1)) { @@ -2072,7 +2072,7 @@ static MagickBooleanType XAnnotateEditImage(Display *display, break; transparent_box=pen_number == (MaxNumberPens-2) ? MagickTrue : MagickFalse; - if (transparent_box != MagickFalse) + if( IfMagickTrue(transparent_box) ) break; if (pen_number == (MaxNumberPens-1)) { @@ -2223,7 +2223,7 @@ static MagickBooleanType XAnnotateEditImage(Display *display, */ x=event.xmotion.x; y=event.xmotion.y; - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { if ((x < (int) (windows->info.x+windows->info.width)) && (y < (int) (windows->info.y+windows->info.height))) @@ -2271,10 +2271,10 @@ static MagickBooleanType XAnnotateEditImage(Display *display, XGetAnnotateInfo(annotate_info); annotate_info->x=x; annotate_info->y=y; - if ((transparent_box == MagickFalse) && (transparent_pen == MagickFalse)) + if( IfMagickFalse(transparent_box) && IfMagickFalse(transparent_pen)) annotate_info->stencil=OpaqueStencil; else - if (transparent_box == MagickFalse) + if( IfMagickFalse(transparent_box) ) annotate_info->stencil=BackgroundStencil; else annotate_info->stencil=ForegroundStencil; @@ -2823,10 +2823,10 @@ static MagickBooleanType XBackgroundImage(Display *display, XCheckRefreshWindows(display,windows); background_resources=(*resource_info); background_resources.window_id=window_id; - background_resources.backdrop=status != 0 ? MagickTrue : MagickFalse; + background_resources.backdrop=IsMagickTrue(status); status=XDisplayBackgroundImage(display,&background_resources,*image, exception); - if (status != MagickFalse) + if (IfMagickTrue(status)) XClientMessage(display,windows->image.id,windows->im_protocols, windows->im_retain_colors,CurrentTime); XSetCursorState(display,windows,MagickFalse); @@ -2945,7 +2945,7 @@ static MagickBooleanType XChopImage(Display *display, state=DefaultState; do { - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { /* Display pointer position. @@ -3084,7 +3084,7 @@ static MagickBooleanType XChopImage(Display *display, */ x=event.xmotion.x; y=event.xmotion.y; - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { if ((x < (int) (windows->info.x+windows->info.width)) && (y < (int) (windows->info.y+windows->info.height))) @@ -3120,7 +3120,7 @@ static MagickBooleanType XChopImage(Display *display, /* Display info and draw chopping line. */ - if (windows->info.mapped == MagickFalse) + if( IfMagickFalse(windows->info.mapped) ) (void) XMapWindow(display,windows->info.id); (void) FormatLocaleString(text,MaxTextExtent, " %.20gx%.20g%+.20g%+.20g",(double) chop_info.width,(double) @@ -3130,7 +3130,7 @@ static MagickBooleanType XChopImage(Display *display, windows->image.highlight_context,&segment_info); } else - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) (void) XWithdrawWindow(display,windows->info.id,windows->info.screen); /* Wait for next event. @@ -3387,7 +3387,7 @@ static MagickBooleanType XColorEditImage(Display *display, state=DefaultState; do { - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { /* Display pointer position. @@ -3679,7 +3679,7 @@ static MagickBooleanType XColorEditImage(Display *display, */ x=event.xmotion.x; y=event.xmotion.y; - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { if ((x < (int) (windows->info.x+windows->info.width)) && (y < (int) (windows->info.y+windows->info.height))) @@ -3743,7 +3743,7 @@ static MagickBooleanType XColorEditImage(Display *display, /* Update color information using point algorithm. */ - if (SetImageStorageClass(*image,DirectClass,exception) == MagickFalse) + if( IfMagickFalse(SetImageStorageClass(*image,DirectClass,exception)) ) return(MagickFalse); q=GetCacheViewAuthenticPixels(image_view,(ssize_t)x_offset, (ssize_t) y_offset,1,1,exception); @@ -3788,7 +3788,7 @@ static MagickBooleanType XColorEditImage(Display *display, } q+=GetPixelChannels(*image); } - if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) + if( IfMagickFalse(SyncCacheViewAuthenticPixels(image_view,exception)) ) break; } } @@ -3836,9 +3836,9 @@ static MagickBooleanType XColorEditImage(Display *display, (DrawInfo *) NULL); (void) QueryColorCompliance(resource_info->pen_colors[pen_id], AllCompliance,&draw_info->fill,exception); - (void) FloodfillPaintImage(*image,draw_info,&target,(ssize_t) - x_offset,(ssize_t) y_offset,method == FloodfillMethod ? - MagickFalse : MagickTrue,exception); + (void) FloodfillPaintImage(*image,draw_info,&target, + (ssize_t)x_offset,(ssize_t)y_offset, + IsMagickFalse(method == FloodfillMethod),exception); draw_info=DestroyDrawInfo(draw_info); break; } @@ -3847,7 +3847,7 @@ static MagickBooleanType XColorEditImage(Display *display, /* Update color information using reset algorithm. */ - if (SetImageStorageClass(*image,DirectClass,exception) == MagickFalse) + if( IfMagickFalse(SetImageStorageClass(*image,DirectClass,exception)) ) return(MagickFalse); for (y=0; y < (int) (*image)->rows; y++) { @@ -3862,7 +3862,7 @@ static MagickBooleanType XColorEditImage(Display *display, SetPixelBlue(*image,ScaleShortToQuantum(color.blue),q); q+=GetPixelChannels(*image); } - if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) + if( IfMagickFalse(SyncCacheViewAuthenticPixels(image_view,exception)) ) break; } break; @@ -4022,7 +4022,7 @@ static MagickBooleanType XCompositeImage(Display *display, state=DefaultState; do { - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { /* Display pointer position. @@ -4136,7 +4136,7 @@ static MagickBooleanType XCompositeImage(Display *display, { case ButtonPress: { - if (image->debug != MagickFalse) + if( IfMagickTrue(image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Button Press: 0x%lx %u +%d+%d",event.xbutton.window, event.xbutton.button,event.xbutton.x,event.xbutton.y); @@ -4156,7 +4156,7 @@ static MagickBooleanType XCompositeImage(Display *display, } case ButtonRelease: { - if (image->debug != MagickFalse) + if( IfMagickTrue(image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Button Release: 0x%lx %u +%d+%d",event.xbutton.window, event.xbutton.button,event.xbutton.x,event.xbutton.y); @@ -4196,7 +4196,7 @@ static MagickBooleanType XCompositeImage(Display *display, length=XLookupString((XKeyEvent *) &event.xkey,command,(int) sizeof(command),&key_symbol,(XComposeStatus *) NULL); *(command+length)='\0'; - if (image->debug != MagickFalse) + if( IfMagickTrue(image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Key press: 0x%lx (%s)",(unsigned long) key_symbol,command); switch ((int) key_symbol) @@ -4238,7 +4238,7 @@ static MagickBooleanType XCompositeImage(Display *display, */ x=event.xmotion.x; y=event.xmotion.y; - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { if ((x < (int) (windows->info.x+windows->info.width)) && (y < (int) (windows->info.y+windows->info.height))) @@ -4255,7 +4255,7 @@ static MagickBooleanType XCompositeImage(Display *display, } default: { - if (image->debug != MagickFalse) + if( IfMagickTrue(image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(),"Event type: %d", event.type); break; @@ -4333,7 +4333,7 @@ static MagickBooleanType XCompositeImage(Display *display, (void) SetImageAlphaChannel(composite_image,OpaqueAlphaChannel,exception); opacity=(Quantum) (ScaleQuantumToChar(QuantumRange)- ((ssize_t) ScaleQuantumToChar(QuantumRange)*blend)/100); - if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) + if( IfMagickFalse(SetImageStorageClass(image,DirectClass,exception)) ) return(MagickFalse); image->alpha_trait=BlendPixelTrait; image_view=AcquireAuthenticCacheView(image,exception); @@ -4348,7 +4348,7 @@ static MagickBooleanType XCompositeImage(Display *display, SetPixelAlpha(image,opacity,q); q+=GetPixelChannels(image); } - if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) + if( IfMagickFalse(SyncCacheViewAuthenticPixels(image_view,exception)) ) break; } image_view=DestroyCacheView(image_view); @@ -4434,7 +4434,7 @@ static MagickBooleanType XConfigureImage(Display *display, */ width=(unsigned int) windows->image.window_changes.width; height=(unsigned int) windows->image.window_changes.height; - if (image->debug != MagickFalse) + if( IfMagickTrue(image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Configure Image: %dx%d=>%.20gx%.20g",windows->image.ximage->width, windows->image.ximage->height,(double) width,(double) height); @@ -4459,7 +4459,7 @@ static MagickBooleanType XConfigureImage(Display *display, (height*windows->image.y/windows->image.ximage->height); status=XMakeImage(display,resource_info,&windows->image,image, (unsigned int) width,(unsigned int) height,exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) XNoticeWidget(display,windows,"Unable to configure X image:", windows->image.name); /* @@ -4495,7 +4495,7 @@ static MagickBooleanType XConfigureImage(Display *display, /* Update Magnify window configuration. */ - if (windows->magnify.mapped != MagickFalse) + if( IfMagickTrue(windows->magnify.mapped) ) XMakeMagnifyImage(display,windows,exception); windows->pan.crop_geometry=windows->image.crop_geometry; XBestIconSize(display,&windows->pan,image); @@ -4538,7 +4538,7 @@ static MagickBooleanType XConfigureImage(Display *display, (void) XReconfigureWMWindow(display,windows->icon.id,windows->icon.screen, (unsigned int) (CWWidth | CWHeight),&window_changes); XSetCursorState(display,windows,MagickFalse); - return(status != 0 ? MagickTrue : MagickFalse); + return(IsMagickTrue(status)); } /* @@ -4693,7 +4693,7 @@ static MagickBooleanType XCropImage(Display *display, state=DefaultState; do { - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { /* Display pointer position. @@ -4840,7 +4840,7 @@ static MagickBooleanType XCropImage(Display *display, */ x=event.xmotion.x; y=event.xmotion.y; - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { if ((x < (int) (windows->info.x+windows->info.width)) && (y < (int) (windows->info.y+windows->info.height))) @@ -4891,7 +4891,7 @@ static MagickBooleanType XCropImage(Display *display, /* Display info and draw cropping rectangle. */ - if (windows->info.mapped == MagickFalse) + if( IfMagickFalse(windows->info.mapped) ) (void) XMapWindow(display,windows->info.id); (void) FormatLocaleString(text,MaxTextExtent, " %.20gx%.20g%+.20g%+.20g",(double) crop_info.width,(double) @@ -4901,7 +4901,7 @@ static MagickBooleanType XCropImage(Display *display, windows->image.highlight_context,&highlight_info); } else - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) (void) XWithdrawWindow(display,windows->info.id,windows->info.screen); /* Wait for next event. @@ -4981,7 +4981,7 @@ static MagickBooleanType XCropImage(Display *display, (void) XMapWindow(display,windows->info.id); do { - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { /* Display pointer position. @@ -5246,7 +5246,7 @@ static MagickBooleanType XCropImage(Display *display, */ x=event.xmotion.x; y=event.xmotion.y; - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { if ((x < (int) (windows->info.x+windows->info.width)) && (y < (int) (windows->info.y+windows->info.height))) @@ -5354,7 +5354,7 @@ static MagickBooleanType XCropImage(Display *display, /* Cut image. */ - if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) + if( IfMagickFalse(SetImageStorageClass(image,DirectClass,exception)) ) return(MagickFalse); image->alpha_trait=BlendPixelTrait; image_view=AcquireAuthenticCacheView(image,exception); @@ -5369,7 +5369,7 @@ static MagickBooleanType XCropImage(Display *display, SetPixelAlpha(image,TransparentAlpha,q); q+=GetPixelChannels(image); } - if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) + if( IfMagickFalse(SyncCacheViewAuthenticPixels(image_view,exception)) ) break; } image_view=DestroyCacheView(image_view); @@ -5541,7 +5541,7 @@ static MagickBooleanType XDrawEditImage(Display *display, state=DefaultState; do { - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { /* Display pointer position. @@ -5620,7 +5620,7 @@ static MagickBooleanType XDrawEditImage(Display *display, break; transparent=pen_number == (MaxNumberPens-2) ? MagickTrue : MagickFalse; - if (transparent != MagickFalse) + if( IfMagickTrue(transparent) ) { draw_info.stencil=TransparentStencil; break; @@ -5901,7 +5901,7 @@ static MagickBooleanType XDrawEditImage(Display *display, */ x=event.xmotion.x; y=event.xmotion.y; - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { if ((x < (int) (windows->info.x+windows->info.width)) && (y < (int) (windows->info.y+windows->info.height))) @@ -5974,7 +5974,7 @@ static MagickBooleanType XDrawEditImage(Display *display, windows->image.highlight_context,&line_info); } else - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) (void) XWithdrawWindow(display,windows->info.id, windows->info.screen); break; @@ -5996,7 +5996,7 @@ static MagickBooleanType XDrawEditImage(Display *display, windows->image.highlight_context,&rectangle_info); } else - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) (void) XWithdrawWindow(display,windows->info.id, windows->info.screen); break; @@ -6020,7 +6020,7 @@ static MagickBooleanType XDrawEditImage(Display *display, windows->image.highlight_context,&rectangle_info); } else - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) (void) XWithdrawWindow(display,windows->info.id, windows->info.screen); break; @@ -6046,7 +6046,7 @@ static MagickBooleanType XDrawEditImage(Display *display, windows->image.highlight_context,&line_info); } else - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) (void) XWithdrawWindow(display,windows->info.id, windows->info.screen); break; @@ -6339,7 +6339,7 @@ static MagickBooleanType XDrawEditImage(Display *display, } XSetCursorState(display,windows,MagickFalse); coordinate_info=(XPoint *) RelinquishMagickMemory(coordinate_info); - return(status != 0 ? MagickTrue : MagickFalse); + return(IsMagickTrue(status)); } /* @@ -6493,7 +6493,7 @@ static void XImageCache(Display *display,XResourceInfo *resource_info, redo_image=(*image); *image=cache_image->list; cache_image=DestroyImage(cache_image); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) return; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -6659,7 +6659,7 @@ static void XImageCache(Display *display,XResourceInfo *resource_info, *image=DestroyImage(*image); *image=redo_image; redo_image=NewImageList(); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) return; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -7214,7 +7214,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, Save image. */ status=XSaveImage(display,resource_info,windows,*image,exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) { char message[MaxTextExtent]; @@ -7234,7 +7234,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, Print image. */ status=XPrintImage(display,resource_info,windows,*image,exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) { char message[MaxTextExtent]; @@ -7259,8 +7259,8 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, XFileBrowserWidget(display,windows,"Delete",filename); if (*filename == '\0') break; - status=remove_utf8(filename) != 0 ? MagickTrue : MagickFalse; - if (status != MagickFalse) + status=IsMagickTrue(remove_utf8(filename)); + if( IfMagickTrue(status) ) XNoticeWidget(display,windows,"Unable to delete image file:",filename); break; } @@ -7313,7 +7313,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, /* exit program. */ - if (resource_info->confirm_exit == MagickFalse) + if( IfMagickFalse(resource_info->confirm_exit) ) XClientMessage(display,windows->image.id,windows->im_protocols, windows->im_exit,CurrentTime); else @@ -7355,7 +7355,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, Paste image. */ status=XPasteImage(display,resource_info,windows,*image,exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) { XNoticeWidget(display,windows,"Unable to paste X image", (*image)->filename); @@ -7503,7 +7503,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, Chop image. */ status=XChopImage(display,resource_info,windows,image,exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) { XNoticeWidget(display,windows,"Unable to cut X image", (*image)->filename); @@ -7541,7 +7541,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, (void) FormatLocaleString(windows->image.crop_geometry,MaxTextExtent, "%ux%u%+d%+d",width,height,(int) (*image)->columns-(int) width-x,y); } - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; (void) XConfigureImage(display,resource_info,windows,*image,exception); break; @@ -7576,7 +7576,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, (void) FormatLocaleString(windows->image.crop_geometry,MaxTextExtent, "%ux%u%+d%+d",width,height,x,(int) (*image)->rows-(int) height-y); } - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; (void) XConfigureImage(display,resource_info,windows,*image,exception); break; @@ -7587,7 +7587,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, Rotate image 90 degrees clockwise. */ status=XRotateImage(display,resource_info,windows,90.0,image,exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) { XNoticeWidget(display,windows,"Unable to rotate X image", (*image)->filename); @@ -7601,7 +7601,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, Rotate image 90 degrees counter-clockwise. */ status=XRotateImage(display,resource_info,windows,-90.0,image,exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) { XNoticeWidget(display,windows,"Unable to rotate X image", (*image)->filename); @@ -7615,7 +7615,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, Rotate image. */ status=XRotateImage(display,resource_info,windows,0.0,image,exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) { XNoticeWidget(display,windows,"Unable to rotate X image", (*image)->filename); @@ -7662,7 +7662,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, } CatchException(exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; windows->image.window_changes.width=(int) (*image)->columns; windows->image.window_changes.height=(int) (*image)->rows; @@ -7703,7 +7703,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, } CatchException(exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; windows->image.window_changes.width=(int) (*image)->columns; windows->image.window_changes.height=(int) (*image)->rows; @@ -7729,7 +7729,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, Trim image. */ status=XTrimImage(display,resource_info,windows,*image,exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) { XNoticeWidget(display,windows,"Unable to trim X image", (*image)->filename); @@ -7759,7 +7759,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, MaxTextExtent); (void) ModulateImage(*image,modulate_factors,exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -7787,7 +7787,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, MaxTextExtent); (void) ModulateImage(*image,modulate_factors,exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -7814,7 +7814,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, MaxTextExtent); (void) ModulateImage(*image,modulate_factors,exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -7839,7 +7839,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, XCheckRefreshWindows(display,windows); (void) GammaImage(*image,atof(factor),exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -7854,7 +7854,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, XCheckRefreshWindows(display,windows); (void) ContrastImage(*image,MagickTrue,exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -7869,7 +7869,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, XCheckRefreshWindows(display,windows); (void) ContrastImage(*image,MagickFalse,exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -7908,7 +7908,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, (void) ContrastStretchImage(*image,black_point,white_point, exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -7945,7 +7945,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, (void) SigmoidalContrastImage(*image,MagickTrue,geometry_info.rho, geometry_info.sigma,exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -7960,7 +7960,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, XCheckRefreshWindows(display,windows); (void) NormalizeImage(*image,exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -7975,7 +7975,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, XCheckRefreshWindows(display,windows); (void) EqualizeImage(*image,exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -7990,7 +7990,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, XCheckRefreshWindows(display,windows); (void) NegateImage(*image,MagickFalse,exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8006,7 +8006,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, (void) SetImageType(*image,(*image)->alpha_trait != BlendPixelTrait ? GrayscaleType : GrayscaleMatteType,exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8040,7 +8040,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, } CatchException(exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8071,7 +8071,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, NoDitherMethod; (void) QuantizeImage(&quantize_info,*image,exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8095,7 +8095,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, } CatchException(exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8133,7 +8133,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, } CatchException(exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8169,7 +8169,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, } CatchException(exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8209,7 +8209,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, } CatchException(exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8245,7 +8245,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, } CatchException(exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8281,7 +8281,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, } CatchException(exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8310,7 +8310,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, threshold=StringToDoubleInterval(factor,(double) QuantumRange+1.0); (void) BilevelImage(*image,threshold,exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8346,7 +8346,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, } CatchException(exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8382,7 +8382,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, } CatchException(exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8414,7 +8414,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, flags=ParseGeometry(geometry,&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; - shade_image=ShadeImage(*image,status != 0 ? MagickFalse : MagickTrue, + shade_image=ShadeImage(*image,IsMagickTrue(status), geometry_info.rho,geometry_info.sigma,exception); if (shade_image != (Image *) NULL) { @@ -8423,7 +8423,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, } CatchException(exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8451,7 +8451,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, exception); (void) RaiseImage(*image,&page_geometry,MagickTrue,exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8480,7 +8480,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, (void) SegmentImage(*image,sRGBColorspace,MagickFalse,geometry_info.rho, geometry_info.sigma,exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8518,7 +8518,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, } CatchException(exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8547,7 +8547,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, threshold=StringToDoubleInterval(factor,(double) QuantumRange+1.0); (void) SolarizeImage(*image,threshold,exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8583,7 +8583,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, } CatchException(exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8619,7 +8619,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, } CatchException(exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8662,7 +8662,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, } CatchException(exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8700,7 +8700,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, } CatchException(exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8736,7 +8736,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, } CatchException(exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8776,7 +8776,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, } CatchException(exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; XConfigureImageColormap(display,resource_info,windows,*image,exception); (void) XConfigureImage(display,resource_info,windows,*image,exception); @@ -8788,7 +8788,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, Annotate the image with text. */ status=XAnnotateEditImage(display,resource_info,windows,*image,exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) { XNoticeWidget(display,windows,"Unable to annotate X image", (*image)->filename); @@ -8802,7 +8802,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, Draw image. */ status=XDrawEditImage(display,resource_info,windows,image,exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) { XNoticeWidget(display,windows,"Unable to draw on the X image", (*image)->filename); @@ -8816,7 +8816,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, Color edit. */ status=XColorEditImage(display,resource_info,windows,image,exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) { XNoticeWidget(display,windows,"Unable to pixel edit X image", (*image)->filename); @@ -8830,7 +8830,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, Matte edit. */ status=XMatteEditImage(display,resource_info,windows,image,exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) { XNoticeWidget(display,windows,"Unable to matte edit X image", (*image)->filename); @@ -8845,7 +8845,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, */ status=XCompositeImage(display,resource_info,windows,*image, exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) { XNoticeWidget(display,windows,"Unable to composite X image", (*image)->filename); @@ -8891,7 +8891,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, } CatchException(exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; windows->image.window_changes.width=(int) (*image)->columns; windows->image.window_changes.height=(int) (*image)->rows; @@ -8947,7 +8947,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, } CatchException(exception); XSetCursorState(display,windows,MagickFalse); - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) break; windows->image.window_changes.width=(int) (*image)->columns; windows->image.window_changes.height=(int) (*image)->rows; @@ -8997,7 +8997,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, XCheckRefreshWindows(display,windows); status=InvokeDelegate(image_info,*image,"edit",(char *) NULL, exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) XNoticeWidget(display,windows,"Unable to edit image comment", (char *) NULL); else @@ -9027,7 +9027,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, (void) FormatLocaleString((*image)->filename,MaxTextExtent,"launch:%s", filename); status=WriteImage(image_info,*image,exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) XNoticeWidget(display,windows,"Unable to launch image editor", (char *) NULL); else @@ -9056,7 +9056,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, /* Zoom image. */ - if (windows->magnify.mapped != MagickFalse) + if( IfMagickTrue(windows->magnify.mapped) ) (void) XRaiseWindow(display,windows->magnify.id); else { @@ -9115,7 +9115,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, filename); status=WriteImage(image_info,preview_image,exception); preview_image=DestroyImage(preview_image); - if (status == MagickFalse) + if( IfMagickFalse(status) ) XNoticeWidget(display,windows,"Unable to show image preview", (*image)->filename); XDelay(display,1500); @@ -9148,7 +9148,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, "show:%s",filename); status=WriteImage(image_info,histogram_image,exception); histogram_image=DestroyImage(histogram_image); - if (status == MagickFalse) + if( IfMagickFalse(status) ) XNoticeWidget(display,windows,"Unable to show histogram", (*image)->filename); XDelay(display,1500); @@ -9187,7 +9187,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, filename); status=WriteImage(image_info,matte_image,exception); matte_image=DestroyImage(matte_image); - if (status == MagickFalse) + if( IfMagickFalse(status) ) XNoticeWidget(display,windows,"Unable to show matte", (*image)->filename); XDelay(display,1500); @@ -9200,7 +9200,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, Background image. */ status=XBackgroundImage(display,resource_info,windows,image,exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) break; nexus=CloneImage(*image,0,0,MagickTrue,exception); if (nexus != (Image *) NULL) @@ -9231,7 +9231,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, Set user preferences. */ status=XPreferencesWidget(display,resource_info,windows); - if (status == MagickFalse) + if( IfMagickFalse(status) ) break; nexus=CloneImage(*image,0,0,MagickTrue,exception); if (nexus != (Image *) NULL) @@ -9286,7 +9286,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, XCheckRefreshWindows(display,windows); status=InvokeDelegate(image_info,*image,"browse",(char *) NULL, exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) XNoticeWidget(display,windows,"Unable to browse documentation", (char *) NULL); XDelay(display,1500); @@ -9370,7 +9370,7 @@ static void XMagnifyImage(Display *display,XWindows *windows,XEvent *event, /* Map and unmap Info widget as text cursor crosses its boundaries. */ - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { if ((x < (int) (windows->info.x+windows->info.width)) && (y < (int) (windows->info.y+windows->info.height))) @@ -9380,7 +9380,7 @@ static void XMagnifyImage(Display *display,XWindows *windows,XEvent *event, if ((x > (int) (windows->info.x+windows->info.width)) || (y > (int) (windows->info.y+windows->info.height))) (void) XMapWindow(display,windows->info.id); - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { /* Display pointer position. @@ -9610,7 +9610,7 @@ static void XMakePanImage(Display *display,XResourceInfo *resource_info, windows->pan.y=(int) windows->image.y; status=XMakeImage(display,resource_info,&windows->pan,image, windows->pan.width,windows->pan.height,exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) ThrowXWindowFatalException(ResourceLimitError, "MemoryAllocationFailed",image->filename); (void) XSetWindowBackgroundPixmap(display,windows->pan.id, @@ -9748,7 +9748,7 @@ static MagickBooleanType XMatteEditImage(Display *display, state=DefaultState; do { - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { /* Display pointer position. @@ -10036,7 +10036,7 @@ static MagickBooleanType XMatteEditImage(Display *display, */ x=event.xmotion.x; y=event.xmotion.y; - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { if ((x < (int) (windows->info.x+windows->info.width)) && (y < (int) (windows->info.y+windows->info.height))) @@ -10091,7 +10091,7 @@ static MagickBooleanType XMatteEditImage(Display *display, if ((x_offset >= (int) (*image)->columns) || (y_offset >= (int) (*image)->rows)) continue; - if (SetImageStorageClass(*image,DirectClass,exception) == MagickFalse) + if( IfMagickFalse(SetImageStorageClass(*image,DirectClass,exception)) ) return(MagickFalse); if ((*image)->alpha_trait != BlendPixelTrait) (void) SetImageAlphaChannel(*image,OpaqueAlphaChannel,exception); @@ -10136,7 +10136,7 @@ static MagickBooleanType XMatteEditImage(Display *display, SetPixelAlpha(*image,(Quantum) StringToLong(matte),q); q+=GetPixelChannels(*image); } - if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) + if( IfMagickFalse(SyncCacheViewAuthenticPixels(image_view,exception)) ) break; } break; @@ -10174,8 +10174,8 @@ static MagickBooleanType XMatteEditImage(Display *display, StringToDouble(matte,(char **) NULL)); channel_mask=SetImageChannelMask(*image,AlphaChannel); (void) FloodfillPaintImage(*image,draw_info,&target,(ssize_t) - x_offset,(ssize_t) y_offset,method == FloodfillMethod ? - MagickFalse : MagickTrue,exception); + x_offset,(ssize_t) y_offset, + IsMagickFalse(method == FloodfillMethod),exception); (void) SetPixelChannelMask(*image,channel_mask); draw_info=DestroyDrawInfo(draw_info); break; @@ -10185,7 +10185,7 @@ static MagickBooleanType XMatteEditImage(Display *display, /* Update matte information using reset algorithm. */ - if (SetImageStorageClass(*image,DirectClass,exception) == MagickFalse) + if( IfMagickFalse(SetImageStorageClass(*image,DirectClass,exception)) ) return(MagickFalse); for (y=0; y < (int) (*image)->rows; y++) { @@ -10198,7 +10198,7 @@ static MagickBooleanType XMatteEditImage(Display *display, SetPixelAlpha(*image,(Quantum) StringToLong(matte),q); q+=GetPixelChannels(*image); } - if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) + if( IfMagickFalse(SyncCacheViewAuthenticPixels(image_view,exception)) ) break; } if (StringToLong(matte) == (long) OpaqueAlpha) @@ -10269,7 +10269,7 @@ static Image *XOpenImage(Display *display,XResourceInfo *resource_info, /* Request file name from user. */ - if (command == MagickFalse) + if( IfMagickFalse(command) ) XFileBrowserWidget(display,windows,"Open",filename); else { @@ -10337,7 +10337,7 @@ static Image *XOpenImage(Display *display,XResourceInfo *resource_info, } magick_info=GetMagickInfo(image_info->magick,exception); if ((magick_info != (const MagickInfo *) NULL) && - (magick_info->raw != MagickFalse)) + IfMagickTrue(magick_info->raw)) { char geometry[MaxTextExtent]; @@ -10692,7 +10692,7 @@ static MagickBooleanType XPasteImage(Display *display, state=DefaultState; do { - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { /* Display pointer position. @@ -10766,7 +10766,7 @@ static MagickBooleanType XPasteImage(Display *display, { case ButtonPress: { - if (image->debug != MagickFalse) + if( IfMagickTrue(image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Button Press: 0x%lx %u +%d+%d",event.xbutton.window, event.xbutton.button,event.xbutton.x,event.xbutton.y); @@ -10795,7 +10795,7 @@ static MagickBooleanType XPasteImage(Display *display, } case ButtonRelease: { - if (image->debug != MagickFalse) + if( IfMagickTrue(image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Button Release: 0x%lx %u +%d+%d",event.xbutton.window, event.xbutton.button,event.xbutton.x,event.xbutton.y); @@ -10835,7 +10835,7 @@ static MagickBooleanType XPasteImage(Display *display, length=XLookupString((XKeyEvent *) &event.xkey,command,(int) sizeof(command),&key_symbol,(XComposeStatus *) NULL); *(command+length)='\0'; - if (image->debug != MagickFalse) + if( IfMagickTrue(image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Key press: 0x%lx (%s)",(long) key_symbol,command); switch ((int) key_symbol) @@ -10877,7 +10877,7 @@ static MagickBooleanType XPasteImage(Display *display, */ x=event.xmotion.x; y=event.xmotion.y; - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { if ((x < (int) (windows->info.x+windows->info.width)) && (y < (int) (windows->info.y+windows->info.height))) @@ -10894,7 +10894,7 @@ static MagickBooleanType XPasteImage(Display *display, } default: { - if (image->debug != MagickFalse) + if( IfMagickTrue(image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(),"Event type: %d", event.type); break; @@ -11027,7 +11027,7 @@ static MagickBooleanType XPrintImage(Display *display, print_image=DestroyImage(print_image); image_info=DestroyImageInfo(image_info); XSetCursorState(display,windows,MagickFalse); - return(status != 0 ? MagickTrue : MagickFalse); + return(IsMagickTrue(status)); } /* @@ -11338,7 +11338,7 @@ static MagickBooleanType XROIImage(Display *display, state=DefaultState; do { - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { /* Display pointer position. @@ -11448,7 +11448,7 @@ static MagickBooleanType XROIImage(Display *display, */ x=event.xmotion.x; y=event.xmotion.y; - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { if ((x < (int) (windows->info.x+windows->info.width)) && (y < (int) (windows->info.y+windows->info.height))) @@ -11499,7 +11499,7 @@ static MagickBooleanType XROIImage(Display *display, /* Display info and draw region of interest rectangle. */ - if (windows->info.mapped == MagickFalse) + if( IfMagickFalse(windows->info.mapped) ) (void) XMapWindow(display,windows->info.id); (void) FormatLocaleString(text,MaxTextExtent, " %.20gx%.20g%+.20g%+.20g",(double) roi_info.width,(double) @@ -11509,7 +11509,7 @@ static MagickBooleanType XROIImage(Display *display, windows->image.highlight_context,&highlight_info); } else - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) (void) XWithdrawWindow(display,windows->info.id,windows->info.screen); /* Wait for next event. @@ -11592,7 +11592,7 @@ static MagickBooleanType XROIImage(Display *display, (void) XMapWindow(display,windows->info.id); do { - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { /* Display pointer position. @@ -11914,7 +11914,7 @@ static MagickBooleanType XROIImage(Display *display, */ x=event.xmotion.x; y=event.xmotion.y; - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { if ((x < (int) (windows->info.x+windows->info.width)) && (y < (int) (windows->info.y+windows->info.height))) @@ -12314,7 +12314,7 @@ static MagickBooleanType XRotateImage(Display *display, /* Display info and draw rotation line. */ - if (windows->info.mapped == MagickFalse) + if( IfMagickFalse(windows->info.mapped) ) (void) XMapWindow(display,windows->info.id); (void) FormatLocaleString(text,MaxTextExtent," %g", direction == VerticalRotateCommand ? degrees-90.0 : degrees); @@ -12323,7 +12323,7 @@ static MagickBooleanType XRotateImage(Display *display, windows->image.highlight_context,&rotate_info); } else - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) (void) XWithdrawWindow(display,windows->info.id, windows->info.screen); /* @@ -12458,7 +12458,7 @@ static MagickBooleanType XRotateImage(Display *display, } } } - if (windows->image.orphan != MagickFalse) + if( IfMagickTrue(windows->image.orphan) ) return(MagickTrue); if (normalized_degrees != 0.0) { @@ -12569,7 +12569,7 @@ static MagickBooleanType XSaveImage(Display *display, XFileBrowserWidget(display,windows,"Save",filename); if (*filename == '\0') return(MagickTrue); - if (IsPathAccessible(filename) != MagickFalse) + if( IfMagickTrue(IsPathAccessible(filename)) ) { int status; @@ -12643,12 +12643,12 @@ static MagickBooleanType XSaveImage(Display *display, */ (void) CopyMagickString(save_image->filename,filename,MaxTextExtent); status=WriteImage(image_info,save_image,exception); - if (status != MagickFalse) + if( IfMagickTrue(status) ) image->taint=MagickFalse; save_image=DestroyImage(save_image); image_info=DestroyImageInfo(image_info); XSetCursorState(display,windows,MagickFalse); - return(status != 0 ? MagickTrue : MagickFalse); + return(IsMagickTrue(status)); } /* @@ -12758,7 +12758,7 @@ static void XScreenEvent(Display *display,XWindows *windows,XEvent *event, if (y >= (int) windows->image.height) y=(int) (windows->image.height-1); windows->magnify.y=windows->image.y+y; - if (windows->magnify.mapped == MagickFalse) + if( IfMagickFalse(windows->magnify.mapped) ) (void) XMapRaised(display,windows->magnify.id); XMakeMagnifyImage(display,windows,exception); if (event->type == ButtonRelease) @@ -12797,7 +12797,7 @@ static void XScreenEvent(Display *display,XWindows *windows,XEvent *event, */ windows->magnify.width=(unsigned int) event->xconfigure.width; windows->magnify.height=(unsigned int) event->xconfigure.height; - if (windows->magnify.mapped == MagickFalse) + if( IfMagickFalse(windows->magnify.mapped) ) break; magnify=1; while ((int) magnify <= event->xconfigure.width) @@ -12882,7 +12882,7 @@ static void XScreenEvent(Display *display,XWindows *windows,XEvent *event, { while (XCheckMaskEvent(display,ButtonMotionMask,event)) ; if (event->xmotion.window == windows->image.id) - if (windows->magnify.mapped != MagickFalse) + if( IfMagickTrue(windows->magnify.mapped) ) { /* Update magnified image. @@ -12973,7 +12973,7 @@ static void XSetCropGeometry(Display *display,XWindows *windows, height, width; - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) { /* Display info on cropping rectangle. @@ -13211,7 +13211,7 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info, /* Delete tile image. */ - if (IsPathAccessible(filename) == MagickFalse) + if( IfMagickFalse(IsPathAccessible(filename)) ) { XNoticeWidget(display,windows,"Image file does not exist:",filename); break; @@ -13219,8 +13219,8 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info, status=XConfirmWidget(display,windows,"Really delete tile",filename); if (status <= 0) break; - status=remove_utf8(filename) != 0 ? MagickTrue : MagickFalse; - if (status != MagickFalse) + status=IsMagickTrue(remove_utf8(filename)); + if( IfMagickTrue(status) ) { XNoticeWidget(display,windows,"Unable to delete image file:", filename); @@ -13257,7 +13257,7 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info, q++; (void) CopyMagickString(filename,p,(size_t) (q-p+1)); p=q; - if (IsPathAccessible(filename) != MagickFalse) + if( IfMagickTrue(IsPathAccessible(filename)) ) { tile++; continue; @@ -13280,7 +13280,7 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info, SetPixelInfoPixel(image,&pixel,s); s+=GetPixelChannels(image); } - if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) + if( IfMagickFalse(SyncCacheViewAuthenticPixels(image_view,exception)) ) break; } image_view=DestroyCacheView(image_view); @@ -13651,7 +13651,7 @@ static Image *XVisualDirectoryImage(Display *display, number_files=1; filelist[0]=filenames; status=ExpandFilenames(&number_files,&filelist); - if ((status == MagickFalse) || (number_files == 0)) + if( IfMagickFalse(status) || (number_files == 0)) { if (number_files == 0) ThrowXWindowFatalException(ImageError,"NoImagesWereFound",filenames) @@ -13671,8 +13671,8 @@ static Image *XVisualDirectoryImage(Display *display, /* Read each image and convert them to a tile. */ - backdrop=(windows->visual_info->klass == TrueColor) || - (windows->visual_info->klass == DirectColor) ? MagickTrue : MagickFalse; + backdrop=IsMagickTrue( (windows->visual_info->klass == TrueColor) || + (windows->visual_info->klass == DirectColor) ); read_info=CloneImageInfo(resource_info->image_info); (void) SetImageOption(read_info,"jpeg:size","120x120"); (void) CloneString(&read_info->size,DefaultTileGeometry); @@ -13716,7 +13716,7 @@ static Image *XVisualDirectoryImage(Display *display, proceed=SetImageProgress(images,LoadImageTag,(MagickOffsetType) i, (MagickSizeType) number_files); - if (proceed == MagickFalse) + if( IfMagickFalse(proceed) ) break; } } @@ -13827,7 +13827,7 @@ MagickExport MagickBooleanType XDisplayBackgroundImage(Display *display, */ assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if (image->debug != MagickFalse) + if( IfMagickTrue(image->debug) ) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); resources=(*resource_info); window_info.id=(Window) NULL; @@ -13937,12 +13937,12 @@ MagickExport MagickBooleanType XDisplayBackgroundImage(Display *display, window_info.y=(int) geometry_info.y; status=XMakeImage(display,&resources,&window_info,image,window_info.width, window_info.height,exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) ThrowXWindowFatalException(XServerFatalError,"UnableToCreateXImage", image->filename); window_info.x=0; window_info.y=0; - if (image->debug != MagickFalse) + if( IfMagickTrue(image->debug) ) { (void) LogMagickEvent(X11Event,GetMagickModule(), "Image: %s[%.20g] %.20gx%.20g ",image->filename,(double) image->scene, @@ -13957,7 +13957,7 @@ MagickExport MagickBooleanType XDisplayBackgroundImage(Display *display, */ width=(int) window_info.width; height=(int) window_info.height; - if (resources.backdrop != MagickFalse) + if( IfMagickTrue(resources.backdrop) ) { /* Center image on window. @@ -14026,7 +14026,7 @@ MagickExport MagickBooleanType XDisplayBackgroundImage(Display *display, delay=1000*image->delay/MagickMax(image->ticks_per_second,1L); XDelay(display,delay == 0UL ? 10UL : delay); (void) XSync(display,MagickFalse); - return(window_info.id == root_window ? MagickTrue : MagickFalse); + return(IsMagickTrue(window_info.id == root_window)); } /* @@ -14522,7 +14522,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, assert(image != (Image **) NULL); assert((*image)->signature == MagickSignature); - if ((*image)->debug != MagickFalse) + if( IfMagickTrue((*image)->debug) ) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",(*image)->filename); display_image=(*image); warning_handler=(WarningHandler) NULL; @@ -14593,7 +14593,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, manager_hints=windows->manager_hints; root_window=XRootWindow(display,visual_info->screen); nexus=NewImageList(); - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) { (void) LogMagickEvent(X11Event,GetMagickModule(), "Image: %s[%.20g] %.20gx%.20g ",display_image->filename, @@ -14622,7 +14622,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, manager_hints->initial_state=WithdrawnState; XMakeWindow(display,root_window,argv,argc,class_hints,manager_hints, &windows->context); - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Window id: 0x%lx (context)",windows->context.id); context_values.background=pixel->background_color.pixel; @@ -14673,7 +14673,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, manager_hints->initial_state=IconicState; XMakeWindow(display,root_window,argv,argc,class_hints,manager_hints, &windows->icon); - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(),"Window id: 0x%lx (icon)", windows->icon.id); /* @@ -14695,7 +14695,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, XGetWindowInfo(display,visual_info,map_info,pixel,font_info,resource_info, &windows->image); windows->image.shape=MagickTrue; /* non-rectangular shape hint */ - if (resource_info->use_shared_memory == MagickFalse) + if( IfMagickFalse(resource_info->use_shared_memory) ) windows->image.shared_memory=MagickFalse; if ((resource_info->title != (char *) NULL) && !(*state & MontageImageState)) { @@ -14774,7 +14774,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, NormalState; XMakeWindow(display,root_window,argv,argc,class_hints,manager_hints, &windows->backdrop); - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Window id: 0x%lx (backdrop)",windows->backdrop.id); (void) XMapWindow(display,windows->backdrop.id); @@ -14806,7 +14806,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, manager_hints->flags|=WindowGroupHint; manager_hints->window_group=windows->group_leader.id; (void) XSelectInput(display,windows->group_leader.id,StructureNotifyMask); - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Window id: 0x%lx (group leader)",windows->group_leader.id); } @@ -14818,7 +14818,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, if (windows->group_leader.id != (Window) NULL) (void) XSetTransientForHint(display,windows->image.id, windows->group_leader.id); - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(),"Window id: 0x%lx (image)", windows->image.id); /* @@ -14846,9 +14846,9 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, windows->info.shadow_stipple=XCreateBitmapFromData(display, windows->info.id,(char *) ShadowBitmap,ShadowWidth,ShadowHeight); (void) XSetTransientForHint(display,windows->info.id,windows->image.id); - if (windows->image.mapped != MagickFalse) + if( IfMagickTrue(windows->image.mapped) ) (void) XWithdrawWindow(display,windows->info.id,windows->info.screen); - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(),"Window id: 0x%lx (info)", windows->info.id); /* @@ -14880,9 +14880,9 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, windows->command.shadow_stipple=XCreateBitmapFromData(display, windows->command.id,(char *) ShadowBitmap,ShadowWidth,ShadowHeight); (void) XSetTransientForHint(display,windows->command.id,windows->image.id); - if (windows->command.mapped != MagickFalse) + if( IfMagickTrue(windows->command.mapped) ) (void) XMapRaised(display,windows->command.id); - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Window id: 0x%lx (command)",windows->command.id); /* @@ -14911,7 +14911,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, windows->widget.shadow_stipple=XCreateBitmapFromData(display, windows->widget.id,(char *) ShadowBitmap,ShadowWidth,ShadowHeight); (void) XSetTransientForHint(display,windows->widget.id,windows->image.id); - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Window id: 0x%lx (widget)",windows->widget.id); /* @@ -14935,7 +14935,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, windows->popup.shadow_stipple=XCreateBitmapFromData(display, windows->popup.id,(char *) ShadowBitmap,ShadowWidth,ShadowHeight); (void) XSetTransientForHint(display,windows->popup.id,windows->image.id); - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Window id: 0x%lx (pop up)",windows->popup.id); /* @@ -14943,7 +14943,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, */ XGetWindowInfo(display,visual_info,map_info,pixel,font_info, resource_info,&windows->magnify); - if (resource_info->use_shared_memory == MagickFalse) + if( IfMagickFalse(resource_info->use_shared_memory) ) windows->magnify.shared_memory=MagickFalse; (void) FormatLocaleString(resource_name,MaxTextExtent,"%s.magnify", resource_info->client_name); @@ -14977,7 +14977,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, manager_hints->window_group=windows->image.id; XMakeWindow(display,root_window,argv,argc,class_hints,manager_hints, &windows->magnify); - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Window id: 0x%lx (magnify)",windows->magnify.id); (void) XSetTransientForHint(display,windows->magnify.id,windows->image.id); @@ -15006,13 +15006,13 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, manager_hints->window_group=windows->image.id; XMakeWindow(display,root_window,argv,argc,class_hints,manager_hints, &windows->pan); - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(),"Window id: 0x%lx (pan)", windows->pan.id); (void) XSetTransientForHint(display,windows->pan.id,windows->image.id); - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) (void) XWithdrawWindow(display,windows->info.id,windows->info.screen); - if ((windows->image.mapped == MagickFalse) || + if( IfMagickFalse(windows->image.mapped) || (windows->backdrop.id != (Window) NULL)) (void) XMapWindow(display,windows->image.id); /* @@ -15038,17 +15038,17 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, display_image->filename); status=XMakeImage(display,resource_info,&windows->image,display_image, width,height,exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) ThrowXWindowFatalException(XServerFatalError,"UnableToCreateXImage", display_image->filename); status=XMakeImage(display,resource_info,&windows->magnify,(Image *) NULL, windows->magnify.width,windows->magnify.height,exception); - if (status == MagickFalse) + if( IfMagickFalse(status) ) ThrowXWindowFatalException(XServerFatalError,"UnableToCreateXImage", display_image->filename); - if (windows->magnify.mapped != MagickFalse) + if( IfMagickTrue(windows->magnify.mapped) ) (void) XMapRaised(display,windows->magnify.id); - if (windows->pan.mapped != MagickFalse) + if( IfMagickTrue(windows->pan.mapped) ) (void) XMapRaised(display,windows->pan.id); windows->image.window_changes.width=(int) display_image->columns; windows->image.window_changes.height=(int) display_image->rows; @@ -15061,7 +15061,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, 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 (resource_info->update != MagickFalse) + if( IfMagickTrue(resource_info->update) ) { MagickBooleanType status; @@ -15070,7 +15070,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, Determine when file data was last modified. */ status=GetPathAttributes(display_image->filename,&attributes); - if (status != MagickFalse) + if( IfMagickTrue(status) ) update_time=attributes.st_mtime; } *state&=(~FormerImageState); @@ -15081,12 +15081,12 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, /* Handle a window event. */ - if (windows->image.mapped != MagickFalse) + if( IfMagickTrue(windows->image.mapped) ) if ((display_image->delay != 0) || (resource_info->update != 0)) { if (timer < time((time_t *) NULL)) { - if (resource_info->update == MagickFalse) + if( IfMagickFalse(resource_info->update) ) *state|=NextImageState | ExitState; else { @@ -15097,7 +15097,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, Determine if image file was modified. */ status=GetPathAttributes(display_image->filename,&attributes); - if (status != MagickFalse) + if( IfMagickTrue(status) ) if (update_time != attributes.st_mtime) { /* @@ -15130,12 +15130,10 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, } timestamp=time((time_t *) NULL); (void) XNextEvent(display,&event); - if (windows->image.stasis == MagickFalse) - windows->image.stasis=(time((time_t *) NULL)-timestamp) > 0 ? - MagickTrue : MagickFalse; - if (windows->magnify.stasis == MagickFalse) - windows->magnify.stasis=(time((time_t *) NULL)-timestamp) > 0 ? - MagickTrue : MagickFalse; + if( IfMagickFalse(windows->image.stasis) ) + windows->image.stasis=IsMagickTrue((time((time_t *) NULL)-timestamp) > 0); + if( IfMagickFalse(windows->magnify.stasis) ) + windows->magnify.stasis=IsMagickTrue((time((time_t *) NULL)-timestamp) > 0); if (event.xany.window == windows->command.id) { /* @@ -15167,7 +15165,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, { case ButtonPress: { - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Button Press: 0x%lx %u +%d+%d",event.xbutton.window, event.xbutton.button,event.xbutton.x,event.xbutton.y); @@ -15207,7 +15205,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, /* Map/unmap Command widget. */ - if (windows->command.mapped != MagickFalse) + if( IfMagickTrue(windows->command.mapped) ) (void) XWithdrawWindow(display,windows->command.id, windows->command.screen); else @@ -15362,7 +15360,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, } case ButtonRelease: { - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Button Release: 0x%lx %u +%d+%d",event.xbutton.window, event.xbutton.button,event.xbutton.x,event.xbutton.y); @@ -15370,7 +15368,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, } case ClientMessage: { - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (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) @@ -15416,7 +15414,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, (unsigned long) magick_windows[i]->mask, &magick_windows[i]->attributes); } - if (windows->pan.mapped != MagickFalse) + if( IfMagickTrue(windows->pan.mapped) ) { (void) XSetWindowBackgroundPixmap(display,windows->pan.id, windows->pan.pixmap); @@ -15533,7 +15531,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, } case ConfigureNotify: { - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (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, @@ -15552,7 +15550,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, Position the transient windows relative of the Image window. */ if (windows->command.geometry == (char *) NULL) - if (windows->command.mapped == MagickFalse) + if( IfMagickFalse(windows->command.mapped) ) { windows->command.x=event.xconfigure.x- windows->command.width-25; @@ -15565,7 +15563,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, &window_changes); } if (windows->widget.geometry == (char *) NULL) - if (windows->widget.mapped == MagickFalse) + if( IfMagickFalse(windows->widget.mapped) ) { windows->widget.x=event.xconfigure.x+ event.xconfigure.width/10; @@ -15579,7 +15577,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, &window_changes); } if (windows->magnify.geometry == (char *) NULL) - if (windows->magnify.mapped == MagickFalse) + if( IfMagickFalse(windows->magnify.mapped) ) { windows->magnify.x=event.xconfigure.x+ event.xconfigure.width+25; @@ -15592,7 +15590,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, &window_changes); } if (windows->pan.geometry == (char *) NULL) - if (windows->pan.mapped == MagickFalse) + if( IfMagickFalse(windows->pan.mapped) ) { windows->pan.x=event.xconfigure.x+ event.xconfigure.width+25; @@ -15618,8 +15616,8 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, windows->image.x=vid_info.x; windows->image.y=vid_info.y; } - if ((windows->image.mapped != MagickFalse) && - (windows->image.stasis != MagickFalse)) + if( IfMagickTrue(windows->image.mapped) && + IfMagickTrue(windows->image.stasis) ) { /* Update image window configuration. @@ -15639,7 +15637,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, XDrawPanRectangle(display,windows); } else - if (windows->pan.mapped != MagickFalse) + if( IfMagickTrue(windows->pan.mapped) ) (void) XWithdrawWindow(display,windows->pan.id, windows->pan.screen); break; @@ -15654,7 +15652,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, */ windows->magnify.width=(unsigned int) event.xconfigure.width; windows->magnify.height=(unsigned int) event.xconfigure.height; - if (windows->magnify.mapped == MagickFalse) + if( IfMagickFalse(windows->magnify.mapped) ) break; magnify=1; while ((int) magnify <= event.xconfigure.width) @@ -15672,8 +15670,8 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, &window_changes); break; } - if ((windows->magnify.mapped != MagickFalse) && - (windows->magnify.stasis != MagickFalse)) + if( IfMagickTrue(windows->magnify.mapped) && + IfMagickTrue(windows->magnify.stasis) ) { status=XMakeImage(display,resource_info,&windows->magnify, display_image,windows->magnify.width,windows->magnify.height, @@ -15682,7 +15680,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, } break; } - if ((windows->magnify.mapped != MagickFalse) && + if( IfMagickTrue(windows->magnify.mapped) && (event.xconfigure.window == windows->pan.id)) { /* @@ -15713,7 +15711,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, /* Group leader has exited. */ - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Destroy Notify: 0x%lx",event.xdestroywindow.window); if (event.xdestroywindow.window == windows->group_leader.id) @@ -15735,7 +15733,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, } case Expose: { - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Expose: 0x%lx %dx%d+%d+%d",event.xexpose.window, event.xexpose.width,event.xexpose.height,event.xexpose.x, @@ -15744,7 +15742,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, Refresh windows that are now exposed. */ if ((event.xexpose.window == windows->image.id) && - (windows->image.mapped != MagickFalse)) + IfMagickTrue(windows->image.mapped) ) { XRefreshWindow(display,&windows->image,&event); delay=display_image->delay/MagickMax( @@ -15753,7 +15751,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, break; } if ((event.xexpose.window == windows->magnify.id) && - (windows->magnify.mapped != MagickFalse)) + IfMagickTrue(windows->magnify.mapped)) { XMakeMagnifyImage(display,windows,exception); break; @@ -15781,7 +15779,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, length=XLookupString((XKeyEvent *) &event.xkey,command,(int) sizeof(command),&key_symbol,(XComposeStatus *) NULL); *(command+length)='\0'; - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Key press: %d 0x%lx (%s)",event.xkey.state,(unsigned long) key_symbol,command); @@ -15820,7 +15818,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, */ (void) XLookupString((XKeyEvent *) &event.xkey,command,(int) sizeof(command),&key_symbol,(XComposeStatus *) NULL); - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Key release: 0x%lx (%c)",(unsigned long) key_symbol,*command); break; @@ -15837,7 +15835,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, } case MapNotify: { - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(),"Map Notify: 0x%lx", event.xmap.window); if (event.xmap.window == windows->backdrop.id) @@ -15945,7 +15943,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, after, length; - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Property Notify: 0x%lx 0x%lx %d",event.xproperty.window, event.xproperty.atom,event.xproperty.state); @@ -15977,7 +15975,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, } case ReparentNotify: { - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Reparent Notify: 0x%lx=>0x%lx",event.xreparent.parent, event.xreparent.window); @@ -15985,7 +15983,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, } case UnmapNotify: { - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(), "Unmap Notify: 0x%lx",event.xunmap.window); if (event.xunmap.window == windows->backdrop.id) @@ -16048,7 +16046,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, } default: { - if (display_image->debug != MagickFalse) + if( IfMagickTrue(display_image->debug) ) (void) LogMagickEvent(X11Event,GetMagickModule(),"Event type: %d", event.type); break; @@ -16059,13 +16057,13 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, (void) XMagickCommand(display,resource_info,windows,FreeBuffersCommand, &display_image,exception); else - if (resource_info->confirm_edit != MagickFalse) + if( IfMagickTrue(resource_info->confirm_edit) ) { /* Query user if image has changed. */ - if ((resource_info->immutable == MagickFalse) && - (display_image->taint != MagickFalse)) + if( IfMagickFalse(resource_info->immutable) && + IfMagickTrue(display_image->taint)) { int status; @@ -16087,18 +16085,18 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, /* Withdraw pan and Magnify window. */ - if (windows->info.mapped != MagickFalse) + if( IfMagickTrue(windows->info.mapped) ) (void) XWithdrawWindow(display,windows->info.id,windows->info.screen); - if (windows->magnify.mapped != MagickFalse) + if( IfMagickTrue(windows->magnify.mapped) ) (void) XWithdrawWindow(display,windows->magnify.id, windows->magnify.screen); - if (windows->command.mapped != MagickFalse) + if( IfMagickTrue(windows->command.mapped) ) (void) XWithdrawWindow(display,windows->command.id, windows->command.screen); } - if (windows->pan.mapped != MagickFalse) + if( IfMagickTrue(windows->pan.mapped) ) (void) XWithdrawWindow(display,windows->pan.id,windows->pan.screen); - if (resource_info->backdrop == MagickFalse) + if( IfMagickFalse(resource_info->backdrop) ) if (windows->backdrop.mapped) { (void) XWithdrawWindow(display,windows->backdrop.id, @@ -16193,7 +16191,7 @@ MagickExport MagickBooleanType DisplayImages(const ImageInfo *image_info, assert(image_info->signature == MagickSignature); assert(image != (Image *) NULL); assert(image->signature == MagickSignature); - if (image->debug != MagickFalse) + if( IfMagickTrue(image->debug) ) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); (void) ThrowMagickException(exception,GetMagickModule(),MissingDelegateError, "DelegateLibrarySupportNotBuiltIn","'%s' (X11)",image->filename); -- 2.50.1