Cleaning and some little tweaks.

[master-thesis.git] / Parasitemia / ParasitemiaCore / Granulometry.fs

diff --git a/Parasitemia/ParasitemiaCore/Granulometry.fs b/Parasitemia/ParasitemiaCore/Granulometry.fs
index b325534..877df99 100644 (file)
--- a/Parasitemia/ParasitemiaCore/Granulometry.fs
+++ b/Parasitemia/ParasitemiaCore/Granulometry.fs
@@ -1,6 +1,7 @@
 module ParasitemiaCore.Granulometry
 
 open System
+open System.IO
 open System.Drawing
 
 open Emgu.CV
@@ -24,7 +25,7 @@ let findRadiusByClosing (img: Image<Gray, 'TDepth>) (range: int * int) (scale: f
     let intensityImg = scaledImg.GetSum().Intensity
 
     // 's' must be odd.
-    let octagon (s: int) : Mat =
+    let octagon (s: int) : Matrix<byte> =
         if s % 2 = 0 then failwith "s must be odd"
         let m = new Matrix<byte>(Array2D.create s s 1uy)
         let r = (float s) / (Math.Sqrt 2. + 2.) |> roundInt
@@ -36,12 +37,12 @@ let findRadiusByClosing (img: Image<Gray, 'TDepth>) (range: int * int) (scale: f
                     m.[s - i - 1, j] <- 0uy
                     m.[i, s - j - 1] <- 0uy
                     m.[s - i - 1, s - j - 1] <- 0uy
-        m.Mat
+        m
 
     let mutable previous_n = Double.NaN
     for r in r1' .. r2' do
         let se = if useOctagon
-                 then octagon (2 * r - 1) // It doesnd't speed up the process.
+                 then (octagon (2 * r - 1)).Mat // It doesn't speed up the process.
                  else CvInvoke.GetStructuringElement(CvEnum.ElementShape.Ellipse, Size(2 * r, 2 * r), Point(-1, -1))
 
         use closed = scaledImg.MorphologyEx(CvEnum.MorphOp.Close, se, Point(-1, -1), 1, CvEnum.BorderType.Replicate, MCvScalar(0.0))