From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 20 May 2012 18:59:41 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5559
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa9b5831efa0b604ad07a0abb130a53d26b67f3a;p=imagemagick

---

diff --git a/coders/caption.c b/coders/caption.c
index 96bd543dd..a7f3fb06a 100644
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -162,7 +162,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
         *text;
 
       /*
-        Scale text to fit bounding box.
+        Scale text to fit bounding box height.
       */
       for ( ; ; )
       {
@@ -179,11 +179,14 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
         (void) status;
         width=(size_t) floor(metrics.width+draw_info->stroke_width+0.5);
         height=(size_t) floor(metrics.height+draw_info->stroke_width+0.5);
-        if ((width > (image->columns+1)) || (height > (image->rows+1)))
+        if (height > image->rows)
           break;
         draw_info->pointsize*=2.0;
       }
       draw_info->pointsize/=2.0;
+      /*
+        Scale text to fit bounding box.
+      */
       for ( ; ; )
       {
         text=AcquireString(caption);
@@ -198,7 +201,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
         status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
         width=(size_t) floor(metrics.width+draw_info->stroke_width+0.5);
         height=(size_t) floor(metrics.height+draw_info->stroke_width+0.5);
-        if ((width > (image->columns+1)) || (height > (image->rows+1)))
+        if ((width > image->columns) || (height > image->rows))
           break;
         draw_info->pointsize++;
       }