From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 7 Feb 2013 01:24:54 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4280
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8592b059b2b4f03c0280b0e1146b225207e624f8;p=imagemagick

---

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index fb769fe72..17db95c12 100644
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -1768,7 +1768,7 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand,
 
           SetGeometryInfo(&geometry_info);
           flags=ParseGeometry(arg1,&geometry_info);
-          if ((flags & RhoValue) == 0)
+          if (flags == 0)
             CLIWandExceptArgBreak(OptionError,"InvalidArgument",option,arg1);
           if ((flags & SigmaValue) == 0)
             geometry_info.sigma=geometry_info.rho;
diff --git a/coders/caption.c b/coders/caption.c
index 7a3443fa9..8574aaf33 100644
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -168,7 +168,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
       /*
         Auto fit text into bounding box.
       */
-      for ( ; ; )
+      for ( ; ; draw_info->pointsize*=2.0)
       {
         text=AcquireString(caption);
         i=FormatMagickCaption(image,draw_info,MagickTrue,&metrics,&text,
@@ -185,11 +185,9 @@ 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*=2.0;
       }
       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;
         text=AcquireString(caption);
@@ -209,7 +207,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
         else
           high=draw_info->pointsize-1.0;
       }
-      for (draw_info->pointsize=(low+high)/2.0; (high-low) > 1.0; )
+      for (draw_info->pointsize=(low+high)/2.0; ; draw_info->pointsize--)
       {
         text=AcquireString(caption);
         i=FormatMagickCaption(image,draw_info,MagickTrue,&metrics,&text,
@@ -225,7 +223,6 @@ 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);
     }
diff --git a/coders/pango.c b/coders/pango.c
index 1018e9cf2..e4e1cb237 100644
--- a/coders/pango.c
+++ b/coders/pango.c
@@ -350,7 +350,7 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
     (void) ParseAbsoluteGeometry(image_info->page,&page);
   if (image->columns == 0)
     {
-      pango_layout_get_pixel_extents(layout,NULL,&extent);
+      pango_layout_get_extents(layout,NULL,&extent);
       image->columns=(extent.x+extent.width+PANGO_SCALE/2)/PANGO_SCALE+2*page.x;
     }
   else
@@ -362,7 +362,7 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
     }
   if (image->rows == 0)
     {
-      pango_layout_get_pixel_extents(layout,NULL,&extent);
+      pango_layout_get_extents(layout,NULL,&extent);
       image->rows=(extent.y+extent.height+PANGO_SCALE/2)/PANGO_SCALE+2*page.y;
     }
   else