(no commit message)

diff --git a/coders/caption.c b/coders/caption.c
index 3fb2b409d3aa18d4871e1adfbae5701d46ad1ff2..33081cbd20c883693890fb8859875559a0082be1 100644 (file)
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -155,7 +155,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
   if (gravity != (char *) NULL)
     draw_info->gravity=(GravityType) ParseCommandOption(MagickGravityOptions,
       MagickFalse,gravity);
-  if ((*caption != '\0') && (image->rows != 0) &&
+  if (((image->columns != 0) || (image->rows != 0)) &&
       (image_info->pointsize == 0.0))
     {
       char
@@ -168,11 +168,46 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
       /*
         Auto fit text into bounding box.
       */
+      status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
+      if (image->columns == 0)
+        {
+          for ( ; ; draw_info->pointsize*=2.0)
+          {
+            (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
+              -metrics.bounds.x1,metrics.ascent);
+            if (draw_info->gravity == UndefinedGravity)
+              (void) CloneString(&draw_info->geometry,geometry);
+            status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
+            (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 (height > image->rows)
+              break;
+          }
+          image->columns=width;
+        }
+      if (image->rows == 0)
+        {
+          for ( ; ; draw_info->pointsize*=2.0)
+          {
+            (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
+              -metrics.bounds.x1,metrics.ascent);
+            if (draw_info->gravity == UndefinedGravity)
+              (void) CloneString(&draw_info->geometry,geometry);
+            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)
+              break;
+          }
+          image->rows=height;
+        }
       for ( ; ; draw_info->pointsize*=2.0)
       {
         text=AcquireString(caption);
         i=FormatMagickCaption(image,draw_info,MagickTrue,&metrics,&text,
           exception);
+        (void) i;
         (void) CloneString(&draw_info->text,text);
         text=DestroyString(text);
         (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
@@ -180,7 +215,6 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
         if (draw_info->gravity == UndefinedGravity)
           (void) CloneString(&draw_info->geometry,geometry);
         status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
-        (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))
@@ -209,7 +243,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
         else
           high=draw_info->pointsize-1.0;
       }
-      for (draw_info->pointsize=(low+high)/2.0; ; draw_info->pointsize--)
+      for (draw_info->pointsize=(low+high)/2.0; (high-low) > 1.0; )
       {
         text=AcquireString(caption);
         i=FormatMagickCaption(image,draw_info,MagickTrue,&metrics,&text,
@@ -225,16 +259,10 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
         height=(size_t) floor(metrics.height+draw_info->stroke_width+0.5);
         if ((width <= image->columns) && (height <= image->rows))
           break;
+        draw_info->pointsize--;
       }
       draw_info->pointsize=floor(draw_info->pointsize+0.5);
     }
-  i=FormatMagickCaption(image,draw_info,MagickTrue,&metrics,&caption,exception);
-  if (image->rows == 0)
-    image->rows=(size_t) ((i+1)*(metrics.ascent-metrics.descent+
-      draw_info->interline_spacing+draw_info->stroke_width)+0.5);
-  if (image->rows == 0)
-    image->rows=(size_t) ((i+1)*draw_info->pointsize+
-      draw_info->interline_spacing+draw_info->stroke_width+0.5);
   if (SetImageBackgroundColor(image,exception) == MagickFalse)
     {
       image=DestroyImageList(image);

diff --git a/coders/label.c b/coders/label.c
index cfa84703c619697f305ad006cb59793fc4c8f46d..3df2cab71e8f7b85048b2a6d4cf644f67cec7777 100644 (file)
--- a/coders/label.c
+++ b/coders/label.c
@@ -130,7 +130,8 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
   label=GetImageProperty(image,"label",exception);
   draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL);
   draw_info->text=ConstantString(label);
-  if ((*label != '\0') && (image->rows != 0) && (image_info->pointsize == 0.0))
+  if (((image->columns != 0) || (image->rows != 0)) &&
+      (image_info->pointsize == 0.0))
     {
       double
         high,
@@ -140,6 +141,39 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
         Auto fit text into bounding box.
       */
       status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
+      if (image->columns == 0)
+        {
+          for ( ; ; draw_info->pointsize*=2.0)
+          {
+            (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
+              -metrics.bounds.x1,metrics.ascent);
+            if (draw_info->gravity == UndefinedGravity)
+              (void) CloneString(&draw_info->geometry,geometry);
+            status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
+            (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 (height > image->rows)
+              break;
+          }
+          image->columns=width;
+        }
+      if (image->rows == 0)
+        {
+          for ( ; ; draw_info->pointsize*=2.0)
+          {
+            (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
+              -metrics.bounds.x1,metrics.ascent);
+            if (draw_info->gravity == UndefinedGravity)
+              (void) CloneString(&draw_info->geometry,geometry);
+            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)
+              break;
+          }
+          image->rows=height;
+        }
       for ( ; ; draw_info->pointsize*=2.0)
       {
         (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
@@ -147,7 +181,6 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
         if (draw_info->gravity == UndefinedGravity)
           (void) CloneString(&draw_info->geometry,geometry);
         status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
-        (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))
@@ -156,8 +189,7 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
           break;
       }
       high=draw_info->pointsize/2.0;
-      low=high/2.0;
-      while ((high-low) > 1.0)
+      for (low=high/2.0; (high-low) > 1.0; )
       {
         draw_info->pointsize=(low+high)/2.0;
         (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
@@ -193,10 +225,6 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
       image=DestroyImageList(image);
       return((Image *) NULL);
     }
-  if (image->columns == 0)
-    image->columns=(size_t) (metrics.width+draw_info->stroke_width+1.5);
-  if (image->columns == 0)
-    image->columns=(size_t) (draw_info->pointsize+draw_info->stroke_width+1.5);
   if (draw_info->gravity == UndefinedGravity)
     {
       (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
@@ -212,11 +240,6 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
           metrics.ascent+draw_info->stroke_width/2.0);
       (void) CloneString(&draw_info->geometry,geometry);
     }
-  if (image->rows == 0)
-    image->rows=(size_t) floor(metrics.height+draw_info->stroke_width+0.5);
-  if (image->rows == 0)
-    image->rows=(size_t) floor(draw_info->pointsize+draw_info->stroke_width+
-      0.5);
   if (SetImageBackgroundColor(image,exception) == MagickFalse)
     {
       image=DestroyImageList(image);