From 40a08ad68a54b58140fc1b1f75df52d40c5cd5b3 Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 9 Feb 2010 02:27:44 +0000
Subject: [PATCH]

---
 magick/animate.c |  8 ++++----
 magick/blob.c    |  4 +---
 magick/display.c | 10 +++++-----
 magick/draw.c    |  6 +++---
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/magick/animate.c b/magick/animate.c
index becb5d3e9..b889473fb 100644
--- a/magick/animate.c
+++ b/magick/animate.c
@@ -484,7 +484,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info,
       *state&=(~AutoReverseAnimationState);
       GetPathComponent((*image)->magick_filename,BasePath,basename);
       (void) FormatMagickString(windows->image.name,MaxTextExtent,
-        "ImageMagick: %s",basename);
+        "%s: %s",MagickPackageName,basename);
       if (resource_info->title != (char *) NULL)
         {
           char
@@ -1654,7 +1654,7 @@ MagickExport Image *XAnimateImages(Display *display,
       */
       GetPathComponent(display_image->magick_filename,TailPath,filename);
       (void) FormatMagickString(windows->image.name,MaxTextExtent,
-        "ImageMagick: %s[%lu of %lu]",filename,display_image->scene,
+        "%s: %s[%lu of %lu]",MagickPackageName,filename,display_image->scene,
         number_scenes);
       (void) CopyMagickString(windows->image.icon_name,filename,MaxTextExtent);
     }
@@ -1970,7 +1970,7 @@ MagickExport Image *XAnimateImages(Display *display,
         while ((p > image_list[scene]->magick_filename) && (*(p-1) != '/'))
           p--;
         (void) FormatMagickString(windows->image.name,MaxTextExtent,
-          "ImageMagick: %s[%lu of %lu]",p,scene+1,number_scenes);
+          "%s: %s[%lu of %lu]",MagickPackageName,p,scene+1,number_scenes);
       }
     status=XStringListToTextProperty(&windows->image.name,1,&window_name);
     if (status != Success)
@@ -2101,7 +2101,7 @@ MagickExport Image *XAnimateImages(Display *display,
               while ((p > image_list[scene]->filename) && (*(p-1) != '/'))
                 p--;
               (void) FormatMagickString(windows->image.name,MaxTextExtent,
-                "ImageMagick: %s[%lu of %lu]",p,scene+1,number_scenes);
+                "%s: %s[%lu of %lu]",MagickPackageName,p,scene+1,number_scenes);
               if (resource_info->title != (char *) NULL)
                 {
                   char
diff --git a/magick/blob.c b/magick/blob.c
index 23b0a00de..e96ebd7ec 100644
--- a/magick/blob.c
+++ b/magick/blob.c
@@ -2325,9 +2325,7 @@ MagickExport MagickBooleanType OpenBlob(const ImageInfo *image_info,
   if (*type == 'w')
     {
       (void) CopyMagickString(filename,image->filename,MaxTextExtent);
-      if ((image_info->adjoin == MagickFalse) &&
-          ((GetPreviousImageInList(image) != (Image *) NULL) ||
-           (GetNextImageInList(image) != (Image *) NULL)))
+      if (image_info->adjoin == MagickFalse)
         {
           /*
             Form filename for multi-part images.
diff --git a/magick/display.c b/magick/display.c
index 6b8c9d8ba..c681e6abc 100644
--- a/magick/display.c
+++ b/magick/display.c
@@ -3504,8 +3504,8 @@ static MagickBooleanType XColorEditImage(Display *display,
               break;
             if (entry != 5)
               {
-                (*image)->fuzz=SiPrefixToDouble(FuzzMenu[entry],1.0*QuantumRange+
-                  1.0);
+                (*image)->fuzz=SiPrefixToDouble(FuzzMenu[entry],1.0*
+                  QuantumRange+1.0);
                 break;
               }
             (void) (void) CopyMagickString(fuzz,"20%",MaxTextExtent);
@@ -14491,10 +14491,10 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info,
       GetPathComponent(display_image->magick_filename,TailPath,filename);
       if (GetImageListLength(display_image) == 1)
         (void) FormatMagickString(windows->image.name,MaxTextExtent,
-          "ImageMagick: %s",filename);
+          "%s: %s",MagickPackageName,filename);
       else
         (void) FormatMagickString(windows->image.name,MaxTextExtent,
-          "ImageMagick: %s[%lu of %lu]",filename,display_image->scene,
+          "%s: %s[%lu of %lu]",MagickPackageName,filename,display_image->scene,
           GetImageListLength(display_image));
       (void) CopyMagickString(windows->image.icon_name,filename,MaxTextExtent);
     }
@@ -14526,7 +14526,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info,
       */
       windows->backdrop.x=0;
       windows->backdrop.y=0;
-      (void) CloneString(&windows->backdrop.name,"ImageMagick Backdrop");
+      (void) CloneString(&windows->backdrop.name,"Backdrop");
       windows->backdrop.flags=(unsigned long) (USSize | USPosition);
       windows->backdrop.width=(unsigned int)
         XDisplayWidth(display,visual_info->screen);
diff --git a/magick/draw.c b/magick/draw.c
index 6f3784d4a..1b0e5dc00 100644
--- a/magick/draw.c
+++ b/magick/draw.c
@@ -2865,7 +2865,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
           *t;
 
         GetMagickToken(q,&q,token);
-        k=1;
+        length=1;
         t=token;
         for (s=token; *s != '\0'; s=t)
         {
@@ -2878,9 +2878,9 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
               t++;
               continue;
             }
-          k++;
+          length++;
         }
-        length+=k*BezierQuantum;
+        length=3*length/2+6*BezierQuantum+360+1;
         break;
       }
       case CirclePrimitive:
-- 
2.40.0