From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 30 May 2010 00:18:58 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~9358
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7866323484789ba96e62dbd0a69a25545b5e39ab;p=imagemagick

---

diff --git a/coders/txt.c b/coders/txt.c
index 7983477ee..0b22ae82b 100644
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -396,9 +396,14 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
     count;
 
   unsigned long
+    blue,
     depth,
+    green,
     height,
+    index,
     max_value,
+    opacity,
+    red,
     width;
 
   /*
@@ -458,21 +463,23 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
           {
             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);
+                &x_offset,&y_offset,&red,&green,&blue,&index,&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);
+                &x_offset,&y_offset,&red,&green,&blue,&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);
+              &x_offset,&y_offset,&red,&green,&blue,&opacity);
           else
             count=(ssize_t) sscanf(text,"%ld,%ld: (%lu,%lu,%lu",
-              &x_offset,&y_offset,&pixel.red,&pixel.green,&pixel.blue);
+              &x_offset,&y_offset,&red,&green,&blue);
+        pixel.red=red;
+        pixel.green=green;
+        pixel.blue=blue;
+        pixel.opacity=opacity;
+        pixel.index=index;
         if (count < 5)
           continue;
         q=GetAuthenticPixels(image,x_offset,y_offset,1,1,exception);
diff --git a/wand/wandtest.c b/wand/wandtest.c
index 5dcada7d7..2535b0b14 100644
--- a/wand/wandtest.c
+++ b/wand/wandtest.c
@@ -490,7 +490,8 @@ int main(int argc,char **argv)
   MagickResetIterator(magick_wand);
   while (MagickNextImage(magick_wand) != MagickFalse)
     (void) fprintf(stdout,"index %ld scene %lu\n",(long)
-      MagickGetIteratorIndex(magick_wand),MagickGetImageScene(magick_wand));
+      MagickGetIteratorIndex(magick_wand),(unsigned long)
+      MagickGetImageScene(magick_wand));
   (void) fprintf(stdout,"Apply image processing options...\n");
   status=MagickCropImage(magick_wand,60,60,10,10);
   if (status == MagickFalse)