From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 13 Mar 2013 10:25:06 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4106
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bbb9b90e57ee620eca646f000f9d3a039421add2;p=imagemagick

---

diff --git a/coders/txt.c b/coders/txt.c
index 6c74bd00f..6a012cd92 100644
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -706,9 +706,6 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image,
         break;
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g,%.20g ",(double)
-          x,(double) y);
-        (void) WriteBlobString(image,buffer);
         GetPixelInfoPixel(image,p,&pixel);
         if (pixel.colorspace == LabColorspace)
           {
@@ -722,7 +719,11 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image,
             */
             if (GetPixelAlpha(image,p) == (Quantum) OpaqueAlpha)
               {
-                (void) QueryColorname(image,&pixel,SVGCompliance,tuple,exception);
+                (void) QueryColorname(image,&pixel,SVGCompliance,tuple,
+                  exception);
+                (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g,%.20g ",
+                  (double) x,(double) y);
+                (void) WriteBlobString(image,buffer);
                 (void) WriteBlobString(image," ");
                 (void) WriteBlobString(image,tuple);
                 (void) WriteBlobString(image," ");
@@ -730,7 +731,9 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image,
             p+=GetPixelChannels(image);
             continue;
           }
-        (void) WriteBlobString(image,": ");
+        (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g,%.20g: ",(double)
+          x,(double) y);
+        (void) WriteBlobString(image,buffer);
         (void) CopyMagickString(tuple,"(",MaxTextExtent);
         if (pixel.colorspace == GRAYColorspace)
           ConcatenateColorComponent(&pixel,GrayPixelChannel,X11Compliance,