(no commit message)

[imagemagick] / coders / txt.c

diff --git a/coders/txt.c b/coders/txt.c
index 937be743f7ff487b23e9a1f6f2342a9abaf887e8..0d0eeeb1cc80f6e1fbf97ab5bfcd359b11a0ad6a 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  %
@@ -109,7 +109,7 @@ static MagickBooleanType IsTXT(const unsigned char *magick,const size_t length)
   ssize_t
     count;
 
-  size_t
+  unsigned long
     columns,
     depth,
     rows;
@@ -248,13 +248,15 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image,
   (void) SetImageBackgroundColor(image);
   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) FormatMagickString(geometry,MaxTextExtent,"0x0%+ld%+ld",(long) page.x,
+    (long) page.y);
   (void) CloneString(&draw_info->geometry,geometry);
   status=GetTypeMetrics(image,draw_info,&metrics);
   if (status == MagickFalse)
     ThrowReaderException(TypeError,"UnableToGetTypeMetrics");
   page.y=(ssize_t) ceil((double) page.y+metrics.ascent-0.5);
-  (void) FormatMagickString(geometry,MaxTextExtent,"0x0%+ld%+ld",page.x,page.y);
+  (void) FormatMagickString(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')
@@ -368,7 +370,7 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
   IndexPacket
     *indexes;
 
-  ssize_t
+  long
     type,
     x_offset,
     y,
@@ -393,9 +395,11 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
   ssize_t
     count;
 
-  size_t
+  unsigned long
     depth,
-    max_value;
+    height,
+    max_value,
+    width;
 
   /*
     Open image file.
@@ -421,10 +425,12 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
   do
   {
     *colorspace='\0';
-    count=(ssize_t) sscanf(text+32,"%lu,%lu,%lu,%s",&image->columns,
-      &image->rows,&max_value,colorspace);
+    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);
@@ -435,7 +441,7 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
         colorspace[i]='\0';
         image->matte=MagickTrue;
       }
-    type=ParseMagickOption(MagickColorspaceOptions,MagickFalse,colorspace);
+    type=ParseCommandOption(MagickColorspaceOptions,MagickFalse,colorspace);
     if (type < 0)
       ThrowReaderException(CorruptImageError,"ImproperImageHeader");
     image->colorspace=(ColorspaceType) type;
@@ -451,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);
@@ -648,15 +652,16 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image)
   scene=0;
   do
   {
-    (void) CopyMagickString(colorspace,MagickOptionToMnemonic(
+    (void) CopyMagickString(colorspace,CommandOptionToMnemonic(
       MagickColorspaceOptions,(ssize_t) 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,(size_t) GetQuantumRange(image->depth),colorspace);
+      "# 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);
     for (y=0; y < (ssize_t) image->rows; y++)
@@ -667,7 +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: ",x,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);
@@ -699,7 +705,8 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image)
         (void) WriteBlobString(image,"\n");
         p++;
       }
-      status=SetImageProgress(image,SaveImageTag,y,image->rows);
+      status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+        image->rows);
       if (status == MagickFalse)
         break;
     }