From 04c0c4fdf84bb7b9e89604e8b9a6079016d5968c Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Wed, 04 Jul 2018 16:06:41 +0000
Subject: [PATCH] Merge pull request #1132 from tinohager/master
---
build/darknet/YoloWrapper.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/build/darknet/YoloWrapper.cs b/build/darknet/YoloWrapper.cs
index 14bf56d..f0c1b0c 100644
--- a/build/darknet/YoloWrapper.cs
+++ b/build/darknet/YoloWrapper.cs
@@ -9,16 +9,16 @@
private const int MaxObjects = 1000;
[DllImport(YoloLibraryName, EntryPoint = "init")]
- public static extern int InitializeYolo(string configurationFilename, string weightsFilename, int gpu);
+ private static extern int InitializeYolo(string configurationFilename, string weightsFilename, int gpu);
[DllImport(YoloLibraryName, EntryPoint = "detect_image")]
- public static extern int DetectImage(string filename, ref BboxContainer container);
+ private static extern int DetectImage(string filename, ref BboxContainer container);
[DllImport(YoloLibraryName, EntryPoint = "detect_mat")]
- public static extern int DetectImage(IntPtr pArray, int nSize, ref BboxContainer container);
+ private static extern int DetectImage(IntPtr pArray, int nSize, ref BboxContainer container);
[DllImport(YoloLibraryName, EntryPoint = "dispose")]
- public static extern int DisposeYolo();
+ private static extern int DisposeYolo();
[StructLayout(LayoutKind.Sequential)]
public struct bbox_t
@@ -66,7 +66,11 @@
{
// Copy the array to unmanaged memory.
Marshal.Copy(imageData, 0, pnt, imageData.Length);
- DetectImage(pnt, imageData.Length, ref container);
+ var count = DetectImage(pnt, imageData.Length, ref container);
+ if (count == -1)
+ {
+ throw new NotSupportedException($"{YoloLibraryName} has no OpenCV support");
+ }
}
catch (Exception exception)
{
--
Gitblit v1.10.0