From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 3 Jun 2010 01:10:47 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~9321
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d8abbae64da926477182d86d5007bc2c5a8b979;p=imagemagick

---

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index b960b8cf4..c4ef7bd76 100644
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -4355,7 +4355,7 @@ Get(ref,...)
                 break;
               page=GetImageBoundingBox(image,&image->exception);
               (void) FormatMagickString(geometry,MaxTextExtent,
-                "%.20gx%.20g%+.20gx%+.20g",(double) page.width,(double)
+                "%.20gx%.20g%+.20g%+.20g",(double) page.width,(double)
                 page.height,(double) page.x,(double) page.y);
               s=newSVpv(geometry,0);
               PUSHs(s ? sv_2mortal(s) : &sv_undef);
@@ -5017,7 +5017,7 @@ Get(ref,...)
                     geometry[MaxTextExtent];
 
                   (void) FormatMagickString(geometry,MaxTextExtent,
-                    "%.20gx%.20g%+.20gx%+.20g",(double) image->page.width,
+                    "%.20gx%.20g%+.20g%+.20g",(double) image->page.width,
                     (double) image->page.height,(double) image->page.x,(double)
                     image->page.y);
                   s=newSVpv(geometry,0);
@@ -8310,7 +8310,7 @@ Mogrify(ref,...)
             Composite two images (normal composition).
           */
           (void) FormatMagickString(composite_geometry,MaxTextExtent,
-            "%.20gx%.20g%+.20gx%+.20g",(double) composite_image->columns,
+            "%.20gx%.20g%+.20g%+.20g",(double) composite_image->columns,
             (double) composite_image->rows,(double) geometry.x,(double)
             geometry.y);
           flags=ParseGravityGeometry(image,composite_geometry,&geometry,
diff --git a/coders/ps.c b/coders/ps.c
index 86cc859a8..6e11c933c 100644
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -1431,7 +1431,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
     else
       if ((image->page.width != 0) && (image->page.height != 0))
         (void) FormatMagickString(page_geometry,MaxTextExtent,
-          "%.20gx%.20g%+.20gx%+.20g",(double) image->page.width,(double)
+          "%.20gx%.20g%+.20g%+.20g",(double) image->page.width,(double)
           image->page.height,(double) image->page.x,(double) image->page.y);
       else
         if ((image->gravity != UndefinedGravity) &&
diff --git a/magick/annotate.c b/magick/annotate.c
index 2a3590251..3cdc30035 100644
--- a/magick/annotate.c
+++ b/magick/annotate.c
@@ -1665,7 +1665,7 @@ static MagickBooleanType RenderPostscript(Image *image,
       crop_info.y=(ssize_t) ceil((resolution.y/DefaultResolution)*extent.y/8.0-
         0.5);
       (void) FormatMagickString(geometry,MaxTextExtent,
-        "%.20gx%.20g%+.20gx%+.20g",(double) crop_info.width,(double)
+        "%.20gx%.20g%+.20g%+.20g",(double) crop_info.width,(double)
         crop_info.height,(double) crop_info.x,(double) crop_info.y);
       (void) TransformImage(&annotate_image,geometry,(char *) NULL);
     }
@@ -1957,7 +1957,7 @@ static MagickBooleanType RenderX11(Image *image,const DrawInfo *draw_info,
           atan2(draw_info->affine.rx,draw_info->affine.sx);
     }
   (void) FormatMagickString(annotate_info.geometry,MaxTextExtent,
-    "%.20gx%.20g%+.20gx%+.20g",(double) width,(double) height,
+    "%.20gx%.20g%+.20g%+.20g",(double) width,(double) height,
     ceil(offset->x-0.5),ceil(offset->y-metrics->ascent-metrics->descent+
     draw_info->interline_spacing-0.5));
   pixel.pen_color.red=ScaleQuantumToShort(draw_info->fill.red);
diff --git a/magick/cache.c b/magick/cache.c
index 71107803e..2bc53fc21 100644
--- a/magick/cache.c
+++ b/magick/cache.c
@@ -4734,7 +4734,7 @@ static MagickBooleanType ReadPixelCacheIndexes(CacheInfo *cache_info,
   if ((cache_info->debug != MagickFalse) &&
       (QuantumTick((MagickOffsetType) nexus_info->region.y,cache_info->rows) != MagickFalse))
     (void) LogMagickEvent(CacheEvent,GetMagickModule(),
-      "%s[%.20gx%.20g%+.20gx%+.20g]",cache_info->filename,(double)
+      "%s[%.20gx%.20g%+.20g%+.20g]",cache_info->filename,(double)
       nexus_info->region.width,(double) nexus_info->region.height,(double)
       nexus_info->region.x,(double) nexus_info->region.y);
   return(MagickTrue);
@@ -4865,7 +4865,7 @@ static MagickBooleanType ReadPixelCachePixels(CacheInfo *cache_info,
   if ((cache_info->debug != MagickFalse) &&
       (QuantumTick((MagickOffsetType) nexus_info->region.y,cache_info->rows) != MagickFalse))
     (void) LogMagickEvent(CacheEvent,GetMagickModule(),
-      "%s[%.20gx%.20g%+.20gx%+.20g]",cache_info->filename,(double)
+      "%s[%.20gx%.20g%+.20g%+.20g]",cache_info->filename,(double)
       nexus_info->region.width,(double) nexus_info->region.height,(double)
       nexus_info->region.x,(double) nexus_info->region.y);
   return(MagickTrue);
@@ -5450,7 +5450,7 @@ static MagickBooleanType WritePixelCacheIndexes(CacheInfo *cache_info,
   if ((cache_info->debug != MagickFalse) &&
       (QuantumTick((MagickOffsetType) nexus_info->region.y,cache_info->rows) != MagickFalse))
     (void) LogMagickEvent(CacheEvent,GetMagickModule(),
-      "%s[%.20gx%.20g%+.20gx%+.20g]",cache_info->filename,(double)
+      "%s[%.20gx%.20g%+.20g%+.20g]",cache_info->filename,(double)
       nexus_info->region.width,(double) nexus_info->region.height,(double)
       nexus_info->region.x,(double) nexus_info->region.y);
   return(MagickTrue);
@@ -5581,7 +5581,7 @@ static MagickBooleanType WritePixelCachePixels(CacheInfo *cache_info,
   if ((cache_info->debug != MagickFalse) &&
       (QuantumTick((MagickOffsetType) nexus_info->region.y,cache_info->rows) != MagickFalse))
     (void) LogMagickEvent(CacheEvent,GetMagickModule(),
-      "%s[%.20gx%.20g%+.20gx%+.20g]",cache_info->filename,(double)
+      "%s[%.20gx%.20g%+.20g%+.20g]",cache_info->filename,(double)
       nexus_info->region.width,(double) nexus_info->region.height,(double)
       nexus_info->region.x,(double) nexus_info->region.y);
   return(MagickTrue);
diff --git a/magick/display.c b/magick/display.c
index 7a5df6139..58b6bb6ee 100644
--- a/magick/display.c
+++ b/magick/display.c
@@ -3081,7 +3081,7 @@ static MagickBooleanType XChopImage(Display *display,
         if (windows->info.mapped == MagickFalse)
           (void) XMapWindow(display,windows->info.id);
         (void) FormatMagickString(text,MaxTextExtent,
-          " %.20gx%.20g%+.20gx%+.20g",(double) chop_info.width,(double)
+          " %.20gx%.20g%+.20g%+.20g",(double) chop_info.width,(double)
           chop_info.height,(double) chop_info.x,(double) chop_info.y);
         XInfoWidget(display,windows,text);
         XHighlightLine(display,windows->image.id,
@@ -4826,7 +4826,7 @@ static MagickBooleanType XCropImage(Display *display,
           if (windows->info.mapped == MagickFalse)
             (void) XMapWindow(display,windows->info.id);
           (void) FormatMagickString(text,MaxTextExtent,
-            " %.20gx%.20g%+.20gx%+.20g",(double) crop_info.width,(double)
+            " %.20gx%.20g%+.20g%+.20g",(double) crop_info.width,(double)
             crop_info.height,(double) crop_info.x,(double) crop_info.y);
           XInfoWidget(display,windows,text);
           XHighlightRectangle(display,windows->image.id,
@@ -4919,7 +4919,7 @@ static MagickBooleanType XCropImage(Display *display,
             Display pointer position.
           */
           (void) FormatMagickString(text,MaxTextExtent,
-            " %.20gx%.20g%+.20gx%+.20g",(double) crop_info.width,(double)
+            " %.20gx%.20g%+.20g%+.20g",(double) crop_info.width,(double)
             crop_info.height,(double) crop_info.x,(double) crop_info.y);
           XInfoWidget(display,windows,text);
         }
@@ -5203,7 +5203,7 @@ static MagickBooleanType XCropImage(Display *display,
             Set primary selection.
           */
           (void) FormatMagickString(text,MaxTextExtent,
-            "%.20gx%.20g%+.20gx%+.20g",(double) crop_info.width,(double)
+            "%.20gx%.20g%+.20g%+.20g",(double) crop_info.width,(double)
             crop_info.height,(double) crop_info.x,(double) crop_info.y);
           request=(&(event.xselectionrequest));
           (void) XChangeProperty(request->display,request->requestor,
@@ -5908,7 +5908,7 @@ static MagickBooleanType XDrawEditImage(Display *display,
                 Display info and draw drawing rectangle.
               */
               (void) FormatMagickString(text,MaxTextExtent,
-                " %.20gx%.20g%+.20gx%+.20g",(double) rectangle_info.width,
+                " %.20gx%.20g%+.20g%+.20g",(double) rectangle_info.width,
                 (double) rectangle_info.height,(double) rectangle_info.x,
                 (double) rectangle_info.y);
               XInfoWidget(display,windows,text);
@@ -5932,7 +5932,7 @@ static MagickBooleanType XDrawEditImage(Display *display,
                 Display info and draw drawing rectangle.
               */
               (void) FormatMagickString(text,MaxTextExtent,
-                " %.20gx%.20g%+.20gx%+.20g",(double) rectangle_info.width,
+                " %.20gx%.20g%+.20g%+.20g",(double) rectangle_info.width,
                 (double) rectangle_info.height,(double) rectangle_info.x,
                 (double) rectangle_info.y);
               XInfoWidget(display,windows,text);
@@ -11322,7 +11322,7 @@ static MagickBooleanType XROIImage(Display *display,
           if (windows->info.mapped == MagickFalse)
             (void) XMapWindow(display,windows->info.id);
           (void) FormatMagickString(text,MaxTextExtent,
-            " %.20gx%.20g%+.20gx%+.20g",(double) roi_info.width,(double)
+            " %.20gx%.20g%+.20g%+.20g",(double) roi_info.width,(double)
             roi_info.height,(double) roi_info.x,(double) roi_info.y);
           XInfoWidget(display,windows,text);
           XHighlightRectangle(display,windows->image.id,
@@ -11418,7 +11418,7 @@ static MagickBooleanType XROIImage(Display *display,
             Display pointer position.
           */
           (void) FormatMagickString(text,MaxTextExtent,
-            " %.20gx%.20g%+.20gx%+.20g",(double) roi_info.width,(double)
+            " %.20gx%.20g%+.20g%+.20g",(double) roi_info.width,(double)
             roi_info.height,(double) roi_info.x,(double) roi_info.y);
           XInfoWidget(display,windows,text);
         }
@@ -11758,7 +11758,7 @@ static MagickBooleanType XROIImage(Display *display,
             Set primary selection.
           */
           (void) FormatMagickString(text,MaxTextExtent,
-            "%.20gx%.20g%+.20gx%+.20g",(double) roi_info.width,(double)
+            "%.20gx%.20g%+.20g%+.20g",(double) roi_info.width,(double)
             roi_info.height,(double) roi_info.x,(double) roi_info.y);
           request=(&(event.xselectionrequest));
           (void) XChangeProperty(request->display,request->requestor,
@@ -12779,7 +12779,7 @@ static void XSetCropGeometry(Display *display,XWindows *windows,
       /*
         Display info on cropping rectangle.
       */
-      (void) FormatMagickString(text,MaxTextExtent," %.20gx%.20g%+.20gx%+.20g",
+      (void) FormatMagickString(text,MaxTextExtent," %.20gx%.20g%+.20g%+.20g",
         (double) crop_info->width,(double) crop_info->height,(double)
         crop_info->x,(double) crop_info->y);
       XInfoWidget(display,windows,text);
diff --git a/magick/draw.c b/magick/draw.c
index 26fd3efd6..6732c334d 100644
--- a/magick/draw.c
+++ b/magick/draw.c
@@ -2422,7 +2422,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
                 (void) SetImageArtifact(image,key,token);
                 (void) FormatMagickString(key,MaxTextExtent,"%s-geometry",name);
                 (void) FormatMagickString(geometry,MaxTextExtent,
-                  "%.20gx%.20g%+.20gx%+.20g",(double) bounds.width,(double)
+                  "%.20gx%.20g%+.20g%+.20g",(double) bounds.width,(double)
                   bounds.height,(double) bounds.x,(double) bounds.y);
                 (void) SetImageArtifact(image,key,geometry);
                 GetMagickToken(q,&q,token);
@@ -4481,7 +4481,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
       geometry.x=x;
       geometry.y=y;
       (void) FormatMagickString(composite_geometry,MaxTextExtent,
-        "%.20gx%.20g%+.20gx%+.20g",(double) composite_image->columns,(double)
+        "%.20gx%.20g%+.20g%+.20g",(double) composite_image->columns,(double)
         composite_image->rows,(double) geometry.x,(double) geometry.y);
       (void) ParseGravityGeometry(image,composite_geometry,&geometry,
         &image->exception);
diff --git a/magick/effect.c b/magick/effect.c
index 56d86d7a6..755a42cd1 100644
--- a/magick/effect.c
+++ b/magick/effect.c
@@ -3700,7 +3700,7 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview,
         geometry.y=i/2;
         (void) RaiseImage(preview_image,&geometry,MagickTrue);
         (void) FormatMagickString(label,MaxTextExtent,
-          "raise %.20gx%.20g%+.20gx%+.20g",(double) geometry.width,(double)
+          "raise %.20gx%.20g%+.20g%+.20g",(double) geometry.width,(double)
           geometry.height,(double) geometry.x,(double) geometry.y);
         break;
       }
diff --git a/magick/identify.c b/magick/identify.c
index dcbbbccc8..7fdbf9684 100644
--- a/magick/identify.c
+++ b/magick/identify.c
@@ -332,7 +332,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
         image->rows);
       if ((image->page.width != 0) || (image->page.height != 0) ||
           (image->page.x != 0) || (image->page.y != 0))
-        (void) fprintf(file,"%.20gx%.20g%+.20gx%+.20g ",(double)
+        (void) fprintf(file,"%.20gx%.20g%+.20g%+.20g ",(double)
           image->page.width,(double) image->page.height,(double) image->page.x,
           (double) image->page.y);
       (void) fprintf(file,"%.20g-bit ",(double) image->depth);
@@ -399,7 +399,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
       GetMagickDescription(magick_info));
   (void) fprintf(file,"  Class: %s\n",MagickOptionToMnemonic(MagickClassOptions,
     (ssize_t) image->storage_class));
-  (void) fprintf(file,"  Geometry: %.20gx%.20g%+.20gx%+.20g\n",(double)
+  (void) fprintf(file,"  Geometry: %.20gx%.20g%+.20g%+.20g\n",(double)
     image->columns,(double) image->rows,(double) image->tile_offset.x,(double)
     image->tile_offset.y);
   if ((image->magick_columns != 0) || (image->magick_rows != 0))
@@ -716,7 +716,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
         image->chromaticity.white_point.x,image->chromaticity.white_point.y);
     }
   if ((image->extract_info.width*image->extract_info.height) != 0)
-    (void) fprintf(file,"  Tile geometry: %.20gx%.20g%+.20gx%+.20g\n",(double)
+    (void) fprintf(file,"  Tile geometry: %.20gx%.20g%+.20g%+.20g\n",(double)
       image->extract_info.width,(double) image->extract_info.height,(double)
       image->extract_info.x,(double) image->extract_info.y);
   (void) fprintf(file,"  Interlace: %s\n",MagickOptionToMnemonic(
@@ -737,7 +737,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
     MagickComposeOptions,(ssize_t) image->compose));
   if ((image->page.width != 0) || (image->page.height != 0) ||
       (image->page.x != 0) || (image->page.y != 0))
-    (void) fprintf(file,"  Page geometry: %.20gx%.20g%+.20gx%+.20g\n",(double)
+    (void) fprintf(file,"  Page geometry: %.20gx%.20g%+.20g%+.20g\n",(double)
       image->page.width,(double) image->page.height,(double)
       image->page.x,(double) image->page.y);
   if ((image->page.x != 0) || (image->page.y != 0))
diff --git a/magick/layer.c b/magick/layer.c
index 79a8d540f..765691e25 100644
--- a/magick/layer.c
+++ b/magick/layer.c
@@ -1263,7 +1263,7 @@ static Image *OptimizeLayerFrames(const Image *image,
   while ( next != (const Image *) NULL )
   {
 #if 0 /*  For debuging */
-    printf("image %.20g :- %.20g  %.20gx%.20g%+.20gx%+.20g\n", (double) i,
+    printf("image %.20g :- %.20g  %.20gx%.20g%+.20g%+.20g\n", (double) i,
       (double) disposals[i],(double) bounds[i].width,(double)
       bounds[i].height,(double) bounds[i].x,(double) bounds[i].y );
 #endif
diff --git a/magick/montage.c b/magick/montage.c
index de5d11cba..7b5f8ca6d 100644
--- a/magick/montage.c
+++ b/magick/montage.c
@@ -661,7 +661,7 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
         &sans,&sans);
     y_offset+=(ssize_t) title_offset;
     (void) FormatMagickString(montage->montage,MaxTextExtent,
-      "%.20gx%.20g%+.20gx%+.20g",(double) (extract_info.width+
+      "%.20gx%.20g%+.20g%+.20g",(double) (extract_info.width+
       (extract_info.x+border_width)*2),(double) (extract_info.height+
       (extract_info.y+border_width)*2+(double) ((metrics.ascent-
       metrics.descent+4)*number_lines+(montage_info->shadow != MagickFalse ? 4 :
@@ -698,7 +698,7 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
         clone_info->pointsize*=2.0;
         (void) GetTypeMetrics(image_list[0],clone_info,&metrics);
         (void) FormatMagickString(geometry,MaxTextExtent,
-          "%.20gx%.20g%+.20gx%+.20g",(double) montage->columns,(double)
+          "%.20gx%.20g%+.20g%+.20g",(double) montage->columns,(double)
           (metrics.ascent-metrics.descent),0.0,(double) extract_info.y+4);
         (void) CloneString(&clone_info->geometry,geometry);
         (void) CloneString(&clone_info->text,title);
@@ -834,7 +834,7 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
                 Annotate composite tile with label.
               */
               (void) FormatMagickString(geometry,MaxTextExtent,
-                "%.20gx%.20g%+.20gx%+.20g",(double) ((montage_info->frame ?
+                "%.20gx%.20g%+.20g%+.20g",(double) ((montage_info->frame ?
                 image->columns : width)-2*border_width),(double)
                 (metrics.ascent-metrics.descent+4)*MultilineCensus(value),
                 (double) (x_offset+border_width),(double)
diff --git a/magick/property.c b/magick/property.c
index 646ed5813..b8221ab15 100644
--- a/magick/property.c
+++ b/magick/property.c
@@ -2704,7 +2704,7 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info,
         /*
           Image geometry.
         */
-        q+=FormatMagickString(q,extent,"%.20gx%.20g%+.20gx%+.20g",(double)
+        q+=FormatMagickString(q,extent,"%.20gx%.20g%+.20g%+.20g",(double)
           image->page.width,(double) image->page.height,(double)
           image->page.x,(double) image->page.y);
         break;
@@ -3111,7 +3111,7 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info,
           Image bounding box.
         */
         page=GetImageBoundingBox(image,&image->exception);
-        q+=FormatMagickString(q,MaxTextExtent,"%.20gx%.20g%+.20gx%+.20g",
+        q+=FormatMagickString(q,MaxTextExtent,"%.20gx%.20g%+.20g%+.20g",
           (double) page.width,(double) page.height,(double) page.x,(double)
           page.y);
         break;
diff --git a/magick/shear.c b/magick/shear.c
index 06fdc4ddc..1c7ab338e 100644
--- a/magick/shear.c
+++ b/magick/shear.c
@@ -978,7 +978,7 @@ MagickExport Image *DeskewImage(const Image *image,const double threshold,
   median_image=DestroyImage(median_image);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TransformEvent,GetMagickModule(),"  Deskew geometry: "
-      "%.20gx%.20g%+.20gx%+.20g",(double) geometry.width,(double)
+      "%.20gx%.20g%+.20g%+.20g",(double) geometry.width,(double)
       geometry.height,(double) geometry.x,(double) geometry.y);
   crop_image=CropImage(deskew_image,&geometry,exception);
   deskew_image=DestroyImage(deskew_image);
diff --git a/wand/drawing-wand.c b/wand/drawing-wand.c
index 8eaa06fcf..6b3de56a5 100644
--- a/wand/drawing-wand.c
+++ b/wand/drawing-wand.c
@@ -4027,7 +4027,7 @@ WandExport MagickBooleanType DrawPopPattern(DrawingWand *wand)
     }
   (void) FormatMagickString(key,MaxTextExtent,"%s",wand->pattern_id);
   (void) SetImageArtifact(wand->image,key,wand->mvg+wand->pattern_offset);
-  (void) FormatMagickString(geometry,MaxTextExtent,"%.20gx%.20g%+.20gx%+.20g",
+  (void) FormatMagickString(geometry,MaxTextExtent,"%.20gx%.20g%+.20g%+.20g",
     (double) wand->pattern_bounds.width,(double) wand->pattern_bounds.height,
     (double) wand->pattern_bounds.x,(double) wand->pattern_bounds.y);
   (void) SetImageArtifact(wand->image,key,geometry);
diff --git a/wand/magick-property.c b/wand/magick-property.c
index b6d79f348..506852530 100644
--- a/wand/magick-property.c
+++ b/wand/magick-property.c
@@ -2503,7 +2503,7 @@ WandExport MagickBooleanType MagickSetPage(MagickWand *wand,
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  (void) FormatMagickString(geometry,MaxTextExtent,"%.20gx%.20g%+.20gx%+.20g",
+  (void) FormatMagickString(geometry,MaxTextExtent,"%.20gx%.20g%+.20g%+.20g",
     (double) width,(double) height,(double) x,(double) y);
   (void) CloneString(&wand->image_info->page,geometry);
   return(MagickTrue);