commit cae9c06539e4a0ce3b21f544808bd8096a76253b
author cristy <urban-warrior@git.imagemagick.org> Mon May 13 11:46:22 2013 +0000
committer cristy <urban-warrior@git.imagemagick.org> Mon May 13 11:46:22 2013 +0000
tree 03c20bbc92bc66b98c408d5fe589c2c59117c009
parent d15dfd180662664494d77aa9aa3485f3314e19e1

coders/caption.c

diff --git a/coders/caption.c b/coders/caption.c
index b5e8654..12620f5 100644
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -212,12 +212,12 @@
         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 @@
         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;

coders/label.c

diff --git a/coders/label.c b/coders/label.c
index 13ec9e0..24cd413 100644
--- a/coders/label.c
+++ b/coders/label.c
@@ -159,12 +159,12 @@
           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 @@
           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;