Attachment 7740 Details for Bug 17714 – Patch for CVE-2016-2318 that applies to Mga5 only

[patch] Patch for CVE-2016-2318 that applies to Mga5 only

GraphicsMagick-1.3.20-CVE-2016-2318.patch (text/plain), 99.72 KB, created by Nicolas Salguero on 2016-05-04 15:06:21 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolas Salguero

Created: 2016-05-04 15:06:21 CEST

Size: 99.72 KB

patch

obsolete

># HG changeset patch
># User Bob Friesenhahn <bfriesen@GraphicsMagick.org>
># Date 1462059123 18000
>#      Sat Apr 30 18:32:03 2016 -0500
># Node ID e797bb0aec31941c454e6f764f9589d3b1843547
># Parent  9ba30629488e95a5b796db9af13aab979e09c139
>DrawImage(): Make SVG path and other primitive parsing more robust.
>Fixes SEGV when reading files provided by CVE-2016-2318 test cases.
>Fixes CVE-2016-2318 completely.
>
>diff -r 9ba30629488e -r e797bb0aec31 locale/C.mgk
>--- a/locale/C.mgk	Sat Apr 30 18:31:06 2016 -0500
>+++ b/locale/C.mgk	Sat Apr 30 18:32:03 2016 -0500
>@@ -622,6 +622,15 @@
>       <Message name="TooManyCoordinates">
>         too many coordinates
>       </Message>
>+      <Message name="FloatValueConversionError">
>+        text value does not convert to float
>+      </Message>
>+      <Message name="IntegerValueConversionError">
>+        text value does not convert to integer
>+      </Message>
>+      <Message name="VectorPathTruncated">
>+        vector path truncated
>+      </Message>
>     </Error>
>     <FatalError>
>       <Message name="Default">
>diff -r 9ba30629488e -r e797bb0aec31 magick/locale_c.h
>--- a/magick/locale_c.h	Sat Apr 30 18:31:06 2016 -0500
>+++ b/magick/locale_c.h	Sat Apr 30 18:32:03 2016 -0500
>@@ -3,7 +3,7 @@
> 
> extern MagickExport const char *GetLocaleMessageFromID(const int);
> 
>-#define MAX_LOCALE_MSGS 538
>+#define MAX_LOCALE_MSGS 547
> 
> #define MGK_BlobErrorUnableToCreateBlob 1
> #define MGK_BlobErrorUnableToOpenFile 2
>@@ -191,361 +191,367 @@
> #define MGK_DelegateFatalErrorDefault 181
> #define MGK_DelegateWarningDefault 182
> #define MGK_DrawErrorAlreadyPushingPatternDefinition 183
>-#define MGK_DrawErrorNonconformingDrawingPrimitiveDefinition 184
>-#define MGK_DrawErrorTooManyCoordinates 185
>-#define MGK_DrawErrorUnableToPrint 186
>-#define MGK_DrawErrorUnbalancedGraphicContextPushPop 187
>-#define MGK_DrawFatalErrorDefault 188
>-#define MGK_DrawWarningNotARelativeURL 189
>-#define MGK_DrawWarningNotCurrentlyPushingPatternDefinition 190
>-#define MGK_DrawWarningURLNotFound 191
>-#define MGK_FileOpenErrorUnableToCreateTemporaryFile 192
>-#define MGK_FileOpenErrorUnableToOpenFile 193
>-#define MGK_FileOpenErrorUnableToWriteFile 194
>-#define MGK_FileOpenFatalErrorDefault 195
>-#define MGK_FileOpenWarningDefault 196
>-#define MGK_ImageErrorAngleIsDiscontinuous 197
>-#define MGK_ImageErrorColorspaceColorProfileMismatch 198
>-#define MGK_ImageErrorImageColorspaceDiffers 199
>-#define MGK_ImageErrorImageColorspaceMismatch 200
>-#define MGK_ImageErrorImageDifferenceExceedsLimit 201
>-#define MGK_ImageErrorImageDoesNotContainResolution 202
>-#define MGK_ImageErrorImageOpacityDiffers 203
>-#define MGK_ImageErrorImageSequenceIsRequired 204
>-#define MGK_ImageErrorImageSizeDiffers 205
>-#define MGK_ImageErrorInvalidColormapIndex 206
>-#define MGK_ImageErrorLeftAndRightImageSizesDiffer 207
>-#define MGK_ImageErrorNoImagesWereFound 208
>-#define MGK_ImageErrorNoImagesWereLoaded 209
>-#define MGK_ImageErrorNoLocaleImageAttribute 210
>-#define MGK_ImageErrorTooManyClusters 211
>-#define MGK_ImageErrorUnableToAppendImage 212
>-#define MGK_ImageErrorUnableToAssignProfile 213
>-#define MGK_ImageErrorUnableToAverageImage 214
>-#define MGK_ImageErrorUnableToCoalesceImage 215
>-#define MGK_ImageErrorUnableToCompareImages 216
>-#define MGK_ImageErrorUnableToCreateImageMosaic 217
>-#define MGK_ImageErrorUnableToCreateStereoImage 218
>-#define MGK_ImageErrorUnableToDeconstructImageSequence 219
>-#define MGK_ImageErrorUnableToFlattenImage 220
>-#define MGK_ImageErrorUnableToGetClipMask 221
>-#define MGK_ImageErrorUnableToHandleImageChannel 222
>-#define MGK_ImageErrorUnableToResizeImage 223
>-#define MGK_ImageErrorUnableToSegmentImage 224
>-#define MGK_ImageErrorUnableToSetClipMask 225
>-#define MGK_ImageErrorUnableToShearImage 226
>-#define MGK_ImageErrorWidthOrHeightExceedsLimit 227
>-#define MGK_ImageFatalErrorUnableToPersistKey 228
>-#define MGK_ImageWarningDefault 229
>-#define MGK_MissingDelegateErrorDPSLibraryIsNotAvailable 230
>-#define MGK_MissingDelegateErrorFPXLibraryIsNotAvailable 231
>-#define MGK_MissingDelegateErrorFreeTypeLibraryIsNotAvailable 232
>-#define MGK_MissingDelegateErrorJPEGLibraryIsNotAvailable 233
>-#define MGK_MissingDelegateErrorLCMSLibraryIsNotAvailable 234
>-#define MGK_MissingDelegateErrorLZWEncodingNotEnabled 235
>-#define MGK_MissingDelegateErrorNoDecodeDelegateForThisImageFormat 236
>-#define MGK_MissingDelegateErrorNoEncodeDelegateForThisImageFormat 237
>-#define MGK_MissingDelegateErrorTIFFLibraryIsNotAvailable 238
>-#define MGK_MissingDelegateErrorXMLLibraryIsNotAvailable 239
>-#define MGK_MissingDelegateErrorXWindowLibraryIsNotAvailable 240
>-#define MGK_MissingDelegateErrorZipLibraryIsNotAvailable 241
>-#define MGK_MissingDelegateFatalErrorDefault 242
>-#define MGK_MissingDelegateWarningDefault 243
>-#define MGK_ModuleErrorFailedToCloseModule 244
>-#define MGK_ModuleErrorFailedToFindSymbol 245
>-#define MGK_ModuleErrorUnableToLoadModule 246
>-#define MGK_ModuleErrorUnableToRegisterImageFormat 247
>-#define MGK_ModuleErrorUnrecognizedModule 248
>-#define MGK_ModuleFatalErrorUnableToInitializeModuleLoader 249
>-#define MGK_ModuleWarningDefault 250
>-#define MGK_MonitorErrorDefault 251
>-#define MGK_MonitorFatalErrorDefault 252
>-#define MGK_MonitorFatalErrorUserRequestedTerminationBySignal 253
>-#define MGK_MonitorWarningDefault 254
>-#define MGK_OptionErrorBevelWidthIsNegative 255
>-#define MGK_OptionErrorColorSeparatedImageRequired 256
>-#define MGK_OptionErrorFrameIsLessThanImageSize 257
>-#define MGK_OptionErrorGeometryDimensionsAreZero 258
>-#define MGK_OptionErrorGeometryDoesNotContainImage 259
>-#define MGK_OptionErrorHaldClutImageDimensionsInvalid 260
>-#define MGK_OptionErrorImagesAreNotTheSameSize 261
>-#define MGK_OptionErrorImageSizeMustExceedBevelWidth 262
>-#define MGK_OptionErrorImageSmallerThanKernelWidth 263
>-#define MGK_OptionErrorImageSmallerThanRadius 264
>-#define MGK_OptionErrorImageWidthsOrHeightsDiffer 265
>-#define MGK_OptionErrorInputImagesAlreadySpecified 266
>-#define MGK_OptionErrorInvalidSubimageSpecification 267
>-#define MGK_OptionErrorKernelRadiusIsTooSmall 268
>-#define MGK_OptionErrorKernelWidthMustBeAnOddNumber 269
>-#define MGK_OptionErrorMatrixIsNotSquare 270
>-#define MGK_OptionErrorMatrixOrderOutOfRange 271
>-#define MGK_OptionErrorMissingAnImageFilename 272
>-#define MGK_OptionErrorMissingArgument 273
>-#define MGK_OptionErrorMustSpecifyAnImageName 274
>-#define MGK_OptionErrorMustSpecifyImageSize 275
>-#define MGK_OptionErrorNoBlobDefined 276
>-#define MGK_OptionErrorNoImagesDefined 277
>-#define MGK_OptionErrorNonzeroWidthAndHeightRequired 278
>-#define MGK_OptionErrorNoProfileNameWasGiven 279
>-#define MGK_OptionErrorNullBlobArgument 280
>-#define MGK_OptionErrorReferenceImageRequired 281
>-#define MGK_OptionErrorReferenceIsNotMyType 282
>-#define MGK_OptionErrorRegionAreaExceedsLimit 283
>-#define MGK_OptionErrorRequestDidNotReturnAnImage 284
>-#define MGK_OptionErrorSteganoImageRequired 285
>-#define MGK_OptionErrorStereoImageRequired 286
>-#define MGK_OptionErrorSubimageSpecificationReturnsNoImages 287
>-#define MGK_OptionErrorUnableToAddOrRemoveProfile 288
>-#define MGK_OptionErrorUnableToAverageImageSequence 289
>-#define MGK_OptionErrorUnableToBlurImage 290
>-#define MGK_OptionErrorUnableToChopImage 291
>-#define MGK_OptionErrorUnableToColorMatrixImage 292
>-#define MGK_OptionErrorUnableToConstituteImage 293
>-#define MGK_OptionErrorUnableToConvolveImage 294
>-#define MGK_OptionErrorUnableToEdgeImage 295
>-#define MGK_OptionErrorUnableToEqualizeImage 296
>-#define MGK_OptionErrorUnableToFilterImage 297
>-#define MGK_OptionErrorUnableToFormatImageMetadata 298
>-#define MGK_OptionErrorUnableToFrameImage 299
>-#define MGK_OptionErrorUnableToOilPaintImage 300
>-#define MGK_OptionErrorUnableToPaintImage 301
>-#define MGK_OptionErrorUnableToRaiseImage 302
>-#define MGK_OptionErrorUnableToSharpenImage 303
>-#define MGK_OptionErrorUnableToThresholdImage 304
>-#define MGK_OptionErrorUnableToWaveImage 305
>-#define MGK_OptionErrorUnrecognizedAttribute 306
>-#define MGK_OptionErrorUnrecognizedChannelType 307
>-#define MGK_OptionErrorUnrecognizedColor 308
>-#define MGK_OptionErrorUnrecognizedColormapType 309
>-#define MGK_OptionErrorUnrecognizedColorspace 310
>-#define MGK_OptionErrorUnrecognizedCommand 311
>-#define MGK_OptionErrorUnrecognizedComposeOperator 312
>-#define MGK_OptionErrorUnrecognizedDisposeMethod 313
>-#define MGK_OptionErrorUnrecognizedElement 314
>-#define MGK_OptionErrorUnrecognizedEndianType 315
>-#define MGK_OptionErrorUnrecognizedGravityType 316
>-#define MGK_OptionErrorUnrecognizedHighlightStyle 317
>-#define MGK_OptionErrorUnrecognizedImageCompression 318
>-#define MGK_OptionErrorUnrecognizedImageFilter 319
>-#define MGK_OptionErrorUnrecognizedImageFormat 320
>-#define MGK_OptionErrorUnrecognizedImageMode 321
>-#define MGK_OptionErrorUnrecognizedImageType 322
>-#define MGK_OptionErrorUnrecognizedIntentType 323
>-#define MGK_OptionErrorUnrecognizedInterlaceType 324
>-#define MGK_OptionErrorUnrecognizedListType 325
>-#define MGK_OptionErrorUnrecognizedMetric 326
>-#define MGK_OptionErrorUnrecognizedModeType 327
>-#define MGK_OptionErrorUnrecognizedNoiseType 328
>-#define MGK_OptionErrorUnrecognizedOperator 329
>-#define MGK_OptionErrorUnrecognizedOption 330
>-#define MGK_OptionErrorUnrecognizedPerlMagickMethod 331
>-#define MGK_OptionErrorUnrecognizedPixelMap 332
>-#define MGK_OptionErrorUnrecognizedPreviewType 333
>-#define MGK_OptionErrorUnrecognizedResourceType 334
>-#define MGK_OptionErrorUnrecognizedType 335
>-#define MGK_OptionErrorUnrecognizedUnitsType 336
>-#define MGK_OptionErrorUnrecognizedVirtualPixelMethod 337
>-#define MGK_OptionErrorUnsupportedSamplingFactor 338
>-#define MGK_OptionErrorUsageError 339
>-#define MGK_OptionFatalErrorInvalidColorspaceType 340
>-#define MGK_OptionFatalErrorInvalidEndianType 341
>-#define MGK_OptionFatalErrorInvalidImageType 342
>-#define MGK_OptionFatalErrorInvalidInterlaceType 343
>-#define MGK_OptionFatalErrorMissingAnImageFilename 344
>-#define MGK_OptionFatalErrorMissingArgument 345
>-#define MGK_OptionFatalErrorNoImagesWereLoaded 346
>-#define MGK_OptionFatalErrorOptionLengthExceedsLimit 347
>-#define MGK_OptionFatalErrorRequestDidNotReturnAnImage 348
>-#define MGK_OptionFatalErrorUnableToOpenXServer 349
>-#define MGK_OptionFatalErrorUnableToPersistKey 350
>-#define MGK_OptionFatalErrorUnrecognizedColormapType 351
>-#define MGK_OptionFatalErrorUnrecognizedColorspaceType 352
>-#define MGK_OptionFatalErrorUnrecognizedDisposeMethod 353
>-#define MGK_OptionFatalErrorUnrecognizedEndianType 354
>-#define MGK_OptionFatalErrorUnrecognizedFilterType 355
>-#define MGK_OptionFatalErrorUnrecognizedImageCompressionType 356
>-#define MGK_OptionFatalErrorUnrecognizedImageType 357
>-#define MGK_OptionFatalErrorUnrecognizedInterlaceType 358
>-#define MGK_OptionFatalErrorUnrecognizedOption 359
>-#define MGK_OptionFatalErrorUnrecognizedResourceType 360
>-#define MGK_OptionFatalErrorUnrecognizedVirtualPixelMethod 361
>-#define MGK_OptionWarningUnrecognizedColor 362
>-#define MGK_RegistryErrorImageExpected 363
>-#define MGK_RegistryErrorImageInfoExpected 364
>-#define MGK_RegistryErrorStructureSizeMismatch 365
>-#define MGK_RegistryErrorUnableToGetRegistryID 366
>-#define MGK_RegistryErrorUnableToLocateImage 367
>-#define MGK_RegistryErrorUnableToSetRegistry 368
>-#define MGK_RegistryFatalErrorDefault 369
>-#define MGK_RegistryWarningDefault 370
>-#define MGK_ResourceLimitErrorCacheResourcesExhausted 371
>-#define MGK_ResourceLimitErrorImagePixelLimitExceeded 372
>-#define MGK_ResourceLimitErrorMemoryAllocationFailed 373
>-#define MGK_ResourceLimitErrorNoPixelsDefinedInCache 374
>-#define MGK_ResourceLimitErrorPixelCacheAllocationFailed 375
>-#define MGK_ResourceLimitErrorUnableToAddColorProfile 376
>-#define MGK_ResourceLimitErrorUnableToAddGenericProfile 377
>-#define MGK_ResourceLimitErrorUnableToAddIPTCProfile 378
>-#define MGK_ResourceLimitErrorUnableToAllocateCoefficients 379
>-#define MGK_ResourceLimitErrorUnableToAllocateColormap 380
>-#define MGK_ResourceLimitErrorUnableToAllocateICCProfile 381
>-#define MGK_ResourceLimitErrorUnableToAllocateString 382
>-#define MGK_ResourceLimitErrorUnableToAnnotateImage 383
>-#define MGK_ResourceLimitErrorUnableToAverageImageSequence 384
>-#define MGK_ResourceLimitErrorUnableToCloneDrawingWand 385
>-#define MGK_ResourceLimitErrorUnableToCloneImage 386
>-#define MGK_ResourceLimitErrorUnableToComputeImageSignature 387
>-#define MGK_ResourceLimitErrorUnableToConstituteImage 388
>-#define MGK_ResourceLimitErrorUnableToConvertFont 389
>-#define MGK_ResourceLimitErrorUnableToConvertStringToTokens 390
>-#define MGK_ResourceLimitErrorUnableToCreateColormap 391
>-#define MGK_ResourceLimitErrorUnableToCreateColorTransform 392
>-#define MGK_ResourceLimitErrorUnableToCreateCommandWidget 393
>-#define MGK_ResourceLimitErrorUnableToCreateImageGroup 394
>-#define MGK_ResourceLimitErrorUnableToCreateImageMontage 395
>-#define MGK_ResourceLimitErrorUnableToCreateXWindow 396
>-#define MGK_ResourceLimitErrorUnableToCropImage 397
>-#define MGK_ResourceLimitErrorUnableToDespeckleImage 398
>-#define MGK_ResourceLimitErrorUnableToDetermineImageClass 399
>-#define MGK_ResourceLimitErrorUnableToDetermineTheNumberOfImageColors 400
>-#define MGK_ResourceLimitErrorUnableToDitherImage 401
>-#define MGK_ResourceLimitErrorUnableToDrawOnImage 402
>-#define MGK_ResourceLimitErrorUnableToEdgeImage 403
>-#define MGK_ResourceLimitErrorUnableToEmbossImage 404
>-#define MGK_ResourceLimitErrorUnableToEnhanceImage 405
>-#define MGK_ResourceLimitErrorUnableToFloodfillImage 406
>-#define MGK_ResourceLimitErrorUnableToGammaCorrectImage 407
>-#define MGK_ResourceLimitErrorUnableToGetBestIconSize 408
>-#define MGK_ResourceLimitErrorUnableToGetFromRegistry 409
>-#define MGK_ResourceLimitErrorUnableToGetPackageInfo 410
>-#define MGK_ResourceLimitErrorUnableToLevelImage 411
>-#define MGK_ResourceLimitErrorUnableToMagnifyImage 412
>-#define MGK_ResourceLimitErrorUnableToManageColor 413
>-#define MGK_ResourceLimitErrorUnableToMapImage 414
>-#define MGK_ResourceLimitErrorUnableToMapImageSequence 415
>-#define MGK_ResourceLimitErrorUnableToMedianFilterImage 416
>-#define MGK_ResourceLimitErrorUnableToMotionBlurImage 417
>-#define MGK_ResourceLimitErrorUnableToNoiseFilterImage 418
>-#define MGK_ResourceLimitErrorUnableToNormalizeImage 419
>-#define MGK_ResourceLimitErrorUnableToOpenColorProfile 420
>-#define MGK_ResourceLimitErrorUnableToQuantizeImage 421
>-#define MGK_ResourceLimitErrorUnableToQuantizeImageSequence 422
>-#define MGK_ResourceLimitErrorUnableToReadTextChunk 423
>-#define MGK_ResourceLimitErrorUnableToReadXImage 424
>-#define MGK_ResourceLimitErrorUnableToReadXServerColormap 425
>-#define MGK_ResourceLimitErrorUnableToResizeImage 426
>-#define MGK_ResourceLimitErrorUnableToRotateImage 427
>-#define MGK_ResourceLimitErrorUnableToSampleImage 428
>-#define MGK_ResourceLimitErrorUnableToScaleImage 429
>-#define MGK_ResourceLimitErrorUnableToSelectImage 430
>-#define MGK_ResourceLimitErrorUnableToSharpenImage 431
>-#define MGK_ResourceLimitErrorUnableToShaveImage 432
>-#define MGK_ResourceLimitErrorUnableToShearImage 433
>-#define MGK_ResourceLimitErrorUnableToSortImageColormap 434
>-#define MGK_ResourceLimitErrorUnableToThresholdImage 435
>-#define MGK_ResourceLimitErrorUnableToTransformColorspace 436
>-#define MGK_ResourceLimitFatalErrorMemoryAllocationFailed 437
>-#define MGK_ResourceLimitFatalErrorSemaporeOperationFailed 438
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateAscii85Info 439
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateCacheInfo 440
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateCacheView 441
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateColorInfo 442
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateDashPattern 443
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateDelegateInfo 444
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateDerivatives 445
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateDrawContext 446
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateDrawInfo 447
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateDrawingWand 448
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateGammaMap 449
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateImage 450
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateImagePixels 451
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateLogInfo 452
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateMagicInfo 453
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateMagickInfo 454
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateModuleInfo 455
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateMontageInfo 456
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateQuantizeInfo 457
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateRandomKernel 458
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateRegistryInfo 459
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateSemaphoreInfo 460
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateString 461
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateTypeInfo 462
>-#define MGK_ResourceLimitFatalErrorUnableToAllocateWand 463
>-#define MGK_ResourceLimitFatalErrorUnableToAnimateImageSequence 464
>-#define MGK_ResourceLimitFatalErrorUnableToCloneBlobInfo 465
>-#define MGK_ResourceLimitFatalErrorUnableToCloneCacheInfo 466
>-#define MGK_ResourceLimitFatalErrorUnableToCloneImage 467
>-#define MGK_ResourceLimitFatalErrorUnableToCloneImageInfo 468
>-#define MGK_ResourceLimitFatalErrorUnableToConcatenateString 469
>-#define MGK_ResourceLimitFatalErrorUnableToConvertText 470
>-#define MGK_ResourceLimitFatalErrorUnableToCreateColormap 471
>-#define MGK_ResourceLimitFatalErrorUnableToDestroySemaphore 472
>-#define MGK_ResourceLimitFatalErrorUnableToDisplayImage 473
>-#define MGK_ResourceLimitFatalErrorUnableToEscapeString 474
>-#define MGK_ResourceLimitFatalErrorUnableToInitializeSemaphore 475
>-#define MGK_ResourceLimitFatalErrorUnableToInterpretMSLImage 476
>-#define MGK_ResourceLimitFatalErrorUnableToLockSemaphore 477
>-#define MGK_ResourceLimitFatalErrorUnableToUnlockSemaphore 478
>-#define MGK_ResourceLimitWarningMemoryAllocationFailed 479
>-#define MGK_StreamErrorImageDoesNotContainTheStreamGeometry 480
>-#define MGK_StreamErrorNoStreamHandlerIsDefined 481
>-#define MGK_StreamErrorPixelCacheIsNotOpen 482
>-#define MGK_StreamErrorUnableToAcquirePixelStream 483
>-#define MGK_StreamErrorUnableToSetPixelStream 484
>-#define MGK_StreamErrorUnableToSyncPixelStream 485
>-#define MGK_StreamFatalErrorDefault 486
>-#define MGK_StreamWarningDefault 487
>-#define MGK_TypeErrorFontSubstitutionRequired 488
>-#define MGK_TypeErrorUnableToGetTypeMetrics 489
>-#define MGK_TypeErrorUnableToInitializeFreetypeLibrary 490
>-#define MGK_TypeErrorUnableToReadFont 491
>-#define MGK_TypeErrorUnrecognizedFontEncoding 492
>-#define MGK_TypeFatalErrorDefault 493
>-#define MGK_TypeWarningDefault 494
>-#define MGK_WandErrorInvalidColormapIndex 495
>-#define MGK_WandErrorWandAPINotImplemented 496
>-#define MGK_WandErrorWandContainsNoImageIndexs 497
>-#define MGK_WandErrorWandContainsNoImages 498
>-#define MGK_XServerErrorColorIsNotKnownToServer 499
>-#define MGK_XServerErrorNoWindowWithSpecifiedIDExists 500
>-#define MGK_XServerErrorStandardColormapIsNotInitialized 501
>-#define MGK_XServerErrorUnableToConnectToRemoteDisplay 502
>-#define MGK_XServerErrorUnableToCreateBitmap 503
>-#define MGK_XServerErrorUnableToCreateColormap 504
>-#define MGK_XServerErrorUnableToCreatePixmap 505
>-#define MGK_XServerErrorUnableToCreateProperty 506
>-#define MGK_XServerErrorUnableToCreateStandardColormap 507
>-#define MGK_XServerErrorUnableToDisplayImageInfo 508
>-#define MGK_XServerErrorUnableToGetProperty 509
>-#define MGK_XServerErrorUnableToGetStandardColormap 510
>-#define MGK_XServerErrorUnableToGetVisual 511
>-#define MGK_XServerErrorUnableToGrabMouse 512
>-#define MGK_XServerErrorUnableToLoadFont 513
>-#define MGK_XServerErrorUnableToMatchVisualToStandardColormap 514
>-#define MGK_XServerErrorUnableToOpenXServer 515
>-#define MGK_XServerErrorUnableToReadXAttributes 516
>-#define MGK_XServerErrorUnableToReadXWindowImage 517
>-#define MGK_XServerErrorUnrecognizedColormapType 518
>-#define MGK_XServerErrorUnrecognizedGravityType 519
>-#define MGK_XServerErrorUnrecognizedVisualSpecifier 520
>-#define MGK_XServerFatalErrorUnableToAllocateXHints 521
>-#define MGK_XServerFatalErrorUnableToCreateCursor 522
>-#define MGK_XServerFatalErrorUnableToCreateGraphicContext 523
>-#define MGK_XServerFatalErrorUnableToCreateStandardColormap 524
>-#define MGK_XServerFatalErrorUnableToCreateTextProperty 525
>-#define MGK_XServerFatalErrorUnableToCreateXImage 526
>-#define MGK_XServerFatalErrorUnableToCreateXPixmap 527
>-#define MGK_XServerFatalErrorUnableToCreateXWindow 528
>-#define MGK_XServerFatalErrorUnableToDisplayImage 529
>-#define MGK_XServerFatalErrorUnableToDitherImage 530
>-#define MGK_XServerFatalErrorUnableToGetPixelInfo 531
>-#define MGK_XServerFatalErrorUnableToGetVisual 532
>-#define MGK_XServerFatalErrorUnableToLoadFont 533
>-#define MGK_XServerFatalErrorUnableToMakeXWindow 534
>-#define MGK_XServerFatalErrorUnableToOpenXServer 535
>-#define MGK_XServerFatalErrorUnableToViewFonts 536
>-#define MGK_XServerWarningUnableToGetVisual 537
>-#define MGK_XServerWarningUsingDefaultVisual 538
>+#define MGK_DrawErrorFloatValueConversionError 187
>+#define MGK_DrawErrorIntegerValueConversionError 188
>+#define MGK_DrawErrorNonconformingDrawingPrimitiveDefinition 189
>+#define MGK_DrawErrorTooManyCoordinates 190
>+#define MGK_DrawErrorUnableToPrint 191
>+#define MGK_DrawErrorUnbalancedGraphicContextPushPop 192
>+#define MGK_DrawErrorVectorPathTruncated 193
>+#define MGK_DrawFatalErrorDefault 194
>+#define MGK_DrawWarningNotARelativeURL 195
>+#define MGK_DrawWarningNotCurrentlyPushingPatternDefinition 196
>+#define MGK_DrawWarningURLNotFound 197
>+#define MGK_FileOpenErrorUnableToCreateTemporaryFile 198
>+#define MGK_FileOpenErrorUnableToOpenFile 199
>+#define MGK_FileOpenErrorUnableToWriteFile 200
>+#define MGK_FileOpenFatalErrorDefault 201
>+#define MGK_FileOpenWarningDefault 202
>+#define MGK_ImageErrorAngleIsDiscontinuous 203
>+#define MGK_ImageErrorColorspaceColorProfileMismatch 204
>+#define MGK_ImageErrorImageColorspaceDiffers 205
>+#define MGK_ImageErrorImageColorspaceMismatch 206
>+#define MGK_ImageErrorImageDifferenceExceedsLimit 207
>+#define MGK_ImageErrorImageDoesNotContainResolution 208
>+#define MGK_ImageErrorImageOpacityDiffers 209
>+#define MGK_ImageErrorImageSequenceIsRequired 210
>+#define MGK_ImageErrorImageSizeDiffers 211
>+#define MGK_ImageErrorInvalidColormapIndex 212
>+#define MGK_ImageErrorLeftAndRightImageSizesDiffer 213
>+#define MGK_ImageErrorNoImagesWereFound 214
>+#define MGK_ImageErrorNoImagesWereLoaded 215
>+#define MGK_ImageErrorNoLocaleImageAttribute 216
>+#define MGK_ImageErrorTooManyClusters 217
>+#define MGK_ImageErrorUnableToAppendImage 218
>+#define MGK_ImageErrorUnableToAssignProfile 219
>+#define MGK_ImageErrorUnableToAverageImage 220
>+#define MGK_ImageErrorUnableToCoalesceImage 221
>+#define MGK_ImageErrorUnableToCompareImages 222
>+#define MGK_ImageErrorUnableToCreateImageMosaic 223
>+#define MGK_ImageErrorUnableToCreateStereoImage 224
>+#define MGK_ImageErrorUnableToDeconstructImageSequence 225
>+#define MGK_ImageErrorUnableToFlattenImage 226
>+#define MGK_ImageErrorUnableToGetClipMask 227
>+#define MGK_ImageErrorUnableToHandleImageChannel 228
>+#define MGK_ImageErrorUnableToResizeImage 229
>+#define MGK_ImageErrorUnableToSegmentImage 230
>+#define MGK_ImageErrorUnableToSetClipMask 231
>+#define MGK_ImageErrorUnableToShearImage 232
>+#define MGK_ImageErrorWidthOrHeightExceedsLimit 233
>+#define MGK_ImageFatalErrorUnableToPersistKey 234
>+#define MGK_ImageWarningDefault 235
>+#define MGK_MissingDelegateErrorDPSLibraryIsNotAvailable 236
>+#define MGK_MissingDelegateErrorFPXLibraryIsNotAvailable 237
>+#define MGK_MissingDelegateErrorFreeTypeLibraryIsNotAvailable 238
>+#define MGK_MissingDelegateErrorJPEGLibraryIsNotAvailable 239
>+#define MGK_MissingDelegateErrorLCMSLibraryIsNotAvailable 240
>+#define MGK_MissingDelegateErrorLZWEncodingNotEnabled 241
>+#define MGK_MissingDelegateErrorNoDecodeDelegateForThisImageFormat 242
>+#define MGK_MissingDelegateErrorNoEncodeDelegateForThisImageFormat 243
>+#define MGK_MissingDelegateErrorTIFFLibraryIsNotAvailable 244
>+#define MGK_MissingDelegateErrorXMLLibraryIsNotAvailable 245
>+#define MGK_MissingDelegateErrorXWindowLibraryIsNotAvailable 246
>+#define MGK_MissingDelegateErrorZipLibraryIsNotAvailable 247
>+#define MGK_MissingDelegateFatalErrorDefault 248
>+#define MGK_MissingDelegateWarningDefault 249
>+#define MGK_ModuleErrorFailedToCloseModule 250
>+#define MGK_ModuleErrorFailedToFindSymbol 251
>+#define MGK_ModuleErrorUnableToLoadModule 252
>+#define MGK_ModuleErrorUnableToRegisterImageFormat 253
>+#define MGK_ModuleErrorUnrecognizedModule 254
>+#define MGK_ModuleFatalErrorUnableToInitializeModuleLoader 255
>+#define MGK_ModuleWarningDefault 256
>+#define MGK_MonitorErrorDefault 257
>+#define MGK_MonitorFatalErrorDefault 258
>+#define MGK_MonitorFatalErrorUserRequestedTerminationBySignal 259
>+#define MGK_MonitorWarningDefault 260
>+#define MGK_OptionErrorBevelWidthIsNegative 261
>+#define MGK_OptionErrorColorSeparatedImageRequired 262
>+#define MGK_OptionErrorFrameIsLessThanImageSize 263
>+#define MGK_OptionErrorGeometryDimensionsAreZero 264
>+#define MGK_OptionErrorGeometryDoesNotContainImage 265
>+#define MGK_OptionErrorHaldClutImageDimensionsInvalid 266
>+#define MGK_OptionErrorImagesAreNotTheSameSize 267
>+#define MGK_OptionErrorImageSizeMustExceedBevelWidth 268
>+#define MGK_OptionErrorImageSmallerThanKernelWidth 269
>+#define MGK_OptionErrorImageSmallerThanRadius 270
>+#define MGK_OptionErrorImageWidthsOrHeightsDiffer 271
>+#define MGK_OptionErrorInputImagesAlreadySpecified 272
>+#define MGK_OptionErrorInvalidSubimageSpecification 273
>+#define MGK_OptionErrorKernelRadiusIsTooSmall 274
>+#define MGK_OptionErrorKernelWidthMustBeAnOddNumber 275
>+#define MGK_OptionErrorMatrixIsNotSquare 276
>+#define MGK_OptionErrorMatrixOrderOutOfRange 277
>+#define MGK_OptionErrorMissingAnImageFilename 278
>+#define MGK_OptionErrorMissingArgument 279
>+#define MGK_OptionErrorMustSpecifyAnImageName 280
>+#define MGK_OptionErrorMustSpecifyImageSize 281
>+#define MGK_OptionErrorNoBlobDefined 282
>+#define MGK_OptionErrorNoImagesDefined 283
>+#define MGK_OptionErrorNonzeroWidthAndHeightRequired 284
>+#define MGK_OptionErrorNoProfileNameWasGiven 285
>+#define MGK_OptionErrorNullBlobArgument 286
>+#define MGK_OptionErrorReferenceImageRequired 287
>+#define MGK_OptionErrorReferenceIsNotMyType 288
>+#define MGK_OptionErrorRegionAreaExceedsLimit 289
>+#define MGK_OptionErrorRequestDidNotReturnAnImage 290
>+#define MGK_OptionErrorSteganoImageRequired 291
>+#define MGK_OptionErrorStereoImageRequired 292
>+#define MGK_OptionErrorSubimageSpecificationReturnsNoImages 293
>+#define MGK_OptionErrorUnableToAddOrRemoveProfile 294
>+#define MGK_OptionErrorUnableToAverageImageSequence 295
>+#define MGK_OptionErrorUnableToBlurImage 296
>+#define MGK_OptionErrorUnableToChopImage 297
>+#define MGK_OptionErrorUnableToColorMatrixImage 298
>+#define MGK_OptionErrorUnableToConstituteImage 299
>+#define MGK_OptionErrorUnableToConvolveImage 300
>+#define MGK_OptionErrorUnableToEdgeImage 301
>+#define MGK_OptionErrorUnableToEqualizeImage 302
>+#define MGK_OptionErrorUnableToFilterImage 303
>+#define MGK_OptionErrorUnableToFormatImageMetadata 304
>+#define MGK_OptionErrorUnableToFrameImage 305
>+#define MGK_OptionErrorUnableToOilPaintImage 306
>+#define MGK_OptionErrorUnableToPaintImage 307
>+#define MGK_OptionErrorUnableToRaiseImage 308
>+#define MGK_OptionErrorUnableToSharpenImage 309
>+#define MGK_OptionErrorUnableToThresholdImage 310
>+#define MGK_OptionErrorUnableToWaveImage 311
>+#define MGK_OptionErrorUnrecognizedAttribute 312
>+#define MGK_OptionErrorUnrecognizedChannelType 313
>+#define MGK_OptionErrorUnrecognizedColor 314
>+#define MGK_OptionErrorUnrecognizedColormapType 315
>+#define MGK_OptionErrorUnrecognizedColorspace 316
>+#define MGK_OptionErrorUnrecognizedCommand 317
>+#define MGK_OptionErrorUnrecognizedComposeOperator 318
>+#define MGK_OptionErrorUnrecognizedDisposeMethod 319
>+#define MGK_OptionErrorUnrecognizedElement 320
>+#define MGK_OptionErrorUnrecognizedEndianType 321
>+#define MGK_OptionErrorUnrecognizedGravityType 322
>+#define MGK_OptionErrorUnrecognizedHighlightStyle 323
>+#define MGK_OptionErrorUnrecognizedImageCompression 324
>+#define MGK_OptionErrorUnrecognizedImageFilter 325
>+#define MGK_OptionErrorUnrecognizedImageFormat 326
>+#define MGK_OptionErrorUnrecognizedImageMode 327
>+#define MGK_OptionErrorUnrecognizedImageType 328
>+#define MGK_OptionErrorUnrecognizedIntentType 329
>+#define MGK_OptionErrorUnrecognizedInterlaceType 330
>+#define MGK_OptionErrorUnrecognizedListType 331
>+#define MGK_OptionErrorUnrecognizedMetric 332
>+#define MGK_OptionErrorUnrecognizedModeType 333
>+#define MGK_OptionErrorUnrecognizedNoiseType 334
>+#define MGK_OptionErrorUnrecognizedOperator 335
>+#define MGK_OptionErrorUnrecognizedOption 336
>+#define MGK_OptionErrorUnrecognizedPerlMagickMethod 337
>+#define MGK_OptionErrorUnrecognizedPixelMap 338
>+#define MGK_OptionErrorUnrecognizedPreviewType 339
>+#define MGK_OptionErrorUnrecognizedResourceType 340
>+#define MGK_OptionErrorUnrecognizedType 341
>+#define MGK_OptionErrorUnrecognizedUnitsType 342
>+#define MGK_OptionErrorUnrecognizedVirtualPixelMethod 343
>+#define MGK_OptionErrorUnsupportedSamplingFactor 344
>+#define MGK_OptionErrorUsageError 345
>+#define MGK_OptionFatalErrorInvalidColorspaceType 346
>+#define MGK_OptionFatalErrorInvalidEndianType 347
>+#define MGK_OptionFatalErrorInvalidImageType 348
>+#define MGK_OptionFatalErrorInvalidInterlaceType 349
>+#define MGK_OptionFatalErrorMissingAnImageFilename 350
>+#define MGK_OptionFatalErrorMissingArgument 351
>+#define MGK_OptionFatalErrorNoImagesWereLoaded 352
>+#define MGK_OptionFatalErrorOptionLengthExceedsLimit 353
>+#define MGK_OptionFatalErrorRequestDidNotReturnAnImage 354
>+#define MGK_OptionFatalErrorUnableToOpenXServer 355
>+#define MGK_OptionFatalErrorUnableToPersistKey 356
>+#define MGK_OptionFatalErrorUnrecognizedColormapType 357
>+#define MGK_OptionFatalErrorUnrecognizedColorspaceType 358
>+#define MGK_OptionFatalErrorUnrecognizedDisposeMethod 359
>+#define MGK_OptionFatalErrorUnrecognizedEndianType 360
>+#define MGK_OptionFatalErrorUnrecognizedFilterType 361
>+#define MGK_OptionFatalErrorUnrecognizedImageCompressionType 362
>+#define MGK_OptionFatalErrorUnrecognizedImageType 363
>+#define MGK_OptionFatalErrorUnrecognizedInterlaceType 364
>+#define MGK_OptionFatalErrorUnrecognizedOption 365
>+#define MGK_OptionFatalErrorUnrecognizedResourceType 366
>+#define MGK_OptionFatalErrorUnrecognizedVirtualPixelMethod 367
>+#define MGK_OptionWarningUnrecognizedColor 368
>+#define MGK_RegistryErrorImageExpected 369
>+#define MGK_RegistryErrorImageInfoExpected 370
>+#define MGK_RegistryErrorStructureSizeMismatch 371
>+#define MGK_RegistryErrorUnableToGetRegistryID 372
>+#define MGK_RegistryErrorUnableToLocateImage 373
>+#define MGK_RegistryErrorUnableToSetRegistry 374
>+#define MGK_RegistryFatalErrorDefault 375
>+#define MGK_RegistryWarningDefault 376
>+#define MGK_ResourceLimitErrorCacheResourcesExhausted 377
>+#define MGK_ResourceLimitErrorImagePixelHeightLimitExceeded 378
>+#define MGK_ResourceLimitErrorImagePixelLimitExceeded 379
>+#define MGK_ResourceLimitErrorImagePixelWidthLimitExceeded 380
>+#define MGK_ResourceLimitErrorMemoryAllocationFailed 381
>+#define MGK_ResourceLimitErrorNoPixelsDefinedInCache 382
>+#define MGK_ResourceLimitErrorPixelCacheAllocationFailed 383
>+#define MGK_ResourceLimitErrorUnableToAddColorProfile 384
>+#define MGK_ResourceLimitErrorUnableToAddGenericProfile 385
>+#define MGK_ResourceLimitErrorUnableToAddIPTCProfile 386
>+#define MGK_ResourceLimitErrorUnableToAllocateCoefficients 387
>+#define MGK_ResourceLimitErrorUnableToAllocateColormap 388
>+#define MGK_ResourceLimitErrorUnableToAllocateICCProfile 389
>+#define MGK_ResourceLimitErrorUnableToAllocateString 390
>+#define MGK_ResourceLimitErrorUnableToAnnotateImage 391
>+#define MGK_ResourceLimitErrorUnableToAverageImageSequence 392
>+#define MGK_ResourceLimitErrorUnableToCloneDrawingWand 393
>+#define MGK_ResourceLimitErrorUnableToCloneImage 394
>+#define MGK_ResourceLimitErrorUnableToComputeImageSignature 395
>+#define MGK_ResourceLimitErrorUnableToConstituteImage 396
>+#define MGK_ResourceLimitErrorUnableToConvertFont 397
>+#define MGK_ResourceLimitErrorUnableToConvertStringToTokens 398
>+#define MGK_ResourceLimitErrorUnableToCreateColormap 399
>+#define MGK_ResourceLimitErrorUnableToCreateColorTransform 400
>+#define MGK_ResourceLimitErrorUnableToCreateCommandWidget 401
>+#define MGK_ResourceLimitErrorUnableToCreateImageGroup 402
>+#define MGK_ResourceLimitErrorUnableToCreateImageMontage 403
>+#define MGK_ResourceLimitErrorUnableToCreateXWindow 404
>+#define MGK_ResourceLimitErrorUnableToCropImage 405
>+#define MGK_ResourceLimitErrorUnableToDespeckleImage 406
>+#define MGK_ResourceLimitErrorUnableToDetermineImageClass 407
>+#define MGK_ResourceLimitErrorUnableToDetermineTheNumberOfImageColors 408
>+#define MGK_ResourceLimitErrorUnableToDitherImage 409
>+#define MGK_ResourceLimitErrorUnableToDrawOnImage 410
>+#define MGK_ResourceLimitErrorUnableToEdgeImage 411
>+#define MGK_ResourceLimitErrorUnableToEmbossImage 412
>+#define MGK_ResourceLimitErrorUnableToEnhanceImage 413
>+#define MGK_ResourceLimitErrorUnableToFloodfillImage 414
>+#define MGK_ResourceLimitErrorUnableToGammaCorrectImage 415
>+#define MGK_ResourceLimitErrorUnableToGetBestIconSize 416
>+#define MGK_ResourceLimitErrorUnableToGetFromRegistry 417
>+#define MGK_ResourceLimitErrorUnableToGetPackageInfo 418
>+#define MGK_ResourceLimitErrorUnableToLevelImage 419
>+#define MGK_ResourceLimitErrorUnableToMagnifyImage 420
>+#define MGK_ResourceLimitErrorUnableToManageColor 421
>+#define MGK_ResourceLimitErrorUnableToMapImage 422
>+#define MGK_ResourceLimitErrorUnableToMapImageSequence 423
>+#define MGK_ResourceLimitErrorUnableToMedianFilterImage 424
>+#define MGK_ResourceLimitErrorUnableToMotionBlurImage 425
>+#define MGK_ResourceLimitErrorUnableToNoiseFilterImage 426
>+#define MGK_ResourceLimitErrorUnableToNormalizeImage 427
>+#define MGK_ResourceLimitErrorUnableToOpenColorProfile 428
>+#define MGK_ResourceLimitErrorUnableToQuantizeImage 429
>+#define MGK_ResourceLimitErrorUnableToQuantizeImageSequence 430
>+#define MGK_ResourceLimitErrorUnableToReadTextChunk 431
>+#define MGK_ResourceLimitErrorUnableToReadXImage 432
>+#define MGK_ResourceLimitErrorUnableToReadXServerColormap 433
>+#define MGK_ResourceLimitErrorUnableToResizeImage 434
>+#define MGK_ResourceLimitErrorUnableToRotateImage 435
>+#define MGK_ResourceLimitErrorUnableToSampleImage 436
>+#define MGK_ResourceLimitErrorUnableToScaleImage 437
>+#define MGK_ResourceLimitErrorUnableToSelectImage 438
>+#define MGK_ResourceLimitErrorUnableToSharpenImage 439
>+#define MGK_ResourceLimitErrorUnableToShaveImage 440
>+#define MGK_ResourceLimitErrorUnableToShearImage 441
>+#define MGK_ResourceLimitErrorUnableToSortImageColormap 442
>+#define MGK_ResourceLimitErrorUnableToThresholdImage 443
>+#define MGK_ResourceLimitErrorUnableToTransformColorspace 444
>+#define MGK_ResourceLimitFatalErrorMemoryAllocationFailed 445
>+#define MGK_ResourceLimitFatalErrorSemaporeOperationFailed 446
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateAscii85Info 447
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateCacheInfo 448
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateCacheView 449
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateColorInfo 450
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateDashPattern 451
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateDelegateInfo 452
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateDerivatives 453
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateDrawContext 454
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateDrawInfo 455
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateDrawingWand 456
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateGammaMap 457
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateImage 458
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateImagePixels 459
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateLogInfo 460
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateMagicInfo 461
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateMagickInfo 462
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateModuleInfo 463
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateMontageInfo 464
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateQuantizeInfo 465
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateRandomKernel 466
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateRegistryInfo 467
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateSemaphoreInfo 468
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateString 469
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateTypeInfo 470
>+#define MGK_ResourceLimitFatalErrorUnableToAllocateWand 471
>+#define MGK_ResourceLimitFatalErrorUnableToAnimateImageSequence 472
>+#define MGK_ResourceLimitFatalErrorUnableToCloneBlobInfo 473
>+#define MGK_ResourceLimitFatalErrorUnableToCloneCacheInfo 474
>+#define MGK_ResourceLimitFatalErrorUnableToCloneImage 475
>+#define MGK_ResourceLimitFatalErrorUnableToCloneImageInfo 476
>+#define MGK_ResourceLimitFatalErrorUnableToConcatenateString 477
>+#define MGK_ResourceLimitFatalErrorUnableToConvertText 478
>+#define MGK_ResourceLimitFatalErrorUnableToCreateColormap 479
>+#define MGK_ResourceLimitFatalErrorUnableToDestroySemaphore 480
>+#define MGK_ResourceLimitFatalErrorUnableToDisplayImage 481
>+#define MGK_ResourceLimitFatalErrorUnableToEscapeString 482
>+#define MGK_ResourceLimitFatalErrorUnableToInitializeSemaphore 483
>+#define MGK_ResourceLimitFatalErrorUnableToInterpretMSLImage 484
>+#define MGK_ResourceLimitFatalErrorUnableToLockSemaphore 485
>+#define MGK_ResourceLimitFatalErrorUnableToObtainRandomEntropy 486
>+#define MGK_ResourceLimitFatalErrorUnableToUnlockSemaphore 487
>+#define MGK_ResourceLimitWarningMemoryAllocationFailed 488
>+#define MGK_StreamErrorImageDoesNotContainTheStreamGeometry 489
>+#define MGK_StreamErrorNoStreamHandlerIsDefined 490
>+#define MGK_StreamErrorPixelCacheIsNotOpen 491
>+#define MGK_StreamErrorUnableToAcquirePixelStream 492
>+#define MGK_StreamErrorUnableToSetPixelStream 493
>+#define MGK_StreamErrorUnableToSyncPixelStream 494
>+#define MGK_StreamFatalErrorDefault 495
>+#define MGK_StreamWarningDefault 496
>+#define MGK_TypeErrorFontSubstitutionRequired 497
>+#define MGK_TypeErrorUnableToGetTypeMetrics 498
>+#define MGK_TypeErrorUnableToInitializeFreetypeLibrary 499
>+#define MGK_TypeErrorUnableToReadFont 500
>+#define MGK_TypeErrorUnrecognizedFontEncoding 501
>+#define MGK_TypeFatalErrorDefault 502
>+#define MGK_TypeWarningDefault 503
>+#define MGK_WandErrorInvalidColormapIndex 504
>+#define MGK_WandErrorWandAPINotImplemented 505
>+#define MGK_WandErrorWandContainsNoImageIndexs 506
>+#define MGK_WandErrorWandContainsNoImages 507
>+#define MGK_XServerErrorColorIsNotKnownToServer 508
>+#define MGK_XServerErrorNoWindowWithSpecifiedIDExists 509
>+#define MGK_XServerErrorStandardColormapIsNotInitialized 510
>+#define MGK_XServerErrorUnableToConnectToRemoteDisplay 511
>+#define MGK_XServerErrorUnableToCreateBitmap 512
>+#define MGK_XServerErrorUnableToCreateColormap 513
>+#define MGK_XServerErrorUnableToCreatePixmap 514
>+#define MGK_XServerErrorUnableToCreateProperty 515
>+#define MGK_XServerErrorUnableToCreateStandardColormap 516
>+#define MGK_XServerErrorUnableToDisplayImageInfo 517
>+#define MGK_XServerErrorUnableToGetProperty 518
>+#define MGK_XServerErrorUnableToGetStandardColormap 519
>+#define MGK_XServerErrorUnableToGetVisual 520
>+#define MGK_XServerErrorUnableToGrabMouse 521
>+#define MGK_XServerErrorUnableToLoadFont 522
>+#define MGK_XServerErrorUnableToMatchVisualToStandardColormap 523
>+#define MGK_XServerErrorUnableToOpenXServer 524
>+#define MGK_XServerErrorUnableToReadXAttributes 525
>+#define MGK_XServerErrorUnableToReadXWindowImage 526
>+#define MGK_XServerErrorUnrecognizedColormapType 527
>+#define MGK_XServerErrorUnrecognizedGravityType 528
>+#define MGK_XServerErrorUnrecognizedVisualSpecifier 529
>+#define MGK_XServerFatalErrorUnableToAllocateXHints 530
>+#define MGK_XServerFatalErrorUnableToCreateCursor 531
>+#define MGK_XServerFatalErrorUnableToCreateGraphicContext 532
>+#define MGK_XServerFatalErrorUnableToCreateStandardColormap 533
>+#define MGK_XServerFatalErrorUnableToCreateTextProperty 534
>+#define MGK_XServerFatalErrorUnableToCreateXImage 535
>+#define MGK_XServerFatalErrorUnableToCreateXPixmap 536
>+#define MGK_XServerFatalErrorUnableToCreateXWindow 537
>+#define MGK_XServerFatalErrorUnableToDisplayImage 538
>+#define MGK_XServerFatalErrorUnableToDitherImage 539
>+#define MGK_XServerFatalErrorUnableToGetPixelInfo 540
>+#define MGK_XServerFatalErrorUnableToGetVisual 541
>+#define MGK_XServerFatalErrorUnableToLoadFont 542
>+#define MGK_XServerFatalErrorUnableToMakeXWindow 543
>+#define MGK_XServerFatalErrorUnableToOpenXServer 544
>+#define MGK_XServerFatalErrorUnableToViewFonts 545
>+#define MGK_XServerWarningUnableToGetVisual 546
>+#define MGK_XServerWarningUsingDefaultVisual 547
> 
> #endif
> 
>@@ -611,43 +614,43 @@
>     { "Delegate/FatalError", 180, DelegateFatalError },
>     { "Delegate/Warning", 181, DelegateWarning },
>     { "Draw/Error", 182, DrawError },
>-    { "Draw/FatalError", 187, DrawFatalError },
>-    { "Draw/Warning", 188, DrawWarning },
>-    { "File/Open/Error", 191, FileOpenError },
>-    { "File/Open/FatalError", 194, FileOpenFatalError },
>-    { "File/Open/Warning", 195, FileOpenWarning },
>-    { "Image/Error", 196, ImageError },
>-    { "Image/FatalError", 227, ImageFatalError },
>-    { "Image/Warning", 228, ImageWarning },
>-    { "Missing/Delegate/Error", 229, MissingDelegateError },
>-    { "Missing/Delegate/FatalError", 241, MissingDelegateFatalError },
>-    { "Missing/Delegate/Warning", 242, MissingDelegateWarning },
>-    { "Module/Error", 243, ModuleError },
>-    { "Module/FatalError", 248, ModuleFatalError },
>-    { "Module/Warning", 249, ModuleWarning },
>-    { "Monitor/Error", 250, MonitorError },
>-    { "Monitor/FatalError", 251, MonitorFatalError },
>-    { "Monitor/Warning", 253, MonitorWarning },
>-    { "Option/Error", 254, OptionError },
>-    { "Option/FatalError", 339, OptionFatalError },
>-    { "Option/Warning", 361, OptionWarning },
>-    { "Registry/Error", 362, RegistryError },
>-    { "Registry/FatalError", 368, RegistryFatalError },
>-    { "Registry/Warning", 369, RegistryWarning },
>-    { "Resource/Limit/Error", 370, ResourceLimitError },
>-    { "Resource/Limit/FatalError", 436, ResourceLimitFatalError },
>-    { "Resource/Limit/Warning", 478, ResourceLimitWarning },
>-    { "Stream/Error", 479, StreamError },
>-    { "Stream/FatalError", 485, StreamFatalError },
>-    { "Stream/Warning", 486, StreamWarning },
>-    { "Type/Error", 487, TypeError },
>-    { "Type/FatalError", 492, TypeFatalError },
>-    { "Type/Warning", 493, TypeWarning },
>-    { "Wand/Error", 494, WandError },
>-    { "XServer/Error", 498, XServerError },
>-    { "XServer/FatalError", 520, XServerFatalError },
>-    { "XServer/Warning", 536, XServerWarning },
>-    { 0, 538, UndefinedException }
>+    { "Draw/FatalError", 193, DrawFatalError },
>+    { "Draw/Warning", 194, DrawWarning },
>+    { "File/Open/Error", 197, FileOpenError },
>+    { "File/Open/FatalError", 200, FileOpenFatalError },
>+    { "File/Open/Warning", 201, FileOpenWarning },
>+    { "Image/Error", 202, ImageError },
>+    { "Image/FatalError", 233, ImageFatalError },
>+    { "Image/Warning", 234, ImageWarning },
>+    { "Missing/Delegate/Error", 235, MissingDelegateError },
>+    { "Missing/Delegate/FatalError", 247, MissingDelegateFatalError },
>+    { "Missing/Delegate/Warning", 248, MissingDelegateWarning },
>+    { "Module/Error", 249, ModuleError },
>+    { "Module/FatalError", 254, ModuleFatalError },
>+    { "Module/Warning", 255, ModuleWarning },
>+    { "Monitor/Error", 256, MonitorError },
>+    { "Monitor/FatalError", 257, MonitorFatalError },
>+    { "Monitor/Warning", 259, MonitorWarning },
>+    { "Option/Error", 260, OptionError },
>+    { "Option/FatalError", 345, OptionFatalError },
>+    { "Option/Warning", 367, OptionWarning },
>+    { "Registry/Error", 368, RegistryError },
>+    { "Registry/FatalError", 374, RegistryFatalError },
>+    { "Registry/Warning", 375, RegistryWarning },
>+    { "Resource/Limit/Error", 376, ResourceLimitError },
>+    { "Resource/Limit/FatalError", 444, ResourceLimitFatalError },
>+    { "Resource/Limit/Warning", 487, ResourceLimitWarning },
>+    { "Stream/Error", 488, StreamError },
>+    { "Stream/FatalError", 494, StreamFatalError },
>+    { "Stream/Warning", 495, StreamWarning },
>+    { "Type/Error", 496, TypeError },
>+    { "Type/FatalError", 501, TypeFatalError },
>+    { "Type/Warning", 502, TypeWarning },
>+    { "Wand/Error", 503, WandError },
>+    { "XServer/Error", 507, XServerError },
>+    { "XServer/FatalError", 529, XServerFatalError },
>+    { "XServer/Warning", 545, XServerWarning },
>+    { 0, 547, UndefinedException }
>   };
> #endif
> 
>@@ -846,361 +849,367 @@
>     { "Default", 181 },
>     { "Default", 182 },
>     { "AlreadyPushingPatternDefinition", 183 },
>-    { "NonconformingDrawingPrimitiveDefinition", 184 },
>-    { "TooManyCoordinates", 185 },
>-    { "UnableToPrint", 186 },
>-    { "UnbalancedGraphicContextPushPop", 187 },
>-    { "Default", 188 },
>-    { "NotARelativeURL", 189 },
>-    { "NotCurrentlyPushingPatternDefinition", 190 },
>-    { "URLNotFound", 191 },
>-    { "UnableToCreateTemporaryFile", 192 },
>-    { "UnableToOpenFile", 193 },
>-    { "UnableToWriteFile", 194 },
>-    { "Default", 195 },
>-    { "Default", 196 },
>-    { "AngleIsDiscontinuous", 197 },
>-    { "ColorspaceColorProfileMismatch", 198 },
>-    { "ImageColorspaceDiffers", 199 },
>-    { "ImageColorspaceMismatch", 200 },
>-    { "ImageDifferenceExceedsLimit", 201 },
>-    { "ImageDoesNotContainResolution", 202 },
>-    { "ImageOpacityDiffers", 203 },
>-    { "ImageSequenceIsRequired", 204 },
>-    { "ImageSizeDiffers", 205 },
>-    { "InvalidColormapIndex", 206 },
>-    { "LeftAndRightImageSizesDiffer", 207 },
>-    { "NoImagesWereFound", 208 },
>-    { "NoImagesWereLoaded", 209 },
>-    { "NoLocaleImageAttribute", 210 },
>-    { "TooManyClusters", 211 },
>-    { "UnableToAppendImage", 212 },
>-    { "UnableToAssignProfile", 213 },
>-    { "UnableToAverageImage", 214 },
>-    { "UnableToCoalesceImage", 215 },
>-    { "UnableToCompareImages", 216 },
>-    { "UnableToCreateImageMosaic", 217 },
>-    { "UnableToCreateStereoImage", 218 },
>-    { "UnableToDeconstructImageSequence", 219 },
>-    { "UnableToFlattenImage", 220 },
>-    { "UnableToGetClipMask", 221 },
>-    { "UnableToHandleImageChannel", 222 },
>-    { "UnableToResizeImage", 223 },
>-    { "UnableToSegmentImage", 224 },
>-    { "UnableToSetClipMask", 225 },
>-    { "UnableToShearImage", 226 },
>-    { "WidthOrHeightExceedsLimit", 227 },
>-    { "UnableToPersistKey", 228 },
>-    { "Default", 229 },
>-    { "DPSLibraryIsNotAvailable", 230 },
>-    { "FPXLibraryIsNotAvailable", 231 },
>-    { "FreeTypeLibraryIsNotAvailable", 232 },
>-    { "JPEGLibraryIsNotAvailable", 233 },
>-    { "LCMSLibraryIsNotAvailable", 234 },
>-    { "LZWEncodingNotEnabled", 235 },
>-    { "NoDecodeDelegateForThisImageFormat", 236 },
>-    { "NoEncodeDelegateForThisImageFormat", 237 },
>-    { "TIFFLibraryIsNotAvailable", 238 },
>-    { "XMLLibraryIsNotAvailable", 239 },
>-    { "XWindowLibraryIsNotAvailable", 240 },
>-    { "ZipLibraryIsNotAvailable", 241 },
>-    { "Default", 242 },
>-    { "Default", 243 },
>-    { "FailedToCloseModule", 244 },
>-    { "FailedToFindSymbol", 245 },
>-    { "UnableToLoadModule", 246 },
>-    { "UnableToRegisterImageFormat", 247 },
>-    { "UnrecognizedModule", 248 },
>-    { "UnableToInitializeModuleLoader", 249 },
>-    { "Default", 250 },
>-    { "Default", 251 },
>-    { "Default", 252 },
>-    { "UserRequestedTerminationBySignal", 253 },
>-    { "Default", 254 },
>-    { "BevelWidthIsNegative", 255 },
>-    { "ColorSeparatedImageRequired", 256 },
>-    { "FrameIsLessThanImageSize", 257 },
>-    { "GeometryDimensionsAreZero", 258 },
>-    { "GeometryDoesNotContainImage", 259 },
>-    { "HaldClutImageDimensionsInvalid", 260 },
>-    { "ImagesAreNotTheSameSize", 261 },
>-    { "ImageSizeMustExceedBevelWidth", 262 },
>-    { "ImageSmallerThanKernelWidth", 263 },
>-    { "ImageSmallerThanRadius", 264 },
>-    { "ImageWidthsOrHeightsDiffer", 265 },
>-    { "InputImagesAlreadySpecified", 266 },
>-    { "InvalidSubimageSpecification", 267 },
>-    { "KernelRadiusIsTooSmall", 268 },
>-    { "KernelWidthMustBeAnOddNumber", 269 },
>-    { "MatrixIsNotSquare", 270 },
>-    { "MatrixOrderOutOfRange", 271 },
>-    { "MissingAnImageFilename", 272 },
>-    { "MissingArgument", 273 },
>-    { "MustSpecifyAnImageName", 274 },
>-    { "MustSpecifyImageSize", 275 },
>-    { "NoBlobDefined", 276 },
>-    { "NoImagesDefined", 277 },
>-    { "NonzeroWidthAndHeightRequired", 278 },
>-    { "NoProfileNameWasGiven", 279 },
>-    { "NullBlobArgument", 280 },
>-    { "ReferenceImageRequired", 281 },
>-    { "ReferenceIsNotMyType", 282 },
>-    { "RegionAreaExceedsLimit", 283 },
>-    { "RequestDidNotReturnAnImage", 284 },
>-    { "SteganoImageRequired", 285 },
>-    { "StereoImageRequired", 286 },
>-    { "SubimageSpecificationReturnsNoImages", 287 },
>-    { "UnableToAddOrRemoveProfile", 288 },
>-    { "UnableToAverageImageSequence", 289 },
>-    { "UnableToBlurImage", 290 },
>-    { "UnableToChopImage", 291 },
>-    { "UnableToColorMatrixImage", 292 },
>-    { "UnableToConstituteImage", 293 },
>-    { "UnableToConvolveImage", 294 },
>-    { "UnableToEdgeImage", 295 },
>-    { "UnableToEqualizeImage", 296 },
>-    { "UnableToFilterImage", 297 },
>-    { "UnableToFormatImageMetadata", 298 },
>-    { "UnableToFrameImage", 299 },
>-    { "UnableToOilPaintImage", 300 },
>-    { "UnableToPaintImage", 301 },
>-    { "UnableToRaiseImage", 302 },
>-    { "UnableToSharpenImage", 303 },
>-    { "UnableToThresholdImage", 304 },
>-    { "UnableToWaveImage", 305 },
>-    { "UnrecognizedAttribute", 306 },
>-    { "UnrecognizedChannelType", 307 },
>-    { "UnrecognizedColor", 308 },
>-    { "UnrecognizedColormapType", 309 },
>-    { "UnrecognizedColorspace", 310 },
>-    { "UnrecognizedCommand", 311 },
>-    { "UnrecognizedComposeOperator", 312 },
>-    { "UnrecognizedDisposeMethod", 313 },
>-    { "UnrecognizedElement", 314 },
>-    { "UnrecognizedEndianType", 315 },
>-    { "UnrecognizedGravityType", 316 },
>-    { "UnrecognizedHighlightStyle", 317 },
>-    { "UnrecognizedImageCompression", 318 },
>-    { "UnrecognizedImageFilter", 319 },
>-    { "UnrecognizedImageFormat", 320 },
>-    { "UnrecognizedImageMode", 321 },
>-    { "UnrecognizedImageType", 322 },
>-    { "UnrecognizedIntentType", 323 },
>-    { "UnrecognizedInterlaceType", 324 },
>-    { "UnrecognizedListType", 325 },
>-    { "UnrecognizedMetric", 326 },
>-    { "UnrecognizedModeType", 327 },
>-    { "UnrecognizedNoiseType", 328 },
>-    { "UnrecognizedOperator", 329 },
>-    { "UnrecognizedOption", 330 },
>-    { "UnrecognizedPerlMagickMethod", 331 },
>-    { "UnrecognizedPixelMap", 332 },
>-    { "UnrecognizedPreviewType", 333 },
>-    { "UnrecognizedResourceType", 334 },
>-    { "UnrecognizedType", 335 },
>-    { "UnrecognizedUnitsType", 336 },
>-    { "UnrecognizedVirtualPixelMethod", 337 },
>-    { "UnsupportedSamplingFactor", 338 },
>-    { "UsageError", 339 },
>-    { "InvalidColorspaceType", 340 },
>-    { "InvalidEndianType", 341 },
>-    { "InvalidImageType", 342 },
>-    { "InvalidInterlaceType", 343 },
>-    { "MissingAnImageFilename", 344 },
>-    { "MissingArgument", 345 },
>-    { "NoImagesWereLoaded", 346 },
>-    { "OptionLengthExceedsLimit", 347 },
>-    { "RequestDidNotReturnAnImage", 348 },
>-    { "UnableToOpenXServer", 349 },
>-    { "UnableToPersistKey", 350 },
>-    { "UnrecognizedColormapType", 351 },
>-    { "UnrecognizedColorspaceType", 352 },
>-    { "UnrecognizedDisposeMethod", 353 },
>-    { "UnrecognizedEndianType", 354 },
>-    { "UnrecognizedFilterType", 355 },
>-    { "UnrecognizedImageCompressionType", 356 },
>-    { "UnrecognizedImageType", 357 },
>-    { "UnrecognizedInterlaceType", 358 },
>-    { "UnrecognizedOption", 359 },
>-    { "UnrecognizedResourceType", 360 },
>-    { "UnrecognizedVirtualPixelMethod", 361 },
>-    { "UnrecognizedColor", 362 },
>-    { "ImageExpected", 363 },
>-    { "ImageInfoExpected", 364 },
>-    { "StructureSizeMismatch", 365 },
>-    { "UnableToGetRegistryID", 366 },
>-    { "UnableToLocateImage", 367 },
>-    { "UnableToSetRegistry", 368 },
>-    { "Default", 369 },
>-    { "Default", 370 },
>-    { "CacheResourcesExhausted", 371 },
>-    { "ImagePixelLimitExceeded", 372 },
>-    { "MemoryAllocationFailed", 373 },
>-    { "NoPixelsDefinedInCache", 374 },
>-    { "PixelCacheAllocationFailed", 375 },
>-    { "UnableToAddColorProfile", 376 },
>-    { "UnableToAddGenericProfile", 377 },
>-    { "UnableToAddIPTCProfile", 378 },
>-    { "UnableToAllocateCoefficients", 379 },
>-    { "UnableToAllocateColormap", 380 },
>-    { "UnableToAllocateICCProfile", 381 },
>-    { "UnableToAllocateString", 382 },
>-    { "UnableToAnnotateImage", 383 },
>-    { "UnableToAverageImageSequence", 384 },
>-    { "UnableToCloneDrawingWand", 385 },
>-    { "UnableToCloneImage", 386 },
>-    { "UnableToComputeImageSignature", 387 },
>-    { "UnableToConstituteImage", 388 },
>-    { "UnableToConvertFont", 389 },
>-    { "UnableToConvertStringToTokens", 390 },
>-    { "UnableToCreateColormap", 391 },
>-    { "UnableToCreateColorTransform", 392 },
>-    { "UnableToCreateCommandWidget", 393 },
>-    { "UnableToCreateImageGroup", 394 },
>-    { "UnableToCreateImageMontage", 395 },
>-    { "UnableToCreateXWindow", 396 },
>-    { "UnableToCropImage", 397 },
>-    { "UnableToDespeckleImage", 398 },
>-    { "UnableToDetermineImageClass", 399 },
>-    { "UnableToDetermineTheNumberOfImageColors", 400 },
>-    { "UnableToDitherImage", 401 },
>-    { "UnableToDrawOnImage", 402 },
>-    { "UnableToEdgeImage", 403 },
>-    { "UnableToEmbossImage", 404 },
>-    { "UnableToEnhanceImage", 405 },
>-    { "UnableToFloodfillImage", 406 },
>-    { "UnableToGammaCorrectImage", 407 },
>-    { "UnableToGetBestIconSize", 408 },
>-    { "UnableToGetFromRegistry", 409 },
>-    { "UnableToGetPackageInfo", 410 },
>-    { "UnableToLevelImage", 411 },
>-    { "UnableToMagnifyImage", 412 },
>-    { "UnableToManageColor", 413 },
>-    { "UnableToMapImage", 414 },
>-    { "UnableToMapImageSequence", 415 },
>-    { "UnableToMedianFilterImage", 416 },
>-    { "UnableToMotionBlurImage", 417 },
>-    { "UnableToNoiseFilterImage", 418 },
>-    { "UnableToNormalizeImage", 419 },
>-    { "UnableToOpenColorProfile", 420 },
>-    { "UnableToQuantizeImage", 421 },
>-    { "UnableToQuantizeImageSequence", 422 },
>-    { "UnableToReadTextChunk", 423 },
>-    { "UnableToReadXImage", 424 },
>-    { "UnableToReadXServerColormap", 425 },
>-    { "UnableToResizeImage", 426 },
>-    { "UnableToRotateImage", 427 },
>-    { "UnableToSampleImage", 428 },
>-    { "UnableToScaleImage", 429 },
>-    { "UnableToSelectImage", 430 },
>-    { "UnableToSharpenImage", 431 },
>-    { "UnableToShaveImage", 432 },
>-    { "UnableToShearImage", 433 },
>-    { "UnableToSortImageColormap", 434 },
>-    { "UnableToThresholdImage", 435 },
>-    { "UnableToTransformColorspace", 436 },
>-    { "MemoryAllocationFailed", 437 },
>-    { "SemaporeOperationFailed", 438 },
>-    { "UnableToAllocateAscii85Info", 439 },
>-    { "UnableToAllocateCacheInfo", 440 },
>-    { "UnableToAllocateCacheView", 441 },
>-    { "UnableToAllocateColorInfo", 442 },
>-    { "UnableToAllocateDashPattern", 443 },
>-    { "UnableToAllocateDelegateInfo", 444 },
>-    { "UnableToAllocateDerivatives", 445 },
>-    { "UnableToAllocateDrawContext", 446 },
>-    { "UnableToAllocateDrawInfo", 447 },
>-    { "UnableToAllocateDrawingWand", 448 },
>-    { "UnableToAllocateGammaMap", 449 },
>-    { "UnableToAllocateImage", 450 },
>-    { "UnableToAllocateImagePixels", 451 },
>-    { "UnableToAllocateLogInfo", 452 },
>-    { "UnableToAllocateMagicInfo", 453 },
>-    { "UnableToAllocateMagickInfo", 454 },
>-    { "UnableToAllocateModuleInfo", 455 },
>-    { "UnableToAllocateMontageInfo", 456 },
>-    { "UnableToAllocateQuantizeInfo", 457 },
>-    { "UnableToAllocateRandomKernel", 458 },
>-    { "UnableToAllocateRegistryInfo", 459 },
>-    { "UnableToAllocateSemaphoreInfo", 460 },
>-    { "UnableToAllocateString", 461 },
>-    { "UnableToAllocateTypeInfo", 462 },
>-    { "UnableToAllocateWand", 463 },
>-    { "UnableToAnimateImageSequence", 464 },
>-    { "UnableToCloneBlobInfo", 465 },
>-    { "UnableToCloneCacheInfo", 466 },
>-    { "UnableToCloneImage", 467 },
>-    { "UnableToCloneImageInfo", 468 },
>-    { "UnableToConcatenateString", 469 },
>-    { "UnableToConvertText", 470 },
>-    { "UnableToCreateColormap", 471 },
>-    { "UnableToDestroySemaphore", 472 },
>-    { "UnableToDisplayImage", 473 },
>-    { "UnableToEscapeString", 474 },
>-    { "UnableToInitializeSemaphore", 475 },
>-    { "UnableToInterpretMSLImage", 476 },
>-    { "UnableToLockSemaphore", 477 },
>-    { "UnableToUnlockSemaphore", 478 },
>-    { "MemoryAllocationFailed", 479 },
>-    { "ImageDoesNotContainTheStreamGeometry", 480 },
>-    { "NoStreamHandlerIsDefined", 481 },
>-    { "PixelCacheIsNotOpen", 482 },
>-    { "UnableToAcquirePixelStream", 483 },
>-    { "UnableToSetPixelStream", 484 },
>-    { "UnableToSyncPixelStream", 485 },
>-    { "Default", 486 },
>-    { "Default", 487 },
>-    { "FontSubstitutionRequired", 488 },
>-    { "UnableToGetTypeMetrics", 489 },
>-    { "UnableToInitializeFreetypeLibrary", 490 },
>-    { "UnableToReadFont", 491 },
>-    { "UnrecognizedFontEncoding", 492 },
>-    { "Default", 493 },
>-    { "Default", 494 },
>-    { "InvalidColormapIndex", 495 },
>-    { "WandAPINotImplemented", 496 },
>-    { "WandContainsNoImageIndexs", 497 },
>-    { "WandContainsNoImages", 498 },
>-    { "ColorIsNotKnownToServer", 499 },
>-    { "NoWindowWithSpecifiedIDExists", 500 },
>-    { "StandardColormapIsNotInitialized", 501 },
>-    { "UnableToConnectToRemoteDisplay", 502 },
>-    { "UnableToCreateBitmap", 503 },
>-    { "UnableToCreateColormap", 504 },
>-    { "UnableToCreatePixmap", 505 },
>-    { "UnableToCreateProperty", 506 },
>-    { "UnableToCreateStandardColormap", 507 },
>-    { "UnableToDisplayImageInfo", 508 },
>-    { "UnableToGetProperty", 509 },
>-    { "UnableToGetStandardColormap", 510 },
>-    { "UnableToGetVisual", 511 },
>-    { "UnableToGrabMouse", 512 },
>-    { "UnableToLoadFont", 513 },
>-    { "UnableToMatchVisualToStandardColormap", 514 },
>-    { "UnableToOpenXServer", 515 },
>-    { "UnableToReadXAttributes", 516 },
>-    { "UnableToReadXWindowImage", 517 },
>-    { "UnrecognizedColormapType", 518 },
>-    { "UnrecognizedGravityType", 519 },
>-    { "UnrecognizedVisualSpecifier", 520 },
>-    { "UnableToAllocateXHints", 521 },
>-    { "UnableToCreateCursor", 522 },
>-    { "UnableToCreateGraphicContext", 523 },
>-    { "UnableToCreateStandardColormap", 524 },
>-    { "UnableToCreateTextProperty", 525 },
>-    { "UnableToCreateXImage", 526 },
>-    { "UnableToCreateXPixmap", 527 },
>-    { "UnableToCreateXWindow", 528 },
>-    { "UnableToDisplayImage", 529 },
>-    { "UnableToDitherImage", 530 },
>-    { "UnableToGetPixelInfo", 531 },
>-    { "UnableToGetVisual", 532 },
>-    { "UnableToLoadFont", 533 },
>-    { "UnableToMakeXWindow", 534 },
>-    { "UnableToOpenXServer", 535 },
>-    { "UnableToViewFonts", 536 },
>-    { "UnableToGetVisual", 537 },
>-    { "UsingDefaultVisual", 538 },
>+    { "FloatValueConversionError", 187 },
>+    { "IntegerValueConversionError", 188 },
>+    { "NonconformingDrawingPrimitiveDefinition", 189 },
>+    { "TooManyCoordinates", 190 },
>+    { "UnableToPrint", 191 },
>+    { "UnbalancedGraphicContextPushPop", 192 },
>+    { "VectorPathTruncated", 193 },
>+    { "Default", 194 },
>+    { "NotARelativeURL", 195 },
>+    { "NotCurrentlyPushingPatternDefinition", 196 },
>+    { "URLNotFound", 197 },
>+    { "UnableToCreateTemporaryFile", 198 },
>+    { "UnableToOpenFile", 199 },
>+    { "UnableToWriteFile", 200 },
>+    { "Default", 201 },
>+    { "Default", 202 },
>+    { "AngleIsDiscontinuous", 203 },
>+    { "ColorspaceColorProfileMismatch", 204 },
>+    { "ImageColorspaceDiffers", 205 },
>+    { "ImageColorspaceMismatch", 206 },
>+    { "ImageDifferenceExceedsLimit", 207 },
>+    { "ImageDoesNotContainResolution", 208 },
>+    { "ImageOpacityDiffers", 209 },
>+    { "ImageSequenceIsRequired", 210 },
>+    { "ImageSizeDiffers", 211 },
>+    { "InvalidColormapIndex", 212 },
>+    { "LeftAndRightImageSizesDiffer", 213 },
>+    { "NoImagesWereFound", 214 },
>+    { "NoImagesWereLoaded", 215 },
>+    { "NoLocaleImageAttribute", 216 },
>+    { "TooManyClusters", 217 },
>+    { "UnableToAppendImage", 218 },
>+    { "UnableToAssignProfile", 219 },
>+    { "UnableToAverageImage", 220 },
>+    { "UnableToCoalesceImage", 221 },
>+    { "UnableToCompareImages", 222 },
>+    { "UnableToCreateImageMosaic", 223 },
>+    { "UnableToCreateStereoImage", 224 },
>+    { "UnableToDeconstructImageSequence", 225 },
>+    { "UnableToFlattenImage", 226 },
>+    { "UnableToGetClipMask", 227 },
>+    { "UnableToHandleImageChannel", 228 },
>+    { "UnableToResizeImage", 229 },
>+    { "UnableToSegmentImage", 230 },
>+    { "UnableToSetClipMask", 231 },
>+    { "UnableToShearImage", 232 },
>+    { "WidthOrHeightExceedsLimit", 233 },
>+    { "UnableToPersistKey", 234 },
>+    { "Default", 235 },
>+    { "DPSLibraryIsNotAvailable", 236 },
>+    { "FPXLibraryIsNotAvailable", 237 },
>+    { "FreeTypeLibraryIsNotAvailable", 238 },
>+    { "JPEGLibraryIsNotAvailable", 239 },
>+    { "LCMSLibraryIsNotAvailable", 240 },
>+    { "LZWEncodingNotEnabled", 241 },
>+    { "NoDecodeDelegateForThisImageFormat", 242 },
>+    { "NoEncodeDelegateForThisImageFormat", 243 },
>+    { "TIFFLibraryIsNotAvailable", 244 },
>+    { "XMLLibraryIsNotAvailable", 245 },
>+    { "XWindowLibraryIsNotAvailable", 246 },
>+    { "ZipLibraryIsNotAvailable", 247 },
>+    { "Default", 248 },
>+    { "Default", 249 },
>+    { "FailedToCloseModule", 250 },
>+    { "FailedToFindSymbol", 251 },
>+    { "UnableToLoadModule", 252 },
>+    { "UnableToRegisterImageFormat", 253 },
>+    { "UnrecognizedModule", 254 },
>+    { "UnableToInitializeModuleLoader", 255 },
>+    { "Default", 256 },
>+    { "Default", 257 },
>+    { "Default", 258 },
>+    { "UserRequestedTerminationBySignal", 259 },
>+    { "Default", 260 },
>+    { "BevelWidthIsNegative", 261 },
>+    { "ColorSeparatedImageRequired", 262 },
>+    { "FrameIsLessThanImageSize", 263 },
>+    { "GeometryDimensionsAreZero", 264 },
>+    { "GeometryDoesNotContainImage", 265 },
>+    { "HaldClutImageDimensionsInvalid", 266 },
>+    { "ImagesAreNotTheSameSize", 267 },
>+    { "ImageSizeMustExceedBevelWidth", 268 },
>+    { "ImageSmallerThanKernelWidth", 269 },
>+    { "ImageSmallerThanRadius", 270 },
>+    { "ImageWidthsOrHeightsDiffer", 271 },
>+    { "InputImagesAlreadySpecified", 272 },
>+    { "InvalidSubimageSpecification", 273 },
>+    { "KernelRadiusIsTooSmall", 274 },
>+    { "KernelWidthMustBeAnOddNumber", 275 },
>+    { "MatrixIsNotSquare", 276 },
>+    { "MatrixOrderOutOfRange", 277 },
>+    { "MissingAnImageFilename", 278 },
>+    { "MissingArgument", 279 },
>+    { "MustSpecifyAnImageName", 280 },
>+    { "MustSpecifyImageSize", 281 },
>+    { "NoBlobDefined", 282 },
>+    { "NoImagesDefined", 283 },
>+    { "NonzeroWidthAndHeightRequired", 284 },
>+    { "NoProfileNameWasGiven", 285 },
>+    { "NullBlobArgument", 286 },
>+    { "ReferenceImageRequired", 287 },
>+    { "ReferenceIsNotMyType", 288 },
>+    { "RegionAreaExceedsLimit", 289 },
>+    { "RequestDidNotReturnAnImage", 290 },
>+    { "SteganoImageRequired", 291 },
>+    { "StereoImageRequired", 292 },
>+    { "SubimageSpecificationReturnsNoImages", 293 },
>+    { "UnableToAddOrRemoveProfile", 294 },
>+    { "UnableToAverageImageSequence", 295 },
>+    { "UnableToBlurImage", 296 },
>+    { "UnableToChopImage", 297 },
>+    { "UnableToColorMatrixImage", 298 },
>+    { "UnableToConstituteImage", 299 },
>+    { "UnableToConvolveImage", 300 },
>+    { "UnableToEdgeImage", 301 },
>+    { "UnableToEqualizeImage", 302 },
>+    { "UnableToFilterImage", 303 },
>+    { "UnableToFormatImageMetadata", 304 },
>+    { "UnableToFrameImage", 305 },
>+    { "UnableToOilPaintImage", 306 },
>+    { "UnableToPaintImage", 307 },
>+    { "UnableToRaiseImage", 308 },
>+    { "UnableToSharpenImage", 309 },
>+    { "UnableToThresholdImage", 310 },
>+    { "UnableToWaveImage", 311 },
>+    { "UnrecognizedAttribute", 312 },
>+    { "UnrecognizedChannelType", 313 },
>+    { "UnrecognizedColor", 314 },
>+    { "UnrecognizedColormapType", 315 },
>+    { "UnrecognizedColorspace", 316 },
>+    { "UnrecognizedCommand", 317 },
>+    { "UnrecognizedComposeOperator", 318 },
>+    { "UnrecognizedDisposeMethod", 319 },
>+    { "UnrecognizedElement", 320 },
>+    { "UnrecognizedEndianType", 321 },
>+    { "UnrecognizedGravityType", 322 },
>+    { "UnrecognizedHighlightStyle", 323 },
>+    { "UnrecognizedImageCompression", 324 },
>+    { "UnrecognizedImageFilter", 325 },
>+    { "UnrecognizedImageFormat", 326 },
>+    { "UnrecognizedImageMode", 327 },
>+    { "UnrecognizedImageType", 328 },
>+    { "UnrecognizedIntentType", 329 },
>+    { "UnrecognizedInterlaceType", 330 },
>+    { "UnrecognizedListType", 331 },
>+    { "UnrecognizedMetric", 332 },
>+    { "UnrecognizedModeType", 333 },
>+    { "UnrecognizedNoiseType", 334 },
>+    { "UnrecognizedOperator", 335 },
>+    { "UnrecognizedOption", 336 },
>+    { "UnrecognizedPerlMagickMethod", 337 },
>+    { "UnrecognizedPixelMap", 338 },
>+    { "UnrecognizedPreviewType", 339 },
>+    { "UnrecognizedResourceType", 340 },
>+    { "UnrecognizedType", 341 },
>+    { "UnrecognizedUnitsType", 342 },
>+    { "UnrecognizedVirtualPixelMethod", 343 },
>+    { "UnsupportedSamplingFactor", 344 },
>+    { "UsageError", 345 },
>+    { "InvalidColorspaceType", 346 },
>+    { "InvalidEndianType", 347 },
>+    { "InvalidImageType", 348 },
>+    { "InvalidInterlaceType", 349 },
>+    { "MissingAnImageFilename", 350 },
>+    { "MissingArgument", 351 },
>+    { "NoImagesWereLoaded", 352 },
>+    { "OptionLengthExceedsLimit", 353 },
>+    { "RequestDidNotReturnAnImage", 354 },
>+    { "UnableToOpenXServer", 355 },
>+    { "UnableToPersistKey", 356 },
>+    { "UnrecognizedColormapType", 357 },
>+    { "UnrecognizedColorspaceType", 358 },
>+    { "UnrecognizedDisposeMethod", 359 },
>+    { "UnrecognizedEndianType", 360 },
>+    { "UnrecognizedFilterType", 361 },
>+    { "UnrecognizedImageCompressionType", 362 },
>+    { "UnrecognizedImageType", 363 },
>+    { "UnrecognizedInterlaceType", 364 },
>+    { "UnrecognizedOption", 365 },
>+    { "UnrecognizedResourceType", 366 },
>+    { "UnrecognizedVirtualPixelMethod", 367 },
>+    { "UnrecognizedColor", 368 },
>+    { "ImageExpected", 369 },
>+    { "ImageInfoExpected", 370 },
>+    { "StructureSizeMismatch", 371 },
>+    { "UnableToGetRegistryID", 372 },
>+    { "UnableToLocateImage", 373 },
>+    { "UnableToSetRegistry", 374 },
>+    { "Default", 375 },
>+    { "Default", 376 },
>+    { "CacheResourcesExhausted", 377 },
>+    { "ImagePixelHeightLimitExceeded", 378 },
>+    { "ImagePixelLimitExceeded", 379 },
>+    { "ImagePixelWidthLimitExceeded", 380 },
>+    { "MemoryAllocationFailed", 381 },
>+    { "NoPixelsDefinedInCache", 382 },
>+    { "PixelCacheAllocationFailed", 383 },
>+    { "UnableToAddColorProfile", 384 },
>+    { "UnableToAddGenericProfile", 385 },
>+    { "UnableToAddIPTCProfile", 386 },
>+    { "UnableToAllocateCoefficients", 387 },
>+    { "UnableToAllocateColormap", 388 },
>+    { "UnableToAllocateICCProfile", 389 },
>+    { "UnableToAllocateString", 390 },
>+    { "UnableToAnnotateImage", 391 },
>+    { "UnableToAverageImageSequence", 392 },
>+    { "UnableToCloneDrawingWand", 393 },
>+    { "UnableToCloneImage", 394 },
>+    { "UnableToComputeImageSignature", 395 },
>+    { "UnableToConstituteImage", 396 },
>+    { "UnableToConvertFont", 397 },
>+    { "UnableToConvertStringToTokens", 398 },
>+    { "UnableToCreateColormap", 399 },
>+    { "UnableToCreateColorTransform", 400 },
>+    { "UnableToCreateCommandWidget", 401 },
>+    { "UnableToCreateImageGroup", 402 },
>+    { "UnableToCreateImageMontage", 403 },
>+    { "UnableToCreateXWindow", 404 },
>+    { "UnableToCropImage", 405 },
>+    { "UnableToDespeckleImage", 406 },
>+    { "UnableToDetermineImageClass", 407 },
>+    { "UnableToDetermineTheNumberOfImageColors", 408 },
>+    { "UnableToDitherImage", 409 },
>+    { "UnableToDrawOnImage", 410 },
>+    { "UnableToEdgeImage", 411 },
>+    { "UnableToEmbossImage", 412 },
>+    { "UnableToEnhanceImage", 413 },
>+    { "UnableToFloodfillImage", 414 },
>+    { "UnableToGammaCorrectImage", 415 },
>+    { "UnableToGetBestIconSize", 416 },
>+    { "UnableToGetFromRegistry", 417 },
>+    { "UnableToGetPackageInfo", 418 },
>+    { "UnableToLevelImage", 419 },
>+    { "UnableToMagnifyImage", 420 },
>+    { "UnableToManageColor", 421 },
>+    { "UnableToMapImage", 422 },
>+    { "UnableToMapImageSequence", 423 },
>+    { "UnableToMedianFilterImage", 424 },
>+    { "UnableToMotionBlurImage", 425 },
>+    { "UnableToNoiseFilterImage", 426 },
>+    { "UnableToNormalizeImage", 427 },
>+    { "UnableToOpenColorProfile", 428 },
>+    { "UnableToQuantizeImage", 429 },
>+    { "UnableToQuantizeImageSequence", 430 },
>+    { "UnableToReadTextChunk", 431 },
>+    { "UnableToReadXImage", 432 },
>+    { "UnableToReadXServerColormap", 433 },
>+    { "UnableToResizeImage", 434 },
>+    { "UnableToRotateImage", 435 },
>+    { "UnableToSampleImage", 436 },
>+    { "UnableToScaleImage", 437 },
>+    { "UnableToSelectImage", 438 },
>+    { "UnableToSharpenImage", 439 },
>+    { "UnableToShaveImage", 440 },
>+    { "UnableToShearImage", 441 },
>+    { "UnableToSortImageColormap", 442 },
>+    { "UnableToThresholdImage", 443 },
>+    { "UnableToTransformColorspace", 444 },
>+    { "MemoryAllocationFailed", 445 },
>+    { "SemaporeOperationFailed", 446 },
>+    { "UnableToAllocateAscii85Info", 447 },
>+    { "UnableToAllocateCacheInfo", 448 },
>+    { "UnableToAllocateCacheView", 449 },
>+    { "UnableToAllocateColorInfo", 450 },
>+    { "UnableToAllocateDashPattern", 451 },
>+    { "UnableToAllocateDelegateInfo", 452 },
>+    { "UnableToAllocateDerivatives", 453 },
>+    { "UnableToAllocateDrawContext", 454 },
>+    { "UnableToAllocateDrawInfo", 455 },
>+    { "UnableToAllocateDrawingWand", 456 },
>+    { "UnableToAllocateGammaMap", 457 },
>+    { "UnableToAllocateImage", 458 },
>+    { "UnableToAllocateImagePixels", 459 },
>+    { "UnableToAllocateLogInfo", 460 },
>+    { "UnableToAllocateMagicInfo", 461 },
>+    { "UnableToAllocateMagickInfo", 462 },
>+    { "UnableToAllocateModuleInfo", 463 },
>+    { "UnableToAllocateMontageInfo", 464 },
>+    { "UnableToAllocateQuantizeInfo", 465 },
>+    { "UnableToAllocateRandomKernel", 466 },
>+    { "UnableToAllocateRegistryInfo", 467 },
>+    { "UnableToAllocateSemaphoreInfo", 468 },
>+    { "UnableToAllocateString", 469 },
>+    { "UnableToAllocateTypeInfo", 470 },
>+    { "UnableToAllocateWand", 471 },
>+    { "UnableToAnimateImageSequence", 472 },
>+    { "UnableToCloneBlobInfo", 473 },
>+    { "UnableToCloneCacheInfo", 474 },
>+    { "UnableToCloneImage", 475 },
>+    { "UnableToCloneImageInfo", 476 },
>+    { "UnableToConcatenateString", 477 },
>+    { "UnableToConvertText", 478 },
>+    { "UnableToCreateColormap", 479 },
>+    { "UnableToDestroySemaphore", 480 },
>+    { "UnableToDisplayImage", 481 },
>+    { "UnableToEscapeString", 482 },
>+    { "UnableToInitializeSemaphore", 483 },
>+    { "UnableToInterpretMSLImage", 484 },
>+    { "UnableToLockSemaphore", 485 },
>+    { "UnableToObtainRandomEntropy", 486 },
>+    { "UnableToUnlockSemaphore", 487 },
>+    { "MemoryAllocationFailed", 488 },
>+    { "ImageDoesNotContainTheStreamGeometry", 489 },
>+    { "NoStreamHandlerIsDefined", 490 },
>+    { "PixelCacheIsNotOpen", 491 },
>+    { "UnableToAcquirePixelStream", 492 },
>+    { "UnableToSetPixelStream", 493 },
>+    { "UnableToSyncPixelStream", 494 },
>+    { "Default", 495 },
>+    { "Default", 496 },
>+    { "FontSubstitutionRequired", 497 },
>+    { "UnableToGetTypeMetrics", 498 },
>+    { "UnableToInitializeFreetypeLibrary", 499 },
>+    { "UnableToReadFont", 500 },
>+    { "UnrecognizedFontEncoding", 501 },
>+    { "Default", 502 },
>+    { "Default", 503 },
>+    { "InvalidColormapIndex", 504 },
>+    { "WandAPINotImplemented", 505 },
>+    { "WandContainsNoImageIndexs", 506 },
>+    { "WandContainsNoImages", 507 },
>+    { "ColorIsNotKnownToServer", 508 },
>+    { "NoWindowWithSpecifiedIDExists", 509 },
>+    { "StandardColormapIsNotInitialized", 510 },
>+    { "UnableToConnectToRemoteDisplay", 511 },
>+    { "UnableToCreateBitmap", 512 },
>+    { "UnableToCreateColormap", 513 },
>+    { "UnableToCreatePixmap", 514 },
>+    { "UnableToCreateProperty", 515 },
>+    { "UnableToCreateStandardColormap", 516 },
>+    { "UnableToDisplayImageInfo", 517 },
>+    { "UnableToGetProperty", 518 },
>+    { "UnableToGetStandardColormap", 519 },
>+    { "UnableToGetVisual", 520 },
>+    { "UnableToGrabMouse", 521 },
>+    { "UnableToLoadFont", 522 },
>+    { "UnableToMatchVisualToStandardColormap", 523 },
>+    { "UnableToOpenXServer", 524 },
>+    { "UnableToReadXAttributes", 525 },
>+    { "UnableToReadXWindowImage", 526 },
>+    { "UnrecognizedColormapType", 527 },
>+    { "UnrecognizedGravityType", 528 },
>+    { "UnrecognizedVisualSpecifier", 529 },
>+    { "UnableToAllocateXHints", 530 },
>+    { "UnableToCreateCursor", 531 },
>+    { "UnableToCreateGraphicContext", 532 },
>+    { "UnableToCreateStandardColormap", 533 },
>+    { "UnableToCreateTextProperty", 534 },
>+    { "UnableToCreateXImage", 535 },
>+    { "UnableToCreateXPixmap", 536 },
>+    { "UnableToCreateXWindow", 537 },
>+    { "UnableToDisplayImage", 538 },
>+    { "UnableToDitherImage", 539 },
>+    { "UnableToGetPixelInfo", 540 },
>+    { "UnableToGetVisual", 541 },
>+    { "UnableToLoadFont", 542 },
>+    { "UnableToMakeXWindow", 543 },
>+    { "UnableToOpenXServer", 544 },
>+    { "UnableToViewFonts", 545 },
>+    { "UnableToGetVisual", 546 },
>+    { "UsingDefaultVisual", 547 },
>     { 0, 0 }
>   };
> #endif
>@@ -1398,10 +1404,13 @@
>     "default error",
>     "default warning",
>     "Already pushing pattern definition",
>+    "text value does not convert to float",
>+    "text value does not convert to integer",
>     "Non-conforming drawing primitive definition",
>     "too many coordinates",
>     "Unable to print",
>     "unbalanced graphic context push-pop",
>+    "vector path truncated",
>     "default error",
>     "Not a relative URL",
>     "Not currently pushing pattern definition",
>diff -r 9ba30629488e -r e797bb0aec31 magick/render.c
>--- a/magick/render.c	Sat Apr 30 18:31:06 2016 -0500
>+++ b/magick/render.c	Sat Apr 30 18:32:03 2016 -0500
>@@ -128,7 +128,7 @@
>   DrawStrokePolygon(Image *,const DrawInfo *,const PrimitiveInfo *);
> 
> static unsigned long
>-  TracePath(PrimitiveInfo *,const char *);
>+  TracePath(Image *image, PrimitiveInfo *,const char *);
> 
> static void
> #if 0
>@@ -148,6 +148,41 @@
>     PointInfo),
>   TraceSquareLinecap(PrimitiveInfo *,const unsigned long,const double);
> 
>+static inline MagickPassFail MagickAtoFChk(const char *str, double *value)
>+{
>+  char *estr=0;
>+  *value=strtod(str,&estr);
>+  return (str == estr ? MagickFail : MagickPass);
>+}
>+#if 0
>+static inline MagickPassFail MagickAtoIChk(const char *str, int *value)
>+{
>+  char *estr=0;
>+  *value=(int) strtol(str,&estr, 10);
>+  return (str == estr ? MagickFail : MagickPass);
>+}
>+#endif
>+static inline MagickPassFail MagickAtoUIChk(const char *str, unsigned int *value)
>+{
>+  char *estr=0;
>+  *value=(unsigned int) strtol(str,&estr, 10);
>+  return (str == estr ? MagickFail : MagickPass);
>+}
>+#if 0
>+static inline MagickPassFail MagickAtoLChk(const char *str, long *value)
>+{
>+  char *estr=0;
>+  *value=strtol(str,&estr, 10);
>+  return (str == estr ? MagickFail : MagickPass);
>+}
>+#endif
>+static inline MagickPassFail MagickAtoULChk(const char *str, unsigned long *value)
>+{
>+  char *estr=0;
>+  *value=(unsigned long) strtol(str,&estr, 10);
>+  return (str == estr ? MagickFail : MagickPass);
>+}
>+
> /*
> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
> %                                                                             %
>@@ -1705,7 +1740,8 @@
>     bounds;
> 
>   size_t
>-    length;
>+    length,
>+    token_max_length;
> 
>   MagickPassFail
>     status;
>@@ -1761,6 +1797,7 @@
>     }
>   graphic_context[n]=CloneDrawInfo((ImageInfo *) NULL,draw_info);
>   token=AllocateString(primitive);
>+  token_max_length=strlen(token);
>   (void) QueryColorDatabase("black",&start_color,&image->exception);
>   (void) SetImageType(image,TrueColorType);
>   status=MagickPass;
>@@ -1774,7 +1809,8 @@
>     /*
>       Interpret graphic primitive.
>     */
>-    GetToken(q,&q,keyword);
>+    if (MagickGetToken(q,&q,keyword,MaxTextExtent) < 1)
>+      break;
>     if (*keyword == '\0')
>       break;
>     if (*keyword == '#')
>@@ -1799,28 +1835,54 @@
>       {
>         if (LocaleCompare("affine",keyword) == 0)
>           {
>-            GetToken(q,&q,token);
>-            affine.sx=MagickAtoF(token);
>-            GetToken(q,&q,token);
>-            if (*token == ',')
>-              GetToken(q,&q,token);
>-            affine.rx=MagickAtoF(token);
>-            GetToken(q,&q,token);
>-            if (*token == ',')
>-              GetToken(q,&q,token);
>-            affine.ry=MagickAtoF(token);
>-            GetToken(q,&q,token);
>-            if (*token == ',')
>-              GetToken(q,&q,token);
>-            affine.sy=MagickAtoF(token);
>-            GetToken(q,&q,token);
>-            if (*token == ',')
>-              GetToken(q,&q,token);
>-            affine.tx=MagickAtoF(token);
>-            GetToken(q,&q,token);
>-            if (*token == ',')
>-              GetToken(q,&q,token);
>-            affine.ty=MagickAtoF(token);
>+            MagickBool affine_args_good = MagickFalse;
>+            do
>+              {
>+                if (MagickGetToken(q,&q,token,token_max_length) < 1)
>+                  break;
>+                if (MagickAtoFChk(token,&affine.sx) != MagickPass)
>+                  break;
>+                if (MagickGetToken(q,&q,token,token_max_length) < 1)
>+                  break;
>+                if (*token == ',')
>+                  if (MagickGetToken(q,&q,token,token_max_length) < 1)
>+                    break;
>+                if (MagickAtoFChk(token,&affine.rx) != MagickPass)
>+                  break;
>+                if (MagickGetToken(q,&q,token,token_max_length) < 1)
>+                  break;
>+                if (*token == ',')
>+                  if (MagickGetToken(q,&q,token,token_max_length) < 1)
>+                    break;
>+                if (MagickAtoFChk(token,&affine.ry) != MagickPass)
>+                  break;
>+                if (MagickGetToken(q,&q,token,token_max_length) < 1)
>+                  break;
>+                if (*token == ',')
>+                  if (MagickGetToken(q,&q,token,token_max_length) < 1)
>+                    break;
>+                if (MagickAtoFChk(token,&affine.sy) != MagickPass)
>+                  break;
>+                if (MagickGetToken(q,&q,token,token_max_length) < 1)
>+                  break;
>+                if (*token == ',')
>+                  if (MagickGetToken(q,&q,token,token_max_length) < 1)
>+                    break;
>+                if (MagickAtoFChk(token,&affine.tx) != MagickPass)
>+                  break;
>+                if (MagickGetToken(q,&q,token,token_max_length) < 1)
>+                  break;
>+                if (*token == ',')
>+                  if (MagickGetToken(q,&q,token,token_max_length) < 1)
>+                    break;
>+                if (MagickAtoFChk(token,&affine.ty) != MagickPass)
>+                  break;
>+                affine_args_good=MagickTrue;
>+              } while (0);
>+            if (affine_args_good != MagickTrue)
>+              {
>+                status=MagickFail;
>+              }
>             break;
>           }
>         if (LocaleCompare("arc",keyword) == 0)
>@@ -1850,7 +1912,11 @@
>             /*
>               Create clip mask.
>             */
>-            GetToken(q,&q,token);
>+            if (MagickGetToken(q,&q,token,token_max_length) < 1)
>+              {
>+                status=MagickFail;
>+                break;
>+              }
>             (void) CloneString(&graphic_context[n]->clip_path,token);
>             (void) DrawClipPath(image,graphic_context[n],
>               graphic_context[n]->clip_path);
>@@ -1948,7 +2014,11 @@
>           }
>         if (LocaleCompare("encoding",keyword) == 0)
>           {
>-            GetToken(q,&q,token);
>+            if (MagickGetToken(q,&q,token,token_max_length) < 1)
>+              {
>+                status=MagickFail;
>+                break;
>+              }
>             (void) CloneString(&graphic_context[n]->encoding,token);
>             break;
>           }
>@@ -2008,7 +2078,10 @@
>           }
>         if (LocaleCompare("font-family",keyword) == 0)
>           {
>-            GetToken(q,&q,token);
>+            MagickGetToken(q,&q,token,token_max_length);
>+            fprintf(stderr,"%s\n",token);
>+            if ((token[0] == '\'') && (token[strlen(token)-1] == '\''))
>+              fprintf(stderr,"==== Hit \n");
>             (void) CloneString(&graphic_context[n]->family,token);
>             break;
>           }
>@@ -2057,20 +2130,29 @@
>           }
>         if (LocaleCompare("font-weight",keyword) == 0)
>           {
>-            GetToken(q,&q,token);
>-            graphic_context[n]->weight=MagickAtoL(token);
>+            if (MagickGetToken(q,&q,token,token_max_length) < 1)
>+              {
>+                status=MagickFail;
>+                break;
>+              }
>             if (LocaleCompare(token,"all") == 0)
>               graphic_context[n]->weight=0;
>-            if (LocaleCompare(token,"bold") == 0)
>+            else if (LocaleCompare(token,"bold") == 0)
>               graphic_context[n]->weight=700;
>-            if (LocaleCompare(token,"bolder") == 0)
>-              if (graphic_context[n]->weight <= 800)
>-                graphic_context[n]->weight+=100;
>-            if (LocaleCompare(token,"lighter") == 0)
>-              if (graphic_context[n]->weight >= 100)
>-                graphic_context[n]->weight-=100;
>-            if (LocaleCompare(token,"normal") == 0)
>+            else if (LocaleCompare(token,"bolder") == 0)
>+              {
>+                if (graphic_context[n]->weight <= 800)
>+                  graphic_context[n]->weight+=100;
>+              }
>+            else if (LocaleCompare(token,"lighter") == 0)
>+              {
>+                if (graphic_context[n]->weight >= 100)
>+                  graphic_context[n]->weight-=100;
>+              }
>+            else if (LocaleCompare(token,"normal") == 0)
>               graphic_context[n]->weight=400;
>+            else if (MagickAtoULChk(token,&graphic_context[n]->weight) != MagickPass)
>+              status=MagickFail;
>             break;
>           }
>         status=MagickFail;
>@@ -3006,7 +3088,7 @@
>       }
>       case PathPrimitive:
>       {
>-        i=(long) (j+TracePath(primitive_info+j,token));
>+        i=(long) (j+TracePath(image,primitive_info+j,token));
>         break;
>       }
>       case ColorPrimitive:
>@@ -4814,8 +4896,50 @@
>   primitive_info->coordinates=2;
> }
> 
>+/*
>+  Special wrapper macros around strtod(), strtol(), and
>+  MagickGetToken() to support TracePath() parsing error detection and
>+  reporting.
>+*/
>+#define MagickTracePathAtoF(str,value)                          \
>+  do {                                                          \
>+    if (MagickAtoFChk(str,value) != MagickPass)                \
>+      {                                                         \
>+        ThrowException(&image->exception,DrawError,FloatValueConversionError,str); \
>+        return 0;                                               \
>+      }                                                         \
>+  } while(0)
>+
>+#define MagickTracePathAtoI(str,value)                       \
>+  do {                                                       \
>+    if (MagickAtoIChk(str,value) != MagickPass)              \
>+      {                                                      \
>+        ThrowException(&image->exception,DrawError,IntegerValueConversionError,str); \
>+        return 0;                                            \
>+      }                                                      \
>+  } while(0)
>+
>+#define MagickTracePathAtoUI(str,value)                       \
>+  do {                                                       \
>+    if (MagickAtoUIChk(str,value) != MagickPass)              \
>+      {                                                      \
>+        ThrowException(&image->exception,DrawError,IntegerValueConversionError,str); \
>+        return 0;                                            \
>+      }                                                      \
>+  } while(0)
>+
>+#define MagickGetTracePathToken(p,ep,token,extent)        \
>+  do {                                                    \
>+    if (MagickGetToken(p,ep,token,extent) < 1)            \
>+      {                                                   \
>+        ThrowException(&image->exception,DrawError,VectorPathTruncated,p); \
>+        return 0;                        \
>+      }                                                   \
>+  } while(0)
>+
>+
> static unsigned long
>-TracePath(PrimitiveInfo *primitive_info,const char *path)
>+TracePath(Image *image,PrimitiveInfo *primitive_info,const char *path)
> {
>   char
>     token[MaxTextExtent];
>@@ -4869,48 +4993,48 @@
>       case 'A':
>       {
>         MagickBool
>-          large_arc,
>-          sweep;
>+          large_arc = MagickFalse,
>+          sweep = MagickFalse;
> 
>         double
>-          angle;
>+          angle = 0.0;
> 
>         PointInfo
>-          arc;
>+          arc = {0,0};
> 
>         /*
>           Compute arc points.
>         */
>         do
>         {
>-          GetToken(p,&p,token);
>+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>           if (*token == ',')
>-            GetToken(p,&p,token);
>-          arc.x=MagickAtoF(token);
>-          GetToken(p,&p,token);
>+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>+          MagickTracePathAtoF(token,&arc.x);
>+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>           if (*token == ',')
>-            GetToken(p,&p,token);
>-          arc.y=MagickAtoF(token);
>-          GetToken(p,&p,token);
>+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>+          MagickTracePathAtoF(token,&arc.y);
>+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>           if (*token == ',')
>-            GetToken(p,&p,token);
>-          angle=MagickAtoF(token);
>-          GetToken(p,&p,token);
>+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>+          MagickTracePathAtoF(token,&angle);
>+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>           if (*token == ',')
>-            GetToken(p,&p,token);
>-          large_arc=MagickAtoI(token);
>-          GetToken(p,&p,token);
>+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>+          MagickTracePathAtoUI(token,&large_arc);
>+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>           if (*token == ',')
>-            GetToken(p,&p,token);
>-          sweep=MagickAtoI(token);
>-          GetToken(p,&p,token);
>+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>+          MagickTracePathAtoUI(token,&sweep);
>+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>           if (*token == ',')
>-            GetToken(p,&p,token);
>-          x=MagickAtoF(token);
>-          GetToken(p,&p,token);
>+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>+          MagickTracePathAtoF(token,&x);
>+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>           if (*token == ',')
>-            GetToken(p,&p,token);
>-          y=MagickAtoF(token);
>+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>+          MagickTracePathAtoF(token,&y);
>           end.x=attribute == 'A' ? x : point.x+x;
>           end.y=attribute == 'A' ? y : point.y+y;
>           TraceArcPath(q,point,end,arc,angle,large_arc,sweep);
>@@ -4934,14 +5058,14 @@
>           points[0]=point;
>           for (i=1; i < 4; i++)
>           {
>-            GetToken(p,&p,token);
>+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>             if (*token == ',')
>-              GetToken(p,&p,token);
>-            x=MagickAtoF(token);
>-            GetToken(p,&p,token);
>+              MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>+            MagickTracePathAtoF(token,&x);
>+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>             if (*token == ',')
>-              GetToken(p,&p,token);
>-            y=MagickAtoF(token);
>+              MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>+            MagickTracePathAtoF(token,&y);
>             end.x=attribute == 'C' ? x : point.x+x;
>             end.y=attribute == 'C' ? y : point.y+y;
>             points[i]=end;
>@@ -4959,10 +5083,10 @@
>       {
>         do
>         {
>-          GetToken(p,&p,token);
>+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>           if (*token == ',')
>-            GetToken(p,&p,token);
>-          x=MagickAtoF(token);
>+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>+          MagickTracePathAtoF(token,&x);
>           point.x=attribute == 'H' ? x: point.x+x;
>           TracePoint(q,point);
>           q+=q->coordinates;
>@@ -4974,14 +5098,14 @@
>       {
>         do
>         {
>-          GetToken(p,&p,token);
>+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>           if (*token == ',')
>-            GetToken(p,&p,token);
>-          x=MagickAtoF(token);
>-          GetToken(p,&p,token);
>+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>+          MagickTracePathAtoF(token,&x);
>+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>           if (*token == ',')
>-            GetToken(p,&p,token);
>-          y=MagickAtoF(token);
>+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>+          MagickTracePathAtoF(token,&y);
>           point.x=attribute == 'L' ? x : point.x+x;
>           point.y=attribute == 'L' ? y : point.y+y;
>           TracePoint(q,point);
>@@ -5001,14 +5125,14 @@
>         i=0;
>         do
>         {
>-          GetToken(p,&p,token);
>+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>           if (*token == ',')
>-            GetToken(p,&p,token);
>-          x=MagickAtoF(token);
>-          GetToken(p,&p,token);
>+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>+          MagickTracePathAtoF(token,&x);
>+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>           if (*token == ',')
>-            GetToken(p,&p,token);
>-          y=MagickAtoF(token);
>+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>+          MagickTracePathAtoF(token,&y);
>           point.x=attribute == 'M' ? x : point.x+x;
>           point.y=attribute == 'M' ? y : point.y+y;
>           if (i == 0)
>@@ -5035,14 +5159,14 @@
>           points[0]=point;
>           for (i=1; i < 3; i++)
>           {
>-            GetToken(p,&p,token);
>+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>             if (*token == ',')
>-              GetToken(p,&p,token);
>-            x=MagickAtoF(token);
>-            GetToken(p,&p,token);
>+              MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>+            MagickTracePathAtoF(token,&x);
>+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>             if (*token == ',')
>-              GetToken(p,&p,token);
>-            y=MagickAtoF(token);
>+              MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>+            MagickTracePathAtoF(token,&y);
>             if (*p == ',')
>               p++;
>             end.x=attribute == 'Q' ? x : point.x+x;
>@@ -5070,14 +5194,14 @@
>           points[1].y=2.0*points[3].y-points[2].y;
>           for (i=2; i < 4; i++)
>           {
>-            GetToken(p,&p,token);
>+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>             if (*token == ',')
>-              GetToken(p,&p,token);
>-            x=MagickAtoF(token);
>-            GetToken(p,&p,token);
>+              MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>+            MagickTracePathAtoF(token,&x);
>+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>             if (*token == ',')
>-              GetToken(p,&p,token);
>-            y=MagickAtoF(token);
>+              MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>+            MagickTracePathAtoF(token,&y);
>             if (*p == ',')
>               p++;
>             end.x=attribute == 'S' ? x : point.x+x;
>@@ -5110,14 +5234,14 @@
>           points[1].y=2.0*points[2].y-points[1].y;
>           for (i=2; i < 3; i++)
>           {
>-            GetToken(p,&p,token);
>+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>             if (*token == ',')
>-              GetToken(p,&p,token);
>-            x=MagickAtoF(token);
>-            GetToken(p,&p,token);
>+              MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>+            MagickTracePathAtoF(token,&x);
>+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>             if (*token == ',')
>-              GetToken(p,&p,token);
>-            y=MagickAtoF(token);
>+              MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>+            MagickTracePathAtoF(token,&y);
>             end.x=attribute == 'T' ? x : point.x+x;
>             end.y=attribute == 'T' ? y : point.y+y;
>             points[i]=end;
>@@ -5140,10 +5264,10 @@
>       {
>         do
>         {
>-          GetToken(p,&p,token);
>+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>           if (*token == ',')
>-            GetToken(p,&p,token);
>-          y=MagickAtoF(token);
>+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
>+          MagickTracePathAtoF(token,&y);
>           point.y=attribute == 'V' ? y : point.y+y;
>           TracePoint(q,point);
>           q+=q->coordinates;
>@@ -5170,6 +5294,7 @@
>       }
>     }
>   }
>+
>   primitive_info->coordinates=q-primitive_info;
>   number_coordinates+=primitive_info->coordinates;
>   for (i=0; i < (long) number_coordinates; i++)
>diff -r 9ba30629488e -r e797bb0aec31 magick/utility.c
>--- a/magick/utility.c	Sat Apr 30 18:31:06 2016 -0500
>+++ b/magick/utility.c	Sat Apr 30 18:32:03 2016 -0500
>@@ -2525,98 +2525,7 @@
> */
> MagickExport void GetToken(const char *start,char **end,char *token)
> {
>-  register char
>-    *p;
>-
>-  register long
>-    i;
>-
>-  double
>-    double_val;
>-
>-  assert(start != (const char *) NULL);
>-  assert(token != (char *) NULL);
>-
>-  i=0;
>-  p=(char *) start;
>-
>-  if (*p != '\0')
>-  {
>-    while (isspace((int)(unsigned char) (*p)) && (*p != '\0'))
>-      p++;
>-    switch (*p)
>-    {
>-      case '"':
>-      case '\'':
>-      case '{':
>-      {
>-        register char
>-          escape;
>-
>-        escape=(*p);
>-        if (escape == '{')
>-          escape='}';
>-        for (p++; *p != '\0'; p++)
>-        {
>-          if ((*p == '\\') && ((*(p+1) == escape) || (*(p+1) == '\\')))
>-            p++;
>-          else
>-            if (*p == escape)
>-              {
>-                p++;
>-                break;
>-              }
>-          token[i++]=(*p);
>-        }
>-        break;
>-      }
>-      default:
>-      {
>-        char
>-          *q;
>-
>-        double_val=strtod(p,&q);
>-        (void) double_val;
>-        if (p != q)
>-          {
>-            for ( ; p < q; p++)
>-              token[i++]=(*p);
>-            if (*p == '%')
>-              token[i++]=(*p++);
>-            break;
>-          }
>-        if ((*p != '\0') && !isalpha((int) *p) && (*p != *DirectorySeparator) &&
>-	    (*p != '#') && (*p != '<'))
>-          {
>-            token[i++]=(*p++);
>-            break;
>-          }
>-        for ( ; *p != '\0'; p++)
>-        {
>-          if ((isspace((int)(unsigned char) *p) || (*p == '=')) && (*(p-1) != '\\'))
>-            break;
>-          token[i++]=(*p);
>-          if (*p == '(')
>-            for (p++; *p != '\0'; p++)
>-            {
>-              token[i++]=(*p);
>-              if ((*p == ')') && (*(p-1) != '\\'))
>-                break;
>-            }
>-        }
>-        break;
>-      }
>-    }
>-  }
>-  token[i]='\0';
>-  if (LocaleNCompare(token,"url(#",5) == 0)
>-    {
>-      i=(long) strlen(token);
>-      (void) strlcpy(token,token+5,MaxTextExtent);
>-      token[i-6]='\0';
>-    }
>-  if (end != (char **) NULL)
>-    *end=p;
>+  (void) MagickGetToken(start,end,token, MaxTextExtent);
> }
> 
> /*
>@@ -3673,6 +3582,166 @@
> %                                                                             %
> %                                                                             %
> %                                                                             %
>++   M a g i c k G e t T o k e n                                               %
>+%                                                                             %
>+%                                                                             %
>+%                                                                             %
>+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>+%
>+%  Method MagickGetToken gets a token from the token stream.  A token is defined
>+%  as sequence of characters delimited by whitespace (e.g. clip-path), a
>+%  sequence delimited with quotes (.e.g "Quote me"), or a sequence enclosed
>+%  in parenthesis (e.g. rgb(0,0,0)).
>+%
>+%  The format of the MagickGetToken method is:
>+%
>+%      void MagickGetToken(const char *start,char **end,char *token,
>+%                          const size_t buffer_length)
>+%
>+%  A description of each parameter follows:
>+%
>+%    o start: the start of the token sequence.
>+%
>+%    o end: point to the end of the token sequence (may be NULL).
>+%
>+%    o token: copy the token to this buffer.
>+%
>+%    o buffer_length: size of the token buffer.  If the token exceeds
>+%             the buffer size, the token will be truncated, but the
>+%             parser will still update the end pointer as if the
>+%             truncation did not occur.
>+%
>+%    o returns: Size of the consumed token, not including a terminating
>+%             null character.  If this is larger or equal to the buffer
>+%             size then truncation has occured.
>+%
>+*/
>+MagickExport size_t MagickGetToken(const char *start,char **end,char *token,
>+                                   const size_t buffer_length)
>+{
>+  register char
>+    *p;
>+
>+  register size_t
>+    i;
>+
>+  register size_t
>+    length = buffer_length - 1;
>+
>+  double
>+    double_val;
>+
>+  assert(start != (const char *) NULL);
>+  assert(token != (char *) NULL);
>+
>+  i=0;
>+  p=(char *) start;
>+
>+  if (*p != '\0')
>+  {
>+    while (isspace((int)(unsigned char) (*p)) && (*p != '\0'))
>+      p++;
>+    switch (*p)
>+    {
>+      case '"':
>+      case '\'':
>+      case '{':
>+      {
>+        register char
>+          escape;
>+
>+        escape=(*p);
>+        if (escape == '{')
>+          escape='}';
>+        for (p++; *p != '\0'; p++)
>+        {
>+          if ((*p == '\\') && ((*(p+1) == escape) || (*(p+1) == '\\')))
>+            p++;
>+          else
>+            if (*p == escape)
>+              {
>+                p++;
>+                break;
>+              }
>+          if (i < length)
>+            token[i++]=(*p);
>+        }
>+        break;
>+      }
>+      default:
>+      {
>+        char
>+          *q;
>+
>+        double_val=strtod(p,&q);
>+        (void) double_val;
>+        if (p != q)
>+          {
>+            for ( ; p < q; p++)
>+              if (i < length)
>+                token[i++]=(*p);
>+            if (*p == '%')
>+              if (i < length)
>+                {
>+                  token[i++]=(*p);
>+                  p++;
>+                }
>+            break;
>+          }
>+        if ((*p != '\0') && !isalpha((int) *p) && (*p != *DirectorySeparator) &&
>+	    (*p != '#') && (*p != '<'))
>+          {
>+            if (i < length)
>+              {
>+                token[i++]=(*p);
>+                p++;
>+              }
>+            break;
>+          }
>+        for ( ; *p != '\0'; p++)
>+        {
>+          if ((isspace((int)(unsigned char) *p) || (*p == '=')) && (*(p-1) != '\\'))
>+            break;
>+          if (i < length)
>+            token[i++]=(*p);
>+          if (*p == '(')
>+            for (p++; *p != '\0'; p++)
>+            {
>+              if (i < length)
>+                token[i++]=(*p);
>+              if ((*p == ')') && (*(p-1) != '\\'))
>+                break;
>+            }
>+        }
>+        break;
>+      }
>+    }
>+  }
>+  token[i]='\0';
>+  {
>+    char
>+      *r;
>+
>+    /*
>+      Parse token in form "url(#%s)"
>+    */
>+    if ((LocaleNCompare(token,"url(#",5) == 0) &&
>+        ((r = strrchr(token,')')) != NULL))
>+    {
>+      *r='\0';
>+      (void) memmove(token,token+5,r-token+1);
>+    }
>+  }
>+  if (end != (char **) NULL)
>+    *end=p;
>+  return (p-start+1);
>+}
>+
>+/*
>+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>+%                                                                             %
>+%                                                                             %
>+%                                                                             %
> %   M a g i c k R a n d R e e n t r a n t                                     %
> %                                                                             %
> %                                                                             %
>diff -r 9ba30629488e -r e797bb0aec31 magick/utility.h
>--- a/magick/utility.h	Sat Apr 30 18:31:06 2016 -0500
>+++ b/magick/utility.h	Sat Apr 30 18:32:03 2016 -0500
>@@ -139,7 +139,7 @@
>   ExpandFilename(char *),
>   FormatSize(const magick_int64_t size,char *format),
>   GetPathComponent(const char *,PathType,char *),
>-  GetToken(const char *,char **,char *),
>+  GetToken(const char *,char **,char *) MAGICK_FUNC_DEPRECATED,
>   LocaleLower(char *),
>   LocaleUpper(char *),
>   Strip(char *),
>@@ -155,6 +155,8 @@
>   MagickSizeStrToInt64(const char *str,const unsigned int kilo);
> 
> extern MagickExport size_t
>+  MagickGetToken(const char *start,char **end,char *token,
>+                 const size_t buffer_length),
>   MagickStrlCat(char *dst, const char *src, const size_t size) MAGICK_FUNC_NONNULL,
>   MagickStrlCpy(char *dst, const char *src, const size_t size) MAGICK_FUNC_NONNULL,
>   MagickStrlCpyTrunc(char *dst, const char *src, const size_t size) MAGICK_FUNC_NONNULL;

# HG changeset patch
# User Bob Friesenhahn <bfriesen@GraphicsMagick.org>
# Date 1462059123 18000
#      Sat Apr 30 18:32:03 2016 -0500
# Node ID e797bb0aec31941c454e6f764f9589d3b1843547
# Parent  9ba30629488e95a5b796db9af13aab979e09c139
DrawImage(): Make SVG path and other primitive parsing more robust.
Fixes SEGV when reading files provided by CVE-2016-2318 test cases.
Fixes CVE-2016-2318 completely.

diff -r 9ba30629488e -r e797bb0aec31 locale/C.mgk
--- a/locale/C.mgk	Sat Apr 30 18:31:06 2016 -0500
+++ b/locale/C.mgk	Sat Apr 30 18:32:03 2016 -0500
@@ -622,6 +622,15 @@
       <Message name="TooManyCoordinates">
         too many coordinates
       </Message>
+      <Message name="FloatValueConversionError">
+        text value does not convert to float
+      </Message>
+      <Message name="IntegerValueConversionError">
+        text value does not convert to integer
+      </Message>
+      <Message name="VectorPathTruncated">
+        vector path truncated
+      </Message>
     </Error>
     <FatalError>
       <Message name="Default">
diff -r 9ba30629488e -r e797bb0aec31 magick/locale_c.h
--- a/magick/locale_c.h	Sat Apr 30 18:31:06 2016 -0500
+++ b/magick/locale_c.h	Sat Apr 30 18:32:03 2016 -0500
@@ -3,7 +3,7 @@
 
 extern MagickExport const char *GetLocaleMessageFromID(const int);
 
-#define MAX_LOCALE_MSGS 538
+#define MAX_LOCALE_MSGS 547
 
 #define MGK_BlobErrorUnableToCreateBlob 1
 #define MGK_BlobErrorUnableToOpenFile 2
@@ -191,361 +191,367 @@
 #define MGK_DelegateFatalErrorDefault 181
 #define MGK_DelegateWarningDefault 182
 #define MGK_DrawErrorAlreadyPushingPatternDefinition 183
-#define MGK_DrawErrorNonconformingDrawingPrimitiveDefinition 184
-#define MGK_DrawErrorTooManyCoordinates 185
-#define MGK_DrawErrorUnableToPrint 186
-#define MGK_DrawErrorUnbalancedGraphicContextPushPop 187
-#define MGK_DrawFatalErrorDefault 188
-#define MGK_DrawWarningNotARelativeURL 189
-#define MGK_DrawWarningNotCurrentlyPushingPatternDefinition 190
-#define MGK_DrawWarningURLNotFound 191
-#define MGK_FileOpenErrorUnableToCreateTemporaryFile 192
-#define MGK_FileOpenErrorUnableToOpenFile 193
-#define MGK_FileOpenErrorUnableToWriteFile 194
-#define MGK_FileOpenFatalErrorDefault 195
-#define MGK_FileOpenWarningDefault 196
-#define MGK_ImageErrorAngleIsDiscontinuous 197
-#define MGK_ImageErrorColorspaceColorProfileMismatch 198
-#define MGK_ImageErrorImageColorspaceDiffers 199
-#define MGK_ImageErrorImageColorspaceMismatch 200
-#define MGK_ImageErrorImageDifferenceExceedsLimit 201
-#define MGK_ImageErrorImageDoesNotContainResolution 202
-#define MGK_ImageErrorImageOpacityDiffers 203
-#define MGK_ImageErrorImageSequenceIsRequired 204
-#define MGK_ImageErrorImageSizeDiffers 205
-#define MGK_ImageErrorInvalidColormapIndex 206
-#define MGK_ImageErrorLeftAndRightImageSizesDiffer 207
-#define MGK_ImageErrorNoImagesWereFound 208
-#define MGK_ImageErrorNoImagesWereLoaded 209
-#define MGK_ImageErrorNoLocaleImageAttribute 210
-#define MGK_ImageErrorTooManyClusters 211
-#define MGK_ImageErrorUnableToAppendImage 212
-#define MGK_ImageErrorUnableToAssignProfile 213
-#define MGK_ImageErrorUnableToAverageImage 214
-#define MGK_ImageErrorUnableToCoalesceImage 215
-#define MGK_ImageErrorUnableToCompareImages 216
-#define MGK_ImageErrorUnableToCreateImageMosaic 217
-#define MGK_ImageErrorUnableToCreateStereoImage 218
-#define MGK_ImageErrorUnableToDeconstructImageSequence 219
-#define MGK_ImageErrorUnableToFlattenImage 220
-#define MGK_ImageErrorUnableToGetClipMask 221
-#define MGK_ImageErrorUnableToHandleImageChannel 222
-#define MGK_ImageErrorUnableToResizeImage 223
-#define MGK_ImageErrorUnableToSegmentImage 224
-#define MGK_ImageErrorUnableToSetClipMask 225
-#define MGK_ImageErrorUnableToShearImage 226
-#define MGK_ImageErrorWidthOrHeightExceedsLimit 227
-#define MGK_ImageFatalErrorUnableToPersistKey 228
-#define MGK_ImageWarningDefault 229
-#define MGK_MissingDelegateErrorDPSLibraryIsNotAvailable 230
-#define MGK_MissingDelegateErrorFPXLibraryIsNotAvailable 231
-#define MGK_MissingDelegateErrorFreeTypeLibraryIsNotAvailable 232
-#define MGK_MissingDelegateErrorJPEGLibraryIsNotAvailable 233
-#define MGK_MissingDelegateErrorLCMSLibraryIsNotAvailable 234
-#define MGK_MissingDelegateErrorLZWEncodingNotEnabled 235
-#define MGK_MissingDelegateErrorNoDecodeDelegateForThisImageFormat 236
-#define MGK_MissingDelegateErrorNoEncodeDelegateForThisImageFormat 237
-#define MGK_MissingDelegateErrorTIFFLibraryIsNotAvailable 238
-#define MGK_MissingDelegateErrorXMLLibraryIsNotAvailable 239
-#define MGK_MissingDelegateErrorXWindowLibraryIsNotAvailable 240
-#define MGK_MissingDelegateErrorZipLibraryIsNotAvailable 241
-#define MGK_MissingDelegateFatalErrorDefault 242
-#define MGK_MissingDelegateWarningDefault 243
-#define MGK_ModuleErrorFailedToCloseModule 244
-#define MGK_ModuleErrorFailedToFindSymbol 245
-#define MGK_ModuleErrorUnableToLoadModule 246
-#define MGK_ModuleErrorUnableToRegisterImageFormat 247
-#define MGK_ModuleErrorUnrecognizedModule 248
-#define MGK_ModuleFatalErrorUnableToInitializeModuleLoader 249
-#define MGK_ModuleWarningDefault 250
-#define MGK_MonitorErrorDefault 251
-#define MGK_MonitorFatalErrorDefault 252
-#define MGK_MonitorFatalErrorUserRequestedTerminationBySignal 253
-#define MGK_MonitorWarningDefault 254
-#define MGK_OptionErrorBevelWidthIsNegative 255
-#define MGK_OptionErrorColorSeparatedImageRequired 256
-#define MGK_OptionErrorFrameIsLessThanImageSize 257
-#define MGK_OptionErrorGeometryDimensionsAreZero 258
-#define MGK_OptionErrorGeometryDoesNotContainImage 259
-#define MGK_OptionErrorHaldClutImageDimensionsInvalid 260
-#define MGK_OptionErrorImagesAreNotTheSameSize 261
-#define MGK_OptionErrorImageSizeMustExceedBevelWidth 262
-#define MGK_OptionErrorImageSmallerThanKernelWidth 263
-#define MGK_OptionErrorImageSmallerThanRadius 264
-#define MGK_OptionErrorImageWidthsOrHeightsDiffer 265
-#define MGK_OptionErrorInputImagesAlreadySpecified 266
-#define MGK_OptionErrorInvalidSubimageSpecification 267
-#define MGK_OptionErrorKernelRadiusIsTooSmall 268
-#define MGK_OptionErrorKernelWidthMustBeAnOddNumber 269
-#define MGK_OptionErrorMatrixIsNotSquare 270
-#define MGK_OptionErrorMatrixOrderOutOfRange 271
-#define MGK_OptionErrorMissingAnImageFilename 272
-#define MGK_OptionErrorMissingArgument 273
-#define MGK_OptionErrorMustSpecifyAnImageName 274
-#define MGK_OptionErrorMustSpecifyImageSize 275
-#define MGK_OptionErrorNoBlobDefined 276
-#define MGK_OptionErrorNoImagesDefined 277
-#define MGK_OptionErrorNonzeroWidthAndHeightRequired 278
-#define MGK_OptionErrorNoProfileNameWasGiven 279
-#define MGK_OptionErrorNullBlobArgument 280
-#define MGK_OptionErrorReferenceImageRequired 281
-#define MGK_OptionErrorReferenceIsNotMyType 282
-#define MGK_OptionErrorRegionAreaExceedsLimit 283
-#define MGK_OptionErrorRequestDidNotReturnAnImage 284
-#define MGK_OptionErrorSteganoImageRequired 285
-#define MGK_OptionErrorStereoImageRequired 286
-#define MGK_OptionErrorSubimageSpecificationReturnsNoImages 287
-#define MGK_OptionErrorUnableToAddOrRemoveProfile 288
-#define MGK_OptionErrorUnableToAverageImageSequence 289
-#define MGK_OptionErrorUnableToBlurImage 290
-#define MGK_OptionErrorUnableToChopImage 291
-#define MGK_OptionErrorUnableToColorMatrixImage 292
-#define MGK_OptionErrorUnableToConstituteImage 293
-#define MGK_OptionErrorUnableToConvolveImage 294
-#define MGK_OptionErrorUnableToEdgeImage 295
-#define MGK_OptionErrorUnableToEqualizeImage 296
-#define MGK_OptionErrorUnableToFilterImage 297
-#define MGK_OptionErrorUnableToFormatImageMetadata 298
-#define MGK_OptionErrorUnableToFrameImage 299
-#define MGK_OptionErrorUnableToOilPaintImage 300
-#define MGK_OptionErrorUnableToPaintImage 301
-#define MGK_OptionErrorUnableToRaiseImage 302
-#define MGK_OptionErrorUnableToSharpenImage 303
-#define MGK_OptionErrorUnableToThresholdImage 304
-#define MGK_OptionErrorUnableToWaveImage 305
-#define MGK_OptionErrorUnrecognizedAttribute 306
-#define MGK_OptionErrorUnrecognizedChannelType 307
-#define MGK_OptionErrorUnrecognizedColor 308
-#define MGK_OptionErrorUnrecognizedColormapType 309
-#define MGK_OptionErrorUnrecognizedColorspace 310
-#define MGK_OptionErrorUnrecognizedCommand 311
-#define MGK_OptionErrorUnrecognizedComposeOperator 312
-#define MGK_OptionErrorUnrecognizedDisposeMethod 313
-#define MGK_OptionErrorUnrecognizedElement 314
-#define MGK_OptionErrorUnrecognizedEndianType 315
-#define MGK_OptionErrorUnrecognizedGravityType 316
-#define MGK_OptionErrorUnrecognizedHighlightStyle 317
-#define MGK_OptionErrorUnrecognizedImageCompression 318
-#define MGK_OptionErrorUnrecognizedImageFilter 319
-#define MGK_OptionErrorUnrecognizedImageFormat 320
-#define MGK_OptionErrorUnrecognizedImageMode 321
-#define MGK_OptionErrorUnrecognizedImageType 322
-#define MGK_OptionErrorUnrecognizedIntentType 323
-#define MGK_OptionErrorUnrecognizedInterlaceType 324
-#define MGK_OptionErrorUnrecognizedListType 325
-#define MGK_OptionErrorUnrecognizedMetric 326
-#define MGK_OptionErrorUnrecognizedModeType 327
-#define MGK_OptionErrorUnrecognizedNoiseType 328
-#define MGK_OptionErrorUnrecognizedOperator 329
-#define MGK_OptionErrorUnrecognizedOption 330
-#define MGK_OptionErrorUnrecognizedPerlMagickMethod 331
-#define MGK_OptionErrorUnrecognizedPixelMap 332
-#define MGK_OptionErrorUnrecognizedPreviewType 333
-#define MGK_OptionErrorUnrecognizedResourceType 334
-#define MGK_OptionErrorUnrecognizedType 335
-#define MGK_OptionErrorUnrecognizedUnitsType 336
-#define MGK_OptionErrorUnrecognizedVirtualPixelMethod 337
-#define MGK_OptionErrorUnsupportedSamplingFactor 338
-#define MGK_OptionErrorUsageError 339
-#define MGK_OptionFatalErrorInvalidColorspaceType 340
-#define MGK_OptionFatalErrorInvalidEndianType 341
-#define MGK_OptionFatalErrorInvalidImageType 342
-#define MGK_OptionFatalErrorInvalidInterlaceType 343
-#define MGK_OptionFatalErrorMissingAnImageFilename 344
-#define MGK_OptionFatalErrorMissingArgument 345
-#define MGK_OptionFatalErrorNoImagesWereLoaded 346
-#define MGK_OptionFatalErrorOptionLengthExceedsLimit 347
-#define MGK_OptionFatalErrorRequestDidNotReturnAnImage 348
-#define MGK_OptionFatalErrorUnableToOpenXServer 349
-#define MGK_OptionFatalErrorUnableToPersistKey 350
-#define MGK_OptionFatalErrorUnrecognizedColormapType 351
-#define MGK_OptionFatalErrorUnrecognizedColorspaceType 352
-#define MGK_OptionFatalErrorUnrecognizedDisposeMethod 353
-#define MGK_OptionFatalErrorUnrecognizedEndianType 354
-#define MGK_OptionFatalErrorUnrecognizedFilterType 355
-#define MGK_OptionFatalErrorUnrecognizedImageCompressionType 356
-#define MGK_OptionFatalErrorUnrecognizedImageType 357
-#define MGK_OptionFatalErrorUnrecognizedInterlaceType 358
-#define MGK_OptionFatalErrorUnrecognizedOption 359
-#define MGK_OptionFatalErrorUnrecognizedResourceType 360
-#define MGK_OptionFatalErrorUnrecognizedVirtualPixelMethod 361
-#define MGK_OptionWarningUnrecognizedColor 362
-#define MGK_RegistryErrorImageExpected 363
-#define MGK_RegistryErrorImageInfoExpected 364
-#define MGK_RegistryErrorStructureSizeMismatch 365
-#define MGK_RegistryErrorUnableToGetRegistryID 366
-#define MGK_RegistryErrorUnableToLocateImage 367
-#define MGK_RegistryErrorUnableToSetRegistry 368
-#define MGK_RegistryFatalErrorDefault 369
-#define MGK_RegistryWarningDefault 370
-#define MGK_ResourceLimitErrorCacheResourcesExhausted 371
-#define MGK_ResourceLimitErrorImagePixelLimitExceeded 372
-#define MGK_ResourceLimitErrorMemoryAllocationFailed 373
-#define MGK_ResourceLimitErrorNoPixelsDefinedInCache 374
-#define MGK_ResourceLimitErrorPixelCacheAllocationFailed 375
-#define MGK_ResourceLimitErrorUnableToAddColorProfile 376
-#define MGK_ResourceLimitErrorUnableToAddGenericProfile 377
-#define MGK_ResourceLimitErrorUnableToAddIPTCProfile 378
-#define MGK_ResourceLimitErrorUnableToAllocateCoefficients 379
-#define MGK_ResourceLimitErrorUnableToAllocateColormap 380
-#define MGK_ResourceLimitErrorUnableToAllocateICCProfile 381
-#define MGK_ResourceLimitErrorUnableToAllocateString 382
-#define MGK_ResourceLimitErrorUnableToAnnotateImage 383
-#define MGK_ResourceLimitErrorUnableToAverageImageSequence 384
-#define MGK_ResourceLimitErrorUnableToCloneDrawingWand 385
-#define MGK_ResourceLimitErrorUnableToCloneImage 386
-#define MGK_ResourceLimitErrorUnableToComputeImageSignature 387
-#define MGK_ResourceLimitErrorUnableToConstituteImage 388
-#define MGK_ResourceLimitErrorUnableToConvertFont 389
-#define MGK_ResourceLimitErrorUnableToConvertStringToTokens 390
-#define MGK_ResourceLimitErrorUnableToCreateColormap 391
-#define MGK_ResourceLimitErrorUnableToCreateColorTransform 392
-#define MGK_ResourceLimitErrorUnableToCreateCommandWidget 393
-#define MGK_ResourceLimitErrorUnableToCreateImageGroup 394
-#define MGK_ResourceLimitErrorUnableToCreateImageMontage 395
-#define MGK_ResourceLimitErrorUnableToCreateXWindow 396
-#define MGK_ResourceLimitErrorUnableToCropImage 397
-#define MGK_ResourceLimitErrorUnableToDespeckleImage 398
-#define MGK_ResourceLimitErrorUnableToDetermineImageClass 399
-#define MGK_ResourceLimitErrorUnableToDetermineTheNumberOfImageColors 400
-#define MGK_ResourceLimitErrorUnableToDitherImage 401
-#define MGK_ResourceLimitErrorUnableToDrawOnImage 402
-#define MGK_ResourceLimitErrorUnableToEdgeImage 403
-#define MGK_ResourceLimitErrorUnableToEmbossImage 404
-#define MGK_ResourceLimitErrorUnableToEnhanceImage 405
-#define MGK_ResourceLimitErrorUnableToFloodfillImage 406
-#define MGK_ResourceLimitErrorUnableToGammaCorrectImage 407
-#define MGK_ResourceLimitErrorUnableToGetBestIconSize 408
-#define MGK_ResourceLimitErrorUnableToGetFromRegistry 409
-#define MGK_ResourceLimitErrorUnableToGetPackageInfo 410
-#define MGK_ResourceLimitErrorUnableToLevelImage 411
-#define MGK_ResourceLimitErrorUnableToMagnifyImage 412
-#define MGK_ResourceLimitErrorUnableToManageColor 413
-#define MGK_ResourceLimitErrorUnableToMapImage 414
-#define MGK_ResourceLimitErrorUnableToMapImageSequence 415
-#define MGK_ResourceLimitErrorUnableToMedianFilterImage 416
-#define MGK_ResourceLimitErrorUnableToMotionBlurImage 417
-#define MGK_ResourceLimitErrorUnableToNoiseFilterImage 418
-#define MGK_ResourceLimitErrorUnableToNormalizeImage 419
-#define MGK_ResourceLimitErrorUnableToOpenColorProfile 420
-#define MGK_ResourceLimitErrorUnableToQuantizeImage 421
-#define MGK_ResourceLimitErrorUnableToQuantizeImageSequence 422
-#define MGK_ResourceLimitErrorUnableToReadTextChunk 423
-#define MGK_ResourceLimitErrorUnableToReadXImage 424
-#define MGK_ResourceLimitErrorUnableToReadXServerColormap 425
-#define MGK_ResourceLimitErrorUnableToResizeImage 426
-#define MGK_ResourceLimitErrorUnableToRotateImage 427
-#define MGK_ResourceLimitErrorUnableToSampleImage 428
-#define MGK_ResourceLimitErrorUnableToScaleImage 429
-#define MGK_ResourceLimitErrorUnableToSelectImage 430
-#define MGK_ResourceLimitErrorUnableToSharpenImage 431
-#define MGK_ResourceLimitErrorUnableToShaveImage 432
-#define MGK_ResourceLimitErrorUnableToShearImage 433
-#define MGK_ResourceLimitErrorUnableToSortImageColormap 434
-#define MGK_ResourceLimitErrorUnableToThresholdImage 435
-#define MGK_ResourceLimitErrorUnableToTransformColorspace 436
-#define MGK_ResourceLimitFatalErrorMemoryAllocationFailed 437
-#define MGK_ResourceLimitFatalErrorSemaporeOperationFailed 438
-#define MGK_ResourceLimitFatalErrorUnableToAllocateAscii85Info 439
-#define MGK_ResourceLimitFatalErrorUnableToAllocateCacheInfo 440
-#define MGK_ResourceLimitFatalErrorUnableToAllocateCacheView 441
-#define MGK_ResourceLimitFatalErrorUnableToAllocateColorInfo 442
-#define MGK_ResourceLimitFatalErrorUnableToAllocateDashPattern 443
-#define MGK_ResourceLimitFatalErrorUnableToAllocateDelegateInfo 444
-#define MGK_ResourceLimitFatalErrorUnableToAllocateDerivatives 445
-#define MGK_ResourceLimitFatalErrorUnableToAllocateDrawContext 446
-#define MGK_ResourceLimitFatalErrorUnableToAllocateDrawInfo 447
-#define MGK_ResourceLimitFatalErrorUnableToAllocateDrawingWand 448
-#define MGK_ResourceLimitFatalErrorUnableToAllocateGammaMap 449
-#define MGK_ResourceLimitFatalErrorUnableToAllocateImage 450
-#define MGK_ResourceLimitFatalErrorUnableToAllocateImagePixels 451
-#define MGK_ResourceLimitFatalErrorUnableToAllocateLogInfo 452
-#define MGK_ResourceLimitFatalErrorUnableToAllocateMagicInfo 453
-#define MGK_ResourceLimitFatalErrorUnableToAllocateMagickInfo 454
-#define MGK_ResourceLimitFatalErrorUnableToAllocateModuleInfo 455
-#define MGK_ResourceLimitFatalErrorUnableToAllocateMontageInfo 456
-#define MGK_ResourceLimitFatalErrorUnableToAllocateQuantizeInfo 457
-#define MGK_ResourceLimitFatalErrorUnableToAllocateRandomKernel 458
-#define MGK_ResourceLimitFatalErrorUnableToAllocateRegistryInfo 459
-#define MGK_ResourceLimitFatalErrorUnableToAllocateSemaphoreInfo 460
-#define MGK_ResourceLimitFatalErrorUnableToAllocateString 461
-#define MGK_ResourceLimitFatalErrorUnableToAllocateTypeInfo 462
-#define MGK_ResourceLimitFatalErrorUnableToAllocateWand 463
-#define MGK_ResourceLimitFatalErrorUnableToAnimateImageSequence 464
-#define MGK_ResourceLimitFatalErrorUnableToCloneBlobInfo 465
-#define MGK_ResourceLimitFatalErrorUnableToCloneCacheInfo 466
-#define MGK_ResourceLimitFatalErrorUnableToCloneImage 467
-#define MGK_ResourceLimitFatalErrorUnableToCloneImageInfo 468
-#define MGK_ResourceLimitFatalErrorUnableToConcatenateString 469
-#define MGK_ResourceLimitFatalErrorUnableToConvertText 470
-#define MGK_ResourceLimitFatalErrorUnableToCreateColormap 471
-#define MGK_ResourceLimitFatalErrorUnableToDestroySemaphore 472
-#define MGK_ResourceLimitFatalErrorUnableToDisplayImage 473
-#define MGK_ResourceLimitFatalErrorUnableToEscapeString 474
-#define MGK_ResourceLimitFatalErrorUnableToInitializeSemaphore 475
-#define MGK_ResourceLimitFatalErrorUnableToInterpretMSLImage 476
-#define MGK_ResourceLimitFatalErrorUnableToLockSemaphore 477
-#define MGK_ResourceLimitFatalErrorUnableToUnlockSemaphore 478
-#define MGK_ResourceLimitWarningMemoryAllocationFailed 479
-#define MGK_StreamErrorImageDoesNotContainTheStreamGeometry 480
-#define MGK_StreamErrorNoStreamHandlerIsDefined 481
-#define MGK_StreamErrorPixelCacheIsNotOpen 482
-#define MGK_StreamErrorUnableToAcquirePixelStream 483
-#define MGK_StreamErrorUnableToSetPixelStream 484
-#define MGK_StreamErrorUnableToSyncPixelStream 485
-#define MGK_StreamFatalErrorDefault 486
-#define MGK_StreamWarningDefault 487
-#define MGK_TypeErrorFontSubstitutionRequired 488
-#define MGK_TypeErrorUnableToGetTypeMetrics 489
-#define MGK_TypeErrorUnableToInitializeFreetypeLibrary 490
-#define MGK_TypeErrorUnableToReadFont 491
-#define MGK_TypeErrorUnrecognizedFontEncoding 492
-#define MGK_TypeFatalErrorDefault 493
-#define MGK_TypeWarningDefault 494
-#define MGK_WandErrorInvalidColormapIndex 495
-#define MGK_WandErrorWandAPINotImplemented 496
-#define MGK_WandErrorWandContainsNoImageIndexs 497
-#define MGK_WandErrorWandContainsNoImages 498
-#define MGK_XServerErrorColorIsNotKnownToServer 499
-#define MGK_XServerErrorNoWindowWithSpecifiedIDExists 500
-#define MGK_XServerErrorStandardColormapIsNotInitialized 501
-#define MGK_XServerErrorUnableToConnectToRemoteDisplay 502
-#define MGK_XServerErrorUnableToCreateBitmap 503
-#define MGK_XServerErrorUnableToCreateColormap 504
-#define MGK_XServerErrorUnableToCreatePixmap 505
-#define MGK_XServerErrorUnableToCreateProperty 506
-#define MGK_XServerErrorUnableToCreateStandardColormap 507
-#define MGK_XServerErrorUnableToDisplayImageInfo 508
-#define MGK_XServerErrorUnableToGetProperty 509
-#define MGK_XServerErrorUnableToGetStandardColormap 510
-#define MGK_XServerErrorUnableToGetVisual 511
-#define MGK_XServerErrorUnableToGrabMouse 512
-#define MGK_XServerErrorUnableToLoadFont 513
-#define MGK_XServerErrorUnableToMatchVisualToStandardColormap 514
-#define MGK_XServerErrorUnableToOpenXServer 515
-#define MGK_XServerErrorUnableToReadXAttributes 516
-#define MGK_XServerErrorUnableToReadXWindowImage 517
-#define MGK_XServerErrorUnrecognizedColormapType 518
-#define MGK_XServerErrorUnrecognizedGravityType 519
-#define MGK_XServerErrorUnrecognizedVisualSpecifier 520
-#define MGK_XServerFatalErrorUnableToAllocateXHints 521
-#define MGK_XServerFatalErrorUnableToCreateCursor 522
-#define MGK_XServerFatalErrorUnableToCreateGraphicContext 523
-#define MGK_XServerFatalErrorUnableToCreateStandardColormap 524
-#define MGK_XServerFatalErrorUnableToCreateTextProperty 525
-#define MGK_XServerFatalErrorUnableToCreateXImage 526
-#define MGK_XServerFatalErrorUnableToCreateXPixmap 527
-#define MGK_XServerFatalErrorUnableToCreateXWindow 528
-#define MGK_XServerFatalErrorUnableToDisplayImage 529
-#define MGK_XServerFatalErrorUnableToDitherImage 530
-#define MGK_XServerFatalErrorUnableToGetPixelInfo 531
-#define MGK_XServerFatalErrorUnableToGetVisual 532
-#define MGK_XServerFatalErrorUnableToLoadFont 533
-#define MGK_XServerFatalErrorUnableToMakeXWindow 534
-#define MGK_XServerFatalErrorUnableToOpenXServer 535
-#define MGK_XServerFatalErrorUnableToViewFonts 536
-#define MGK_XServerWarningUnableToGetVisual 537
-#define MGK_XServerWarningUsingDefaultVisual 538
+#define MGK_DrawErrorFloatValueConversionError 187
+#define MGK_DrawErrorIntegerValueConversionError 188
+#define MGK_DrawErrorNonconformingDrawingPrimitiveDefinition 189
+#define MGK_DrawErrorTooManyCoordinates 190
+#define MGK_DrawErrorUnableToPrint 191
+#define MGK_DrawErrorUnbalancedGraphicContextPushPop 192
+#define MGK_DrawErrorVectorPathTruncated 193
+#define MGK_DrawFatalErrorDefault 194
+#define MGK_DrawWarningNotARelativeURL 195
+#define MGK_DrawWarningNotCurrentlyPushingPatternDefinition 196
+#define MGK_DrawWarningURLNotFound 197
+#define MGK_FileOpenErrorUnableToCreateTemporaryFile 198
+#define MGK_FileOpenErrorUnableToOpenFile 199
+#define MGK_FileOpenErrorUnableToWriteFile 200
+#define MGK_FileOpenFatalErrorDefault 201
+#define MGK_FileOpenWarningDefault 202
+#define MGK_ImageErrorAngleIsDiscontinuous 203
+#define MGK_ImageErrorColorspaceColorProfileMismatch 204
+#define MGK_ImageErrorImageColorspaceDiffers 205
+#define MGK_ImageErrorImageColorspaceMismatch 206
+#define MGK_ImageErrorImageDifferenceExceedsLimit 207
+#define MGK_ImageErrorImageDoesNotContainResolution 208
+#define MGK_ImageErrorImageOpacityDiffers 209
+#define MGK_ImageErrorImageSequenceIsRequired 210
+#define MGK_ImageErrorImageSizeDiffers 211
+#define MGK_ImageErrorInvalidColormapIndex 212
+#define MGK_ImageErrorLeftAndRightImageSizesDiffer 213
+#define MGK_ImageErrorNoImagesWereFound 214
+#define MGK_ImageErrorNoImagesWereLoaded 215
+#define MGK_ImageErrorNoLocaleImageAttribute 216
+#define MGK_ImageErrorTooManyClusters 217
+#define MGK_ImageErrorUnableToAppendImage 218
+#define MGK_ImageErrorUnableToAssignProfile 219
+#define MGK_ImageErrorUnableToAverageImage 220
+#define MGK_ImageErrorUnableToCoalesceImage 221
+#define MGK_ImageErrorUnableToCompareImages 222
+#define MGK_ImageErrorUnableToCreateImageMosaic 223
+#define MGK_ImageErrorUnableToCreateStereoImage 224
+#define MGK_ImageErrorUnableToDeconstructImageSequence 225
+#define MGK_ImageErrorUnableToFlattenImage 226
+#define MGK_ImageErrorUnableToGetClipMask 227
+#define MGK_ImageErrorUnableToHandleImageChannel 228
+#define MGK_ImageErrorUnableToResizeImage 229
+#define MGK_ImageErrorUnableToSegmentImage 230
+#define MGK_ImageErrorUnableToSetClipMask 231
+#define MGK_ImageErrorUnableToShearImage 232
+#define MGK_ImageErrorWidthOrHeightExceedsLimit 233
+#define MGK_ImageFatalErrorUnableToPersistKey 234
+#define MGK_ImageWarningDefault 235
+#define MGK_MissingDelegateErrorDPSLibraryIsNotAvailable 236
+#define MGK_MissingDelegateErrorFPXLibraryIsNotAvailable 237
+#define MGK_MissingDelegateErrorFreeTypeLibraryIsNotAvailable 238
+#define MGK_MissingDelegateErrorJPEGLibraryIsNotAvailable 239
+#define MGK_MissingDelegateErrorLCMSLibraryIsNotAvailable 240
+#define MGK_MissingDelegateErrorLZWEncodingNotEnabled 241
+#define MGK_MissingDelegateErrorNoDecodeDelegateForThisImageFormat 242
+#define MGK_MissingDelegateErrorNoEncodeDelegateForThisImageFormat 243
+#define MGK_MissingDelegateErrorTIFFLibraryIsNotAvailable 244
+#define MGK_MissingDelegateErrorXMLLibraryIsNotAvailable 245
+#define MGK_MissingDelegateErrorXWindowLibraryIsNotAvailable 246
+#define MGK_MissingDelegateErrorZipLibraryIsNotAvailable 247
+#define MGK_MissingDelegateFatalErrorDefault 248
+#define MGK_MissingDelegateWarningDefault 249
+#define MGK_ModuleErrorFailedToCloseModule 250
+#define MGK_ModuleErrorFailedToFindSymbol 251
+#define MGK_ModuleErrorUnableToLoadModule 252
+#define MGK_ModuleErrorUnableToRegisterImageFormat 253
+#define MGK_ModuleErrorUnrecognizedModule 254
+#define MGK_ModuleFatalErrorUnableToInitializeModuleLoader 255
+#define MGK_ModuleWarningDefault 256
+#define MGK_MonitorErrorDefault 257
+#define MGK_MonitorFatalErrorDefault 258
+#define MGK_MonitorFatalErrorUserRequestedTerminationBySignal 259
+#define MGK_MonitorWarningDefault 260
+#define MGK_OptionErrorBevelWidthIsNegative 261
+#define MGK_OptionErrorColorSeparatedImageRequired 262
+#define MGK_OptionErrorFrameIsLessThanImageSize 263
+#define MGK_OptionErrorGeometryDimensionsAreZero 264
+#define MGK_OptionErrorGeometryDoesNotContainImage 265
+#define MGK_OptionErrorHaldClutImageDimensionsInvalid 266
+#define MGK_OptionErrorImagesAreNotTheSameSize 267
+#define MGK_OptionErrorImageSizeMustExceedBevelWidth 268
+#define MGK_OptionErrorImageSmallerThanKernelWidth 269
+#define MGK_OptionErrorImageSmallerThanRadius 270
+#define MGK_OptionErrorImageWidthsOrHeightsDiffer 271
+#define MGK_OptionErrorInputImagesAlreadySpecified 272
+#define MGK_OptionErrorInvalidSubimageSpecification 273
+#define MGK_OptionErrorKernelRadiusIsTooSmall 274
+#define MGK_OptionErrorKernelWidthMustBeAnOddNumber 275
+#define MGK_OptionErrorMatrixIsNotSquare 276
+#define MGK_OptionErrorMatrixOrderOutOfRange 277
+#define MGK_OptionErrorMissingAnImageFilename 278
+#define MGK_OptionErrorMissingArgument 279
+#define MGK_OptionErrorMustSpecifyAnImageName 280
+#define MGK_OptionErrorMustSpecifyImageSize 281
+#define MGK_OptionErrorNoBlobDefined 282
+#define MGK_OptionErrorNoImagesDefined 283
+#define MGK_OptionErrorNonzeroWidthAndHeightRequired 284
+#define MGK_OptionErrorNoProfileNameWasGiven 285
+#define MGK_OptionErrorNullBlobArgument 286
+#define MGK_OptionErrorReferenceImageRequired 287
+#define MGK_OptionErrorReferenceIsNotMyType 288
+#define MGK_OptionErrorRegionAreaExceedsLimit 289
+#define MGK_OptionErrorRequestDidNotReturnAnImage 290
+#define MGK_OptionErrorSteganoImageRequired 291
+#define MGK_OptionErrorStereoImageRequired 292
+#define MGK_OptionErrorSubimageSpecificationReturnsNoImages 293
+#define MGK_OptionErrorUnableToAddOrRemoveProfile 294
+#define MGK_OptionErrorUnableToAverageImageSequence 295
+#define MGK_OptionErrorUnableToBlurImage 296
+#define MGK_OptionErrorUnableToChopImage 297
+#define MGK_OptionErrorUnableToColorMatrixImage 298
+#define MGK_OptionErrorUnableToConstituteImage 299
+#define MGK_OptionErrorUnableToConvolveImage 300
+#define MGK_OptionErrorUnableToEdgeImage 301
+#define MGK_OptionErrorUnableToEqualizeImage 302
+#define MGK_OptionErrorUnableToFilterImage 303
+#define MGK_OptionErrorUnableToFormatImageMetadata 304
+#define MGK_OptionErrorUnableToFrameImage 305
+#define MGK_OptionErrorUnableToOilPaintImage 306
+#define MGK_OptionErrorUnableToPaintImage 307
+#define MGK_OptionErrorUnableToRaiseImage 308
+#define MGK_OptionErrorUnableToSharpenImage 309
+#define MGK_OptionErrorUnableToThresholdImage 310
+#define MGK_OptionErrorUnableToWaveImage 311
+#define MGK_OptionErrorUnrecognizedAttribute 312
+#define MGK_OptionErrorUnrecognizedChannelType 313
+#define MGK_OptionErrorUnrecognizedColor 314
+#define MGK_OptionErrorUnrecognizedColormapType 315
+#define MGK_OptionErrorUnrecognizedColorspace 316
+#define MGK_OptionErrorUnrecognizedCommand 317
+#define MGK_OptionErrorUnrecognizedComposeOperator 318
+#define MGK_OptionErrorUnrecognizedDisposeMethod 319
+#define MGK_OptionErrorUnrecognizedElement 320
+#define MGK_OptionErrorUnrecognizedEndianType 321
+#define MGK_OptionErrorUnrecognizedGravityType 322
+#define MGK_OptionErrorUnrecognizedHighlightStyle 323
+#define MGK_OptionErrorUnrecognizedImageCompression 324
+#define MGK_OptionErrorUnrecognizedImageFilter 325
+#define MGK_OptionErrorUnrecognizedImageFormat 326
+#define MGK_OptionErrorUnrecognizedImageMode 327
+#define MGK_OptionErrorUnrecognizedImageType 328
+#define MGK_OptionErrorUnrecognizedIntentType 329
+#define MGK_OptionErrorUnrecognizedInterlaceType 330
+#define MGK_OptionErrorUnrecognizedListType 331
+#define MGK_OptionErrorUnrecognizedMetric 332
+#define MGK_OptionErrorUnrecognizedModeType 333
+#define MGK_OptionErrorUnrecognizedNoiseType 334
+#define MGK_OptionErrorUnrecognizedOperator 335
+#define MGK_OptionErrorUnrecognizedOption 336
+#define MGK_OptionErrorUnrecognizedPerlMagickMethod 337
+#define MGK_OptionErrorUnrecognizedPixelMap 338
+#define MGK_OptionErrorUnrecognizedPreviewType 339
+#define MGK_OptionErrorUnrecognizedResourceType 340
+#define MGK_OptionErrorUnrecognizedType 341
+#define MGK_OptionErrorUnrecognizedUnitsType 342
+#define MGK_OptionErrorUnrecognizedVirtualPixelMethod 343
+#define MGK_OptionErrorUnsupportedSamplingFactor 344
+#define MGK_OptionErrorUsageError 345
+#define MGK_OptionFatalErrorInvalidColorspaceType 346
+#define MGK_OptionFatalErrorInvalidEndianType 347
+#define MGK_OptionFatalErrorInvalidImageType 348
+#define MGK_OptionFatalErrorInvalidInterlaceType 349
+#define MGK_OptionFatalErrorMissingAnImageFilename 350
+#define MGK_OptionFatalErrorMissingArgument 351
+#define MGK_OptionFatalErrorNoImagesWereLoaded 352
+#define MGK_OptionFatalErrorOptionLengthExceedsLimit 353
+#define MGK_OptionFatalErrorRequestDidNotReturnAnImage 354
+#define MGK_OptionFatalErrorUnableToOpenXServer 355
+#define MGK_OptionFatalErrorUnableToPersistKey 356
+#define MGK_OptionFatalErrorUnrecognizedColormapType 357
+#define MGK_OptionFatalErrorUnrecognizedColorspaceType 358
+#define MGK_OptionFatalErrorUnrecognizedDisposeMethod 359
+#define MGK_OptionFatalErrorUnrecognizedEndianType 360
+#define MGK_OptionFatalErrorUnrecognizedFilterType 361
+#define MGK_OptionFatalErrorUnrecognizedImageCompressionType 362
+#define MGK_OptionFatalErrorUnrecognizedImageType 363
+#define MGK_OptionFatalErrorUnrecognizedInterlaceType 364
+#define MGK_OptionFatalErrorUnrecognizedOption 365
+#define MGK_OptionFatalErrorUnrecognizedResourceType 366
+#define MGK_OptionFatalErrorUnrecognizedVirtualPixelMethod 367
+#define MGK_OptionWarningUnrecognizedColor 368
+#define MGK_RegistryErrorImageExpected 369
+#define MGK_RegistryErrorImageInfoExpected 370
+#define MGK_RegistryErrorStructureSizeMismatch 371
+#define MGK_RegistryErrorUnableToGetRegistryID 372
+#define MGK_RegistryErrorUnableToLocateImage 373
+#define MGK_RegistryErrorUnableToSetRegistry 374
+#define MGK_RegistryFatalErrorDefault 375
+#define MGK_RegistryWarningDefault 376
+#define MGK_ResourceLimitErrorCacheResourcesExhausted 377
+#define MGK_ResourceLimitErrorImagePixelHeightLimitExceeded 378
+#define MGK_ResourceLimitErrorImagePixelLimitExceeded 379
+#define MGK_ResourceLimitErrorImagePixelWidthLimitExceeded 380
+#define MGK_ResourceLimitErrorMemoryAllocationFailed 381
+#define MGK_ResourceLimitErrorNoPixelsDefinedInCache 382
+#define MGK_ResourceLimitErrorPixelCacheAllocationFailed 383
+#define MGK_ResourceLimitErrorUnableToAddColorProfile 384
+#define MGK_ResourceLimitErrorUnableToAddGenericProfile 385
+#define MGK_ResourceLimitErrorUnableToAddIPTCProfile 386
+#define MGK_ResourceLimitErrorUnableToAllocateCoefficients 387
+#define MGK_ResourceLimitErrorUnableToAllocateColormap 388
+#define MGK_ResourceLimitErrorUnableToAllocateICCProfile 389
+#define MGK_ResourceLimitErrorUnableToAllocateString 390
+#define MGK_ResourceLimitErrorUnableToAnnotateImage 391
+#define MGK_ResourceLimitErrorUnableToAverageImageSequence 392
+#define MGK_ResourceLimitErrorUnableToCloneDrawingWand 393
+#define MGK_ResourceLimitErrorUnableToCloneImage 394
+#define MGK_ResourceLimitErrorUnableToComputeImageSignature 395
+#define MGK_ResourceLimitErrorUnableToConstituteImage 396
+#define MGK_ResourceLimitErrorUnableToConvertFont 397
+#define MGK_ResourceLimitErrorUnableToConvertStringToTokens 398
+#define MGK_ResourceLimitErrorUnableToCreateColormap 399
+#define MGK_ResourceLimitErrorUnableToCreateColorTransform 400
+#define MGK_ResourceLimitErrorUnableToCreateCommandWidget 401
+#define MGK_ResourceLimitErrorUnableToCreateImageGroup 402
+#define MGK_ResourceLimitErrorUnableToCreateImageMontage 403
+#define MGK_ResourceLimitErrorUnableToCreateXWindow 404
+#define MGK_ResourceLimitErrorUnableToCropImage 405
+#define MGK_ResourceLimitErrorUnableToDespeckleImage 406
+#define MGK_ResourceLimitErrorUnableToDetermineImageClass 407
+#define MGK_ResourceLimitErrorUnableToDetermineTheNumberOfImageColors 408
+#define MGK_ResourceLimitErrorUnableToDitherImage 409
+#define MGK_ResourceLimitErrorUnableToDrawOnImage 410
+#define MGK_ResourceLimitErrorUnableToEdgeImage 411
+#define MGK_ResourceLimitErrorUnableToEmbossImage 412
+#define MGK_ResourceLimitErrorUnableToEnhanceImage 413
+#define MGK_ResourceLimitErrorUnableToFloodfillImage 414
+#define MGK_ResourceLimitErrorUnableToGammaCorrectImage 415
+#define MGK_ResourceLimitErrorUnableToGetBestIconSize 416
+#define MGK_ResourceLimitErrorUnableToGetFromRegistry 417
+#define MGK_ResourceLimitErrorUnableToGetPackageInfo 418
+#define MGK_ResourceLimitErrorUnableToLevelImage 419
+#define MGK_ResourceLimitErrorUnableToMagnifyImage 420
+#define MGK_ResourceLimitErrorUnableToManageColor 421
+#define MGK_ResourceLimitErrorUnableToMapImage 422
+#define MGK_ResourceLimitErrorUnableToMapImageSequence 423
+#define MGK_ResourceLimitErrorUnableToMedianFilterImage 424
+#define MGK_ResourceLimitErrorUnableToMotionBlurImage 425
+#define MGK_ResourceLimitErrorUnableToNoiseFilterImage 426
+#define MGK_ResourceLimitErrorUnableToNormalizeImage 427
+#define MGK_ResourceLimitErrorUnableToOpenColorProfile 428
+#define MGK_ResourceLimitErrorUnableToQuantizeImage 429
+#define MGK_ResourceLimitErrorUnableToQuantizeImageSequence 430
+#define MGK_ResourceLimitErrorUnableToReadTextChunk 431
+#define MGK_ResourceLimitErrorUnableToReadXImage 432
+#define MGK_ResourceLimitErrorUnableToReadXServerColormap 433
+#define MGK_ResourceLimitErrorUnableToResizeImage 434
+#define MGK_ResourceLimitErrorUnableToRotateImage 435
+#define MGK_ResourceLimitErrorUnableToSampleImage 436
+#define MGK_ResourceLimitErrorUnableToScaleImage 437
+#define MGK_ResourceLimitErrorUnableToSelectImage 438
+#define MGK_ResourceLimitErrorUnableToSharpenImage 439
+#define MGK_ResourceLimitErrorUnableToShaveImage 440
+#define MGK_ResourceLimitErrorUnableToShearImage 441
+#define MGK_ResourceLimitErrorUnableToSortImageColormap 442
+#define MGK_ResourceLimitErrorUnableToThresholdImage 443
+#define MGK_ResourceLimitErrorUnableToTransformColorspace 444
+#define MGK_ResourceLimitFatalErrorMemoryAllocationFailed 445
+#define MGK_ResourceLimitFatalErrorSemaporeOperationFailed 446
+#define MGK_ResourceLimitFatalErrorUnableToAllocateAscii85Info 447
+#define MGK_ResourceLimitFatalErrorUnableToAllocateCacheInfo 448
+#define MGK_ResourceLimitFatalErrorUnableToAllocateCacheView 449
+#define MGK_ResourceLimitFatalErrorUnableToAllocateColorInfo 450
+#define MGK_ResourceLimitFatalErrorUnableToAllocateDashPattern 451
+#define MGK_ResourceLimitFatalErrorUnableToAllocateDelegateInfo 452
+#define MGK_ResourceLimitFatalErrorUnableToAllocateDerivatives 453
+#define MGK_ResourceLimitFatalErrorUnableToAllocateDrawContext 454
+#define MGK_ResourceLimitFatalErrorUnableToAllocateDrawInfo 455
+#define MGK_ResourceLimitFatalErrorUnableToAllocateDrawingWand 456
+#define MGK_ResourceLimitFatalErrorUnableToAllocateGammaMap 457
+#define MGK_ResourceLimitFatalErrorUnableToAllocateImage 458
+#define MGK_ResourceLimitFatalErrorUnableToAllocateImagePixels 459
+#define MGK_ResourceLimitFatalErrorUnableToAllocateLogInfo 460
+#define MGK_ResourceLimitFatalErrorUnableToAllocateMagicInfo 461
+#define MGK_ResourceLimitFatalErrorUnableToAllocateMagickInfo 462
+#define MGK_ResourceLimitFatalErrorUnableToAllocateModuleInfo 463
+#define MGK_ResourceLimitFatalErrorUnableToAllocateMontageInfo 464
+#define MGK_ResourceLimitFatalErrorUnableToAllocateQuantizeInfo 465
+#define MGK_ResourceLimitFatalErrorUnableToAllocateRandomKernel 466
+#define MGK_ResourceLimitFatalErrorUnableToAllocateRegistryInfo 467
+#define MGK_ResourceLimitFatalErrorUnableToAllocateSemaphoreInfo 468
+#define MGK_ResourceLimitFatalErrorUnableToAllocateString 469
+#define MGK_ResourceLimitFatalErrorUnableToAllocateTypeInfo 470
+#define MGK_ResourceLimitFatalErrorUnableToAllocateWand 471
+#define MGK_ResourceLimitFatalErrorUnableToAnimateImageSequence 472
+#define MGK_ResourceLimitFatalErrorUnableToCloneBlobInfo 473
+#define MGK_ResourceLimitFatalErrorUnableToCloneCacheInfo 474
+#define MGK_ResourceLimitFatalErrorUnableToCloneImage 475
+#define MGK_ResourceLimitFatalErrorUnableToCloneImageInfo 476
+#define MGK_ResourceLimitFatalErrorUnableToConcatenateString 477
+#define MGK_ResourceLimitFatalErrorUnableToConvertText 478
+#define MGK_ResourceLimitFatalErrorUnableToCreateColormap 479
+#define MGK_ResourceLimitFatalErrorUnableToDestroySemaphore 480
+#define MGK_ResourceLimitFatalErrorUnableToDisplayImage 481
+#define MGK_ResourceLimitFatalErrorUnableToEscapeString 482
+#define MGK_ResourceLimitFatalErrorUnableToInitializeSemaphore 483
+#define MGK_ResourceLimitFatalErrorUnableToInterpretMSLImage 484
+#define MGK_ResourceLimitFatalErrorUnableToLockSemaphore 485
+#define MGK_ResourceLimitFatalErrorUnableToObtainRandomEntropy 486
+#define MGK_ResourceLimitFatalErrorUnableToUnlockSemaphore 487
+#define MGK_ResourceLimitWarningMemoryAllocationFailed 488
+#define MGK_StreamErrorImageDoesNotContainTheStreamGeometry 489
+#define MGK_StreamErrorNoStreamHandlerIsDefined 490
+#define MGK_StreamErrorPixelCacheIsNotOpen 491
+#define MGK_StreamErrorUnableToAcquirePixelStream 492
+#define MGK_StreamErrorUnableToSetPixelStream 493
+#define MGK_StreamErrorUnableToSyncPixelStream 494
+#define MGK_StreamFatalErrorDefault 495
+#define MGK_StreamWarningDefault 496
+#define MGK_TypeErrorFontSubstitutionRequired 497
+#define MGK_TypeErrorUnableToGetTypeMetrics 498
+#define MGK_TypeErrorUnableToInitializeFreetypeLibrary 499
+#define MGK_TypeErrorUnableToReadFont 500
+#define MGK_TypeErrorUnrecognizedFontEncoding 501
+#define MGK_TypeFatalErrorDefault 502
+#define MGK_TypeWarningDefault 503
+#define MGK_WandErrorInvalidColormapIndex 504
+#define MGK_WandErrorWandAPINotImplemented 505
+#define MGK_WandErrorWandContainsNoImageIndexs 506
+#define MGK_WandErrorWandContainsNoImages 507
+#define MGK_XServerErrorColorIsNotKnownToServer 508
+#define MGK_XServerErrorNoWindowWithSpecifiedIDExists 509
+#define MGK_XServerErrorStandardColormapIsNotInitialized 510
+#define MGK_XServerErrorUnableToConnectToRemoteDisplay 511
+#define MGK_XServerErrorUnableToCreateBitmap 512
+#define MGK_XServerErrorUnableToCreateColormap 513
+#define MGK_XServerErrorUnableToCreatePixmap 514
+#define MGK_XServerErrorUnableToCreateProperty 515
+#define MGK_XServerErrorUnableToCreateStandardColormap 516
+#define MGK_XServerErrorUnableToDisplayImageInfo 517
+#define MGK_XServerErrorUnableToGetProperty 518
+#define MGK_XServerErrorUnableToGetStandardColormap 519
+#define MGK_XServerErrorUnableToGetVisual 520
+#define MGK_XServerErrorUnableToGrabMouse 521
+#define MGK_XServerErrorUnableToLoadFont 522
+#define MGK_XServerErrorUnableToMatchVisualToStandardColormap 523
+#define MGK_XServerErrorUnableToOpenXServer 524
+#define MGK_XServerErrorUnableToReadXAttributes 525
+#define MGK_XServerErrorUnableToReadXWindowImage 526
+#define MGK_XServerErrorUnrecognizedColormapType 527
+#define MGK_XServerErrorUnrecognizedGravityType 528
+#define MGK_XServerErrorUnrecognizedVisualSpecifier 529
+#define MGK_XServerFatalErrorUnableToAllocateXHints 530
+#define MGK_XServerFatalErrorUnableToCreateCursor 531
+#define MGK_XServerFatalErrorUnableToCreateGraphicContext 532
+#define MGK_XServerFatalErrorUnableToCreateStandardColormap 533
+#define MGK_XServerFatalErrorUnableToCreateTextProperty 534
+#define MGK_XServerFatalErrorUnableToCreateXImage 535
+#define MGK_XServerFatalErrorUnableToCreateXPixmap 536
+#define MGK_XServerFatalErrorUnableToCreateXWindow 537
+#define MGK_XServerFatalErrorUnableToDisplayImage 538
+#define MGK_XServerFatalErrorUnableToDitherImage 539
+#define MGK_XServerFatalErrorUnableToGetPixelInfo 540
+#define MGK_XServerFatalErrorUnableToGetVisual 541
+#define MGK_XServerFatalErrorUnableToLoadFont 542
+#define MGK_XServerFatalErrorUnableToMakeXWindow 543
+#define MGK_XServerFatalErrorUnableToOpenXServer 544
+#define MGK_XServerFatalErrorUnableToViewFonts 545
+#define MGK_XServerWarningUnableToGetVisual 546
+#define MGK_XServerWarningUsingDefaultVisual 547
 
 #endif
 
@@ -611,43 +614,43 @@
     { "Delegate/FatalError", 180, DelegateFatalError },
     { "Delegate/Warning", 181, DelegateWarning },
     { "Draw/Error", 182, DrawError },
-    { "Draw/FatalError", 187, DrawFatalError },
-    { "Draw/Warning", 188, DrawWarning },
-    { "File/Open/Error", 191, FileOpenError },
-    { "File/Open/FatalError", 194, FileOpenFatalError },
-    { "File/Open/Warning", 195, FileOpenWarning },
-    { "Image/Error", 196, ImageError },
-    { "Image/FatalError", 227, ImageFatalError },
-    { "Image/Warning", 228, ImageWarning },
-    { "Missing/Delegate/Error", 229, MissingDelegateError },
-    { "Missing/Delegate/FatalError", 241, MissingDelegateFatalError },
-    { "Missing/Delegate/Warning", 242, MissingDelegateWarning },
-    { "Module/Error", 243, ModuleError },
-    { "Module/FatalError", 248, ModuleFatalError },
-    { "Module/Warning", 249, ModuleWarning },
-    { "Monitor/Error", 250, MonitorError },
-    { "Monitor/FatalError", 251, MonitorFatalError },
-    { "Monitor/Warning", 253, MonitorWarning },
-    { "Option/Error", 254, OptionError },
-    { "Option/FatalError", 339, OptionFatalError },
-    { "Option/Warning", 361, OptionWarning },
-    { "Registry/Error", 362, RegistryError },
-    { "Registry/FatalError", 368, RegistryFatalError },
-    { "Registry/Warning", 369, RegistryWarning },
-    { "Resource/Limit/Error", 370, ResourceLimitError },
-    { "Resource/Limit/FatalError", 436, ResourceLimitFatalError },
-    { "Resource/Limit/Warning", 478, ResourceLimitWarning },
-    { "Stream/Error", 479, StreamError },
-    { "Stream/FatalError", 485, StreamFatalError },
-    { "Stream/Warning", 486, StreamWarning },
-    { "Type/Error", 487, TypeError },
-    { "Type/FatalError", 492, TypeFatalError },
-    { "Type/Warning", 493, TypeWarning },
-    { "Wand/Error", 494, WandError },
-    { "XServer/Error", 498, XServerError },
-    { "XServer/FatalError", 520, XServerFatalError },
-    { "XServer/Warning", 536, XServerWarning },
-    { 0, 538, UndefinedException }
+    { "Draw/FatalError", 193, DrawFatalError },
+    { "Draw/Warning", 194, DrawWarning },
+    { "File/Open/Error", 197, FileOpenError },
+    { "File/Open/FatalError", 200, FileOpenFatalError },
+    { "File/Open/Warning", 201, FileOpenWarning },
+    { "Image/Error", 202, ImageError },
+    { "Image/FatalError", 233, ImageFatalError },
+    { "Image/Warning", 234, ImageWarning },
+    { "Missing/Delegate/Error", 235, MissingDelegateError },
+    { "Missing/Delegate/FatalError", 247, MissingDelegateFatalError },
+    { "Missing/Delegate/Warning", 248, MissingDelegateWarning },
+    { "Module/Error", 249, ModuleError },
+    { "Module/FatalError", 254, ModuleFatalError },
+    { "Module/Warning", 255, ModuleWarning },
+    { "Monitor/Error", 256, MonitorError },
+    { "Monitor/FatalError", 257, MonitorFatalError },
+    { "Monitor/Warning", 259, MonitorWarning },
+    { "Option/Error", 260, OptionError },
+    { "Option/FatalError", 345, OptionFatalError },
+    { "Option/Warning", 367, OptionWarning },
+    { "Registry/Error", 368, RegistryError },
+    { "Registry/FatalError", 374, RegistryFatalError },
+    { "Registry/Warning", 375, RegistryWarning },
+    { "Resource/Limit/Error", 376, ResourceLimitError },
+    { "Resource/Limit/FatalError", 444, ResourceLimitFatalError },
+    { "Resource/Limit/Warning", 487, ResourceLimitWarning },
+    { "Stream/Error", 488, StreamError },
+    { "Stream/FatalError", 494, StreamFatalError },
+    { "Stream/Warning", 495, StreamWarning },
+    { "Type/Error", 496, TypeError },
+    { "Type/FatalError", 501, TypeFatalError },
+    { "Type/Warning", 502, TypeWarning },
+    { "Wand/Error", 503, WandError },
+    { "XServer/Error", 507, XServerError },
+    { "XServer/FatalError", 529, XServerFatalError },
+    { "XServer/Warning", 545, XServerWarning },
+    { 0, 547, UndefinedException }
   };
 #endif
 
@@ -846,361 +849,367 @@
     { "Default", 181 },
     { "Default", 182 },
     { "AlreadyPushingPatternDefinition", 183 },
-    { "NonconformingDrawingPrimitiveDefinition", 184 },
-    { "TooManyCoordinates", 185 },
-    { "UnableToPrint", 186 },
-    { "UnbalancedGraphicContextPushPop", 187 },
-    { "Default", 188 },
-    { "NotARelativeURL", 189 },
-    { "NotCurrentlyPushingPatternDefinition", 190 },
-    { "URLNotFound", 191 },
-    { "UnableToCreateTemporaryFile", 192 },
-    { "UnableToOpenFile", 193 },
-    { "UnableToWriteFile", 194 },
-    { "Default", 195 },
-    { "Default", 196 },
-    { "AngleIsDiscontinuous", 197 },
-    { "ColorspaceColorProfileMismatch", 198 },
-    { "ImageColorspaceDiffers", 199 },
-    { "ImageColorspaceMismatch", 200 },
-    { "ImageDifferenceExceedsLimit", 201 },
-    { "ImageDoesNotContainResolution", 202 },
-    { "ImageOpacityDiffers", 203 },
-    { "ImageSequenceIsRequired", 204 },
-    { "ImageSizeDiffers", 205 },
-    { "InvalidColormapIndex", 206 },
-    { "LeftAndRightImageSizesDiffer", 207 },
-    { "NoImagesWereFound", 208 },
-    { "NoImagesWereLoaded", 209 },
-    { "NoLocaleImageAttribute", 210 },
-    { "TooManyClusters", 211 },
-    { "UnableToAppendImage", 212 },
-    { "UnableToAssignProfile", 213 },
-    { "UnableToAverageImage", 214 },
-    { "UnableToCoalesceImage", 215 },
-    { "UnableToCompareImages", 216 },
-    { "UnableToCreateImageMosaic", 217 },
-    { "UnableToCreateStereoImage", 218 },
-    { "UnableToDeconstructImageSequence", 219 },
-    { "UnableToFlattenImage", 220 },
-    { "UnableToGetClipMask", 221 },
-    { "UnableToHandleImageChannel", 222 },
-    { "UnableToResizeImage", 223 },
-    { "UnableToSegmentImage", 224 },
-    { "UnableToSetClipMask", 225 },
-    { "UnableToShearImage", 226 },
-    { "WidthOrHeightExceedsLimit", 227 },
-    { "UnableToPersistKey", 228 },
-    { "Default", 229 },
-    { "DPSLibraryIsNotAvailable", 230 },
-    { "FPXLibraryIsNotAvailable", 231 },
-    { "FreeTypeLibraryIsNotAvailable", 232 },
-    { "JPEGLibraryIsNotAvailable", 233 },
-    { "LCMSLibraryIsNotAvailable", 234 },
-    { "LZWEncodingNotEnabled", 235 },
-    { "NoDecodeDelegateForThisImageFormat", 236 },
-    { "NoEncodeDelegateForThisImageFormat", 237 },
-    { "TIFFLibraryIsNotAvailable", 238 },
-    { "XMLLibraryIsNotAvailable", 239 },
-    { "XWindowLibraryIsNotAvailable", 240 },
-    { "ZipLibraryIsNotAvailable", 241 },
-    { "Default", 242 },
-    { "Default", 243 },
-    { "FailedToCloseModule", 244 },
-    { "FailedToFindSymbol", 245 },
-    { "UnableToLoadModule", 246 },
-    { "UnableToRegisterImageFormat", 247 },
-    { "UnrecognizedModule", 248 },
-    { "UnableToInitializeModuleLoader", 249 },
-    { "Default", 250 },
-    { "Default", 251 },
-    { "Default", 252 },
-    { "UserRequestedTerminationBySignal", 253 },
-    { "Default", 254 },
-    { "BevelWidthIsNegative", 255 },
-    { "ColorSeparatedImageRequired", 256 },
-    { "FrameIsLessThanImageSize", 257 },
-    { "GeometryDimensionsAreZero", 258 },
-    { "GeometryDoesNotContainImage", 259 },
-    { "HaldClutImageDimensionsInvalid", 260 },
-    { "ImagesAreNotTheSameSize", 261 },
-    { "ImageSizeMustExceedBevelWidth", 262 },
-    { "ImageSmallerThanKernelWidth", 263 },
-    { "ImageSmallerThanRadius", 264 },
-    { "ImageWidthsOrHeightsDiffer", 265 },
-    { "InputImagesAlreadySpecified", 266 },
-    { "InvalidSubimageSpecification", 267 },
-    { "KernelRadiusIsTooSmall", 268 },
-    { "KernelWidthMustBeAnOddNumber", 269 },
-    { "MatrixIsNotSquare", 270 },
-    { "MatrixOrderOutOfRange", 271 },
-    { "MissingAnImageFilename", 272 },
-    { "MissingArgument", 273 },
-    { "MustSpecifyAnImageName", 274 },
-    { "MustSpecifyImageSize", 275 },
-    { "NoBlobDefined", 276 },
-    { "NoImagesDefined", 277 },
-    { "NonzeroWidthAndHeightRequired", 278 },
-    { "NoProfileNameWasGiven", 279 },
-    { "NullBlobArgument", 280 },
-    { "ReferenceImageRequired", 281 },
-    { "ReferenceIsNotMyType", 282 },
-    { "RegionAreaExceedsLimit", 283 },
-    { "RequestDidNotReturnAnImage", 284 },
-    { "SteganoImageRequired", 285 },
-    { "StereoImageRequired", 286 },
-    { "SubimageSpecificationReturnsNoImages", 287 },
-    { "UnableToAddOrRemoveProfile", 288 },
-    { "UnableToAverageImageSequence", 289 },
-    { "UnableToBlurImage", 290 },
-    { "UnableToChopImage", 291 },
-    { "UnableToColorMatrixImage", 292 },
-    { "UnableToConstituteImage", 293 },
-    { "UnableToConvolveImage", 294 },
-    { "UnableToEdgeImage", 295 },
-    { "UnableToEqualizeImage", 296 },
-    { "UnableToFilterImage", 297 },
-    { "UnableToFormatImageMetadata", 298 },
-    { "UnableToFrameImage", 299 },
-    { "UnableToOilPaintImage", 300 },
-    { "UnableToPaintImage", 301 },
-    { "UnableToRaiseImage", 302 },
-    { "UnableToSharpenImage", 303 },
-    { "UnableToThresholdImage", 304 },
-    { "UnableToWaveImage", 305 },
-    { "UnrecognizedAttribute", 306 },
-    { "UnrecognizedChannelType", 307 },
-    { "UnrecognizedColor", 308 },
-    { "UnrecognizedColormapType", 309 },
-    { "UnrecognizedColorspace", 310 },
-    { "UnrecognizedCommand", 311 },
-    { "UnrecognizedComposeOperator", 312 },
-    { "UnrecognizedDisposeMethod", 313 },
-    { "UnrecognizedElement", 314 },
-    { "UnrecognizedEndianType", 315 },
-    { "UnrecognizedGravityType", 316 },
-    { "UnrecognizedHighlightStyle", 317 },
-    { "UnrecognizedImageCompression", 318 },
-    { "UnrecognizedImageFilter", 319 },
-    { "UnrecognizedImageFormat", 320 },
-    { "UnrecognizedImageMode", 321 },
-    { "UnrecognizedImageType", 322 },
-    { "UnrecognizedIntentType", 323 },
-    { "UnrecognizedInterlaceType", 324 },
-    { "UnrecognizedListType", 325 },
-    { "UnrecognizedMetric", 326 },
-    { "UnrecognizedModeType", 327 },
-    { "UnrecognizedNoiseType", 328 },
-    { "UnrecognizedOperator", 329 },
-    { "UnrecognizedOption", 330 },
-    { "UnrecognizedPerlMagickMethod", 331 },
-    { "UnrecognizedPixelMap", 332 },
-    { "UnrecognizedPreviewType", 333 },
-    { "UnrecognizedResourceType", 334 },
-    { "UnrecognizedType", 335 },
-    { "UnrecognizedUnitsType", 336 },
-    { "UnrecognizedVirtualPixelMethod", 337 },
-    { "UnsupportedSamplingFactor", 338 },
-    { "UsageError", 339 },
-    { "InvalidColorspaceType", 340 },
-    { "InvalidEndianType", 341 },
-    { "InvalidImageType", 342 },
-    { "InvalidInterlaceType", 343 },
-    { "MissingAnImageFilename", 344 },
-    { "MissingArgument", 345 },
-    { "NoImagesWereLoaded", 346 },
-    { "OptionLengthExceedsLimit", 347 },
-    { "RequestDidNotReturnAnImage", 348 },
-    { "UnableToOpenXServer", 349 },
-    { "UnableToPersistKey", 350 },
-    { "UnrecognizedColormapType", 351 },
-    { "UnrecognizedColorspaceType", 352 },
-    { "UnrecognizedDisposeMethod", 353 },
-    { "UnrecognizedEndianType", 354 },
-    { "UnrecognizedFilterType", 355 },
-    { "UnrecognizedImageCompressionType", 356 },
-    { "UnrecognizedImageType", 357 },
-    { "UnrecognizedInterlaceType", 358 },
-    { "UnrecognizedOption", 359 },
-    { "UnrecognizedResourceType", 360 },
-    { "UnrecognizedVirtualPixelMethod", 361 },
-    { "UnrecognizedColor", 362 },
-    { "ImageExpected", 363 },
-    { "ImageInfoExpected", 364 },
-    { "StructureSizeMismatch", 365 },
-    { "UnableToGetRegistryID", 366 },
-    { "UnableToLocateImage", 367 },
-    { "UnableToSetRegistry", 368 },
-    { "Default", 369 },
-    { "Default", 370 },
-    { "CacheResourcesExhausted", 371 },
-    { "ImagePixelLimitExceeded", 372 },
-    { "MemoryAllocationFailed", 373 },
-    { "NoPixelsDefinedInCache", 374 },
-    { "PixelCacheAllocationFailed", 375 },
-    { "UnableToAddColorProfile", 376 },
-    { "UnableToAddGenericProfile", 377 },
-    { "UnableToAddIPTCProfile", 378 },
-    { "UnableToAllocateCoefficients", 379 },
-    { "UnableToAllocateColormap", 380 },
-    { "UnableToAllocateICCProfile", 381 },
-    { "UnableToAllocateString", 382 },
-    { "UnableToAnnotateImage", 383 },
-    { "UnableToAverageImageSequence", 384 },
-    { "UnableToCloneDrawingWand", 385 },
-    { "UnableToCloneImage", 386 },
-    { "UnableToComputeImageSignature", 387 },
-    { "UnableToConstituteImage", 388 },
-    { "UnableToConvertFont", 389 },
-    { "UnableToConvertStringToTokens", 390 },
-    { "UnableToCreateColormap", 391 },
-    { "UnableToCreateColorTransform", 392 },
-    { "UnableToCreateCommandWidget", 393 },
-    { "UnableToCreateImageGroup", 394 },
-    { "UnableToCreateImageMontage", 395 },
-    { "UnableToCreateXWindow", 396 },
-    { "UnableToCropImage", 397 },
-    { "UnableToDespeckleImage", 398 },
-    { "UnableToDetermineImageClass", 399 },
-    { "UnableToDetermineTheNumberOfImageColors", 400 },
-    { "UnableToDitherImage", 401 },
-    { "UnableToDrawOnImage", 402 },
-    { "UnableToEdgeImage", 403 },
-    { "UnableToEmbossImage", 404 },
-    { "UnableToEnhanceImage", 405 },
-    { "UnableToFloodfillImage", 406 },
-    { "UnableToGammaCorrectImage", 407 },
-    { "UnableToGetBestIconSize", 408 },
-    { "UnableToGetFromRegistry", 409 },
-    { "UnableToGetPackageInfo", 410 },
-    { "UnableToLevelImage", 411 },
-    { "UnableToMagnifyImage", 412 },
-    { "UnableToManageColor", 413 },
-    { "UnableToMapImage", 414 },
-    { "UnableToMapImageSequence", 415 },
-    { "UnableToMedianFilterImage", 416 },
-    { "UnableToMotionBlurImage", 417 },
-    { "UnableToNoiseFilterImage", 418 },
-    { "UnableToNormalizeImage", 419 },
-    { "UnableToOpenColorProfile", 420 },
-    { "UnableToQuantizeImage", 421 },
-    { "UnableToQuantizeImageSequence", 422 },
-    { "UnableToReadTextChunk", 423 },
-    { "UnableToReadXImage", 424 },
-    { "UnableToReadXServerColormap", 425 },
-    { "UnableToResizeImage", 426 },
-    { "UnableToRotateImage", 427 },
-    { "UnableToSampleImage", 428 },
-    { "UnableToScaleImage", 429 },
-    { "UnableToSelectImage", 430 },
-    { "UnableToSharpenImage", 431 },
-    { "UnableToShaveImage", 432 },
-    { "UnableToShearImage", 433 },
-    { "UnableToSortImageColormap", 434 },
-    { "UnableToThresholdImage", 435 },
-    { "UnableToTransformColorspace", 436 },
-    { "MemoryAllocationFailed", 437 },
-    { "SemaporeOperationFailed", 438 },
-    { "UnableToAllocateAscii85Info", 439 },
-    { "UnableToAllocateCacheInfo", 440 },
-    { "UnableToAllocateCacheView", 441 },
-    { "UnableToAllocateColorInfo", 442 },
-    { "UnableToAllocateDashPattern", 443 },
-    { "UnableToAllocateDelegateInfo", 444 },
-    { "UnableToAllocateDerivatives", 445 },
-    { "UnableToAllocateDrawContext", 446 },
-    { "UnableToAllocateDrawInfo", 447 },
-    { "UnableToAllocateDrawingWand", 448 },
-    { "UnableToAllocateGammaMap", 449 },
-    { "UnableToAllocateImage", 450 },
-    { "UnableToAllocateImagePixels", 451 },
-    { "UnableToAllocateLogInfo", 452 },
-    { "UnableToAllocateMagicInfo", 453 },
-    { "UnableToAllocateMagickInfo", 454 },
-    { "UnableToAllocateModuleInfo", 455 },
-    { "UnableToAllocateMontageInfo", 456 },
-    { "UnableToAllocateQuantizeInfo", 457 },
-    { "UnableToAllocateRandomKernel", 458 },
-    { "UnableToAllocateRegistryInfo", 459 },
-    { "UnableToAllocateSemaphoreInfo", 460 },
-    { "UnableToAllocateString", 461 },
-    { "UnableToAllocateTypeInfo", 462 },
-    { "UnableToAllocateWand", 463 },
-    { "UnableToAnimateImageSequence", 464 },
-    { "UnableToCloneBlobInfo", 465 },
-    { "UnableToCloneCacheInfo", 466 },
-    { "UnableToCloneImage", 467 },
-    { "UnableToCloneImageInfo", 468 },
-    { "UnableToConcatenateString", 469 },
-    { "UnableToConvertText", 470 },
-    { "UnableToCreateColormap", 471 },
-    { "UnableToDestroySemaphore", 472 },
-    { "UnableToDisplayImage", 473 },
-    { "UnableToEscapeString", 474 },
-    { "UnableToInitializeSemaphore", 475 },
-    { "UnableToInterpretMSLImage", 476 },
-    { "UnableToLockSemaphore", 477 },
-    { "UnableToUnlockSemaphore", 478 },
-    { "MemoryAllocationFailed", 479 },
-    { "ImageDoesNotContainTheStreamGeometry", 480 },
-    { "NoStreamHandlerIsDefined", 481 },
-    { "PixelCacheIsNotOpen", 482 },
-    { "UnableToAcquirePixelStream", 483 },
-    { "UnableToSetPixelStream", 484 },
-    { "UnableToSyncPixelStream", 485 },
-    { "Default", 486 },
-    { "Default", 487 },
-    { "FontSubstitutionRequired", 488 },
-    { "UnableToGetTypeMetrics", 489 },
-    { "UnableToInitializeFreetypeLibrary", 490 },
-    { "UnableToReadFont", 491 },
-    { "UnrecognizedFontEncoding", 492 },
-    { "Default", 493 },
-    { "Default", 494 },
-    { "InvalidColormapIndex", 495 },
-    { "WandAPINotImplemented", 496 },
-    { "WandContainsNoImageIndexs", 497 },
-    { "WandContainsNoImages", 498 },
-    { "ColorIsNotKnownToServer", 499 },
-    { "NoWindowWithSpecifiedIDExists", 500 },
-    { "StandardColormapIsNotInitialized", 501 },
-    { "UnableToConnectToRemoteDisplay", 502 },
-    { "UnableToCreateBitmap", 503 },
-    { "UnableToCreateColormap", 504 },
-    { "UnableToCreatePixmap", 505 },
-    { "UnableToCreateProperty", 506 },
-    { "UnableToCreateStandardColormap", 507 },
-    { "UnableToDisplayImageInfo", 508 },
-    { "UnableToGetProperty", 509 },
-    { "UnableToGetStandardColormap", 510 },
-    { "UnableToGetVisual", 511 },
-    { "UnableToGrabMouse", 512 },
-    { "UnableToLoadFont", 513 },
-    { "UnableToMatchVisualToStandardColormap", 514 },
-    { "UnableToOpenXServer", 515 },
-    { "UnableToReadXAttributes", 516 },
-    { "UnableToReadXWindowImage", 517 },
-    { "UnrecognizedColormapType", 518 },
-    { "UnrecognizedGravityType", 519 },
-    { "UnrecognizedVisualSpecifier", 520 },
-    { "UnableToAllocateXHints", 521 },
-    { "UnableToCreateCursor", 522 },
-    { "UnableToCreateGraphicContext", 523 },
-    { "UnableToCreateStandardColormap", 524 },
-    { "UnableToCreateTextProperty", 525 },
-    { "UnableToCreateXImage", 526 },
-    { "UnableToCreateXPixmap", 527 },
-    { "UnableToCreateXWindow", 528 },
-    { "UnableToDisplayImage", 529 },
-    { "UnableToDitherImage", 530 },
-    { "UnableToGetPixelInfo", 531 },
-    { "UnableToGetVisual", 532 },
-    { "UnableToLoadFont", 533 },
-    { "UnableToMakeXWindow", 534 },
-    { "UnableToOpenXServer", 535 },
-    { "UnableToViewFonts", 536 },
-    { "UnableToGetVisual", 537 },
-    { "UsingDefaultVisual", 538 },
+    { "FloatValueConversionError", 187 },
+    { "IntegerValueConversionError", 188 },
+    { "NonconformingDrawingPrimitiveDefinition", 189 },
+    { "TooManyCoordinates", 190 },
+    { "UnableToPrint", 191 },
+    { "UnbalancedGraphicContextPushPop", 192 },
+    { "VectorPathTruncated", 193 },
+    { "Default", 194 },
+    { "NotARelativeURL", 195 },
+    { "NotCurrentlyPushingPatternDefinition", 196 },
+    { "URLNotFound", 197 },
+    { "UnableToCreateTemporaryFile", 198 },
+    { "UnableToOpenFile", 199 },
+    { "UnableToWriteFile", 200 },
+    { "Default", 201 },
+    { "Default", 202 },
+    { "AngleIsDiscontinuous", 203 },
+    { "ColorspaceColorProfileMismatch", 204 },
+    { "ImageColorspaceDiffers", 205 },
+    { "ImageColorspaceMismatch", 206 },
+    { "ImageDifferenceExceedsLimit", 207 },
+    { "ImageDoesNotContainResolution", 208 },
+    { "ImageOpacityDiffers", 209 },
+    { "ImageSequenceIsRequired", 210 },
+    { "ImageSizeDiffers", 211 },
+    { "InvalidColormapIndex", 212 },
+    { "LeftAndRightImageSizesDiffer", 213 },
+    { "NoImagesWereFound", 214 },
+    { "NoImagesWereLoaded", 215 },
+    { "NoLocaleImageAttribute", 216 },
+    { "TooManyClusters", 217 },
+    { "UnableToAppendImage", 218 },
+    { "UnableToAssignProfile", 219 },
+    { "UnableToAverageImage", 220 },
+    { "UnableToCoalesceImage", 221 },
+    { "UnableToCompareImages", 222 },
+    { "UnableToCreateImageMosaic", 223 },
+    { "UnableToCreateStereoImage", 224 },
+    { "UnableToDeconstructImageSequence", 225 },
+    { "UnableToFlattenImage", 226 },
+    { "UnableToGetClipMask", 227 },
+    { "UnableToHandleImageChannel", 228 },
+    { "UnableToResizeImage", 229 },
+    { "UnableToSegmentImage", 230 },
+    { "UnableToSetClipMask", 231 },
+    { "UnableToShearImage", 232 },
+    { "WidthOrHeightExceedsLimit", 233 },
+    { "UnableToPersistKey", 234 },
+    { "Default", 235 },
+    { "DPSLibraryIsNotAvailable", 236 },
+    { "FPXLibraryIsNotAvailable", 237 },
+    { "FreeTypeLibraryIsNotAvailable", 238 },
+    { "JPEGLibraryIsNotAvailable", 239 },
+    { "LCMSLibraryIsNotAvailable", 240 },
+    { "LZWEncodingNotEnabled", 241 },
+    { "NoDecodeDelegateForThisImageFormat", 242 },
+    { "NoEncodeDelegateForThisImageFormat", 243 },
+    { "TIFFLibraryIsNotAvailable", 244 },
+    { "XMLLibraryIsNotAvailable", 245 },
+    { "XWindowLibraryIsNotAvailable", 246 },
+    { "ZipLibraryIsNotAvailable", 247 },
+    { "Default", 248 },
+    { "Default", 249 },
+    { "FailedToCloseModule", 250 },
+    { "FailedToFindSymbol", 251 },
+    { "UnableToLoadModule", 252 },
+    { "UnableToRegisterImageFormat", 253 },
+    { "UnrecognizedModule", 254 },
+    { "UnableToInitializeModuleLoader", 255 },
+    { "Default", 256 },
+    { "Default", 257 },
+    { "Default", 258 },
+    { "UserRequestedTerminationBySignal", 259 },
+    { "Default", 260 },
+    { "BevelWidthIsNegative", 261 },
+    { "ColorSeparatedImageRequired", 262 },
+    { "FrameIsLessThanImageSize", 263 },
+    { "GeometryDimensionsAreZero", 264 },
+    { "GeometryDoesNotContainImage", 265 },
+    { "HaldClutImageDimensionsInvalid", 266 },
+    { "ImagesAreNotTheSameSize", 267 },
+    { "ImageSizeMustExceedBevelWidth", 268 },
+    { "ImageSmallerThanKernelWidth", 269 },
+    { "ImageSmallerThanRadius", 270 },
+    { "ImageWidthsOrHeightsDiffer", 271 },
+    { "InputImagesAlreadySpecified", 272 },
+    { "InvalidSubimageSpecification", 273 },
+    { "KernelRadiusIsTooSmall", 274 },
+    { "KernelWidthMustBeAnOddNumber", 275 },
+    { "MatrixIsNotSquare", 276 },
+    { "MatrixOrderOutOfRange", 277 },
+    { "MissingAnImageFilename", 278 },
+    { "MissingArgument", 279 },
+    { "MustSpecifyAnImageName", 280 },
+    { "MustSpecifyImageSize", 281 },
+    { "NoBlobDefined", 282 },
+    { "NoImagesDefined", 283 },
+    { "NonzeroWidthAndHeightRequired", 284 },
+    { "NoProfileNameWasGiven", 285 },
+    { "NullBlobArgument", 286 },
+    { "ReferenceImageRequired", 287 },
+    { "ReferenceIsNotMyType", 288 },
+    { "RegionAreaExceedsLimit", 289 },
+    { "RequestDidNotReturnAnImage", 290 },
+    { "SteganoImageRequired", 291 },
+    { "StereoImageRequired", 292 },
+    { "SubimageSpecificationReturnsNoImages", 293 },
+    { "UnableToAddOrRemoveProfile", 294 },
+    { "UnableToAverageImageSequence", 295 },
+    { "UnableToBlurImage", 296 },
+    { "UnableToChopImage", 297 },
+    { "UnableToColorMatrixImage", 298 },
+    { "UnableToConstituteImage", 299 },
+    { "UnableToConvolveImage", 300 },
+    { "UnableToEdgeImage", 301 },
+    { "UnableToEqualizeImage", 302 },
+    { "UnableToFilterImage", 303 },
+    { "UnableToFormatImageMetadata", 304 },
+    { "UnableToFrameImage", 305 },
+    { "UnableToOilPaintImage", 306 },
+    { "UnableToPaintImage", 307 },
+    { "UnableToRaiseImage", 308 },
+    { "UnableToSharpenImage", 309 },
+    { "UnableToThresholdImage", 310 },
+    { "UnableToWaveImage", 311 },
+    { "UnrecognizedAttribute", 312 },
+    { "UnrecognizedChannelType", 313 },
+    { "UnrecognizedColor", 314 },
+    { "UnrecognizedColormapType", 315 },
+    { "UnrecognizedColorspace", 316 },
+    { "UnrecognizedCommand", 317 },
+    { "UnrecognizedComposeOperator", 318 },
+    { "UnrecognizedDisposeMethod", 319 },
+    { "UnrecognizedElement", 320 },
+    { "UnrecognizedEndianType", 321 },
+    { "UnrecognizedGravityType", 322 },
+    { "UnrecognizedHighlightStyle", 323 },
+    { "UnrecognizedImageCompression", 324 },
+    { "UnrecognizedImageFilter", 325 },
+    { "UnrecognizedImageFormat", 326 },
+    { "UnrecognizedImageMode", 327 },
+    { "UnrecognizedImageType", 328 },
+    { "UnrecognizedIntentType", 329 },
+    { "UnrecognizedInterlaceType", 330 },
+    { "UnrecognizedListType", 331 },
+    { "UnrecognizedMetric", 332 },
+    { "UnrecognizedModeType", 333 },
+    { "UnrecognizedNoiseType", 334 },
+    { "UnrecognizedOperator", 335 },
+    { "UnrecognizedOption", 336 },
+    { "UnrecognizedPerlMagickMethod", 337 },
+    { "UnrecognizedPixelMap", 338 },
+    { "UnrecognizedPreviewType", 339 },
+    { "UnrecognizedResourceType", 340 },
+    { "UnrecognizedType", 341 },
+    { "UnrecognizedUnitsType", 342 },
+    { "UnrecognizedVirtualPixelMethod", 343 },
+    { "UnsupportedSamplingFactor", 344 },
+    { "UsageError", 345 },
+    { "InvalidColorspaceType", 346 },
+    { "InvalidEndianType", 347 },
+    { "InvalidImageType", 348 },
+    { "InvalidInterlaceType", 349 },
+    { "MissingAnImageFilename", 350 },
+    { "MissingArgument", 351 },
+    { "NoImagesWereLoaded", 352 },
+    { "OptionLengthExceedsLimit", 353 },
+    { "RequestDidNotReturnAnImage", 354 },
+    { "UnableToOpenXServer", 355 },
+    { "UnableToPersistKey", 356 },
+    { "UnrecognizedColormapType", 357 },
+    { "UnrecognizedColorspaceType", 358 },
+    { "UnrecognizedDisposeMethod", 359 },
+    { "UnrecognizedEndianType", 360 },
+    { "UnrecognizedFilterType", 361 },
+    { "UnrecognizedImageCompressionType", 362 },
+    { "UnrecognizedImageType", 363 },
+    { "UnrecognizedInterlaceType", 364 },
+    { "UnrecognizedOption", 365 },
+    { "UnrecognizedResourceType", 366 },
+    { "UnrecognizedVirtualPixelMethod", 367 },
+    { "UnrecognizedColor", 368 },
+    { "ImageExpected", 369 },
+    { "ImageInfoExpected", 370 },
+    { "StructureSizeMismatch", 371 },
+    { "UnableToGetRegistryID", 372 },
+    { "UnableToLocateImage", 373 },
+    { "UnableToSetRegistry", 374 },
+    { "Default", 375 },
+    { "Default", 376 },
+    { "CacheResourcesExhausted", 377 },
+    { "ImagePixelHeightLimitExceeded", 378 },
+    { "ImagePixelLimitExceeded", 379 },
+    { "ImagePixelWidthLimitExceeded", 380 },
+    { "MemoryAllocationFailed", 381 },
+    { "NoPixelsDefinedInCache", 382 },
+    { "PixelCacheAllocationFailed", 383 },
+    { "UnableToAddColorProfile", 384 },
+    { "UnableToAddGenericProfile", 385 },
+    { "UnableToAddIPTCProfile", 386 },
+    { "UnableToAllocateCoefficients", 387 },
+    { "UnableToAllocateColormap", 388 },
+    { "UnableToAllocateICCProfile", 389 },
+    { "UnableToAllocateString", 390 },
+    { "UnableToAnnotateImage", 391 },
+    { "UnableToAverageImageSequence", 392 },
+    { "UnableToCloneDrawingWand", 393 },
+    { "UnableToCloneImage", 394 },
+    { "UnableToComputeImageSignature", 395 },
+    { "UnableToConstituteImage", 396 },
+    { "UnableToConvertFont", 397 },
+    { "UnableToConvertStringToTokens", 398 },
+    { "UnableToCreateColormap", 399 },
+    { "UnableToCreateColorTransform", 400 },
+    { "UnableToCreateCommandWidget", 401 },
+    { "UnableToCreateImageGroup", 402 },
+    { "UnableToCreateImageMontage", 403 },
+    { "UnableToCreateXWindow", 404 },
+    { "UnableToCropImage", 405 },
+    { "UnableToDespeckleImage", 406 },
+    { "UnableToDetermineImageClass", 407 },
+    { "UnableToDetermineTheNumberOfImageColors", 408 },
+    { "UnableToDitherImage", 409 },
+    { "UnableToDrawOnImage", 410 },
+    { "UnableToEdgeImage", 411 },
+    { "UnableToEmbossImage", 412 },
+    { "UnableToEnhanceImage", 413 },
+    { "UnableToFloodfillImage", 414 },
+    { "UnableToGammaCorrectImage", 415 },
+    { "UnableToGetBestIconSize", 416 },
+    { "UnableToGetFromRegistry", 417 },
+    { "UnableToGetPackageInfo", 418 },
+    { "UnableToLevelImage", 419 },
+    { "UnableToMagnifyImage", 420 },
+    { "UnableToManageColor", 421 },
+    { "UnableToMapImage", 422 },
+    { "UnableToMapImageSequence", 423 },
+    { "UnableToMedianFilterImage", 424 },
+    { "UnableToMotionBlurImage", 425 },
+    { "UnableToNoiseFilterImage", 426 },
+    { "UnableToNormalizeImage", 427 },
+    { "UnableToOpenColorProfile", 428 },
+    { "UnableToQuantizeImage", 429 },
+    { "UnableToQuantizeImageSequence", 430 },
+    { "UnableToReadTextChunk", 431 },
+    { "UnableToReadXImage", 432 },
+    { "UnableToReadXServerColormap", 433 },
+    { "UnableToResizeImage", 434 },
+    { "UnableToRotateImage", 435 },
+    { "UnableToSampleImage", 436 },
+    { "UnableToScaleImage", 437 },
+    { "UnableToSelectImage", 438 },
+    { "UnableToSharpenImage", 439 },
+    { "UnableToShaveImage", 440 },
+    { "UnableToShearImage", 441 },
+    { "UnableToSortImageColormap", 442 },
+    { "UnableToThresholdImage", 443 },
+    { "UnableToTransformColorspace", 444 },
+    { "MemoryAllocationFailed", 445 },
+    { "SemaporeOperationFailed", 446 },
+    { "UnableToAllocateAscii85Info", 447 },
+    { "UnableToAllocateCacheInfo", 448 },
+    { "UnableToAllocateCacheView", 449 },
+    { "UnableToAllocateColorInfo", 450 },
+    { "UnableToAllocateDashPattern", 451 },
+    { "UnableToAllocateDelegateInfo", 452 },
+    { "UnableToAllocateDerivatives", 453 },
+    { "UnableToAllocateDrawContext", 454 },
+    { "UnableToAllocateDrawInfo", 455 },
+    { "UnableToAllocateDrawingWand", 456 },
+    { "UnableToAllocateGammaMap", 457 },
+    { "UnableToAllocateImage", 458 },
+    { "UnableToAllocateImagePixels", 459 },
+    { "UnableToAllocateLogInfo", 460 },
+    { "UnableToAllocateMagicInfo", 461 },
+    { "UnableToAllocateMagickInfo", 462 },
+    { "UnableToAllocateModuleInfo", 463 },
+    { "UnableToAllocateMontageInfo", 464 },
+    { "UnableToAllocateQuantizeInfo", 465 },
+    { "UnableToAllocateRandomKernel", 466 },
+    { "UnableToAllocateRegistryInfo", 467 },
+    { "UnableToAllocateSemaphoreInfo", 468 },
+    { "UnableToAllocateString", 469 },
+    { "UnableToAllocateTypeInfo", 470 },
+    { "UnableToAllocateWand", 471 },
+    { "UnableToAnimateImageSequence", 472 },
+    { "UnableToCloneBlobInfo", 473 },
+    { "UnableToCloneCacheInfo", 474 },
+    { "UnableToCloneImage", 475 },
+    { "UnableToCloneImageInfo", 476 },
+    { "UnableToConcatenateString", 477 },
+    { "UnableToConvertText", 478 },
+    { "UnableToCreateColormap", 479 },
+    { "UnableToDestroySemaphore", 480 },
+    { "UnableToDisplayImage", 481 },
+    { "UnableToEscapeString", 482 },
+    { "UnableToInitializeSemaphore", 483 },
+    { "UnableToInterpretMSLImage", 484 },
+    { "UnableToLockSemaphore", 485 },
+    { "UnableToObtainRandomEntropy", 486 },
+    { "UnableToUnlockSemaphore", 487 },
+    { "MemoryAllocationFailed", 488 },
+    { "ImageDoesNotContainTheStreamGeometry", 489 },
+    { "NoStreamHandlerIsDefined", 490 },
+    { "PixelCacheIsNotOpen", 491 },
+    { "UnableToAcquirePixelStream", 492 },
+    { "UnableToSetPixelStream", 493 },
+    { "UnableToSyncPixelStream", 494 },
+    { "Default", 495 },
+    { "Default", 496 },
+    { "FontSubstitutionRequired", 497 },
+    { "UnableToGetTypeMetrics", 498 },
+    { "UnableToInitializeFreetypeLibrary", 499 },
+    { "UnableToReadFont", 500 },
+    { "UnrecognizedFontEncoding", 501 },
+    { "Default", 502 },
+    { "Default", 503 },
+    { "InvalidColormapIndex", 504 },
+    { "WandAPINotImplemented", 505 },
+    { "WandContainsNoImageIndexs", 506 },
+    { "WandContainsNoImages", 507 },
+    { "ColorIsNotKnownToServer", 508 },
+    { "NoWindowWithSpecifiedIDExists", 509 },
+    { "StandardColormapIsNotInitialized", 510 },
+    { "UnableToConnectToRemoteDisplay", 511 },
+    { "UnableToCreateBitmap", 512 },
+    { "UnableToCreateColormap", 513 },
+    { "UnableToCreatePixmap", 514 },
+    { "UnableToCreateProperty", 515 },
+    { "UnableToCreateStandardColormap", 516 },
+    { "UnableToDisplayImageInfo", 517 },
+    { "UnableToGetProperty", 518 },
+    { "UnableToGetStandardColormap", 519 },
+    { "UnableToGetVisual", 520 },
+    { "UnableToGrabMouse", 521 },
+    { "UnableToLoadFont", 522 },
+    { "UnableToMatchVisualToStandardColormap", 523 },
+    { "UnableToOpenXServer", 524 },
+    { "UnableToReadXAttributes", 525 },
+    { "UnableToReadXWindowImage", 526 },
+    { "UnrecognizedColormapType", 527 },
+    { "UnrecognizedGravityType", 528 },
+    { "UnrecognizedVisualSpecifier", 529 },
+    { "UnableToAllocateXHints", 530 },
+    { "UnableToCreateCursor", 531 },
+    { "UnableToCreateGraphicContext", 532 },
+    { "UnableToCreateStandardColormap", 533 },
+    { "UnableToCreateTextProperty", 534 },
+    { "UnableToCreateXImage", 535 },
+    { "UnableToCreateXPixmap", 536 },
+    { "UnableToCreateXWindow", 537 },
+    { "UnableToDisplayImage", 538 },
+    { "UnableToDitherImage", 539 },
+    { "UnableToGetPixelInfo", 540 },
+    { "UnableToGetVisual", 541 },
+    { "UnableToLoadFont", 542 },
+    { "UnableToMakeXWindow", 543 },
+    { "UnableToOpenXServer", 544 },
+    { "UnableToViewFonts", 545 },
+    { "UnableToGetVisual", 546 },
+    { "UsingDefaultVisual", 547 },
     { 0, 0 }
   };
 #endif
@@ -1398,10 +1404,13 @@
     "default error",
     "default warning",
     "Already pushing pattern definition",
+    "text value does not convert to float",
+    "text value does not convert to integer",
     "Non-conforming drawing primitive definition",
     "too many coordinates",
     "Unable to print",
     "unbalanced graphic context push-pop",
+    "vector path truncated",
     "default error",
     "Not a relative URL",
     "Not currently pushing pattern definition",
diff -r 9ba30629488e -r e797bb0aec31 magick/render.c
--- a/magick/render.c	Sat Apr 30 18:31:06 2016 -0500
+++ b/magick/render.c	Sat Apr 30 18:32:03 2016 -0500
@@ -128,7 +128,7 @@
   DrawStrokePolygon(Image *,const DrawInfo *,const PrimitiveInfo *);
 
 static unsigned long
-  TracePath(PrimitiveInfo *,const char *);
+  TracePath(Image *image, PrimitiveInfo *,const char *);
 
 static void
 #if 0
@@ -148,6 +148,41 @@
     PointInfo),
   TraceSquareLinecap(PrimitiveInfo *,const unsigned long,const double);
 
+static inline MagickPassFail MagickAtoFChk(const char *str, double *value)
+{
+  char *estr=0;
+  *value=strtod(str,&estr);
+  return (str == estr ? MagickFail : MagickPass);
+}
+#if 0
+static inline MagickPassFail MagickAtoIChk(const char *str, int *value)
+{
+  char *estr=0;
+  *value=(int) strtol(str,&estr, 10);
+  return (str == estr ? MagickFail : MagickPass);
+}
+#endif
+static inline MagickPassFail MagickAtoUIChk(const char *str, unsigned int *value)
+{
+  char *estr=0;
+  *value=(unsigned int) strtol(str,&estr, 10);
+  return (str == estr ? MagickFail : MagickPass);
+}
+#if 0
+static inline MagickPassFail MagickAtoLChk(const char *str, long *value)
+{
+  char *estr=0;
+  *value=strtol(str,&estr, 10);
+  return (str == estr ? MagickFail : MagickPass);
+}
+#endif
+static inline MagickPassFail MagickAtoULChk(const char *str, unsigned long *value)
+{
+  char *estr=0;
+  *value=(unsigned long) strtol(str,&estr, 10);
+  return (str == estr ? MagickFail : MagickPass);
+}
+
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
@@ -1705,7 +1740,8 @@
     bounds;
 
   size_t
-    length;
+    length,
+    token_max_length;
 
   MagickPassFail
     status;
@@ -1761,6 +1797,7 @@
     }
   graphic_context[n]=CloneDrawInfo((ImageInfo *) NULL,draw_info);
   token=AllocateString(primitive);
+  token_max_length=strlen(token);
   (void) QueryColorDatabase("black",&start_color,&image->exception);
   (void) SetImageType(image,TrueColorType);
   status=MagickPass;
@@ -1774,7 +1809,8 @@
     /*
       Interpret graphic primitive.
     */
-    GetToken(q,&q,keyword);
+    if (MagickGetToken(q,&q,keyword,MaxTextExtent) < 1)
+      break;
     if (*keyword == '\0')
       break;
     if (*keyword == '#')
@@ -1799,28 +1835,54 @@
       {
         if (LocaleCompare("affine",keyword) == 0)
           {
-            GetToken(q,&q,token);
-            affine.sx=MagickAtoF(token);
-            GetToken(q,&q,token);
-            if (*token == ',')
-              GetToken(q,&q,token);
-            affine.rx=MagickAtoF(token);
-            GetToken(q,&q,token);
-            if (*token == ',')
-              GetToken(q,&q,token);
-            affine.ry=MagickAtoF(token);
-            GetToken(q,&q,token);
-            if (*token == ',')
-              GetToken(q,&q,token);
-            affine.sy=MagickAtoF(token);
-            GetToken(q,&q,token);
-            if (*token == ',')
-              GetToken(q,&q,token);
-            affine.tx=MagickAtoF(token);
-            GetToken(q,&q,token);
-            if (*token == ',')
-              GetToken(q,&q,token);
-            affine.ty=MagickAtoF(token);
+            MagickBool affine_args_good = MagickFalse;
+            do
+              {
+                if (MagickGetToken(q,&q,token,token_max_length) < 1)
+                  break;
+                if (MagickAtoFChk(token,&affine.sx) != MagickPass)
+                  break;
+                if (MagickGetToken(q,&q,token,token_max_length) < 1)
+                  break;
+                if (*token == ',')
+                  if (MagickGetToken(q,&q,token,token_max_length) < 1)
+                    break;
+                if (MagickAtoFChk(token,&affine.rx) != MagickPass)
+                  break;
+                if (MagickGetToken(q,&q,token,token_max_length) < 1)
+                  break;
+                if (*token == ',')
+                  if (MagickGetToken(q,&q,token,token_max_length) < 1)
+                    break;
+                if (MagickAtoFChk(token,&affine.ry) != MagickPass)
+                  break;
+                if (MagickGetToken(q,&q,token,token_max_length) < 1)
+                  break;
+                if (*token == ',')
+                  if (MagickGetToken(q,&q,token,token_max_length) < 1)
+                    break;
+                if (MagickAtoFChk(token,&affine.sy) != MagickPass)
+                  break;
+                if (MagickGetToken(q,&q,token,token_max_length) < 1)
+                  break;
+                if (*token == ',')
+                  if (MagickGetToken(q,&q,token,token_max_length) < 1)
+                    break;
+                if (MagickAtoFChk(token,&affine.tx) != MagickPass)
+                  break;
+                if (MagickGetToken(q,&q,token,token_max_length) < 1)
+                  break;
+                if (*token == ',')
+                  if (MagickGetToken(q,&q,token,token_max_length) < 1)
+                    break;
+                if (MagickAtoFChk(token,&affine.ty) != MagickPass)
+                  break;
+                affine_args_good=MagickTrue;
+              } while (0);
+            if (affine_args_good != MagickTrue)
+              {
+                status=MagickFail;
+              }
             break;
           }
         if (LocaleCompare("arc",keyword) == 0)
@@ -1850,7 +1912,11 @@
             /*
               Create clip mask.
             */
-            GetToken(q,&q,token);
+            if (MagickGetToken(q,&q,token,token_max_length) < 1)
+              {
+                status=MagickFail;
+                break;
+              }
             (void) CloneString(&graphic_context[n]->clip_path,token);
             (void) DrawClipPath(image,graphic_context[n],
               graphic_context[n]->clip_path);
@@ -1948,7 +2014,11 @@
           }
         if (LocaleCompare("encoding",keyword) == 0)
           {
-            GetToken(q,&q,token);
+            if (MagickGetToken(q,&q,token,token_max_length) < 1)
+              {
+                status=MagickFail;
+                break;
+              }
             (void) CloneString(&graphic_context[n]->encoding,token);
             break;
           }
@@ -2008,7 +2078,10 @@
           }
         if (LocaleCompare("font-family",keyword) == 0)
           {
-            GetToken(q,&q,token);
+            MagickGetToken(q,&q,token,token_max_length);
+            fprintf(stderr,"%s\n",token);
+            if ((token[0] == '\'') && (token[strlen(token)-1] == '\''))
+              fprintf(stderr,"==== Hit \n");
             (void) CloneString(&graphic_context[n]->family,token);
             break;
           }
@@ -2057,20 +2130,29 @@
           }
         if (LocaleCompare("font-weight",keyword) == 0)
           {
-            GetToken(q,&q,token);
-            graphic_context[n]->weight=MagickAtoL(token);
+            if (MagickGetToken(q,&q,token,token_max_length) < 1)
+              {
+                status=MagickFail;
+                break;
+              }
             if (LocaleCompare(token,"all") == 0)
               graphic_context[n]->weight=0;
-            if (LocaleCompare(token,"bold") == 0)
+            else if (LocaleCompare(token,"bold") == 0)
               graphic_context[n]->weight=700;
-            if (LocaleCompare(token,"bolder") == 0)
-              if (graphic_context[n]->weight <= 800)
-                graphic_context[n]->weight+=100;
-            if (LocaleCompare(token,"lighter") == 0)
-              if (graphic_context[n]->weight >= 100)
-                graphic_context[n]->weight-=100;
-            if (LocaleCompare(token,"normal") == 0)
+            else if (LocaleCompare(token,"bolder") == 0)
+              {
+                if (graphic_context[n]->weight <= 800)
+                  graphic_context[n]->weight+=100;
+              }
+            else if (LocaleCompare(token,"lighter") == 0)
+              {
+                if (graphic_context[n]->weight >= 100)
+                  graphic_context[n]->weight-=100;
+              }
+            else if (LocaleCompare(token,"normal") == 0)
               graphic_context[n]->weight=400;
+            else if (MagickAtoULChk(token,&graphic_context[n]->weight) != MagickPass)
+              status=MagickFail;
             break;
           }
         status=MagickFail;
@@ -3006,7 +3088,7 @@
       }
       case PathPrimitive:
       {
-        i=(long) (j+TracePath(primitive_info+j,token));
+        i=(long) (j+TracePath(image,primitive_info+j,token));
         break;
       }
       case ColorPrimitive:
@@ -4814,8 +4896,50 @@
   primitive_info->coordinates=2;
 }
 
+/*
+  Special wrapper macros around strtod(), strtol(), and
+  MagickGetToken() to support TracePath() parsing error detection and
+  reporting.
+*/
+#define MagickTracePathAtoF(str,value)                          \
+  do {                                                          \
+    if (MagickAtoFChk(str,value) != MagickPass)                \
+      {                                                         \
+        ThrowException(&image->exception,DrawError,FloatValueConversionError,str); \
+        return 0;                                               \
+      }                                                         \
+  } while(0)
+
+#define MagickTracePathAtoI(str,value)                       \
+  do {                                                       \
+    if (MagickAtoIChk(str,value) != MagickPass)              \
+      {                                                      \
+        ThrowException(&image->exception,DrawError,IntegerValueConversionError,str); \
+        return 0;                                            \
+      }                                                      \
+  } while(0)
+
+#define MagickTracePathAtoUI(str,value)                       \
+  do {                                                       \
+    if (MagickAtoUIChk(str,value) != MagickPass)              \
+      {                                                      \
+        ThrowException(&image->exception,DrawError,IntegerValueConversionError,str); \
+        return 0;                                            \
+      }                                                      \
+  } while(0)
+
+#define MagickGetTracePathToken(p,ep,token,extent)        \
+  do {                                                    \
+    if (MagickGetToken(p,ep,token,extent) < 1)            \
+      {                                                   \
+        ThrowException(&image->exception,DrawError,VectorPathTruncated,p); \
+        return 0;                        \
+      }                                                   \
+  } while(0)
+
+
 static unsigned long
-TracePath(PrimitiveInfo *primitive_info,const char *path)
+TracePath(Image *image,PrimitiveInfo *primitive_info,const char *path)
 {
   char
     token[MaxTextExtent];
@@ -4869,48 +4993,48 @@
       case 'A':
       {
         MagickBool
-          large_arc,
-          sweep;
+          large_arc = MagickFalse,
+          sweep = MagickFalse;
 
         double
-          angle;
+          angle = 0.0;
 
         PointInfo
-          arc;
+          arc = {0,0};
 
         /*
           Compute arc points.
         */
         do
         {
-          GetToken(p,&p,token);
+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
           if (*token == ',')
-            GetToken(p,&p,token);
-          arc.x=MagickAtoF(token);
-          GetToken(p,&p,token);
+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
+          MagickTracePathAtoF(token,&arc.x);
+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
           if (*token == ',')
-            GetToken(p,&p,token);
-          arc.y=MagickAtoF(token);
-          GetToken(p,&p,token);
+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
+          MagickTracePathAtoF(token,&arc.y);
+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
           if (*token == ',')
-            GetToken(p,&p,token);
-          angle=MagickAtoF(token);
-          GetToken(p,&p,token);
+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
+          MagickTracePathAtoF(token,&angle);
+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
           if (*token == ',')
-            GetToken(p,&p,token);
-          large_arc=MagickAtoI(token);
-          GetToken(p,&p,token);
+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
+          MagickTracePathAtoUI(token,&large_arc);
+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
           if (*token == ',')
-            GetToken(p,&p,token);
-          sweep=MagickAtoI(token);
-          GetToken(p,&p,token);
+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
+          MagickTracePathAtoUI(token,&sweep);
+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
           if (*token == ',')
-            GetToken(p,&p,token);
-          x=MagickAtoF(token);
-          GetToken(p,&p,token);
+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
+          MagickTracePathAtoF(token,&x);
+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
           if (*token == ',')
-            GetToken(p,&p,token);
-          y=MagickAtoF(token);
+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
+          MagickTracePathAtoF(token,&y);
           end.x=attribute == 'A' ? x : point.x+x;
           end.y=attribute == 'A' ? y : point.y+y;
           TraceArcPath(q,point,end,arc,angle,large_arc,sweep);
@@ -4934,14 +5058,14 @@
           points[0]=point;
           for (i=1; i < 4; i++)
           {
-            GetToken(p,&p,token);
+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
             if (*token == ',')
-              GetToken(p,&p,token);
-            x=MagickAtoF(token);
-            GetToken(p,&p,token);
+              MagickGetTracePathToken(p,&p,token,MaxTextExtent);
+            MagickTracePathAtoF(token,&x);
+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
             if (*token == ',')
-              GetToken(p,&p,token);
-            y=MagickAtoF(token);
+              MagickGetTracePathToken(p,&p,token,MaxTextExtent);
+            MagickTracePathAtoF(token,&y);
             end.x=attribute == 'C' ? x : point.x+x;
             end.y=attribute == 'C' ? y : point.y+y;
             points[i]=end;
@@ -4959,10 +5083,10 @@
       {
         do
         {
-          GetToken(p,&p,token);
+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
           if (*token == ',')
-            GetToken(p,&p,token);
-          x=MagickAtoF(token);
+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
+          MagickTracePathAtoF(token,&x);
           point.x=attribute == 'H' ? x: point.x+x;
           TracePoint(q,point);
           q+=q->coordinates;
@@ -4974,14 +5098,14 @@
       {
         do
         {
-          GetToken(p,&p,token);
+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
           if (*token == ',')
-            GetToken(p,&p,token);
-          x=MagickAtoF(token);
-          GetToken(p,&p,token);
+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
+          MagickTracePathAtoF(token,&x);
+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
           if (*token == ',')
-            GetToken(p,&p,token);
-          y=MagickAtoF(token);
+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
+          MagickTracePathAtoF(token,&y);
           point.x=attribute == 'L' ? x : point.x+x;
           point.y=attribute == 'L' ? y : point.y+y;
           TracePoint(q,point);
@@ -5001,14 +5125,14 @@
         i=0;
         do
         {
-          GetToken(p,&p,token);
+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
           if (*token == ',')
-            GetToken(p,&p,token);
-          x=MagickAtoF(token);
-          GetToken(p,&p,token);
+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
+          MagickTracePathAtoF(token,&x);
+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
           if (*token == ',')
-            GetToken(p,&p,token);
-          y=MagickAtoF(token);
+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
+          MagickTracePathAtoF(token,&y);
           point.x=attribute == 'M' ? x : point.x+x;
           point.y=attribute == 'M' ? y : point.y+y;
           if (i == 0)
@@ -5035,14 +5159,14 @@
           points[0]=point;
           for (i=1; i < 3; i++)
           {
-            GetToken(p,&p,token);
+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
             if (*token == ',')
-              GetToken(p,&p,token);
-            x=MagickAtoF(token);
-            GetToken(p,&p,token);
+              MagickGetTracePathToken(p,&p,token,MaxTextExtent);
+            MagickTracePathAtoF(token,&x);
+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
             if (*token == ',')
-              GetToken(p,&p,token);
-            y=MagickAtoF(token);
+              MagickGetTracePathToken(p,&p,token,MaxTextExtent);
+            MagickTracePathAtoF(token,&y);
             if (*p == ',')
               p++;
             end.x=attribute == 'Q' ? x : point.x+x;
@@ -5070,14 +5194,14 @@
           points[1].y=2.0*points[3].y-points[2].y;
           for (i=2; i < 4; i++)
           {
-            GetToken(p,&p,token);
+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
             if (*token == ',')
-              GetToken(p,&p,token);
-            x=MagickAtoF(token);
-            GetToken(p,&p,token);
+              MagickGetTracePathToken(p,&p,token,MaxTextExtent);
+            MagickTracePathAtoF(token,&x);
+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
             if (*token == ',')
-              GetToken(p,&p,token);
-            y=MagickAtoF(token);
+              MagickGetTracePathToken(p,&p,token,MaxTextExtent);
+            MagickTracePathAtoF(token,&y);
             if (*p == ',')
               p++;
             end.x=attribute == 'S' ? x : point.x+x;
@@ -5110,14 +5234,14 @@
           points[1].y=2.0*points[2].y-points[1].y;
           for (i=2; i < 3; i++)
           {
-            GetToken(p,&p,token);
+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
             if (*token == ',')
-              GetToken(p,&p,token);
-            x=MagickAtoF(token);
-            GetToken(p,&p,token);
+              MagickGetTracePathToken(p,&p,token,MaxTextExtent);
+            MagickTracePathAtoF(token,&x);
+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
             if (*token == ',')
-              GetToken(p,&p,token);
-            y=MagickAtoF(token);
+              MagickGetTracePathToken(p,&p,token,MaxTextExtent);
+            MagickTracePathAtoF(token,&y);
             end.x=attribute == 'T' ? x : point.x+x;
             end.y=attribute == 'T' ? y : point.y+y;
             points[i]=end;
@@ -5140,10 +5264,10 @@
       {
         do
         {
-          GetToken(p,&p,token);
+          MagickGetTracePathToken(p,&p,token,MaxTextExtent);
           if (*token == ',')
-            GetToken(p,&p,token);
-          y=MagickAtoF(token);
+            MagickGetTracePathToken(p,&p,token,MaxTextExtent);
+          MagickTracePathAtoF(token,&y);
           point.y=attribute == 'V' ? y : point.y+y;
           TracePoint(q,point);
           q+=q->coordinates;
@@ -5170,6 +5294,7 @@
       }
     }
   }
+
   primitive_info->coordinates=q-primitive_info;
   number_coordinates+=primitive_info->coordinates;
   for (i=0; i < (long) number_coordinates; i++)
diff -r 9ba30629488e -r e797bb0aec31 magick/utility.c
--- a/magick/utility.c	Sat Apr 30 18:31:06 2016 -0500
+++ b/magick/utility.c	Sat Apr 30 18:32:03 2016 -0500
@@ -2525,98 +2525,7 @@
 */
 MagickExport void GetToken(const char *start,char **end,char *token)
 {
-  register char
-    *p;
-
-  register long
-    i;
-
-  double
-    double_val;
-
-  assert(start != (const char *) NULL);
-  assert(token != (char *) NULL);
-
-  i=0;
-  p=(char *) start;
-
-  if (*p != '\0')
-  {
-    while (isspace((int)(unsigned char) (*p)) && (*p != '\0'))
-      p++;
-    switch (*p)
-    {
-      case '"':
-      case '\'':
-      case '{':
-      {
-        register char
-          escape;
-
-        escape=(*p);
-        if (escape == '{')
-          escape='}';
-        for (p++; *p != '\0'; p++)
-        {
-          if ((*p == '\\') && ((*(p+1) == escape) || (*(p+1) == '\\')))
-            p++;
-          else
-            if (*p == escape)
-              {
-                p++;
-                break;
-              }
-          token[i++]=(*p);
-        }
-        break;
-      }
-      default:
-      {
-        char
-          *q;
-
-        double_val=strtod(p,&q);
-        (void) double_val;
-        if (p != q)
-          {
-            for ( ; p < q; p++)
-              token[i++]=(*p);
-            if (*p == '%')
-              token[i++]=(*p++);
-            break;
-          }
-        if ((*p != '\0') && !isalpha((int) *p) && (*p != *DirectorySeparator) &&
-	    (*p != '#') && (*p != '<'))
-          {
-            token[i++]=(*p++);
-            break;
-          }
-        for ( ; *p != '\0'; p++)
-        {
-          if ((isspace((int)(unsigned char) *p) || (*p == '=')) && (*(p-1) != '\\'))
-            break;
-          token[i++]=(*p);
-          if (*p == '(')
-            for (p++; *p != '\0'; p++)
-            {
-              token[i++]=(*p);
-              if ((*p == ')') && (*(p-1) != '\\'))
-                break;
-            }
-        }
-        break;
-      }
-    }
-  }
-  token[i]='\0';
-  if (LocaleNCompare(token,"url(#",5) == 0)
-    {
-      i=(long) strlen(token);
-      (void) strlcpy(token,token+5,MaxTextExtent);
-      token[i-6]='\0';
-    }
-  if (end != (char **) NULL)
-    *end=p;
+  (void) MagickGetToken(start,end,token, MaxTextExtent);
 }
 
 /*
@@ -3673,6 +3582,166 @@
 %                                                                             %
 %                                                                             %
 %                                                                             %
++   M a g i c k G e t T o k e n                                               %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  Method MagickGetToken gets a token from the token stream.  A token is defined
+%  as sequence of characters delimited by whitespace (e.g. clip-path), a
+%  sequence delimited with quotes (.e.g "Quote me"), or a sequence enclosed
+%  in parenthesis (e.g. rgb(0,0,0)).
+%
+%  The format of the MagickGetToken method is:
+%
+%      void MagickGetToken(const char *start,char **end,char *token,
+%                          const size_t buffer_length)
+%
+%  A description of each parameter follows:
+%
+%    o start: the start of the token sequence.
+%
+%    o end: point to the end of the token sequence (may be NULL).
+%
+%    o token: copy the token to this buffer.
+%
+%    o buffer_length: size of the token buffer.  If the token exceeds
+%             the buffer size, the token will be truncated, but the
+%             parser will still update the end pointer as if the
+%             truncation did not occur.
+%
+%    o returns: Size of the consumed token, not including a terminating
+%             null character.  If this is larger or equal to the buffer
+%             size then truncation has occured.
+%
+*/
+MagickExport size_t MagickGetToken(const char *start,char **end,char *token,
+                                   const size_t buffer_length)
+{
+  register char
+    *p;
+
+  register size_t
+    i;
+
+  register size_t
+    length = buffer_length - 1;
+
+  double
+    double_val;
+
+  assert(start != (const char *) NULL);
+  assert(token != (char *) NULL);
+
+  i=0;
+  p=(char *) start;
+
+  if (*p != '\0')
+  {
+    while (isspace((int)(unsigned char) (*p)) && (*p != '\0'))
+      p++;
+    switch (*p)
+    {
+      case '"':
+      case '\'':
+      case '{':
+      {
+        register char
+          escape;
+
+        escape=(*p);
+        if (escape == '{')
+          escape='}';
+        for (p++; *p != '\0'; p++)
+        {
+          if ((*p == '\\') && ((*(p+1) == escape) || (*(p+1) == '\\')))
+            p++;
+          else
+            if (*p == escape)
+              {
+                p++;
+                break;
+              }
+          if (i < length)
+            token[i++]=(*p);
+        }
+        break;
+      }
+      default:
+      {
+        char
+          *q;
+
+        double_val=strtod(p,&q);
+        (void) double_val;
+        if (p != q)
+          {
+            for ( ; p < q; p++)
+              if (i < length)
+                token[i++]=(*p);
+            if (*p == '%')
+              if (i < length)
+                {
+                  token[i++]=(*p);
+                  p++;
+                }
+            break;
+          }
+        if ((*p != '\0') && !isalpha((int) *p) && (*p != *DirectorySeparator) &&
+	    (*p != '#') && (*p != '<'))
+          {
+            if (i < length)
+              {
+                token[i++]=(*p);
+                p++;
+              }
+            break;
+          }
+        for ( ; *p != '\0'; p++)
+        {
+          if ((isspace((int)(unsigned char) *p) || (*p == '=')) && (*(p-1) != '\\'))
+            break;
+          if (i < length)
+            token[i++]=(*p);
+          if (*p == '(')
+            for (p++; *p != '\0'; p++)
+            {
+              if (i < length)
+                token[i++]=(*p);
+              if ((*p == ')') && (*(p-1) != '\\'))
+                break;
+            }
+        }
+        break;
+      }
+    }
+  }
+  token[i]='\0';
+  {
+    char
+      *r;
+
+    /*
+      Parse token in form "url(#%s)"
+    */
+    if ((LocaleNCompare(token,"url(#",5) == 0) &&
+        ((r = strrchr(token,')')) != NULL))
+    {
+      *r='\0';
+      (void) memmove(token,token+5,r-token+1);
+    }
+  }
+  if (end != (char **) NULL)
+    *end=p;
+  return (p-start+1);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
 %   M a g i c k R a n d R e e n t r a n t                                     %
 %                                                                             %
 %                                                                             %
diff -r 9ba30629488e -r e797bb0aec31 magick/utility.h
--- a/magick/utility.h	Sat Apr 30 18:31:06 2016 -0500
+++ b/magick/utility.h	Sat Apr 30 18:32:03 2016 -0500
@@ -139,7 +139,7 @@
   ExpandFilename(char *),
   FormatSize(const magick_int64_t size,char *format),
   GetPathComponent(const char *,PathType,char *),
-  GetToken(const char *,char **,char *),
+  GetToken(const char *,char **,char *) MAGICK_FUNC_DEPRECATED,
   LocaleLower(char *),
   LocaleUpper(char *),
   Strip(char *),
@@ -155,6 +155,8 @@
   MagickSizeStrToInt64(const char *str,const unsigned int kilo);
 
 extern MagickExport size_t
+  MagickGetToken(const char *start,char **end,char *token,
+                 const size_t buffer_length),
   MagickStrlCat(char *dst, const char *src, const size_t size) MAGICK_FUNC_NONNULL,
   MagickStrlCpy(char *dst, const char *src, const size_t size) MAGICK_FUNC_NONNULL,
   MagickStrlCpyTrunc(char *dst, const char *src, const size_t size) MAGICK_FUNC_NONNULL;

Actions: View | Diff

Attachments on bug 17714: 7739 | 7740 | 7741 | 7898 | 7899 | 7900 | 7901 | 7902 | 7903 | 7904 | 7905 | 8052