(no commit message)

diff --git a/coders/dcm.c b/coders/dcm.c
index 906d818351d8a707e61f2c375e348916e312208c..265c2feee1340843f19f3984e38cfb4cffafacc4 100644 (file)
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -3101,8 +3101,8 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
               (void) CopyMagickString(transfer_syntax,(char *) data,
                 MaxTextExtent);
             if (image_info->verbose != MagickFalse)
-              (void) FormatLocaleFile(stdout,"transfer_syntax=%s\n",(const char*)
-                transfer_syntax);
+              (void) FormatLocaleFile(stdout,"transfer_syntax=%s\n",
+                (const char*) transfer_syntax);
             if (strncmp(transfer_syntax,"1.2.840.10008.1.2",17) == 0)
               {
                 int

diff --git a/coders/pes.c b/coders/pes.c
index d62c7aa7cb8ffc60da18d9506f5eba9a585dc37b..0a76dec8322c578a7c961d7db9a3408a497a5968 100644 (file)
--- a/coders/pes.c
+++ b/coders/pes.c
@@ -635,8 +635,8 @@ static Image *ReadPESImage(const ImageInfo *image_info,ExceptionInfo *exception)
   for (i=0; i < (ssize_t) number_blocks; i++)
   {
     offset=blocks[i].offset;
-    (void) FormatLocaleFile(file,"  <path stroke=\"#%02x%02x%02x\" fill=\"none\" "
-      "d=\"M %g %g",blocks[i].color->red,blocks[i].color->green,
+    (void) FormatLocaleFile(file,"  <path stroke=\"#%02x%02x%02x\" "
+      "fill=\"none\" d=\"M %g %g",blocks[i].color->red,blocks[i].color->green,
       blocks[i].color->blue,stitches[offset].x-bounds.x1,
       stitches[offset].y-bounds.y1);
     for (j=1; j < (ssize_t) (blocks[i+1].offset-offset); j++)

diff --git a/coders/wpg.c b/coders/wpg.c
index 0d90e3a8b85d6c8697cce156b09d262114f15e60..ffd8fe8b5c6eff554f6c30272461becfb243d2d8 100644 (file)
--- a/coders/wpg.c
+++ b/coders/wpg.c
@@ -619,8 +619,9 @@ static int UnpackWPG2Raster(Image *image,int bpp)
             return(-2);
           break;
         case 0x7E:
-          (void) FormatLocaleFile(stderr,"\nUnsupported WPG token XOR, please report!");
-    XorMe=!XorMe;
+          (void) FormatLocaleFile(stderr,
+            "\nUnsupported WPG token XOR, please report!");
+          XorMe=!XorMe;
           break;
         case 0x7F:
           RunCount=ReadBlobByte(image);   /* BLK */
@@ -630,8 +631,8 @@ static int UnpackWPG2Raster(Image *image,int bpp)
             }
           break;
         case 0xFD:
-    RunCount=ReadBlobByte(image);   /* EXT */
-    for(i=0; i<= RunCount;i++)
+          RunCount=ReadBlobByte(image);   /* EXT */
+          for(i=0; i<= RunCount;i++)
             for(bbuf=0; bbuf < SampleSize; bbuf++)
               InsertByte6(SampleBuffer[bbuf]);          
           break;
@@ -640,8 +641,8 @@ static int UnpackWPG2Raster(Image *image,int bpp)
           if(x!=0)
             {
               (void) FormatLocaleFile(stderr,
-                             "\nUnsupported WPG2 unaligned token RST x=%.20g, please report!\n"
-                             ,(double) x);
+                "\nUnsupported WPG2 unaligned token RST x=%.20g, please report!\n"
+                ,(double) x);
               return(-3);
             }
           {

diff --git a/magick/annotate.c b/magick/annotate.c
index bb69d1959ca1367b391a39d99a745f58b26645fa..d3dea05c4b86a054ed7e204f744f3633083aa2cd 100644 (file)
--- a/magick/annotate.c
+++ b/magick/annotate.c
@@ -1668,14 +1668,16 @@ static MagickBooleanType RenderPostscript(Image *image,
     (void) FormatLocaleFile(file,
       "/Times-Roman-ISO dup /Times-Roman ReencodeType findfont setfont\n");
   else
-    (void) FormatLocaleFile(file,"/%s-ISO dup /%s ReencodeType findfont setfont\n",
-      draw_info->font,draw_info->font);
+    (void) FormatLocaleFile(file,
+      "/%s-ISO dup /%s ReencodeType findfont setfont\n",draw_info->font,
+      draw_info->font);
   (void) FormatLocaleFile(file,"[%g %g %g %g 0 0] concat\n",
     draw_info->affine.sx,-draw_info->affine.rx,-draw_info->affine.ry,
     draw_info->affine.sy);
   text=EscapeParenthesis(draw_info->text);
   if (identity == MagickFalse)
-    (void) FormatLocaleFile(file,"(%s) stringwidth pop -0.5 mul -0.5 rmoveto\n",text);
+    (void) FormatLocaleFile(file,"(%s) stringwidth pop -0.5 mul -0.5 rmoveto\n",
+      text);
   (void) FormatLocaleFile(file,"(%s) show\n",text);
   text=DestroyString(text);
   (void) FormatLocaleFile(file,"showpage\n");

diff --git a/magick/coder.c b/magick/coder.c
index 3d939a34f0da0883aa029c90ad7c59f2fdeba18c..7eb93c0d7ea06fb54b00790c187d621da2582699 100644 (file)
--- a/magick/coder.c
+++ b/magick/coder.c
@@ -602,7 +602,8 @@ MagickExport MagickBooleanType ListCoderInfo(FILE *file,
         if (coder_info[i]->path != (char *) NULL)
           (void) FormatLocaleFile(file,"\nPath: %s\n\n",coder_info[i]->path);
         (void) FormatLocaleFile(file,"Magick      Coder\n");
-        (void) FormatLocaleFile(file,"-------------------------------------------------"
+        (void) FormatLocaleFile(file,
+          "-------------------------------------------------"
           "------------------------------\n");
       }
     path=coder_info[i]->path;

diff --git a/magick/color.c b/magick/color.c
index a558696cd7b3d59abd6d366027bcef6eda6554c5..bd8eafb2ebdcfd824a391913f2c5ce17fd15c8a7 100644 (file)
--- a/magick/color.c
+++ b/magick/color.c
@@ -1984,9 +1984,11 @@ MagickExport MagickBooleanType ListColorInfo(FILE *file,
       {
         if (color_info[i]->path != (char *) NULL)
           (void) FormatLocaleFile(file,"\nPath: %s\n\n",color_info[i]->path);
-        (void) FormatLocaleFile(file,"Name                  Color                  "
+        (void) FormatLocaleFile(file,
+          "Name                  Color                  "
           "                       Compliance\n");
-        (void) FormatLocaleFile(file,"-------------------------------------------------"
+        (void) FormatLocaleFile(file,
+          "-------------------------------------------------"
           "------------------------------\n");
       }
     path=color_info[i]->path;

diff --git a/magick/configure.c b/magick/configure.c
index 460dce5f69beb7b7d8b1d3224876c815ae7479c5..b8a53ef2f3981256978af542a668293983e545b3 100644 (file)
--- a/magick/configure.c
+++ b/magick/configure.c
@@ -936,9 +936,11 @@ MagickExport MagickBooleanType ListConfigureInfo(FILE *file,
         (LocaleCompare(path,configure_info[i]->path) != 0))
       {
         if (configure_info[i]->path != (char *) NULL)
-          (void) FormatLocaleFile(file,"\nPath: %s\n\n",configure_info[i]->path);
+          (void) FormatLocaleFile(file,"\nPath: %s\n\n",
+            configure_info[i]->path);
         (void) FormatLocaleFile(file,"Name          Value\n");
-        (void) FormatLocaleFile(file,"-------------------------------------------------"
+        (void) FormatLocaleFile(file,
+          "-------------------------------------------------"
           "------------------------------\n");
       }
     path=configure_info[i]->path;

diff --git a/magick/delegate.c b/magick/delegate.c
index 6f8f606c0e0d10b00ccb81611a1df98fc6234c84..ec043982f1168c042e7671eff05a971890a2bd29 100644 (file)
--- a/magick/delegate.c
+++ b/magick/delegate.c
@@ -1136,7 +1136,8 @@ MagickExport MagickBooleanType ListDelegateInfo(FILE *file,
         if (delegate_info[i]->path != (char *) NULL)
           (void) FormatLocaleFile(file,"\nPath: %s\n\n",delegate_info[i]->path);
         (void) FormatLocaleFile(file,"Delegate                Command\n");
-        (void) FormatLocaleFile(file,"-------------------------------------------------"
+        (void) FormatLocaleFile(file,
+          "-------------------------------------------------"
           "------------------------------\n");
       }
     path=delegate_info[i]->path;

diff --git a/magick/deprecate.h b/magick/deprecate.h
index 59a53393f514c13428ec990c149e5874acb88788..bd69b897e7106310a501ebb2cd40a9033eec31f0 100644 (file)
--- a/magick/deprecate.h
+++ b/magick/deprecate.h
@@ -155,9 +155,9 @@ extern MagickExport int
 
 extern MagickExport ssize_t
   FormatMagickString(char *,const size_t,const char *,...)
-    magick_attribute((format (printf,3,4))),
+    magick_attribute((format (printf,3,4))) magick_attribute((deprecated)),
   FormatMagickStringList(char *,const size_t,const char *,va_list)
-    magick_attribute((format (printf,3,0))),
+    magick_attribute((format (printf,3,0))) magick_attribute((deprecated)),
   GetImageListIndex(const Image *) magick_attribute((deprecated)),
   SetMagickRegistry(const RegistryType,const void *,const size_t,
     ExceptionInfo *) magick_attribute((deprecated));

diff --git a/magick/distort.c b/magick/distort.c
index bd592874e9710a068c91f4f74dd1d7902b76eb23..9e09cbb1034cd5d1a77b77efcd9b83ac5ebca8d9 100644 (file)
--- a/magick/distort.c
+++ b/magick/distort.c
@@ -1853,7 +1853,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
         CoefficientsToAffineArgs(inverse);
         FormatLocaleFile(stderr, "Affine Projection:\n");
         FormatLocaleFile(stderr, "  -distort AffineProjection \\\n      '");
-        for (i=0; i<5; i++)
+        for (i=0; i < 5; i++)
           FormatLocaleFile(stderr, "%lf,", inverse[i]);
         FormatLocaleFile(stderr, "%lf'\n", inverse[5]);
         inverse = (double *) RelinquishMagickMemory(inverse);

diff --git a/magick/draw.c b/magick/draw.c
index db4cef864dd5c7e33077debd840738ce36c61112..0299fd2810eae98f0988d68673a5b3d3203d202c 100644 (file)
--- a/magick/draw.c
+++ b/magick/draw.c
@@ -5531,7 +5531,8 @@ static size_t TracePath(PrimitiveInfo *primitive_info,const char *path)
       default:
       {
         if (isalpha((int) ((unsigned char) attribute)) != 0)
-          (void) FormatLocaleFile(stderr,"attribute not recognized: %c\n",attribute);
+          (void) FormatLocaleFile(stderr,"attribute not recognized: %c\n",
+            attribute);
         break;
       }
     }

diff --git a/magick/fx.c b/magick/fx.c
index f186d35c2da5fde19d901cd0bd963cf4018921c4..da15f164abd9082fdc30cbf6ea9c7c8f8a9886fb 100644 (file)
--- a/magick/fx.c
+++ b/magick/fx.c
@@ -2451,9 +2451,10 @@ static MagickRealType FxEvaluateSubexpression(FxInfo *fx_info,
           if (strlen(subexpression) > 1)
             subexpression[strlen(subexpression)-1]='\0';
           if (fx_info->file != (FILE *) NULL)
-            (void) FormatLocaleFile(fx_info->file,"%s[%.20g,%.20g].%s: %s=%.*g\n",
-              fx_info->images->filename,(double) x,(double) y,type,
-              subexpression,GetMagickPrecision(),(double) alpha);
+            (void) FormatLocaleFile(fx_info->file,
+              "%s[%.20g,%.20g].%s: %s=%.*g\n",fx_info->images->filename,
+               (double) x,(double) y,type,subexpression,GetMagickPrecision(),
+               (double) alpha);
           return(0.0);
         }
       break;

diff --git a/magick/identify.c b/magick/identify.c
index 7ac595eee6dc21bf8d2da94393e3e830b9d76229..bbeb756d084053fef15a3061c7f4b256be13802b 100644 (file)
--- a/magick/identify.c
+++ b/magick/identify.c
@@ -321,15 +321,16 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
            (image->scene == 0))
         (void) FormatLocaleFile(file,"%s ",image->filename);
       else
-        (void) FormatLocaleFile(file,"%s[%.20g] ",image->filename,(double) image->scene);
+        (void) FormatLocaleFile(file,"%s[%.20g] ",image->filename,(double)
+          image->scene);
       (void) FormatLocaleFile(file,"%s ",image->magick);
       if ((image->magick_columns != 0) || (image->magick_rows != 0))
         if ((image->magick_columns != image->columns) ||
             (image->magick_rows != image->rows))
-          (void) FormatLocaleFile(file,"%.20gx%.20g=>",(double) image->magick_columns,
-            (double) image->magick_rows);
-      (void) FormatLocaleFile(file,"%.20gx%.20g ",(double) image->columns,(double)
-        image->rows);
+          (void) FormatLocaleFile(file,"%.20gx%.20g=>",(double)
+            image->magick_columns,(double) image->magick_rows);
+      (void) FormatLocaleFile(file,"%.20gx%.20g ",(double) image->columns,
+        (double) image->rows);
       if ((image->page.width != 0) || (image->page.height != 0) ||
           (image->page.x != 0) || (image->page.y != 0))
         (void) FormatLocaleFile(file,"%.20gx%.20g%+.20g%+.20g ",(double)
@@ -337,8 +338,8 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
           (double) image->page.y);
       (void) FormatLocaleFile(file,"%.20g-bit ",(double) image->depth);
       if (image->type != UndefinedType)
-        (void) FormatLocaleFile(file,"%s ",CommandOptionToMnemonic(MagickTypeOptions,
-          (ssize_t) image->type));
+        (void) FormatLocaleFile(file,"%s ",CommandOptionToMnemonic(
+          MagickTypeOptions,(ssize_t) image->type));
       if (image->storage_class == DirectClass)
         {
           (void) FormatLocaleFile(file,"DirectClass ");
@@ -350,7 +351,8 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
         }
       else
         if (image->total_colors <= image->colors)
-          (void) FormatLocaleFile(file,"PseudoClass %.20gc ",(double) image->colors);
+          (void) FormatLocaleFile(file,"PseudoClass %.20gc ",(double)
+            image->colors);
         else
           (void) FormatLocaleFile(file,"PseudoClass %.20g=>%.20gc ",(double)
             image->total_colors,(double) image->colors);
@@ -364,9 +366,10 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
           (void) FormatMagickSize(GetBlobSize(image),MagickFalse,format);
           (void) FormatLocaleFile(file,"%s ",format);
         }
-      (void) FormatLocaleFile(file,"%0.3fu %lu:%02lu.%03lu",user_time,(unsigned long)
-        (elapsed_time/60.0),(unsigned long) floor(fmod(elapsed_time,60.0)),
-        (unsigned long) (1000.0*(elapsed_time-floor(elapsed_time))));
+      (void) FormatLocaleFile(file,"%0.3fu %lu:%02lu.%03lu",user_time,
+        (unsigned long) (elapsed_time/60.0),(unsigned long) floor(fmod(
+        elapsed_time,60.0)),(unsigned long) (1000.0*(elapsed_time-
+        floor(elapsed_time))));
       (void) FormatLocaleFile(file,"\n");
       (void) fflush(file);
       return(ferror(file) != 0 ? MagickFalse : MagickTrue);
@@ -397,8 +400,8 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
   else
     (void) FormatLocaleFile(file,"  Format: %s (%s)\n",image->magick,
       GetMagickDescription(magick_info));
-  (void) FormatLocaleFile(file,"  Class: %s\n",CommandOptionToMnemonic(MagickClassOptions,
-    (ssize_t) image->storage_class));
+  (void) FormatLocaleFile(file,"  Class: %s\n",CommandOptionToMnemonic(
+    MagickClassOptions,(ssize_t) image->storage_class));
   (void) FormatLocaleFile(file,"  Geometry: %.20gx%.20g%+.20g%+.20g\n",(double)
     image->columns,(double) image->rows,(double) image->tile_offset.x,(double)
     image->tile_offset.y);
@@ -411,13 +414,14 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
     {
       (void) FormatLocaleFile(file,"  Resolution: %gx%g\n",image->x_resolution,
         image->y_resolution);
-      (void) FormatLocaleFile(file,"  Print size: %gx%g\n",(double) image->columns/
-        image->x_resolution,(double) image->rows/image->y_resolution);
+      (void) FormatLocaleFile(file,"  Print size: %gx%g\n",(double)
+        image->columns/image->x_resolution,(double) image->rows/
+        image->y_resolution);
     }
   (void) FormatLocaleFile(file,"  Units: %s\n",CommandOptionToMnemonic(
     MagickResolutionOptions,(ssize_t) image->units));
-  (void) FormatLocaleFile(file,"  Type: %s\n",CommandOptionToMnemonic(MagickTypeOptions,
-    (ssize_t) type));
+  (void) FormatLocaleFile(file,"  Type: %s\n",CommandOptionToMnemonic(
+    MagickTypeOptions,(ssize_t) type));
   if (image->type != UndefinedType)
     (void) FormatLocaleFile(file,"  Base type: %s\n",CommandOptionToMnemonic(
       MagickTypeOptions,(ssize_t) image->type));
@@ -446,7 +450,8 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
         }
       depth=GetImageDepth(image,&image->exception);
       if (image->depth == depth)
-        (void) FormatLocaleFile(file,"  Depth: %.20g-bit\n",(double) image->depth);
+        (void) FormatLocaleFile(file,"  Depth: %.20g-bit\n",(double)
+          image->depth);
       else
         (void) FormatLocaleFile(file,"  Depth: %.20g/%.20g-bit\n",(double)
           image->depth,(double) depth);
@@ -534,15 +539,16 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
       if (colorspace != GRAYColorspace)
         {
           (void) FormatLocaleFile(file,"  Image statistics:\n");
-          (void) PrintChannelStatistics(file,CompositeChannels,"Overall",1.0/scale,
-            channel_statistics);
+          (void) PrintChannelStatistics(file,CompositeChannels,"Overall",1.0/
+            scale,channel_statistics);
         }
       channel_statistics=(ChannelStatistics *) RelinquishMagickMemory(
         channel_statistics);
     }
   if (channel_features != (ChannelFeatures *) NULL)
     {
-      (void) FormatLocaleFile(file,"  Channel features (horizontal, vertical, left and right diagonals, average):\n");
+      (void) FormatLocaleFile(file,"  Channel features (horizontal, vertical, "
+        "left and right diagonals, average):\n");
       switch (colorspace)
       {
         case RGBColorspace:
@@ -678,7 +684,8 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
             (void) QueryMagickColorname(image,&pixel,SVGCompliance,color,
               &image->exception);
             GetColorTuple(&pixel,MagickTrue,hex);
-            (void) FormatLocaleFile(file,"  %8ld: %s %s %s\n",(long) i,tuple,hex,color);
+            (void) FormatLocaleFile(file,"  %8ld: %s %s %s\n",(long) i,tuple,
+              hex,color);
             p++;
           }
         }
@@ -692,8 +699,9 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
   if (image->error.normalized_maximum_error != 0.0)
     (void) FormatLocaleFile(file,"  Normalized maximum error: %g\n",
       image->error.normalized_maximum_error);
-  (void) FormatLocaleFile(file,"  Rendering intent: %s\n",CommandOptionToMnemonic(
-    MagickIntentOptions,(ssize_t) image->rendering_intent));
+  (void) FormatLocaleFile(file,"  Rendering intent: %s\n",
+    CommandOptionToMnemonic(MagickIntentOptions,(ssize_t)
+    image->rendering_intent));
   if (image->gamma != 0.0)
     (void) FormatLocaleFile(file,"  Gamma: %g\n",image->gamma);
   if ((image->chromaticity.red_primary.x != 0.0) ||
@@ -716,9 +724,9 @@ 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) FormatLocaleFile(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) FormatLocaleFile(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) FormatLocaleFile(file,"  Interlace: %s\n",CommandOptionToMnemonic(
     MagickInterlaceOptions,(ssize_t) image->interlace));
   (void) QueryColorname(image,&image->background_color,SVGCompliance,color,
@@ -737,8 +745,8 @@ 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) FormatLocaleFile(file,"  Page geometry: %.20gx%.20g%+.20g%+.20g\n",(double)
-      image->page.width,(double) image->page.height,(double)
+    (void) FormatLocaleFile(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))
     (void) FormatLocaleFile(file,"  Origin geometry: %+.20g%+.20g\n",(double)
@@ -749,10 +757,11 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
     (void) FormatLocaleFile(file,"  Delay: %.20gx%.20g\n",(double) image->delay,
       (double) image->ticks_per_second);
   if (image->iterations != 1)
-    (void) FormatLocaleFile(file,"  Iterations: %.20g\n",(double) image->iterations);
+    (void) FormatLocaleFile(file,"  Iterations: %.20g\n",(double)
+      image->iterations);
   if ((image->next != (Image *) NULL) || (image->previous != (Image *) NULL))
-    (void) FormatLocaleFile(file,"  Scene: %.20g of %.20g\n",(double) image->scene,
-      (double) GetImageListLength(image));
+    (void) FormatLocaleFile(file,"  Scene: %.20g of %.20g\n",(double)
+      image->scene,(double) GetImageListLength(image));
   else
     if (image->scene != 0)
       (void) FormatLocaleFile(file,"  Scene: %.20g\n",(double) image->scene);
@@ -801,8 +810,8 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
             (void) FormatLocaleFile(file,"\n");
             continue;
           }
-        (void) FormatLocaleFile(file," %.20gx%.20g %s\n",(double) tile->magick_columns,
-          (double) tile->magick_rows,tile->magick);
+        (void) FormatLocaleFile(file," %.20gx%.20g %s\n",(double)
+          tile->magick_columns,(double) tile->magick_rows,tile->magick);
         (void) SignatureImage(tile);
         ResetImagePropertyIterator(tile);
         property=GetNextImageProperty(tile);
@@ -864,8 +873,8 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
         profile=GetImageProfile(image,name);
         if (profile == (StringInfo *) NULL)
           continue;
-        (void) FormatLocaleFile(file,"    Profile-%s: %.20g bytes\n",name,(double)
-          GetStringInfoLength(profile));
+        (void) FormatLocaleFile(file,"    Profile-%s: %.20g bytes\n",name,
+          (double) GetStringInfoLength(profile));
 #if defined(MAGICKCORE_LCMS_DELEGATE)
         if ((LocaleCompare(name,"icc") == 0) ||
             (LocaleCompare(name,"icm") == 0))
@@ -991,8 +1000,8 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
                 case 219: tag="Custom Field 20"; break;
                 default: tag="unknown"; break;
               }
-              (void) FormatLocaleFile(file,"      %s[%.20g,%.20g]: ",tag,(double)
-                dataset,(double) record);
+              (void) FormatLocaleFile(file,"      %s[%.20g,%.20g]: ",tag,
+                (double) dataset,(double) record);
               length=(size_t) (GetStringInfoDatum(profile)[i++] << 8);
               length|=GetStringInfoDatum(profile)[i++];
               attribute=(char *) NULL;
@@ -1071,9 +1080,10 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
     elapsed_time+0.5),MagickFalse,format);
   (void) FormatLocaleFile(file,"  Pixels per second: %s\n",format);
   (void) FormatLocaleFile(file,"  User time: %0.3fu\n",user_time);
-  (void) FormatLocaleFile(file,"  Elapsed time: %lu:%02lu.%03lu\n",(unsigned long)
-    (elapsed_time/60.0),(unsigned long) ceil(fmod(elapsed_time,60.0)),
-    (unsigned long) (1000.0*(elapsed_time-floor(elapsed_time))));
+  (void) FormatLocaleFile(file,"  Elapsed time: %lu:%02lu.%03lu\n",
+    (unsigned long) (elapsed_time/60.0),(unsigned long) ceil(fmod(
+    elapsed_time,60.0)),(unsigned long) (1000.0*(elapsed_time-floor(
+    elapsed_time))));
   (void) FormatLocaleFile(file,"  Version: %s\n",GetMagickVersion((size_t *)
     NULL));
   (void) fflush(file);

diff --git a/magick/layer.c b/magick/layer.c
index 81afc0809aef921d192ba2bbd48b9cc72bda9f66..1ba050ca22741f2898535ee439852f983d85ef6d 100644 (file)
--- a/magick/layer.c
+++ b/magick/layer.c
@@ -1070,8 +1070,8 @@ static Image *OptimizeLayerFrames(const Image *image,
   bounds[0]=CompareImageBounds(prev_image,curr,CompareAnyLayer,exception);
 #if DEBUG_OPT_FRAME
   FormatLocaleFile(stderr, "overlay: %.20gx%.20g%+.20g%+.20g\n\n",
-       (double) bounds[i].width,(double) bounds[i].height,
-       (double) bounds[i].x,(double) bounds[i].y );
+    (double) bounds[i].width,(double) bounds[i].height,
+    (double) bounds[i].x,(double) bounds[i].y );
 #endif
   /*
     Compute the bounding box of changes for each pair of images.

diff --git a/magick/locale.c b/magick/locale.c
index e66b2664c2cc8ee8f4f49afbcbc7892f033bbab8..cf800d643655d48dc0c337f90f3d64d2b4c5ad54 100644 (file)
--- a/magick/locale.c
+++ b/magick/locale.c
@@ -869,7 +869,8 @@ MagickExport MagickBooleanType ListLocaleInfo(FILE *file,
         if (locale_info[i]->path != (char *) NULL)
           (void) FormatLocaleFile(file,"\nPath: %s\n\n",locale_info[i]->path);
         (void) FormatLocaleFile(file,"Tag/Message\n");
-        (void) FormatLocaleFile(file,"-------------------------------------------------"
+        (void) FormatLocaleFile(file,
+          "-------------------------------------------------"
           "------------------------------\n");
       }
     path=locale_info[i]->path;

diff --git a/magick/log.c b/magick/log.c
index fce62b3377931040a34ee68d689f79e23bb2ed0c..9bbc4be8335813a3012a005cb4c63906e0a3927a 100644 (file)
--- a/magick/log.c
+++ b/magick/log.c
@@ -642,8 +642,10 @@ MagickExport MagickBooleanType ListLogInfo(FILE *file,ExceptionInfo *exception)
       {
         if (log_info[i]->path != (char *) NULL)
           (void) FormatLocaleFile(file,"\nPath: %s\n\n",log_info[i]->path);
-        (void) FormatLocaleFile(file,"Filename       Generations     Limit  Format\n");
-        (void) FormatLocaleFile(file,"-------------------------------------------------"
+        (void) FormatLocaleFile(file,
+          "Filename       Generations     Limit  Format\n");
+        (void) FormatLocaleFile(file,
+          "-------------------------------------------------"
           "------------------------------\n");
       }
     path=log_info[i]->path;

diff --git a/magick/magic.c b/magick/magic.c
index 9a3db433109633225effd788dd8ca38b5c47b494..5ab04e1a1b0f85538647595c80383b12f2541648 100644 (file)
--- a/magick/magic.c
+++ b/magick/magic.c
@@ -599,7 +599,8 @@ MagickExport MagickBooleanType ListMagicInfo(FILE *file,
         if (magic_info[i]->path != (char *) NULL)
           (void) FormatLocaleFile(file,"\nPath: %s\n\n",magic_info[i]->path);
         (void) FormatLocaleFile(file,"Name      Offset Target\n");
-        (void) FormatLocaleFile(file,"-------------------------------------------------"
+        (void) FormatLocaleFile(file,
+          "-------------------------------------------------"
           "------------------------------\n");
       }
     path=magic_info[i]->path;

diff --git a/magick/magick.c b/magick/magick.c
index 676a08647a486b99e376af5c657e3b6aebbce601..01c145dbb0a1a05e4596019a85758cb51a595867 100644 (file)
--- a/magick/magick.c
+++ b/magick/magick.c
@@ -958,14 +958,15 @@ MagickExport MagickBooleanType ListMagickInfo(FILE *file,
 #else
   (void) FormatLocaleFile(file,"   Format  Module    Mode  Description\n");
 #endif
-  (void) FormatLocaleFile(file,"--------------------------------------------------------"
+  (void) FormatLocaleFile(file,
+    "--------------------------------------------------------"
     "-----------------------\n");
   for (i=0; i < (ssize_t) number_formats; i++)
   {
     if (magick_info[i]->stealth != MagickFalse)
       continue;
-    (void) FormatLocaleFile(file,"%9s%c ",magick_info[i]->name != (char *) NULL ?
-      magick_info[i]->name : "",
+    (void) FormatLocaleFile(file,"%9s%c ",
+      magick_info[i]->name != (char *) NULL ? magick_info[i]->name : "",
       magick_info[i]->blob_support != MagickFalse ? '*' : ' ');
 #if defined(MAGICKCORE_MODULES_SUPPORT)
     {

diff --git a/magick/mime.c b/magick/mime.c
index f8397bb9368209c2ce3c60780d4d0ccf11d6e8ec..2fbc461355e2fd3b7f72f5aa568d9754032cad5d 100644 (file)
--- a/magick/mime.c
+++ b/magick/mime.c
@@ -676,7 +676,8 @@ MagickExport MagickBooleanType ListMimeInfo(FILE *file,ExceptionInfo *exception)
         if (mime_info[i]->path != (char *) NULL)
           (void) FormatLocaleFile(file,"\nPath: %s\n\n",mime_info[i]->path);
         (void) FormatLocaleFile(file,"Type                   Description\n");
-        (void) FormatLocaleFile(file,"-------------------------------------------------"
+        (void) FormatLocaleFile(file,
+          "-------------------------------------------------"
           "------------------------------\n");
       }
     path=mime_info[i]->path;

diff --git a/magick/module.c b/magick/module.c
index a3cd583a94d656012de4141c2d97eeccbfae97c6..47755c1d824c3fd53e31d82eadb4d52e72bf8c15 100644 (file)
--- a/magick/module.c
+++ b/magick/module.c
@@ -1090,7 +1090,8 @@ MagickExport MagickBooleanType ListModuleInfo(FILE *file,
   GetPathComponent(module_path,HeadPath,path);
   (void) FormatLocaleFile(file,"\nPath: %s\n\n",path);
   (void) FormatLocaleFile(file,"Image Coder\n");
-  (void) FormatLocaleFile(file,"-------------------------------------------------"
+  (void) FormatLocaleFile(file,
+    "-------------------------------------------------"
     "------------------------------\n");
   for (i=0; i < (ssize_t) number_modules; i++)
   {
@@ -1116,7 +1117,8 @@ MagickExport MagickBooleanType ListModuleInfo(FILE *file,
   GetPathComponent(module_path,HeadPath,path);
   (void) FormatLocaleFile(file,"\nPath: %s\n\n",path);
   (void) FormatLocaleFile(file,"Image Filter\n");
-  (void) FormatLocaleFile(file,"-------------------------------------------------"
+  (void) FormatLocaleFile(file,
+    "-------------------------------------------------"
     "------------------------------\n");
   for (i=0; i < (ssize_t) number_modules; i++)
   {

diff --git a/magick/morphology.c b/magick/morphology.c
index fff530ee87a30ccf1ff48b3af9648079c880d61c..985beb3c636814036bda2f5bf3b8bd4d260f4597 100644 (file)
--- a/magick/morphology.c
+++ b/magick/morphology.c
@@ -415,7 +415,7 @@ static KernelInfo *ParseKernelName(const char *kernel_string)
 #if 0
   /* For Debugging Geometry Input */
   FormatLocaleFile(stderr, "Geometry = 0x%04X : %lg x %lg %+lg %+lg\n",
-       flags, args.rho, args.sigma, args.xi, args.psi );
+    flags, args.rho, args.sigma, args.xi, args.psi );
 #endif
 
   /* special handling of missing values in input string */
@@ -516,8 +516,8 @@ MagickExport KernelInfo *AcquireKernelInfo(const char *kernel_string)
 
       /* Error handling -- this is not proper error handling! */
       if ( new_kernel == (KernelInfo *) NULL ) {
-        FormatLocaleFile(stderr, "Failed to parse kernel number #%.20g\n",(double)
-          kernel_number);
+        FormatLocaleFile(stderr, "Failed to parse kernel number #%.20g\n",
+          (double) kernel_number);
         if ( kernel != (KernelInfo *) NULL )
           kernel=DestroyKernelInfo(kernel);
         return((KernelInfo *) NULL);
@@ -3852,9 +3852,10 @@ MagickExport Image *MorphologyApply(const Image *image, const ChannelType
                       channel, kernel, exception);
 
       if ( verbose == MagickTrue )
-        (void) FormatLocaleFile(stderr, "%s:%.20g.%.20g #%.20g => Changed %.20g\n",
-            CommandOptionToMnemonic(MagickMorphologyOptions, method),
-            1.0,0.0,1.0, (double) changed);
+        (void) FormatLocaleFile(stderr,
+          "%s:%.20g.%.20g #%.20g => Changed %.20g\n",
+          CommandOptionToMnemonic(MagickMorphologyOptions, method),
+          1.0,0.0,1.0, (double) changed);
 
       if ( changed < 0 )
         goto error_cleanup;
@@ -4038,7 +4039,8 @@ MagickExport Image *MorphologyApply(const Image *image, const ChannelType
           if ( verbose == MagickTrue ) {
             if ( kernel_loop > 1 )
               FormatLocaleFile(stderr, "\n"); /* add end-of-line from previous */
-            (void) FormatLocaleFile(stderr, "%s%s%s:%.20g.%.20g #%.20g => Changed %.20g",
+            (void) FormatLocaleFile(stderr,
+              "%s%s%s:%.20g.%.20g #%.20g => Changed %.20g",
               v_info,CommandOptionToMnemonic(MagickMorphologyOptions,
               primitive),(this_kernel == rflt_kernel ) ? "*" : "",
               (double) (method_loop+kernel_loop-1),(double) kernel_number,
@@ -4743,8 +4745,8 @@ MagickExport void ShowKernelInfo(KernelInfo *kernel)
           CommandOptionToMnemonic(MagickKernelOptions, k->type) );
     if ( fabs(k->angle) > MagickEpsilon )
       FormatLocaleFile(stderr, "@%lg", k->angle);
-    FormatLocaleFile(stderr, "\" of size %lux%lu%+ld%+ld",(unsigned long) k->width,
-      (unsigned long) k->height,(long) k->x,(long) k->y);
+    FormatLocaleFile(stderr, "\" of size %lux%lu%+ld%+ld",(unsigned long)
+      k->width,(unsigned long) k->height,(long) k->x,(long) k->y);
     FormatLocaleFile(stderr,
           " with values from %.*lg to %.*lg\n",
           GetMagickPrecision(), k->minimum,

diff --git a/magick/policy.c b/magick/policy.c
index 933dc9bc866e4efc0bb5131d7b815b7c57ad07f0..4ab744342fbbcef4b3ff429abfe008c583861072 100644 (file)
--- a/magick/policy.c
+++ b/magick/policy.c
@@ -598,7 +598,8 @@ MagickExport MagickBooleanType ListPolicyInfo(FILE *file,
           (void) FormatLocaleFile(file,"Execute ");
         (void) FormatLocaleFile(file,"\n");
         if (policy_info[i]->pattern != (char *) NULL)
-          (void) FormatLocaleFile(file,"    pattern: %s\n",policy_info[i]->pattern);
+          (void) FormatLocaleFile(file,"    pattern: %s\n",
+            policy_info[i]->pattern);
       }
   }
   policy_info=(const PolicyInfo **) RelinquishMagickMemory((void *)

diff --git a/magick/resize.c b/magick/resize.c
index 559547a239cf5bdf8978e5c5828be9b2592041dc..167af0b72c7ceebd3a28ac8e6849415e6ea5b301 100644 (file)
--- a/magick/resize.c
+++ b/magick/resize.c
@@ -1084,8 +1084,8 @@ MagickExport ResizeFilter *AcquireResizeFilter(const Image *image,
           (void) FormatLocaleFile(stdout,"%5.2lf\t%.*g\n",x,GetMagickPrecision(),
             (double) GetResizeFilterWeight(resize_filter,x));
         /* A final value so gnuplot can graph the 'stop' properly. */
-        (void) FormatLocaleFile(stdout,"%5.2lf\t%.*g\n",support,GetMagickPrecision(),
-          0.0);
+        (void) FormatLocaleFile(stdout,"%5.2lf\t%.*g\n",support,
+          GetMagickPrecision(),0.0);
       }
       /* Output the above once only for each image - remove setting */
     (void) DeleteImageArtifact((Image *) image,"filter:verbose");

diff --git a/magick/resource.c b/magick/resource.c
index de1c7a0a39c333f1b82e866db2b94ac8fed941e2..db7bed29eeb269b0c7e41a47067a06ae61bfbc1d 100644 (file)
--- a/magick/resource.c
+++ b/magick/resource.c
@@ -691,11 +691,12 @@ MagickExport MagickBooleanType ListMagickResourceInfo(FILE *file,
       resource_info.time_limit);
   (void) FormatLocaleFile(file,"File         Area       Memory          Map"
     "         Disk    Thread         Time\n");
-  (void) FormatLocaleFile(file,"--------------------------------------------------------"
+  (void) FormatLocaleFile(file,
+    "--------------------------------------------------------"
     "-----------------------\n");
-  (void) FormatLocaleFile(file,"%4g   %10s   %10s   %10s   %10s    %6g  %11s\n",(double)
-    resource_info.file_limit,area_limit,memory_limit,map_limit,disk_limit,
-    (double) resource_info.thread_limit,time_limit);
+  (void) FormatLocaleFile(file,"%4g   %10s   %10s   %10s   %10s    %6g  %11s\n",
+    (double) resource_info.file_limit,area_limit,memory_limit,map_limit,
+    disk_limit,(double) resource_info.thread_limit,time_limit);
   (void) fflush(file);
   UnlockSemaphoreInfo(resource_semaphore);
   return(MagickTrue);

diff --git a/magick/segment.c b/magick/segment.c
index 30486fc8dff953c894614874ba60074c7225f3d4..f19300e71c413570a04252cdf92d416b26f8570e 100644 (file)
--- a/magick/segment.c
+++ b/magick/segment.c
@@ -451,16 +451,16 @@ static MagickBooleanType Classify(Image *image,short **extrema,
         cluster_threshold);
       (void) FormatLocaleFile(stdout,"\tWeighting Exponent = %g\n",(double)
         weighting_exponent);
-      (void) FormatLocaleFile(stdout,"\tTotal Number of Clusters = %.20g\n\n",(double)
-        number_clusters);
+      (void) FormatLocaleFile(stdout,"\tTotal Number of Clusters = %.20g\n\n",
+        (double) number_clusters);
       /*
         Print the total number of points per cluster.
       */
       (void) FormatLocaleFile(stdout,"\n\nNumber of Vectors Per Cluster\n");
       (void) FormatLocaleFile(stdout,"=============================\n\n");
       for (cluster=head; cluster != (Cluster *) NULL; cluster=cluster->next)
-        (void) FormatLocaleFile(stdout,"Cluster #%.20g = %.20g\n",(double) cluster->id,
-          (double) cluster->count);
+        (void) FormatLocaleFile(stdout,"Cluster #%.20g = %.20g\n",(double)
+          cluster->id,(double) cluster->count);
       /*
         Print the cluster extents.
       */
@@ -469,8 +469,10 @@ static MagickBooleanType Classify(Image *image,short **extrema,
       (void) FormatLocaleFile(stdout,"================");
       for (cluster=head; cluster != (Cluster *) NULL; cluster=cluster->next)
       {
-        (void) FormatLocaleFile(stdout,"\n\nCluster #%.20g\n\n",(double) cluster->id);
-        (void) FormatLocaleFile(stdout,"%.20g-%.20g  %.20g-%.20g  %.20g-%.20g\n",(double)
+        (void) FormatLocaleFile(stdout,"\n\nCluster #%.20g\n\n",(double)
+          cluster->id);
+        (void) FormatLocaleFile(stdout,
+          "%.20g-%.20g  %.20g-%.20g  %.20g-%.20g\n",(double)
           cluster->red.left,(double) cluster->red.right,(double)
           cluster->green.left,(double) cluster->green.right,(double)
           cluster->blue.left,(double) cluster->blue.right);
@@ -483,7 +485,8 @@ static MagickBooleanType Classify(Image *image,short **extrema,
       (void) FormatLocaleFile(stdout,"=====================");
       for (cluster=head; cluster != (Cluster *) NULL; cluster=cluster->next)
       {
-        (void) FormatLocaleFile(stdout,"\n\nCluster #%.20g\n\n",(double) cluster->id);
+        (void) FormatLocaleFile(stdout,"\n\nCluster #%.20g\n\n",(double)
+          cluster->id);
         (void) FormatLocaleFile(stdout,"%g  %g  %g\n",(double)
           cluster->red.center,(double) cluster->green.center,(double)
           cluster->blue.center);

diff --git a/magick/semaphore.c b/magick/semaphore.c
index ee9be1c8bdbc185395addac08412a980bd5ba7a1..d4a95ab929d311b878d6280c3e864df7b5f308df 100644 (file)
--- a/magick/semaphore.c
+++ b/magick/semaphore.c
@@ -394,7 +394,8 @@ MagickExport void UnlockSemaphoreInfo(SemaphoreInfo *semaphore_info)
   assert(IsMagickThreadEqual(semaphore_info->id) != MagickFalse);
   if (semaphore_info->reference_count == 0)
     {
-      (void) FormatLocaleFile(stderr,"Warning: semaphore lock already unlocked!\n");
+      (void) FormatLocaleFile(stderr,
+        "Warning: semaphore lock already unlocked!\n");
       (void) fflush(stderr);
       return;
     }

diff --git a/magick/threshold.c b/magick/threshold.c
index c65ef9b3415dd9a2eda21e8b667d12a4df95fbab..10fe872916a98c2bb3da1849b48a98a96e6b8028 100644 (file)
--- a/magick/threshold.c
+++ b/magick/threshold.c
@@ -1156,8 +1156,9 @@ MagickBooleanType ListThresholdMapFile(FILE *file,const char *xml,
   if ( thresholds == (XMLTreeInfo *)NULL )
     return(MagickFalse);
 
-  (void) FormatLocaleFile(file,"%-16s %-12s %s\n", "Map", "Alias", "Description");
-  (void) FormatLocaleFile(file,"----------------------------------------------------\n");
+  (void) FormatLocaleFile(file,"%-16s %-12s %s\n","Map","Alias","Description");
+  (void) FormatLocaleFile(file,
+    "----------------------------------------------------\n");
 
   for( threshold = GetXMLTreeChild(thresholds,"threshold");
        threshold != (XMLTreeInfo *)NULL;
@@ -1186,7 +1187,8 @@ MagickBooleanType ListThresholdMapFile(FILE *file,const char *xml,
       thresholds=DestroyXMLTree(thresholds);
       return(MagickFalse);
     }
-    (void) FormatLocaleFile(file,"%-16s %-12s %s\n",map,alias ? alias : "", content);
+    (void) FormatLocaleFile(file,"%-16s %-12s %s\n",map,alias ? alias : "",
+      content);
   }
   thresholds=DestroyXMLTree(thresholds);
   return(MagickTrue);
@@ -1234,8 +1236,8 @@ MagickExport MagickBooleanType ListThresholdMaps(FILE *file,
     file = stdout;
   options=GetConfigureOptions(ThresholdsFilename,exception);
 
-  (void) FormatLocaleFile(file, "\n   Threshold Maps for Ordered Dither Operations\n");
-
+  (void) FormatLocaleFile(file,
+    "\n   Threshold Maps for Ordered Dither Operations\n");
   while ( ( option=(const StringInfo *) GetNextValueInLinkedList(options) )
           != (const StringInfo *) NULL)
   {

diff --git a/magick/xwindow.c b/magick/xwindow.c
index 9ef30b5355550fa649af8f1f7a6683688237a9a4..9f4ee8664125eab6d6e2b88f3279ef87a17d54c3 100644 (file)
--- a/magick/xwindow.c
+++ b/magick/xwindow.c
@@ -1992,10 +1992,11 @@ MagickExport void XDisplayImageInfo(Display *display,
     (void) FormatLocaleFile(file,"  colormap type: Shared\n");
   else
     (void) FormatLocaleFile(file,"  colormap type: Private\n");
-  (void) FormatLocaleFile(file,"  geometry: %dx%d\n",windows->image.ximage->width,
-    windows->image.ximage->height);
+  (void) FormatLocaleFile(file,"  geometry: %dx%d\n",
+    windows->image.ximage->width,windows->image.ximage->height);
   if (windows->image.crop_geometry != (char *) NULL)
-    (void) FormatLocaleFile(file,"  crop geometry: %s\n",windows->image.crop_geometry);
+    (void) FormatLocaleFile(file,"  crop geometry: %s\n",
+      windows->image.crop_geometry);
   if (windows->image.pixmap == (Pixmap) NULL)
     (void) FormatLocaleFile(file,"  type: X Image\n");
   else
@@ -2024,7 +2025,8 @@ MagickExport void XDisplayImageInfo(Display *display,
     undo_image=GetPreviousImageInList(undo_image);
   }
   (void) FormatLocaleFile(file,"Undo Edit Cache\n  levels: %u\n",levels);
-  (void) FormatLocaleFile(file,"  bytes: %.20gmb\n",(double) ((bytes+(1 << 19)) >> 20));
+  (void) FormatLocaleFile(file,"  bytes: %.20gmb\n",(double)
+    ((bytes+(1 << 19)) >> 20));
   (void) FormatLocaleFile(file,"  limit: %.20gmb\n\n",(double)
     resource_info->undo_cache);
   /*

diff --git a/tests/validate.c b/tests/validate.c
index ebdb1428127ff5922f72d99ddb728e0b0c6a59fe..57408208a8b779c92021d6fa472fcf1f6bfa7b88 100644 (file)
--- a/tests/validate.c
+++ b/tests/validate.c
@@ -115,7 +115,8 @@ static size_t ValidateCompareCommand(ImageInfo *image_info,
     arguments=StringToArgv(command,&number_arguments);
     if (arguments == (char **) NULL)
       {
-        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+          GetMagickModule());
         (*fail)++;
         continue;
       }
@@ -126,7 +127,8 @@ static size_t ValidateCompareCommand(ImageInfo *image_info,
     arguments=(char **) RelinquishMagickMemory(arguments);
     if (status != MagickFalse)
       {
-        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+          GetMagickModule());
         (*fail)++;
         continue;
       }
@@ -205,7 +207,8 @@ static size_t ValidateCompositeCommand(ImageInfo *image_info,
     arguments=StringToArgv(command,&number_arguments);
     if (arguments == (char **) NULL)
       {
-        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+          GetMagickModule());
         (*fail)++;
         continue;
       }
@@ -216,7 +219,8 @@ static size_t ValidateCompositeCommand(ImageInfo *image_info,
     arguments=(char **) RelinquishMagickMemory(arguments);
     if (status != MagickFalse)
       {
-        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+          GetMagickModule());
         (*fail)++;
         continue;
       }
@@ -294,7 +298,8 @@ static size_t ValidateConvertCommand(ImageInfo *image_info,
     arguments=StringToArgv(command,&number_arguments);
     if (arguments == (char **) NULL)
       {
-        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+          GetMagickModule());
         (*fail)++;
         continue;
       }
@@ -305,7 +310,8 @@ static size_t ValidateConvertCommand(ImageInfo *image_info,
     arguments=(char **) RelinquishMagickMemory(arguments);
     if (status != MagickFalse)
       {
-        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+          GetMagickModule());
         (*fail)++;
         continue;
       }
@@ -384,7 +390,8 @@ static size_t ValidateIdentifyCommand(ImageInfo *image_info,
     arguments=StringToArgv(command,&number_arguments);
     if (arguments == (char **) NULL)
       {
-        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+          GetMagickModule());
         (*fail)++;
         continue;
       }
@@ -395,7 +402,8 @@ static size_t ValidateIdentifyCommand(ImageInfo *image_info,
     arguments=(char **) RelinquishMagickMemory(arguments);
     if (status != MagickFalse)
       {
-        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+          GetMagickModule());
         (*fail)++;
         continue;
       }
@@ -490,8 +498,8 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
         Generate reference image.
       */
       CatchException(exception);
-      (void) FormatLocaleFile(stdout,"  test %.20g: %s/%s/%s/%.20g-bits",(double)
-        (test++),reference_formats[i].magick,CommandOptionToMnemonic(
+      (void) FormatLocaleFile(stdout,"  test %.20g: %s/%s/%s/%.20g-bits",
+        (double) (test++),reference_formats[i].magick,CommandOptionToMnemonic(
         MagickCompressOptions,reference_formats[i].compression),
         CommandOptionToMnemonic(MagickTypeOptions,reference_types[j].type),
         (double) reference_types[j].depth);
@@ -500,7 +508,8 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
       reference_image=ReadImage(image_info,exception);
       if (reference_image == (Image *) NULL)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
           continue;
         }
@@ -517,7 +526,8 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
       InheritException(exception,&reference_image->exception);
       if (status == MagickFalse)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
           reference_image=DestroyImage(reference_image);
           continue;
@@ -526,7 +536,8 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
       InheritException(exception,&reference_image->exception);
       if (status == MagickFalse)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
           reference_image=DestroyImage(reference_image);
           continue;
@@ -537,7 +548,8 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
       reference_image=DestroyImage(reference_image);
       if (status == MagickFalse)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
           continue;
         }
@@ -549,7 +561,8 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
       reference_image=ReadImage(image_info,exception);
       if (reference_image == (Image *) NULL)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
           continue;
         }
@@ -566,7 +579,8 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
       blob=ImageToBlob(image_info,reference_image,&length,exception);
       if (blob == (unsigned char *) NULL)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
           reference_image=DestroyImage(reference_image);
           continue;
@@ -580,7 +594,8 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
       blob=(unsigned char *) RelinquishMagickMemory(blob);
       if (reconstruct_image == (Image *) NULL)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
           reference_image=DestroyImage(reference_image);
           continue;
@@ -603,7 +618,8 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
       reference_image=DestroyImage(reference_image);
       if (difference_image == (Image *) NULL)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
           continue;
         }
@@ -701,8 +717,8 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
         Generate reference image.
       */
       CatchException(exception);
-      (void) FormatLocaleFile(stdout,"  test %.20g: %s/%s/%s/%.20g-bits",(double)
-        (test++),reference_formats[i].magick,CommandOptionToMnemonic(
+      (void) FormatLocaleFile(stdout,"  test %.20g: %s/%s/%s/%.20g-bits",
+        (double) (test++),reference_formats[i].magick,CommandOptionToMnemonic(
         MagickCompressOptions,reference_formats[i].compression),
         CommandOptionToMnemonic(MagickTypeOptions,reference_types[j].type),
         (double) reference_types[j].depth);
@@ -711,7 +727,8 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
       reference_image=ReadImage(image_info,exception);
       if (reference_image == (Image *) NULL)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
           continue;
         }
@@ -728,7 +745,8 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
       InheritException(exception,&reference_image->exception);
       if (status == MagickFalse)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
           reference_image=DestroyImage(reference_image);
           continue;
@@ -737,7 +755,8 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
       InheritException(exception,&reference_image->exception);
       if (status == MagickFalse)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
           reference_image=DestroyImage(reference_image);
           continue;
@@ -748,7 +767,8 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
       reference_image=DestroyImage(reference_image);
       if (status == MagickFalse)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
           continue;
         }
@@ -760,7 +780,8 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
       reference_image=ReadImage(image_info,exception);
       if (reference_image == (Image *) NULL)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
           continue;
         }
@@ -775,7 +796,8 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
       InheritException(exception,&reference_image->exception);
       if (status == MagickFalse)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
           reference_image=DestroyImage(reference_image);
           continue;
@@ -788,7 +810,8 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
       reconstruct_image=ReadImage(image_info,exception);
       if (reconstruct_image == (Image *) NULL)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
           reference_image=DestroyImage(reference_image);
           continue;
@@ -811,7 +834,8 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
       reference_image=DestroyImage(reference_image);
       if (difference_image == (Image *) NULL)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
           continue;
         }
@@ -895,7 +919,8 @@ static size_t ValidateImportExportPixels(ImageInfo *image_info,
 
   (void) output_filename;
   test=0;
-  (void) FormatLocaleFile(stdout,"validate the import and export of image pixels:\n");
+  (void) FormatLocaleFile(stdout,
+    "validate the import and export of image pixels:\n");
   for (i=0; reference_map[i] != (char *) NULL; i++)
   {
     for (j=0; reference_storage[j].type != UndefinedPixel; j++)
@@ -912,7 +937,8 @@ static size_t ValidateImportExportPixels(ImageInfo *image_info,
       reference_image=ReadImage(image_info,exception);
       if (reference_image == (Image *) NULL)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
           continue;
         }
@@ -923,7 +949,8 @@ static size_t ValidateImportExportPixels(ImageInfo *image_info,
       pixels=(unsigned char *) AcquireQuantumMemory(length,sizeof(*pixels));
       if (pixels == (unsigned char *) NULL)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
           reference_image=DestroyImage(reference_image);
           continue;
@@ -934,7 +961,8 @@ static size_t ValidateImportExportPixels(ImageInfo *image_info,
         exception);
       if (status == MagickFalse)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
           pixels=(unsigned char *) RelinquishMagickMemory(pixels);
           reference_image=DestroyImage(reference_image);
@@ -947,7 +975,8 @@ static size_t ValidateImportExportPixels(ImageInfo *image_info,
       InheritException(exception,&reference_image->exception);
       if (status == MagickFalse)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
            pixels=(unsigned char *) RelinquishMagickMemory(pixels);
           reference_image=DestroyImage(reference_image);
@@ -968,7 +997,8 @@ static size_t ValidateImportExportPixels(ImageInfo *image_info,
       pixels=(unsigned char *) RelinquishMagickMemory(pixels);
       if (status == MagickFalse)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
           reference_image=DestroyImage(reference_image);
           continue;
@@ -982,7 +1012,8 @@ static size_t ValidateImportExportPixels(ImageInfo *image_info,
       reference_image=DestroyImage(reference_image);
       if (difference_image == (Image *) NULL)
         {
-          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
           (*fail)++;
           continue;
         }
@@ -1070,7 +1101,8 @@ static size_t ValidateMontageCommand(ImageInfo *image_info,
     arguments=StringToArgv(command,&number_arguments);
     if (arguments == (char **) NULL)
       {
-        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
         (*fail)++;
         continue;
       }
@@ -1081,7 +1113,8 @@ static size_t ValidateMontageCommand(ImageInfo *image_info,
     arguments=(char **) RelinquishMagickMemory(arguments);
     if (status != MagickFalse)
       {
-        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
         (*fail)++;
         continue;
       }
@@ -1159,7 +1192,8 @@ static size_t ValidateStreamCommand(ImageInfo *image_info,
     arguments=StringToArgv(command,&number_arguments);
     if (arguments == (char **) NULL)
       {
-        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
         (*fail)++;
         continue;
       }
@@ -1170,7 +1204,8 @@ static size_t ValidateStreamCommand(ImageInfo *image_info,
     arguments=(char **) RelinquishMagickMemory(arguments);
     if (status != MagickFalse)
       {
-        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
+            GetMagickModule());
         (*fail)++;
         continue;
       }
@@ -1376,8 +1411,10 @@ int main(int argc,char **argv)
           {
             (void) FormatLocaleFile(stdout,"Version: %s\n",
               GetMagickVersion((size_t *) NULL));
-            (void) FormatLocaleFile(stdout,"Copyright: %s\n\n",GetMagickCopyright());
-            (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
+            (void) FormatLocaleFile(stdout,"Copyright: %s\n\n",
+              GetMagickCopyright());
+            (void) FormatLocaleFile(stdout,"Features: %s\n\n",
+              GetMagickFeatures());
             return(0);
           }
         ThrowValidateException(OptionError,"UnrecognizedOption",option)
@@ -1414,8 +1451,9 @@ int main(int argc,char **argv)
             GetMagickVersion((size_t *) NULL));
           (void) FormatLocaleFile(stdout,"Copyright: %s\n\n",
             GetMagickCopyright());
-          (void) FormatLocaleFile(stdout,"ImageMagick Validation Suite (%s)\n\n",
-            CommandOptionToMnemonic(MagickValidateOptions,(ssize_t) type));
+          (void) FormatLocaleFile(stdout,
+            "ImageMagick Validation Suite (%s)\n\n",CommandOptionToMnemonic(
+            MagickValidateOptions,(ssize_t) type));
           if ((type & CompareValidate) != 0)
             tests+=ValidateCompareCommand(image_info,reference_filename,
               output_filename,&fail,exception);

diff --git a/wand/animate.c b/wand/animate.c
index 9681961823f282a403ffec708bd0273a71f32909..dd82ce345a992d83267aea71fda1aefbc670d82e 100644 (file)
--- a/wand/animate.c
+++ b/wand/animate.c
@@ -314,8 +314,10 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
         {
           (void) FormatLocaleFile(stdout,"Version: %s\n",
             GetMagickVersion((size_t *) NULL));
-          (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
-          (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
+          (void) FormatLocaleFile(stdout,"Copyright: %s\n",
+            GetMagickCopyright());
+          (void) FormatLocaleFile(stdout,"Features: %s\n\n",
+            GetMagickFeatures());
           return(MagickFalse);
         }
     }
@@ -1369,8 +1371,10 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
           {
             (void) FormatLocaleFile(stdout,"Version: %s\n",
               GetMagickVersion((size_t *) NULL));
-            (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
-            (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
+            (void) FormatLocaleFile(stdout,"Copyright: %s\n",
+              GetMagickCopyright());
+            (void) FormatLocaleFile(stdout,"Features: %s\n\n",
+              GetMagickFeatures());
             break;
           }
         if (LocaleCompare("virtual-pixel",option+1) == 0)

diff --git a/wand/compare.c b/wand/compare.c
index 413748e9889c2bcc234412994c349ae5d685a960..997d1417f53b0fdc75502971430a2dcb0180f8d4 100644 (file)
--- a/wand/compare.c
+++ b/wand/compare.c
@@ -264,8 +264,10 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
         {
           (void) FormatLocaleFile(stdout,"Version: %s\n",
             GetMagickVersion((size_t *) NULL));
-          (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
-          (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
+          (void) FormatLocaleFile(stdout,"Copyright: %s\n",
+            GetMagickCopyright());
+          (void) FormatLocaleFile(stdout,"Features: %s\n\n",
+            GetMagickFeatures());
           return(MagickFalse);
         }
     }
@@ -896,8 +898,10 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
           {
             (void) FormatLocaleFile(stdout,"Version: %s\n",
               GetMagickVersion((size_t *) NULL));
-            (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
-            (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
+            (void) FormatLocaleFile(stdout,"Copyright: %s\n",
+              GetMagickCopyright());
+            (void) FormatLocaleFile(stdout,"Features: %s\n\n",
+              GetMagickFeatures());
             break;
           }
         if (LocaleCompare("virtual-pixel",option+1) == 0)

diff --git a/wand/composite.c b/wand/composite.c
index 94eadf08f5038a0a2ddb3055914b28df3ef872ed..7334b43189be024ee58c7e25dca9eebc4b1062f5 100644 (file)
--- a/wand/composite.c
+++ b/wand/composite.c
@@ -456,8 +456,10 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
         {
           (void) FormatLocaleFile(stdout,"Version: %s\n",
             GetMagickVersion((size_t *) NULL));
-          (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
-          (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
+          (void) FormatLocaleFile(stdout,"Copyright: %s\n",
+            GetMagickCopyright());
+          (void) FormatLocaleFile(stdout,"Features: %s\n\n",
+            GetMagickFeatures());
           return(MagickFalse);
         }
     }
@@ -1539,8 +1541,10 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
           {
             (void) FormatLocaleFile(stdout,"Version: %s\n",
               GetMagickVersion((size_t *) NULL));
-            (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
-            (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
+            (void) FormatLocaleFile(stdout,"Copyright: %s\n",
+              GetMagickCopyright());
+            (void) FormatLocaleFile(stdout,"Features: %s\n\n",
+              GetMagickFeatures());
             break;
           }
         if (LocaleCompare("virtual-pixel",option+1) == 0)

diff --git a/wand/conjure.c b/wand/conjure.c
index 898156960865bcb6b518cf4706cfe595900cb84c..0fb9138be5b57de3ba7eb1f3728f28a28929339c 100644 (file)
--- a/wand/conjure.c
+++ b/wand/conjure.c
@@ -270,8 +270,10 @@ WandExport MagickBooleanType ConjureImageCommand(ImageInfo *image_info,
           {
             (void) FormatLocaleFile(stdout,"Version: %s\n",
               GetMagickVersion((size_t *) NULL));
-            (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
-            (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
+            (void) FormatLocaleFile(stdout,"Copyright: %s\n",
+              GetMagickCopyright());
+            (void) FormatLocaleFile(stdout,"Features: %s\n\n",
+              GetMagickFeatures());
             return(MagickFalse);
           }
         /*

diff --git a/wand/convert.c b/wand/convert.c
index 0ab925b007a029d60ded8a762be8d2be94f437f6..66f49a985f72613283bfdb0dcbff6ff1d3ef85fc 100644 (file)
--- a/wand/convert.c
+++ b/wand/convert.c
@@ -526,8 +526,10 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
         {
           (void) FormatLocaleFile(stdout,"Version: %s\n",
             GetMagickVersion((size_t *) NULL));
-          (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
-          (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
+          (void) FormatLocaleFile(stdout,"Copyright: %s\n",
+            GetMagickCopyright());
+          (void) FormatLocaleFile(stdout,"Features: %s\n\n",
+            GetMagickFeatures());
           return(MagickFalse);
         }
     }
@@ -2899,8 +2901,10 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
           {
             (void) FormatLocaleFile(stdout,"Version: %s\n",
               GetMagickVersion((size_t *) NULL));
-            (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
-            (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
+            (void) FormatLocaleFile(stdout,"Copyright: %s\n",
+              GetMagickCopyright());
+            (void) FormatLocaleFile(stdout,"Features: %s\n\n",
+              GetMagickFeatures());
             break;
           }
         if (LocaleCompare("view",option+1) == 0)

diff --git a/wand/display.c b/wand/display.c
index 3a80c197edba4f24a2d7780f996320170ac3e948..b06a81661b8dab9e134bbe59a7cd4c7479446bd8 100644 (file)
--- a/wand/display.c
+++ b/wand/display.c
@@ -361,8 +361,10 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
         {
           (void) FormatLocaleFile(stdout,"Version: %s\n",
             GetMagickVersion((size_t *) NULL));
-          (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
-          (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
+          (void) FormatLocaleFile(stdout,"Copyright: %s\n",
+            GetMagickCopyright());
+          (void) FormatLocaleFile(stdout,"Features: %s\n\n",
+            GetMagickFeatures());
           return(MagickFalse);
         }
     }
@@ -1789,8 +1791,10 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
           {
             (void) FormatLocaleFile(stdout,"Version: %s\n",
               GetMagickVersion((size_t *) NULL));
-            (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
-            (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
+            (void) FormatLocaleFile(stdout,"Copyright: %s\n",
+              GetMagickCopyright());
+            (void) FormatLocaleFile(stdout,"Features: %s\n\n",
+              GetMagickFeatures());
             break;
           }
         if (LocaleCompare("visual",option+1) == 0)

diff --git a/wand/drawtest.c b/wand/drawtest.c
index 2cc5f098335a7cc5f70d1eb51e0ab3b7e08b6665..9dcec8de0fa0b8b9685999ec69b8f14c29c303b8 100644 (file)
--- a/wand/drawtest.c
+++ b/wand/drawtest.c
@@ -57,7 +57,8 @@
     severity; \
  \
   description=MagickGetException(wand,&severity); \
-  (void) FormatLocaleFile(stderr,"%s %s %lu %s\n",GetMagickModule(),description); \
+  (void) FormatLocaleFile(stderr,"%s %s %lu %s\n",GetMagickModule(), \
+    description); \
   description=(char *) MagickRelinquishMemory(description); \
   exit(-1); \
 }

diff --git a/wand/identify.c b/wand/identify.c
index 687d5601c6fc68b930f47eaf85dbd8cf5e77066b..d0d98a65f0bd575c8c1d1d10d703fef299e228dd 100644 (file)
--- a/wand/identify.c
+++ b/wand/identify.c
@@ -245,8 +245,10 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
         {
           (void) FormatLocaleFile(stdout,"Version: %s\n",
             GetMagickVersion((size_t *) NULL));
-          (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
-          (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
+          (void) FormatLocaleFile(stdout,"Copyright: %s\n",
+            GetMagickCopyright());
+          (void) FormatLocaleFile(stdout,"Features: %s\n\n",
+            GetMagickFeatures());
           return(MagickFalse);
         }
     }

diff --git a/wand/import.c b/wand/import.c
index 19b953e70e1e3524eecb5d26477fe581b6078f33..9fd274ff55f7e91057e043e10c0d7d885b178dd3 100644 (file)
--- a/wand/import.c
+++ b/wand/import.c
@@ -311,8 +311,10 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
         {
           (void) FormatLocaleFile(stdout,"Version: %s\n",
             GetMagickVersion((size_t *) NULL));
-          (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
-          (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
+          (void) FormatLocaleFile(stdout,"Copyright: %s\n",
+            GetMagickCopyright());
+          (void) FormatLocaleFile(stdout,"Features: %s\n\n",
+            GetMagickFeatures());
           return(MagickFalse);
         }
     }
@@ -1274,8 +1276,10 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
           {
             (void) FormatLocaleFile(stdout,"Version: %s\n",
               GetMagickVersion((size_t *) NULL));
-            (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
-            (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
+            (void) FormatLocaleFile(stdout,"Copyright: %s\n",
+              GetMagickCopyright());
+            (void) FormatLocaleFile(stdout,"Features: %s\n\n",
+              GetMagickFeatures());
             break;
           }
         ThrowImportException(OptionError,"UnrecognizedOption",option);

diff --git a/wand/mogrify.c b/wand/mogrify.c
index 17ab1ac9bc53491935049a163e6ce4c6ca609825..ff236a01132b392d04f835d25a5491e08f835dd3 100644 (file)
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -368,8 +368,9 @@ static MagickBooleanType MonitorProgress(const char *text,
   if (locale_message == message)
     locale_message=tag;
   if (p == (char *) NULL)
-    (void) FormatLocaleFile(stderr,"%s: %ld of %lu, %02ld%% complete\r",locale_message,
-      (long) offset,(unsigned long) extent,(long) (100L*offset/(extent-1)));
+    (void) FormatLocaleFile(stderr,"%s: %ld of %lu, %02ld%% complete\r",
+      locale_message,(long) offset,(unsigned long) extent,(long)
+      (100L*offset/(extent-1)));
   else
     (void) FormatLocaleFile(stderr,"%s[%s]: %ld of %lu, %02ld%% complete\r",
       locale_message,p+1,(long) offset,(unsigned long) extent,(long)
@@ -3632,8 +3633,10 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
         {
           (void) FormatLocaleFile(stdout,"Version: %s\n",
             GetMagickVersion((size_t *) NULL));
-          (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
-          (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
+          (void) FormatLocaleFile(stdout,"Copyright: %s\n",
+            GetMagickCopyright());
+          (void) FormatLocaleFile(stdout,"Features: %s\n\n",
+            GetMagickFeatures());
           return(MagickFalse);
         }
     }
@@ -5952,8 +5955,10 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
           {
             (void) FormatLocaleFile(stdout,"Version: %s\n",
               GetMagickVersion((size_t *) NULL));
-            (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
-            (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
+            (void) FormatLocaleFile(stdout,"Copyright: %s\n",
+              GetMagickCopyright());
+            (void) FormatLocaleFile(stdout,"Features: %s\n\n",
+              GetMagickFeatures());
             break;
           }
         if (LocaleCompare("view",option+1) == 0)
@@ -8265,7 +8270,8 @@ WandExport MagickBooleanType MogrifyImages(ImageInfo *image_info,
   status=0;
 
 #if 0
-FormatLocaleFile(stderr, "mogrify start %s %d (%s)\n",argv[0],argc,post?"post":"pre");
+  (void) FormatLocaleFile(stderr, "mogrify start %s %d (%s)\n",argv[0],argc,
+    post?"post":"pre");
 #endif
 
   /*
@@ -8273,7 +8279,6 @@ FormatLocaleFile(stderr, "mogrify start %s %d (%s)\n",argv[0],argc,post?"post":"
   */
   if (post == MagickFalse)
     status&=MogrifyImageList(image_info,argc,argv,images,exception);
-
   /*
     For each image, process simple single image operators
   */
@@ -8282,8 +8287,8 @@ FormatLocaleFile(stderr, "mogrify start %s %d (%s)\n",argv[0],argc,post?"post":"
   for (;;)
   {
 #if 0
-FormatLocaleFile(stderr, "mogrify %ld of %ld\n",
-  (long)GetImageIndexInList(*images),(long)GetImageListLength(*images));
+  (void) FormatLocaleFile(stderr,"mogrify %ld of %ld\n",(long)
+    GetImageIndexInList(*images),(long)GetImageListLength(*images));
 #endif
     status&=MogrifyImage(image_info,argc,argv,images,exception);
     proceed=SetImageProgress(*images,MogrifyImageTag,(MagickOffsetType) i, n);
@@ -8296,8 +8301,8 @@ FormatLocaleFile(stderr, "mogrify %ld of %ld\n",
   }
   assert( *images != (Image *) NULL );
 #if 0
-FormatLocaleFile(stderr, "mogrify end %ld of %ld\n",
-  (long)GetImageIndexInList(*images),(long)GetImageListLength(*images));
+  (void) FormatLocaleFile(stderr,"mogrify end %ld of %ld\n",(long)
+    GetImageIndexInList(*images),(long)GetImageListLength(*images));
 #endif
 
   /*

diff --git a/wand/montage.c b/wand/montage.c
index 795270b3800a43730e20e9f1a7705c00585a2918..52a61b1ba61591282f016f482ee286e86b957894 100644 (file)
--- a/wand/montage.c
+++ b/wand/montage.c
@@ -336,8 +336,10 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
         {
           (void) FormatLocaleFile(stdout,"Version: %s\n",
             GetMagickVersion((size_t *) NULL));
-          (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
-          (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
+          (void) FormatLocaleFile(stdout,"Copyright: %s\n",
+            GetMagickCopyright());
+          (void) FormatLocaleFile(stdout,"Features: %s\n\n",
+            GetMagickFeatures());
           return(MagickFalse);
         }
     }
@@ -1690,8 +1692,10 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
           {
             (void) FormatLocaleFile(stdout,"Version: %s\n",
               GetMagickVersion((size_t *) NULL));
-            (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
-            (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
+            (void) FormatLocaleFile(stdout,"Copyright: %s\n",
+              GetMagickCopyright());
+            (void) FormatLocaleFile(stdout,"Features: %s\n\n",
+              GetMagickFeatures());
             break;
           }
         if (LocaleCompare("virtual-pixel",option+1) == 0)

diff --git a/wand/stream.c b/wand/stream.c
index 9c3f336e8cb5d2f9ea5cfb8e389f04e9f0241b94..7ee17397db998844cd10772cb34090b544babfeb 100644 (file)
--- a/wand/stream.c
+++ b/wand/stream.c
@@ -233,8 +233,10 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
         {
           (void) FormatLocaleFile(stdout,"Version: %s\n",
             GetMagickVersion((size_t *) NULL));
-          (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
-          (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
+          (void) FormatLocaleFile(stdout,"Copyright: %s\n",
+            GetMagickCopyright());
+          (void) FormatLocaleFile(stdout,"Features: %s\n\n",
+            GetMagickFeatures());
           return(MagickFalse);
         }
     }
@@ -721,8 +723,10 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
           {
             (void) FormatLocaleFile(stdout,"Version: %s\n",
               GetMagickVersion((size_t *) NULL));
-            (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
-            (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
+            (void) FormatLocaleFile(stdout,"Copyright: %s\n",
+              GetMagickCopyright());
+            (void) FormatLocaleFile(stdout,"Features: %s\n\n",
+              GetMagickFeatures());
             break;
           }
         if (LocaleCompare("virtual-pixel",option+1) == 0)

diff --git a/wand/wandtest.c b/wand/wandtest.c
index 41d752a8588804713a01f9676ad252a52b2f7d0c..044b4db364f10df842119ad96b472b98e5849536 100644 (file)
--- a/wand/wandtest.c
+++ b/wand/wandtest.c
@@ -67,7 +67,8 @@ int main(int argc,char **argv)
 #define ThrowAPIException(wand) \
 { \
   description=MagickGetException(wand,&severity); \
-  (void) FormatLocaleFile(stderr,"%s %s %lu %s\n",GetMagickModule(),description); \
+  (void) FormatLocaleFile(stderr,"%s %s %lu %s\n",GetMagickModule(), \
+    description); \
   description=(char *) MagickRelinquishMemory(description); \
   exit(-1); \
 }
@@ -559,7 +560,8 @@ int main(int argc,char **argv)
     for (i=0; i < 9; i++)
       if (pixels[i] != primary_colors[i])
         {
-          (void) FormatLocaleFile(stderr,"Get pixels does not match set pixels\n");
+          (void) FormatLocaleFile(stderr,
+            "Get pixels does not match set pixels\n");
           exit(1);
         }
   }
@@ -575,7 +577,8 @@ int main(int argc,char **argv)
   }
   MagickResetIterator(magick_wand);
   (void) MagickSetIteratorIndex(magick_wand,4);
-  (void) FormatLocaleFile(stdout,"Utilitize pixel iterator to draw diagonal...\n");
+  (void) FormatLocaleFile(stdout,
+    "Utilitize pixel iterator to draw diagonal...\n");
   iterator=NewPixelIterator(magick_wand);
   if (iterator == (PixelIterator *) NULL)
     ThrowAPIException(magick_wand);
@@ -592,7 +595,8 @@ int main(int argc,char **argv)
   status=MagickWriteImages(magick_wand,"wandtest_out.miff",MagickTrue);
   if (status == MagickFalse)
     ThrowAPIException(magick_wand);
-  (void) FormatLocaleFile(stdout,"Change image format from \"MIFF\" to \"GIF\"...\n");
+  (void) FormatLocaleFile(stdout,
+    "Change image format from \"MIFF\" to \"GIF\"...\n");
   status=MagickSetImageFormat(magick_wand,"GIF");
   if (status == MagickFalse)
      ThrowAPIException(magick_wand);
@@ -636,7 +640,8 @@ int main(int argc,char **argv)
   status=MagickDeleteOption(magick_wand,"wand:custom-option");
   if (status == MagickFalse)
     ThrowAPIException(magick_wand);
-  (void) FormatLocaleFile(stdout,"Set, list, get, and delete wand property...\n");
+  (void) FormatLocaleFile(stdout,
+    "Set, list, get, and delete wand property...\n");
   status=MagickSetImageProperty(magick_wand,"wand:custom-property",
     CustomProperty);
   if (status == MagickFalse)
@@ -662,7 +667,8 @@ int main(int argc,char **argv)
   status=MagickDeleteImageProperty(magick_wand,"wand:custom-property");
   if (status == MagickFalse)
     ThrowAPIException(magick_wand);
-  (void) FormatLocaleFile(stdout,"Set, list, get, and remove sRGB color profile...\n");
+  (void) FormatLocaleFile(stdout,
+    "Set, list, get, and remove sRGB color profile...\n");
   status=MagickSetImageProfile(magick_wand,"sRGB",sRGBProfile,
     sizeof(sRGBProfile));
   if (status == MagickFalse)