Changeset 8026

Timestamp:

05/23/12 21:51:35 (12 months ago)

Author:

cristy

Message:

 

File:

• ImageMagick/branches/ImageMagick-6/coders/caption.c (modified) (2 diffs)

ImageMagick/branches/ImageMagick-6/coders/caption.c

@@ -178 +178 @@
         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.
@@ -199 +198 @@
         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);