From d1303500703fe6c5c7c8aed975dc9ed9d021084a Mon Sep 17 00:00:00 2001 From: anthony Date: Tue, 11 May 2010 12:00:43 +0000 Subject: [PATCH] Remove previous geometry changes --- magick/geometry.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/magick/geometry.c b/magick/geometry.c index 6498fe339..7c1175651 100644 --- a/magick/geometry.c +++ b/magick/geometry.c @@ -794,7 +794,6 @@ MagickExport MagickStatusType ParseGeometry(const char *geometry, case 'X': case '/': case ':': - case ';': { p++; break; @@ -820,7 +819,7 @@ MagickExport MagickStatusType ParseGeometry(const char *geometry, if (LocaleNCompare(p,"0x",2) == 0) value=(double) strtol(p,&q,10); if ((((int) *q) == -41) || (*q == 'x') || (*q == 'X') || (*q == ',') || - (*q == '/') || (*q == ':') || (*q == ';') || (*q =='\0')) + (*q == '/') || (*q == ':') || (*q =='\0')) { /* Parse rho. @@ -838,7 +837,7 @@ MagickExport MagickStatusType ParseGeometry(const char *geometry, } q=p; if ((((int) *p) == -41) || (*p == 'x') || (*p == 'X') || (*p == ',') || - (*p == '/') || (*p == ':') || (*p == ';')) + (*p == '/') || (*p == ':')) { /* Parse sigma. @@ -860,13 +859,12 @@ MagickExport MagickStatusType ParseGeometry(const char *geometry, } while (isspace((int) ((unsigned char) *p)) != 0) p++; - if ((*p == '+') || (*p == '-') || (*p == ',') || (*p == '/') || - (*p == ':') || (*p == ';')) + if ((*p == '+') || (*p == '-') || (*p == ',') || (*p == '/') || (*p == ':')) { /* Parse xi value. */ - if ((*p == ',') || (*p == '/') || (*p == ':') || (*p == ';')) + if ((*p == ',') || (*p == '/') || (*p == ':')) p++; q=p; value=strtod(p,&p); @@ -880,12 +878,12 @@ MagickExport MagickStatusType ParseGeometry(const char *geometry, while (isspace((int) ((unsigned char) *p)) != 0) p++; if ((*p == '+') || (*p == '-') || (*p == ',') || (*p == '/') || - (*p == ':') || (*p == ';')) + (*p == ':')) { /* Parse psi value. */ - if ((*p == ',') || (*p == '/') || (*p == ':') || (*p == ';')) + if ((*p == ',') || (*p == '/') || (*p == ':')) p++; q=p; value=strtod(p,&p); @@ -900,7 +898,7 @@ MagickExport MagickStatusType ParseGeometry(const char *geometry, while (isspace((int) ((unsigned char) *p)) != 0) p++; if ((*p == '+') || (*p == '-') || (*p == ',') || (*p == '/') || - (*p == ':') || (*p == ';')) + (*p == ':')) { /* Parse chi value. -- 2.40.0