(no commit message)

diff --git a/MagickCore/option.c b/MagickCore/option.c
index 719cee3b0ccbc1a4edad996e96621a966260f705..ac9457278dfb1987fe6902b151c4f3de910bdeb6 100644 (file)
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -264,8 +264,8 @@ static const OptionInfo
     { "+channel", 0L, ImageInfoOptionFlag, MagickFalse },
     { "-channel", 1L, ImageInfoOptionFlag, MagickFalse },
     { "-channel-fx", 1L, ListOperatorFlag | FireOptionFlag, MagickFalse },
-    { "+charcoal", 0L, DeprecateOptionFlag, MagickTrue },
-    { "-charcoal", 0L, SimpleOperatorFlag, MagickFalse },
+    { "+charcoal", 1L, DeprecateOptionFlag, MagickTrue },
+    { "-charcoal", 1L, SimpleOperatorFlag, MagickFalse },
     { "+chop", 1L, DeprecateOptionFlag, MagickTrue },
     { "-chop", 1L, SimpleOperatorFlag, MagickFalse },
     { "+clamp", 0L, DeprecateOptionFlag, MagickTrue },

diff --git a/MagickCore/property.c b/MagickCore/property.c
index 01a7cfb15e89b108fb0a6ce7190b25a1cf0ff2ca..0731b4ade820ecbf1a7947f9a806c8f5bb831432 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -2242,6 +2242,7 @@ static const char *GetMagickPropertyLetter(const ImageInfo *image_info,
     case 'f': /* Filename without directory component */
     {
       GetPathComponent(image->magick_filename,TailPath,value);
+      string=value;
       break;
     }
     case 'g': /* Image geometry, canvas and offset  %Wx%H+%X+%Y */
@@ -3110,12 +3111,13 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info,
         continue;
       }
       value=GetMagickPropertyLetter(image_info,image,*p, exception);
-      if (value != (char *) NULL) {
-        AppendString2Text(value);
-        continue;
-      }
-      (void) ThrowMagickException(exception,GetMagickModule(),
-          OptionWarning,"UnknownImageProperty","\"%%%c\"",*p);
+      if (value != (char *) NULL)
+        {
+          AppendString2Text(value);
+          continue;
+        }
+      (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
+        "UnknownImageProperty","\"%%%c\"",*p);
       continue;
     }