Skip to content

Commit

Permalink
Merge pull request #1201 from shimat/goodbye_blob
Browse files Browse the repository at this point in the history
remove Blob
  • Loading branch information
shimat authored Feb 6, 2021
2 parents 2884633 + 422c07a commit 1c6a50c
Show file tree
Hide file tree
Showing 21 changed files with 2 additions and 3,493 deletions.
29 changes: 1 addition & 28 deletions OpenCvSharp.sln
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenCvSharp", "src\OpenCvSh
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenCvSharp.Tests", "test\OpenCvSharp.Tests\OpenCvSharp.Tests.csproj", "{FFBBCF99-97F0-4F81-AAF6-8D851A8E1D2E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenCvSharp.Blob", "src\OpenCvSharp.Blob\OpenCvSharp.Blob.csproj", "{82AFDA65-515E-4EC0-A415-77D8A6711508}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenCvSharp.Extensions", "src\OpenCvSharp.Extensions\OpenCvSharp.Extensions.csproj", "{B4B78BB2-1B7C-4CF2-BC72-43789EEDCE00}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenCvSharpExtern", "src\OpenCvSharpExtern\OpenCvSharpExtern.vcxproj", "{8E7279F8-F801-4672-B42F-1ED2C68B16A4}"
Expand All @@ -26,7 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tool", "tool", "{A6E578C0-A
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenCvSharp.ReleaseMaker", "tool\OpenCvSharp.ReleaseMaker\OpenCvSharp.ReleaseMaker.csproj", "{E2C8C528-B7C7-40AF-BB7F-1147A41E2E23}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenCvSharp.NupkgBetaRemover", "tool\OpenCvSharp.NupkgBetaRemover\OpenCvSharp.NupkgBetaRemover.csproj", "{CC19F9A5-01A7-4BDF-B34C-CF56F46A474A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenCvSharp.NupkgBetaRemover", "tool\OpenCvSharp.NupkgBetaRemover\OpenCvSharp.NupkgBetaRemover.csproj", "{CC19F9A5-01A7-4BDF-B34C-CF56F46A474A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uwpOpenCvSharpExtern", "src\uwpOpenCvSharpExtern\uwpOpenCvSharpExtern.vcxproj", "{BD5471E5-7B55-5192-8DA4-042B66AF71AE}"
EndProject
Expand Down Expand Up @@ -96,30 +94,6 @@ Global
{FFBBCF99-97F0-4F81-AAF6-8D851A8E1D2E}.Release-JP|x64.Build.0 = Release|Any CPU
{FFBBCF99-97F0-4F81-AAF6-8D851A8E1D2E}.Release-JP|x86.ActiveCfg = Release|Any CPU
{FFBBCF99-97F0-4F81-AAF6-8D851A8E1D2E}.Release-JP|x86.Build.0 = Release|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Debug|Any CPU.Build.0 = Debug|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Debug|ARM.ActiveCfg = Debug|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Debug|ARM.Build.0 = Debug|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Debug|x64.ActiveCfg = Debug|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Debug|x64.Build.0 = Debug|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Debug|x86.ActiveCfg = Debug|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Debug|x86.Build.0 = Debug|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Release|Any CPU.ActiveCfg = Release|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Release|Any CPU.Build.0 = Release|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Release|ARM.ActiveCfg = Release|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Release|ARM.Build.0 = Release|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Release|x64.ActiveCfg = Release|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Release|x64.Build.0 = Release|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Release|x86.ActiveCfg = Release|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Release|x86.Build.0 = Release|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Release-JP|Any CPU.ActiveCfg = Release|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Release-JP|Any CPU.Build.0 = Release|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Release-JP|ARM.ActiveCfg = Release|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Release-JP|ARM.Build.0 = Release|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Release-JP|x64.ActiveCfg = Release|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Release-JP|x64.Build.0 = Release|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Release-JP|x86.ActiveCfg = Release|Any CPU
{82AFDA65-515E-4EC0-A415-77D8A6711508}.Release-JP|x86.Build.0 = Release|Any CPU
{B4B78BB2-1B7C-4CF2-BC72-43789EEDCE00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4B78BB2-1B7C-4CF2-BC72-43789EEDCE00}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4B78BB2-1B7C-4CF2-BC72-43789EEDCE00}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -288,7 +262,6 @@ Global
GlobalSection(NestedProjects) = preSolution
{EB310923-197F-4E20-B123-3A3E7F1D5069} = {E048D213-B3B9-453F-9A41-29FDEB0D496B}
{FFBBCF99-97F0-4F81-AAF6-8D851A8E1D2E} = {1F113DD0-E292-47A5-8EFF-3FB5D0869BF3}
{82AFDA65-515E-4EC0-A415-77D8A6711508} = {E048D213-B3B9-453F-9A41-29FDEB0D496B}
{B4B78BB2-1B7C-4CF2-BC72-43789EEDCE00} = {E048D213-B3B9-453F-9A41-29FDEB0D496B}
{8E7279F8-F801-4672-B42F-1ED2C68B16A4} = {E048D213-B3B9-453F-9A41-29FDEB0D496B}
{4232CB4A-DFE3-46CA-9503-C5F1798BAED3} = {E048D213-B3B9-453F-9A41-29FDEB0D496B}
Expand Down
17 changes: 1 addition & 16 deletions nuget/OpenCvSharp4.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -55,51 +55,36 @@
<file src="..\src\OpenCvSharp\bin\Release\net48\OpenCvSharp.dll" target="lib\net48" />
<file src="..\src\OpenCvSharp\bin\Release\net48\OpenCvSharp.xml" target="lib\net48" />
<file src="..\src\OpenCvSharp\bin\Release\net48\OpenCvSharp.pdb" target="lib\net48" />
<file src="..\src\OpenCvSharp.Blob\bin\Release\net48\OpenCvSharp.Blob.dll" target="lib\net48" />
<file src="..\src\OpenCvSharp.Blob\bin\Release\net48\OpenCvSharp.Blob.pdb" target="lib\net48" />
<file src="..\src\OpenCvSharp.Blob\bin\Release\net48\OpenCvSharp.Blob.xml" target="lib\net48" />
<file src="..\src\OpenCvSharp.Extensions\bin\Release\net48\OpenCvSharp.Extensions.dll" target="lib\net48" />
<file src="..\src\OpenCvSharp.Extensions\bin\Release\net48\OpenCvSharp.Extensions.pdb" target="lib\net48" />
<file src="..\src\OpenCvSharp.Extensions\bin\Release\net48\OpenCvSharp.Extensions.xml" target="lib\net48" />

<file src="..\src\OpenCvSharp\bin\Release\net461\OpenCvSharp.dll" target="lib\net461" />
<file src="..\src\OpenCvSharp\bin\Release\net461\OpenCvSharp.xml" target="lib\net461" />
<file src="..\src\OpenCvSharp\bin\Release\net461\OpenCvSharp.pdb" target="lib\net461" />
<file src="..\src\OpenCvSharp.Blob\bin\Release\net461\OpenCvSharp.Blob.dll" target="lib\net461" />
<file src="..\src\OpenCvSharp.Blob\bin\Release\net461\OpenCvSharp.Blob.pdb" target="lib\net461" />
<file src="..\src\OpenCvSharp.Blob\bin\Release\net461\OpenCvSharp.Blob.xml" target="lib\net461" />
<file src="..\src\OpenCvSharp.Extensions\bin\Release\net461\OpenCvSharp.Extensions.dll" target="lib\net461" />
<file src="..\src\OpenCvSharp.Extensions\bin\Release\net461\OpenCvSharp.Extensions.pdb" target="lib\net461" />
<file src="..\src\OpenCvSharp.Extensions\bin\Release\net461\OpenCvSharp.Extensions.xml" target="lib\net461" />

<file src="..\src\OpenCvSharp\bin\Release\netstandard2.0\OpenCvSharp.dll" target="lib\netstandard2.0" />
<file src="..\src\OpenCvSharp\bin\Release\netstandard2.0\OpenCvSharp.pdb" target="lib\netstandard2.0" />
<file src="..\src\OpenCvSharp\bin\Release\netstandard2.0\OpenCvSharp.xml" target="lib\netstandard2.0" />
<file src="..\src\OpenCvSharp.Blob\bin\Release\netstandard2.0\OpenCvSharp.Blob.dll" target="lib\netstandard2.0" />
<file src="..\src\OpenCvSharp.Blob\bin\Release\netstandard2.0\OpenCvSharp.Blob.pdb" target="lib\netstandard2.0" />
<file src="..\src\OpenCvSharp.Blob\bin\Release\netstandard2.0\OpenCvSharp.Blob.xml" target="lib\netstandard2.0" />
<file src="..\src\OpenCvSharp.Extensions\bin\Release\netstandard2.0\OpenCvSharp.Extensions.dll" target="lib\netstandard2.0" />
<file src="..\src\OpenCvSharp.Extensions\bin\Release\netstandard2.0\OpenCvSharp.Extensions.pdb" target="lib\netstandard2.0" />
<file src="..\src\OpenCvSharp.Extensions\bin\Release\netstandard2.0\OpenCvSharp.Extensions.xml" target="lib\netstandard2.0" />

<file src="..\src\OpenCvSharp\bin\Release\netstandard2.1\OpenCvSharp.dll" target="lib\netstandard2.1" />
<file src="..\src\OpenCvSharp\bin\Release\netstandard2.1\OpenCvSharp.pdb" target="lib\netstandard2.1" />
<file src="..\src\OpenCvSharp\bin\Release\netstandard2.1\OpenCvSharp.xml" target="lib\netstandard2.1" />
<file src="..\src\OpenCvSharp.Blob\bin\Release\netstandard2.1\OpenCvSharp.Blob.dll" target="lib\netstandard2.1" />
<file src="..\src\OpenCvSharp.Blob\bin\Release\netstandard2.1\OpenCvSharp.Blob.pdb" target="lib\netstandard2.1" />
<file src="..\src\OpenCvSharp.Blob\bin\Release\netstandard2.1\OpenCvSharp.Blob.xml" target="lib\netstandard2.1" />
<file src="..\src\OpenCvSharp.Extensions\bin\Release\netstandard2.1\OpenCvSharp.Extensions.dll" target="lib\netstandard2.1" />
<file src="..\src\OpenCvSharp.Extensions\bin\Release\netstandard2.1\OpenCvSharp.Extensions.pdb" target="lib\netstandard2.1" />
<file src="..\src\OpenCvSharp.Extensions\bin\Release\netstandard2.1\OpenCvSharp.Extensions.xml" target="lib\netstandard2.1" />

<file src="..\src\OpenCvSharp\bin\Release\netcoreapp2.1\OpenCvSharp.dll" target="lib\netcoreapp2.1" />
<file src="..\src\OpenCvSharp\bin\Release\netcoreapp2.1\OpenCvSharp.pdb" target="lib\netcoreapp2.1" />
<file src="..\src\OpenCvSharp\bin\Release\netcoreapp2.1\OpenCvSharp.xml" target="lib\netcoreapp2.1" />
<file src="..\src\OpenCvSharp.Blob\bin\Release\netcoreapp2.1\OpenCvSharp.Blob.dll" target="lib\netcoreapp2.1" />
<file src="..\src\OpenCvSharp.Blob\bin\Release\netcoreapp2.1\OpenCvSharp.Blob.pdb" target="lib\netcoreapp2.1" />
<file src="..\src\OpenCvSharp.Blob\bin\Release\netcoreapp2.1\OpenCvSharp.Blob.xml" target="lib\netcoreapp2.1" />
<file src="..\src\OpenCvSharp.Extensions\bin\Release\netcoreapp2.1\OpenCvSharp.Extensions.dll" target="lib\netcoreapp2.1" />
<file src="..\src\OpenCvSharp.Extensions\bin\Release\netcoreapp2.1\OpenCvSharp.Extensions.pdb" target="lib\netcoreapp2.1" />
<file src="..\src\OpenCvSharp.Extensions\bin\Release\netcoreapp2.1\OpenCvSharp.Extensions.xml" target="lib\netcoreapp2.1" />
</files>
</package>
</package>
207 changes: 0 additions & 207 deletions src/OpenCvSharp.Blob/BlobRenderer.cs

This file was deleted.

Loading

0 comments on commit 1c6a50c

Please sign in to comment.