(no commit message)

diff --git a/magick/blob.c b/magick/blob.c
index 342d8d73a6d59034eb2cd94cc443f5f7d629e349..23b0a00de4e3a370e29a9b706ab23c25311c11a8 100644 (file)
--- a/magick/blob.c
+++ b/magick/blob.c
@@ -483,6 +483,7 @@ MagickExport MagickBooleanType CloseBlob(Image *image)
   if (image->blob->synchronize != MagickFalse)
     SyncBlob(image);
   image->blob->size=GetBlobSize(image);
+  image->extent=image->blob->size;
   image->blob->eof=MagickFalse;
   if (image->blob->exempt != MagickFalse)
     {
@@ -1193,31 +1194,31 @@ MagickExport const struct stat *GetBlobProperties(const Image *image)
 MagickExport MagickSizeType GetBlobSize(const Image *image)
 {
   MagickSizeType
-    length;
+    extent;
 
   assert(image != (Image *) NULL);
   assert(image->signature == MagickSignature);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(image->blob != (BlobInfo *) NULL);
-  length=0;
+  extent=0;
   switch (image->blob->type)
   {
     case UndefinedStream:
     {
-      length=image->blob->size;
+      extent=image->blob->size;
       break;
     }
     case FileStream:
     {
       if (fstat(fileno(image->blob->file),&image->blob->properties) == 0)
-        length=(MagickSizeType) image->blob->properties.st_size;
+        extent=(MagickSizeType) image->blob->properties.st_size;
       break;
     }
     case StandardStream:
     case PipeStream:
     {
-      length=image->blob->size;
+      extent=image->blob->size;
       break;
     }
     case ZipStream:
@@ -1228,18 +1229,18 @@ MagickExport MagickSizeType GetBlobSize(const Image *image)
 
       status=GetPathAttributes(image->filename,&image->blob->properties);
       if (status != MagickFalse)
-        length=(MagickSizeType) image->blob->properties.st_size;
+        extent=(MagickSizeType) image->blob->properties.st_size;
       break;
     }
     case FifoStream:
       break;
     case BlobStream:
     {
-      length=(MagickSizeType) image->blob->length;
+      extent=(MagickSizeType) image->blob->extent;
       break;
     }
   }
-  return(length);
+  return(extent);
 }
 \f
 /*

diff --git a/magick/identify.c b/magick/identify.c
index 7e9a6f3dd343f675e8584f55af3cb07ea9a35c3d..e0bce1059e267f4aab6d94554ba303df1fd75504 100644 (file)
--- a/magick/identify.c
+++ b/magick/identify.c
@@ -301,7 +301,8 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
         if (LocaleCompare(image->magick_filename,image->filename) != 0)
           (void) fprintf(file,"%s=>",image->magick_filename);
        if ((GetPreviousImageInList(image) == (Image *) NULL) &&
-           (GetNextImageInList(image) == (Image *) NULL) && (image->scene == 0))
+           (GetNextImageInList(image) == (Image *) NULL) &&
+           (image->scene == 0))
         (void) fprintf(file,"%s ",image->filename);
       else
         (void) fprintf(file,"%s[%lu] ",image->filename,image->scene);

diff --git a/magick/image.h b/magick/image.h
index 59ee3bef062839ac2b26b0a0e73f15e00f8ba21e..50e968bcd4d1f01c07fcc582a051ca7da97ca11d 100644 (file)
--- a/magick/image.h
+++ b/magick/image.h
@@ -330,6 +330,9 @@ struct _Image
 
   MagickBooleanType
     dither;
+
+  MagickSizeType
+    extent;
 };
 
 struct _ImageInfo

diff --git a/magick/property.c b/magick/property.c
index 78b802c5d5ea0a5fd7309134b09452778dc7dff3..7cf2c2559eb9f5158c84ee4acb67d783cb1d84ed 100644 (file)
--- a/magick/property.c
+++ b/magick/property.c
@@ -2607,17 +2607,13 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info,
         char
           format[MaxTextExtent];
 
-        MagickSizeType
-          length;
-
         /*
           File size.
         */
-        length=GetBlobSize(image);
         (void) FormatMagickString(format,MaxTextExtent,"%lu",(unsigned long)
-          length);
-        if (length != (MagickSizeType) ((size_t) length))
-          (void) FormatMagickSize(length,MagickFalse,format);
+          image->extent);
+        if (image->extent != (MagickSizeType) ((size_t) image->extent))
+          (void) FormatMagickSize(image->extent,MagickFalse,format);
         q+=ConcatenateMagickString(q,format,extent);
         break;
       }