(no commit message)

[imagemagick] / coders / txt.c

diff --git a/coders/txt.c b/coders/txt.c
index 7983477eeaae9cbcdce2289ef96d081442f39153..bc4e03f6fca03571f640c4b81d851f53bae78548 100644 (file)
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -17,7 +17,7 @@
 %                                 July 1992                                   %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2010 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2011 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  %
@@ -457,22 +457,20 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
         if (image->colorspace == CMYKColorspace)
           {
             if (image->matte != MagickFalse)
-              count=(ssize_t) sscanf(text,"%ld,%ld: (%lu,%lu,%lu,%lu,%lu",
-                &x_offset,&y_offset,&pixel.red,&pixel.green,&pixel.blue,
-                &pixel.index,&pixel.opacity);
+              count=(ssize_t) sscanf(text,"%ld,%ld: (%u,%u,%u,%u,%u",&x_offset,
+                &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.index,
+                &pixel.opacity);
             else
-              count=(ssize_t) sscanf(text,"%ld,%ld: (%lu,%lu,%lu,%lu",
-                &x_offset,&y_offset,&pixel.red,&pixel.green,&pixel.blue,
-                &pixel.index);
+              count=(ssize_t) sscanf(text,"%ld,%ld: (%u,%u,%u,%u",&x_offset,
+                &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.index);
           }
         else
           if (image->matte != MagickFalse)
-            count=(ssize_t) sscanf(text,"%ld,%ld: (%lu,%lu,%lu,%lu",
-              &x_offset,&y_offset,&pixel.red,&pixel.green,&pixel.blue,
-              &pixel.opacity);
+            count=(ssize_t) sscanf(text,"%ld,%ld: (%u,%u,%u,%u",&x_offset,
+              &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.opacity);
           else
-            count=(ssize_t) sscanf(text,"%ld,%ld: (%lu,%lu,%lu",
-              &x_offset,&y_offset,&pixel.red,&pixel.green,&pixel.blue);
+            count=(ssize_t) sscanf(text,"%ld,%ld: (%u,%u,%u",&x_offset,
+              &y_offset,&pixel.red,&pixel.green,&pixel.blue);
         if (count < 5)
           continue;
         q=GetAuthenticPixels(image,x_offset,y_offset,1,1,exception);
@@ -661,8 +659,8 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image)
     if (image->matte != MagickFalse)
       (void) ConcatenateMagickString(colorspace,"a",MaxTextExtent);
     (void) FormatMagickString(buffer,MaxTextExtent,
-      "# ImageMagick pixel enumeration: %lu,%lu,%lu,%s\n",(unsigned long)
-      image->columns,(unsigned long) image->rows,(unsigned long)
+      "# ImageMagick pixel enumeration: %.20g,%.20g,%.20g,%s\n",(double)
+      image->columns,(double) image->rows,(double)
       GetQuantumRange(image->depth),colorspace);
     (void) WriteBlobString(image,buffer);
     GetMagickPixelPacket(image,&pixel);
@@ -674,8 +672,8 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image)
       indexes=GetVirtualIndexQueue(image);
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        (void) FormatMagickString(buffer,MaxTextExtent,"%ld,%ld: ",(long) x,
-          (long) y);
+        (void) FormatMagickString(buffer,MaxTextExtent,"%.20g,%.20g: ",(double)
+          x,(double) y);
         (void) WriteBlobString(image,buffer);
         SetMagickPixelPacket(image,p,indexes+x,&pixel);
         (void) CopyMagickString(tuple,"(",MaxTextExtent);
@@ -708,7 +706,7 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image)
         p++;
       }
       status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
-                image->rows);
+        image->rows);
       if (status == MagickFalse)
         break;
     }