Changeset 36 for ImageMagick/trunk/magick/cache.c

Timestamp:

09/10/09 16:10:14 (6 months ago)

Author:

cristy

Message:

 

Files:

• ImageMagick/trunk/magick/cache.c (modified) (8 diffs)

ImageMagick/trunk/magick/cache.c

@@ -1472 +1472 @@
     type;
 
+  MapMode
+    mode;
+
   assert(cache != (Cache) NULL);
   cache_info=(CacheInfo *) cache;
@@ -1489 +1492 @@
     (void) DeleteNodeByValueFromSplayTree(cache_resources,cache_info);
   type=cache_info->type;
+  mode=cache_info->mode;
   RelinquishPixelCachePixels(cache_info);
-  if ((type == MapCache) || (type == DiskCache))
+  if ((mode != ReadMode) && ((type == MapCache) || (type == DiskCache)))
     (void) RelinquishUniqueFileResource(cache_info->cache_filename);
   *cache_info->cache_filename='\0';
@@ -2100 +2104 @@
   destroy=MagickFalse;
   (void) LockSemaphoreInfo(cache_info->semaphore);
-  if (cache_info->reference_count > 1)
+  if ((cache_info->reference_count > 1) || (cache_info->mode == ReadMode))
     {
       Image
@@ -4099 +4103 @@
 %    o filename: the persistent pixel cache filename.
 %
+%    o attach: A value other than zero initializes the persistent pixel
+%      cache.
+%
 %    o initialize: A value other than zero initializes the persistent pixel
 %      cache.
@@ -4144 +4151 @@
     {
       /*
-        Attach persistent pixel cache.
+        Attach existing persistent pixel cache.
       */
       if (image->debug != MagickFalse)
@@ -4155 +4162 @@
       if (OpenPixelCache(image,ReadMode,exception) == MagickFalse)
         return(MagickFalse);
-      cache_info=(CacheInfo *) ReferencePixelCache(cache_info);
       *offset+=cache_info->length+pagesize-(cache_info->length % pagesize);
       return(MagickTrue);
     }
-  if ((cache_info->type != MemoryCache) && (cache_info->reference_count == 1))
+  if ((cache_info->mode != ReadMode) && (cache_info->type != MemoryCache) &&
+      (cache_info->reference_count == 1))
     {
       (void) LockSemaphoreInfo(cache_info->semaphore);
-      if ((cache_info->type != MemoryCache) &&
+      if ((cache_info->mode != ReadMode) && (cache_info->type != MemoryCache) &&
           (cache_info->reference_count == 1))
         {
@@ -4169 +4176 @@
 
           /*
-            Usurp resident persistent pixel cache.
+            Usurp existing persistent pixel cache.
           */
           status=rename(cache_info->cache_filename,filename);
@@ -4189 +4196 @@
     }
   /*
-    Attach persistent pixel cache.
+    Clone persistent pixel cache.
   */
   clone_image=(*image);