(no commit message)

diff --git a/coders/caption.c b/coders/caption.c
index bcae0d6e0d87130d0b9510d5366fbf5526e3851d..ce62c487fe185d55f476fe7a015fd9caf1da0ae3 100644 (file)
--- 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)