From f57e54841539736a386c2b5800e36a00dbbb3cb6 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 17 Feb 2013 22:11:27 +0000 Subject: [PATCH] --- MagickCore/option.c | 4 ++-- MagickCore/property.c | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/MagickCore/option.c b/MagickCore/option.c index 719cee3b0..ac9457278 100644 --- 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 01a7cfb15..0731b4ade 100644 --- 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; } -- 2.40.0