From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 24 May 2012 01:52:18 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5545
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42f5a6a8af8b1e4fd5f341e709c4d06778b8d85f;p=imagemagick

---

diff --git a/coders/caption.c b/coders/caption.c
index bcae0d6e0..ce62c487f 100644
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -179,11 +179,10 @@ 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) || (height > image->rows))
+        if ((width > image->columns) && (height > image->rows))
           break;
-        draw_info->pointsize*=2.0;
+        draw_info->pointsize++;
       }
-      draw_info->pointsize/=2.0;
       /*
         Scale text down to fit bounding box.
       */
@@ -201,11 +200,10 @@ 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) || (height > image->rows))
+        if ((width <= image->columns) && (height <= image->rows))
           break;
-        draw_info->pointsize++;
+        draw_info->pointsize--;
       }
-      draw_info->pointsize--;
     }
   i=FormatMagickCaption(image,draw_info,MagickTrue,&metrics,&caption,exception);
   if (image->rows == 0)