Commit 3278fc22 authored by Cristy's avatar Cristy

...

parent fede9f9d
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.
......
......@@ -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;
......
......@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment