mirror/darknet
1
0
Fork 0
mirror of https://github.com/pjreddie/darknet.git synced 2023-08-10 21:13:14 +03:00
Code Issues Projects Releases Wiki Activity

Optimize YoloWrapper

Browse Source 
protect internal methods, add exception if openCV support is not available
This commit is contained in:
Tino Hager
2018-07-03 22:29:10 +02:00
parent 6d2e31bf20
commit f4d4099104
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build/darknet/YoloWrapper.cs
View File

@ -9,16 +9,16 @@ namespace Darknet
private const int MaxObjects = 1000; private const int MaxObjects = 1000;
[DllImport(YoloLibraryName, EntryPoint = "init")] [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")] [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")] [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")] [DllImport(YoloLibraryName, EntryPoint = "dispose")]
public static extern int DisposeYolo(); private static extern int DisposeYolo();
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
public struct bbox_t public struct bbox_t
@ -66,7 +66,11 @@ namespace Darknet
{ {
// Copy the array to unmanaged memory. // Copy the array to unmanaged memory.
Marshal.Copy(imageData, 0, pnt, imageData.Length); 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) catch (Exception exception)
{ {