Skip to content

Commit 1e8551f

Browse files
shimatshimat
committed
4.0
1 parent 2c1941b commit 1e8551f

22 files changed

+38
-38
lines changed

‎SampleBase/SampleBase.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\OpenCvSharp3-AnyCPU.3.4.4.20181118\build\OpenCvSharp3-AnyCPU.props" Condition="Exists('..\packages\OpenCvSharp3-AnyCPU.3.4.4.20181118\build\OpenCvSharp3-AnyCPU.props')" />
3+
<Import Project="..\packages\OpenCvSharp3-AnyCPU.4.0.0.20181129\build\OpenCvSharp3-AnyCPU.props" Condition="Exists('..\packages\OpenCvSharp3-AnyCPU.4.0.0.20181129\build\OpenCvSharp3-AnyCPU.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -79,16 +79,16 @@
7979
</PropertyGroup>
8080
<ItemGroup>
8181
<Reference Include="OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
82-
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.4.4.20181118\lib\net461\OpenCvSharp.dll</HintPath>
82+
<HintPath>..\packages\OpenCvSharp3-AnyCPU.4.0.0.20181129\lib\net461\OpenCvSharp.dll</HintPath>
8383
</Reference>
8484
<Reference Include="OpenCvSharp.Blob, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
85-
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.4.4.20181118\lib\net461\OpenCvSharp.Blob.dll</HintPath>
85+
<HintPath>..\packages\OpenCvSharp3-AnyCPU.4.0.0.20181129\lib\net461\OpenCvSharp.Blob.dll</HintPath>
8686
</Reference>
8787
<Reference Include="OpenCvSharp.Extensions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
88-
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.4.4.20181118\lib\net461\OpenCvSharp.Extensions.dll</HintPath>
88+
<HintPath>..\packages\OpenCvSharp3-AnyCPU.4.0.0.20181129\lib\net461\OpenCvSharp.Extensions.dll</HintPath>
8989
</Reference>
9090
<Reference Include="OpenCvSharp.UserInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
91-
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.4.4.20181118\lib\net461\OpenCvSharp.UserInterface.dll</HintPath>
91+
<HintPath>..\packages\OpenCvSharp3-AnyCPU.4.0.0.20181129\lib\net461\OpenCvSharp.UserInterface.dll</HintPath>
9292
</Reference>
9393
<Reference Include="PresentationCore" />
9494
<Reference Include="PresentationFramework" />
@@ -342,7 +342,7 @@
342342
<ErrorText>このプロジェクトは、このコンピューターにはない NuGet パッケージを参照しています。これらをダウンロードするには、NuGet パッケージの復元を有効にしてください。詳細については、http://go.microsoft.com/fwlink/?LinkID=322105 を参照してください。不足しているファイルは {0} です。</ErrorText>
343343
</PropertyGroup>
344344
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
345-
<Error Condition="!Exists('..\packages\OpenCvSharp3-AnyCPU.3.4.4.20181118\build\OpenCvSharp3-AnyCPU.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenCvSharp3-AnyCPU.3.4.4.20181118\build\OpenCvSharp3-AnyCPU.props'))" />
345+
<Error Condition="!Exists('..\packages\OpenCvSharp3-AnyCPU.4.0.0.20181129\build\OpenCvSharp3-AnyCPU.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenCvSharp3-AnyCPU.4.0.0.20181129\build\OpenCvSharp3-AnyCPU.props'))" />
346346
</Target>
347347
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
348348
Other similar extension points exist, see Microsoft.Common.targets.

‎SampleBase/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="OpenCvSharp3-AnyCPU" version="3.4.4.20181118" targetFramework="net461" />
3+
<package id="OpenCvSharp3-AnyCPU" version="4.0.0.20181129" targetFramework="net461" />
44
</packages>

‎SamplesCS/Samples/BRISKSample.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class BRISKSample : ISample
1010
{
1111
public void Run()
1212
{
13-
var gray = new Mat(FilePath.Image.Lenna, ImreadModes.GrayScale);
13+
var gray = new Mat(FilePath.Image.Lenna, ImreadModes.Grayscale);
1414
var dst = new Mat(FilePath.Image.Lenna, ImreadModes.Color);
1515

1616
BRISK brisk = BRISK.Create();

‎SamplesCS/Samples/BinarizerSample.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ internal class BinarizerSample : ISample
1010
{
1111
public void Run()
1212
{
13-
using (var src = Cv2.ImRead(FilePath.Image.Binarization, ImreadModes.GrayScale))
13+
using (var src = Cv2.ImRead(FilePath.Image.Binarization, ImreadModes.Grayscale))
1414
using (var niblack = new Mat())
1515
using (var sauvola = new Mat())
1616
using (var bernsen = new Mat())

‎SamplesCS/Samples/ClaheSample.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class ClaheSample : ISample
1212
{
1313
public void Run()
1414
{
15-
Mat src = new Mat(FilePath.Image.TsukubaLeft, ImreadModes.GrayScale);
15+
Mat src = new Mat(FilePath.Image.TsukubaLeft, ImreadModes.Grayscale);
1616
Mat dst1 = new Mat();
1717
Mat dst2 = new Mat();
1818
Mat dst3 = new Mat();

‎SamplesCS/Samples/DFT.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class DFT : ISample
1313
{
1414
public void Run()
1515
{
16-
Mat img = Cv2.ImRead(FilePath.Image.Lenna, ImreadModes.GrayScale);
16+
Mat img = Cv2.ImRead(FilePath.Image.Lenna, ImreadModes.Grayscale);
1717

1818
// expand input image to optimal size
1919
Mat padded = new Mat();

‎SamplesCS/Samples/FREAKSample.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class FREAKSample : ISample
1111
{
1212
public void Run()
1313
{
14-
var gray = new Mat(FilePath.Image.Lenna, ImreadModes.GrayScale);
14+
var gray = new Mat(FilePath.Image.Lenna, ImreadModes.Grayscale);
1515
var dst = new Mat(FilePath.Image.Lenna, ImreadModes.Color);
1616

1717
// ORB

‎SamplesCS/Samples/HistSample.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class HistSample : ISample
1212
{
1313
public void Run()
1414
{
15-
Mat src = Cv2.ImRead(FilePath.Image.Lenna, ImreadModes.GrayScale);
15+
Mat src = Cv2.ImRead(FilePath.Image.Lenna, ImreadModes.Grayscale);
1616

1717
// Histogram view
1818
const int Width = 260, Height = 200;

‎SamplesCS/Samples/HoughLinesSample.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void Run()
2121
private void SampleCpp()
2222
{
2323
// (1) Load the image
24-
using (Mat imgGray = new Mat(FilePath.Image.Goryokaku, ImreadModes.GrayScale))
24+
using (Mat imgGray = new Mat(FilePath.Image.Goryokaku, ImreadModes.Grayscale))
2525
using (Mat imgStd = new Mat(FilePath.Image.Goryokaku, ImreadModes.Color))
2626
using (Mat imgProb = imgStd.Clone())
2727
{

‎SamplesCS/Samples/KAZESample.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ internal class KAZESample : ISample
1212
{
1313
public void Run()
1414
{
15-
var gray = new Mat(FilePath.Image.Lenna, ImreadModes.GrayScale);
15+
var gray = new Mat(FilePath.Image.Lenna, ImreadModes.Grayscale);
1616
var kaze = KAZE.Create();
1717
var akaze = AKAZE.Create();
1818

0 commit comments

Comments
 (0)