(no commit message)

diff --git a/MagickCore/color.c b/MagickCore/color.c
index 186ff5e15ecc8ad2f3ea4ea44b8f976f70907809..0d9e761372b1b5a6176bfa84d8bc1817b63c2457 100644 (file)
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -1454,11 +1454,16 @@ MagickExport void GetColorTuple(const PixelInfo *pixel,
   if (color.matte != MagickFalse)
     (void) ConcatenateMagickString(tuple,"a",MaxTextExtent);
   (void) ConcatenateMagickString(tuple,"(",MaxTextExtent);
-  ConcatenateColorComponent(&color,RedPixelChannel,SVGCompliance,tuple);
-  (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
-  ConcatenateColorComponent(&color,GreenPixelChannel,SVGCompliance,tuple);
-  (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
-  ConcatenateColorComponent(&color,BluePixelChannel,SVGCompliance,tuple);
+  if (color.colorspace == GRAYColorspace)
+    ConcatenateColorComponent(&color,GrayPixelChannel,SVGCompliance,tuple);
+  else
+    {
+      ConcatenateColorComponent(&color,RedPixelChannel,SVGCompliance,tuple);
+      (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
+      ConcatenateColorComponent(&color,GreenPixelChannel,SVGCompliance,tuple);
+      (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
+      ConcatenateColorComponent(&color,BluePixelChannel,SVGCompliance,tuple);
+    }
   if (color.colorspace == CMYKColorspace)
     {
       (void) ConcatenateMagickString(tuple,",",MaxTextExtent);

diff --git a/coders/txt.c b/coders/txt.c
index 9a0f45cf4b099ef28f6628cb3ec92df91f8762be..29ac14ab74cec0363c246a5103b9ed74b0f083e8 100644 (file)
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -442,8 +442,8 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
     if (type < 0)
       ThrowReaderException(CorruptImageError,"ImproperImageHeader");
     image->colorspace=(ColorspaceType) type;
-    (void) ResetMagickMemory(&pixel,0,sizeof(pixel));
     (void) SetImageBackgroundColor(image,exception);
+    GetPixelInfo(image,&pixel);
     range=GetQuantumRange(image->depth);
     for (y=0; y < (ssize_t) image->rows; y++)
     {
@@ -451,35 +451,60 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
       {
         if (ReadBlobString(image,text) == (char *) NULL)
           break;
-        if (image->colorspace == CMYKColorspace)
+        switch (image->colorspace)
+        {
+          case GRAYColorspace:
           {
             if (image->matte != MagickFalse)
-              count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf,%lf,%lf",
-                &x_offset,&y_offset,&pixel.red,&pixel.green,&pixel.blue,
-                &pixel.black,&pixel.alpha);
-            else
-              count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf,%lf",&x_offset,
-                &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.black);
+              {
+                count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf",&x_offset,
+                  &y_offset,&pixel.red,&pixel.alpha);
+                pixel.green=pixel.red;
+                pixel.blue=pixel.red;
+                break;
+              }
+            count=(ssize_t) sscanf(text,"%ld,%ld: (%lf",&x_offset,&y_offset,
+              &pixel.red);
+            pixel.green=pixel.red;
+            pixel.blue=pixel.red;
+            break;       
           }
-        else
-          if (image->matte != MagickFalse)
+          case CMYKColorspace:
+          {
+            if (image->matte != MagickFalse)
+              {
+                count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf,%lf,%lf",
+                  &x_offset,&y_offset,&pixel.red,&pixel.green,&pixel.blue,
+                  &pixel.black,&pixel.alpha);
+                break;
+              }
             count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf,%lf",&x_offset,
-              &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.alpha);
-          else
+              &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.black);
+            break;
+          }
+          default:
+          {
+            if (image->matte != MagickFalse)
+              {
+                count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf,%lf",
+                  &x_offset,&y_offset,&pixel.red,&pixel.green,&pixel.blue,
+                  &pixel.alpha);
+                break;
+              }
             count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf",&x_offset,
               &y_offset,&pixel.red,&pixel.green,&pixel.blue);
-        if (count < 5)
-          continue;
+            break;       
+          }
+        }
+        pixel.red=ScaleAnyToQuantum(pixel.red,range);
+        pixel.green=ScaleAnyToQuantum(pixel.green,range);
+        pixel.blue=ScaleAnyToQuantum(pixel.blue,range);
+        pixel.black=ScaleAnyToQuantum(pixel.black,range);
+        pixel.alpha=ScaleAnyToQuantum(pixel.alpha,range);
         q=GetAuthenticPixels(image,x_offset,y_offset,1,1,exception);
         if (q == (Quantum *) NULL)
           continue;
-        SetPixelRed(image,ScaleAnyToQuantum(pixel.red,range),q);
-        SetPixelGreen(image,ScaleAnyToQuantum(pixel.green,range),q);
-        SetPixelBlue(image,ScaleAnyToQuantum(pixel.blue,range),q);
-        if (image->colorspace == CMYKColorspace)
-          SetPixelBlack(image,ScaleAnyToQuantum(pixel.black,range),q);
-        if (image->matte != MagickFalse)
-          SetPixelAlpha(image,ScaleAnyToQuantum(pixel.alpha,range),q);
+        SetPixelInfoPixel(image,&pixel,q);
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
       }
@@ -670,14 +695,20 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image,
         (void) WriteBlobString(image,buffer);
         GetPixelInfoPixel(image,p,&pixel);
         (void) CopyMagickString(tuple,"(",MaxTextExtent);
-        ConcatenateColorComponent(&pixel,RedPixelChannel,X11Compliance,
-          tuple);
-        (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
-        ConcatenateColorComponent(&pixel,GreenPixelChannel,X11Compliance,
-          tuple);
-        (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
-        ConcatenateColorComponent(&pixel,BluePixelChannel,X11Compliance,
-          tuple);
+        if (pixel.colorspace == GRAYColorspace)
+          ConcatenateColorComponent(&pixel,GrayPixelChannel,X11Compliance,
+            tuple);
+        else
+          {
+            ConcatenateColorComponent(&pixel,RedPixelChannel,X11Compliance,
+              tuple);
+            (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
+            ConcatenateColorComponent(&pixel,GreenPixelChannel,X11Compliance,
+              tuple);
+            (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
+            ConcatenateColorComponent(&pixel,BluePixelChannel,X11Compliance,
+              tuple);
+          }
         if (pixel.colorspace == CMYKColorspace)
           {
             (void) ConcatenateMagickString(tuple,",",MaxTextExtent);