From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 14 Nov 2013 16:20:04 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~3125
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02e64f85ab79992a87dd6979d4948488fec02817;p=imagemagick

---

diff --git a/MagickCore/display.c b/MagickCore/display.c
index eecdcba83..2c7a3a8b2 100644
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -13838,7 +13838,7 @@ MagickExport MagickBooleanType XDisplayBackgroundImage(Display *display,
     window_info.id=root_window;
   else
     {
-      if (isdigit((unsigned char) *resources.window_id) != 0)
+      if (isdigit((int) ((unsigned char) *resources.window_id)) != 0)
         window_info.id=XWindowByID(display,root_window,
           (Window) strtol((char *) resources.window_id,(char **) NULL,0));
       if (window_info.id == (Window) NULL)
diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 778bbdea5..43eb658dc 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -1309,7 +1309,7 @@ static double FxGetSymbol(FxInfo *fx_info,const PixelChannel channel,
   level=0;
   point.x=(double) x;
   point.y=(double) y;
-  if (isalpha((int) *(p+1)) == 0)
+  if (isalpha((int) ((unsigned char) *(p+1))) == 0)
     {
       if (strchr("suv",(int) *p) != (char *) NULL)
         {
@@ -1351,7 +1351,7 @@ static double FxGetSymbol(FxInfo *fx_info,const PixelChannel channel,
           if (*p == '.')
             p++;
         }
-      if ((*p == 'p') && (isalpha((int) *(p+1)) == 0))
+      if ((*p == 'p') && (isalpha((int) ((unsigned char) *(p+1))) == 0))
         {
           p++;
           if (*p == '{')
diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index 359413f06..06f5ea4c6 100644
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -518,7 +518,7 @@ MagickExport KernelInfo *AcquireKernelInfo(const char *kernel_string)
     if ( *token != ';' ) {
 
       /* tokens starting with alpha is a Named kernel */
-      if (isalpha((int) *token) != 0)
+      if (isalpha((int) ((unsigned char) *token)) != 0)
         new_kernel = ParseKernelName(p);
       else /* otherwise a user defined kernel array */
         new_kernel = ParseKernelArray(p);
diff --git a/MagickCore/vms.c b/MagickCore/vms.c
index f4d02d1ec..355c6dce9 100644
--- a/MagickCore/vms.c
+++ b/MagickCore/vms.c
@@ -195,7 +195,7 @@ struct dirent *readdir(DIR *directory)
   */
   buffer[sizeof(buffer)-1]='\0';
   for (p=buffer; *p; p++)
-    if (isupper((unsigned char) *p))
+    if (isupper((int) ((unsigned char) *p)))
       *p=tolower(*p);
   /*
     Skip any directory component and just copy the name.
diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index 1d49525b7..a58c6840f 100644
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -4942,7 +4942,7 @@ MagickExport Image *XImportImage(const ImageInfo *image_info,
           /*
             Select window by ID or name.
           */
-          if (isdigit((unsigned char) *image_info->filename) != 0)
+          if (isdigit((int) ((unsigned char) *image_info->filename)) != 0)
             target=XWindowByID(display,root,(Window)
               strtol(image_info->filename,(char **) NULL,0));
           if (target == (Window) NULL)
@@ -5295,7 +5295,7 @@ MagickPrivate XWindows *XInitializeWindows(Display *display,
   windows->group_leader.id=(Window) NULL;
   if (resource_info->window_group != (char *) NULL)
     {
-      if (isdigit((unsigned char) *resource_info->window_group) != 0)
+      if (isdigit((int) ((unsigned char) *resource_info->window_group)) != 0)
         windows->group_leader.id=XWindowByID(display,root_window,(Window)
           strtol((char *) resource_info->window_group,(char **) NULL,0));
       if (windows->group_leader.id == (Window) NULL)
@@ -8929,7 +8929,7 @@ MagickExport MagickBooleanType XRemoteCommand(Display *display,
       /*
         Search window hierarchy and identify any clients by name or ID.
       */
-      if (isdigit((unsigned char) *window) != 0)
+      if (isdigit((int) ((unsigned char) *window)) != 0)
         remote_window=XWindowByID(display,root_window,(Window)
           strtol((char *) window,(char **) NULL,0));
       if (remote_window == (Window) NULL)