From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 26 May 2013 19:22:40 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~3639
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0696de1c50b4fece983d6c88b139ff3d0d534f44;p=imagemagick

---

diff --git a/MagickWand/compare.c b/MagickWand/compare.c
index d5ecbaa03..36536fa89 100644
--- 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 098c33d35..9dfb7fdef 100644
--- 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 d59f3cb9b..50a77c2d5 100644
--- 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 09975af6b..edaef3e2a 100644
--- 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 1962adf84..b85860239 100644
--- 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)