]> granicus.if.org Git - imagemagick/commitdiff
https://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=34639
authorCristy <urban-warrior@imagemagick.org>
Tue, 28 Aug 2018 12:29:32 +0000 (08:29 -0400)
committerCristy <urban-warrior@imagemagick.org>
Tue, 28 Aug 2018 12:29:32 +0000 (08:29 -0400)
coders/caption.c
coders/label.c

index e7026a23ce25d286b9da799708dee4f073b25195..fb839a5e41ca6f3d1186b3642fecb48abc546f0b 100644 (file)
@@ -293,7 +293,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
   (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g",MagickMax(
     draw_info->direction == RightToLeftDirection ? (double) image->columns-
     metrics.bounds.x2 : -metrics.bounds.x1,0.0),draw_info->gravity ==
-    UndefinedGravity ? metrics.ascent : 0.0);
+    UndefinedGravity ? MagickMax(metrics.ascent,metrics.bounds.y2) : 0.0);
   (void) CloneString(&draw_info->geometry,geometry);
   status=AnnotateImage(image,draw_info,exception);
   if (image_info->pointsize == 0.0)
index 523e12b5b177800b5d4adab58a7ea157b38010b9..3bf4b848327e106272258fddbad9242417220d18 100644 (file)
@@ -259,7 +259,7 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
   (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g",
     draw_info->direction == RightToLeftDirection ? (double) image->columns-
     metrics.bounds.x2 : 0.0,draw_info->gravity == UndefinedGravity ?
-    metrics.ascent : 0.0);
+    MagickMax(metrics.ascent,metrics.bounds.y2) : 0.0);
   (void) CloneString(&draw_info->geometry,geometry);
   status=AnnotateImage(image,draw_info,exception);
   if (image_info->pointsize == 0.0)