From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 23 Jun 2010 19:12:05 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~9190
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0be53ea825d4f5b43a8167c58b84f7c1e3e7004a;p=imagemagick

---

diff --git a/ChangeLog b/ChangeLog
index cafb1dff9..2f5203a12 100644
--- 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 2a187c0ca..01b45dc34 100644
--- 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)++;
       }
   }