(no commit message)

diff --git a/magick/cache.c b/magick/cache.c
index 5e1e45f6d6cd677abc0946cbac6f3172f619b664..e39dedbf9f1a126d5d577a63a1d2311cfd2011a9 100644 (file)
--- a/magick/cache.c
+++ b/magick/cache.c
@@ -4005,7 +4005,7 @@ static MagickBooleanType ExtendCache(Image *image,MagickSizeType length)
 
       (void) FormatMagickSize(length,MagickFalse,format);
       (void) FormatMagickString(message,MaxTextExtent,
-        "extend %s (%s[%d], disk, %s)",cache_info->filename,
+        "extend %s (%s[%d], disk, %sB)",cache_info->filename,
         cache_info->cache_filename,cache_info->file,format);
       (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",message);
     }
@@ -4090,7 +4090,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
                   (void) FormatMagickSize(cache_info->length,MagickTrue,
                     format);
                   (void) FormatMagickString(message,MaxTextExtent,
-                    "open %s (%s memory, %lux%lu %s)",cache_info->filename,
+                    "open %s (%s memory, %lux%lu %sB)",cache_info->filename,
                     cache_info->mapped != MagickFalse ? "anonymous" : "heap",
                     cache_info->columns,cache_info->rows,format);
                   (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",
@@ -4183,7 +4183,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
                   (void) FormatMagickSize(cache_info->length,MagickTrue,
                     format);
                   (void) FormatMagickString(message,MaxTextExtent,
-                    "open %s (%s[%d], memory-mapped, %lux%lu %s)",
+                    "open %s (%s[%d], memory-mapped, %lux%lu %sB)",
                     cache_info->filename,cache_info->cache_filename,
                     cache_info->file,cache_info->columns,cache_info->rows,
                     format);
@@ -4204,7 +4204,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
     {
       (void) FormatMagickSize(cache_info->length,MagickFalse,format);
       (void) FormatMagickString(message,MaxTextExtent,
-        "open %s (%s[%d], disk, %lux%lu %s)",cache_info->filename,
+        "open %s (%s[%d], disk, %lux%lu %sB)",cache_info->filename,
         cache_info->cache_filename,cache_info->file,cache_info->columns,
         cache_info->rows,format);
       (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",message);

diff --git a/magick/identify.c b/magick/identify.c
index 950008f1cae2ee16f5832b43cb64f8f079161c52..3a7c73cd56287b3650684ddf633b2508f7ecd9a6 100644 (file)
--- a/magick/identify.c
+++ b/magick/identify.c
@@ -331,7 +331,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
       if (GetBlobSize(image) != 0)
         {
           (void) FormatMagickSize(GetBlobSize(image),MagickFalse,format);
-          (void) fprintf(file,"%s ",format);
+          (void) fprintf(file,"%sB ",format);
         }
       (void) fprintf(file,"%0.3fu %ld:%02ld.%03ld",user_time,(long)
         (elapsed_time/60.0),(long) floor(fmod(elapsed_time,60.0)),
@@ -1028,7 +1028,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
   (void) fprintf(file,"  Tainted: %s\n",MagickOptionToMnemonic(
     MagickBooleanOptions,(long) image->taint));
   (void) FormatMagickSize(GetBlobSize(image),MagickFalse,format);
-  (void) fprintf(file,"  Filesize: %s\n",format);
+  (void) fprintf(file,"  Filesize: %sB\n",format);
   (void) FormatMagickSize((MagickSizeType) image->columns*image->rows,
      MagickFalse,format);
   (void) fprintf(file,"  Number pixels: %s\n",format);

diff --git a/magick/log.c b/magick/log.c
index 8e7a07a52861beda3beabd7be87b20087d509da3..027f5a52f77b74f8f6a48edd098fa64ac52015ea 100644 (file)
--- a/magick/log.c
+++ b/magick/log.c
@@ -656,7 +656,7 @@ MagickExport MagickBooleanType ListLogInfo(FILE *file,ExceptionInfo *exception)
     (void) fprintf(file,"%9lu  ",log_info[i]->generations);
     (void) FormatMagickSize(MegabytesToBytes(log_info[i]->limit),MagickFalse,
       limit);
-    (void) fprintf(file,"%8s  ",limit);
+    (void) fprintf(file,"%8sB  ",limit);
     if (log_info[i]->format != (char *) NULL)
       (void) fprintf(file,"%s",log_info[i]->format);
     (void) fprintf(file,"\n");

diff --git a/magick/property.c b/magick/property.c
index 7cf2c2559eb9f5158c84ee4acb67d783cb1d84ed..acbd1926ecb1d9557ef83615b87d444f6804627f 100644 (file)
--- a/magick/property.c
+++ b/magick/property.c
@@ -2348,7 +2348,7 @@ MagickExport const char *GetMagickProperty(const ImageInfo *image_info,
             format[MaxTextExtent];
 
           (void) FormatMagickSize(GetBlobSize(image),MagickFalse,format);
-          (void) FormatMagickString(value,MaxTextExtent,"%s",format);
+          (void) FormatMagickString(value,MaxTextExtent,"%sB",format);
           break;
         }
       if (LocaleNCompare("scenes",property,6) == 0)
@@ -2615,6 +2615,7 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info,
         if (image->extent != (MagickSizeType) ((size_t) image->extent))
           (void) FormatMagickSize(image->extent,MagickFalse,format);
         q+=ConcatenateMagickString(q,format,extent);
+        q+=ConcatenateMagickString(q,"B",extent);
         break;
       }
       case 'c':

diff --git a/magick/resize.c b/magick/resize.c
index 2ec6667075e1219242b1b3cbe480c0a1f5c87b3a..49290b8af871b5dd12550cbdfd5edcff160170fd 100644 (file)
--- a/magick/resize.c
+++ b/magick/resize.c
@@ -3012,6 +3012,7 @@ MagickExport Image *ThumbnailImage(const Image *image,
   (void) FormatMagickString(value,MaxTextExtent,"%ld",(long)
     attributes.st_mtime);
   (void) FormatMagickSize(GetBlobSize(image),MagickFalse,value);
+  (void) ConcatenateMagickString(value,"B",MaxTextExtent);
   (void) SetImageProperty(thumbnail_image,"Thumb::Size",value);
   (void) FormatMagickString(value,MaxTextExtent,"image/%s",image->magick);
   LocaleLower(value);

diff --git a/magick/resource.c b/magick/resource.c
index ef717d7e03335b270aaaeceb1a8abd90e90e027b..2583ce0ef391fcf1b54192199fcf2154ed62da28 100644 (file)
--- a/magick/resource.c
+++ b/magick/resource.c
@@ -259,7 +259,7 @@ MagickExport MagickBooleanType AcquireMagickResource(const ResourceType type,
       break;
   }
   UnlockSemaphoreInfo(resource_semaphore);
-  (void) LogMagickEvent(ResourceEvent,GetMagickModule(),"%s: %s/%s/%s",
+  (void) LogMagickEvent(ResourceEvent,GetMagickModule(),"%s: %sB/%sB/%sB",
     MagickOptionToMnemonic(MagickResourceOptions,(long) type),resource_request,
     resource_current,resource_limit);
   return(status);
@@ -798,7 +798,7 @@ MagickExport void RelinquishMagickResource(const ResourceType type,
       break;
   }
   UnlockSemaphoreInfo(resource_semaphore);
-  (void) LogMagickEvent(ResourceEvent,GetMagickModule(),"%s: %s/%s/%s",
+  (void) LogMagickEvent(ResourceEvent,GetMagickModule(),"%s: %sB/%sB/%sB",
     MagickOptionToMnemonic(MagickResourceOptions,(long) type),resource_request,
     resource_current,resource_limit);
 }

diff --git a/magick/string.c b/magick/string.c
index 09a5486ab1430d9ecf6799afe6d8db6232e1035e..b716adb62aa544113b73594221fa203bf9a87bd2 100644 (file)
--- a/magick/string.c
+++ b/magick/string.c
@@ -985,7 +985,7 @@ MagickExport StringInfo *FileToStringInfo(const char *filename,
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  FormatMagickSize() converts a size to a human readable format, for example,
-%  14kb, 234mb, 2.7gb, or 3.0tb.  Scaling is done by repetitively dividing by
+%  14k, 234m, 2.7g, or 3.0t.  Scaling is done by repetitively dividing by
 %  1000.
 %
 %  The format of the FormatMagickSize method is:
@@ -1021,11 +1021,11 @@ MagickExport long FormatMagickSize(const MagickSizeType size,
   static const char
     *bi_units[] =
     {
-      "b", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB", (char *) NULL
+      "", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi", "Yi", (char *) NULL
     },
     *traditional_units[] =
     {
-      "b", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB", (char *) NULL
+      "", "K", "M", "G", "T", "P", "E", "Z", "Y", (char *) NULL
     };
 
   bytes=1000.0;