(no commit message)

diff --git a/MagickWand/compare.c b/MagickWand/compare.c
index d5ecbaa0372363072e01b2a43c418fbe136e4ae3..36536fa89b309f9287235b1573209ce39965678a 100644 (file)
--- a/MagickWand/compare.c
+++ b/MagickWand/compare.c
@@ -1009,7 +1009,6 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
                   (reconstruct_image->rows != image->rows))
                 (void) FormatLocaleFile(stderr," @ %.20g,%.20g",(double)
                   difference_image->page.x,(double) difference_image->page.y);
-              (void) FormatLocaleFile(stderr,"\n");
               break;
             }
             case AbsoluteErrorMetric:
@@ -1021,7 +1020,6 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
                   (reconstruct_image->rows != image->rows))
                 (void) FormatLocaleFile(stderr," @ %.20g,%.20g",(double)
                   difference_image->page.x,(double) difference_image->page.y);
-              (void) FormatLocaleFile(stderr,"\n");
               break;
             }
             case MeanErrorPerPixelMetric:
@@ -1033,7 +1031,6 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
                   (reconstruct_image->rows != image->rows))
                 (void) FormatLocaleFile(stderr," @ %.20g,%.20g",(double)
                   difference_image->page.x,(double) difference_image->page.y);
-              (void) FormatLocaleFile(stderr,"\n");
               break;
             }
             case UndefinedMetric:
@@ -1194,7 +1191,6 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
             ThrowCompareException(ResourceLimitError,"MemoryAllocationFailed",
               GetExceptionMessage(errno));
           (void) ConcatenateString(&(*metadata),text);
-          (void) ConcatenateString(&(*metadata),"\n");
           text=DestroyString(text);
         }
       difference_image=DestroyImageList(difference_image);

diff --git a/MagickWand/composite.c b/MagickWand/composite.c
index 098c33d35fd91d1d18a5540d17e7cc68bcb3a4d0..9dfb7fdefb544593e06fab16adc4612d77adf964 100644 (file)
--- a/MagickWand/composite.c
+++ b/MagickWand/composite.c
@@ -1646,7 +1646,6 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
         ThrowCompositeException(ResourceLimitError,"MemoryAllocationFailed",
           GetExceptionMessage(errno));
       (void) ConcatenateString(&(*metadata),text);
-      (void) ConcatenateString(&(*metadata),"\n");
       text=DestroyString(text);
     }
   images=DestroyImage(images);

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index d59f3cb9b0f935e3d4f3b3e4771041120b4b1991..50a77c2d5f374a93b2ae0176c8807cfcf0b8967e 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -181,7 +181,6 @@ WandExport MagickBooleanType MagickCommandGenesis(ImageInfo *image_info,
         if ((metadata != (char **) NULL) && (*metadata != (char *) NULL))
           {
             (void) fputs(*metadata,stdout);
-            (void) fputc('\n',stdout);
             *metadata=DestroyString(*metadata);
           }
       return(status);
@@ -223,7 +222,6 @@ WandExport MagickBooleanType MagickCommandGenesis(ImageInfo *image_info,
           if ((metadata != (char **) NULL) && (*metadata != (char *) NULL))
             {
               (void) fputs(*metadata,stdout);
-              (void) fputc('\n',stdout);
               *metadata=DestroyString(*metadata);
             }
         }
@@ -259,7 +257,6 @@ WandExport MagickBooleanType MagickCommandGenesis(ImageInfo *image_info,
             if ((metadata != (char **) NULL) && (*metadata != (char *) NULL))
               {
                 (void) fputs(*metadata,stdout);
-                (void) fputc('\n',stdout);
                 *metadata=DestroyString(*metadata);
               }
           }

diff --git a/MagickWand/montage.c b/MagickWand/montage.c
index 09975af6b72d76f8f4d31341b46dcf43e30528ba..edaef3e2a30a7574eb87c6d6bf7d508b318e4079 100644 (file)
--- a/MagickWand/montage.c
+++ b/MagickWand/montage.c
@@ -1,4 +1,3 @@
-/*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
 %                                                                             %
@@ -1790,7 +1789,6 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             ThrowMontageException(ResourceLimitError,"MemoryAllocationFailed",
               GetExceptionMessage(errno));
           (void) ConcatenateString(&(*metadata),text);
-          (void) ConcatenateString(&(*metadata),"\n");
           text=DestroyString(text);
         }
     }

diff --git a/MagickWand/stream.c b/MagickWand/stream.c
index 1962adf8422ad013619ed7f41c7e726f46111ee6..b85860239f81266014884ca15a014d0cbbf47011 100644 (file)
--- a/MagickWand/stream.c
+++ b/MagickWand/stream.c
@@ -731,8 +731,8 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
             method=ParseCommandOption(MagickVirtualPixelOptions,MagickFalse,
               argv[i]);
             if (method < 0)
-              ThrowStreamException(OptionError,
-                "UnrecognizedVirtualPixelMethod",argv[i]);
+              ThrowStreamException(OptionError,"UnrecognizedVirtualPixelMethod",
+                argv[i]);
             break;
           }
         ThrowStreamException(OptionError,"UnrecognizedOption",option)