From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 3 Jun 2010 17:15:02 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~9314
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75a2623568540f98985ce5bb1d88687eb9c85d2e;p=imagemagick

---

diff --git a/tests/validate.c b/tests/validate.c
index effa271fb..8ead526a0 100644
--- a/tests/validate.c
+++ b/tests/validate.c
@@ -108,14 +108,14 @@ static size_t ValidateCompareCommand(ImageInfo *image_info,
   for (i=0; compare_options[i] != (char *) NULL; i++)
   {
     CatchException(exception);
-    (void) fprintf(stdout,"  test %lu: %s",(unsigned long) test++,
+    (void) fprintf(stdout,"  test %.20g: %s",(double) (test++),
       compare_options[i]);
     (void) FormatMagickString(command,MaxTextExtent,"%s %s %s %s",
       compare_options[i],reference_filename,reference_filename,output_filename);
     arguments=StringToArgv(command,&number_arguments);
     if (arguments == (char **) NULL)
       {
-        (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
         (*fail)++;
         continue;
       }
@@ -126,14 +126,15 @@ static size_t ValidateCompareCommand(ImageInfo *image_info,
     arguments=(char **) RelinquishMagickMemory(arguments);
     if (status != MagickFalse)
       {
-        (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
         (*fail)++;
         continue;
       }
     (void) fprintf(stdout,"... pass.\n");
   }
-  (void) fprintf(stdout,"  summary: %lu subtests; %lu passed; %lu failed.\n",
-    (unsigned long) test,(unsigned long) (test-(*fail)),(unsigned long) *fail);
+  (void) fprintf(stdout,
+    "  summary: %.20g subtests; %.20g passed; %.20g failed.\n",(double) test,
+    (double) (test-(*fail)),(double) *fail);
   return(test);
 }
 
@@ -196,7 +197,7 @@ static size_t ValidateCompositeCommand(ImageInfo *image_info,
   for (i=0; composite_options[i] != (char *) NULL; i++)
   {
     CatchException(exception);
-    (void) fprintf(stdout,"  test %lu: %s",(unsigned long) test++,
+    (void) fprintf(stdout,"  test %.20g: %s",(double) (test++),
       composite_options[i]);
     (void) FormatMagickString(command,MaxTextExtent,"%s %s %s %s",
       reference_filename,composite_options[i],reference_filename,
@@ -204,7 +205,7 @@ static size_t ValidateCompositeCommand(ImageInfo *image_info,
     arguments=StringToArgv(command,&number_arguments);
     if (arguments == (char **) NULL)
       {
-        (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
         (*fail)++;
         continue;
       }
@@ -215,14 +216,15 @@ static size_t ValidateCompositeCommand(ImageInfo *image_info,
     arguments=(char **) RelinquishMagickMemory(arguments);
     if (status != MagickFalse)
       {
-        (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
         (*fail)++;
         continue;
       }
     (void) fprintf(stdout,"... pass.\n");
   }
-  (void) fprintf(stdout,"  summary: %lu subtests; %lu passed; %lu failed.\n",
-    (unsigned long) test,(unsigned long) (test-(*fail)),(unsigned long) *fail);
+  (void) fprintf(stdout,
+    "  summary: %.20g subtests; %.20g passed; %.20g failed.\n",(double) test,
+    (double) (test-(*fail)),(double) *fail);
   return(test);
 }
 
@@ -285,14 +287,14 @@ static size_t ValidateConvertCommand(ImageInfo *image_info,
   for (i=0; convert_options[i] != (char *) NULL; i++)
   {
     CatchException(exception);
-    (void) fprintf(stdout,"  test %lu: %s",(unsigned long) test++,
+    (void) fprintf(stdout,"  test %.20g: %s",(double) test++,
       convert_options[i]);
     (void) FormatMagickString(command,MaxTextExtent,"%s %s %s %s",
       reference_filename,convert_options[i],reference_filename,output_filename);
     arguments=StringToArgv(command,&number_arguments);
     if (arguments == (char **) NULL)
       {
-        (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
         (*fail)++;
         continue;
       }
@@ -303,14 +305,15 @@ static size_t ValidateConvertCommand(ImageInfo *image_info,
     arguments=(char **) RelinquishMagickMemory(arguments);
     if (status != MagickFalse)
       {
-        (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
         (*fail)++;
         continue;
       }
     (void) fprintf(stdout,"... pass.\n");
   }
-  (void) fprintf(stdout,"  summary: %lu subtests; %lu passed; %lu failed.\n",
-    (unsigned long) test,(unsigned long) (test-(*fail)),(unsigned long) *fail);
+  (void) fprintf(stdout,
+    "  summary: %.20g subtests; %.20g passed; %.20g failed.\n",(double) test,
+    (double) (test-(*fail)),(double) *fail);
   return(test);
 }
 
@@ -374,14 +377,14 @@ static size_t ValidateIdentifyCommand(ImageInfo *image_info,
   for (i=0; identify_options[i] != (char *) NULL; i++)
   {
     CatchException(exception);
-    (void) fprintf(stdout,"  test %lu: %s",(unsigned long) test++,
+    (void) fprintf(stdout,"  test %.20g: %s",(double) test++,
       identify_options[i]);
     (void) FormatMagickString(command,MaxTextExtent,"%s %s",
       identify_options[i],reference_filename);
     arguments=StringToArgv(command,&number_arguments);
     if (arguments == (char **) NULL)
       {
-        (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
         (*fail)++;
         continue;
       }
@@ -392,14 +395,15 @@ static size_t ValidateIdentifyCommand(ImageInfo *image_info,
     arguments=(char **) RelinquishMagickMemory(arguments);
     if (status != MagickFalse)
       {
-        (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
         (*fail)++;
         continue;
       }
     (void) fprintf(stdout,"... pass.\n");
   }
-  (void) fprintf(stdout,"  summary: %lu subtests; %lu passed; %lu failed.\n",
-    (unsigned long) test,(unsigned long) (test-(*fail)),(unsigned long) *fail);
+  (void) fprintf(stdout,
+    "  summary: %.20g subtests; %.20g passed; %.20g failed.\n",(double) test,
+    (double) (test-(*fail)),(double) *fail);
   return(test);
 }
 
@@ -486,26 +490,25 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
         Generate reference image.
       */
       CatchException(exception);
-      (void) fprintf(stdout,"  test %lu: %s/%s/%s/%lu-bits",(unsigned long)
-        test++,reference_formats[i].magick,MagickOptionToMnemonic(
+      (void) fprintf(stdout,"  test %.20g: %s/%s/%s/%.20g-bits",(double)
+        (test++),reference_formats[i].magick,MagickOptionToMnemonic(
         MagickCompressOptions,reference_formats[i].compression),
         MagickOptionToMnemonic(MagickTypeOptions,reference_types[j].type),
-        (unsigned long) reference_types[j].depth);
+        (double) reference_types[j].depth);
       (void) CopyMagickString(image_info->filename,reference_filename,
         MaxTextExtent);
       reference_image=ReadImage(image_info,exception);
       if (reference_image == (Image *) NULL)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
           continue;
         }
       /*
         Write reference image.
       */
-      (void) FormatMagickString(size,MaxTextExtent,"%lux%lu",
-        (unsigned long) reference_image->columns,(unsigned long)
-        reference_image->rows);
+      (void) FormatMagickString(size,MaxTextExtent,"%.20gx%.20g",
+        (double) reference_image->columns,(double) reference_image->rows);
       (void) CloneString(&image_info->size,size);
       image_info->depth=reference_types[j].depth;
       (void) FormatMagickString(reference_image->filename,MaxTextExtent,"%s:%s",
@@ -514,7 +517,7 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
       InheritException(exception,&reference_image->exception);
       if (status == MagickFalse)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
           reference_image=DestroyImage(reference_image);
           continue;
@@ -523,7 +526,7 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
       InheritException(exception,&reference_image->exception);
       if (status == MagickFalse)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
           reference_image=DestroyImage(reference_image);
           continue;
@@ -534,7 +537,7 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
       reference_image=DestroyImage(reference_image);
       if (status == MagickFalse)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
           continue;
         }
@@ -546,7 +549,7 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
       reference_image=ReadImage(image_info,exception);
       if (reference_image == (Image *) NULL)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
           continue;
         }
@@ -563,7 +566,7 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
       blob=ImageToBlob(image_info,reference_image,&length,exception);
       if (blob == (unsigned char *) NULL)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
           reference_image=DestroyImage(reference_image);
           continue;
@@ -577,7 +580,7 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
       blob=(unsigned char *) RelinquishMagickMemory(blob);
       if (reconstruct_image == (Image *) NULL)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
           reference_image=DestroyImage(reference_image);
           continue;
@@ -600,7 +603,7 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
       reference_image=DestroyImage(reference_image);
       if (difference_image == (Image *) NULL)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
           continue;
         }
@@ -615,8 +618,9 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
       (void) fprintf(stdout,"... pass.\n");
     }
   }
-  (void) fprintf(stdout,"  summary: %lu subtests; %lu passed; %lu failed.\n",
-    (unsigned long) test,(unsigned long) (test-(*fail)),(unsigned long) *fail);
+  (void) fprintf(stdout,
+    "  summary: %.20g subtests; %.20g passed; %.20g failed.\n",(double) test,
+    (double) (test-(*fail)),(double) *fail);
   return(test);
 }
 
@@ -697,26 +701,25 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
         Generate reference image.
       */
       CatchException(exception);
-      (void) fprintf(stdout,"  test %lu: %s/%s/%s/%lu-bits",(unsigned long)
-        test++,reference_formats[i].magick,MagickOptionToMnemonic(
+      (void) fprintf(stdout,"  test %.20g: %s/%s/%s/%.20g-bits",(double)
+        (test++),reference_formats[i].magick,MagickOptionToMnemonic(
         MagickCompressOptions,reference_formats[i].compression),
         MagickOptionToMnemonic(MagickTypeOptions,reference_types[j].type),
-        (unsigned long) reference_types[j].depth);
+        (double) reference_types[j].depth);
       (void) CopyMagickString(image_info->filename,reference_filename,
         MaxTextExtent);
       reference_image=ReadImage(image_info,exception);
       if (reference_image == (Image *) NULL)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
           continue;
         }
       /*
         Write reference image.
       */
-      (void) FormatMagickString(size,MaxTextExtent,"%lux%lu",
-        (unsigned long) reference_image->columns,(unsigned long)
-        reference_image->rows);
+      (void) FormatMagickString(size,MaxTextExtent,"%.20gx%.20g",
+        (double) reference_image->columns,(double) reference_image->rows);
       (void) CloneString(&image_info->size,size);
       image_info->depth=reference_types[j].depth;
       (void) FormatMagickString(reference_image->filename,MaxTextExtent,"%s:%s",
@@ -725,7 +728,7 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
       InheritException(exception,&reference_image->exception);
       if (status == MagickFalse)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
           reference_image=DestroyImage(reference_image);
           continue;
@@ -734,7 +737,7 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
       InheritException(exception,&reference_image->exception);
       if (status == MagickFalse)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
           reference_image=DestroyImage(reference_image);
           continue;
@@ -745,7 +748,7 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
       reference_image=DestroyImage(reference_image);
       if (status == MagickFalse)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
           continue;
         }
@@ -757,7 +760,7 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
       reference_image=ReadImage(image_info,exception);
       if (reference_image == (Image *) NULL)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
           continue;
         }
@@ -772,7 +775,7 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
       InheritException(exception,&reference_image->exception);
       if (status == MagickFalse)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
           reference_image=DestroyImage(reference_image);
           continue;
@@ -785,7 +788,7 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
       reconstruct_image=ReadImage(image_info,exception);
       if (reconstruct_image == (Image *) NULL)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
           reference_image=DestroyImage(reference_image);
           continue;
@@ -808,7 +811,7 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
       reference_image=DestroyImage(reference_image);
       if (difference_image == (Image *) NULL)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
           continue;
         }
@@ -823,8 +826,9 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
       (void) fprintf(stdout,"... pass.\n");
     }
   }
-  (void) fprintf(stdout,"  summary: %lu subtests; %lu passed; %lu failed.\n",
-    (unsigned long) test,(unsigned long) (test-(*fail)),(unsigned long) *fail);
+  (void) fprintf(stdout,
+    "  summary: %.20g subtests; %.20g passed; %.20g failed.\n",(double) test,
+    (double) (test-(*fail)),(double) *fail);
   return(test);
 }
 
@@ -900,7 +904,7 @@ static size_t ValidateImportExportPixels(ImageInfo *image_info,
         Generate reference image.
       */
       CatchException(exception);
-      (void) fprintf(stdout,"  test %lu: %s/%s",(unsigned long) test++,
+      (void) fprintf(stdout,"  test %.20g: %s/%s",(double) (test++),
         reference_map[i],MagickOptionToMnemonic(MagickStorageOptions,
         reference_storage[j].type));
       (void) CopyMagickString(image_info->filename,reference_filename,
@@ -908,7 +912,7 @@ static size_t ValidateImportExportPixels(ImageInfo *image_info,
       reference_image=ReadImage(image_info,exception);
       if (reference_image == (Image *) NULL)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
           continue;
         }
@@ -919,7 +923,7 @@ static size_t ValidateImportExportPixels(ImageInfo *image_info,
       pixels=(unsigned char *) AcquireQuantumMemory(length,sizeof(*pixels));
       if (pixels == (unsigned char *) NULL)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
           reference_image=DestroyImage(reference_image);
           continue;
@@ -930,7 +934,7 @@ static size_t ValidateImportExportPixels(ImageInfo *image_info,
         exception);
       if (status == MagickFalse)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
           pixels=(unsigned char *) RelinquishMagickMemory(pixels);
           reference_image=DestroyImage(reference_image);
@@ -943,7 +947,7 @@ static size_t ValidateImportExportPixels(ImageInfo *image_info,
       InheritException(exception,&reference_image->exception);
       if (status == MagickFalse)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
            pixels=(unsigned char *) RelinquishMagickMemory(pixels);
           reference_image=DestroyImage(reference_image);
@@ -964,7 +968,7 @@ static size_t ValidateImportExportPixels(ImageInfo *image_info,
       pixels=(unsigned char *) RelinquishMagickMemory(pixels);
       if (status == MagickFalse)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
           reference_image=DestroyImage(reference_image);
           continue;
@@ -978,7 +982,7 @@ static size_t ValidateImportExportPixels(ImageInfo *image_info,
       reference_image=DestroyImage(reference_image);
       if (difference_image == (Image *) NULL)
         {
-          (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+          (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
           (*fail)++;
           continue;
         }
@@ -993,8 +997,9 @@ static size_t ValidateImportExportPixels(ImageInfo *image_info,
       (void) fprintf(stdout,"... pass.\n");
     }
   }
-  (void) fprintf(stdout,"  summary: %lu subtests; %lu passed; %lu failed.\n",
-    (unsigned long) test,(unsigned long) (test-(*fail)),(unsigned long) *fail);
+  (void) fprintf(stdout,
+    "  summary: %.20g subtests; %.20g passed; %.20g failed.\n",(double) test,
+    (double) (test-(*fail)),(double) *fail);
   return(test);
 }
 
@@ -1057,7 +1062,7 @@ static size_t ValidateMontageCommand(ImageInfo *image_info,
   for (i=0; montage_options[i] != (char *) NULL; i++)
   {
     CatchException(exception);
-    (void) fprintf(stdout,"  test %lu: %s",(unsigned long) test++,
+    (void) fprintf(stdout,"  test %.20g: %s",(double) (test++),
       montage_options[i]);
     (void) FormatMagickString(command,MaxTextExtent,"%s %s %s %s",
       reference_filename,montage_options[i],reference_filename,
@@ -1065,7 +1070,7 @@ static size_t ValidateMontageCommand(ImageInfo *image_info,
     arguments=StringToArgv(command,&number_arguments);
     if (arguments == (char **) NULL)
       {
-        (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
         (*fail)++;
         continue;
       }
@@ -1076,14 +1081,15 @@ static size_t ValidateMontageCommand(ImageInfo *image_info,
     arguments=(char **) RelinquishMagickMemory(arguments);
     if (status != MagickFalse)
       {
-        (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
         (*fail)++;
         continue;
       }
     (void) fprintf(stdout,"... pass.\n");
   }
-  (void) fprintf(stdout,"  summary: %lu subtests; %lu passed; %lu failed.\n",
-    (unsigned long) test,(unsigned long) (test-(*fail)),(unsigned long) *fail);
+  (void) fprintf(stdout,
+    "  summary: %.20g subtests; %.20g passed; %.20g failed.\n",(double) test,
+    (double) (test-(*fail)),(double) *fail);
   return(test);
 }
 
@@ -1146,14 +1152,14 @@ static size_t ValidateStreamCommand(ImageInfo *image_info,
   for (i=0; stream_options[i] != (char *) NULL; i++)
   {
     CatchException(exception);
-    (void) fprintf(stdout,"  test %lu: %s",(unsigned long) test++,
+    (void) fprintf(stdout,"  test %.20g: %s",(double) (test++),
       stream_options[i]);
     (void) FormatMagickString(command,MaxTextExtent,"%s %s %s",
       stream_options[i],reference_filename,output_filename);
     arguments=StringToArgv(command,&number_arguments);
     if (arguments == (char **) NULL)
       {
-        (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
         (*fail)++;
         continue;
       }
@@ -1164,14 +1170,15 @@ static size_t ValidateStreamCommand(ImageInfo *image_info,
     arguments=(char **) RelinquishMagickMemory(arguments);
     if (status != MagickFalse)
       {
-        (void) fprintf(stdout,"... fail @ %s/%s/%lu.\n",GetMagickModule());
+        (void) fprintf(stdout,"... fail @ %s/%s/%u.\n",GetMagickModule());
         (*fail)++;
         continue;
       }
     (void) fprintf(stdout,"... pass.\n");
   }
-  (void) fprintf(stdout,"  summary: %lu subtests; %lu passed; %lu failed.\n",
-    (unsigned long) test,(unsigned long) (test-(*fail)),(unsigned long) *fail);
+  (void) fprintf(stdout,
+    "  summary: %.20g subtests; %.20g passed; %.20g failed.\n",(double) test,
+    (double) (test-(*fail)),(double) *fail);
   return(test);
 }
 
@@ -1435,9 +1442,9 @@ int main(int argc,char **argv)
           if ((type & StreamValidate) != 0)
             tests+=ValidateStreamCommand(image_info,reference_filename,
               output_filename,&fail,exception);
-          (void) fprintf(stdout,"validation suite: %lu tests; %lu passed; "
-            "%lu failed.\n",(unsigned long) tests,(unsigned long) (tests-fail),
-            (unsigned long) fail);
+          (void) fprintf(stdout,
+            "validation suite: %.20g tests; %.20g passed; %.20g failed.\n",
+            (double) tests,(double) (tests-fail),(double) fail);
         }
       (void) RelinquishUniqueFileResource(output_filename);
       (void) RelinquishUniqueFileResource(reference_filename);
@@ -1449,7 +1456,7 @@ int main(int argc,char **argv)
       elapsed_time=GetElapsedTime(timer);
       user_time=GetUserTime(timer);
       (void) fprintf(stderr,
-        "Performance: %lui %gips %0.3fu %ld:%02ld.%03ld\n",(unsigned long)
+        "Performance: %.20gi %gips %0.3fu %ld:%02ld.%03ld\n",(double)
         iterations,1.0*iterations/elapsed_time,user_time,(long)
         (elapsed_time/60.0),(long) ceil(fmod(elapsed_time,60.0)),
         (long) (1000.0*(elapsed_time-floor(elapsed_time))));