% MagickCore Geometry Methods %
% %
% Software Design %
-% John Cristy %
+% Cristy %
% January 2003 %
% %
% %
-% Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization %
% dedicated to making software imaging solutions freely available. %
% %
% You may not use this file except in compliance with the License. You may %
(void) CopyMagickString(p,p+1,MaxTextExtent);
break;
}
+ case 'x':
+ case 'X':
+ {
+ flags|=SeparatorValue;
+ p++;
+ break;
+ }
case '-':
case '.':
case ',':
case '7':
case '8':
case '9':
- case 'x':
- case 'X':
case 215:
+ case 'e':
+ case 'E':
{
p++;
break;
(void) value;
if (LocaleNCompare(p,"0x",2) == 0)
value=(double) strtol(p,&q,10);
- c=(int) ((unsigned char) *q);
- if ((c == 215) || (*q == 'x') || (*q == 'X') || (*q == '\0'))
+ if ((*p != '+') && (*p != '-'))
{
- /*
- Parse width.
- */
- q=p;
- if (LocaleNCompare(p,"0x",2) == 0)
- *width=(size_t) strtol(p,&p,10);
- else
- *width=(size_t) floor(StringToDouble(p,&p)+0.5);
- if (p != q)
- flags|=WidthValue;
- }
- c=(int) ((unsigned char) *p);
- if ((c == 215) || (*p == 'x') || (*p == 'X'))
- {
- p++;
- if ((*p != '+') && (*p != '-'))
+ c=(int) ((unsigned char) *q);
+ if ((c == 215) || (*q == 'x') || (*q == 'X') || (*q == '\0'))
{
/*
- Parse height.
+ Parse width.
*/
q=p;
- *height=(size_t) floor(StringToDouble(p,&p)+0.5);
+ if (LocaleNCompare(p,"0x",2) == 0)
+ *width=(size_t) strtol(p,&p,10);
+ else
+ *width=(size_t) floor(StringToDouble(p,&p)+0.5);
if (p != q)
- flags|=HeightValue;
+ flags|=WidthValue;
+ }
+ }
+ if ((*p != '+') && (*p != '-'))
+ {
+ c=(int) ((unsigned char) *p);
+ if ((c == 215) || (*p == 'x') || (*p == 'X'))
+ {
+ p++;
+ if ((*p != '+') && (*p != '-'))
+ {
+ /*
+ Parse height.
+ */
+ q=p;
+ *height=(size_t) floor(StringToDouble(p,&p)+0.5);
+ if (p != q)
+ flags|=HeightValue;
+ }
}
}
if ((*p == '+') || (*p == '-'))
Parse x value.
*/
while ((*p == '+') || (*p == '-'))
- {
- if (*p == '-')
- flags^=XNegative; /* negate sign */
- p++;
- }
+ {
+ if (*p == '-')
+ flags^=XNegative; /* negate sign */
+ p++;
+ }
q=p;
*x=(ssize_t) ceil(StringToDouble(p,&p)-0.5);
if (p != q)
{
flags|=XValue;
- if ( (flags&XNegative) != 0 )
- *x = -*x;
+ if ((flags & XNegative) != 0)
+ *x=(-*x);
}
}
if ((*p == '+') || (*p == '-'))
Parse y value.
*/
while ((*p == '+') || (*p == '-'))
- {
- if (*p == '-')
- flags^=YNegative; /* negate sign */
- p++;
- }
+ {
+ if (*p == '-')
+ flags^=YNegative; /* negate sign */
+ p++;
+ }
q=p;
*y=(ssize_t) ceil(StringToDouble(p,&p)-0.5);
if (p != q)
{
flags|=YValue;
- if ( (flags&YNegative) != 0 )
- *y = -*y;
+ if ((flags & YNegative) != 0)
+ *y=(-*y);
+ }
+ }
+ if ((flags & PercentValue) != 0)
+ {
+ if (((flags & SeparatorValue) == 0) && ((flags & HeightValue) == 0))
+ {
+ *height=(*width);
+ flags|=HeightValue;
}
+ if (((flags & SeparatorValue) != 0) && ((flags & WidthValue) == 0))
+ *width=(*height);
}
#if 0
/* Debugging Geometry */
- fprintf(stderr,"GetGeometry...\n");
- fprintf(stderr,"Input: %s\n",geometry);
- fprintf(stderr,"Flags: %c %c %s %s\n",
- (flags&WidthValue)?'W':' ',(flags&HeightValue)?'H':' ',
- (flags&XValue)?((flags&XNegative)?"-X":"+X"):" ",
- (flags&YValue)?((flags&YNegative)?"-Y":"+Y"):" ");
- fprintf(stderr,"Geometry: %ldx%ld%+ld%+ld\n",
- (long)*width,(long)*height,(long)*x,(long)*y);
+ (void) fprintf(stderr,"GetGeometry...\n");
+ (void) fprintf(stderr,"Input: %s\n",geometry);
+ (void) fprintf(stderr,"Flags: %c %c %s %s\n",
+ (flags & WidthValue) ? 'W' : ' ',(flags & HeightValue) ? 'H' : ' ',
+ (flags & XValue) ? ((flags & XNegative) ? "-X" : "+X") : " ",
+ (flags & YValue) ? ((flags & YNegative) ? "-Y" : "+Y") : " ");
+ (void) fprintf(stderr,"Geometry: %ldx%ld%+ld%+ld\n",(long) *width,(long)
+ *height,(long) *x,(long) *y);
#endif
return(flags);
}
{ "a2", "1191x1684" },
{ "a3", "842x1191" },
{ "a4", "595x842" },
- { "a4smaLL", "595x842" },
+ { "a4small", "595x842" },
{ "a5", "420x595" },
{ "a6", "297x420" },
{ "a7", "210x297" },
{ "ledger", "1224x792" },
{ "legal", "612x1008" },
{ "letter", "612x792" },
- { "lettersmaLL", "612x792" },
+ { "lettersmall", "612x792" },
{ "quarto", "610x780" },
{ "statement", "396x612" },
{ "tabloid", "792x1224" },
}
}
}
- determinant=(affine_matrix->sx*affine_matrix->sy
- - affine_matrix->rx*affine_matrix->ry);
+ determinant=(affine_matrix->sx*affine_matrix->sy-affine_matrix->rx*
+ affine_matrix->ry);
if (fabs(determinant) < MagickEpsilon)
(void) ThrowMagickException(exception,GetMagickModule(),OptionError,
"InvalidArgument","'%s' : 'Indeterminate Matrix'",geometry);
% and ^) flags present. It does not report the location of the percentage
% relative to the values.
%
-% Values may also be seperated by commas, colons, or slashes, and offsets.
+% Values may also be separated by commas, colons, or slashes, and offsets.
% Offsets may be prefixed by multiple signs to make offset string
% substitutions easier to handle from shell scripts.
% For example: "-10-10", "-+10-+10", or "+-10+-10" will generate negtive
(void) CopyMagickString(p,p+1,MaxTextExtent);
break;
}
+ case 'x':
+ case 'X':
+ {
+ flags|=SeparatorValue;
+ p++;
+ break;
+ }
case '-':
case '+':
case ',':
case '7':
case '8':
case '9':
- case 'x':
- case 'X':
case '/':
case ':':
case 215:
+ case 'e':
+ case 'E':
{
p++;
break;
if ((*p == ',') || (*p == '/') || (*p == ':') )
p++;
while ((*p == '+') || (*p == '-'))
- {
- if (*p == '-')
- flags^=XiNegative; /* negate sign */
- p++;
- }
+ {
+ if (*p == '-')
+ flags^=XiNegative; /* negate sign */
+ p++;
+ }
q=p;
value=StringToDouble(p,&p);
if (p != q)
{
flags|=XiValue;
- if ( (flags&XiNegative) != 0 )
- value = -value;
+ if ((flags & XiNegative) != 0)
+ value=(-value);
geometry_info->xi=value;
}
while (isspace((int) ((unsigned char) *p)) != 0)
if ((*p == ',') || (*p == '/') || (*p == ':'))
p++;
while ((*p == '+') || (*p == '-'))
- {
- if (*p == '-')
- flags^=PsiNegative; /* negate sign */
- p++;
- }
+ {
+ if (*p == '-')
+ flags^=PsiNegative; /* negate sign */
+ p++;
+ }
q=p;
value=StringToDouble(p,&p);
- if (p != q) {
- flags|=PsiValue;
- if ( (flags&PsiNegative) != 0 )
- value = -value;
- geometry_info->psi=value;
- }
- }
+ if (p != q)
+ {
+ flags|=PsiValue;
+ if ((flags & PsiNegative) != 0)
+ value=(-value);
+ geometry_info->psi=value;
+ }
+ }
while (isspace((int) ((unsigned char) *p)) != 0)
p++;
if ((*p == '+') || (*p == '-') || (*p == ',') || (*p == '/') ||
if ((*p == ',') || (*p == '/') || (*p == ':'))
p++;
while ((*p == '+') || (*p == '-'))
- {
- if (*p == '-')
- flags^=ChiNegative; /* negate sign */
- p++;
- }
+ {
+ if (*p == '-')
+ flags^=ChiNegative; /* negate sign */
+ p++;
+ }
q=p;
value=StringToDouble(p,&p);
- if (p != q) {
- flags|=ChiValue;
- if ( (flags&ChiNegative) != 0 )
- value = -value;
- geometry_info->chi=value;
- }
+ if (p != q)
+ {
+ flags|=ChiValue;
+ if ((flags & ChiNegative) != 0)
+ value=(-value);
+ geometry_info->chi=value;
+ }
}
}
if (strchr(pedantic_geometry,':') != (char *) NULL)
flags|=SigmaValue;
flags&=(~XiValue);
}
+ if ((flags & PercentValue) != 0)
+ {
+ if (((flags & SeparatorValue) == 0) && ((flags & SigmaValue) == 0))
+ geometry_info->sigma=geometry_info->rho;
+ if (((flags & SeparatorValue) != 0) && ((flags & RhoValue) == 0))
+ geometry_info->rho=geometry_info->sigma;
+ }
#if 0
/* Debugging Geometry */
- fprintf(stderr,"ParseGeometry...\n");
- fprintf(stderr,"Flags: %c %c %s %s %s\n",
- (flags&RhoValue)?'W':' ',(flags&SigmaValue)?'H':' ',
- (flags&XiValue)?((flags&XiNegative)?"-X":"+X"):" ",
- (flags&PsiValue)?((flags&PsiNegative)?"-Y":"+Y"):" ",
- (flags&ChiValue)?((flags&ChiNegative)?"-Z":"+Z"):" ");
- fprintf(stderr,"Geometry: %lg,%lg,%lg,%lg,%lg\n",
- geometry_info->rho,geometry_info->sigma,
- geometry_info->xi,geometry_info->psi,geometry_info->chi);
+ (void) fprintf(stderr,"ParseGeometry...\n");
+ (void) fprintf(stderr,"Flags: %c %c %s %s %s\n",
+ (flags & RhoValue) ? 'W' : ' ',(flags & SigmaValue) ? 'H' : ' ',
+ (flags & XiValue) ? ((flags & XiNegative) ? "-X" : "+X") : " ",
+ (flags & PsiValue) ? ((flags & PsiNegative) ? "-Y" : "+Y") : " ",
+ (flags & ChiValue) ? ((flags & ChiNegative) ? "-Z" : "+Z") : " ");
+ (void) fprintf(stderr,"Geometry: %lg,%lg,%lg,%lg,%lg\n",geometry_info->rho,
+ geometry_info->sigma,geometry_info->xi,geometry_info->psi,
+ geometry_info->chi);
#endif
return(flags);
}
if (flags == NoValue)
{
(void) ThrowMagickException(exception,GetMagickModule(),OptionError,
- "InvalidGeometry","'%s'",geometry);
+ "InvalidGeometry","`%s'",geometry);
return(flags);
}
if ((flags & PercentValue) != 0)
if ((flags & SigmaValue) == 0)
scale.y=scale.x;
*width=(size_t) floor(scale.x*former_width/100.0+0.5);
- if (*width == 0)
- *width=1;
*height=(size_t) floor(scale.y*former_height/100.0+0.5);
- if (*height == 0)
- *height=1;
former_width=(*width);
former_height=(*height);
}
(void) ParseGeometry(geometry,&geometry_info);
area=geometry_info.rho;
distance=sqrt((double) former_width*former_height);
- scale.x=(double) former_width/(distance/sqrt((double) area));
- scale.y=(double) former_height/(distance/sqrt((double) area));
+ scale.x=former_width/(distance/sqrt(area));
+ scale.y=former_height/(distance/sqrt(area));
if ((scale.x < (double) *width) || (scale.y < (double) *height))
{
- *width=(size_t) (former_width/(distance/sqrt(area))+0.5);
- *height=(size_t) (former_height/(distance/sqrt(area))+0.5);
+ *width=(unsigned long) (former_width/(distance/sqrt(area)));
+ *height=(unsigned long) (former_height/(distance/sqrt(area)));
}
former_width=(*width);
former_height=(*height);
if (flags == NoValue)
{
(void) ThrowMagickException(exception,GetMagickModule(),OptionError,
- "InvalidGeometry","'%s'",geometry);
+ "InvalidGeometry","`%s'",geometry);
return(flags);
}
if ((flags & PercentValue) != 0)
}
flags=ParseMetaGeometry(geometry,®ion_info->x,®ion_info->y,
®ion_info->width,®ion_info->height);
+ if ((((flags & WidthValue) != 0) || ((flags & HeightValue) != 0)) &&
+ (((flags & PercentValue) != 0) || ((flags & SeparatorValue) == 0)))
+ {
+ if ((flags & WidthValue) == 0)
+ region_info->width=region_info->height;
+ if ((flags & HeightValue) == 0)
+ region_info->height=region_info->width;
+ }
return(flags);
}
\f
®ion_info->width,®ion_info->height);
if (flags == NoValue)
(void) ThrowMagickException(exception,GetMagickModule(),OptionError,
- "InvalidGeometry","'%s'",geometry);
+ "InvalidGeometry","`%s'",geometry);
return(flags);
}
\f
projects / imagemagick / blobdiff