...

diff --git a/ChangeLog b/ChangeLog
index 81ce8565045b9629888ee6593bc08de7c85fed40..9b8977ab77c73ec291c806b2896d9469ced3e4f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 2018-02-18  7.0.7-23 Cristy  <quetzlzacatenango@image...>
-  * Release ImageMagick version 7.0.0-23, GIT revision 22949:7c392b26d:20180218.
+  * Release ImageMagick version 7.0.0-23, GIT revision 22969:c6b3a22b0:20180218.
 
 2018-02-09  7.0.7-23 Dirk Lemstra <dirk@lem.....org>
   * Add support for reading the HEIC image format to the Windows build.

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 130635ca7c029b7aa79dd2f9d1676735158b5d60..1c36397fa01cbda8ee2335e98cbd64ea3eb2a24c 100644 (file)
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -1921,7 +1921,7 @@ static const char *FxOperatorPrecedence(const char *expression,
       case 'E':
       case 'e':
       {
-        if ((isdigit((int) ((unsigned char) c)) != 0) &&
+        if ((isdigit(c) != 0) &&
             ((LocaleNCompare(expression,"E+",2) == 0) ||
              (LocaleNCompare(expression,"E-",2) == 0)))
           {
@@ -1971,11 +1971,11 @@ static const char *FxOperatorPrecedence(const char *expression,
         }
         default:
         {
-          if (((c != 0) && ((isdigit((int) ((unsigned char) c)) != 0) ||
-               (strchr(")",(int) ((unsigned char) c)) != (char *) NULL))) &&
+          if (((c != 0) && ((isdigit(c) != 0) ||
+               (strchr(")",c) != (char *) NULL))) &&
               (((islower((int) ((unsigned char) *expression)) != 0) ||
                (strchr("(",(int) ((unsigned char) *expression)) != (char *) NULL)) ||
-               ((isdigit((int) ((unsigned char) c)) == 0) &&
+               ((isdigit(c) == 0) &&
                 (isdigit((int) ((unsigned char) *expression)) != 0))) &&
               (strchr("xy",(int) ((unsigned char) *expression)) == (char *) NULL))
             precedence=MultiplyPrecedence;

diff --git a/coders/sixel.c b/coders/sixel.c
index 7ceaf5e88d5da0f804b5d6a88513ae65b104610a..c2870f572cef3e524b604af3d6dc32ab37132670 100644 (file)
--- a/coders/sixel.c
+++ b/coders/sixel.c
@@ -201,8 +201,8 @@ static unsigned char *get_params(unsigned char *p, int *param, int *len)
         while (*p == ' ' || *p == '\t') {
             p++;
         }
-        if (isdigit(*p)) {
-            for (n = 0; isdigit(*p); p++) {
+        if (isdigit((int) ((unsigned char) *p))) {
+            for (n = 0; isdigit((int) ((unsigned char) *p)); p++) {
                 n = (int) ((ssize_t) n * 10 + (*p - '0'));
             }
             if (*len < 10) {