From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 12 Apr 2014 01:16:12 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2456
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8b1ddfd95cc2a977b8f867b62a9d4101c1ae474;p=imagemagick

---

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index 87b225ce4..176b46318 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -964,8 +964,8 @@ static MagickBooleanType TraceEdges(Image *edge_image,CacheView *trace_view,
         status=GetMatrixElement(pixel_cache,edge.x+u,edge.y+v,&pixel);
         if (status == MagickFalse)
           return(MagickFalse);
-        if ((pixel.intensity >= lower_threshold) &&
-            (GetPixelIntensity(edge_image,q) == 0))
+        if ((GetPixelIntensity(edge_image,q) == 0.0) &&
+            (pixel.intensity >= lower_threshold))
           {
             *q=QuantumRange;
             status=SyncCacheViewAuthenticPixels(trace_view,exception);
@@ -1302,8 +1302,8 @@ MagickExport Image *CannyEdgeImage(const Image *image,const double radius,
           status=MagickFalse;
           continue;
         }
-      if ((pixel.intensity >= upper_threshold) &&
-          (GetPixelIntensity(edge_image,q) == 0))
+      if ((GetPixelIntensity(edge_image,q) == 0.0) &&
+          (pixel.intensity >= upper_threshold))
         {
           *q=QuantumRange;
           status=SyncCacheViewAuthenticPixels(edge_view,exception);