Changeset 7863

Timestamp:

05/10/12 21:56:24 (13 months ago)

Author:

anthony

Message:

 

Location:

ImageMagick/trunk

Files:

• MagickCore/resample.c (modified) (1 diff)
• MagickCore/utility.c (modified) (1 diff)
• MagickWand/magick-cli.c (modified) (2 diffs)
• MagickWand/operation.c (modified) (3 diffs)

ImageMagick/trunk/MagickCore/resample.c

@@ -1324 +1324 @@
 #endif
   {
-    if (IsStringTrue(GetImageArtifact(resample_filter->image,
+    if (IfStringTrue(GetImageArtifact(resample_filter->image,
              "resample:verbose")) )
       {

ImageMagick/trunk/MagickCore/utility.c

@@ -700 +700 @@
 %  Which provide their own '@' meta-character handling.
 %
+%  You can see the results of the expansion using "Configure" log
+%  events.
+%
+%
+%  The returned list should be freed using  DestroyStringList().
+%
+%  However the strings in the original pointed to argv are not
+%  freed  (TO BE CHECKED).  So a copy of the original pointer (and count)
+%  should be kept separate if they need to be freed later.
+%
 %
 %  The format of the ExpandFilenames function is:

ImageMagick/trunk/MagickWand/magick-cli.c

@@ -687 +687 @@
     i;
 
-  if (IfMagickFalse(ExpandFilenames(&argc,&argv)))
+  if (IfMagickFalse(  ExpandFilenames(&argc,&argv)  ))
     ThrowFileException(exception,ResourceLimitError,"MemoryAllocationFailed",
          GetExceptionMessage(errno));
@@ -726 +726 @@
   ReadCommandlLine(argc,&argv);
 
-#if 0
-  status=ExpandFilenames(&argc,&argv);
-  if ( IfMagickFalse(status) )
-    ThrowConvertException(ResourceLimitError,"MemoryAllocationFailed",
-      GetExceptionMessage(errno));
-#endif
-
   /* Initialize special "CLI Wand" to hold images and settings (empty) */
   cli_wand=AcquireMagickCLI(image_info,exception);

ImageMagick/trunk/MagickWand/operation.c

@@ -4280 +4280 @@
 #if 0
     /* Directly read 'arg1' without filename expansion handling (see below).
-       This does NOT turn off the 'coder:' prefix, or '[...]' read modifiers.
     */
 # if !USE_WAND_METHODS
@@ -4319 +4318 @@
     argv = (char **) &arg1;
 
-    if (IfMagickFalse(ExpandFilenames(&argc,&argv)))
+    /* Expand 'glob' expressions in the given filename.
+       Expansion handles any 'coder:' prefix, or read modifiers attached
+       to the filename, including them in the resulting expanded list.
+    */
+    if (IfMagickFalse(  ExpandFilenames(&argc,&argv)  ))
       CLIWandExceptArgReturn(ResourceLimitError,"MemoryAllocationFailed",
           option,GetExceptionMessage(errno));
@@ -4336 +4339 @@
       AppendImageToList(&_images, new_images);
     }
-    /* FUTURE: how do I free the expanded filename array memory ??? */
-    //argv=DestroyStringList(argv);  /* Is this correct? */
+    argv=DestroyStringList(argv);  /* Destroy the Expanded Filename list */
 #endif
     return;