commit e8c25f9b4c9fb72cad6db08eeda58c7c5784014e
author cristy <urban-warrior@git.imagemagick.org> Thu Jun 03 00:53:06 2010 +0000
committer cristy <urban-warrior@git.imagemagick.org> Thu Jun 03 00:53:06 2010 +0000
tree 19e5fe80eedfd2afa0707e8413fb3a80205ff7b0
parent 38ea08308f079e4d21ad8b8ac465dcc3e1d78458

magick/cache.c

diff --git a/magick/cache.c b/magick/cache.c
index 8c09689..7110780 100644
--- a/magick/cache.c
+++ b/magick/cache.c
@@ -4077,8 +4077,8 @@
   cache_info=(CacheInfo *) image->cache;
   source_info=(*cache_info);
   source_info.file=(-1);
-  (void) FormatMagickString(cache_info->filename,MaxTextExtent,"%s[%lu]",
-    image->filename,(unsigned long) GetImageIndexInList(image));
+  (void) FormatMagickString(cache_info->filename,MaxTextExtent,"%s[%.20g]",
+    image->filename,(double) GetImageIndexInList(image));
   cache_info->mode=mode;
   cache_info->rows=image->rows;
   cache_info->columns=image->columns;
@@ -4125,10 +4125,10 @@
                   (void) FormatMagickSize(cache_info->length,MagickTrue,
                     format);
                   (void) FormatMagickString(message,MaxTextExtent,
-                    "open %s (%s memory, %lux%lu %sB)",cache_info->filename,
+                    "open %s (%s memory, %.20gx%.20g %sB)",cache_info->filename,
                     cache_info->mapped != MagickFalse ? "anonymous" : "heap",
-                    (unsigned long) cache_info->columns,(unsigned long)
-                    cache_info->rows,format);
+                    (double) cache_info->columns,(double) cache_info->rows,
+                    format);
                   (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",
                     message);
                 }
@@ -4219,10 +4219,10 @@
                   (void) FormatMagickSize(cache_info->length,MagickTrue,
                     format);
                   (void) FormatMagickString(message,MaxTextExtent,
-                    "open %s (%s[%d], memory-mapped, %lux%lu %sB)",
+                    "open %s (%s[%d], memory-mapped, %.20gx%.20g %sB)",
                     cache_info->filename,cache_info->cache_filename,
-                    cache_info->file,(unsigned long) cache_info->columns,
-                    (unsigned long) cache_info->rows,format);
+                    cache_info->file,(double) cache_info->columns,(double)
+                    cache_info->rows,format);
                   (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",
                     message);
                 }
@@ -4240,9 +4240,9 @@
     {
       (void) FormatMagickSize(cache_info->length,MagickFalse,format);
       (void) FormatMagickString(message,MaxTextExtent,
-        "open %s (%s[%d], disk, %lux%lu %sB)",cache_info->filename,
-        cache_info->cache_filename,cache_info->file,(unsigned long)
-        cache_info->columns,(unsigned long) cache_info->rows,format);
+        "open %s (%s[%d], disk, %.20gx%.20g %sB)",cache_info->filename,
+        cache_info->cache_filename,cache_info->file,(double)
+        cache_info->columns,(double) cache_info->rows,format);
       (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",message);
     }
   return(MagickTrue);
@@ -4733,10 +4733,10 @@
   }
   if ((cache_info->debug != MagickFalse) &&
       (QuantumTick((MagickOffsetType) nexus_info->region.y,cache_info->rows) != MagickFalse))
-    (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s[%lux%lu%+ld%+ld]",
-      cache_info->filename,(unsigned long) nexus_info->region.width,
-      (unsigned long) nexus_info->region.height,(long) nexus_info->region.x,
-      (long) nexus_info->region.y);
+    (void) LogMagickEvent(CacheEvent,GetMagickModule(),
+      "%s[%.20gx%.20g%+.20gx%+.20g]",cache_info->filename,(double)
+      nexus_info->region.width,(double) nexus_info->region.height,(double)
+      nexus_info->region.x,(double) nexus_info->region.y);
   return(MagickTrue);
 }
 
@@ -4864,10 +4864,10 @@
   }
   if ((cache_info->debug != MagickFalse) &&
       (QuantumTick((MagickOffsetType) nexus_info->region.y,cache_info->rows) != MagickFalse))
-    (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s[%lux%lu%+ld%+ld]",
-      cache_info->filename,(unsigned long) nexus_info->region.width,
-      (unsigned long) nexus_info->region.height,(long) nexus_info->region.x,
-      (long) nexus_info->region.y);
+    (void) LogMagickEvent(CacheEvent,GetMagickModule(),
+      "%s[%.20gx%.20g%+.20gx%+.20g]",cache_info->filename,(double)
+      nexus_info->region.width,(double) nexus_info->region.height,(double)
+      nexus_info->region.x,(double) nexus_info->region.y);
   return(MagickTrue);
 }
 
@@ -5449,10 +5449,10 @@
   }
   if ((cache_info->debug != MagickFalse) &&
       (QuantumTick((MagickOffsetType) nexus_info->region.y,cache_info->rows) != MagickFalse))
-    (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s[%lux%lu%+ld%+ld]",
-      cache_info->filename,(unsigned long) nexus_info->region.width,
-      (unsigned long) nexus_info->region.height,(long) nexus_info->region.x,
-      (long) nexus_info->region.y);
+    (void) LogMagickEvent(CacheEvent,GetMagickModule(),
+      "%s[%.20gx%.20g%+.20gx%+.20g]",cache_info->filename,(double)
+      nexus_info->region.width,(double) nexus_info->region.height,(double)
+      nexus_info->region.x,(double) nexus_info->region.y);
   return(MagickTrue);
 }
 
@@ -5580,9 +5580,9 @@
   }
   if ((cache_info->debug != MagickFalse) &&
       (QuantumTick((MagickOffsetType) nexus_info->region.y,cache_info->rows) != MagickFalse))
-    (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s[%lux%lu%+ld%+ld]",
-      cache_info->filename,(unsigned long) nexus_info->region.width,
-      (unsigned long) nexus_info->region.height,(long) nexus_info->region.x,
-      (long) nexus_info->region.y);
+    (void) LogMagickEvent(CacheEvent,GetMagickModule(),
+      "%s[%.20gx%.20g%+.20gx%+.20g]",cache_info->filename,(double)
+      nexus_info->region.width,(double) nexus_info->region.height,(double)
+      nexus_info->region.x,(double) nexus_info->region.y);
   return(MagickTrue);
 }