Skip to content

Commit 7139d74

Browse files
committed
update nuget
1 parent fe3e879 commit 7139d74

28 files changed

+73
-84
lines changed

CameraOpenCV/CameraOpenCV.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,13 @@
187187
</ItemGroup>
188188
<ItemGroup>
189189
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
190-
<Version>6.2.11</Version>
190+
<Version>6.2.12</Version>
191191
</PackageReference>
192192
<PackageReference Include="OpenCvSharp4">
193-
<Version>4.5.1.20201229</Version>
193+
<Version>4.5.1.20210210</Version>
194194
</PackageReference>
195195
<PackageReference Include="OpenCvSharp4.runtime.uwp">
196-
<Version>4.5.1.20201229</Version>
196+
<Version>4.5.1.20210210</Version>
197197
</PackageReference>
198198
</ItemGroup>
199199
<ItemGroup />

SamplesCS/Samples/ArucoSample.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void Run()
7070
using var normalizedImage = new Mat();
7171
Cv2.WarpPerspective(src, normalizedImage, transform, new Size(1024, 1024));
7272

73-
using var _1 = new Window("Original Image", WindowMode.AutoSize, src);
73+
using var _1 = new Window("Original Image", src, WindowFlags.AutoSize);
7474
using var _2 = new Window($"Found {ids.Length} Markers", detectedMarkers);
7575
using var _3 = new Window("Normalized Image", normalizedImage);
7676

SamplesCS/Samples/BinarizerSample.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ public void Run()
3939
sw.Stop();
4040
Console.WriteLine($"Nick {sw.ElapsedMilliseconds} ms");
4141

42-
using (new Window("src", WindowMode.AutoSize, src))
43-
using (new Window("Niblack", WindowMode.AutoSize, niblack))
44-
using (new Window("Sauvola", WindowMode.AutoSize, sauvola))
45-
using (new Window("Bernsen", WindowMode.AutoSize, bernsen))
46-
using (new Window("Nick", WindowMode.AutoSize, nick))
42+
using (new Window("src", src, WindowFlags.AutoSize))
43+
using (new Window("Niblack", niblack, WindowFlags.AutoSize))
44+
using (new Window("Sauvola", sauvola, WindowFlags.AutoSize))
45+
using (new Window("Bernsen", bernsen, WindowFlags.AutoSize))
46+
using (new Window("Nick", nick, WindowFlags.AutoSize))
4747
{
4848
Cv2.WaitKey();
4949
}

SamplesCS/Samples/FaceDetection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private Mat DetectFace(CascadeClassifier cascade)
4242

4343
// Detect faces
4444
Rect[] faces = cascade.DetectMultiScale(
45-
gray, 1.08, 2, HaarDetectionType.ScaleImage, new Size(30, 30));
45+
gray, 1.08, 2, HaarDetectionTypes.ScaleImage, new Size(30, 30));
4646

4747
// Render all detected faces
4848
foreach (Rect face in faces)

SamplesCS/Samples/HOGSample.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ public void Run()
4949
img.Rectangle(r.TopLeft, r.BottomRight, Scalar.Red, 3);
5050
}
5151

52-
using (var window = new Window("people detector", WindowMode.Normal, img))
52+
using (var window = new Window("people detector", img, WindowFlags.Normal))
5353
{
54-
window.SetProperty(WindowProperty.Fullscreen, 1);
54+
window.SetProperty(WindowPropertyFlags.Fullscreen, 1);
5555
Cv2.WaitKey(0);
5656
}
5757
}

SamplesCS/Samples/HistSample.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ public void Run()
4848
-1);
4949
}
5050

51-
using (new Window("Image", WindowMode.AutoSize | WindowMode.FreeRatio, src))
52-
using (new Window("Histogram", WindowMode.AutoSize | WindowMode.FreeRatio, render))
51+
using (new Window("Image", src, WindowFlags.AutoSize | WindowFlags.FreeRatio))
52+
using (new Window("Histogram", render, WindowFlags.AutoSize | WindowFlags.FreeRatio))
5353
{
5454
Cv2.WaitKey();
5555
}

SamplesCS/Samples/HoughLinesSample.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ private void SampleCpp()
5353
}
5454

5555
// (5) Show results
56-
using (new Window("Hough_line_standard", WindowMode.AutoSize, imgStd))
57-
using (new Window("Hough_line_probabilistic", WindowMode.AutoSize, imgProb))
56+
using (new Window("Hough_line_standard", imgStd))
57+
using (new Window("Hough_line_probabilistic", imgProb))
5858
{
5959
Window.WaitKey(0);
6060
}

SamplesCS/Samples/InpaintSample.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void Run()
3232
using var inpaintMask = new Mat(img0.Size(), MatType.CV_8U, Scalar.Black);
3333
using var inpainted = img0.EmptyClone();
3434

35-
using var wImage = new Window("image", WindowMode.AutoSize, img);
35+
using var wImage = new Window("image", img);
3636
var prevPt = new Point(-1, -1);
3737
wImage.SetMouseCallback((MouseEventTypes ev, int x, int y, MouseEventFlags flags, IntPtr userdata) =>
3838
{
@@ -76,10 +76,10 @@ public void Run()
7676
case 'i': // do Inpaint
7777
case '\r':
7878
Cv2.Inpaint(img, inpaintMask, inpainted, 3, InpaintMethod.Telea);
79-
wInpaint1 ??= new Window("inpainted image (algorithm by Alexandru Telea)", WindowMode.AutoSize);
79+
wInpaint1 ??= new Window("inpainted image (algorithm by Alexandru Telea)", WindowFlags.AutoSize);
8080
wInpaint1.ShowImage(inpainted);
8181
Cv2.Inpaint(img, inpaintMask, inpainted, 3, InpaintMethod.NS);
82-
wInpaint2 ??= new Window("inpainted image (algorithm by Navier-Strokes)", WindowMode.AutoSize);
82+
wInpaint2 ??= new Window("inpainted image (algorithm by Navier-Strokes)", WindowFlags.AutoSize);
8383
wInpaint2.ShowImage(inpainted);
8484
break;
8585
case 's': // save images

SamplesCS/Samples/OpenVinoFaceDetection.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ public void Run()
2323
int frameWidth = frame.Cols;
2424

2525
using var netFace = CvDnn.ReadNet(modelFace, modelFaceTxt);
26-
netFace.SetPreferableBackend(Net.Backend.INFERENCE_ENGINE);
27-
netFace.SetPreferableTarget(Net.Target.CPU);
26+
netFace.SetPreferableBackend(Backend.INFERENCE_ENGINE);
27+
netFace.SetPreferableTarget(Target.CPU);
2828

2929
using var blob = CvDnn.BlobFromImage(frame, 1.0, new OpenCvSharp.Size(672, 384), new OpenCvSharp.Scalar(0, 0, 0), false, false);
3030
netFace.SetInput(blob);

SamplesCS/Samples/Pose.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ public void Run()
3636
const int inHeight = 368;
3737

3838
using var net = CvDnn.ReadNetFromCaffe(modelTxt, model);
39-
net.SetPreferableBackend(Net.Backend.OPENCV);
40-
net.SetPreferableTarget(Net.Target.CPU);
39+
net.SetPreferableBackend(Backend.OPENCV);
40+
net.SetPreferableTarget(Target.CPU);
4141

4242
using var inpBlob = CvDnn.BlobFromImage(frame, 1.0 / 255, new Size(inWidth, inHeight), new Scalar(0, 0, 0), false, false);
4343

0 commit comments

Comments
 (0)