Merge pull request #7 from shimat/CPlusPlus-Renewal

CPlusPlus Renewal
shimat · Feb 19, 2014 · e0309ae · e0309ae
2 parents 0d5297c + bd7b73f
commit e0309ae
Show file tree

Hide file tree

Showing 70 changed files with 2,621 additions and 2,028 deletions.
diff --git a/nuget/OpenCvSharp-x64.nuspec b/nuget/OpenCvSharp-x64.nuspec
@@ -2,13 +2,13 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>OpenCvSharp-x64</id>
-        <version>2.4.8.20140131</version>
+        <version>2.4.8.20140219</version>
         <title>OpenCvSharp x64</title>
         <authors>shimat</authors>
         <licenseUrl>http://www.gnu.org/licenses/lgpl-3.0.en.html</licenseUrl>
-        <projectUrl>http://code.google.com/p/opencvsharp/</projectUrl>
+        <projectUrl>https://github.com/shimat/opencvsharp</projectUrl>
         <iconUrl>http://opencvsharp.googlecode.com/files/Lenna.ico</iconUrl>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <requireLicenseAcceptance>true</requireLicenseAcceptance>
         <description>OpenCV wrapper for .NET Framework</description>
         <releaseNotes>2.4.8 support</releaseNotes>
         <copyright>Copyright 2008-2014</copyright>
@@ -38,6 +38,7 @@
         <file src="..\lib\opencv\x64\vc10\opencv_ml248.dll" target="Content\opencv_ml248.dll" />
         <file src="..\lib\opencv\x64\vc10\opencv_nonfree248.dll" target="Content\opencv_nonfree248.dll" />
         <file src="..\lib\opencv\x64\vc10\opencv_objdetect248.dll" target="Content\opencv_objdetect248.dll" />
+        <file src="..\lib\opencv\x64\vc10\opencv_ocl248.dll" target="Content\opencv_ocl248.dll" />
         <file src="..\lib\opencv\x64\vc10\opencv_photo248.dll" target="Content\opencv_photo248.dll" />
         <file src="..\lib\opencv\x64\vc10\opencv_stitching248.dll" target="Content\opencv_stitching248.dll" />
         <file src="..\lib\opencv\x64\vc10\opencv_superres248.dll" target="Content\opencv_superres248.dll" />

diff --git a/nuget/OpenCvSharp-x86.nuspec b/nuget/OpenCvSharp-x86.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>OpenCvSharp-x86</id>
-        <version>2.4.8.20140131</version>
+        <version>2.4.8.20140219</version>
         <title>OpenCvSharp x86</title>
         <authors>shimat</authors>
         <licenseUrl>http://www.gnu.org/licenses/lgpl-3.0.en.html</licenseUrl>
@@ -38,6 +38,7 @@
         <file src="..\lib\opencv\x86\vc10\opencv_ml248.dll" target="Content\opencv_ml248.dll" />
         <file src="..\lib\opencv\x86\vc10\opencv_nonfree248.dll" target="Content\opencv_nonfree248.dll" />
         <file src="..\lib\opencv\x86\vc10\opencv_objdetect248.dll" target="Content\opencv_objdetect248.dll" />
+        <file src="..\lib\opencv\x86\vc10\opencv_ocl248.dll" target="Content\opencv_ocl248.dll" />
         <file src="..\lib\opencv\x86\vc10\opencv_photo248.dll" target="Content\opencv_photo248.dll" />
         <file src="..\lib\opencv\x86\vc10\opencv_stitching248.dll" target="Content\opencv_stitching248.dll" />
         <file src="..\lib\opencv\x86\vc10\opencv_superres248.dll" target="Content\opencv_superres248.dll" />

diff --git a/nuget/tools-x64/install.ps1 b/nuget/tools-x64/install.ps1
@@ -39,6 +39,7 @@ $copyFiles = @(
     "opencv_ml248.dll";
     "opencv_nonfree248.dll";
     "opencv_objdetect248.dll";
+    "opencv_ocl248.dll";
     "opencv_photo248.dll";
     "opencv_stitching248.dll";
     "opencv_superres248.dll";

diff --git a/nuget/tools-x86/install.ps1 b/nuget/tools-x86/install.ps1
@@ -38,6 +38,7 @@ $copyFiles = @(
     "opencv_legacy248.dll";
     "opencv_ml248.dll";
     "opencv_nonfree248.dll";
+    "opencv_ocl248.dll";
     "opencv_objdetect248.dll";
     "opencv_photo248.dll";
     "opencv_stitching248.dll";