(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 0a578275a417a4f4d134c8ac9097fd97c134d6b6..1e6ec40bdf2fe8d1a8b4b2e8804c6ed253d201aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-28  6.6.4-8 Cristy  <quetzlzacatenango@image...>
+  * Temporary files not always deleted (reference
+    http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=15960).
+
 2010-09-27  6.6.4-8 Nicolas Robidoux <nicolas.robidoux@gmail...>
   * Simplified the ClampUpAxes code, the use of its outputs, its
     comments, and credited Craig DeForest for the "clamp singular values"

diff --git a/magick/resource.c b/magick/resource.c
index 8665d3799e25922128f0cb816845c7e69e037ea4..e2c1c0a4945797b2a71f52ca2ed0d8c36bc683cf 100644 (file)
--- a/magick/resource.c
+++ b/magick/resource.c
@@ -270,7 +270,7 @@ MagickExport MagickBooleanType AcquireMagickResource(const ResourceType type,
 %                                                                             %
 %                                                                             %
 %                                                                             %
-+   A s y n c h r o n o u s R e s o u r c e C o m p o n e n t T e r m i n u s %
+temporary_resource=DestroyString((char *) temporary_resource);
 %                                                                             %
 %                                                                             %
 %                                                                             %
@@ -332,6 +332,7 @@ MagickExport void AsynchronousResourceComponentTerminus(void)
 static void *DestroyTemporaryResources(void *temporary_resource)
 {
   (void) remove((char *) temporary_resource);
+  temporary_resource=DestroyString((char *) temporary_resource);
   return((void *) NULL);
 }
 
@@ -414,9 +415,6 @@ MagickExport int AcquireUniqueFileResource(char *path)
 # define TMP_MAX  238328
 #endif
 
-  char
-    *resource;
-
   int
     c,
     file;
@@ -479,8 +477,8 @@ MagickExport int AcquireUniqueFileResource(char *path)
     temporary_resources=NewSplayTree(CompareSplayTreeString,
       RelinquishMagickMemory,DestroyTemporaryResources);
   UnlockSemaphoreInfo(resource_semaphore);
-  resource=ConstantString(path);
-  (void) AddValueToSplayTree(temporary_resources,resource,resource);
+  (void) AddValueToSplayTree(temporary_resources,ConstantString(path),
+    ConstantString(path));
   return(file);
 }
 \f