From 7e10958cd2a31abe804c823c459d444739e966c6 Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 1 Jun 2010 12:56:44 +0000 Subject: [PATCH] --- magick/option.c | 22 +++++++++++----------- wand/mogrify.c | 5 ++++- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/magick/option.c b/magick/option.c index 429733824..70e22c360 100644 --- a/magick/option.c +++ b/magick/option.c @@ -102,7 +102,7 @@ static const OptionInfo { "Opaque", (ssize_t) OpaqueAlphaChannel, MagickFalse }, { "Set", (ssize_t) SetAlphaChannel, MagickFalse }, { "Shape", (ssize_t) ShapeAlphaChannel, MagickFalse }, - { "Reset", (ssize_t) SetAlphaChannel, MagickTrue }, /* deprecated */ + { "Reset", (ssize_t) SetAlphaChannel, MagickTrue }, /* deprecated */ { "Transparent", (ssize_t) TransparentAlphaChannel, MagickFalse }, { (char *) NULL, (ssize_t) UndefinedAlphaChannel, MagickFalse } }, @@ -136,7 +136,7 @@ static const OptionInfo { "Red", (ssize_t) RedChannel, MagickFalse }, { "Saturation", (ssize_t) GreenChannel, MagickFalse }, { "Yellow", (ssize_t) YellowChannel, MagickFalse }, - { "Sync", (ssize_t) SyncChannels, MagickFalse }, /* special channel flag */ + { "Sync", (ssize_t) SyncChannels, MagickFalse }, { (char *) NULL, (ssize_t) UndefinedChannel, MagickFalse } }, ClassOptions[] = @@ -176,10 +176,10 @@ static const OptionInfo { "-append", 0L, MagickFalse }, { "+authenticate", 0L, MagickFalse }, { "-authenticate", 1L, MagickFalse }, - { "+auto-gamma", 0L, MagickTrue }, /* under development */ - { "-auto-gamma", 0L, MagickTrue }, /* under development */ - { "+auto-level", 0L, MagickTrue }, /* under development */ - { "-auto-level", 0L, MagickTrue }, /* under development */ + { "+auto-gamma", 0L, MagickTrue }, + { "-auto-gamma", 0L, MagickTrue }, + { "+auto-level", 0L, MagickTrue }, + { "-auto-level", 0L, MagickTrue }, { "+auto-orient", 0L, MagickFalse }, { "-auto-orient", 0L, MagickFalse }, { "+average", 0L, MagickFalse }, @@ -755,9 +755,9 @@ static const OptionInfo { "Src", (ssize_t) SrcCompositeOp, MagickFalse }, { "VividLight", (ssize_t) VividLightCompositeOp, MagickFalse }, { "Xor", (ssize_t) XorCompositeOp, MagickFalse }, - { "Add", (ssize_t) AddCompositeOp, MagickTrue }, /* depreciate */ - { "Subtract", (ssize_t) SubtractCompositeOp, MagickTrue }, /* depreciate */ - { "Threshold", (ssize_t) ThresholdCompositeOp, MagickTrue }, /* depreciate */ + { "Add", (ssize_t) AddCompositeOp, MagickTrue }, /* deprecate */ + { "Subtract", (ssize_t) SubtractCompositeOp, MagickTrue }, /* deprecate */ + { "Threshold", (ssize_t) ThresholdCompositeOp, MagickTrue }, /* deprecate */ { (char *) NULL, (ssize_t) UndefinedCompositeOp, MagickFalse } }, CompressOptions[] = @@ -1087,8 +1087,8 @@ static const OptionInfo { "Chebyshev", (ssize_t) ChebyshevKernel, MagickFalse }, { "Manhatten", (ssize_t) ManhattenKernel, MagickFalse }, { "Euclidean", (ssize_t) EuclideanKernel, MagickFalse }, - { "Test", (ssize_t) TestKernel, MagickTrue }, /* for experimental kernels */ - { "User Defined", (ssize_t) UserDefinedKernel, MagickTrue }, /* internel */ + { "Test", (ssize_t) TestKernel, MagickTrue }, /* experimental */ + { "User Defined", (ssize_t) UserDefinedKernel, MagickTrue }, /* internal */ { (char *) NULL, (ssize_t) UndefinedKernel, MagickFalse } }, LayerOptions[] = diff --git a/wand/mogrify.c b/wand/mogrify.c index ca5061517..3874317e1 100644 --- a/wand/mogrify.c +++ b/wand/mogrify.c @@ -2890,7 +2890,10 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, (void) DeleteImageRegistry(argv[i+1]+9); else if (LocaleNCompare(argv[i+1],"option:",7) == 0) - (void) DeleteImageOption(image_info,argv[i+1]+7); + { + (void) DeleteImageOption(image_info,argv[i+1]+7); + (void) DeleteImageArtifact(*image,argv[i+1]+7); + } else (void) DeleteImageProperty(*image,argv[i+1]); break; -- 2.40.0