(no commit message)

diff --git a/ChangeLog b/ChangeLog
index cafb1dff932068e63665f8099f6a53b6329ab4ab..2f5203a129bfe5dcb855ab39b6ff31823dc89488 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
     http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16487).
   * Montage now uses final background setting (e.g. montage -background none ...
     -background lightblue show:).
+  * Do not annotate directory paths in ListFiles().
 
 2010-06-17  6.6.2-7 Cristy  <quetzlzacatenango@image...>
   * Support new label:pointsize property.

diff --git a/magick/utility.c b/magick/utility.c
index 2a187c0cabbfd718a2b1578897de95fd4a04f64e..01b45dc34167682ba00fa7fc349092892fe49a0e 100644 (file)
--- a/magick/utility.c
+++ b/magick/utility.c
@@ -1718,7 +1718,8 @@ MagickExport char **ListFiles(const char *directory,const char *pattern,
   /*
     Save the current and change to the new directory.
   */
-  buffer=(struct dirent *) AcquireAlignedMemory(1,sizeof(*buffer)+FILENAME_MAX+1);
+  buffer=(struct dirent *) AcquireAlignedMemory(1,sizeof(*buffer)+
+    FILENAME_MAX+1);
   if (buffer == (struct dirent *) NULL)
     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
   while ((MagickReadDirectory(current_directory,buffer,&entry) == 0) &&
@@ -1758,9 +1759,6 @@ MagickExport char **ListFiles(const char *directory,const char *pattern,
         }
 #endif
         filelist[*number_entries]=(char *) AcquireString(entry->d_name);
-        if (IsPathDirectory(entry->d_name) > 0)
-          (void) ConcatenateMagickString(filelist[*number_entries],
-            DirectorySeparator,MaxTextExtent);
         (*number_entries)++;
       }
   }