Changeset 7842

Timestamp:

05/08/12 14:38:18 (14 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk/MagickCore

Files:

• cache-private.h (modified) (1 diff)
• cache.c (modified) (7 diffs)

ImageMagick/trunk/MagickCore/cache-private.h

@@ -193 +193 @@
     *disk_semaphore;
 
-  time_t
-    timestamp;
-
   size_t
     signature;

ImageMagick/trunk/MagickCore/cache.c

@@ -516 +516 @@
   cache_info->file=file;
   cache_info->mode=mode;
-  cache_info->timestamp=time(0);
   UnlockSemaphoreInfo(cache_info->disk_semaphore);
   return(MagickTrue);
 }
 
-static inline MagickOffsetType ReadPixelCacheRegion(CacheInfo *cache_info,
-  const MagickOffsetType offset,const MagickSizeType length,
-  unsigned char *restrict buffer)
+static inline MagickOffsetType ReadPixelCacheRegion(
+  const CacheInfo *restrict cache_info,const MagickOffsetType offset,
+  const MagickSizeType length,unsigned char *restrict buffer)
 {
   register MagickOffsetType
@@ -531 +530 @@
     count;
 
-  cache_info->timestamp=time(0);
 #if !defined(MAGICKCORE_HAVE_PREAD)
   LockSemaphoreInfo(cache_info->disk_semaphore);
@@ -565 +563 @@
 }
 
-static inline MagickOffsetType WritePixelCacheRegion(CacheInfo *cache_info,
-  const MagickOffsetType offset,const MagickSizeType length,
-  const unsigned char *restrict buffer)
+static inline MagickOffsetType WritePixelCacheRegion(
+  const CacheInfo *restrict cache_info,const MagickOffsetType offset,
+  const MagickSizeType length,const unsigned char *restrict buffer)
 {
   register MagickOffsetType
@@ -575 +573 @@
     count;
 
-  cache_info->timestamp=time(0);
 #if !defined(MAGICKCORE_HAVE_PWRITE)
   LockSemaphoreInfo(cache_info->disk_semaphore);
@@ -1496 +1493 @@
 
 static inline MagickBooleanType IsPixelAuthentic(
-  const CacheInfo *restrict cache_info,NexusInfo *nexus_info)
+  const CacheInfo *restrict cache_info,const NexusInfo *restrict nexus_info)
 {
   MagickBooleanType
@@ -1832 +1829 @@
 */
 
-static inline MagickBooleanType ValidatePixelCacheMorphology(const Image *image)
-{
-  CacheInfo
-    *cache_info;
-
-  PixelChannelMap
-    *p,
-    *q;
+static inline MagickBooleanType ValidatePixelCacheMorphology(
+  const Image *restrict image)
+{
+  const CacheInfo
+    *restrict cache_info;
+
+  const PixelChannelMap
+    *restrict p,
+    *restrict q;
 
   /*
@@ -4731 +4729 @@
 */
 
-static inline MagickBooleanType AcquireCacheNexusPixels(CacheInfo *cache_info,
-  NexusInfo *nexus_info,ExceptionInfo *exception)
+static inline MagickBooleanType AcquireCacheNexusPixels(
+  const CacheInfo *restrict cache_info,NexusInfo *nexus_info,
+  ExceptionInfo *exception)
 {
   if (nexus_info->length != (MagickSizeType) ((size_t) nexus_info->length))