(void) CloneString(&draw_info->text,text);
text=DestroyString(text);
(void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
- -metrics.bounds.x1,metrics.ascent);
+ -metrics.bounds.x1,metrics.bounds.y2);
if (draw_info->gravity == UndefinedGravity)
(void) CloneString(&draw_info->geometry,geometry);
status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
(void) CloneString(&draw_info->text,text);
text=DestroyString(text);
(void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
- -metrics.bounds.x1,metrics.ascent);
+ -metrics.bounds.x1,metrics.bounds.y2);
if (draw_info->gravity == UndefinedGravity)
(void) CloneString(&draw_info->geometry,geometry);
status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
- image->rows=(size_t) ((i+1)*(metrics.ascent-metrics.descent+
+ image->rows=(size_t) ((i+1)*(metrics.bounds.y2-metrics.descent+
draw_info->interline_spacing+draw_info->stroke_width)+0.5);
}
if (fabs(image_info->pointsize) < MagickEpsilon)
(void) CloneString(&draw_info->text,text);
text=DestroyString(text);
(void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
- -metrics.bounds.x1,metrics.ascent);
+ -metrics.bounds.x1,metrics.bounds.y2);
if (draw_info->gravity == UndefinedGravity)
(void) CloneString(&draw_info->geometry,geometry);
status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
(void) CloneString(&draw_info->text,text);
text=DestroyString(text);
(void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
- -metrics.bounds.x1,metrics.ascent);
+ -metrics.bounds.x1,metrics.bounds.y2);
if (draw_info->gravity == UndefinedGravity)
(void) CloneString(&draw_info->geometry,geometry);
status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
if ((draw_info->gravity != UndefinedGravity) &&
(draw_info->direction != RightToLeftDirection))
- image->page.x=(ssize_t) floor(metrics.bounds.x1-
- draw_info->stroke_width/2.0+0.5);
+ {
+ image->page.x=(ssize_t) floor(metrics.bounds.x1-
+ draw_info->stroke_width/2.0+0.5);
+ image->page.y=(ssize_t) floor(-2-draw_info->stroke_width/2.0+0.5);
+ }
else
{
(void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
- -metrics.bounds.x1+draw_info->stroke_width/2.0,metrics.ascent+
+ -metrics.bounds.x1+draw_info->stroke_width/2.0,metrics.bounds.y2+
draw_info->stroke_width/2.0);
if (draw_info->direction == RightToLeftDirection)
(void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
image->columns-(metrics.bounds.x2+draw_info->stroke_width/2.0),
- metrics.ascent+draw_info->stroke_width/2.0);
+ metrics.bounds.y2+draw_info->stroke_width/2.0);
draw_info->geometry=AcquireString(geometry);
}
status=AnnotateImage(image,draw_info,exception);
draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL);
draw_info->text=ConstantString(label);
metrics.width=0;
- metrics.ascent=0.0;
+ metrics.bounds.y2=0.0;
status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
if ((image->columns == 0) && (image->rows == 0))
{
for ( ; ; draw_info->pointsize*=2.0)
{
(void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
- -metrics.bounds.x1,metrics.ascent);
+ -metrics.bounds.x1,metrics.bounds.y2);
if (draw_info->gravity == UndefinedGravity)
(void) CloneString(&draw_info->geometry,geometry);
status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
{
draw_info->pointsize=(low+high)/2.0;
(void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
- -metrics.bounds.x1,metrics.ascent);
+ -metrics.bounds.x1,metrics.bounds.y2);
if (draw_info->gravity == UndefinedGravity)
(void) CloneString(&draw_info->geometry,geometry);
status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
if (image->columns == 0)
image->columns=(size_t) (draw_info->pointsize+draw_info->stroke_width+0.5);
if (image->rows == 0)
- image->rows=(size_t) (metrics.ascent-metrics.descent+
+ image->rows=(size_t) (metrics.bounds.y2-metrics.descent+
draw_info->stroke_width+0.5);
if (image->rows == 0)
image->rows=(size_t) (draw_info->pointsize+draw_info->stroke_width+0.5);
return(DestroyImageList(image));
if ((draw_info->gravity != UndefinedGravity) &&
(draw_info->direction != RightToLeftDirection))
- image->page.x=(ssize_t) floor(metrics.bounds.x1-
- draw_info->stroke_width/2.0+0.5);
+ {
+ image->page.x=(ssize_t) floor(metrics.bounds.x1-
+ draw_info->stroke_width/2.0+0.5);
+ image->page.y=(ssize_t) floor(-2-draw_info->stroke_width/2.0+0.5);
+ }
else
{
(void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
- -metrics.bounds.x1+draw_info->stroke_width/2.0,metrics.ascent+
+ -metrics.bounds.x1+draw_info->stroke_width/2.0,metrics.bounds.y2+
draw_info->stroke_width/2.0);
if (draw_info->direction == RightToLeftDirection)
(void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
image->columns-(metrics.bounds.x2+draw_info->stroke_width/2.0),
- metrics.ascent+draw_info->stroke_width/2.0);
+ metrics.bounds.y2+draw_info->stroke_width/2.0);
draw_info->geometry=AcquireString(geometry);
}
if (SetImageBackgroundColor(image,exception) == MagickFalse)