From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 19 Feb 2015 15:50:41 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1267
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3626c86d75e99025576dd884c6f4df10a0364baf;p=imagemagick

---

diff --git a/coders/caption.c b/coders/caption.c
index 550c8cd08..b4566d2f4 100644
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -167,7 +167,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
       (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);
@@ -183,11 +183,11 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
       (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)
@@ -207,7 +207,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
         (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);
@@ -233,7 +233,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
         (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);
@@ -269,17 +269,20 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
   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);
diff --git a/coders/label.c b/coders/label.c
index 97043dfd6..6570ace76 100644
--- a/coders/label.c
+++ b/coders/label.c
@@ -132,7 +132,7 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
   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))
     {
@@ -153,7 +153,7 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
         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);
@@ -174,7 +174,7 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
         {
           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);
@@ -207,7 +207,7 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
   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);
@@ -216,17 +216,20 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
     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)