(no commit message)

diff --git a/magick/compress.c b/magick/compress.c
index 497ee2d78e25d0543b4a3e0a04d6842663d8a3ba..3722a50a993fd3810b59375566db250ca0c6afd1 100644 (file)
--- a/magick/compress.c
+++ b/magick/compress.c
@@ -829,7 +829,7 @@ MagickExport MagickBooleanType HuffmanEncodeImage(const ImageInfo *image_info,
             entry=MWTable+((runlength/64)-1);
           else
             entry=EXTable+(MagickMin((size_t) runlength,2560)-1792)/64;
-          runlength-=(ssize_t) entry->count;
+          runlength-=(long) entry->count;
           HuffmanOutputCode(entry);
         }
       entry=TWTable+MagickMin((size_t) runlength,63);
@@ -849,7 +849,7 @@ MagickExport MagickBooleanType HuffmanEncodeImage(const ImageInfo *image_info,
               entry=MBTable+((runlength/64)-1);
               if (runlength >= 1792)
                 entry=EXTable+(MagickMin((size_t) runlength,2560)-1792)/64;
-              runlength-=(ssize_t) entry->count;
+              runlength-=(long) entry->count;
               HuffmanOutputCode(entry);
             }
           entry=TBTable+MagickMin((size_t) runlength,63);

diff --git a/magick/list.c b/magick/list.c
index c49a65744009cf79ec0f45c97c81550bd03821e5..d7bb440aee25ab0e17e16198f303526086471277 100644 (file)
--- a/magick/list.c
+++ b/magick/list.c
@@ -236,7 +236,7 @@ MagickExport Image *CloneImages(const Image *images,const char *scenes,
       p++;
     first=strtol(p,&p,10);
     if (first < 0)
-      first+=(ssize_t) length;
+      first+=(long) length;
     last=first;
     while (isspace((int) ((unsigned char) *p)) != 0)
       p++;
@@ -244,7 +244,7 @@ MagickExport Image *CloneImages(const Image *images,const char *scenes,
       {
         last=strtol(p+1,&p,10);
         if (last < 0)
-          last+=(ssize_t) length;
+          last+=(long) length;
       }
     for (step=first > last ? -1 : 1; first != (last+step); first+=step)
     {
@@ -386,7 +386,7 @@ MagickExport void DeleteImages(Image **images,const char *scenes,
       p++;
     first=strtol(p,&p,10);
     if (first < 0)
-      first+=(ssize_t) length;
+      first+=(long) length;
     last=first;
     while (isspace((int) ((unsigned char) *p)) != 0)
       p++;
@@ -394,7 +394,7 @@ MagickExport void DeleteImages(Image **images,const char *scenes,
       {
         last=strtol(p+1,&p,10);
         if (last < 0)
-          last+=(ssize_t) length;
+          last+=(long) length;
       }
     if (first > last)
       continue;

diff --git a/magick/widget.c b/magick/widget.c
index 9036461a0cea1dba4c6a8b1f5305f0fd3fbfaa2c..1186c25603c4805e64bb2391d7578f05dc1c8d7d 100644 (file)
--- a/magick/widget.c
+++ b/magick/widget.c
@@ -2045,8 +2045,8 @@ MagickExport void XColorBrowserWidget(Display *display,XWindows *windows,
           slider_info.id=0;
         slider_info.y=slider_info.min_y;
         if (colors != 0)
-          slider_info.y+=slider_info.id*(slider_info.max_y-
-            slider_info.min_y+1)/colors;
+          slider_info.y+=(int) (slider_info.id*(slider_info.max_y-
+            slider_info.min_y+1)/colors);
         if (slider_info.id != selection_info.id)
           {
             /*
@@ -4650,8 +4650,8 @@ 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.min_y+1)/files;
+          slider_info.y+=(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-private.h b/magick/xwindow-private.h
index 1282ce3d9353d6348ae01548481c914b5b7af857..005c83c20498b79cc452e4c017432549525649de 100644 (file)
--- a/magick/xwindow-private.h
+++ b/magick/xwindow-private.h
@@ -433,7 +433,7 @@ typedef struct _XWindowInfo
   void
     *segment_info;
 
-  size_t
+  long
     mask;
 
   MagickBooleanType

diff --git a/magick/xwindow.c b/magick/xwindow.c
index ba0ee2c01962fcf0f04ba2ab77e35ec024bdd125..4d4dbeff5ca9c07ef5b8a053487e0eb68ac12415 100644 (file)
--- a/magick/xwindow.c
+++ b/magick/xwindow.c
@@ -1148,12 +1148,15 @@ MagickExport XVisualInfo *XBestVisualInfo(Display *display,
     *map_type,
     *visual_type;
 
-  ssize_t
-    visual_mask;
-
   register int
     i;
 
+  size_t
+    one;
+
+  ssize_t
+    visual_mask;
+
   static int
     number_visuals;
 
@@ -1176,8 +1179,9 @@ MagickExport XVisualInfo *XBestVisualInfo(Display *display,
   visual_mask=VisualScreenMask;
   visual_template.screen=XDefaultScreen(display);
   visual_template.depth=XDefaultDepth(display,XDefaultScreen(display));
+  one=1;
   if ((resource_info->immutable != MagickFalse) && (resource_info->colors != 0))
-    if (resource_info->colors <= (1UL << (size_t) visual_template.depth))
+    if (resource_info->colors <= (one << (size_t) visual_template.depth))
       visual_mask|=VisualDepthMask;
   if (visual_type != (char *) NULL)
     {
@@ -1779,7 +1783,7 @@ MagickExport void XDelay(Display *display,const size_t milliseconds)
   if (milliseconds == 0)
     return;
 #if defined(MAGICKCORE_WINDOWS_SUPPORT)
-  Sleep(milliseconds);
+  Sleep((long) milliseconds);
 #elif defined(vms)
   {
     float
@@ -4272,7 +4276,7 @@ static Image *XGetWindowImage(Display *display,const Window window,
                       (~(window_info[id].visual->blue_mask)+1);
                     for (i=0; i < (int) number_colors; i++)
                     {
-                      colors[i].pixel=red | green | blue;
+                      colors[i].pixel=(unsigned long) (red | green | blue);
                       colors[i].pad='\0';
                       red+=red_bit;
                       if (red > window_info[id].visual->red_mask)