commit 92c93bd35e207736d340f1b32000006a5bf6208e
author anthony <anthony@git.imagemagick.org> Mon Mar 19 14:02:47 2012 +0000
committer anthony <anthony@git.imagemagick.org> Mon Mar 19 14:02:47 2012 +0000
tree b74805f521802b315edb4b2bbea2d96109962ff6
parent 22fd9d3aab6e385ec51d502d18a65a9d23c2d222

Option Error checking - initial and a's done

MagickCore/geometry.c

diff --git a/MagickCore/geometry.c b/MagickCore/geometry.c
index 0b642cc..3e133da 100644
--- a/MagickCore/geometry.c
+++ b/MagickCore/geometry.c
@@ -703,11 +703,11 @@
       }
     }
   }
-  determinant=(affine_matrix->sx*affine_matrix->sy-affine_matrix->rx*
-    affine_matrix->ry);
+  determinant=(affine_matrix->sx*affine_matrix->sy
+                 - affine_matrix->rx*affine_matrix->ry);
   if (fabs(determinant) < MagickEpsilon)
     (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
-      "InvalidGeometry","`%s'",geometry);
+      "InvalidArgument","'%s' : 'Indeterminate Matrix'",geometry);
   return(flags);
 }
 

MagickCore/option.c

diff --git a/MagickCore/option.c b/MagickCore/option.c
index 18a1865..478966c 100644
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -192,7 +192,7 @@
     { "+append", 0L, ListOperatorOptionFlag | FireOptionFlag, MagickFalse },
     { "-append", 0L, ListOperatorOptionFlag | FireOptionFlag, MagickFalse },
     { "+attenuate", 0L, ImageInfoOptionFlag, MagickFalse },
-    { "-attenuate", 0L, ImageInfoOptionFlag, MagickFalse },
+    { "-attenuate", 1L, ImageInfoOptionFlag, MagickFalse },
     { "+authenticate", 0L, ImageInfoOptionFlag, MagickFalse },
     { "-authenticate", 1L, ImageInfoOptionFlag, MagickFalse },
     { "+auto-gamma", 0L, DeprecateOptionFlag, MagickTrue },