(no commit message)

diff --git a/magick/display.c b/magick/display.c
index ad789fba950377b1f32fc7b77414746045bf67f7..6cc4ea376eec0308688805b4bb71466334a61412 100644 (file)
--- a/magick/display.c
+++ b/magick/display.c
@@ -102,6 +102,10 @@ static const unsigned char
   {
     0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55
   },
+  OpaqueBitmap[8] =
+  {
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+  },
   ShadowBitmap[8] =
   {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -1500,6 +1504,8 @@ typedef enum
 #define DiagonalHeight  16
 #define HighlightWidth  8
 #define HighlightHeight  8
+#define OpaqueWidth  8
+#define OpaqueHeight  8
 #define ScalesWidth  16
 #define ScalesHeight  16
 #define ShadowWidth  8
@@ -5635,8 +5641,6 @@ static MagickBooleanType XDrawEditImage(Display *display,
               if (stipple != (Pixmap) NULL)
                 (void) XFreePixmap(display,stipple);
               stipple=(Pixmap) NULL;
-              if (entry == 6)
-                break;
               if (entry != 7)
                 {
                   switch (entry)
@@ -5672,13 +5676,19 @@ static MagickBooleanType XDrawEditImage(Display *display,
                       break;
                     }
                     case 5:
-                    default:
                     {
                       stipple=XCreateBitmapFromData(display,root_window,
                         (char *) HighlightBitmap,HighlightWidth,
                         HighlightHeight);
                       break;
                     }
+                    case 6:
+                    default:
+                    {
+                      stipple=XCreateBitmapFromData(display,root_window,
+                        (char *) OpaqueBitmap,OpaqueWidth,OpaqueHeight);
+                      break;
+                    }
                   }
                   break;
                 }
@@ -5738,7 +5748,8 @@ static MagickBooleanType XDrawEditImage(Display *display,
                 break;
               if (entry != 5)
                 {
-                  line_width=(unsigned int) StringToUnsignedLong(WidthsMenu[entry]);
+                  line_width=(unsigned int) StringToUnsignedLong(
+                    WidthsMenu[entry]);
                   break;
                 }
               (void) XDialogWidget(display,windows,"Ok","Enter line width:",

diff --git a/magick/xwindow.c b/magick/xwindow.c
index 1d453210e149d80d630f73d49f35716a1d7fbdd9..15d6230775222d4991591f4a62887d8c7ea9d42d 100644 (file)
--- a/magick/xwindow.c
+++ b/magick/xwindow.c
@@ -2343,8 +2343,11 @@ MagickExport MagickBooleanType XDrawImage(Display *display,
   */
   (void) XSetBackground(display,draw_context,0);
   (void) XSetForeground(display,draw_context,(size_t) (~0));
-  (void) XSetFillStyle(display,draw_context,FillOpaqueStippled);
-  (void) XSetStipple(display,draw_context,draw_info->stipple);
+  if (draw_info->stipple !=  (Pixmap) NULL)
+    {
+      (void) XSetFillStyle(display,draw_context,FillOpaqueStippled);
+      (void) XSetStipple(display,draw_context,draw_info->stipple);
+    }
   switch (draw_info->element)
   {
     case PointElement: