From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 29 May 2010 13:25:01 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~9370
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6b6ece8afea47c6a48f0e189f8f0296606d40f2;p=imagemagick

---

diff --git a/coders/xpm.c b/coders/xpm.c
index 51654fb49..6c7d866cc 100644
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -257,7 +257,7 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception)
   ssize_t
     count;
 
-  unsigned long
+  size_t
     colors,
     columns,
     rows,
@@ -314,11 +314,11 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception)
     if (*p != '"')
       continue;
     count=(ssize_t) sscanf(p+1,"%lu %lu %lu %lu",&columns,&rows,&colors,&width);
-    if (count == 4)
-      break;
     image->columns=columns;
     image->rows=rows;
     image->colors=colors;
+    if (count == 4)
+      break;
   }
   if ((count != 4) || (width > 10) || (image->columns == 0) ||
       (image->rows == 0) || (image->colors == 0))
@@ -742,9 +742,9 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info,
     "static char *%s[] = {\n",basename);
   (void) WriteBlobString(image,buffer);
   (void) WriteBlobString(image,"/* columns rows colors chars-per-pixel */\n");
-  (void) FormatMagickString(buffer,MaxTextExtent,"\"%lu %lu %lu %ld\",\n",
+  (void) FormatMagickString(buffer,MaxTextExtent,"\"%lu %lu %lu %lu\",\n",
     (unsigned long) picon->columns,(unsigned long) picon->rows,(unsigned long)
-    colors,(long) characters_per_pixel);
+    colors,(unsigned long) characters_per_pixel);
   (void) WriteBlobString(image,buffer);
   GetMagickPixelPacket(image,&pixel);
   for (i=0; i < (ssize_t) colors; i++)
@@ -774,8 +774,8 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info,
       symbol[j]=Cixel[k];
     }
     symbol[j]='\0';
-    (void) FormatMagickString(buffer,MaxTextExtent,"\"%s c %s\",\n",symbol,
-      name);
+    (void) FormatMagickString(buffer,MaxTextExtent,"\"%s c %s\",\n",
+       symbol,name);
     (void) WriteBlobString(image,buffer);
   }
   /*
@@ -974,9 +974,9 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image)
     "static char *%s[] = {\n",basename);
   (void) WriteBlobString(image,buffer);
   (void) WriteBlobString(image,"/* columns rows colors chars-per-pixel */\n");
-  (void) FormatMagickString(buffer,MaxTextExtent,"\"%lu %lu %lu %ld\",\n",
-    (unsigned long) image->columns,(unsigned long) image->rows,
-    (unsigned long) image->colors,(long) characters_per_pixel);
+  (void) FormatMagickString(buffer,MaxTextExtent,"\"%lu %lu %lu %lu\",\n",
+    (unsigned long) image->columns,(unsigned long) image->rows,(unsigned long)
+    image->colors,(unsigned long) characters_per_pixel);
   (void) WriteBlobString(image,buffer);
   GetMagickPixelPacket(image,&pixel);
   for (i=0; i < (ssize_t) image->colors; i++)
@@ -1036,8 +1036,7 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image)
     (void) WriteBlobString(image,buffer);
     if (image->previous == (Image *) NULL)
       {
-        status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
-                image->rows);
+        status=SetImageProgress(image,SaveImageTag,y,image->rows);
         if (status == MagickFalse)
           break;
       }
diff --git a/magick/quantum-private.h b/magick/quantum-private.h
index d56a3e9b0..dd8b76d11 100644
--- a/magick/quantum-private.h
+++ b/magick/quantum-private.h
@@ -312,7 +312,7 @@ static inline Quantum ScaleAnyToQuantum(const QuantumAny quantum,
 static inline QuantumAny ScaleQuantumToAny(const Quantum quantum,
   const QuantumAny range)
 {
-  return((QuantumAny) (((MagickRealType) range*quantum)/QuantumRange)+0.5);
+  return((QuantumAny) (((MagickRealType) range*quantum)/QuantumRange+0.5));
 }
 
 #if (MAGICKCORE_QUANTUM_DEPTH == 8)
diff --git a/wand/wandtest.c b/wand/wandtest.c
index 3f31795fc..5dcada7d7 100644
--- a/wand/wandtest.c
+++ b/wand/wandtest.c
@@ -448,16 +448,18 @@ int main(int argc,char **argv)
     ThrowAPIException(magick_wand);
   if (MagickGetNumberImages(magick_wand) != 5)
     (void) fprintf(stderr,"read %lu images; expected 5\n",
-      (size_t) MagickGetNumberImages(magick_wand));
+      (unsigned long) MagickGetNumberImages(magick_wand));
   (void) fprintf(stdout,"Iterate forward...\n");
   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,"Iterate reverse...\n");
   while (MagickPreviousImage(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,"Remove scene 1...\n");
   (void) MagickSetIteratorIndex(magick_wand,1);
   clone_wand=MagickGetImage(magick_wand);
@@ -467,7 +469,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,"Insert scene 1 back in sequence...\n");
   (void) MagickSetIteratorIndex(magick_wand,0);
   status=MagickAddImage(magick_wand,clone_wand);
@@ -476,7 +479,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,"Set scene 2 to scene 1...\n");
   (void) MagickSetIteratorIndex(magick_wand,2);
   status=MagickSetImage(magick_wand,clone_wand);