🚀 go-pugleaf

To apply this patch:
 
cd to the top of the source tree (to the directory containing the
"ImageMagick" directory) and do:
 
      patch -p -s < ThisFile
 
Patch will work silently unless an error occurs.  If you want to watch
patch do its thing, leave out the "-s" argument to patch.
 
Finally, to rebuild after applying this patch, cd to the "ImageMagick"
directory and type:
 
      make
 
The entire distribution is available as contrib/ImageMagick.tar.Z on
export.lcs.mit.edu.
 
Brief notes on what this patch fixes:
 
o An expose event for the Magnify window may occur before it is mapped.
  This caused display to fail on Solburne and HP's.

diff -c -r ImageMagick/display.c ImageMagick2.1.3/display.c
*** ImageMagick/display.c	Sun Nov 15 20:41:19 1992
--- ImageMagick2.1.3/display.c	Sun Nov 15 20:43:58 1992
***************
*** 2876,2904 ****
            Refresh windows that are now exposed.
          */
          if (event.xexpose.window == image_window.id)
!           {
!             XRefreshWindow(display,&image_window,&event);
!             /*
!               Reset timeout after expose.
!             */
!             if (resource_info->delay == 0)
!               timeout=(~0);
!             else
!               timeout=(unsigned long) time((time_t *) 0)+resource_info->delay;
!             break;
!           }
!         if (event.xexpose.window == magnify_window.id)
!           if (event.xexpose.count == 0)
              {
!               XMakeMagnifyImage(display,resource_info,&image_window,
!                 &magnify_window);
                break;
              }
          if (event.xexpose.window == pan_window.id)
!           {
!             XDrawPanRectangle(display,&image_window,&pan_window);
!             break;
!           }
          break;
        }
        case KeyPress:
--- 2876,2908 ----
            Refresh windows that are now exposed.
          */
          if (event.xexpose.window == image_window.id)
!           if (*state & ImageMappedState)
              {
!               XRefreshWindow(display,&image_window,&event);
!               /*
!                 Reset timeout after expose.
!               */
!               if (resource_info->delay == 0)
!                 timeout=(~0);
!               else
!                 timeout=(unsigned long) time((time_t *) 0)+resource_info->delay;
                break;
              }
+         if (event.xexpose.window == magnify_window.id)
+           if (event.xexpose.count == 0)
+             if (*state & MagnifyMappedState)
+               {
+                 XMakeMagnifyImage(display,resource_info,&image_window,
+                   &magnify_window);
+                 break;
+               }
          if (event.xexpose.window == pan_window.id)
!           if (event.xexpose.count == 0)
!             if (*state & PanIconMappedState)
!               {
!                 XDrawPanRectangle(display,&image_window,&pan_window);
!                 break;
!               }
          break;
        }
        case KeyPress:
Common subdirectories: ImageMagick/images and ImageMagick2.1.3/images
Common subdirectories: ImageMagick/scenes and ImageMagick2.1.3/scenes
Common subdirectories: ImageMagick/utilities and ImageMagick2.1.3/utilities
Common subdirectories: ImageMagick/xtp and ImageMagick2.1.3/xtp
-- 
cristy@dupont.com