From 3278fc22854db6236bcac95c963f0460b247a778 Mon Sep 17 00:00:00 2001 From: Cristy Date: Sun, 18 Feb 2018 18:56:50 -0500 Subject: [PATCH] ... --- ChangeLog | 2 +- MagickCore/fx.c | 8 ++++---- coders/sixel.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 81ce85650..9b8977ab7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ 2018-02-18 7.0.7-23 Cristy - * 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 * Add support for reading the HEIC image format to the Windows build. diff --git a/MagickCore/fx.c b/MagickCore/fx.c index 130635ca7..1c36397fa 100644 --- 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 7ceaf5e88..c2870f572 100644 --- 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) { -- 2.40.0