From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 6 Apr 2014 12:58:42 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2492
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c869a2377c46a3fe73c74fedd5831a48cb096ad;p=imagemagick

---

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index d94795364..ed085ae02 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -1330,7 +1330,7 @@ MagickExport Image *CannyEdgeImage(const Image *image,const double radius,
     if (SyncCacheViewAuthenticPixels(edge_view,exception) == MagickFalse)
       status=MagickFalse;
   }
-  trace_view=DestroyCacheView(edge_view);
+  trace_view=DestroyCacheView(trace_view);
   edge_view=DestroyCacheView(edge_view);
   pixel_cache=DestroyMatrixInfo(pixel_cache);
   return(edge_image);
diff --git a/MagickCore/option.c b/MagickCore/option.c
index e46b43d10..5fd4e3e2d 100644
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -259,8 +259,7 @@ static const OptionInfo
     { "-brightness-contrast", 1L, SimpleOperatorFlag, MagickFalse },
     { "+cache", 0L, GlobalOptionFlag, MagickFalse },
     { "-cache", 1L, GlobalOptionFlag, MagickFalse },
-    { "+edge", 1L, SimpleOperatorFlag, MagickTrue },
-    { "-edge", 1L, SimpleOperatorFlag, MagickFalse },
+    { "+canny", 1L, SimpleOperatorFlag, MagickTrue },
     { "+caption", 0L, ImageInfoOptionFlag | NeverInterpretArgsFlag, MagickFalse },
     { "-caption", 1L, ImageInfoOptionFlag | NeverInterpretArgsFlag, MagickFalse },
     { "+cdl", 1L, DeprecateOptionFlag, MagickTrue },
@@ -780,6 +779,8 @@ static const OptionInfo
     { "-window-group", 1L, NonMagickOptionFlag, MagickFalse },
     { "+write", 1L, NoImageOperatorFlag | NeverInterpretArgsFlag | FireOptionFlag, MagickFalse },
     { "-write", 1L, NoImageOperatorFlag | NeverInterpretArgsFlag | FireOptionFlag, MagickFalse },
+    { "+zzz", 0L, UndefinedOptionFlag, MagickTrue },  /* required by CLI */
+    { "-zzz", 0L, UndefinedOptionFlag, MagickFalse },  /* binary search */
     { (char *) NULL, 0L, UndefinedOptionFlag, MagickFalse }
   },
   ComposeOptions[] =