diff --git a/.gitignore b/.gitignore index 5003052..db2fb96 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ .vs bin -obj \ No newline at end of file +obj +lib +include +staticlib +*.nupkg \ No newline at end of file diff --git a/OpenCV.Net/NuGet/NuGet-Overlay.cmd b/OpenCV.Net/NuGet/NuGet-Overlay.cmd deleted file mode 100644 index d337173..0000000 --- a/OpenCV.Net/NuGet/NuGet-Overlay.cmd +++ /dev/null @@ -1,27 +0,0 @@ -@echo off -setlocal - -set THISPKGDIR=%~dp0 - -set NUGET_EXTENSIONS_PATH=%THISPKGDIR%\build\native\private - -if '%1' == '' goto get_help -if '%1' == 'help' goto get_help -if '%1' == '-help' goto get_help - -nuget overlay -OverlayPackageDirectory "%THISPKGDIR%\." -Version 2.4.8 -Pivots %* -goto fin - - -:get_help -echo. -echo Usage: -echo. -echo %0 help -- shows this help. -echo %0 [pivots] -- installs the pivots that match the selection -echo %0 [pivots] -List -- shows the pivots that match the selection -echo. -echo Specify 'all' to match all the pivots - -:fin - diff --git a/OpenCV.Net/NuGet/build/native/pivot-list.txt b/OpenCV.Net/NuGet/build/native/pivot-list.txt deleted file mode 100644 index f139e48..0000000 --- a/OpenCV.Net/NuGet/build/native/pivot-list.txt +++ /dev/null @@ -1,4 +0,0 @@ -OpenCV.ffmpeg.overlay-x64_v110 -OpenCV.ffmpeg.overlay-Win32_v110 -OpenCV.overlay-x64_v110_Release -OpenCV.overlay-Win32_v110_Release diff --git a/OpenCV.Net/NuGet/build/native/private/CoApp.NuGetNativeExtensions.dll b/OpenCV.Net/NuGet/build/native/private/CoApp.NuGetNativeExtensions.dll deleted file mode 100644 index 2f0dfb2..0000000 Binary files a/OpenCV.Net/NuGet/build/native/private/CoApp.NuGetNativeExtensions.dll and /dev/null differ diff --git a/OpenCV.Net/NuGet/build/native/private/CoApp.NuGetNativeMSBuildTasks.dll.orig b/OpenCV.Net/NuGet/build/native/private/CoApp.NuGetNativeMSBuildTasks.dll.orig deleted file mode 100644 index 6f9b7f8..0000000 Binary files a/OpenCV.Net/NuGet/build/native/private/CoApp.NuGetNativeMSBuildTasks.dll.orig and /dev/null differ diff --git a/OpenCV.Net/NuGet/build/net40/OpenCV.Net.props b/OpenCV.Net/NuGet/build/net40/OpenCV.Net.props deleted file mode 100644 index 7231daa..0000000 --- a/OpenCV.Net/NuGet/build/net40/OpenCV.Net.props +++ /dev/null @@ -1,15 +0,0 @@ - - - - false - $(MSBuildThisFileDirectory)..\..\build\native\private - - - - - - 2.4.8 - 562967133814784 - - - \ No newline at end of file diff --git a/OpenCV.Net/NuGet/build/net40/OpenCV.Net.targets b/OpenCV.Net/NuGet/build/net40/OpenCV.Net.targets deleted file mode 100644 index f959366..0000000 --- a/OpenCV.Net/NuGet/build/net40/OpenCV.Net.targets +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - true - - - - - - true - - - - - - true - - - - - - true - - - - - - - - - - true - - - - - - - \ No newline at end of file diff --git a/OpenCV.Net/OpenCV.Net.csproj b/OpenCV.Net/OpenCV.Net.csproj index b6f99cd..172323b 100644 --- a/OpenCV.Net/OpenCV.Net.csproj +++ b/OpenCV.Net/OpenCV.Net.csproj @@ -10,9 +10,7 @@ - - - + \ No newline at end of file diff --git a/OpenCV.Net/runtime.json b/OpenCV.Net/runtime.json new file mode 100644 index 0000000..3b7ad1c --- /dev/null +++ b/OpenCV.Net/runtime.json @@ -0,0 +1,14 @@ +{ + "runtimes": { + "win-x64": { + "OpenCV.Net": { + "OpenCV.runtime.win-x64": "2.4.8" + } + }, + "win-x86": { + "OpenCV.Net": { + "OpenCV.runtime.win-x86": "2.4.8" + } + } + } +} diff --git a/OpenCV/LICENSE b/OpenCV/LICENSE new file mode 100644 index 0000000..5e32d88 --- /dev/null +++ b/OpenCV/LICENSE @@ -0,0 +1,33 @@ +By downloading, copying, installing or using the software you agree to this license. +If you do not agree to this license, do not download, install, +copy or use the software. + + + License Agreement + For Open Source Computer Vision Library + (3-clause BSD License) + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + * Neither the names of the copyright holders nor the names of the contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +This software is provided by the copyright holders and contributors "as is" and +any express or implied warranties, including, but not limited to, the implied +warranties of merchantability and fitness for a particular purpose are disclaimed. +In no event shall copyright holders or contributors be liable for any direct, +indirect, incidental, special, exemplary, or consequential damages +(including, but not limited to, procurement of substitute goods or services; +loss of use, data, or profits; or business interruption) however caused +and on any theory of liability, whether in contract, strict liability, +or tort (including negligence or otherwise) arising in any way out of +the use of this software, even if advised of the possibility of such damage. diff --git a/OpenCV/OpenCV.autopkg b/OpenCV/OpenCV.autopkg deleted file mode 100644 index e2276ca..0000000 --- a/OpenCV/OpenCV.autopkg +++ /dev/null @@ -1,88 +0,0 @@ -nuget { - nuspec { - id = OpenCV; - version: 2.4.10; - title: OpenCV; - authors: {Itseez}; - owners: {Gonçalo Lopes}; - licenseUrl: "http://opensource.org/licenses/bsd-license.php"; - projectUrl: "http://opencv.org"; - iconUrl: "http://opencvlibrary.svn.sourceforge.net/viewvc/opencvlibrary/trunk/opencv/doc/opencv-logo.png"; - requireLicenseAcceptance: false; - summary: "OpenCV is a library of programming functions for realtime computer vision."; - description: @"OpenCV (Open Source Computer Vision) is a library of programming functions for realtime computer vision. OpenCV is released under a BSD license and hence it’s free for both academic and commercial use. It has C++, C, Python and Java (Android) interfaces and supports Windows, Linux, Android, iOS and Mac OS. It has more than 2500 optimized algorithms. Adopted all around the world, OpenCV has more than 7 million downloads growing by nearly 200K/month. Usage ranges from interactive art, to mines inspection, stitching maps on the web on through advanced robotics."; - releaseNotes: "Binaries and build targets for OpenCV 2.4.10 in the x86 and x64 platform architectures."; - copyright: "© Copyright 2014, Itseez"; - tags: { OpenCV, Computer, Vision, Image, Processing }; - } - - files { - docs: { "LICENSE" }; - include: { "include\**\*" }; - [x64,v110] { - bin: { "x64\vc11\bin\opencv_ffmpeg2410_64.dll" }; - } - - [x86,v110] { - bin: { "x86\vc11\bin\opencv_ffmpeg2410.dll" }; - } - - [x64,v110,debug] { - lib: { "x64\vc11\lib\*2410d.lib" }; - bin: { "x64\vc11\bin\*2410d.dll" }; - } - - [x64,v110,release] { - lib: { "x64\vc11\lib\*2410.lib" }; - bin: { "x64\vc11\bin\*2410.dll" }; - } - - [x86,v110,debug] { - lib: { "x86\vc11\lib\*2410d.lib" }; - bin: { "x86\vc11\bin\*2410d.dll" }; - } - - [x86,v110,release] { - lib: { "x86\vc11\lib\*2410.lib" }; - bin: { - #exclude: { "**\opencv_ffmpeg*.dll" }; - "x86\vc11\bin\*2410.dll" - }; - } - - [x64,v120] { - bin: { "x64\vc12\bin\opencv_ffmpeg2410_64.dll" }; - } - - [x86,v120] { - bin: { "x86\vc12\bin\opencv_ffmpeg2410.dll" }; - } - - [x64,v120,debug] { - lib: { "x64\vc12\lib\*2410d.lib" }; - bin: { "x64\vc12\bin\*2410d.dll" }; - } - - [x64,v120,release] { - lib: { "x64\vc12\lib\*2410.lib" }; - bin: { "x64\vc12\bin\*2410.dll" }; - } - - [x86,v120,debug] { - lib: { "x86\vc12\lib\*2410d.lib" }; - bin: { "x86\vc12\bin\*2410d.dll" }; - } - - [x86,v120,release] { - lib: { "x86\vc12\lib\*2410.lib" }; - bin: { - #exclude: { "**\opencv_ffmpeg*.dll" }; - "x86\vc12\bin\*2410.dll" - }; - } - } - - targets { - Defines += HAS_OPENCV; - } -} \ No newline at end of file diff --git a/OpenCV/OpenCV.runtime.win-x64/OpenCV.runtime.win-x64.nuspec b/OpenCV/OpenCV.runtime.win-x64/OpenCV.runtime.win-x64.nuspec new file mode 100644 index 0000000..644be07 --- /dev/null +++ b/OpenCV/OpenCV.runtime.win-x64/OpenCV.runtime.win-x64.nuspec @@ -0,0 +1,19 @@ + + + + OpenCV.runtime.win-x64 + 2.4.8 + OpenCV team + OpenCV team + false + LICENSE + https://opencv.org/ + win x64 native runtime for OpenCV.Net. + Copyright © OpenCV team + + + + + + + \ No newline at end of file diff --git a/OpenCV/OpenCV.runtime.win-x86/OpenCV.runtime.win-x86.nuspec b/OpenCV/OpenCV.runtime.win-x86/OpenCV.runtime.win-x86.nuspec new file mode 100644 index 0000000..77f2683 --- /dev/null +++ b/OpenCV/OpenCV.runtime.win-x86/OpenCV.runtime.win-x86.nuspec @@ -0,0 +1,19 @@ + + + + OpenCV.runtime.win-x86 + 2.4.8 + OpenCV team + OpenCV team + false + LICENSE + https://opencv.org/ + win x86 native runtime for OpenCV.Net. + Copyright © OpenCV team + + + + + + + \ No newline at end of file diff --git a/OpenCV/net/OpenCV.redist.targets b/OpenCV/net/OpenCV.redist.targets deleted file mode 100644 index abf7da6..0000000 --- a/OpenCV/net/OpenCV.redist.targets +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file