]> granicus.if.org Git - imagemagick/blobdiff - coders/txt.c
(no commit message)
[imagemagick] / coders / txt.c
index f78d891e8aa38f55abcac215c796776876d5cfd6..3aa7eaa866921dec5ff4990ca2a8d3177001ad9e 100644 (file)
@@ -17,7 +17,7 @@
 %                                 July 1992                                   %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2009 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %
 /*
   Include declarations.
 */
-#include "magick/studio.h"
-#include "magick/annotate.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/annotate.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
 \f
 /*
   Forward declarations.
 */
 static MagickBooleanType
-  WriteTXTImage(const ImageInfo *,Image *);
+  WriteTXTImage(const ImageInfo *,Image *,ExceptionInfo *);
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -169,9 +170,6 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image,
   Image
     *texture;
 
-  long
-    offset;
-
   MagickBooleanType
     status;
 
@@ -181,6 +179,9 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image,
   RectangleInfo
     page;
 
+  ssize_t
+    offset;
+
   TypeMetric
     metrics;
 
@@ -199,7 +200,7 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image,
   */
   delta.x=DefaultResolution;
   delta.y=DefaultResolution;
-  if ((image->x_resolution == 0.0) || (image->y_resolution == 0.0))
+  if ((image->resolution.x == 0.0) || (image->resolution.y == 0.0))
     {
       GeometryInfo
         geometry_info;
@@ -208,10 +209,10 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image,
         flags;
 
       flags=ParseGeometry(PSDensityGeometry,&geometry_info);
-      image->x_resolution=geometry_info.rho;
-      image->y_resolution=geometry_info.sigma;
+      image->resolution.x=geometry_info.rho;
+      image->resolution.y=geometry_info.sigma;
       if ((flags & SigmaValue) == 0)
-        image->y_resolution=image->x_resolution;
+        image->resolution.y=image->resolution.x;
     }
   page.width=612;
   page.height=792;
@@ -222,9 +223,10 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image,
   /*
     Initialize Image structure.
   */
-  image->columns=(unsigned long) (((page.width*image->x_resolution)/
+  image->columns=(size_t) floor((((double) page.width*image->resolution.x)/
     delta.x)+0.5);
-  image->rows=(unsigned long) (((page.height*image->y_resolution)/delta.y)+0.5);
+  image->rows=(size_t) floor((((double) page.height*image->resolution.y)/
+    delta.y)+0.5);
   image->page.x=0;
   image->page.y=0;
   texture=(Image *) NULL;
@@ -243,16 +245,18 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image,
   /*
     Annotate the text image.
   */
-  (void) SetImageBackgroundColor(image);
+  (void) SetImageBackgroundColor(image,exception);
   draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL);
   (void) CloneString(&draw_info->text,image_info->filename);
-  (void) FormatMagickString(geometry,MaxTextExtent,"0x0%+ld%+ld",page.x,page.y);
+  (void) FormatLocaleString(geometry,MaxTextExtent,"0x0%+ld%+ld",(long) page.x,
+    (long) page.y);
   (void) CloneString(&draw_info->geometry,geometry);
-  status=GetTypeMetrics(image,draw_info,&metrics);
+  status=GetTypeMetrics(image,draw_info,&metrics,exception);
   if (status == MagickFalse)
     ThrowReaderException(TypeError,"UnableToGetTypeMetrics");
-  page.y=(long) (page.y+metrics.ascent+0.5);
-  (void) FormatMagickString(geometry,MaxTextExtent,"0x0%+ld%+ld",page.x,page.y);
+  page.y=(ssize_t) ceil((double) page.y+metrics.ascent-0.5);
+  (void) FormatLocaleString(geometry,MaxTextExtent,"0x0%+ld%+ld",(long) page.x,
+    (long) page.y);
   (void) CloneString(&draw_info->geometry,geometry);
   (void) CopyMagickString(filename,image_info->filename,MaxTextExtent);
   if (*draw_info->text != '\0')
@@ -265,7 +269,7 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image,
     */
     (void) ConcatenateString(&draw_info->text,text);
     (void) ConcatenateString(&draw_info->text,"\n");
-    offset+=(long) (metrics.ascent-metrics.descent);
+    offset+=(ssize_t) (metrics.ascent-metrics.descent);
     if (image->previous == (Image *) NULL)
       {
         status=SetImageProgress(image,LoadImageTag,offset,image->rows);
@@ -273,7 +277,7 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image,
           break;
       }
     p=ReadBlobString(image,text);
-    if ((offset < (long) image->rows) && (p != (char *) NULL))
+    if ((offset < (ssize_t) image->rows) && (p != (char *) NULL))
       continue;
     if (texture != (Image *) NULL)
       {
@@ -282,11 +286,11 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image,
 
         progress_monitor=SetImageProgressMonitor(image,
           (MagickProgressMonitor) NULL,image->client_data);
-        (void) TextureImage(image,texture);
+        (void) TextureImage(image,texture,exception);
         (void) SetImageProgressMonitor(image,progress_monitor,
           image->client_data);
       }
-    (void) AnnotateImage(image,draw_info);
+    (void) AnnotateImage(image,draw_info,exception);
     if (p == (char *) NULL)
       break;
     /*
@@ -294,7 +298,7 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image,
     */
     *draw_info->text='\0';
     offset=2*page.y;
-    AcquireNextImage(image_info,image);
+    AcquireNextImage(image_info,image,exception);
     if (GetNextImageInList(image) == (Image *) NULL)
       {
         image=DestroyImageList(image);
@@ -304,7 +308,7 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image,
     image->next->rows=image->rows;
     image=SyncNextImageInList(image);
     (void) CopyMagickString(image->filename,filename,MaxTextExtent);
-    (void) SetImageBackgroundColor(image);
+    (void) SetImageBackgroundColor(image,exception);
     status=SetImageProgress(image,LoadImagesTag,TellBlob(image),
       GetBlobSize(image));
     if (status == MagickFalse)
@@ -317,10 +321,10 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image,
 
       progress_monitor=SetImageProgressMonitor(image,
         (MagickProgressMonitor) NULL,image->client_data);
-      (void) TextureImage(image,texture);
+      (void) TextureImage(image,texture,exception);
       (void) SetImageProgressMonitor(image,progress_monitor,image->client_data);
     }
-  (void) AnnotateImage(image,draw_info);
+  (void) AnnotateImage(image,draw_info,exception);
   if (texture != (Image *) NULL)
     texture=DestroyImage(texture);
   draw_info=DestroyDrawInfo(draw_info);
@@ -363,15 +367,13 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
   Image
     *image;
 
-  IndexPacket
-    *indexes;
-
   long
     type,
-    x,
-    y;
+    x_offset,
+    y,
+    y_offset;
 
-  LongPixelPacket
+  PixelInfo
     pixel;
 
   MagickBooleanType
@@ -380,10 +382,11 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
   QuantumAny
     range;
 
-  register long
-    i;
+  register ssize_t
+    i,
+    x;
 
-  register PixelPacket
+  register Quantum
     *q;
 
   ssize_t
@@ -391,7 +394,9 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
 
   unsigned long
     depth,
-    max_value;
+    height,
+    max_value,
+    width;
 
   /*
     Open image file.
@@ -403,7 +408,7 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
       image_info->filename);
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickSignature);
-  image=AcquireImage(image_info);
+  image=AcquireImage(image_info,exception);
   status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
   if (status == MagickFalse)
     {
@@ -414,65 +419,126 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
   (void) ReadBlobString(image,text);
   if (LocaleNCompare((char *) text,MagickID,strlen(MagickID)) != 0)
     return(ReadTEXTImage(image_info,image,text,exception));
-  *colorspace='\0';
-  count=(ssize_t) sscanf(text+32,"%lu,%lu,%lu,%s",&image->columns,
-    &image->rows,&max_value,colorspace);
-  if (count != 4)
-    ThrowReaderException(CorruptImageError,"ImproperImageHeader");
-  for (depth=1; (GetQuantumRange(depth)+1) < max_value; depth++) ;
-  image->depth=depth;
-  LocaleLower(colorspace);
-  i=(long) strlen(colorspace)-1;
-  image->matte=MagickFalse;
-  if ((i > 0) && (colorspace[i] == 'a'))
-    {
-      colorspace[i]='\0';
-      image->matte=MagickTrue;
-    }
-  type=ParseMagickOption(MagickColorspaceOptions,MagickFalse,colorspace);
-  if (type < 0)
-    ThrowReaderException(CorruptImageError,"ImproperImageHeader");
-  image->colorspace=(ColorspaceType) type;
-  (void) ResetMagickMemory(&pixel,0,sizeof(pixel));
-  (void) SetImageBackgroundColor(image);
-  range=GetQuantumRange(image->depth);
-  while (ReadBlobString(image,text) != (char *) NULL)
+  do
   {
-    if (image->colorspace == CMYKColorspace)
+    *colorspace='\0';
+    count=(ssize_t) sscanf(text+32,"%lu,%lu,%lu,%s",&width,&height,&max_value,
+      colorspace);
+    if (count != 4)
+      ThrowReaderException(CorruptImageError,"ImproperImageHeader");
+    image->columns=width;
+    image->rows=height;
+    for (depth=1; (GetQuantumRange(depth)+1) < max_value; depth++) ;
+    image->depth=depth;
+    LocaleLower(colorspace);
+    i=(ssize_t) strlen(colorspace)-1;
+    image->alpha_trait=UndefinedPixelTrait;
+    if ((i > 0) && (colorspace[i] == 'a'))
       {
-        if (image->matte != MagickFalse)
-          count=(ssize_t) sscanf(text,"%ld,%ld: (%lu,%lu,%lu,%lu,%lu",&x,&y,
-            &pixel.red,&pixel.green,&pixel.blue,&pixel.index,&pixel.opacity);
-        else
-          count=(ssize_t) sscanf(text,"%ld,%ld: (%lu,%lu,%lu,%lu",&x,&y,
-            &pixel.red,&pixel.green,&pixel.blue,&pixel.index);
+        colorspace[i]='\0';
+        image->alpha_trait=BlendPixelTrait;
       }
-    else
-      if (image->matte != MagickFalse)
-        count=(ssize_t) sscanf(text,"%ld,%ld: (%lu,%lu,%lu,%lu",&x,&y,
-          &pixel.red,&pixel.green,&pixel.blue,&pixel.opacity);
-      else
-        count=(ssize_t) sscanf(text,"%ld,%ld: (%lu,%lu,%lu",&x,&y,
-          &pixel.red,&pixel.green,&pixel.blue);
-    if (count < 5)
-      continue;
-    q=GetAuthenticPixels(image,x,y,1,1,exception);
-    if (q == (PixelPacket *) NULL)
-      continue;
-    q->red=ScaleAnyToQuantum(pixel.red,range);
-    q->green=ScaleAnyToQuantum(pixel.green,range);
-    q->blue=ScaleAnyToQuantum(pixel.blue,range);
-    if (image->colorspace == CMYKColorspace)
+    type=ParseCommandOption(MagickColorspaceOptions,MagickFalse,colorspace);
+    if (type < 0)
+      ThrowReaderException(CorruptImageError,"ImproperImageHeader");
+    (void) SetImageBackgroundColor(image,exception);
+    (void) SetImageColorspace(image,(ColorspaceType) type,exception);
+    GetPixelInfo(image,&pixel);
+    range=GetQuantumRange(image->depth);
+    for (y=0; y < (ssize_t) image->rows; y++)
+    {
+      double
+        alpha,
+        black,
+        blue,
+        green,
+        red;
+
+      for (x=0; x < (ssize_t) image->columns; x++)
       {
-        indexes=GetAuthenticIndexQueue(image);
-        *indexes=ScaleAnyToQuantum(pixel.index,range);
+        if (ReadBlobString(image,text) == (char *) NULL)
+          break;
+        switch (image->colorspace)
+        {
+          case GRAYColorspace:
+          {
+            if (image->alpha_trait == BlendPixelTrait)
+              {
+                count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf",&x_offset,
+                  &y_offset,&red,&alpha);
+                green=red;
+                blue=red;
+                break;
+              }
+            count=(ssize_t) sscanf(text,"%ld,%ld: (%lf",&x_offset,&y_offset,
+              &red);
+            green=red;
+            blue=red;
+            break;       
+          }
+          case CMYKColorspace:
+          {
+            if (image->alpha_trait == BlendPixelTrait)
+              {
+                count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf,%lf,%lf",
+                  &x_offset,&y_offset,&red,&green,&blue,&black,&alpha);
+                break;
+              }
+            count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf,%lf",&x_offset,
+              &y_offset,&red,&green,&blue,&black);
+            break;
+          }
+          default:
+          {
+            if (image->alpha_trait == BlendPixelTrait)
+              {
+                count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf,%lf",
+                  &x_offset,&y_offset,&red,&green,&blue,&alpha);
+                break;
+              }
+            count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf",&x_offset,
+              &y_offset,&red,&green,&blue);
+            break;       
+          }
+        }
+        if (image->colorspace == LabColorspace)
+          {
+            green+=(range+1)/2.0;
+            blue+=(range+1)/2.0;
+          }
+        pixel.red=ScaleAnyToQuantum((QuantumAny) (red+0.5),range);
+        pixel.green=ScaleAnyToQuantum((QuantumAny) (green+0.5),range);
+        pixel.blue=ScaleAnyToQuantum((QuantumAny) (blue+0.5),range);
+        pixel.black=ScaleAnyToQuantum((QuantumAny) (black+0.5),range);
+        pixel.alpha=ScaleAnyToQuantum((QuantumAny) (alpha+0.5),range);
+        q=GetAuthenticPixels(image,x_offset,y_offset,1,1,exception);
+        if (q == (Quantum *) NULL)
+          continue;
+        SetPixelInfoPixel(image,&pixel,q);
+        if (SyncAuthenticPixels(image,exception) == MagickFalse)
+          break;
       }
-    if (image->matte != MagickFalse)
-      q->opacity=(Quantum) (QuantumRange-ScaleAnyToQuantum(pixel.opacity,
-        range));
-    if (SyncAuthenticPixels(image,exception) == MagickFalse)
-      break;
-  }
+    }
+    (void) ReadBlobString(image,text);
+    if (LocaleNCompare((char *) text,MagickID,strlen(MagickID)) == 0)
+      {
+        /*
+          Allocate next image structure.
+        */
+        AcquireNextImage(image_info,image,exception);
+        if (GetNextImageInList(image) == (Image *) NULL)
+          {
+            image=DestroyImageList(image);
+            return((Image *) NULL);
+          }
+        image=SyncNextImageInList(image);
+        status=SetImageProgress(image,LoadImagesTag,TellBlob(image),
+          GetBlobSize(image));
+        if (status == MagickFalse)
+          break;
+      }
+  } while (LocaleNCompare((char *) text,MagickID,strlen(MagickID)) == 0);
+  (void) CloseBlob(image);
   return(GetFirstImageInList(image));
 }
 \f
@@ -496,10 +562,10 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
 %
 %  The format of the RegisterTXTImage method is:
 %
-%      unsigned long RegisterTXTImage(void)
+%      size_t RegisterTXTImage(void)
 %
 */
-ModuleExport unsigned long RegisterTXTImage(void)
+ModuleExport size_t RegisterTXTImage(void)
 {
   MagickInfo
     *entry;
@@ -508,7 +574,6 @@ ModuleExport unsigned long RegisterTXTImage(void)
   entry->decoder=(DecodeImageHandler *) ReadTXTImage;
   entry->encoder=(EncodeImageHandler *) WriteTXTImage;
   entry->raw=MagickTrue;
-  entry->adjoin=MagickFalse;
   entry->endian_support=MagickTrue;
   entry->description=ConstantString("Text");
   entry->module=ConstantString("TXT");
@@ -516,7 +581,6 @@ ModuleExport unsigned long RegisterTXTImage(void)
   entry=SetMagickInfo("TXT");
   entry->decoder=(DecodeImageHandler *) ReadTXTImage;
   entry->encoder=(EncodeImageHandler *) WriteTXTImage;
-  entry->adjoin=MagickFalse;
   entry->description=ConstantString("Text");
   entry->magick=(IsImageFormatHandler *) IsTXT;
   entry->module=ConstantString("TXT");
@@ -564,7 +628,8 @@ ModuleExport void UnregisterTXTImage(void)
 %
 %  The format of the WriteTXTImage method is:
 %
-%      MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image)
+%      MagickBooleanType WriteTXTImage(const ImageInfo *image_info,
+%        Image *image,ExceptionInfo *exception)
 %
 %  A description of each parameter follows.
 %
@@ -572,32 +637,35 @@ ModuleExport void UnregisterTXTImage(void)
 %
 %    o image:  The image.
 %
+%    o exception: return any errors or warnings in this structure.
+%
 */
-static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image)
+static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image,
+  ExceptionInfo *exception)
 {
   char
     buffer[MaxTextExtent],
     colorspace[MaxTextExtent],
     tuple[MaxTextExtent];
 
-  long
-    y;
-
   MagickBooleanType
     status;
 
-  MagickPixelPacket
-    pixel;
+  MagickOffsetType
+    scene;
 
-  register const IndexPacket
-    *indexes;
+  PixelInfo
+    pixel;
 
-  register const PixelPacket
+  register const Quantum
     *p;
 
-  register long
+  register ssize_t
     x;
 
+  ssize_t
+    y;
+
   /*
     Open output image file.
   */
@@ -607,64 +675,92 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image)
   assert(image->signature == MagickSignature);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
-  status=OpenBlob(image_info,image,WriteBlobMode,&image->exception);
+  status=OpenBlob(image_info,image,WriteBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  (void) CopyMagickString(colorspace,MagickOptionToMnemonic(
-    MagickColorspaceOptions,(long) image->colorspace),MaxTextExtent);
-  LocaleLower(colorspace);
-  image->depth=GetImageQuantumDepth(image,MagickTrue);
-  if (image->matte != MagickFalse)
-    (void) ConcatenateMagickString(colorspace,"a",MaxTextExtent);
-  (void) FormatMagickString(buffer,MaxTextExtent,
-    "# ImageMagick pixel enumeration: %lu,%lu,%lu,%s\n",image->columns,
-    image->rows,(unsigned long) GetQuantumRange(image->depth),colorspace);
-  (void) WriteBlobString(image,buffer);
-  GetMagickPixelPacket(image,&pixel);
-  for (y=0; y < (long) image->rows; y++)
+  scene=0;
+  do
   {
-    p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
-    if (p == (const PixelPacket *) NULL)
-      break;
-    indexes=GetVirtualIndexQueue(image);
-    for (x=0; x < (long) image->columns; x++)
+    (void) CopyMagickString(colorspace,CommandOptionToMnemonic(
+      MagickColorspaceOptions,(ssize_t) image->colorspace),MaxTextExtent);
+    LocaleLower(colorspace);
+    image->depth=GetImageQuantumDepth(image,MagickTrue);
+    if (image->alpha_trait == BlendPixelTrait)
+      (void) ConcatenateMagickString(colorspace,"a",MaxTextExtent);
+    (void) FormatLocaleString(buffer,MaxTextExtent,
+      "# ImageMagick pixel enumeration: %.20g,%.20g,%.20g,%s\n",(double)
+      image->columns,(double) image->rows,(double)
+      GetQuantumRange(image->depth),colorspace);
+    (void) WriteBlobString(image,buffer);
+    GetPixelInfo(image,&pixel);
+    for (y=0; y < (ssize_t) image->rows; y++)
     {
-      (void) FormatMagickString(buffer,MaxTextExtent,"%ld,%ld: ",x,y);
-      (void) WriteBlobString(image,buffer);
-      SetMagickPixelPacket(image,p,indexes+x,&pixel);
-      (void) CopyMagickString(tuple,"(",MaxTextExtent);
-      ConcatenateColorComponent(&pixel,RedChannel,X11Compliance,tuple);
-      (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
-      ConcatenateColorComponent(&pixel,GreenChannel,X11Compliance,tuple);
-      (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
-      ConcatenateColorComponent(&pixel,BlueChannel,X11Compliance,tuple);
-      if (pixel.colorspace == CMYKColorspace)
-        {
-          (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
-          ConcatenateColorComponent(&pixel,IndexChannel,X11Compliance,tuple);
-        }
-      if (pixel.matte != MagickFalse)
-        {
-          (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
-          ConcatenateColorComponent(&pixel,AlphaChannel,X11Compliance,tuple);
-        }
-      (void) ConcatenateMagickString(tuple,")",MaxTextExtent);
-      (void) WriteBlobString(image,tuple);
-      (void) WriteBlobString(image,"  ");
-      GetColorTuple(&pixel,MagickTrue,tuple);
-      (void) FormatMagickString(buffer,MaxTextExtent,"%s",tuple);
-      (void) WriteBlobString(image,buffer);
-      (void) WriteBlobString(image,"  ");
-      (void) QueryMagickColorname(image,&pixel,SVGCompliance,tuple,
-        &image->exception);
-      (void) WriteBlobString(image,tuple);
-      (void) WriteBlobString(image,"\n");
-      p++;
+      p=GetVirtualPixels(image,0,y,image->columns,1,exception);
+      if (p == (const Quantum *) NULL)
+        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)
+          {
+            pixel.green-=(QuantumRange+1)/2.0;
+            pixel.blue-=(QuantumRange+1)/2.0;
+          }
+        (void) CopyMagickString(tuple,"(",MaxTextExtent);
+        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);
+            ConcatenateColorComponent(&pixel,BlackPixelChannel,X11Compliance,
+              tuple);
+          }
+        if (pixel.alpha_trait == BlendPixelTrait)
+          {
+            (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
+            ConcatenateColorComponent(&pixel,AlphaPixelChannel,X11Compliance,
+              tuple);
+          }
+        (void) ConcatenateMagickString(tuple,")",MaxTextExtent);
+        (void) WriteBlobString(image,tuple);
+        (void) WriteBlobString(image,"  ");
+        GetColorTuple(&pixel,MagickTrue,tuple);
+        (void) FormatLocaleString(buffer,MaxTextExtent,"%s",tuple);
+        (void) WriteBlobString(image,buffer);
+        (void) WriteBlobString(image,"  ");
+        (void) QueryColorname(image,&pixel,SVGCompliance,tuple,exception);
+        (void) WriteBlobString(image,tuple);
+        (void) WriteBlobString(image,"\n");
+        p+=GetPixelChannels(image);
+      }
+      status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+        image->rows);
+      if (status == MagickFalse)
+        break;
     }
-    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+    if (GetNextImageInList(image) == (Image *) NULL)
+      break;
+    image=SyncNextImageInList(image);
+    status=SetImageProgress(image,SaveImagesTag,scene++,
+      GetImageListLength(image));
     if (status == MagickFalse)
       break;
-  }
+  } while (image_info->adjoin != MagickFalse);
   (void) CloseBlob(image);
   return(MagickTrue);
 }