Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish_nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: windows.yml
name: nuget_packages_windows
name: packages_windows

- name: Download ubuntu artifact
uses: dawidd6/action-download-artifact@v2
Expand Down
75 changes: 0 additions & 75 deletions OpenCvSharp.sln
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ Global
Release|ARM = Release|ARM
Release|x64 = Release|x64
Release|x86 = Release|x86
Release-JP|Any CPU = Release-JP|Any CPU
Release-JP|ARM = Release-JP|ARM
Release-JP|x64 = Release-JP|x64
Release-JP|x86 = Release-JP|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EB310923-197F-4E20-B123-3A3E7F1D5069}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Expand All @@ -62,14 +58,6 @@ Global
{EB310923-197F-4E20-B123-3A3E7F1D5069}.Release|x64.Build.0 = Release|Any CPU
{EB310923-197F-4E20-B123-3A3E7F1D5069}.Release|x86.ActiveCfg = Release|Any CPU
{EB310923-197F-4E20-B123-3A3E7F1D5069}.Release|x86.Build.0 = Release|Any CPU
{EB310923-197F-4E20-B123-3A3E7F1D5069}.Release-JP|Any CPU.ActiveCfg = Release|Any CPU
{EB310923-197F-4E20-B123-3A3E7F1D5069}.Release-JP|Any CPU.Build.0 = Release|Any CPU
{EB310923-197F-4E20-B123-3A3E7F1D5069}.Release-JP|ARM.ActiveCfg = Release-JP|Any CPU
{EB310923-197F-4E20-B123-3A3E7F1D5069}.Release-JP|ARM.Build.0 = Release-JP|Any CPU
{EB310923-197F-4E20-B123-3A3E7F1D5069}.Release-JP|x64.ActiveCfg = Release-JP|Any CPU
{EB310923-197F-4E20-B123-3A3E7F1D5069}.Release-JP|x64.Build.0 = Release-JP|Any CPU
{EB310923-197F-4E20-B123-3A3E7F1D5069}.Release-JP|x86.ActiveCfg = Release-JP|Any CPU
{EB310923-197F-4E20-B123-3A3E7F1D5069}.Release-JP|x86.Build.0 = Release-JP|Any CPU
{FFBBCF99-97F0-4F81-AAF6-8D851A8E1D2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FFBBCF99-97F0-4F81-AAF6-8D851A8E1D2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FFBBCF99-97F0-4F81-AAF6-8D851A8E1D2E}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand All @@ -86,14 +74,6 @@ Global
{FFBBCF99-97F0-4F81-AAF6-8D851A8E1D2E}.Release|x64.Build.0 = Release|Any CPU
{FFBBCF99-97F0-4F81-AAF6-8D851A8E1D2E}.Release|x86.ActiveCfg = Release|Any CPU
{FFBBCF99-97F0-4F81-AAF6-8D851A8E1D2E}.Release|x86.Build.0 = Release|Any CPU
{FFBBCF99-97F0-4F81-AAF6-8D851A8E1D2E}.Release-JP|Any CPU.ActiveCfg = Release|Any CPU
{FFBBCF99-97F0-4F81-AAF6-8D851A8E1D2E}.Release-JP|Any CPU.Build.0 = Release|Any CPU
{FFBBCF99-97F0-4F81-AAF6-8D851A8E1D2E}.Release-JP|ARM.ActiveCfg = Release|Any CPU
{FFBBCF99-97F0-4F81-AAF6-8D851A8E1D2E}.Release-JP|ARM.Build.0 = Release|Any CPU
{FFBBCF99-97F0-4F81-AAF6-8D851A8E1D2E}.Release-JP|x64.ActiveCfg = Release|Any CPU
{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
{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 All @@ -110,14 +90,6 @@ Global
{B4B78BB2-1B7C-4CF2-BC72-43789EEDCE00}.Release|x64.Build.0 = Release|Any CPU
{B4B78BB2-1B7C-4CF2-BC72-43789EEDCE00}.Release|x86.ActiveCfg = Release|Any CPU
{B4B78BB2-1B7C-4CF2-BC72-43789EEDCE00}.Release|x86.Build.0 = Release|Any CPU
{B4B78BB2-1B7C-4CF2-BC72-43789EEDCE00}.Release-JP|Any CPU.ActiveCfg = Release|Any CPU
{B4B78BB2-1B7C-4CF2-BC72-43789EEDCE00}.Release-JP|Any CPU.Build.0 = Release|Any CPU
{B4B78BB2-1B7C-4CF2-BC72-43789EEDCE00}.Release-JP|ARM.ActiveCfg = Release|Any CPU
{B4B78BB2-1B7C-4CF2-BC72-43789EEDCE00}.Release-JP|ARM.Build.0 = Release|Any CPU
{B4B78BB2-1B7C-4CF2-BC72-43789EEDCE00}.Release-JP|x64.ActiveCfg = Release|Any CPU
{B4B78BB2-1B7C-4CF2-BC72-43789EEDCE00}.Release-JP|x64.Build.0 = Release|Any CPU
{B4B78BB2-1B7C-4CF2-BC72-43789EEDCE00}.Release-JP|x86.ActiveCfg = Release|Any CPU
{B4B78BB2-1B7C-4CF2-BC72-43789EEDCE00}.Release-JP|x86.Build.0 = Release|Any CPU
{8E7279F8-F801-4672-B42F-1ED2C68B16A4}.Debug|Any CPU.ActiveCfg = Debug|Win32
{8E7279F8-F801-4672-B42F-1ED2C68B16A4}.Debug|ARM.ActiveCfg = Debug|Win32
{8E7279F8-F801-4672-B42F-1ED2C68B16A4}.Debug|x64.ActiveCfg = Release|x64
Expand All @@ -131,13 +103,6 @@ Global
{8E7279F8-F801-4672-B42F-1ED2C68B16A4}.Release|x64.Build.0 = Release|x64
{8E7279F8-F801-4672-B42F-1ED2C68B16A4}.Release|x86.ActiveCfg = Release|Win32
{8E7279F8-F801-4672-B42F-1ED2C68B16A4}.Release|x86.Build.0 = Release|Win32
{8E7279F8-F801-4672-B42F-1ED2C68B16A4}.Release-JP|Any CPU.ActiveCfg = Release|x64
{8E7279F8-F801-4672-B42F-1ED2C68B16A4}.Release-JP|Any CPU.Build.0 = Release|x64
{8E7279F8-F801-4672-B42F-1ED2C68B16A4}.Release-JP|ARM.ActiveCfg = Release|Win32
{8E7279F8-F801-4672-B42F-1ED2C68B16A4}.Release-JP|x64.ActiveCfg = Release|x64
{8E7279F8-F801-4672-B42F-1ED2C68B16A4}.Release-JP|x64.Build.0 = Release|x64
{8E7279F8-F801-4672-B42F-1ED2C68B16A4}.Release-JP|x86.ActiveCfg = Release|Win32
{8E7279F8-F801-4672-B42F-1ED2C68B16A4}.Release-JP|x86.Build.0 = Release|Win32
{4232CB4A-DFE3-46CA-9503-C5F1798BAED3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4232CB4A-DFE3-46CA-9503-C5F1798BAED3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4232CB4A-DFE3-46CA-9503-C5F1798BAED3}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand All @@ -154,14 +119,6 @@ Global
{4232CB4A-DFE3-46CA-9503-C5F1798BAED3}.Release|x64.Build.0 = Release|Any CPU
{4232CB4A-DFE3-46CA-9503-C5F1798BAED3}.Release|x86.ActiveCfg = Release|Any CPU
{4232CB4A-DFE3-46CA-9503-C5F1798BAED3}.Release|x86.Build.0 = Release|Any CPU
{4232CB4A-DFE3-46CA-9503-C5F1798BAED3}.Release-JP|Any CPU.ActiveCfg = Release|Any CPU
{4232CB4A-DFE3-46CA-9503-C5F1798BAED3}.Release-JP|Any CPU.Build.0 = Release|Any CPU
{4232CB4A-DFE3-46CA-9503-C5F1798BAED3}.Release-JP|ARM.ActiveCfg = Release|Any CPU
{4232CB4A-DFE3-46CA-9503-C5F1798BAED3}.Release-JP|ARM.Build.0 = Release|Any CPU
{4232CB4A-DFE3-46CA-9503-C5F1798BAED3}.Release-JP|x64.ActiveCfg = Release|Any CPU
{4232CB4A-DFE3-46CA-9503-C5F1798BAED3}.Release-JP|x64.Build.0 = Release|Any CPU
{4232CB4A-DFE3-46CA-9503-C5F1798BAED3}.Release-JP|x86.ActiveCfg = Release|Any CPU
{4232CB4A-DFE3-46CA-9503-C5F1798BAED3}.Release-JP|x86.Build.0 = Release|Any CPU
{CC19F9A5-01A7-4BDF-B34C-CF56F46A474A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CC19F9A5-01A7-4BDF-B34C-CF56F46A474A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CC19F9A5-01A7-4BDF-B34C-CF56F46A474A}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand All @@ -178,14 +135,6 @@ Global
{CC19F9A5-01A7-4BDF-B34C-CF56F46A474A}.Release|x64.Build.0 = Release|Any CPU
{CC19F9A5-01A7-4BDF-B34C-CF56F46A474A}.Release|x86.ActiveCfg = Release|Any CPU
{CC19F9A5-01A7-4BDF-B34C-CF56F46A474A}.Release|x86.Build.0 = Release|Any CPU
{CC19F9A5-01A7-4BDF-B34C-CF56F46A474A}.Release-JP|Any CPU.ActiveCfg = Release|Any CPU
{CC19F9A5-01A7-4BDF-B34C-CF56F46A474A}.Release-JP|Any CPU.Build.0 = Release|Any CPU
{CC19F9A5-01A7-4BDF-B34C-CF56F46A474A}.Release-JP|ARM.ActiveCfg = Release|Any CPU
{CC19F9A5-01A7-4BDF-B34C-CF56F46A474A}.Release-JP|ARM.Build.0 = Release|Any CPU
{CC19F9A5-01A7-4BDF-B34C-CF56F46A474A}.Release-JP|x64.ActiveCfg = Release|Any CPU
{CC19F9A5-01A7-4BDF-B34C-CF56F46A474A}.Release-JP|x64.Build.0 = Release|Any CPU
{CC19F9A5-01A7-4BDF-B34C-CF56F46A474A}.Release-JP|x86.ActiveCfg = Release|Any CPU
{CC19F9A5-01A7-4BDF-B34C-CF56F46A474A}.Release-JP|x86.Build.0 = Release|Any CPU
{BD5471E5-7B55-5192-8DA4-042B66AF71AE}.Debug|Any CPU.ActiveCfg = Debug|Win32
{BD5471E5-7B55-5192-8DA4-042B66AF71AE}.Debug|ARM.ActiveCfg = Debug|ARM
{BD5471E5-7B55-5192-8DA4-042B66AF71AE}.Debug|x64.ActiveCfg = Release|x64
Expand All @@ -199,14 +148,6 @@ Global
{BD5471E5-7B55-5192-8DA4-042B66AF71AE}.Release|x64.Build.0 = Release|x64
{BD5471E5-7B55-5192-8DA4-042B66AF71AE}.Release|x86.ActiveCfg = Release|Win32
{BD5471E5-7B55-5192-8DA4-042B66AF71AE}.Release|x86.Build.0 = Release|Win32
{BD5471E5-7B55-5192-8DA4-042B66AF71AE}.Release-JP|Any CPU.ActiveCfg = Release|x64
{BD5471E5-7B55-5192-8DA4-042B66AF71AE}.Release-JP|Any CPU.Build.0 = Release|x64
{BD5471E5-7B55-5192-8DA4-042B66AF71AE}.Release-JP|ARM.ActiveCfg = Release|ARM
{BD5471E5-7B55-5192-8DA4-042B66AF71AE}.Release-JP|ARM.Build.0 = Release|ARM
{BD5471E5-7B55-5192-8DA4-042B66AF71AE}.Release-JP|x64.ActiveCfg = Release|x64
{BD5471E5-7B55-5192-8DA4-042B66AF71AE}.Release-JP|x64.Build.0 = Release|x64
{BD5471E5-7B55-5192-8DA4-042B66AF71AE}.Release-JP|x86.ActiveCfg = Release|Win32
{BD5471E5-7B55-5192-8DA4-042B66AF71AE}.Release-JP|x86.Build.0 = Release|Win32
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand All @@ -223,14 +164,6 @@ Global
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release|x64.Build.0 = Release|Any CPU
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release|x86.ActiveCfg = Release|Any CPU
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release|x86.Build.0 = Release|Any CPU
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release-JP|Any CPU.ActiveCfg = Release|Any CPU
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release-JP|Any CPU.Build.0 = Release|Any CPU
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release-JP|ARM.ActiveCfg = Release|Any CPU
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release-JP|ARM.Build.0 = Release|Any CPU
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release-JP|x64.ActiveCfg = Release|Any CPU
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release-JP|x64.Build.0 = Release|Any CPU
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release-JP|x86.ActiveCfg = Release|Any CPU
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release-JP|x86.Build.0 = Release|Any CPU
{1C399497-5240-439A-879A-4ACB34C409AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1C399497-5240-439A-879A-4ACB34C409AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1C399497-5240-439A-879A-4ACB34C409AE}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand All @@ -247,14 +180,6 @@ Global
{1C399497-5240-439A-879A-4ACB34C409AE}.Release|x64.Build.0 = Release|Any CPU
{1C399497-5240-439A-879A-4ACB34C409AE}.Release|x86.ActiveCfg = Release|Any CPU
{1C399497-5240-439A-879A-4ACB34C409AE}.Release|x86.Build.0 = Release|Any CPU
{1C399497-5240-439A-879A-4ACB34C409AE}.Release-JP|Any CPU.ActiveCfg = Release|Any CPU
{1C399497-5240-439A-879A-4ACB34C409AE}.Release-JP|Any CPU.Build.0 = Release|Any CPU
{1C399497-5240-439A-879A-4ACB34C409AE}.Release-JP|ARM.ActiveCfg = Release|Any CPU
{1C399497-5240-439A-879A-4ACB34C409AE}.Release-JP|ARM.Build.0 = Release|Any CPU
{1C399497-5240-439A-879A-4ACB34C409AE}.Release-JP|x64.ActiveCfg = Release|Any CPU
{1C399497-5240-439A-879A-4ACB34C409AE}.Release-JP|x64.Build.0 = Release|Any CPU
{1C399497-5240-439A-879A-4ACB34C409AE}.Release-JP|x86.ActiveCfg = Release|Any CPU
{1C399497-5240-439A-879A-4ACB34C409AE}.Release-JP|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 2 additions & 0 deletions OpenCvSharp.sln.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=caffe/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=calib/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=CDECL/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Cholesky/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=CLAHE/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Coeffs/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=covariation/@EntryIndexedValue">True</s:Boolean>
Expand Down Expand Up @@ -55,6 +56,7 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=fourcc/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=gitignore/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=grayscale/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=HAAR/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=highgui/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=homography/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Hough/@EntryIndexedValue">True</s:Boolean>
Expand Down
49 changes: 0 additions & 49 deletions src/OpenCvSharp.Extensions/Binarizer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,19 @@

namespace OpenCvSharp.Extensions
{
#if LANG_JP
/// <summary>
/// 様々な二値化手法を集めたクラス (OpenCVの関数ではなく, OpenCvSharpが独自に実装したものである. 出来は保証しない.)
/// </summary>
#else
/// <summary>
/// Various binarization methods (ATTENTION : The methods of this class is not implemented in OpenCV)
/// </summary>
#endif
[Obsolete("Use CvXImgProc.NiblackThreshold instead.")]
public static class Binarizer
{
#if LANG_JP
/// <summary>
/// Niblackの手法による二値化処理を行う。
/// </summary>
/// <param name="imgSrc">入力画像</param>
/// <param name="imgDst">出力画像</param>
/// <param name="kernelSize">局所領域のサイズ</param>
/// <param name="k">係数</param>
#else
/// <summary>
/// Binarizes by Niblack's method (This is faster but memory-hogging)
/// </summary>
/// <param name="src">Input image</param>
/// <param name="dst">Output image</param>
/// <param name="kernelSize">Window size</param>
/// <param name="k">Adequate coefficient</param>
#endif
public static void Niblack(Mat src, Mat dst, int kernelSize, double k)
{
if (src == null)
Expand Down Expand Up @@ -99,16 +83,6 @@ public static void Niblack(Mat src, Mat dst, int kernelSize, double k)
}
}

#if LANG_JP
/// <summary>
/// Sauvolaの手法による二値化処理を行う。
/// </summary>
/// <param name="imgSrc">入力画像</param>
/// <param name="imgDst">出力画像</param>
/// <param name="kernelSize">局所領域のサイズ</param>
/// <param name="k">係数</param>
/// <param name="r">係数</param>
#else
/// <summary>
/// Binarizes by Sauvola's method (This is faster but memory-hogging)
/// </summary>
Expand All @@ -117,7 +91,6 @@ public static void Niblack(Mat src, Mat dst, int kernelSize, double k)
/// <param name="kernelSize">Window size</param>
/// <param name="k">Adequate coefficient</param>
/// <param name="r">Adequate coefficient</param>
#endif
public static void Sauvola(Mat src, Mat dst, int kernelSize, double k, double r)
{
if (src == null)
Expand Down Expand Up @@ -188,17 +161,6 @@ public static void Sauvola(Mat src, Mat dst, int kernelSize, double k, double r)
}
}


#if LANG_JP
/// <summary>
/// Bernsenの手法による二値化処理を行う。
/// </summary>
/// <param name="imgSrc">入力画像</param>
/// <param name="imgDst">出力画像</param>
/// <param name="kernelSize">局所領域のサイズ</param>
/// <param name="constrastMin">この数値以下のコントラストの領域は背景領域とみなす</param>
/// <param name="bgThreshold">背景領域と見なされた領域に適用する閾値(背景領域以外では、適応的に閾値を求める)</param>
#else
/// <summary>
/// Binarizes by Bernsen's method
/// </summary>
Expand All @@ -207,7 +169,6 @@ public static void Sauvola(Mat src, Mat dst, int kernelSize, double k, double r)
/// <param name="kernelSize">Window size</param>
/// <param name="constrastMin">Adequate coefficient</param>
/// <param name="bgThreshold">Adequate coefficient</param>
#endif
public static void Bernsen(Mat src, Mat dst, int kernelSize, byte constrastMin, byte bgThreshold)
{
if (src == null)
Expand Down Expand Up @@ -259,23 +220,13 @@ public static void Bernsen(Mat src, Mat dst, int kernelSize, byte constrastMin,

}

#if LANG_JP
/// <summary>
/// Nickの手法による二値化処理を行う。
/// </summary>
/// <param name="imgSrc">入力画像</param>
/// <param name="imgDst">出力画像</param>
/// <param name="kernelSize">局所領域のサイズ</param>
/// <param name="k">係数</param>
#else
/// <summary>
/// Binarizes by Nick's method
/// </summary>
/// <param name="src">Input image</param>
/// <param name="dst">Output image</param>
/// <param name="kernelSize">Window size</param>
/// <param name="k">Adequate coefficient</param>
#endif
public static void Nick(Mat src, Mat dst, int kernelSize, double k)
{
if (src == null)
Expand Down
Loading