(no commit message)

diff --git a/coders/caption.c b/coders/caption.c
index b5e8654d5c2aec61f125be5e0a93cc641c146754..12620f5340e15ff322ea46464b3c53e81d1ad9a6 100644 (file)
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -212,12 +212,12 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
         height=(size_t) floor(metrics.height+draw_info->stroke_width+0.5);
         if ((image->columns != 0) && (image->rows != 0))
           {
-            if ((width > image->columns) && (height > image->rows))
+            if ((width >= image->columns) && (height >= image->rows))
               break;
           }
         else
-          if (((image->columns != 0) && (width > image->columns)) ||
-              ((image->rows != 0) && (height > image->rows)))
+          if (((image->columns != 0) && (width >= image->columns)) ||
+              ((image->rows != 0) && (height >= image->rows)))
             break;
       }
       high=draw_info->pointsize;
@@ -238,7 +238,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
         height=(size_t) floor(metrics.height+draw_info->stroke_width+0.5);
         if ((image->columns != 0) && (image->rows != 0))
           {
-            if ((width <= image->columns) && (height <= image->rows))
+            if ((width < image->columns) && (height < image->rows))
               low=draw_info->pointsize+1.0;
             else
               high=draw_info->pointsize-1.0;

diff --git a/coders/label.c b/coders/label.c
index 13ec9e0450a85a31ff5acda8ec8fa027ac0e49a8..24cd413c1fa50f930349c51a9c76ce55111c9704 100644 (file)
--- a/coders/label.c
+++ b/coders/label.c
@@ -159,12 +159,12 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
           height=(size_t) floor(metrics.height+draw_info->stroke_width+0.5);
           if ((image->columns != 0) && (image->rows != 0))
             {
-              if ((width > image->columns) && (height > image->rows))
+              if ((width >= image->columns) && (height >= image->rows))
                 break;
             }
           else
-            if (((image->columns != 0) && (width > image->columns)) ||
-                ((image->rows != 0) && (height > image->rows)))
+            if (((image->columns != 0) && (width >= image->columns)) ||
+                ((image->rows != 0) && (height >= image->rows)))
               break;
         }
         high=draw_info->pointsize;
@@ -180,7 +180,7 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
           height=(size_t) floor(metrics.height+draw_info->stroke_width+0.5);
           if ((image->columns != 0) && (image->rows != 0))
             {
-              if ((width <= image->columns) && (height <= image->rows))
+              if ((width < image->columns) && (height < image->rows))
                 low=draw_info->pointsize+1.0;
               else
                 high=draw_info->pointsize-1.0;