(no commit message)

[imagemagick] / MagickCore / widget.c

diff --git a/MagickCore/widget.c b/MagickCore/widget.c
index d89d78f6e44cd10397310cbe9bf63ee17a63c3ce..21676c72a38ffd4f171ea3de2c77a41305c675fa 100644 (file)
--- a/MagickCore/widget.c
+++ b/MagickCore/widget.c
@@ -14,11 +14,11 @@
 %                   MagickCore X11 User Interface Methods                     %
 %                                                                             %
 %                              Software Design                                %
-%                                John Cristy                                  %
+%                                   Cristy                                    %
 %                              September 1993                                 %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %
@@ -1788,10 +1788,12 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows,
   /*
     Respond to X events.
   */
+  XGetWidgetInfo((char *) NULL,&mode_info);
   XGetWidgetInfo((char *) NULL,&slider_info);
   XGetWidgetInfo((char *) NULL,&north_info);
   XGetWidgetInfo((char *) NULL,&south_info);
   XGetWidgetInfo((char *) NULL,&expose_info);
+  XGetWidgetInfo((char *) NULL,&selection_info);
   visible_colors=0;
   delay=SuspendTime << 2;
   state=UpdateConfigurationState;
@@ -2252,8 +2254,9 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows,
             /*
               User pressed mode button.
             */
-            (void) CopyMagickString(reply_info.text,mode_info.text,
-              MaxTextExtent);
+            if (mode_info.text != (char *) NULL)
+              (void) CopyMagickString(reply_info.text,mode_info.text,
+                MaxTextExtent);
             (void) CopyMagickString(primary_selection,reply_info.text,
               MaxTextExtent);
             (void) XSetSelectionOwner(display,XA_PRIMARY,windows->widget.id,
@@ -2996,7 +2999,7 @@ MagickPrivate int XCommandWidget(Display *display,XWindows *windows,
         sizeof(*selection_info));
       if (selection_info == (XWidgetInfo *) NULL)
         {
-          ThrowXWindowFatalException(ResourceLimitError,
+          ThrowXWindowFatalException(ResourceLimitFatalError,
             "MemoryAllocationFailed","...");
           return(id);
         }
@@ -6893,6 +6896,7 @@ MagickPrivate void XListBrowserWidget(Display *display,XWindows *windows,
   XGetWidgetInfo((char *) NULL,&north_info);
   XGetWidgetInfo((char *) NULL,&south_info);
   XGetWidgetInfo((char *) NULL,&expose_info);
+  XGetWidgetInfo((char *) NULL,&selection_info);
   visible_entries=0;
   delay=SuspendTime << 2;
   state=UpdateConfigurationState;
@@ -8588,8 +8592,9 @@ MagickPrivate MagickBooleanType XPreferencesWidget(Display *display,
           MagickFalse ? MagickTrue : MagickFalse;
         preferences_info[4].raised=resource_info->display_warnings ==
           MagickFalse ? MagickTrue : MagickFalse;
-        preferences_info[5].raised=resource_info->quantize_info->dither ==
-          MagickFalse ? MagickTrue : MagickFalse;
+        preferences_info[5].raised=
+          resource_info->quantize_info->dither_method == NoDitherMethod ?
+          MagickTrue : MagickFalse;
         preferences_info[6].raised=resource_info->colormap !=
           SharedColormap ? MagickTrue : MagickFalse;
         preferences_info[7].raised=resource_info->use_pixmap ==
@@ -8842,8 +8847,9 @@ MagickPrivate MagickBooleanType XPreferencesWidget(Display *display,
     preferences_info[3].raised == MagickFalse ? MagickTrue : MagickFalse;
   resource_info->display_warnings=
      preferences_info[4].raised == MagickFalse ? MagickTrue : MagickFalse;
-  resource_info->quantize_info->dither=
-    preferences_info[5].raised == MagickFalse ? MagickTrue : MagickFalse;
+  resource_info->quantize_info->dither_method=
+    preferences_info[5].raised == MagickFalse ?
+    RiemersmaDitherMethod : NoDitherMethod;
   resource_info->colormap=SharedColormap;
   if (preferences_info[6].raised)
     resource_info->colormap=PrivateColormap;
@@ -9095,6 +9101,7 @@ MagickPrivate void XTextViewWidget(Display *display,
   XGetWidgetInfo((char *) NULL,&north_info);
   XGetWidgetInfo((char *) NULL,&south_info);
   XGetWidgetInfo((char *) NULL,&expose_info);
+  XGetWidgetInfo((char *) NULL,&selection_info);
   visible_lines=0;
   delay=SuspendTime << 2;
   height=(unsigned int) (font_info->ascent+font_info->descent);