Skip to content

Commit 59b6fbc

Browse files
author
shimat
committed
Merge pull request #15 from shimat/Merge-MachineLearning
Merge MachineLearning
2 parents 650935c + 7619a49 commit 59b6fbc

File tree

162 files changed

+2386
-16881
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+2386
-16881
lines changed

‎nuget/OpenCvSharp-x64.nuspec‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>OpenCvSharp-x64</id>
5-
<version>2.4.8.20140405</version>
5+
<version>2.4.8.20140420</version>
66
<title>OpenCvSharp x64</title>
77
<authors>shimat</authors>
88
<licenseUrl>http://www.gnu.org/licenses/lgpl-3.0.en.html</licenseUrl>
99
<projectUrl>https://github.com/shimat/opencvsharp</projectUrl>
1010
<iconUrl>http://opencvsharp.googlecode.com/files/Lenna.ico</iconUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1212
<description>OpenCV wrapper for .NET Framework</description>
13-
<releaseNotes>Added C++ objdetect methods.</releaseNotes>
13+
<releaseNotes>- Merged MachineLearning to CPlusPlus
14+
- Removed old Blob API</releaseNotes>
1415
<copyright>Copyright 2008-2014</copyright>
1516
<tags>Image Processing OpenCV Wrapper FFI</tags>
1617
<frameworkAssemblies>
@@ -50,8 +51,6 @@
5051
<file src="..\src\OpenCvSharp.CPlusPlus\bin\Release\OpenCvSharp.CPlusPlus.dll.config" target="lib\net20\OpenCvSharp.CPlusPlus.dll.config" />
5152
<file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll" target="lib\net20\OpenCvSharp.dll" />
5253
<file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll.config" target="lib\net20\OpenCvSharp.dll.config" />
53-
<file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll" target="lib\net20\OpenCvSharp.MachineLearning.dll" />
54-
<file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll.config" target="lib\net20\OpenCvSharp.MachineLearning.dll.config" />
5554
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\OpenCvSharp.UserInterface.dll" target="lib\net20\OpenCvSharp.UserInterface.dll" />
5655
<file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll" target="lib\net35\OpenCvSharp.Blob.dll" />
5756
<file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll.config" target="lib\net35\OpenCvSharp.Blob.dll.config" />
@@ -60,8 +59,6 @@
6059
<file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll" target="lib\net35\OpenCvSharp.dll" />
6160
<file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll.config" target="lib\net35\OpenCvSharp.dll.config" />
6261
<file src="..\src\OpenCvSharp.Extensions\bin\Release\OpenCvSharp.Extensions.dll" target="lib\net35\OpenCvSharp.Extensions.dll" />
63-
<file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll" target="lib\net35\OpenCvSharp.MachineLearning.dll" />
64-
<file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll.config" target="lib\net35\OpenCvSharp.MachineLearning.dll.config" />
6562
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\OpenCvSharp.UserInterface.dll" target="lib\net35\OpenCvSharp.UserInterface.dll" />
6663
<file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll" target="lib\net40\OpenCvSharp.Blob.dll" />
6764
<file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll.config" target="lib\net40\OpenCvSharp.Blob.dll.config" />
@@ -70,8 +67,6 @@
7067
<file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll" target="lib\net40\OpenCvSharp.dll" />
7168
<file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll.config" target="lib\net40\OpenCvSharp.dll.config" />
7269
<file src="..\src\OpenCvSharp.Extensions\bin\Release\OpenCvSharp.Extensions.dll" target="lib\net40\OpenCvSharp.Extensions.dll" />
73-
<file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll" target="lib\net40\OpenCvSharp.MachineLearning.dll" />
74-
<file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll.config" target="lib\net40\OpenCvSharp.MachineLearning.dll.config" />
7570
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\OpenCvSharp.UserInterface.dll" target="lib\net40\OpenCvSharp.UserInterface.dll" />
7671
<file src="tools-x64\init.ps1" target="tools\init.ps1" />
7772
<file src="tools-x64\install.ps1" target="tools\install.ps1" />

‎nuget/OpenCvSharp-x86.nuspec‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>OpenCvSharp-x86</id>
5-
<version>2.4.8.20140405</version>
5+
<version>2.4.8.20140420</version>
66
<title>OpenCvSharp x86</title>
77
<authors>shimat</authors>
88
<licenseUrl>http://www.gnu.org/licenses/lgpl-3.0.en.html</licenseUrl>
99
<projectUrl>https://github.com/shimat/opencvsharp</projectUrl>
1010
<iconUrl>http://opencvsharp.googlecode.com/files/Lenna.ico</iconUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1212
<description>OpenCV wrapper for .NET Framework</description>
13-
<releaseNotes>Added C++ objdetect methods.</releaseNotes>
13+
<releaseNotes>- Merged MachineLearning to CPlusPlus
14+
- Removed old Blob API</releaseNotes>
1415
<copyright>Copyright 2008-2014</copyright>
1516
<tags>Image Processing OpenCV Wrapper FFI</tags>
1617
<frameworkAssemblies>
@@ -50,8 +51,6 @@
5051
<file src="..\src\OpenCvSharp.CPlusPlus\bin\Release\OpenCvSharp.CPlusPlus.dll.config" target="lib\net20\OpenCvSharp.CPlusPlus.dll.config" />
5152
<file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll" target="lib\net20\OpenCvSharp.dll" />
5253
<file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll.config" target="lib\net20\OpenCvSharp.dll.config" />
53-
<file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll" target="lib\net20\OpenCvSharp.MachineLearning.dll" />
54-
<file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll.config" target="lib\net20\OpenCvSharp.MachineLearning.dll.config" />
5554
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\OpenCvSharp.UserInterface.dll" target="lib\net20\OpenCvSharp.UserInterface.dll" />
5655
<file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll" target="lib\net35\OpenCvSharp.Blob.dll" />
5756
<file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll.config" target="lib\net35\OpenCvSharp.Blob.dll.config" />
@@ -60,8 +59,6 @@
6059
<file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll" target="lib\net35\OpenCvSharp.dll" />
6160
<file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll.config" target="lib\net35\OpenCvSharp.dll.config" />
6261
<file src="..\src\OpenCvSharp.Extensions\bin\Release\OpenCvSharp.Extensions.dll" target="lib\net35\OpenCvSharp.Extensions.dll" />
63-
<file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll" target="lib\net35\OpenCvSharp.MachineLearning.dll" />
64-
<file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll.config" target="lib\net35\OpenCvSharp.MachineLearning.dll.config" />
6562
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\OpenCvSharp.UserInterface.dll" target="lib\net35\OpenCvSharp.UserInterface.dll" />
6663
<file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll" target="lib\net40\OpenCvSharp.Blob.dll" />
6764
<file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll.config" target="lib\net40\OpenCvSharp.Blob.dll.config" />
@@ -70,8 +67,6 @@
7067
<file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll" target="lib\net40\OpenCvSharp.dll" />
7168
<file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll.config" target="lib\net40\OpenCvSharp.dll.config" />
7269
<file src="..\src\OpenCvSharp.Extensions\bin\Release\OpenCvSharp.Extensions.dll" target="lib\net40\OpenCvSharp.Extensions.dll" />
73-
<file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll" target="lib\net40\OpenCvSharp.MachineLearning.dll" />
74-
<file src="..\src\OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll.config" target="lib\net40\OpenCvSharp.MachineLearning.dll.config" />
7570
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\OpenCvSharp.UserInterface.dll" target="lib\net40\OpenCvSharp.UserInterface.dll" />
7671
<file src="tools-x86\init.ps1" target="tools\init.ps1" />
7772
<file src="tools-x86\install.ps1" target="tools\install.ps1" />

‎src/OpenCvSharp.Blob/CvContourChainCode.cs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Text;
4-
using OpenCvSharp.Blob.Old;
5-
6-
// Copyright (C) 2007 by Cristóbal Carnero Liñán
1+
// Copyright (C) 2007 by Cristóbal Carnero Liñán
72
// grendel.ccl@gmail.com
83
//
94
// This file is part of cvBlob.
@@ -21,6 +16,9 @@
2116
// You should have received a copy of the Lesser GNU General Public License
2217
// along with cvBlob. If not, see <http://www.gnu.org/licenses/>.
2318

19+
using System;
20+
using System.Collections.Generic;
21+
2422
namespace OpenCvSharp.Blob
2523
{
2624
/// <summary>

‎src/OpenCvSharp.Blob/LabelData.cs‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.Text;
42

53
namespace OpenCvSharp.Blob
64
{
@@ -122,18 +120,11 @@ public void DebugShow()
122120
{
123121
for (int c = 0; c < Cols; c++)
124122
{
125-
try
126-
{
127-
if (Values[r, c] != 0)
128-
img[r, c] = 255;
129-
}
130-
catch
131-
{
132-
throw;
133-
}
123+
if (Values[r, c] != 0)
124+
img[r, c] = 255;
134125
}
135126
}
136-
CvWindow.ShowImages("new", img);
127+
CvWindow.ShowImages(img);
137128
}
138129
}
139130
}

0 commit comments

Comments
 (0)