(no commit message)

diff --git a/magick/widget.c b/magick/widget.c
index 1186c25603c4805e64bb2391d7578f05dc1c8d7d..b956ae41539ccb1f560f0bd072948ec5cfe55734 100644 (file)
--- a/magick/widget.c
+++ b/magick/widget.c
@@ -4650,7 +4650,7 @@ MagickExport void XFileBrowserWidget(Display *display,XWindows *windows,
           slider_info.id=0;
         slider_info.y=slider_info.min_y;
         if (files > 0)
-          slider_info.y+=(slider_info.id*(slider_info.max_y-
+          slider_info.y+=(int) (slider_info.id*(slider_info.max_y-
             slider_info.min_y+1)/files);
         if (slider_info.id != selection_info.id)
           {

diff --git a/magick/xwindow.c b/magick/xwindow.c
index 6c831eed7e981bf51004b5bdc1cd36aac8ea6cc6..bca60ebe2adca259b493a106234002499e1da2da 100644 (file)
--- a/magick/xwindow.c
+++ b/magick/xwindow.c
@@ -7898,7 +7898,7 @@ MagickExport void XMakeStandardColormap(Display *display,
           for (i=0; i < (ssize_t) image->colors; )
           {
             diversity[i].count<<=4;  /* increase this colors popularity */
-            i+=MagickMax((ssize_t) (image->colors >> 4),2);
+            i+=MagickMax((int) (image->colors >> 4),2);
           }
           diversity[image->colors-1].count<<=4;
           qsort((void *) diversity,image->colors,sizeof(*diversity),
@@ -8007,7 +8007,7 @@ MagickExport void XMakeStandardColormap(Display *display,
               p=colors+image->colors;
               for (i=0; i < (ssize_t) retain_colors; i++)
               {
-                p->pixel=(size_t) i;
+                p->pixel=(int) i;
                 p++;
               }
               (void) XQueryColors(display,
@@ -8254,7 +8254,7 @@ MagickExport void XMakeWindow(Display *display,Window parent,char **argv,
   size_hints=XAllocSizeHints();
   if (size_hints == (XSizeHints *) NULL)
     ThrowXWindowFatalException(XServerFatalError,"UnableToMakeXWindow",argv[0]);
-  size_hints->flags=(ssize_t) window_info->flags;
+  size_hints->flags=(int) window_info->flags;
   size_hints->x=window_info->x;
   size_hints->y=window_info->y;
   size_hints->width=(int) window_info->width;
@@ -9393,7 +9393,7 @@ MagickExport Window XWindowByID(Display *display,const Window root_window,
   if (id == 0)
     return(XSelectWindow(display,&rectangle_info));
   if (root_window == id)
-    return(id);
+    return(root_window);
   status=XQueryTree(display,root_window,&child,&child,&children,
     &number_children);
   if (status == False)