Changeset 7587
- Timestamp:
- 04/22/12 04:51:01 (13 months ago)
- Location:
- ImageMagick/trunk
- Files:
-
- 9 edited
-
MagickCore/option.c (modified) (30 diffs)
-
MagickCore/option.h (modified) (2 diffs)
-
MagickWand/magick-cli.c (modified) (15 diffs)
-
MagickWand/operation.c (modified) (25 diffs)
-
MagickWand/operation.h (modified) (1 diff)
-
MagickWand/wandcli-private.h (modified) (2 diffs)
-
MagickWand/wandcli.c (modified) (3 diffs)
-
config/english.xml (modified) (1 diff)
-
config/francais.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
ImageMagick/trunk/MagickCore/option.c
r7580 r7587 180 180 Should not show any differences... 181 181 */ 182 { "(", 0L, SpecialOptionFlag, MagickTrue },183 { ")", 0L, SpecialOptionFlag, MagickTrue },184 { "{", 0L, SpecialOptionFlag, MagickTrue },185 { "}", 0L, SpecialOptionFlag, MagickTrue },186 { "--", 1L, SpecialOptionFlag, MagickTrue },182 { "(", 0L, NoImageOperatorFlag, MagickTrue }, 183 { ")", 0L, NoImageOperatorFlag, MagickTrue }, 184 { "{", 0L, NoImageOperatorFlag, MagickTrue }, 185 { "}", 0L, NoImageOperatorFlag, MagickTrue }, 186 { "--", 1L, NoImageOperatorFlag, MagickTrue }, 187 187 { "+adaptive-blur", 1L, DeprecateOptionFlag, MagickTrue }, 188 { "-adaptive-blur", 1L, SimpleOperator OptionFlag, MagickFalse },188 { "-adaptive-blur", 1L, SimpleOperatorFlag, MagickFalse }, 189 189 { "+adaptive-resize", 1L, DeprecateOptionFlag, MagickTrue }, 190 { "-adaptive-resize", 1L, SimpleOperator OptionFlag, MagickFalse },190 { "-adaptive-resize", 1L, SimpleOperatorFlag, MagickFalse }, 191 191 { "+adaptive-sharpen", 1L, DeprecateOptionFlag, MagickTrue }, 192 { "-adaptive-sharpen", 1L, SimpleOperator OptionFlag, MagickFalse },192 { "-adaptive-sharpen", 1L, SimpleOperatorFlag, MagickFalse }, 193 193 { "+adjoin", 0L, ImageInfoOptionFlag, MagickFalse }, 194 194 { "-adjoin", 0L, ImageInfoOptionFlag, MagickFalse }, … … 198 198 { "-affinity", 1L, DeprecateOptionFlag | FireOptionFlag, MagickTrue }, 199 199 { "+alpha", 1L, DeprecateOptionFlag, MagickTrue }, 200 { "-alpha", 1L, SimpleOperator OptionFlag, MagickFalse },200 { "-alpha", 1L, SimpleOperatorFlag, MagickFalse }, 201 201 { "+annotate", 0L, DeprecateOptionFlag, MagickTrue }, 202 { "-annotate", 2L, SimpleOperator OptionFlag, MagickFalse },202 { "-annotate", 2L, SimpleOperatorFlag, MagickFalse }, 203 203 { "+antialias", 0L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, 204 204 { "-antialias", 0L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, 205 { "+append", 0L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },206 { "-append", 0L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },205 { "+append", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 206 { "-append", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 207 207 { "+attenuate", 0L, ImageInfoOptionFlag, MagickFalse }, 208 208 { "-attenuate", 1L, ImageInfoOptionFlag, MagickFalse }, … … 210 210 { "-authenticate", 1L, ImageInfoOptionFlag, MagickFalse }, 211 211 { "+auto-gamma", 0L, DeprecateOptionFlag, MagickTrue }, 212 { "-auto-gamma", 0L, SimpleOperator OptionFlag, MagickFalse },212 { "-auto-gamma", 0L, SimpleOperatorFlag, MagickFalse }, 213 213 { "+auto-level", 0L, DeprecateOptionFlag, MagickTrue }, 214 { "-auto-level", 0L, SimpleOperator OptionFlag, MagickFalse },214 { "-auto-level", 0L, SimpleOperatorFlag, MagickFalse }, 215 215 { "+auto-orient", 0L, DeprecateOptionFlag, MagickTrue }, 216 { "-auto-orient", 0L, SimpleOperator OptionFlag, MagickFalse },216 { "-auto-orient", 0L, SimpleOperatorFlag, MagickFalse }, 217 217 { "+average", 0L, DeprecateOptionFlag, MagickTrue }, 218 { "-average", 0L, ReplacedOptionFlag | ListOperator OptionFlag | FireOptionFlag, MagickTrue },218 { "-average", 0L, ReplacedOptionFlag | ListOperatorFlag | FireOptionFlag, MagickTrue }, 219 219 { "+backdrop", 0L, NonMagickOptionFlag, MagickFalse }, 220 220 { "-backdrop", 1L, NonMagickOptionFlag, MagickFalse }, … … 228 228 { "-black-point-compensation", 0L, ImageInfoOptionFlag, MagickFalse }, 229 229 { "+black-threshold", 0L, DeprecateOptionFlag, MagickTrue }, 230 { "-black-threshold", 1L, SimpleOperator OptionFlag, MagickFalse },230 { "-black-threshold", 1L, SimpleOperatorFlag, MagickFalse }, 231 231 { "+blend", 0L, NonMagickOptionFlag, MagickFalse }, 232 232 { "-blend", 1L, NonMagickOptionFlag, MagickFalse }, 233 233 { "+blue-primary", 0L, ImageInfoOptionFlag, MagickFalse }, 234 234 { "-blue-primary", 1L, ImageInfoOptionFlag, MagickFalse }, 235 { "+blue-shift", 1L, SimpleOperator OptionFlag, MagickFalse },236 { "-blue-shift", 1L, SimpleOperator OptionFlag, MagickFalse },235 { "+blue-shift", 1L, SimpleOperatorFlag, MagickFalse }, 236 { "-blue-shift", 1L, SimpleOperatorFlag, MagickFalse }, 237 237 { "+blur", 0L, DeprecateOptionFlag, MagickTrue }, 238 { "-blur", 1L, SimpleOperator OptionFlag, MagickFalse },238 { "-blur", 1L, SimpleOperatorFlag, MagickFalse }, 239 239 { "+border", 1L, DeprecateOptionFlag, MagickTrue }, 240 { "-border", 1L, SimpleOperator OptionFlag, MagickFalse },240 { "-border", 1L, SimpleOperatorFlag, MagickFalse }, 241 241 { "+bordercolor", 0L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, 242 242 { "-bordercolor", 1L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, … … 246 246 { "-box", 1L, ReplacedOptionFlag | ImageInfoOptionFlag | DrawInfoOptionFlag, MagickTrue }, 247 247 { "+brightness-contrast", 0L, DeprecateOptionFlag, MagickTrue }, 248 { "-brightness-contrast", 1L, SimpleOperator OptionFlag, MagickFalse },248 { "-brightness-contrast", 1L, SimpleOperatorFlag, MagickFalse }, 249 249 { "+cache", 0L, GlobalOptionFlag, MagickFalse }, 250 250 { "-cache", 1L, GlobalOptionFlag, MagickFalse }, … … 252 252 { "-caption", 1L, ImageInfoOptionFlag, MagickFalse }, 253 253 { "+cdl", 1L, DeprecateOptionFlag, MagickTrue }, 254 { "-cdl", 1L, SimpleOperator OptionFlag, MagickFalse },254 { "-cdl", 1L, SimpleOperatorFlag, MagickFalse }, 255 255 { "+channel", 0L, ImageInfoOptionFlag, MagickFalse }, 256 256 { "-channel", 1L, ImageInfoOptionFlag, MagickFalse }, 257 { "-channel-fx", 1L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },257 { "-channel-fx", 1L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 258 258 { "+charcoal", 0L, DeprecateOptionFlag, MagickTrue }, 259 { "-charcoal", 0L, SimpleOperator OptionFlag, MagickFalse },259 { "-charcoal", 0L, SimpleOperatorFlag, MagickFalse }, 260 260 { "+chop", 1L, DeprecateOptionFlag, MagickTrue }, 261 { "-chop", 1L, SimpleOperator OptionFlag, MagickFalse },261 { "-chop", 1L, SimpleOperatorFlag, MagickFalse }, 262 262 { "+clamp", 0L, DeprecateOptionFlag, MagickTrue }, 263 { "-clamp", 0L, SimpleOperator OptionFlag, MagickFalse },264 { "+clip", 0L, SimpleOperator OptionFlag, MagickFalse },265 { "-clip", 0L, SimpleOperator OptionFlag, MagickFalse },266 { "+clip-mask", 0L, SimpleOperator OptionFlag, MagickFalse },267 { "-clip-mask", 1L, SimpleOperator OptionFlag, MagickFalse },268 { "+clip-path", 1L, SimpleOperator OptionFlag, MagickFalse },269 { "-clip-path", 1L, SimpleOperator OptionFlag, MagickFalse },270 { "+clone", 0L, SpecialOptionFlag, MagickFalse },271 { "-clone", 1L, SpecialOptionFlag, MagickFalse },263 { "-clamp", 0L, SimpleOperatorFlag, MagickFalse }, 264 { "+clip", 0L, SimpleOperatorFlag, MagickFalse }, 265 { "-clip", 0L, SimpleOperatorFlag, MagickFalse }, 266 { "+clip-mask", 0L, SimpleOperatorFlag, MagickFalse }, 267 { "-clip-mask", 1L, SimpleOperatorFlag, MagickFalse }, 268 { "+clip-path", 1L, SimpleOperatorFlag, MagickFalse }, 269 { "-clip-path", 1L, SimpleOperatorFlag, MagickFalse }, 270 { "+clone", 0L, NoImageOperatorFlag, MagickFalse }, 271 { "-clone", 1L, NoImageOperatorFlag, MagickFalse }, 272 272 { "+clut", 0L, DeprecateOptionFlag | FireOptionFlag, MagickTrue }, 273 { "-clut", 0L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },273 { "-clut", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 274 274 { "+coalesce", 0L, DeprecateOptionFlag | FireOptionFlag, MagickTrue }, 275 { "-coalesce", 0L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },275 { "-coalesce", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 276 276 { "+color-matrix", 1L, DeprecateOptionFlag, MagickTrue }, 277 { "-color-matrix", 1L, SimpleOperator OptionFlag, MagickFalse },277 { "-color-matrix", 1L, SimpleOperatorFlag, MagickFalse }, 278 278 { "+colorize", 1L, DeprecateOptionFlag, MagickTrue }, 279 { "-colorize", 1L, SimpleOperator OptionFlag, MagickFalse },279 { "-colorize", 1L, SimpleOperatorFlag, MagickFalse }, 280 280 { "+colormap", 0L, NonMagickOptionFlag, MagickFalse }, 281 281 { "-colormap", 1L, NonMagickOptionFlag, MagickFalse }, 282 282 { "+colors", 1L, DeprecateOptionFlag, MagickTrue }, 283 { "-colors", 1L, SimpleOperator OptionFlag, MagickFalse },284 { "+colorspace", 0L, ImageInfoOptionFlag | SimpleOperator OptionFlag, MagickFalse },285 { "-colorspace", 1L, ImageInfoOptionFlag | SimpleOperator OptionFlag, MagickFalse },283 { "-colors", 1L, SimpleOperatorFlag, MagickFalse }, 284 { "+colorspace", 0L, ImageInfoOptionFlag | SimpleOperatorFlag, MagickFalse }, 285 { "-colorspace", 1L, ImageInfoOptionFlag | SimpleOperatorFlag, MagickFalse }, 286 286 { "+combine", 0L, DeprecateOptionFlag | FireOptionFlag, MagickTrue }, 287 { "-combine", 0L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },287 { "-combine", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 288 288 { "+comment", 0L, ImageInfoOptionFlag, MagickFalse }, 289 289 { "-comment", 1L, ImageInfoOptionFlag, MagickFalse }, … … 291 291 { "-compose", 1L, ImageInfoOptionFlag, MagickFalse }, 292 292 { "+composite", 0L, DeprecateOptionFlag | FireOptionFlag, MagickTrue }, 293 { "-composite", 0L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },293 { "-composite", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 294 294 { "+compress", 0L, ImageInfoOptionFlag, MagickFalse }, 295 295 { "-compress", 1L, ImageInfoOptionFlag, MagickFalse }, 296 296 { "+concurrent", 0L, DeprecateOptionFlag, MagickTrue }, 297 297 { "-concurrent", 0L, GenesisOptionFlag, MagickFalse }, 298 { "+contrast", 0L, ReplacedOptionFlag | SimpleOperator OptionFlag, MagickTrue },299 { "-contrast", 0L, ReplacedOptionFlag | SimpleOperator OptionFlag, MagickTrue },298 { "+contrast", 0L, ReplacedOptionFlag | SimpleOperatorFlag, MagickTrue }, 299 { "-contrast", 0L, ReplacedOptionFlag | SimpleOperatorFlag, MagickTrue }, 300 300 { "+contrast-stretch", 1L, DeprecateOptionFlag, MagickTrue }, 301 { "-contrast-stretch", 1L, SimpleOperator OptionFlag, MagickFalse },301 { "-contrast-stretch", 1L, SimpleOperatorFlag, MagickFalse }, 302 302 { "+convolve", 1L, DeprecateOptionFlag, MagickTrue }, 303 { "-convolve", 1L, SimpleOperator OptionFlag, MagickFalse },303 { "-convolve", 1L, SimpleOperatorFlag, MagickFalse }, 304 304 { "+crop", 1L, DeprecateOptionFlag | FireOptionFlag, MagickTrue }, 305 { "-crop", 1L, SimpleOperator OptionFlag | FireOptionFlag, MagickFalse },305 { "-crop", 1L, SimpleOperatorFlag | FireOptionFlag, MagickFalse }, 306 306 { "+cycle", 1L, DeprecateOptionFlag, MagickTrue }, 307 { "-cycle", 1L, SimpleOperator OptionFlag, MagickFalse },307 { "-cycle", 1L, SimpleOperatorFlag, MagickFalse }, 308 308 { "+debug", 0L, GlobalOptionFlag | FireOptionFlag, MagickFalse }, 309 309 { "-debug", 1L, GlobalOptionFlag | FireOptionFlag, MagickFalse }, 310 310 { "+decipher", 1L, DeprecateOptionFlag, MagickTrue }, 311 { "-decipher", 1L, SimpleOperator OptionFlag, MagickFalse },311 { "-decipher", 1L, SimpleOperatorFlag, MagickFalse }, 312 312 { "+deconstruct", 0L, DeprecateOptionFlag, MagickTrue }, 313 { "-deconstruct", 0L, ReplacedOptionFlag | ListOperator OptionFlag | FireOptionFlag, MagickTrue },313 { "-deconstruct", 0L, ReplacedOptionFlag | ListOperatorFlag | FireOptionFlag, MagickTrue }, 314 314 { "+define", 1L, ImageInfoOptionFlag, MagickFalse }, 315 315 { "-define", 1L, ImageInfoOptionFlag, MagickFalse }, 316 316 { "+delay", 0L, ImageInfoOptionFlag, MagickFalse }, 317 317 { "-delay", 1L, ImageInfoOptionFlag, MagickFalse }, 318 { "+delete", 0L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },319 { "-delete", 1L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },318 { "+delete", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 319 { "-delete", 1L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 320 320 { "+density", 0L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, 321 321 { "-density", 1L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, 322 { "+depth", 0L, ImageInfoOptionFlag | SimpleOperator OptionFlag, MagickFalse },323 { "-depth", 1L, ImageInfoOptionFlag | SimpleOperator OptionFlag, MagickFalse },322 { "+depth", 0L, ImageInfoOptionFlag | SimpleOperatorFlag, MagickFalse }, 323 { "-depth", 1L, ImageInfoOptionFlag | SimpleOperatorFlag, MagickFalse }, 324 324 { "+descend", 0L, NonMagickOptionFlag, MagickFalse }, 325 325 { "-descend", 1L, NonMagickOptionFlag, MagickFalse }, 326 { "+deskew", 0L, SimpleOperator OptionFlag, MagickFalse },327 { "-deskew", 1L, SimpleOperator OptionFlag, MagickFalse },326 { "+deskew", 0L, SimpleOperatorFlag, MagickFalse }, 327 { "-deskew", 1L, SimpleOperatorFlag, MagickFalse }, 328 328 { "+despeckle", 0L, DeprecateOptionFlag, MagickTrue }, 329 { "-despeckle", 0L, SimpleOperator OptionFlag, MagickFalse },329 { "-despeckle", 0L, SimpleOperatorFlag, MagickFalse }, 330 330 { "+direction", 0L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, 331 331 { "-direction", 1L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, … … 340 340 { "+dissimilarity-threshold", 0L, NonMagickOptionFlag | ImageInfoOptionFlag, MagickFalse }, 341 341 { "-dissimilarity-threshold", 1L, NonMagickOptionFlag | ImageInfoOptionFlag, MagickFalse }, 342 { "+distort", 2L, SimpleOperator OptionFlag, MagickFalse },343 { "-distort", 2L, SimpleOperator OptionFlag, MagickFalse },342 { "+distort", 2L, SimpleOperatorFlag, MagickFalse }, 343 { "-distort", 2L, SimpleOperatorFlag, MagickFalse }, 344 344 { "+dither", 0L, ImageInfoOptionFlag | QuantizeInfoOptionFlag, MagickFalse }, 345 345 { "-dither", 1L, ImageInfoOptionFlag | QuantizeInfoOptionFlag, MagickFalse }, 346 346 { "+draw", 0L, DeprecateOptionFlag, MagickTrue }, 347 { "-draw", 1L, SimpleOperator OptionFlag, MagickFalse },348 { "+duplicate", 0L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },349 { "-duplicate", 1L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },347 { "-draw", 1L, SimpleOperatorFlag, MagickFalse }, 348 { "+duplicate", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 349 { "-duplicate", 1L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 350 350 { "+duration", 1L, GenesisOptionFlag, MagickFalse }, 351 351 { "-duration", 1L, GenesisOptionFlag, MagickFalse }, 352 352 { "+edge", 1L, DeprecateOptionFlag, MagickTrue }, 353 { "-edge", 1L, SimpleOperator OptionFlag, MagickFalse },353 { "-edge", 1L, SimpleOperatorFlag, MagickFalse }, 354 354 { "+emboss", 1L, DeprecateOptionFlag, MagickTrue }, 355 { "-emboss", 1L, SimpleOperator OptionFlag, MagickFalse },355 { "-emboss", 1L, SimpleOperatorFlag, MagickFalse }, 356 356 { "+encipher", 1L, DeprecateOptionFlag, MagickTrue }, 357 { "-encipher", 1L, SimpleOperator OptionFlag, MagickFalse },357 { "-encipher", 1L, SimpleOperatorFlag, MagickFalse }, 358 358 { "+encoding", 0L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, 359 359 { "-encoding", 1L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, … … 361 361 { "-endian", 1L, ImageInfoOptionFlag, MagickFalse }, 362 362 { "+enhance", 0L, DeprecateOptionFlag, MagickTrue }, 363 { "-enhance", 0L, SimpleOperator OptionFlag, MagickFalse },363 { "-enhance", 0L, SimpleOperatorFlag, MagickFalse }, 364 364 { "+equalize", 0L, DeprecateOptionFlag, MagickTrue }, 365 { "-equalize", 0L, SimpleOperator OptionFlag, MagickFalse },365 { "-equalize", 0L, SimpleOperatorFlag, MagickFalse }, 366 366 { "+evaluate", 2L, DeprecateOptionFlag, MagickTrue }, 367 { "-evaluate", 2L, SimpleOperator OptionFlag, MagickFalse },367 { "-evaluate", 2L, SimpleOperatorFlag, MagickFalse }, 368 368 { "+evaluate-sequence", 1L, DeprecateOptionFlag | FireOptionFlag, MagickTrue }, 369 { "-evaluate-sequence", 1L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },369 { "-evaluate-sequence", 1L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 370 370 { "-exit", 0L, SpecialOptionFlag, MagickFalse }, 371 371 { "+extent", 1L, DeprecateOptionFlag, MagickTrue }, 372 { "-extent", 1L, SimpleOperator OptionFlag, MagickFalse },372 { "-extent", 1L, SimpleOperatorFlag, MagickFalse }, 373 373 { "+extract", 0L, ImageInfoOptionFlag, MagickFalse }, 374 374 { "-extract", 1L, ImageInfoOptionFlag, MagickFalse }, 375 375 { "+family", 0L, DeprecateOptionFlag, MagickTrue }, 376 376 { "-family", 1L, DrawInfoOptionFlag, MagickFalse }, 377 { "+features", 0L, SimpleOperator OptionFlag | FireOptionFlag, MagickFalse },378 { "-features", 1L, SimpleOperator OptionFlag | FireOptionFlag, MagickFalse },379 { "+fft", 0L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },380 { "-fft", 0L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },377 { "+features", 0L, SimpleOperatorFlag | FireOptionFlag, MagickFalse }, 378 { "-features", 1L, SimpleOperatorFlag | FireOptionFlag, MagickFalse }, 379 { "+fft", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 380 { "-fft", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 381 381 { "+fill", 0L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, 382 382 { "-fill", 1L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, … … 384 384 { "-filter", 1L, ImageInfoOptionFlag, MagickFalse }, 385 385 { "+flatten", 0L, DeprecateOptionFlag, MagickTrue }, 386 { "-flatten", 0L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },386 { "-flatten", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 387 387 { "+flip", 0L, DeprecateOptionFlag, MagickTrue }, 388 { "-flip", 0L, SimpleOperator OptionFlag, MagickFalse },389 { "+floodfill", 2L, SimpleOperator OptionFlag, MagickFalse },390 { "-floodfill", 2L, SimpleOperator OptionFlag, MagickFalse },388 { "-flip", 0L, SimpleOperatorFlag, MagickFalse }, 389 { "+floodfill", 2L, SimpleOperatorFlag, MagickFalse }, 390 { "-floodfill", 2L, SimpleOperatorFlag, MagickFalse }, 391 391 { "+flop", 0L, DeprecateOptionFlag, MagickTrue }, 392 { "-flop", 0L, SimpleOperator OptionFlag, MagickFalse },392 { "-flop", 0L, SimpleOperatorFlag, MagickFalse }, 393 393 { "+font", 0L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, 394 394 { "-font", 1L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, … … 398 398 { "-format", 1L, ImageInfoOptionFlag, MagickFalse }, 399 399 { "+frame", 1L, DeprecateOptionFlag, MagickTrue }, 400 { "-frame", 1L, SimpleOperator OptionFlag, MagickFalse },400 { "-frame", 1L, SimpleOperatorFlag, MagickFalse }, 401 401 { "+function", 2L, DeprecateOptionFlag, MagickTrue }, 402 { "-function", 2L,SimpleOperator OptionFlag, MagickFalse },402 { "-function", 2L,SimpleOperatorFlag, MagickFalse }, 403 403 { "+fuzz", 0L, ImageInfoOptionFlag, MagickFalse }, 404 404 { "-fuzz", 1L, ImageInfoOptionFlag, MagickFalse }, 405 405 { "+fx", 1L, DeprecateOptionFlag | FireOptionFlag, MagickTrue }, 406 { "-fx", 1L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },407 { "+gamma", 0L, SimpleOperator OptionFlag, MagickFalse },408 { "-gamma", 1L, SimpleOperator OptionFlag, MagickFalse },406 { "-fx", 1L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 407 { "+gamma", 0L, SimpleOperatorFlag, MagickFalse }, 408 { "-gamma", 1L, SimpleOperatorFlag, MagickFalse }, 409 409 { "+gaussian", 1L, DeprecateOptionFlag, MagickTrue }, 410 { "-gaussian", 1L, ReplacedOptionFlag | SimpleOperator OptionFlag, MagickTrue },410 { "-gaussian", 1L, ReplacedOptionFlag | SimpleOperatorFlag, MagickTrue }, 411 411 { "+gaussian-blur", 1L, DeprecateOptionFlag, MagickTrue }, 412 { "-gaussian-blur", 1L, SimpleOperator OptionFlag, MagickFalse },413 { "+geometry", 0L, SimpleOperator OptionFlag, MagickFalse },414 { "-geometry", 1L, SimpleOperator OptionFlag, MagickFalse },412 { "-gaussian-blur", 1L, SimpleOperatorFlag, MagickFalse }, 413 { "+geometry", 0L, SimpleOperatorFlag, MagickFalse }, 414 { "-geometry", 1L, SimpleOperatorFlag, MagickFalse }, 415 415 { "+gravity", 0L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, 416 416 { "-gravity", 1L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, … … 418 418 { "-green-primary", 1L, ImageInfoOptionFlag, MagickFalse }, 419 419 { "+hald-clut", 0L, DeprecateOptionFlag | FireOptionFlag, MagickTrue }, 420 { "-hald-clut", 0L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },420 { "-hald-clut", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 421 421 { "+highlight-color", 0L, NonMagickOptionFlag | ImageInfoOptionFlag, MagickFalse }, 422 422 { "-highlight-color", 1L, NonMagickOptionFlag | ImageInfoOptionFlag, MagickFalse }, … … 426 426 { "-iconic", 1L, NonMagickOptionFlag, MagickFalse }, 427 427 { "+identify", 0L, DeprecateOptionFlag | FireOptionFlag, MagickTrue }, 428 { "-identify", 0L, SimpleOperator OptionFlag | FireOptionFlag, MagickFalse },429 { "+ift", 0L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },430 { "-ift", 0L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },428 { "-identify", 0L, SimpleOperatorFlag | FireOptionFlag, MagickFalse }, 429 { "+ift", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 430 { "-ift", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 431 431 { "+immutable", 0L, NonMagickOptionFlag, MagickFalse }, 432 432 { "-immutable", 0L, NonMagickOptionFlag, MagickFalse }, 433 433 { "+implode", 0L, DeprecateOptionFlag, MagickTrue }, 434 { "-implode", 1L, SimpleOperator OptionFlag, MagickFalse },435 { "+insert", 0L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },436 { "-insert", 1L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },434 { "-implode", 1L, SimpleOperatorFlag, MagickFalse }, 435 { "+insert", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 436 { "-insert", 1L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 437 437 { "+intent", 0L, ImageInfoOptionFlag, MagickFalse }, 438 438 { "-intent", 1L, ImageInfoOptionFlag, MagickFalse }, … … 444 444 { "-interpolate", 1L, ImageInfoOptionFlag, MagickFalse }, 445 445 { "+interpolative-resize", 1L, DeprecateOptionFlag, MagickTrue }, 446 { "-interpolative-resize", 1L, SimpleOperator OptionFlag, MagickFalse },446 { "-interpolative-resize", 1L, SimpleOperatorFlag, MagickFalse }, 447 447 { "+interword-spacing", 0L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, 448 448 { "-interword-spacing", 1L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, … … 452 452 { "-label", 1L, ImageInfoOptionFlag, MagickFalse }, 453 453 { "+lat", 1L, DeprecateOptionFlag, MagickTrue }, 454 { "-lat", 1L, SimpleOperator OptionFlag, MagickFalse },454 { "-lat", 1L, SimpleOperatorFlag, MagickFalse }, 455 455 { "+layers", 1L, DeprecateOptionFlag | FireOptionFlag, MagickTrue }, 456 { "-layers", 1L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },457 { "+level", 1L, SimpleOperator OptionFlag, MagickFalse },458 { "-level", 1L, SimpleOperator OptionFlag, MagickFalse },459 { "+level-colors", 1L, SimpleOperator OptionFlag, MagickFalse },460 { "-level-colors", 1L, SimpleOperator OptionFlag, MagickFalse },456 { "-layers", 1L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 457 { "+level", 1L, SimpleOperatorFlag, MagickFalse }, 458 { "-level", 1L, SimpleOperatorFlag, MagickFalse }, 459 { "+level-colors", 1L, SimpleOperatorFlag, MagickFalse }, 460 { "-level-colors", 1L, SimpleOperatorFlag, MagickFalse }, 461 461 { "+limit", 0L, DeprecateOptionFlag, MagickTrue }, 462 462 { "-limit", 2L, GlobalOptionFlag | FireOptionFlag, MagickFalse }, 463 463 { "+linear-stretch", 1L, DeprecateOptionFlag, MagickTrue }, 464 { "-linear-stretch", 1L, SimpleOperator OptionFlag, MagickFalse },464 { "-linear-stretch", 1L, SimpleOperatorFlag, MagickFalse }, 465 465 { "+liquid-rescale", 1L, DeprecateOptionFlag, MagickTrue }, 466 { "-liquid-rescale", 1L, SimpleOperator OptionFlag, MagickFalse },466 { "-liquid-rescale", 1L, SimpleOperatorFlag, MagickFalse }, 467 467 { "+list", 0L, DeprecateOptionFlag, MagickTrue }, 468 { "-list", 1L, SpecialOptionFlag, MagickFalse },468 { "-list", 1L, NoImageOperatorFlag, MagickFalse }, 469 469 { "+log", 0L, DeprecateOptionFlag, MagickFalse }, 470 470 { "-log", 1L, GlobalOptionFlag, MagickFalse }, … … 475 475 { "+magnify", 0L, NonMagickOptionFlag, MagickFalse }, 476 476 { "-magnify", 1L, NonMagickOptionFlag, MagickFalse }, 477 { "+map", 0L, ReplacedOptionFlag | ListOperator OptionFlag | FireOptionFlag, MagickTrue },478 { "-map", 1L, ReplacedOptionFlag | SimpleOperator OptionFlag, MagickTrue },479 { "+mask", 0L, SimpleOperator OptionFlag, MagickFalse },480 { "-mask", 1L, SimpleOperator OptionFlag, MagickFalse },481 { "+matte", 0L, ReplacedOptionFlag | SimpleOperator OptionFlag, MagickTrue },482 { "-matte", 0L, ReplacedOptionFlag | SimpleOperator OptionFlag, MagickTrue },477 { "+map", 0L, ReplacedOptionFlag | ListOperatorFlag | FireOptionFlag, MagickTrue }, 478 { "-map", 1L, ReplacedOptionFlag | SimpleOperatorFlag, MagickTrue }, 479 { "+mask", 0L, SimpleOperatorFlag, MagickFalse }, 480 { "-mask", 1L, SimpleOperatorFlag, MagickFalse }, 481 { "+matte", 0L, ReplacedOptionFlag | SimpleOperatorFlag, MagickTrue }, 482 { "-matte", 0L, ReplacedOptionFlag | SimpleOperatorFlag, MagickTrue }, 483 483 { "+mattecolor", 0L, ImageInfoOptionFlag, MagickFalse }, 484 484 { "-mattecolor", 1L, ImageInfoOptionFlag, MagickFalse }, … … 486 486 { "-maximum", 0L, DeprecateOptionFlag | FireOptionFlag, MagickTrue }, 487 487 { "+median", 1L, DeprecateOptionFlag, MagickTrue }, 488 { "-median", 1L, ReplacedOptionFlag | SimpleOperator OptionFlag | FireOptionFlag, MagickTrue },488 { "-median", 1L, ReplacedOptionFlag | SimpleOperatorFlag | FireOptionFlag, MagickTrue }, 489 489 { "+metric", 0L, ImageInfoOptionFlag, MagickFalse }, 490 490 { "-metric", 1L, ImageInfoOptionFlag, MagickFalse }, … … 492 492 { "-minimum", 0L, DeprecateOptionFlag | FireOptionFlag, MagickTrue }, 493 493 { "+mode", 1L, NonMagickOptionFlag, MagickFalse }, 494 { "-mode", 1L, ReplacedOptionFlag | SimpleOperator OptionFlag, MagickTrue },494 { "-mode", 1L, ReplacedOptionFlag | SimpleOperatorFlag, MagickTrue }, 495 495 { "+modulate", 1L, DeprecateOptionFlag, MagickTrue }, 496 { "-modulate", 1L, SimpleOperator OptionFlag, MagickFalse },497 { "+monitor", 0L, ImageInfoOptionFlag | SimpleOperator OptionFlag, MagickFalse },498 { "-monitor", 0L, ImageInfoOptionFlag | SimpleOperator OptionFlag, MagickFalse },496 { "-modulate", 1L, SimpleOperatorFlag, MagickFalse }, 497 { "+monitor", 0L, ImageInfoOptionFlag | SimpleOperatorFlag, MagickFalse }, 498 { "-monitor", 0L, ImageInfoOptionFlag | SimpleOperatorFlag, MagickFalse }, 499 499 { "+monochrome", 0L, ImageInfoOptionFlag, MagickFalse }, 500 { "-monochrome", 0L, ImageInfoOptionFlag | SimpleOperator OptionFlag, MagickFalse },500 { "-monochrome", 0L, ImageInfoOptionFlag | SimpleOperatorFlag, MagickFalse }, 501 501 { "+morph", 1L, DeprecateOptionFlag | FireOptionFlag, MagickTrue }, 502 { "-morph", 1L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },502 { "-morph", 1L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 503 503 { "+morphology", 2L, DeprecateOptionFlag, MagickTrue }, 504 { "-morphology", 2L, SimpleOperator OptionFlag, MagickFalse },504 { "-morphology", 2L, SimpleOperatorFlag, MagickFalse }, 505 505 { "+mosaic", 0L, DeprecateOptionFlag, MagickTrue }, 506 { "-mosaic", 0L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },506 { "-mosaic", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 507 507 { "+motion-blur", 1L, DeprecateOptionFlag, MagickTrue }, 508 { "-motion-blur", 1L, SimpleOperator OptionFlag, MagickFalse },508 { "-motion-blur", 1L, SimpleOperatorFlag, MagickFalse }, 509 509 { "+name", 0L, NonMagickOptionFlag, MagickFalse }, 510 510 { "-name", 1L, NonMagickOptionFlag, MagickFalse }, 511 { "+negate", 0L, SimpleOperator OptionFlag, MagickFalse },512 { "-negate", 0L, SimpleOperator OptionFlag, MagickFalse },513 { "+noise", 1L, SimpleOperator OptionFlag, MagickFalse },514 { "-noise", 1L, ReplacedOptionFlag | SimpleOperator OptionFlag, MagickFalse },515 { "-noop", 0L, SpecialOptionFlag, MagickFalse },511 { "+negate", 0L, SimpleOperatorFlag, MagickFalse }, 512 { "-negate", 0L, SimpleOperatorFlag, MagickFalse }, 513 { "+noise", 1L, SimpleOperatorFlag, MagickFalse }, 514 { "-noise", 1L, ReplacedOptionFlag | SimpleOperatorFlag, MagickFalse }, 515 { "-noop", 0L, NoImageOperatorFlag, MagickFalse }, 516 516 { "+normalize", 0L, DeprecateOptionFlag, MagickTrue }, 517 { "-normalize", 0L, SimpleOperator OptionFlag, MagickFalse },518 { "+opaque", 1L, SimpleOperator OptionFlag, MagickFalse },519 { "-opaque", 1L, SimpleOperator OptionFlag, MagickFalse },517 { "-normalize", 0L, SimpleOperatorFlag, MagickFalse }, 518 { "+opaque", 1L, SimpleOperatorFlag, MagickFalse }, 519 { "-opaque", 1L, SimpleOperatorFlag, MagickFalse }, 520 520 { "+ordered-dither", 0L, DeprecateOptionFlag, MagickTrue }, 521 { "-ordered-dither", 1L, SimpleOperator OptionFlag, MagickFalse },521 { "-ordered-dither", 1L, SimpleOperatorFlag, MagickFalse }, 522 522 { "+orient", 0L, ImageInfoOptionFlag, MagickFalse }, 523 523 { "-orient", 1L, ImageInfoOptionFlag, MagickFalse }, … … 525 525 { "-page", 1L, ImageInfoOptionFlag, MagickFalse }, 526 526 { "+paint", 0L, DeprecateOptionFlag, MagickTrue }, 527 { "-paint", 1L, SimpleOperator OptionFlag, MagickFalse },527 { "-paint", 1L, SimpleOperatorFlag, MagickFalse }, 528 528 { "+path", 0L, NonMagickOptionFlag, MagickFalse }, 529 529 { "-path", 1L, NonMagickOptionFlag, MagickFalse }, … … 534 534 { "+pointsize", 0L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, 535 535 { "-pointsize", 1L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, 536 { "+polaroid", 0L, SimpleOperator OptionFlag, MagickFalse },537 { "-polaroid", 1L, SimpleOperator OptionFlag, MagickFalse },536 { "+polaroid", 0L, SimpleOperatorFlag, MagickFalse }, 537 { "-polaroid", 1L, SimpleOperatorFlag, MagickFalse }, 538 538 { "+posterize", 1L, DeprecateOptionFlag, MagickTrue }, 539 { "-posterize", 1L, SimpleOperator OptionFlag, MagickFalse },539 { "-posterize", 1L, SimpleOperatorFlag, MagickFalse }, 540 540 { "+precision", 0L, ImageInfoOptionFlag, MagickFalse }, 541 541 { "-precision", 1L, ImageInfoOptionFlag, MagickFalse }, … … 543 543 { "-preview", 1L, GlobalOptionFlag, MagickFalse }, 544 544 { "+print", 1L, DeprecateOptionFlag | FireOptionFlag, MagickTrue }, 545 { "-print", 1L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },545 { "-print", 1L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 546 546 { "+process", 1L, DeprecateOptionFlag | FireOptionFlag, MagickTrue }, 547 { "-process", 1L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },548 { "+profile", 1L, SimpleOperator OptionFlag, MagickFalse },549 { "-profile", 1L, SimpleOperator OptionFlag, MagickFalse },547 { "-process", 1L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 548 { "+profile", 1L, SimpleOperatorFlag, MagickFalse }, 549 { "-profile", 1L, SimpleOperatorFlag, MagickFalse }, 550 550 { "+quality", 0L, ImageInfoOptionFlag, MagickFalse }, 551 551 { "-quality", 1L, ImageInfoOptionFlag, MagickFalse }, … … 555 555 { "-quiet", 0L, GlobalOptionFlag | FireOptionFlag, MagickFalse }, 556 556 { "+radial-blur", 1L, DeprecateOptionFlag, MagickTrue }, 557 { "-radial-blur", 1L, SimpleOperator OptionFlag, MagickFalse },558 { "+raise", 1L, SimpleOperator OptionFlag, MagickFalse },559 { "-raise", 1L, SimpleOperator OptionFlag, MagickFalse },557 { "-radial-blur", 1L, SimpleOperatorFlag, MagickFalse }, 558 { "+raise", 1L, SimpleOperatorFlag, MagickFalse }, 559 { "-raise", 1L, SimpleOperatorFlag, MagickFalse }, 560 560 { "+random-threshold", 1L, DeprecateOptionFlag, MagickTrue }, 561 { "-random-threshold", 1L, SimpleOperator OptionFlag, MagickFalse },562 { "-read", 1L, SpecialOptionFlag, MagickFalse },561 { "-random-threshold", 1L, SimpleOperatorFlag, MagickFalse }, 562 { "-read", 1L, NoImageOperatorFlag, MagickFalse }, 563 563 { "+recolor", 1L, DeprecateOptionFlag, MagickTrue }, 564 { "-recolor", 1L, ReplacedOptionFlag | SimpleOperator OptionFlag, MagickTrue },564 { "-recolor", 1L, ReplacedOptionFlag | SimpleOperatorFlag, MagickTrue }, 565 565 { "+red-primary", 0L, ImageInfoOptionFlag, MagickFalse }, 566 566 { "-red-primary", 1L, ImageInfoOptionFlag, MagickFalse }, 567 567 { "+regard-warnings", 0L, ImageInfoOptionFlag, MagickFalse }, 568 568 { "-regard-warnings", 0L, ImageInfoOptionFlag, MagickFalse }, 569 { "+region", 0L, SpecialOptionFlag, MagickFalse },570 { "-region", 1L, SpecialOptionFlag, MagickFalse },571 { "+remap", 0L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },572 { "-remap", 1L, SimpleOperator OptionFlag, MagickFalse },569 { "+region", 0L, NoImageOperatorFlag, MagickFalse }, 570 { "-region", 1L, NoImageOperatorFlag, MagickFalse }, 571 { "+remap", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 572 { "-remap", 1L, SimpleOperatorFlag, MagickFalse }, 573 573 { "+remote", 0L, NonMagickOptionFlag, MagickFalse }, 574 574 { "-remote", 1L, NonMagickOptionFlag, MagickFalse }, 575 575 { "+render", 0L, DrawInfoOptionFlag, MagickFalse }, 576 576 { "-render", 0L, DrawInfoOptionFlag, MagickFalse }, 577 { "+repage", 0L, SimpleOperator OptionFlag, MagickFalse },578 { "-repage", 1L, SimpleOperator OptionFlag, MagickFalse },577 { "+repage", 0L, SimpleOperatorFlag, MagickFalse }, 578 { "-repage", 1L, SimpleOperatorFlag, MagickFalse }, 579 579 { "+resample", 1L, DeprecateOptionFlag, MagickTrue }, 580 { "-resample", 1L, SimpleOperator OptionFlag, MagickFalse },580 { "-resample", 1L, SimpleOperatorFlag, MagickFalse }, 581 581 { "+resize", 1L, DeprecateOptionFlag, MagickTrue }, 582 { "-resize", 1L, SimpleOperator OptionFlag, MagickFalse },582 { "-resize", 1L, SimpleOperatorFlag, MagickFalse }, 583 583 { "+respect-parenthesis", 0L, ImageInfoOptionFlag, MagickFalse }, 584 584 { "-respect-parenthesis", 0L, ImageInfoOptionFlag, MagickFalse }, 585 585 { "+reverse", 0L, DeprecateOptionFlag | FireOptionFlag, MagickTrue }, 586 { "-reverse", 0L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },586 { "-reverse", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 587 587 { "+roll", 1L, DeprecateOptionFlag, MagickTrue }, 588 { "-roll", 1L, SimpleOperator OptionFlag, MagickFalse },588 { "-roll", 1L, SimpleOperatorFlag, MagickFalse }, 589 589 { "+rotate", 1L, DeprecateOptionFlag, MagickTrue }, 590 { "-rotate", 1L, SimpleOperator OptionFlag, MagickFalse },590 { "-rotate", 1L, SimpleOperatorFlag, MagickFalse }, 591 591 { "+sample", 1L, DeprecateOptionFlag, MagickTrue }, 592 { "-sample", 1L, SimpleOperator OptionFlag, MagickFalse },592 { "-sample", 1L, SimpleOperatorFlag, MagickFalse }, 593 593 { "+sampling-factor", 0L, ImageInfoOptionFlag, MagickFalse }, 594 594 { "-sampling-factor", 1L, ImageInfoOptionFlag, MagickFalse }, 595 { "+sans", 1L, SpecialOptionFlag, MagickTrue },596 { "-sans", 1L, SpecialOptionFlag, MagickTrue },597 { "+sans0", 0L, SpecialOptionFlag, MagickTrue }, /* equivelent to 'noop' */598 { "-sans0", 0L, SpecialOptionFlag, MagickTrue },599 { "+sans2", 2L, SpecialOptionFlag, MagickTrue },600 { "-sans2", 2L, SpecialOptionFlag, MagickTrue },595 { "+sans", 1L, NoImageOperatorFlag, MagickTrue }, 596 { "-sans", 1L, NoImageOperatorFlag, MagickTrue }, 597 { "+sans0", 0L, NoImageOperatorFlag, MagickTrue }, /* equivelent to 'noop' */ 598 { "-sans0", 0L, NoImageOperatorFlag, MagickTrue }, 599 { "+sans2", 2L, NoImageOperatorFlag, MagickTrue }, 600 { "-sans2", 2L, NoImageOperatorFlag, MagickTrue }, 601 601 { "+scale", 1L, DeprecateOptionFlag, MagickTrue }, 602 { "-scale", 1L, SimpleOperator OptionFlag, MagickFalse },602 { "-scale", 1L, SimpleOperatorFlag, MagickFalse }, 603 603 { "+scene", 0L, ImageInfoOptionFlag, MagickFalse }, 604 604 { "-scene", 1L, ImageInfoOptionFlag, MagickFalse }, … … 607 607 { "+screen", 0L, NonMagickOptionFlag, MagickFalse }, 608 608 { "-screen", 1L, NonMagickOptionFlag, MagickFalse }, 609 { "-script", 1L, UndefinedOptionFlag, MagickFalse }, /* special handling */609 { "-script", 1L, SpecialOptionFlag, MagickFalse }, 610 610 { "+seed", 0L, GlobalOptionFlag, MagickFalse }, 611 611 { "-seed", 1L, GlobalOptionFlag, MagickFalse }, 612 612 { "+segment", 1L, DeprecateOptionFlag, MagickTrue }, 613 { "-segment", 1L, SimpleOperator OptionFlag, MagickFalse },613 { "-segment", 1L, SimpleOperatorFlag, MagickFalse }, 614 614 { "+selective-blur", 1L, DeprecateOptionFlag, MagickTrue }, 615 { "-selective-blur", 1L, SimpleOperator OptionFlag, MagickFalse },615 { "-selective-blur", 1L, SimpleOperatorFlag, MagickFalse }, 616 616 { "+separate", 0L, DeprecateOptionFlag | FireOptionFlag, MagickTrue }, 617 { "-separate", 0L, SimpleOperator OptionFlag | FireOptionFlag, MagickFalse },617 { "-separate", 0L, SimpleOperatorFlag | FireOptionFlag, MagickFalse }, 618 618 { "+sepia-tone", 1L, DeprecateOptionFlag, MagickTrue }, 619 { "-sepia-tone", 1L, SimpleOperator OptionFlag, MagickFalse },620 { "+set", 1L, SimpleOperator OptionFlag, MagickFalse },621 { "-set", 2L, SimpleOperator OptionFlag, MagickFalse },619 { "-sepia-tone", 1L, SimpleOperatorFlag, MagickFalse }, 620 { "+set", 1L, SimpleOperatorFlag, MagickFalse }, 621 { "-set", 2L, SimpleOperatorFlag, MagickFalse }, 622 622 { "+shade", 0L, DeprecateOptionFlag, MagickTrue }, 623 { "-shade", 1L, SimpleOperator OptionFlag, MagickFalse },623 { "-shade", 1L, SimpleOperatorFlag, MagickFalse }, 624 624 { "+shadow", 1L, DeprecateOptionFlag, MagickTrue }, 625 { "-shadow", 1L, SimpleOperator OptionFlag, MagickFalse },625 { "-shadow", 1L, SimpleOperatorFlag, MagickFalse }, 626 626 { "+shared-memory", 0L, NonMagickOptionFlag, MagickFalse }, 627 627 { "-shared-memory", 1L, NonMagickOptionFlag, MagickFalse }, 628 628 { "+sharpen", 1L, DeprecateOptionFlag, MagickTrue }, 629 { "-sharpen", 1L, SimpleOperator OptionFlag, MagickFalse },629 { "-sharpen", 1L, SimpleOperatorFlag, MagickFalse }, 630 630 { "+shave", 1L, DeprecateOptionFlag, MagickTrue }, 631 { "-shave", 1L, SimpleOperator OptionFlag, MagickFalse },631 { "-shave", 1L, SimpleOperatorFlag, MagickFalse }, 632 632 { "+shear", 1L, DeprecateOptionFlag, MagickTrue }, 633 { "-shear", 1L, SimpleOperator OptionFlag, MagickFalse },634 { "+sigmoidal-contrast", 1L, SimpleOperator OptionFlag, MagickFalse },635 { "-sigmoidal-contrast", 1L, SimpleOperator OptionFlag, MagickFalse },633 { "-shear", 1L, SimpleOperatorFlag, MagickFalse }, 634 { "+sigmoidal-contrast", 1L, SimpleOperatorFlag, MagickFalse }, 635 { "-sigmoidal-contrast", 1L, SimpleOperatorFlag, MagickFalse }, 636 636 { "+silent", 0L, NonMagickOptionFlag, MagickFalse }, 637 637 { "-silent", 1L, NonMagickOptionFlag, MagickFalse }, … … 639 639 { "-size", 1L, ImageInfoOptionFlag, MagickFalse }, 640 640 { "+sketch", 1L, DeprecateOptionFlag, MagickTrue }, 641 { "-sketch", 1L, SimpleOperator OptionFlag, MagickFalse },642 { "+smush", 1L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },643 { "-smush", 1L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },641 { "-sketch", 1L, SimpleOperatorFlag, MagickFalse }, 642 { "+smush", 1L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 643 { "-smush", 1L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 644 644 { "+snaps", 0L, NonMagickOptionFlag, MagickFalse }, 645 645 { "-snaps", 1L, NonMagickOptionFlag, MagickFalse }, 646 646 { "+solarize", 1L, DeprecateOptionFlag, MagickTrue }, 647 { "-solarize", 1L, SimpleOperator OptionFlag, MagickFalse },647 { "-solarize", 1L, SimpleOperatorFlag, MagickFalse }, 648 648 { "+sparse-color", 1L, DeprecateOptionFlag, MagickTrue }, 649 { "-sparse-color", 2L, SimpleOperator OptionFlag, MagickFalse },649 { "-sparse-color", 2L, SimpleOperatorFlag, MagickFalse }, 650 650 { "+splice", 1L, DeprecateOptionFlag, MagickTrue }, 651 { "-splice", 1L, SimpleOperator OptionFlag, MagickFalse },651 { "-splice", 1L, SimpleOperatorFlag, MagickFalse }, 652 652 { "+spread", 1L, DeprecateOptionFlag, MagickTrue }, 653 { "-spread", 1L, SimpleOperator OptionFlag, MagickFalse },653 { "-spread", 1L, SimpleOperatorFlag, MagickFalse }, 654 654 { "+statistic", 2L, DeprecateOptionFlag, MagickTrue }, 655 { "-statistic", 2L, SimpleOperator OptionFlag, MagickFalse },655 { "-statistic", 2L, SimpleOperatorFlag, MagickFalse }, 656 656 { "+stegano", 0L, NonMagickOptionFlag, MagickFalse }, 657 657 { "-stegano", 1L, NonMagickOptionFlag, MagickFalse }, … … 659 659 { "-stereo", 1L, NonMagickOptionFlag, MagickFalse }, 660 660 { "+stretch", 1L, DeprecateOptionFlag, MagickTrue }, 661 { "-stretch", 1L, SimpleOperator OptionFlag, MagickFalse },661 { "-stretch", 1L, SimpleOperatorFlag, MagickFalse }, 662 662 { "+strip", 0L, DeprecateOptionFlag, MagickTrue }, 663 { "-strip", 0L, SimpleOperator OptionFlag, MagickFalse },663 { "-strip", 0L, SimpleOperatorFlag, MagickFalse }, 664 664 { "+stroke", 0L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, 665 665 { "-stroke", 1L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, … … 668 668 { "+style", 0L, DrawInfoOptionFlag, MagickFalse }, 669 669 { "-style", 1L, DrawInfoOptionFlag, MagickFalse }, 670 //{ "+subimage-search", 0L, NonMagickOptionFlag | ImageInfoOptionFlag, MagickFalse },671 //{ "-subimage-search", 0L, NonMagickOptionFlag | ImageInfoOptionFlag, MagickFalse },672 { "-subimage", 0L, ListOperator OptionFlag, MagickFalse },673 { "+swap", 0L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },674 { "-swap", 1L, ListOperator OptionFlag | FireOptionFlag, MagickFalse },670 { "+subimage-search", 0L, NonMagickOptionFlag | ImageInfoOptionFlag, MagickFalse }, 671 { "-subimage-search", 0L, NonMagickOptionFlag | ImageInfoOptionFlag, MagickFalse }, 672 { "-subimage", 0L, ListOperatorFlag, MagickFalse }, 673 { "+swap", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 674 { "-swap", 1L, ListOperatorFlag | FireOptionFlag, MagickFalse }, 675 675 { "+swirl", 1L, DeprecateOptionFlag, MagickTrue }, 676 { "-swirl", 1L, SimpleOperator OptionFlag, MagickFalse },676 { "-swirl", 1L, SimpleOperatorFlag, MagickFalse }, 677 677 { "+synchronize", 0L, ImageInfoOptionFlag, MagickFalse }, 678 678 { "-synchronize", 0L, ImageInfoOptionFlag, MagickFalse }, … … 683 683 { "+texture", 0L, ImageInfoOptionFlag, MagickFalse }, 684 684 { "-texture", 1L, ImageInfoOptionFlag, MagickFalse }, 685 { "+threshold", 0L, SimpleOperator OptionFlag, MagickFalse },686 { "-threshold", 1L, SimpleOperator OptionFlag, MagickFalse },685 { "+threshold", 0L, SimpleOperatorFlag, MagickFalse }, 686 { "-threshold", 1L, SimpleOperatorFlag, MagickFalse }, 687 687 { "+thumbnail", 1L, DeprecateOptionFlag, MagickTrue }, 688 { "-thumbnail", 1L, SimpleOperator OptionFlag, MagickFalse },688 { "-thumbnail", 1L, SimpleOperatorFlag, MagickFalse }, 689 689 { "+tile", 0L, DrawInfoOptionFlag, MagickFalse }, 690 690 { "-tile", 1L, DrawInfoOptionFlag, MagickFalse }, 691 691 { "+tile-offset", 0L, ImageInfoOptionFlag, MagickFalse }, 692 692 { "-tile-offset", 1L, ImageInfoOptionFlag, MagickFalse }, 693 { "+tint", 1L, SimpleOperator OptionFlag, MagickFalse },694 { "-tint", 1L, SimpleOperator OptionFlag, MagickFalse },693 { "+tint", 1L, SimpleOperatorFlag, MagickFalse }, 694 { "-tint", 1L, SimpleOperatorFlag, MagickFalse }, 695 695 { "+title", 0L, NonMagickOptionFlag, MagickFalse }, 696 696 { "-title", 1L, NonMagickOptionFlag, MagickFalse }, 697 697 { "+transform", 0L, DeprecateOptionFlag, MagickTrue }, 698 { "-transform", 0L, ReplacedOptionFlag | SimpleOperator OptionFlag, MagickTrue },699 { "+transparent", 1L, SimpleOperator OptionFlag, MagickFalse },700 { "-transparent", 1L, SimpleOperator OptionFlag, MagickFalse },698 { "-transform", 0L, ReplacedOptionFlag | SimpleOperatorFlag, MagickTrue }, 699 { "+transparent", 1L, SimpleOperatorFlag, MagickFalse }, 700 { "-transparent", 1L, SimpleOperatorFlag, MagickFalse }, 701 701 { "+transparent-color", 0L, ImageInfoOptionFlag, MagickFalse }, 702 702 { "-transparent-color", 1L, ImageInfoOptionFlag, MagickFalse }, 703 703 { "+transpose", 0L, DeprecateOptionFlag, MagickTrue }, 704 { "-transpose", 0L, SimpleOperator OptionFlag, MagickFalse },704 { "-transpose", 0L, SimpleOperatorFlag, MagickFalse }, 705 705 { "+transverse", 0L, DeprecateOptionFlag, MagickTrue }, 706 { "-transverse", 0L, SimpleOperator OptionFlag, MagickFalse },706 { "-transverse", 0L, SimpleOperatorFlag, MagickFalse }, 707 707 { "+treedepth", 1L, DeprecateOptionFlag, MagickTrue }, 708 708 { "-treedepth", 1L, QuantizeInfoOptionFlag, MagickFalse }, 709 709 { "+trim", 0L, DeprecateOptionFlag, MagickTrue }, 710 { "-trim", 0L, SimpleOperator OptionFlag, MagickFalse },711 { "+type", 0L, ImageInfoOptionFlag | SimpleOperator OptionFlag, MagickFalse },712 { "-type", 1L, ImageInfoOptionFlag | SimpleOperator OptionFlag, MagickFalse },710 { "-trim", 0L, SimpleOperatorFlag, MagickFalse }, 711 { "+type", 0L, ImageInfoOptionFlag | SimpleOperatorFlag, MagickFalse }, 712 { "-type", 1L, ImageInfoOptionFlag | SimpleOperatorFlag, MagickFalse }, 713 713 { "+undercolor", 0L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, 714 714 { "-undercolor", 1L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse }, 715 { "+unique", 0L, SimpleOperator OptionFlag, MagickFalse },716 { "-unique", 0L, SimpleOperator OptionFlag, MagickFalse },715 { "+unique", 0L, SimpleOperatorFlag, MagickFalse }, 716 { "-unique", 0L, SimpleOperatorFlag, MagickFalse }, 717 717 { "+unique-colors", 0L, DeprecateOptionFlag, MagickTrue }, 718 { "-unique-colors", 0L, SimpleOperator OptionFlag, MagickFalse },718 { "-unique-colors", 0L, SimpleOperatorFlag, MagickFalse }, 719 719 { "+units", 0L, ImageInfoOptionFlag, MagickFalse }, 720 720 { "-units", 1L, ImageInfoOptionFlag, MagickFalse }, 721 721 { "+unsharp", 1L, DeprecateOptionFlag, MagickTrue }, 722 { "-unsharp", 1L, SimpleOperator OptionFlag, MagickFalse },722 { "-unsharp", 1L, SimpleOperatorFlag, MagickFalse }, 723 723 { "+update", 0L, NonMagickOptionFlag, MagickFalse }, 724 724 { "-update", 1L, NonMagickOptionFlag, MagickFalse }, … … 728 728 { "-verbose", 0L, ImageInfoOptionFlag, MagickFalse }, 729 729 { "+version", 0L, DeprecateOptionFlag, MagickTrue }, 730 { "-version", 0L, SpecialOptionFlag, MagickFalse },730 { "-version", 0L, NoImageOperatorFlag, MagickFalse }, 731 731 { "+view", 0L, ImageInfoOptionFlag, MagickFalse }, 732 732 { "-view", 1L, ImageInfoOptionFlag, MagickFalse }, 733 733 { "+vignette", 1L, DeprecateOptionFlag, MagickTrue }, 734 { "-vignette", 1L, SimpleOperator OptionFlag, MagickFalse },734 { "-vignette", 1L, SimpleOperatorFlag, MagickFalse }, 735 735 { "+virtual-pixel", 0L, ImageInfoOptionFlag, MagickFalse }, 736 736 { "-virtual-pixel", 1L, ImageInfoOptionFlag, MagickFalse }, … … 740 740 { "-watermark", 1L, NonMagickOptionFlag, MagickFalse }, 741 741 { "+wave", 1L, DeprecateOptionFlag, MagickTrue }, 742 { "-wave", 1L, SimpleOperator OptionFlag, MagickFalse },742 { "-wave", 1L, SimpleOperatorFlag, MagickFalse }, 743 743 { "+weight", 1L, DeprecateOptionFlag, MagickTrue }, 744 744 { "-weight", 1L, DrawInfoOptionFlag, MagickFalse }, … … 746 746 { "-white-point", 1L, ImageInfoOptionFlag, MagickFalse }, 747 747 { "+white-threshold", 1L, DeprecateOptionFlag, MagickTrue }, 748 { "-white-threshold", 1L, SimpleOperator OptionFlag, MagickFalse },748 { "-white-threshold", 1L, SimpleOperatorFlag, MagickFalse }, 749 749 { "+window", 0L, NonMagickOptionFlag, MagickFalse }, 750 750 { "-window", 1L, NonMagickOptionFlag, MagickFalse }, 751 751 { "+window-group", 0L, NonMagickOptionFlag, MagickFalse }, 752 752 { "-window-group", 1L, NonMagickOptionFlag, MagickFalse }, 753 { "+write", 1L, SpecialOptionFlag | FireOptionFlag, MagickFalse },754 { "-write", 1L, SpecialOptionFlag | FireOptionFlag, MagickFalse },753 { "+write", 1L, NoImageOperatorFlag | FireOptionFlag, MagickFalse }, 754 { "-write", 1L, NoImageOperatorFlag | FireOptionFlag, MagickFalse }, 755 755 { (char *) NULL, 0L, UndefinedOptionFlag, MagickFalse } 756 756 }, -
ImageMagick/trunk/MagickCore/option.h
r7570 r7587 113 113 } ValidateType; 114 114 115 typedef struct _OptionInfo116 {117 const char118 *mnemonic;119 120 ssize_t121 type,122 flags;123 124 MagickBooleanType125 stealth;126 } OptionInfo;127 128 115 /* 129 116 Flags to describe classes of image processing options. … … 141 128 SettingOptionFlags = 0x000F, /* mask for all setting options */ 142 129 143 SimpleOperatorOptionFlag = 0x0010, /* Simple Image processingoperator */144 ListOperatorOptionFlag = 0x0020, /* Multi-Image processing operator */145 SpecialOptionFlag = 0x0040, /* Special handled Option*/130 NoImageOperatorFlag = 0x0010, /* Images not required operator */ 131 SimpleOperatorFlag = 0x0020, /* Simple Image processing operator */ 132 ListOperatorFlag = 0x0040, /* Multi-Image processing operator */ 146 133 GenesisOptionFlag = 0x0080, /* MagickCommandGenesis() Only Option */ 147 134 148 ImageRequiredFlags = 0x0030, /* Flags also means Images Required */ 135 SpecialOptionFlag = 0x0100, /* Operator with Special Requirements */ 136 /* EG: for specific CLI commands */ 149 137 150 138 NonMagickOptionFlag = 0x1000, /* Option not used by Magick Command */ 151 139 FireOptionFlag = 0x2000, /* Convert operation seq firing point */ 152 140 DeprecateOptionFlag = 0x4000, /* Deprecate option (no code) */ 153 ReplacedOptionFlag = 0x8000 /* Replaced Option ( still works) */141 ReplacedOptionFlag = 0x8000 /* Replaced Option (but still works) */ 154 142 155 143 } CommandOptionFlags; 144 145 typedef struct _OptionInfo 146 { 147 const char 148 *mnemonic; 149 150 ssize_t 151 type, 152 flags; 153 154 MagickBooleanType 155 stealth; 156 } OptionInfo; 156 157 157 158 -
ImageMagick/trunk/MagickWand/magick-cli.c
r7580 r7587 210 210 while (1) { 211 211 212 /* Get a option */213 212 { MagickBooleanType status = GetScriptToken(token_info); 214 213 cli_wand->line=token_info->token_line; … … 221 220 CloneString(&option,token_info->token); 222 221 223 { /* get option type and argument count*/224 const OptionInfo *option_info= GetCommandOptionInfo(option);225 count=option_info->type;226 option_type=(CommandOptionFlags) option_info->flags;222 /* get option, its argument count, and option type */ 223 cli_wand->command = GetCommandOptionInfo(option); 224 count=cli_wand->command->type; 225 option_type=(CommandOptionFlags) cli_wand->command->flags; 227 226 #if 0 228 (void) FormatLocaleFile(stderr, "Script: %u,%u: \"%s\" matched \"%s\"\n", 229 cli_wand->line, cli_wand->line, option, option_info->mnemonic ); 230 #endif 231 } 227 (void) FormatLocaleFile(stderr, "Script: %u,%u: \"%s\" matched \"%s\"\n", 228 cli_wand->line, cli_wand->line, option, cli_wand->command->mnemonic ); 229 #endif 232 230 233 231 /* handle a undefined option - image read? */ … … 240 238 if ( IfMagickFalse(IsCommandOption(option))) { 241 239 /* non-option -- treat as a image read */ 242 CLISpecialOperator(cli_wand,"-read",option); 240 cli_wand->command=(const OptionInfo *)NULL; 241 CLIOption(cli_wand,"-read",option); 243 242 goto next_token; 244 243 } 245 if ( LocaleCompare(option,"-script") == 0 ) { 246 option_type=SpecialOptionFlag; 247 count=1; 248 /* fall thru - collect one argument */ 249 } 250 else { 251 CLIWandExceptionBreak(OptionFatalError,"UnrecognizedOption",option); 252 goto next_token; 253 } 244 CLIWandExceptionBreak(OptionFatalError,"UnrecognizedOption",option); 245 goto next_token; 254 246 } 255 247 … … 269 261 else 270 262 CloneString(&arg2,(char *)NULL); 263 271 264 272 265 /* … … 281 274 if ( (option_type & DeprecateOptionFlag) != 0 ) { 282 275 CLIWandException(OptionError,"DeprecatedOptionNoCode",option); 283 if ( CLICatchException(cli_wand, MagickFalse) != MagickFalse)276 if ( IfMagickTrue(CLICatchException(cli_wand, MagickFalse)) ) 284 277 break; 285 278 goto next_token; … … 296 289 break; /* forced end of script */ 297 290 } 298 elseif ( LocaleCompare(option,"-script") == 0 ) {291 if ( LocaleCompare(option,"-script") == 0 ) { 299 292 /* FUTURE: call new script from this script */ 300 293 CLIWandExceptionBreak(OptionError,"InvalidUseOfOption",option); … … 303 296 /* FUTURE: handle special script-argument options here */ 304 297 /* handle any other special operators now */ 305 CLISpecialOperator(cli_wand,option,arg1); 306 } 307 308 if ( (option_type & SettingOptionFlags) != 0 ) { 309 CLISettingOptionInfo(cli_wand, option, arg1, arg2); 310 // FUTURE: Sync Specific Settings into Image Properities (not global) 311 } 312 313 /* FUTURE: The not a setting part below is a temporary hack to stop gap 314 * measure for options that are BOTH settings and optional 'Simple/List' 315 * operators. Specifically -monitor, -depth, and -colorspace */ 316 if ( cli_wand->wand.images == (Image *)NULL ) { 317 if (((option_type & ImageRequiredFlags) != 0 ) && 318 ((option_type & SettingOptionFlags) == 0 )) /* temp hack */ 319 CLIWandException(OptionError,"NoImagesFound",option); 298 CLIWandExceptionBreak(OptionError,"InvalidUseOfOption",option); 320 299 goto next_token; 321 300 } 322 301 323 /* FUTURE: this is temporary - get 'settings' to handle 324 distribution of settings to images attributes,proprieties,artifacts */ 325 SyncImagesSettings(cli_wand->wand.image_info,cli_wand->wand.images, 326 cli_wand->wand.exception); 327 328 if ( (option_type & SimpleOperatorOptionFlag) != 0) 329 CLISimpleOperatorImages(cli_wand, option, arg1, arg2); 330 331 if ( (option_type & ListOperatorOptionFlag) != 0 ) 332 CLIListOperatorImages(cli_wand, option, arg1, arg2); 302 /* Process non-specific Option */ 303 CLIOption(cli_wand, option, arg1, arg2); 333 304 334 305 next_token: … … 469 440 cli_wand->line=i; /* note the argument for this option */ 470 441 471 { const OptionInfo *option_info = GetCommandOptionInfo(argv[i]); 472 count=option_info->type; 473 option_type=(CommandOptionFlags) option_info->flags; 442 /* get option, its argument count, and option type */ 443 cli_wand->command = GetCommandOptionInfo(argv[i]); 444 count=cli_wand->command->type; 445 option_type=(CommandOptionFlags) cli_wand->command->flags; 474 446 #if 0 475 (void) FormatLocaleFile(stderr, "CLI %d: \"%s\" matched \"%s\"\n", 476 i, argv[i], option_info->mnemonic ); 477 #endif 478 } 447 (void) FormatLocaleFile(stderr, "CLI %d: \"%s\" matched \"%s\"\n", 448 i, argv[i], cli_wand->command->mnemonic ); 449 #endif 479 450 480 451 if ( option_type == UndefinedOptionFlag || … … 484 455 #endif 485 456 if ( IfMagickFalse(IsCommandOption(option)) ) { 486 if ( (cli_wand->process_flags & ProcessNonOptionImageRead) != 0 ) 487 /* non-option -- treat as a image read */ 488 CLISpecialOperator(cli_wand,"-read",option); 489 else 490 CLIWandException(OptionFatalError,"UnrecognizedOption",option); 491 goto next_argument; 492 } 493 if ( ((cli_wand->process_flags & ProcessScriptOption) != 0) && 494 (LocaleCompare(option,"-script") == 0) ) { 495 /* Call Script from CLI, with a filename as a zeroth argument. 496 NOTE: -script may need to use 'implict write filename' so it 497 must be handled here to prevent 'missing argument' error. 498 */ 499 ProcessScriptOptions(cli_wand,argc,argv,i+1); 500 return(argc); /* Script does not return to CLI -- Yet -- FUTURE */ 457 if ( (cli_wand->process_flags & ProcessNonOptionImageRead) != 0 ) { 458 /* non-option -- treat as a image read */ 459 cli_wand->command=(const OptionInfo *)NULL; 460 CLIOption(cli_wand,"-read",option); 461 goto next_argument; 462 } 501 463 } 502 464 CLIWandException(OptionFatalError,"UnrecognizedOption",option); 503 465 goto next_argument; 466 } 467 468 if ( ((option_type & SpecialOptionFlag) != 0 ) && 469 ((cli_wand->process_flags & ProcessScriptOption) != 0) && 470 (LocaleCompare(option,"-script") == 0) ) { 471 /* Call Script from CLI, with a filename as a zeroth argument. 472 NOTE: -script may need to use the 'implict write filename' argument 473 so it must be handled specially to prevent a 'missing argument' error. 474 */ 475 if ( (i+count) >= argc ) 476 CLIWandException(OptionFatalError,"MissingArgument",option); 477 ProcessScriptOptions(cli_wand,argc,argv,i+1); 478 return(argc); /* Script does not return to CLI -- Yet */ 479 /* FUTURE: when it does, their may be no write arg! */ 504 480 } 505 481 … … 522 498 i,option,count,option_type,arg1,arg2); 523 499 #endif 524 /* Hard Depreciated Options, no code to execute - error */ 525 if ( (option_type & DeprecateOptionFlag) != 0 ) { 526 CLIWandException(OptionError,"DeprecatedOptionNoCode",option); 527 goto next_argument; 528 } 529 530 /* Ignore MagickCommandGenesis() only option on CLI */ 500 531 501 if ( (option_type & GenesisOptionFlag) != 0 ) 532 goto next_argument; 502 goto next_argument; /* ignored this from command line args */ 533 503 534 504 if ( (option_type & SpecialOptionFlag) != 0 ) { … … 536 506 && LocaleCompare(option,"-exit") == 0 ) 537 507 return(i+count); 538 /* handle any other special operators now */539 CLISpecialOperator(cli_wand,option,arg1);540 }541 542 if ( (option_type & SettingOptionFlags) != 0 ) {543 CLISettingOptionInfo(cli_wand, option, arg1, arg2);544 // FUTURE: Sync individual Settings into images (no SyncImageSettings())545 }546 547 /* FUTURE: The not a setting part below is a temporary hack to stop gap548 * measure for options that are BOTH settings and optional 'Simple/List'549 * operators. Specifically -monitor, -depth, and -colorspace */550 if ( cli_wand->wand.images == (Image *)NULL ) {551 if (((option_type & ImageRequiredFlags) != 0 ) &&552 ((option_type & SettingOptionFlags) == 0 ) ) /* temp hack */553 CLIWandException(OptionError,"NoImagesFound",option);554 508 goto next_argument; 555 509 } 556 510 557 /* FUTURE: this is temporary - get 'settings' to handle 558 distribution of settings to images attributes,proprieties,artifacts */ 559 SyncImagesSettings(cli_wand->wand.image_info,cli_wand->wand.images, 560 cli_wand->wand.exception); 561 562 if ( (option_type & SimpleOperatorOptionFlag) != 0) 563 CLISimpleOperatorImages(cli_wand, option, arg1, arg2); 564 565 if ( (option_type & ListOperatorOptionFlag) != 0 ) 566 CLIListOperatorImages(cli_wand, option, arg1, arg2); 511 /* Process non-specific Option */ 512 CLIOption(cli_wand, option, arg1, arg2); 567 513 568 514 next_argument: … … 615 561 } 616 562 617 CLISpecialOperator(cli_wand,"-write",option); 563 cli_wand->command=(const OptionInfo *)NULL; 564 CLIOption(cli_wand,"-write",option); 618 565 return(argc); 619 566 } … … 805 752 /* Special Case: Version Information and Abort */ 806 753 if (argc == 2) { 807 if (LocaleCompare("-version",argv[1]) == 0) { 808 CLI SpecialOperator(cli_wand, "-version", (char *)NULL);754 if (LocaleCompare("-version",argv[1]) == 0) { /* just version */ 755 CLIOption(cli_wand, "-version"); 809 756 goto Magick_Command_Exit; 810 757 } 811 758 if ((LocaleCompare("-help",argv[1]) == 0) || /* GNU standard option */ 812 (LocaleCompare("--help",argv[1]) == 0) ) { 759 (LocaleCompare("--help",argv[1]) == 0) ) { /* just a brief summary */ 813 760 MagickUsage(MagickFalse); 814 761 goto Magick_Command_Exit; 815 762 } 816 if (LocaleCompare("-usage",argv[1]) == 0) { 817 CLI SpecialOperator(cli_wand, "-version", (char *)NULL);763 if (LocaleCompare("-usage",argv[1]) == 0) { /* both version & usage */ 764 CLIOption(cli_wand, "-version"); 818 765 MagickUsage(MagickTrue); 819 766 goto Magick_Command_Exit; … … 831 778 /* List Information and Abort */ 832 779 if (LocaleCompare("-list",argv[1]) == 0) { 833 CLI SpecialOperator(cli_wand, argv[1], argv[2]);780 CLIOption(cli_wand, argv[1]); 834 781 goto Magick_Command_Exit; 835 782 } … … 862 809 FUTURE: "-reset stacks" option */ 863 810 while (cli_wand->image_list_stack != (Stack *)NULL) 864 CLI SpecialOperator(cli_wand,")",(const char *)NULL);811 CLIOption(cli_wand,")"); 865 812 while (cli_wand->image_info_stack != (Stack *)NULL) 866 CLI SpecialOperator(cli_wand,"}",(const char *)NULL);813 CLIOption(cli_wand,"}"); 867 814 868 815 /* assert we have recovered the original structures */ -
ImageMagick/trunk/MagickWand/operation.c
r7577 r7587 367 367 % % 368 368 % % 369 +C L I S e t t i n g O p t i o n I n f o %369 % C L I S e t t i n g O p t i o n I n f o % 370 370 % % 371 371 % % … … 397 397 % o arg1, arg2: optional argument strings to the operation 398 398 % arg2 is currently only used by "-limit" 399 %400 % Example usage...401 %402 % CLISettingOptionInfo(cli_wand, "-background", "Red", NULL); // set value403 % CLISettingOptionInfo(cli_wand, "-adjoin", NULL, NULL); // set boolean404 % CLISettingOptionInfo(cli_wand, "+adjoin", NULL, NULL); // unset405 %406 % Or for handling command line arguments EG: +/-option ["arg1"]407 %408 % argc,argv409 % i=index in argv410 %411 % option_info = GetCommandOptionInfo(argv[i]);412 % count=option_info->type;413 % option_type=option_info->flags;414 %415 % if ( (option_type & SettingOperatorOptionFlags) != 0 )416 % CLISettingOptionInfo(cli_wand, argv[i],417 % (count>=1) ? argv[i+1] : (char *)NULL,418 % (count>=2) ? argv[i+2] : (char *)NULL);419 % i += count+1;420 399 % 421 400 */ … … 453 432 if (LocaleCompare("affine",option+1) == 0) 454 433 { 455 CLIWandWarn Depreciated("-draw 'affine ...'");434 CLIWandWarnReplaced("-draw 'affine ...'"); 456 435 if (IfSetOption) 457 436 (void) ParseAffineGeometry(arg1,&_draw_info->affine,_exception); … … 559 538 if (LocaleCompare("box",option+1) == 0) 560 539 { 561 CLIWandWarn Depreciated("-undercolor");540 CLIWandWarnReplaced("-undercolor"); 562 541 CLISettingOptionInfo(cli_wand,"-undercolor",arg1, arg2); 563 542 break; … … 1602 1581 % o arg1, arg2: optional argument strings to the operation 1603 1582 % 1604 % Any problems will be added to the 'exception' entry of the given wand.1605 %1606 % Example usage...1607 %1608 % CLISimpleOperatorImages(cli_wand, "-crop","100x100+20+30",NULL);1609 % CLISimpleOperatorImages(cli_wand, "+repage",NULL,NULL);1610 % CLISimpleOperatorImages(cli_wand, "+distort","SRT","45");1611 %1612 % Or for handling command line arguments EG: +/-option ["arg1"]1613 %1614 % cli_wand1615 % argc,argv1616 % i=index in argv1617 %1618 % option_info = GetCommandOptionInfo(argv[i]);1619 % count=option_info->type;1620 % option_type=option_info->flags;1621 %1622 % if ( (option_type & SimpleOperatorOptionFlag) != 0 )1623 % CLISimpleOperatorImages(cli_wand, argv[i],1624 % count>=1 ? argv[i+1] : (char *)NULL,1625 % count>=2 ? argv[i+2] : (char *)NULL );1626 % i += count+1;1627 %1628 1583 */ 1629 1584 … … 1679 1634 if (IfMagickTrue(cli_wand->wand.debug)) 1680 1635 (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",cli_wand->wand.name); 1681 1682 (void) SyncImageSettings(_image_info,_image,_exception);1683 1636 1684 1637 SetGeometryInfo(&geometry_info); … … 2071 2024 if (LocaleCompare("contrast",option+1) == 0) 2072 2025 { 2073 CLIWandWarn Depreciated(normal_op?"-level":"+level");2026 CLIWandWarnReplaced(normal_op?"-level":"+level"); 2074 2027 (void) ContrastImage(_image,normal_op,_exception); 2075 2028 break; … … 2441 2394 if (LocaleCompare("gaussian",option+1) == 0) 2442 2395 { 2443 CLIWandWarn Depreciated("-gaussian-blur");2396 CLIWandWarnReplaced("-gaussian-blur"); 2444 2397 CLISimpleOperatorImage(cli_wand,"-gaussian-blur",arg1,NULL); 2445 2398 } … … 2648 2601 if (LocaleCompare("map",option+1) == 0) 2649 2602 { 2650 CLIWandWarn Depreciated("-remap");2603 CLIWandWarnReplaced("-remap"); 2651 2604 CLISimpleOperatorImage(cli_wand,"-remap",NULL,NULL); 2652 2605 break; … … 2672 2625 if (LocaleCompare("matte",option+1) == 0) 2673 2626 { 2674 CLIWandWarn Depreciated(IfNormalOp?"-alpha Set":"-alpha Off");2627 CLIWandWarnReplaced(IfNormalOp?"-alpha Set":"-alpha Off"); 2675 2628 (void) SetImageAlphaChannel(_image,IfNormalOp ? SetAlphaChannel : 2676 2629 DeactivateAlphaChannel, _exception); … … 2679 2632 if (LocaleCompare("median",option+1) == 0) 2680 2633 { 2681 CLIWandWarn Depreciated("-statistic Median");2634 CLIWandWarnReplaced("-statistic Median"); 2682 2635 CLISimpleOperatorImage(cli_wand,"-statistic","Median",arg1); 2683 2636 break; … … 2686 2639 { 2687 2640 /* FUTURE: note this is also a special "montage" option */ 2688 CLIWandWarn Depreciated("-statistic Mode");2641 CLIWandWarnReplaced("-statistic Mode"); 2689 2642 CLISimpleOperatorImage(cli_wand,"-statistic","Mode",arg1); 2690 2643 break; … … 2773 2726 if (IfNormalOp) 2774 2727 { 2775 CLIWandWarn Depreciated("-statistic NonPeak");2728 CLIWandWarnReplaced("-statistic NonPeak"); 2776 2729 CLISimpleOperatorImage(cli_wand,"-statistic","NonPeak",arg1); 2777 2730 break; … … 2965 2918 if (LocaleCompare("recolor",option+1) == 0) 2966 2919 { 2967 CLIWandWarn Depreciated("-color-matrix");2920 CLIWandWarnReplaced("-color-matrix"); 2968 2921 CLISimpleOperatorImage(cli_wand,"-color-matrix",arg1,NULL); 2969 2922 } … … 3322 3275 if (LocaleCompare("transform",option+1) == 0) 3323 3276 { 3324 CLIWandWarn Depreciated("+distort AffineProjection");3277 CLIWandWarnReplaced("+distort AffineProjection"); 3325 3278 new_image=AffineTransformImage(_image,&_draw_info->affine,_exception); 3326 3279 break; … … 3537 3490 % arg2 is currently not used 3538 3491 % 3539 % Example usage...3540 %3541 % CLIListOperatorImages(cli_wand,MagickFalse,"-duplicate", "3", NULL);3542 % CLIListOperatorImages(cli_wand,MagickTrue, "+append", NULL, NULL);3543 %3544 % Or for handling command line arguments EG: +/-option ["arg1"]3545 %3546 % cli_wand3547 % argc,argv3548 % i=index in argv3549 %3550 % option_info = GetCommandOptionInfo(argv[i]);3551 % count=option_info->type;3552 % option_type=option_info->flags;3553 %3554 % if ( (option_type & ListOperatorOptionFlag) != 0 )3555 % CLIListOperatorImages(cli_wand,argv[i],3556 % count>=1 ? argv[i+1] : (char *)NULL,3557 % count>=2 ? argv[i+2] : (char *)NULL );3558 % i += count+1;3559 %3560 3492 */ 3561 3493 WandExport void CLIListOperatorImages(MagickCLI *cli_wand, … … 3584 3516 (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",cli_wand->wand.name); 3585 3517 3586 (void) SyncImagesSettings(_image_info,_images,_exception);3587 3588 3518 new_images=NewImageList(); 3589 3519 … … 3599 3529 if (LocaleCompare("average",option+1) == 0) 3600 3530 { 3601 CLIWandWarn Depreciated("-evaluate-sequence Mean");3531 CLIWandWarnReplaced("-evaluate-sequence Mean"); 3602 3532 CLIListOperatorImages(cli_wand,"-evaluate-sequence","Mean",NULL); 3603 3533 break; … … 3723 3653 if (LocaleCompare("deconstruct",option+1) == 0) 3724 3654 { 3725 CLIWandWarn Depreciated("-layer CompareAny");3655 CLIWandWarnReplaced("-layer CompareAny"); 3726 3656 CLIListOperatorImages(cli_wand,"-layer","CompareAny",NULL); 3727 3657 break; … … 4021 3951 if (LocaleCompare("map",option+1) == 0) 4022 3952 { 4023 CLIWandWarn Depreciated("+remap");3953 CLIWandWarnReplaced("+remap"); 4024 3954 (void) RemapImages(_quantize_info,_images,(Image *) NULL,_exception); 4025 3955 break; … … 4292 4222 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 4293 4223 % 4294 % CLI SpecialOperator() Applies operations that may not actually need images4224 % CLINoImageOperator() Applies operations that may not actually need images 4295 4225 % in an image list wen it is applied. 4296 4226 % … … 4302 4232 % character prefixes, other than simply '-' or '+'. 4303 4233 % 4304 % The format of the CLI SpecialOption method is:4305 % 4306 % void CLI SpecialOption(MagickCLI *cli_wand,const char *option,4307 % const char *arg1 )4234 % The format of the CLINoImageOption method is: 4235 % 4236 % void CLINoImageOption(MagickCLI *cli_wand,const char *option, 4237 % const char *arg1, const char *arg2) 4308 4238 % 4309 4239 % A description of each parameter follows: … … 4313 4243 % o option: The special option (with any switch char) to process 4314 4244 % 4315 % o arg1: Argument for option, if required 4316 % 4317 % Example Usage... 4318 % 4319 % CLISpecialOperator(cli_wand,"-read","rose:"); 4320 % 4321 % Or for handling command line arguments EG: +/-option ["arg1"] 4322 % 4323 % cli_wand 4324 % argc,argv 4325 % i=index in argv 4326 % 4327 % option_info = GetCommandOptionInfo(argv[i]); 4328 % count=option_info->type; 4329 % option_type=option_info->flags; 4330 % 4331 % if ( (option_type & SpecialOptionFlag) != 0 ) 4332 % CLISpecialOperator(cli_wand,argv[i], 4333 % count>=1 ? argv[i+1] : (char *)NULL); 4334 % i += count+1; 4245 % o arg1 & arg2: Argument for option, if required 4246 % Currently arg2 is not used. 4335 4247 % 4336 4248 */ 4337 4338 WandExport void CLISpecialOperator(MagickCLI *cli_wand, 4339 const char *option, const char *arg1) 4249 WandExport void CLINoImageOperator(MagickCLI *cli_wand, 4250 const char *option, const char *arg1, const char *magick_unused(arg2)) 4340 4251 { 4341 4252 #define _image_info (cli_wand->wand.image_info) … … 4350 4261 if (IfMagickTrue(cli_wand->wand.debug)) 4351 4262 (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",cli_wand->wand.name); 4352 4353 if(_images != (Image *)NULL)4354 (void) SyncImagesSettings(cli_wand->wand.image_info,_images,_exception);4355 4263 4356 4264 /* … … 4674 4582 #undef IfPlusOp 4675 4583 } 4584 4585 /* 4586 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 4587 % % 4588 % % 4589 % % 4590 + C L I O p t i o n O p e r a t i o n s % 4591 % % 4592 % % 4593 % % 4594 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 4595 % 4596 % CLIOption() Processes the given option using the given CLI Magick Wand. 4597 % 4598 % If the cli_wand->command pointer is non-null, then it is assumed that the 4599 % option has already been search for up from the CommandOptions[] table in 4600 % "MagickCore/options.c" using GetCommandOptionInfo(), so that any command 4601 % specific options (such as "magick" scripting options, or "display" settings) 4602 % can be handled separatally. 4603 % 4604 % The format of the CLIOption method is: 4605 % 4606 % void CLIOption(MagickCLI *cli_wand,const char *option, ...) 4607 % 4608 % A description of each parameter follows: 4609 % 4610 % o cli_wand: the main CLI Wand to use. 4611 % 4612 % o option: The special option (with any switch char) to process 4613 % 4614 % o args: any required arguments for an option 4615 % 4616 % Example Usage... 4617 % 4618 % CLIoption(cli_wand,"-read","rose:"); 4619 % CLIoption(cli_wand,"-virtual-pixel","transparent"); 4620 % CLIoption(cli_wand,"-distort","SRT:","30"); 4621 % CLIoption(cli_wand,"-write","rotated_rose.png"); 4622 % 4623 */ 4624 WandExport void CLIOption(MagickCLI *cli_wand,const char *option,...) 4625 { 4626 const char 4627 *arg1, 4628 *arg2; 4629 4630 CommandOptionFlags 4631 option_type; 4632 4633 assert(cli_wand != (MagickCLI *) NULL); 4634 assert(cli_wand->signature == WandSignature); 4635 assert(cli_wand->wand.signature == WandSignature); 4636 if (IfMagickTrue(cli_wand->wand.debug)) 4637 (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",cli_wand->wand.name); 4638 4639 if ( cli_wand->command == (const OptionInfo *) NULL ) 4640 cli_wand->command = GetCommandOptionInfo(option); 4641 #if 0 4642 (void) FormatLocaleFile(stderr, "CLIOption \"%s\" matched \"%s\"\n", 4643 option, cli_wand->command->mnemonic ); 4644 #endif 4645 4646 option_type=(CommandOptionFlags) cli_wand->command->flags; 4647 4648 if ( option_type == UndefinedOptionFlag ) 4649 CLIWandExceptionReturn(OptionFatalError,"UnrecognizedOption",option); 4650 4651 assert( LocaleCompare(cli_wand->command->mnemonic,option) == 0 ); 4652 4653 if ((option_type & (SpecialOptionFlag|GenesisOptionFlag)) != 0 ) 4654 CLIWandExceptionReturn(OptionFatalError,"InvalidUseOfOption",option); 4655 4656 if ( (option_type & DeprecateOptionFlag) != 0 ) 4657 CLIWandExceptionReturn(OptionError,"DeprecatedOptionNoCode",option); 4658 4659 if ( IfMagickTrue(CLICatchException(cli_wand, MagickFalse)) ) 4660 return; 4661 4662 4663 { size_t 4664 count = cli_wand->command->type; 4665 4666 va_list 4667 operands; 4668 4669 va_start(operands,option); 4670 4671 arg1=arg2=NULL; 4672 if ( count >= 1 ) 4673 arg1=(const char *) va_arg(operands, const char *); 4674 if ( count >= 2 ) 4675 arg2=(const char *) va_arg(operands, const char *); 4676 4677 va_end(operands); 4678 4679 #if 1 4680 (void) FormatLocaleFile(stderr, 4681 "CLIOption: \"%s\" Count: %d Flags: %04x Args: \"%s\" \"%s\"\n", 4682 option,count,option_type,arg1,arg2); 4683 #endif 4684 } 4685 4686 cli_wand->command = (const OptionInfo *) NULL; /* prevent re-use later */ 4687 4688 4689 /* 4690 Call the appropriate option handler 4691 */ 4692 4693 /* FUTURE: this is temporary - get 'settings' to handle 4694 distribution of settings to images attributes,proprieties,artifacts */ 4695 if ( cli_wand->wand.images != (Image *)NULL ) 4696 SyncImagesSettings(cli_wand->wand.image_info,cli_wand->wand.images, 4697 cli_wand->wand.exception); 4698 4699 if ( (option_type & SettingOptionFlags) != 0 ) { 4700 CLISettingOptionInfo(cli_wand, option, arg1, arg2); 4701 // FUTURE: Sync Specific Settings into Image Properities (not global) 4702 } 4703 4704 if ( (option_type & NoImageOperatorFlag) != 0) 4705 CLINoImageOperator(cli_wand, option, arg1, arg2); 4706 4707 /* FUTURE: The not a setting part below is a temporary hack due to 4708 * some options being both a Setting and a Simple operator. 4709 * Specifically -monitor, -depth, and -colorspace */ 4710 if ( cli_wand->wand.images == (Image *)NULL ) { 4711 if ( ((option_type & (SimpleOperatorFlag|ListOperatorFlag)) != 0 ) && 4712 ((option_type & SettingOptionFlags) == 0 )) /* temp hack */ 4713 CLIWandException(OptionError,"NoImagesFound",option); 4714 return; /* on its own this is not an error */ 4715 } 4716 4717 if ( (option_type & SimpleOperatorFlag) != 0) 4718 CLISimpleOperatorImages(cli_wand, option, arg1, arg2); 4719 4720 if ( (option_type & ListOperatorFlag) != 0 ) 4721 CLIListOperatorImages(cli_wand, option, arg1, arg2); 4722 4723 } -
ImageMagick/trunk/MagickWand/operation.h
r7439 r7587 23 23 #endif 24 24 25 /* These actually private */ 25 26 extern WandExport void 26 27 CLISettingOptionInfo(MagickCLI *,const char *,const char *, const char *), 27 28 CLISimpleOperatorImages(MagickCLI *,const char *,const char *,const char *), 28 29 CLIListOperatorImages(MagickCLI *, const char *,const char *,const char *), 29 CLISpecialOperator(MagickCLI *,const char *,const char *); 30 CLINoImageOperator(MagickCLI *, const char *,const char *,const char *); 31 32 /* This can be used by used using WandCLI API */ 33 extern WandExport void 34 CLIOption(MagickCLI *,const char *,...); 30 35 31 36 #if defined(__cplusplus) || defined(c_plusplus) -
ImageMagick/trunk/MagickWand/wandcli-private.h
r7487 r7587 31 31 "'%s' '%s'",option, arg) 32 32 33 #define CLIWandWarn Depreciated(message) \33 #define CLIWandWarnReplaced(message) \ 34 34 if ( (cli_wand->process_flags & ProcessWarnDepreciated) != 0 ) \ 35 35 (void) CLIThrowException(cli_wand,GetMagickModule(),OptionWarning, \ 36 " DeprecatedOption", "'%s', use \"%s\"",option,message)36 "ReplacedOption", "'%s', use \"%s\"",option,message) 37 37 38 38 #define CLIWandExceptionFile(severity,tag,context) \ … … 109 109 *draw_info; /* for CLI API usage, not used by MagickWand API */ 110 110 111 ProcessOptionFlags 112 process_flags; /* When handling CLI, what options do we process? */ 113 114 const OptionInfo 115 *command; /* The option entry that is being processed */ 116 111 117 Stack 112 118 *image_list_stack, /* Stacks of Image Lists and Image Info settings */ 113 119 *image_info_stack; 114 120 115 ProcessOptionFlags116 process_flags; /* when handling CLI, what options do we process? */117 118 121 const char /* Location of option being processed for exception */ 119 122 *location, /* location format string for exception reports */ 120 *filename; /* "CLI", "unknown", or script filename */123 *filename; /* "CLI", "unknown", or the script filename */ 121 124 122 125 size_t -
ImageMagick/trunk/MagickWand/wandcli.c
r7436 r7587 118 118 cli_wand->draw_info=CloneDrawInfo(cli_wand->wand.image_info,(DrawInfo *) NULL); 119 119 cli_wand->quantize_info=AcquireQuantizeInfo(cli_wand->wand.image_info); 120 cli_wand->process_flags=MagickCommandOptionFlags; /* assume "magick" CLI */ 121 cli_wand->command=(const OptionInfo *)NULL; /* no option at this time */ 120 122 cli_wand->image_list_stack=(Stack *)NULL; 121 123 cli_wand->image_info_stack=(Stack *)NULL; 122 cli_wand->process_flags=MagickCommandOptionFlags; /* assume "magick" CLI */123 124 124 125 /* default exception location... 125 126 EG: sprintf(locaiton, filename, line, column); 126 127 */ 127 cli_wand->location="from \"%s\""; /* location format: */ 128 cli_wand->filename="unknown"; /* unknown source */ 129 cli_wand->line=0; 130 cli_wand->column=0; 128 cli_wand->location="from \"%s\""; /* location format using arguments: */ 129 /* filename, line, column */ 130 cli_wand->filename="unknown"; /* script filename, unknown source */ 131 cli_wand->line=0; /* line from script OR CLI argument */ 132 cli_wand->column=0; /* column from script */ 131 133 132 134 cli_wand->signature=WandSignature; … … 214 216 % only, or all errors, according to 'all_execeptions' boolean argument. 215 217 % 216 % The function returns true i serrors are fatal, in which case the caller218 % The function returns true if errors are fatal, in which case the caller 217 219 % should abort and re-call with an 'all_exceptions' argument of true before 218 220 % quitting. … … 225 227 % MagickBooleanType CLICatchException(MagickCLI *cli_wand, 226 228 % const MagickBooleanType all_exceptions ); 229 % 230 % Arguments are 231 % 232 % o cli_wand: The Wand CLI that holds the exception Information 233 % 234 % o all_exceptions: Report all exceptions, including the fatal one 227 235 % 228 236 */ -
ImageMagick/trunk/config/english.xml
r7583 r7587 931 931 </fatalerror> 932 932 <warning> 933 <message name=" DeprecatedOption">934 option is deprecated933 <message name="ReplacedOption"> 934 option has been replaced 935 935 </message> 936 936 <message name="GeometryDoesNotContainImage"> -
ImageMagick/trunk/config/francais.xml
r7583 r7587 923 923 <warning> 924 924 <message name="DepreciatedOption"> 925 option est obsolÚte925 Option a été remplacée 926 926 </message> 927 927 <message name="GeometryDoesNotContainImage">
Note: See TracChangeset
for help on using the changeset viewer.
