% March 2000 %
% %
% %
-% Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2015 ImageMagick Studio LLC, a non-profit organization %
% dedicated to making software imaging solutions freely available. %
% %
% You may not use this file except in compliance with the License. You may %
{ "Discrete", DiscreteAlphaChannel, UndefinedOptionFlag, MagickFalse },
{ "Disassociate", DisassociateAlphaChannel, UndefinedOptionFlag, MagickFalse },
{ "Extract", ExtractAlphaChannel, UndefinedOptionFlag, MagickFalse },
- { "Off", DeactivateAlphaChannel, UndefinedOptionFlag, MagickFalse },
- { "On", ActivateAlphaChannel, UndefinedOptionFlag, MagickFalse },
+ { "Off", OffAlphaChannel, UndefinedOptionFlag, MagickFalse },
+ { "On", OnAlphaChannel, UndefinedOptionFlag, MagickFalse },
{ "Opaque", OpaqueAlphaChannel, UndefinedOptionFlag, MagickFalse },
{ "Remove", RemoveAlphaChannel, UndefinedOptionFlag, MagickFalse },
{ "Set", SetAlphaChannel, UndefinedOptionFlag, MagickFalse },
{ "UserSpaceOnUse", UserSpaceOnUse, UndefinedOptionFlag, MagickFalse },
{ (char *) NULL, UndefinedPathUnits, UndefinedOptionFlag, MagickFalse }
},
+ ColorspaceOptions[] =
+ {
+ { "Undefined", UndefinedColorspace, UndefinedOptionFlag, MagickTrue },
+ { "CIELab", LabColorspace, UndefinedOptionFlag, MagickFalse },
+ { "CMY", CMYColorspace, UndefinedOptionFlag, MagickFalse },
+ { "CMYK", CMYKColorspace, UndefinedOptionFlag, MagickFalse },
+ { "Gray", GRAYColorspace, UndefinedOptionFlag, MagickFalse },
+ { "HCL", HCLColorspace, UndefinedOptionFlag, MagickFalse },
+ { "HCLp", HCLpColorspace, UndefinedOptionFlag, MagickFalse },
+ { "HSB", HSBColorspace, UndefinedOptionFlag, MagickFalse },
+ { "HSI", HSIColorspace, UndefinedOptionFlag, MagickFalse },
+ { "HSL", HSLColorspace, UndefinedOptionFlag, MagickFalse },
+ { "HSV", HSVColorspace, UndefinedOptionFlag, MagickFalse },
+ { "HWB", HWBColorspace, UndefinedOptionFlag, MagickFalse },
+ { "Lab", LabColorspace, UndefinedOptionFlag, MagickFalse },
+ { "LCH", LCHColorspace, UndefinedOptionFlag, MagickFalse },
+ { "LCHab", LCHabColorspace, UndefinedOptionFlag, MagickFalse },
+ { "LCHuv", LCHuvColorspace, UndefinedOptionFlag, MagickFalse },
+ { "LMS", LMSColorspace, UndefinedOptionFlag, MagickFalse },
+ { "Log", LogColorspace, UndefinedOptionFlag, MagickFalse },
+ { "Luv", LuvColorspace, UndefinedOptionFlag, MagickFalse },
+ { "OHTA", OHTAColorspace, UndefinedOptionFlag, MagickFalse },
+ { "Rec601YCbCr", Rec601YCbCrColorspace, UndefinedOptionFlag, MagickFalse },
+ { "Rec709YCbCr", Rec709YCbCrColorspace, UndefinedOptionFlag, MagickFalse },
+ { "RGB", RGBColorspace, UndefinedOptionFlag, MagickFalse },
+ { "scRGB", scRGBColorspace, UndefinedOptionFlag, MagickFalse },
+ { "sRGB", sRGBColorspace, UndefinedOptionFlag, MagickFalse },
+ { "Transparent", TransparentColorspace, UndefinedOptionFlag, MagickFalse },
+ { "xyY", xyYColorspace, UndefinedOptionFlag, MagickFalse },
+ { "XYZ", XYZColorspace, UndefinedOptionFlag, MagickFalse },
+ { "YCbCr", YCbCrColorspace, UndefinedOptionFlag, MagickFalse },
+ { "YDbDr", YDbDrColorspace, UndefinedOptionFlag, MagickFalse },
+ { "YCC", YCCColorspace, UndefinedOptionFlag, MagickFalse },
+ { "YIQ", YIQColorspace, UndefinedOptionFlag, MagickFalse },
+ { "YPbPr", YPbPrColorspace, UndefinedOptionFlag, MagickFalse },
+ { "YUV", YUVColorspace, UndefinedOptionFlag, MagickFalse },
+ { (char *) NULL, UndefinedColorspace, UndefinedOptionFlag, MagickFalse }
+ },
+ ComplexOptions[] =
+ {
+ { "Undefined", UndefinedComplexOperator, UndefinedOptionFlag, MagickTrue },
+ { "Add", AddComplexOperator, UndefinedOptionFlag, MagickFalse },
+ { "Conjugate", ConjugateComplexOperator, UndefinedOptionFlag, MagickFalse },
+ { "Divide", DivideComplexOperator, UndefinedOptionFlag, MagickFalse },
+ { "MagnitudePhase", MagnitudePhaseComplexOperator, UndefinedOptionFlag, MagickFalse },
+ { "Multiply", MultiplyComplexOperator, UndefinedOptionFlag, MagickFalse },
+ { "RealImaginary", RealImaginaryComplexOperator, UndefinedOptionFlag, MagickFalse },
+ { "Subtract", SubtractComplexOperator, UndefinedOptionFlag, MagickFalse },
+ { (char *) NULL, UndefinedComplexOperator, UndefinedOptionFlag, MagickFalse }
+ },
CommandOptions[] =
{
/*
{ "-caption", 1L, ImageInfoOptionFlag | NeverInterpretArgsFlag, MagickFalse },
{ "+cdl", 1L, DeprecateOptionFlag, MagickTrue },
{ "-cdl", 1L, SimpleOperatorFlag | NeverInterpretArgsFlag, MagickFalse },
- { "+channel", 0L, ImageInfoOptionFlag, MagickFalse },
- { "-channel", 1L, ImageInfoOptionFlag, MagickFalse },
+ { "+channel", 0L, SimpleOperatorFlag, MagickFalse },
+ { "-channel", 1L, SimpleOperatorFlag, MagickFalse },
{ "-channel-fx", 1L, ListOperatorFlag | FireOptionFlag, MagickFalse },
{ "+charcoal", 1L, DeprecateOptionFlag, MagickTrue },
{ "-charcoal", 1L, SimpleOperatorFlag, MagickFalse },
{ "-compress", 1L, ImageInfoOptionFlag, MagickFalse },
{ "+concurrent", 0L, DeprecateOptionFlag, MagickTrue },
{ "-concurrent", 0L, GenesisOptionFlag, MagickFalse },
+ { "+connected-components", 1L, DeprecateOptionFlag, MagickTrue },
+ { "-connected-components", 1L, SimpleOperatorFlag, MagickFalse },
{ "-contrast", 0L, ReplacedOptionFlag | SimpleOperatorFlag, MagickTrue },
{ "+contrast", 0L, ReplacedOptionFlag | SimpleOperatorFlag, MagickTrue },
{ "+contrast-stretch", 1L, DeprecateOptionFlag, MagickTrue },
{ "-contrast-stretch", 1L, SimpleOperatorFlag, MagickFalse },
{ "+convolve", 1L, DeprecateOptionFlag, MagickTrue },
{ "-convolve", 1L, SimpleOperatorFlag, MagickFalse },
+ { "+copy", 2L, DeprecateOptionFlag | FireOptionFlag, MagickTrue },
+ { "-copy", 2L, ListOperatorFlag | FireOptionFlag, MagickFalse },
{ "+crop", 1L, DeprecateOptionFlag | FireOptionFlag, MagickTrue },
{ "-crop", 1L, SimpleOperatorFlag | FireOptionFlag, MagickFalse },
{ "+cycle", 1L, DeprecateOptionFlag, MagickTrue },
{ "-geometry", 1L, SimpleOperatorFlag, MagickFalse },
{ "+gravity", 0L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse },
{ "-gravity", 1L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse },
- { "-grayscale", 1L, SimpleOperatorFlag, MagickFalse },
{ "+grayscale", 1L, SimpleOperatorFlag, MagickTrue },
+ { "-grayscale", 1L, SimpleOperatorFlag, MagickFalse },
{ "+green-primary", 0L, ImageInfoOptionFlag, MagickFalse },
{ "-green-primary", 1L, ImageInfoOptionFlag, MagickFalse },
{ "+hald-clut", 0L, DeprecateOptionFlag | FireOptionFlag, MagickTrue },
{ "-magnify", 0L, SimpleOperatorFlag, MagickFalse },
{ "+map", 0L, ReplacedOptionFlag | ListOperatorFlag | FireOptionFlag, MagickTrue },
{ "-map", 1L, ReplacedOptionFlag | SimpleOperatorFlag, MagickTrue },
- { "+mask", 0L, SimpleOperatorFlag | NeverInterpretArgsFlag, MagickFalse },
- { "-mask", 1L, SimpleOperatorFlag | NeverInterpretArgsFlag, MagickFalse },
+ { "+mask", 0L, DeprecateOptionFlag | NeverInterpretArgsFlag, MagickFalse },
+ { "-mask", 1L, DeprecateOptionFlag | NeverInterpretArgsFlag, MagickFalse },
{ "-matte", 0L, ReplacedOptionFlag | SimpleOperatorFlag, MagickTrue },
{ "+matte", 0L, ReplacedOptionFlag | SimpleOperatorFlag, MagickTrue },
{ "+mattecolor", 0L, ImageInfoOptionFlag, MagickFalse },
{ "-motion-blur", 1L, SimpleOperatorFlag, MagickFalse },
{ "+name", 0L, NonMagickOptionFlag, MagickFalse },
{ "-name", 1L, NonMagickOptionFlag, MagickFalse },
- { "-negate", 0L, SimpleOperatorFlag, MagickFalse },
{ "+negate", 0L, SimpleOperatorFlag, MagickFalse },
+ { "-negate", 0L, SimpleOperatorFlag, MagickFalse },
{ "-noise", 1L, ReplacedOptionFlag | SimpleOperatorFlag, MagickFalse },
{ "+noise", 1L, SimpleOperatorFlag, MagickFalse },
{ "-noop", 0L, NoImageOperatorFlag, MagickFalse },
{ "+random-threshold", 1L, DeprecateOptionFlag, MagickTrue },
{ "-random-threshold", 1L, SimpleOperatorFlag, MagickFalse },
{ "-read", 1L, NoImageOperatorFlag | NeverInterpretArgsFlag, MagickFalse },
+ { "+read-mask", 0L, SimpleOperatorFlag | NeverInterpretArgsFlag, MagickFalse },
+ { "-read-mask", 1L, SimpleOperatorFlag | NeverInterpretArgsFlag, MagickFalse },
{ "+recolor", 1L, DeprecateOptionFlag, MagickTrue },
{ "-recolor", 1L, ReplacedOptionFlag | SimpleOperatorFlag, MagickTrue },
{ "+red-primary", 0L, ImageInfoOptionFlag, MagickFalse },
{ "-window-group", 1L, NonMagickOptionFlag, MagickFalse },
{ "-write", 1L, NoImageOperatorFlag | NeverInterpretArgsFlag | FireOptionFlag, MagickFalse },
{ "+write", 1L, NoImageOperatorFlag | NeverInterpretArgsFlag | FireOptionFlag, MagickFalse },
+ { "+write-mask", 0L, SimpleOperatorFlag | NeverInterpretArgsFlag, MagickFalse },
+ { "-write-mask", 1L, SimpleOperatorFlag | NeverInterpretArgsFlag, MagickFalse },
{ (char *) NULL, 0L, UndefinedOptionFlag, MagickFalse }
},
+ ComplianceOptions[] =
+ {
+ { "Undefined", UndefinedCompliance, UndefinedOptionFlag, MagickTrue },
+ { "CSS", CSSCompliance, UndefinedOptionFlag, MagickFalse },
+ { "No", NoCompliance, UndefinedOptionFlag, MagickFalse },
+ { "SVG", SVGCompliance, UndefinedOptionFlag, MagickFalse },
+ { "X11", X11Compliance, UndefinedOptionFlag, MagickFalse },
+ { "XPM", XPMCompliance, UndefinedOptionFlag, MagickFalse },
+ { (char *) NULL, UndefinedClass, UndefinedOptionFlag, MagickFalse }
+ },
ComposeOptions[] =
{
{ "Undefined", UndefinedCompositeOp, UndefinedOptionFlag, MagickTrue },
{ "Xor", XorCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Divide", DivideDstCompositeOp, DeprecateOptionFlag, MagickTrue },
{ "Minus", MinusDstCompositeOp, DeprecateOptionFlag, MagickTrue },
+ { "Subtract", ModulusSubtractCompositeOp, DeprecateOptionFlag, MagickTrue },
+ { "Add", ModulusAddCompositeOp, DeprecateOptionFlag, MagickTrue },
{ "Threshold", ThresholdCompositeOp, DeprecateOptionFlag, MagickTrue },
{ "CopyOpacity", CopyAlphaCompositeOp, UndefinedOptionFlag, MagickTrue },
{ (char *) NULL, UndefinedCompositeOp, UndefinedOptionFlag, MagickFalse }
{ "ZipS", ZipSCompression, UndefinedOptionFlag, MagickFalse },
{ (char *) NULL, UndefinedCompression, UndefinedOptionFlag, MagickFalse }
},
- ColorspaceOptions[] =
- {
- { "Undefined", UndefinedColorspace, UndefinedOptionFlag, MagickTrue },
- { "CIELab", LabColorspace, UndefinedOptionFlag, MagickFalse },
- { "CMY", CMYColorspace, UndefinedOptionFlag, MagickFalse },
- { "CMYK", CMYKColorspace, UndefinedOptionFlag, MagickFalse },
- { "Gray", GRAYColorspace, UndefinedOptionFlag, MagickFalse },
- { "HCL", HCLColorspace, UndefinedOptionFlag, MagickFalse },
- { "HCLp", HCLpColorspace, UndefinedOptionFlag, MagickFalse },
- { "HSB", HSBColorspace, UndefinedOptionFlag, MagickFalse },
- { "HSI", HSIColorspace, UndefinedOptionFlag, MagickFalse },
- { "HSL", HSLColorspace, UndefinedOptionFlag, MagickFalse },
- { "HSV", HSVColorspace, UndefinedOptionFlag, MagickFalse },
- { "HWB", HWBColorspace, UndefinedOptionFlag, MagickFalse },
- { "Lab", LabColorspace, UndefinedOptionFlag, MagickFalse },
- { "LCH", LCHColorspace, UndefinedOptionFlag, MagickFalse },
- { "LCHab", LCHabColorspace, UndefinedOptionFlag, MagickFalse },
- { "LCHuv", LCHuvColorspace, UndefinedOptionFlag, MagickFalse },
- { "LMS", LMSColorspace, UndefinedOptionFlag, MagickFalse },
- { "Log", LogColorspace, UndefinedOptionFlag, MagickFalse },
- { "Luv", LuvColorspace, UndefinedOptionFlag, MagickFalse },
- { "OHTA", OHTAColorspace, UndefinedOptionFlag, MagickFalse },
- { "Rec601YCbCr", Rec601YCbCrColorspace, UndefinedOptionFlag, MagickFalse },
- { "Rec709YCbCr", Rec709YCbCrColorspace, UndefinedOptionFlag, MagickFalse },
- { "RGB", RGBColorspace, UndefinedOptionFlag, MagickFalse },
- { "scRGB", scRGBColorspace, UndefinedOptionFlag, MagickFalse },
- { "sRGB", sRGBColorspace, UndefinedOptionFlag, MagickFalse },
- { "Transparent", TransparentColorspace, UndefinedOptionFlag, MagickFalse },
- { "xyY", xyYColorspace, UndefinedOptionFlag, MagickFalse },
- { "XYZ", XYZColorspace, UndefinedOptionFlag, MagickFalse },
- { "YCbCr", YCbCrColorspace, UndefinedOptionFlag, MagickFalse },
- { "YDbDr", YDbDrColorspace, UndefinedOptionFlag, MagickFalse },
- { "YCC", YCCColorspace, UndefinedOptionFlag, MagickFalse },
- { "YIQ", YIQColorspace, UndefinedOptionFlag, MagickFalse },
- { "YPbPr", YPbPrColorspace, UndefinedOptionFlag, MagickFalse },
- { "YUV", YUVColorspace, UndefinedOptionFlag, MagickFalse },
- { (char *) NULL, UndefinedColorspace, UndefinedOptionFlag, MagickFalse }
- },
- ComplexOptions[] =
- {
- { "Undefined", UndefinedComplexOperator, UndefinedOptionFlag, MagickTrue },
- { "Add", AddComplexOperator, UndefinedOptionFlag, MagickFalse },
- { "Conjugate", ConjugateComplexOperator, UndefinedOptionFlag, MagickFalse },
- { "Divide", DivideComplexOperator, UndefinedOptionFlag, MagickFalse },
- { "MagnitudePhase", MagnitudePhaseComplexOperator, UndefinedOptionFlag, MagickFalse },
- { "Multiply", MultiplyComplexOperator, UndefinedOptionFlag, MagickFalse },
- { "RealImaginary", RealImaginaryComplexOperator, UndefinedOptionFlag, MagickFalse },
- { "Subtract", SubtractComplexOperator, UndefinedOptionFlag, MagickFalse },
- { (char *) NULL, UndefinedComplexOperator, UndefinedOptionFlag, MagickFalse }
- },
DataTypeOptions[] =
{
{ "Undefined", UndefinedData, UndefinedOptionFlag, MagickTrue },
},
DisposeOptions[] =
{
- { "Undefined", UndefinedDispose, UndefinedOptionFlag, MagickTrue },
+ { "Undefined", UndefinedDispose, UndefinedOptionFlag, MagickFalse },
{ "Background", BackgroundDispose, UndefinedOptionFlag, MagickFalse },
{ "None", NoneDispose, UndefinedOptionFlag, MagickFalse },
{ "Previous", PreviousDispose, UndefinedOptionFlag, MagickFalse },
- { "Undefined", UndefinedDispose, UndefinedOptionFlag, MagickFalse },
{ "0", UndefinedDispose, UndefinedOptionFlag, MagickFalse },
{ "1", NoneDispose, UndefinedOptionFlag, MagickFalse },
{ "2", BackgroundDispose, UndefinedOptionFlag, MagickFalse },
{ "ArcTan", ArctanFunction, UndefinedOptionFlag, MagickFalse },
{ (char *) NULL, UndefinedFunction, UndefinedOptionFlag, MagickFalse }
},
+ GradientOptions[] =
+ {
+ { "Undefined", UndefinedGradient, UndefinedOptionFlag, MagickTrue },
+ { "Linear", LinearGradient, UndefinedOptionFlag, MagickFalse },
+ { "Radial", RadialGradient, UndefinedOptionFlag, MagickFalse },
+ { (char *) NULL, UndefinedRule, UndefinedOptionFlag, MagickFalse }
+ },
GravityOptions[] =
{
{ "Undefined", UndefinedGravity, UndefinedOptionFlag, MagickTrue },
{ "Color", MagickColorOptions, UndefinedOptionFlag, MagickFalse },
{ "Colorspace", MagickColorspaceOptions, UndefinedOptionFlag, MagickFalse },
{ "Command", MagickCommandOptions, UndefinedOptionFlag, MagickFalse },
+ { "Compliance", MagickComplianceOptions, UndefinedOptionFlag, MagickFalse },
{ "Complex", MagickComplexOptions, UndefinedOptionFlag, MagickFalse },
{ "Compose", MagickComposeOptions, UndefinedOptionFlag, MagickFalse },
{ "Compress", MagickCompressOptions, UndefinedOptionFlag, MagickFalse },
{ "Font", MagickFontOptions, UndefinedOptionFlag, MagickFalse },
{ "Format", MagickFormatOptions, UndefinedOptionFlag, MagickFalse },
{ "Function", MagickFunctionOptions, UndefinedOptionFlag, MagickFalse },
+ { "Gradient", MagickGradientOptions, UndefinedOptionFlag, MagickFalse },
{ "Gravity", MagickGravityOptions, UndefinedOptionFlag, MagickFalse },
{ "Intensity", MagickPixelIntensityOptions, UndefinedOptionFlag, MagickFalse },
{ "Intent", MagickIntentOptions, UndefinedOptionFlag, MagickFalse },
{ "Undefined", MagickUndefinedOptions, UndefinedOptionFlag, MagickTrue },
{ "Validate", MagickValidateOptions, UndefinedOptionFlag, MagickFalse },
{ "VirtualPixel", MagickVirtualPixelOptions, UndefinedOptionFlag, MagickFalse },
+ { "Weight", MagickWeightOptions, UndefinedOptionFlag, MagickFalse },
{ (char *) NULL, MagickUndefinedOptions, UndefinedOptionFlag, MagickFalse }
},
LogEventOptions[] =
PrimitiveOptions[] =
{
{ "Undefined", UndefinedPrimitive, UndefinedOptionFlag, MagickTrue },
+ { "Alpha", AlphaPrimitive, UndefinedOptionFlag, MagickFalse },
{ "Arc", ArcPrimitive, UndefinedOptionFlag, MagickFalse },
{ "Bezier", BezierPrimitive, UndefinedOptionFlag, MagickFalse },
{ "Circle", CirclePrimitive, UndefinedOptionFlag, MagickFalse },
{ "Ellipse", EllipsePrimitive, UndefinedOptionFlag, MagickFalse },
{ "Image", ImagePrimitive, UndefinedOptionFlag, MagickFalse },
{ "Line", LinePrimitive, UndefinedOptionFlag, MagickFalse },
- { "Matte", MattePrimitive, UndefinedOptionFlag, MagickFalse },
+ { "Matte", AlphaPrimitive, UndefinedOptionFlag, MagickFalse },
{ "Path", PathPrimitive, UndefinedOptionFlag, MagickFalse },
{ "Point", PointPrimitive, UndefinedOptionFlag, MagickFalse },
{ "Polygon", PolygonPrimitive, UndefinedOptionFlag, MagickFalse },
{ "Area", AreaResource, UndefinedOptionFlag, MagickFalse },
{ "Disk", DiskResource, UndefinedOptionFlag, MagickFalse },
{ "File", FileResource, UndefinedOptionFlag, MagickFalse },
+ { "Height", HeightResource, UndefinedOptionFlag, MagickFalse },
{ "Map", MapResource, UndefinedOptionFlag, MagickFalse },
{ "Memory", MemoryResource, UndefinedOptionFlag, MagickFalse },
{ "Thread", ThreadResource, UndefinedOptionFlag, MagickFalse },
{ "Time", TimeResource, UndefinedOptionFlag, MagickFalse },
+ { "Width", WidthResource, UndefinedOptionFlag, MagickFalse },
{ (char *) NULL, UndefinedResource, UndefinedOptionFlag, MagickFalse }
},
SparseColorOptions[] =
{ "Undefined", UndefinedType, UndefinedOptionFlag, MagickTrue },
{ "Bilevel", BilevelType, UndefinedOptionFlag, MagickFalse },
{ "ColorSeparation", ColorSeparationType, UndefinedOptionFlag, MagickFalse },
- { "ColorSeparationAlpha", ColorSeparationMatteType, UndefinedOptionFlag, MagickFalse },
- { "ColorSeparationMatte", ColorSeparationMatteType, UndefinedOptionFlag, MagickFalse },
+ { "ColorSeparationAlpha", ColorSeparationAlphaType, UndefinedOptionFlag, MagickFalse },
+ { "ColorSeparationMatte", ColorSeparationAlphaType, UndefinedOptionFlag, MagickFalse },
{ "Grayscale", GrayscaleType, UndefinedOptionFlag, MagickFalse },
- { "GrayscaleAlpha", GrayscaleMatteType, UndefinedOptionFlag, MagickFalse },
- { "GrayscaleMatte", GrayscaleMatteType, UndefinedOptionFlag, MagickFalse },
+ { "GrayscaleAlpha", GrayscaleAlphaType, UndefinedOptionFlag, MagickFalse },
+ { "GrayscaleMatte", GrayscaleAlphaType, UndefinedOptionFlag, MagickFalse },
{ "Optimize", OptimizeType, UndefinedOptionFlag, MagickFalse },
{ "Palette", PaletteType, UndefinedOptionFlag, MagickFalse },
- { "PaletteBilevelAlpha", PaletteBilevelMatteType, UndefinedOptionFlag, MagickFalse },
- { "PaletteBilevelMatte", PaletteBilevelMatteType, UndefinedOptionFlag, MagickFalse },
- { "PaletteAlpha", PaletteMatteType, UndefinedOptionFlag, MagickFalse },
- { "PaletteMatte", PaletteMatteType, UndefinedOptionFlag, MagickFalse },
- { "TrueColorAlpha", TrueColorMatteType, UndefinedOptionFlag, MagickFalse },
- { "TrueColorMatte", TrueColorMatteType, UndefinedOptionFlag, MagickFalse },
+ { "PaletteBilevelAlpha", PaletteBilevelAlphaType, UndefinedOptionFlag, MagickFalse },
+ { "PaletteBilevelMatte", PaletteBilevelAlphaType, UndefinedOptionFlag, MagickFalse },
+ { "PaletteAlpha", PaletteAlphaType, UndefinedOptionFlag, MagickFalse },
+ { "PaletteMatte", PaletteAlphaType, UndefinedOptionFlag, MagickFalse },
+ { "TrueColorAlpha", TrueColorAlphaType, UndefinedOptionFlag, MagickFalse },
+ { "TrueColorMatte", TrueColorAlphaType, UndefinedOptionFlag, MagickFalse },
{ "TrueColor", TrueColorType, UndefinedOptionFlag, MagickFalse },
{ (char *) NULL, UndefinedType, UndefinedOptionFlag, MagickFalse }
},
{ "VerticalTileEdge", VerticalTileEdgeVirtualPixelMethod, UndefinedOptionFlag, MagickFalse },
{ "White", WhiteVirtualPixelMethod, UndefinedOptionFlag, MagickFalse },
{ (char *) NULL, UndefinedVirtualPixelMethod, UndefinedOptionFlag, MagickFalse }
+ },
+ WeightOptions[] =
+ {
+ { "Undefined", 0L, UndefinedOptionFlag, MagickTrue },
+ { "Thin", 100L, UndefinedOptionFlag, MagickFalse },
+ { "ExtraLight", 200L, UndefinedOptionFlag, MagickFalse },
+ { "UltraLight", 200L, UndefinedOptionFlag, MagickFalse },
+ { "Light", 300L, DeprecateOptionFlag, MagickTrue },
+ { "Normal", 400L, UndefinedOptionFlag, MagickFalse },
+ { "Regular", 400L, UndefinedOptionFlag, MagickFalse },
+ { "Medium", 500L, UndefinedOptionFlag, MagickFalse },
+ { "DemiBold", 600L, UndefinedOptionFlag, MagickFalse },
+ { "SemiBold", 600L, UndefinedOptionFlag, MagickFalse },
+ { "Bold", 700L, UndefinedOptionFlag, MagickFalse },
+ { "ExtraBold", 800L, UndefinedOptionFlag, MagickFalse },
+ { "UltraBold", 800L, UndefinedOptionFlag, MagickFalse },
+ { "Heavy", 900L, UndefinedOptionFlag, MagickFalse },
+ { "Black", 900L, UndefinedOptionFlag, MagickFalse },
+ { (char *) NULL, 0L, UndefinedOptionFlag, MagickFalse }
};
\f
/*
const ImageInfo *clone_info)
{
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(clone_info != (const ImageInfo *) NULL);
- assert(clone_info->signature == MagickSignature);
+ assert(clone_info->signature == MagickCoreSignature);
if (clone_info->options != (void *) NULL)
{
if (image_info->options != (void *) NULL)
const char *option)
{
char
- key[MaxTextExtent],
- value[MaxTextExtent];
+ key[MagickPathExtent],
+ value[MagickPathExtent];
register char
*p;
assert(image_info != (ImageInfo *) NULL);
assert(option != (const char *) NULL);
- (void) CopyMagickString(key,option,MaxTextExtent);
+ (void) CopyMagickString(key,option,MagickPathExtent);
for (p=key; *p != '\0'; p++)
if (*p == '=')
break;
*value='\0';
if (*p == '=')
- (void) CopyMagickString(value,p+1,MaxTextExtent);
+ (void) CopyMagickString(value,p+1,MagickPathExtent);
*p='\0';
return(SetImageOption(image_info,key,value));
}
const char *option)
{
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
MagickExport void DestroyImageOptions(ImageInfo *image_info)
{
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
const char *option)
{
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
case MagickClipPathOptions: return(ClipPathOptions);
case MagickColorspaceOptions: return(ColorspaceOptions);
case MagickCommandOptions: return(CommandOptions);
+ case MagickComplianceOptions: return(ComplianceOptions);
case MagickComplexOptions: return(ComplexOptions);
case MagickComposeOptions: return(ComposeOptions);
case MagickCompressOptions: return(CompressOptions);
case MagickFillRuleOptions: return(FillRuleOptions);
case MagickFilterOptions: return(FilterOptions);
case MagickFunctionOptions: return(FunctionOptions);
+ case MagickGradientOptions: return(GradientOptions);
case MagickGravityOptions: return(GravityOptions);
case MagickIntentOptions: return(IntentOptions);
case MagickInterlaceOptions: return(InterlaceOptions);
case MagickTypeOptions: return(TypeOptions);
case MagickValidateOptions: return(ValidateOptions);
case MagickVirtualPixelOptions: return(VirtualPixelOptions);
+ case MagickWeightOptions: return(WeightOptions);
default: break;
}
return((const OptionInfo *) NULL);
const MagickBooleanType list,const char *options)
{
char
- token[MaxTextExtent];
+ token[MagickPathExtent];
const OptionInfo
*command_info,
while (((isspace((int) ((unsigned char) *p)) == 0) && (*p != sentinel)) &&
(*p != '\0'))
{
- if ((q-token) >= (MaxTextExtent-1))
+ if ((q-token) >= (MagickPathExtent-1))
break;
*q++=(*p++);
}
(strchr(token+1,'_') != (char *) NULL)))
{
while ((q=strchr(token+1,'-')) != (char *) NULL)
- (void) CopyMagickString(q,q+1,MaxTextExtent-strlen(q));
+ (void) CopyMagickString(q,q+1,MagickPathExtent-strlen(q));
while ((q=strchr(token+1,'_')) != (char *) NULL)
- (void) CopyMagickString(q,q+1,MaxTextExtent-strlen(q));
+ (void) CopyMagickString(q,q+1,MagickPathExtent-strlen(q));
for (i=0; option_info[i].mnemonic != (char *) NULL; i++)
if (LocaleCompare(token,option_info[i].mnemonic) == 0)
break;
MagickExport char *GetNextImageOption(const ImageInfo *image_info)
{
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
if ((*option != '-') && (*option != '+'))
return(MagickFalse);
if (strlen(option) == 1)
- return(IsMagickTrue((*option == '{') || (*option == '}') ||
- (*option == '[') || (*option == ']') ));
+ return(((*option == '{') || (*option == '}') || (*option == '[') ||
+ (*option == ']')) ? MagickTrue : MagickFalse);
option++;
if (*option == '-')
return(MagickTrue);
if (type == option_info[i].type)
break;
if (option_info[i].mnemonic == (const char *) NULL)
- return("undefined");
+ return("Unrecognized");
return(option_info[i].mnemonic);
}
\f
const MagickBooleanType list,const char *options)
{
char
- token[MaxTextExtent];
+ token[MagickPathExtent];
const OptionInfo
*command_info,
ssize_t
option_types;
+ if (options == (const char *) NULL)
+ return(-1);
option_info=GetOptionInfo(option);
if (option_info == (const OptionInfo *) NULL)
return(-1);
while (((isspace((int) ((unsigned char) *p)) == 0) && (*p != sentinel)) &&
(*p != '\0'))
{
- if ((q-token) >= (MaxTextExtent-1))
+ if ((q-token) >= (MagickPathExtent-1))
break;
*q++=(*p++);
}
(strchr(token+1,'_') != (char *) NULL)))
{
while ((q=strchr(token+1,'-')) != (char *) NULL)
- (void) CopyMagickString(q,q+1,MaxTextExtent-strlen(q));
+ (void) CopyMagickString(q,q+1,MagickPathExtent-strlen(q));
while ((q=strchr(token+1,'_')) != (char *) NULL)
- (void) CopyMagickString(q,q+1,MaxTextExtent-strlen(q));
+ (void) CopyMagickString(q,q+1,MagickPathExtent-strlen(q));
for (i=0; option_info[i].mnemonic != (char *) NULL; i++)
if (LocaleCompare(token,option_info[i].mnemonic) == 0)
break;
{
char
*q,
- token[MaxTextExtent];
+ token[MagickPathExtent];
ssize_t
channel;
*value;
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
MagickExport void ResetImageOptions(const ImageInfo *image_info)
{
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
MagickExport void ResetImageOptionIterator(const ImageInfo *image_info)
{
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
const char *option,const char *value)
{
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);