From dfe2b6658f367de8f84405263f62768fb853adaf Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 22 Aug 2010 16:17:24 +0000 Subject: [PATCH] --- magick/widget.c | 2 +- magick/xwindow.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/magick/widget.c b/magick/widget.c index 1186c2560..b956ae415 100644 --- 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 6c831eed7..bca60ebe2 100644 --- 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) -- 2.40.0