(no commit message)

diff --git a/magick/histogram.c b/magick/histogram.c
index c7797c08337322f8fbda9306a9c34dc9a7bb2b78..7cd80818c8fb7d7ca719a345729e6c9ca6a7f3f3 100644 (file)
--- a/magick/histogram.c
+++ b/magick/histogram.c
@@ -1183,7 +1183,7 @@ MagickExport size_t GetNumberColors(const Image *image,FILE *file,
     (void) ConcatenateMagickString(tuple,")",MaxTextExtent);
     (void) QueryMagickColorname(image,&pixel,SVGCompliance,color,exception);
     GetColorTuple(&pixel,MagickTrue,hex);
-    (void) fprintf(file,MagickSizeFormat,p->count);
+    (void) fprintf(file,"%10" MagickSizeFormat,p->count);
     (void) fprintf(file,": %s %s %s\n",tuple,hex,color);
     if (image->progress_monitor != (MagickProgressMonitor) NULL)
       {

diff --git a/magick/magick-type.h b/magick/magick-type.h
index fe9f677645d09708177e21579d61aafd63298ac8..aa0222be00b18722bc4a9341f6f925e8b065136b 100644 (file)
--- a/magick/magick-type.h
+++ b/magick/magick-type.h
@@ -110,16 +110,19 @@ typedef unsigned int MagickStatusType;
 #if (MAGICKCORE_SIZEOF_UNSIGNED_LONG_LONG == 8)
 typedef long long MagickOffsetType;
 typedef unsigned long long MagickSizeType;
-#define MagickSizeFormat  "%10llu"
+#define MagickOffsetFormat  "lld"
+#define MagickSizeFormat  "llu"
 #else
 typedef ssize_t MagickOffsetType;
 typedef size_t MagickSizeType;
-#define MagickSizeFormat  "%10lu"
+#define MagickOffsetFormat  "ld"
+#define MagickSizeFormat  "lu"
 #endif
 #else
 typedef __int64 MagickOffsetType;
 typedef unsigned __int64 MagickSizeType;
-#define MagickSizeFormat  "%10llu"
+#define MagickOffsetFormat  "I64i"
+#define MagickSizeFormat  "I64u"
 #endif
 
 #if defined(_MSC_VER) && (_MSC_VER == 1200)