Merge pull request #15 from shimat/Merge-MachineLearning

Merge MachineLearning
shimat · Apr 19, 2014 · 59b6fbc · 59b6fbc
2 parents 650935c + 7619a49
commit 59b6fbc
Show file tree

Hide file tree

Showing 162 changed files with 2,386 additions and 16,881 deletions.
diff --git a/nuget/OpenCvSharp-x64.nuspec b/nuget/OpenCvSharp-x64.nuspec
@@ -2,15 +2,16 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>OpenCvSharp-x64</id>
-        <version>2.4.8.20140405</version>
+        <version>2.4.8.20140420</version>
         <title>OpenCvSharp x64</title>
         <authors>shimat</authors>
         <licenseUrl>http://www.gnu.org/licenses/lgpl-3.0.en.html</licenseUrl>
         <projectUrl>https://github.com/shimat/opencvsharp</projectUrl>
         <iconUrl>http://opencvsharp.googlecode.com/files/Lenna.ico</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>OpenCV wrapper for .NET Framework</description>
-        <releaseNotes>Added C++ objdetect methods.</releaseNotes>
+        <releaseNotes>- Merged MachineLearning to CPlusPlus
+- Removed old Blob API</releaseNotes>
         <copyright>Copyright 2008-2014</copyright>
         <tags>Image Processing OpenCV Wrapper FFI</tags>
         <frameworkAssemblies>
@@ -50,8 +51,6 @@
         <file src="..\src\OpenCvSharp.CPlusPlus\bin\Release\OpenCvSharp.CPlusPlus.dll.config" target="lib\net20\OpenCvSharp.CPlusPlus.dll.config" />
         <file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll" target="lib\net20\OpenCvSharp.dll" />
         <file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll.config" target="lib\net20\OpenCvSharp.dll.config" />
-        <file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll" target="lib\net20\OpenCvSharp.MachineLearning.dll" />
-        <file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll.config" target="lib\net20\OpenCvSharp.MachineLearning.dll.config" />
         <file src="..\src\OpenCvSharp.UserInterface\bin\Release\OpenCvSharp.UserInterface.dll" target="lib\net20\OpenCvSharp.UserInterface.dll" />
         <file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll" target="lib\net35\OpenCvSharp.Blob.dll" />
         <file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll.config" target="lib\net35\OpenCvSharp.Blob.dll.config" />
@@ -60,8 +59,6 @@
         <file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll" target="lib\net35\OpenCvSharp.dll" />
         <file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll.config" target="lib\net35\OpenCvSharp.dll.config" />
         <file src="..\src\OpenCvSharp.Extensions\bin\Release\OpenCvSharp.Extensions.dll" target="lib\net35\OpenCvSharp.Extensions.dll" />
-        <file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll" target="lib\net35\OpenCvSharp.MachineLearning.dll" />
-        <file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll.config" target="lib\net35\OpenCvSharp.MachineLearning.dll.config" />
         <file src="..\src\OpenCvSharp.UserInterface\bin\Release\OpenCvSharp.UserInterface.dll" target="lib\net35\OpenCvSharp.UserInterface.dll" />
         <file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll" target="lib\net40\OpenCvSharp.Blob.dll" />
         <file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll.config" target="lib\net40\OpenCvSharp.Blob.dll.config" />
@@ -70,8 +67,6 @@
         <file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll" target="lib\net40\OpenCvSharp.dll" />
         <file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll.config" target="lib\net40\OpenCvSharp.dll.config" />
         <file src="..\src\OpenCvSharp.Extensions\bin\Release\OpenCvSharp.Extensions.dll" target="lib\net40\OpenCvSharp.Extensions.dll" />
-        <file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll" target="lib\net40\OpenCvSharp.MachineLearning.dll" />
-        <file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll.config" target="lib\net40\OpenCvSharp.MachineLearning.dll.config" />
         <file src="..\src\OpenCvSharp.UserInterface\bin\Release\OpenCvSharp.UserInterface.dll" target="lib\net40\OpenCvSharp.UserInterface.dll" />
         <file src="tools-x64\init.ps1" target="tools\init.ps1" />
         <file src="tools-x64\install.ps1" target="tools\install.ps1" />

diff --git a/nuget/OpenCvSharp-x86.nuspec b/nuget/OpenCvSharp-x86.nuspec
@@ -2,15 +2,16 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>OpenCvSharp-x86</id>
-        <version>2.4.8.20140405</version>
+        <version>2.4.8.20140420</version>
         <title>OpenCvSharp x86</title>
         <authors>shimat</authors>
         <licenseUrl>http://www.gnu.org/licenses/lgpl-3.0.en.html</licenseUrl>
         <projectUrl>https://github.com/shimat/opencvsharp</projectUrl>
         <iconUrl>http://opencvsharp.googlecode.com/files/Lenna.ico</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>OpenCV wrapper for .NET Framework</description>
-        <releaseNotes>Added C++ objdetect methods.</releaseNotes>
+        <releaseNotes>- Merged MachineLearning to CPlusPlus
+- Removed old Blob API</releaseNotes>
         <copyright>Copyright 2008-2014</copyright>
         <tags>Image Processing OpenCV Wrapper FFI</tags>
         <frameworkAssemblies>
@@ -50,8 +51,6 @@
         <file src="..\src\OpenCvSharp.CPlusPlus\bin\Release\OpenCvSharp.CPlusPlus.dll.config" target="lib\net20\OpenCvSharp.CPlusPlus.dll.config" />
         <file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll" target="lib\net20\OpenCvSharp.dll" />
         <file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll.config" target="lib\net20\OpenCvSharp.dll.config" />
-        <file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll" target="lib\net20\OpenCvSharp.MachineLearning.dll" />
-        <file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll.config" target="lib\net20\OpenCvSharp.MachineLearning.dll.config" />
         <file src="..\src\OpenCvSharp.UserInterface\bin\Release\OpenCvSharp.UserInterface.dll" target="lib\net20\OpenCvSharp.UserInterface.dll" />
         <file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll" target="lib\net35\OpenCvSharp.Blob.dll" />
         <file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll.config" target="lib\net35\OpenCvSharp.Blob.dll.config" />
@@ -60,8 +59,6 @@
         <file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll" target="lib\net35\OpenCvSharp.dll" />
         <file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll.config" target="lib\net35\OpenCvSharp.dll.config" />
         <file src="..\src\OpenCvSharp.Extensions\bin\Release\OpenCvSharp.Extensions.dll" target="lib\net35\OpenCvSharp.Extensions.dll" />
-        <file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll" target="lib\net35\OpenCvSharp.MachineLearning.dll" />
-        <file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll.config" target="lib\net35\OpenCvSharp.MachineLearning.dll.config" />
         <file src="..\src\OpenCvSharp.UserInterface\bin\Release\OpenCvSharp.UserInterface.dll" target="lib\net35\OpenCvSharp.UserInterface.dll" />
         <file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll" target="lib\net40\OpenCvSharp.Blob.dll" />
         <file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll.config" target="lib\net40\OpenCvSharp.Blob.dll.config" />
@@ -70,8 +67,6 @@
         <file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll" target="lib\net40\OpenCvSharp.dll" />
         <file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll.config" target="lib\net40\OpenCvSharp.dll.config" />
         <file src="..\src\OpenCvSharp.Extensions\bin\Release\OpenCvSharp.Extensions.dll" target="lib\net40\OpenCvSharp.Extensions.dll" />
-        <file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll" target="lib\net40\OpenCvSharp.MachineLearning.dll" />
-        <file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll.config" target="lib\net40\OpenCvSharp.MachineLearning.dll.config" />
         <file src="..\src\OpenCvSharp.UserInterface\bin\Release\OpenCvSharp.UserInterface.dll" target="lib\net40\OpenCvSharp.UserInterface.dll" />
         <file src="tools-x86\init.ps1" target="tools\init.ps1" />
         <file src="tools-x86\install.ps1" target="tools\install.ps1" />

diff --git a/src/OpenCvSharp.Blob/CvContourChainCode.cs b/src/OpenCvSharp.Blob/CvContourChainCode.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenCvSharp.Blob.Old;
-
-// Copyright (C) 2007 by Cristóbal Carnero Liñán
+// Copyright (C) 2007 by Cristóbal Carnero Liñán
 // grendel.ccl@gmail.com
 //
 // This file is part of cvBlob.
@@ -21,6 +16,9 @@
 // You should have received a copy of the Lesser GNU General Public License
 // along with cvBlob.  If not, see <http://www.gnu.org/licenses/>.
 
+using System;
+using System.Collections.Generic;
+
 namespace OpenCvSharp.Blob
 {
     /// <summary>

diff --git a/src/OpenCvSharp.Blob/LabelData.cs b/src/OpenCvSharp.Blob/LabelData.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenCvSharp.Blob
 {
@@ -122,18 +120,11 @@ public void DebugShow()
                 {
                     for (int c = 0; c < Cols; c++)
                     {
-                        try
-                        {
-                            if (Values[r, c] != 0)
-                                img[r, c] = 255;
-                        }
-                        catch
-                        {
-                            throw;
-                        }
+                        if (Values[r, c] != 0)
+                            img[r, c] = 255;
                     }
                 }
-                CvWindow.ShowImages("new", img);
+                CvWindow.ShowImages(img);
             }
         }
     }