From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 26 Oct 2014 22:22:02 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1834
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4089840e603909af233ccbb8e4740346ed16b857;p=imagemagick

---

diff --git a/MagickCore/vision.c b/MagickCore/vision.c
index f08ff9a45..b88f0ff70 100644
--- a/MagickCore/vision.c
+++ b/MagickCore/vision.c
@@ -220,11 +220,16 @@ static MagickBooleanType ConnectedComponentsStatistics(const Image *image,
   {
     object[i].bounding_box.width-=(object[i].bounding_box.x-1);
     object[i].bounding_box.height-=(object[i].bounding_box.y-1);
-    object[i].color.red=object[i].color.red/object[i].area;
-    object[i].color.green=object[i].color.green/object[i].area;
-    object[i].color.blue=object[i].color.blue/object[i].area;
-    object[i].color.alpha=object[i].color.alpha/object[i].area;
-    object[i].color.black=object[i].color.black/object[i].area;
+    object[i].color.red=(MagickRealType) (object[i].color.red/
+      object[i].area);
+    object[i].color.green=(MagickRealType) (object[i].color.green/
+      object[i].area);
+    object[i].color.blue=(MagickRealType) (object[i].color.blue/
+      object[i].area);
+    object[i].color.alpha=(MagickRealType) (object[i].color.alpha/
+      object[i].area);
+    object[i].color.black=(MagickRealType) (object[i].color.black/
+      object[i].area);
     object[i].centroid.x=object[i].centroid.x/object[i].area;
     object[i].centroid.y=object[i].centroid.y/object[i].area;
   }
@@ -336,11 +341,16 @@ static MagickBooleanType MergeConnectedComponents(const Image *image,
   {
     object[i].bounding_box.width-=(object[i].bounding_box.x-1);
     object[i].bounding_box.height-=(object[i].bounding_box.y-1);
-    object[i].color.red=object[i].color.red/object[i].area;
-    object[i].color.green=object[i].color.green/object[i].area;
-    object[i].color.blue=object[i].color.blue/object[i].area;
-    object[i].color.alpha=object[i].color.alpha/object[i].area;
-    object[i].color.black=object[i].color.black/object[i].area;
+    object[i].color.red=(MagickRealType) (object[i].color.red/
+      object[i].area);
+    object[i].color.green=(MagickRealType) (object[i].color.green/
+      object[i].area);
+    object[i].color.blue=(MagickRealType) (object[i].color.blue/
+      object[i].area);
+    object[i].color.alpha=(MagickRealType) (object[i].color.alpha/
+      object[i].area);
+    object[i].color.black=(MagickRealType) (object[i].color.black/
+      object[i].area);
     object[i].centroid.x=object[i].centroid.x/object[i].area;
     object[i].centroid.y=object[i].centroid.y/object[i].area;
   }
@@ -613,7 +623,7 @@ MagickExport Image *ConnectedComponentsImage(const Image *image,
   artifact=GetImageArtifact(image,"connected-components:area-threshold");
   if (artifact != (const char *) NULL)
     area_threshold=StringToDouble(artifact,(char **) NULL);
-  if (area_threshold > 0.0);
+  if (area_threshold > 0.0)
     status=MergeConnectedComponents(image,component_image,(size_t) n,
       area_threshold,exception);
   if (status == MagickFalse)