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

Merge pull request #1111 from tinohager/master

Browse Source 
Optimize C# interface adjust array size
This commit is contained in:
Alexey
2018-06-28 01:41:52 +03:00
committed by GitHub
parent b847f39f60 bff7644f31
commit 0e1d52500d
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build/darknet/YoloWrapper.cs
View File

@ -6,6 +6,7 @@ namespace Darknet
public class YoloWrapper : IDisposable public class YoloWrapper : IDisposable
{ {
private const string YoloLibraryName = "yolo_cpp_dll.dll"; private const string YoloLibraryName = "yolo_cpp_dll.dll";
private const int MaxObjects = 1000;
[DllImport(YoloLibraryName, EntryPoint = "init")] [DllImport(YoloLibraryName, EntryPoint = "init")]
public static extern int InitializeYolo(string configurationFilename, string weightsFilename, int gpu); public static extern int InitializeYolo(string configurationFilename, string weightsFilename, int gpu);
@ -29,10 +30,10 @@ namespace Darknet
public UInt32 frames_counter; public UInt32 frames_counter;
}; };
[StructLayout(LayoutKind.Sequential, Size = 10)] [StructLayout(LayoutKind.Sequential)]
public struct BboxContainer public struct BboxContainer
{ {
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)] [MarshalAs(UnmanagedType.ByValArray, SizeConst = MaxObjects)]
public bbox_t[] candidates; public bbox_t[] candidates;
} }

2
src/yolo_v2_class.cpp
View File

@ -22,8 +22,6 @@ extern "C" {
#define FRAMES 3 #define FRAMES 3
int max_objects() { return C_SHARP_MAX_OBJECTS; }
//static Detector* detector = NULL; //static Detector* detector = NULL;
static std::unique_ptr<Detector> detector; static std::unique_ptr<Detector> detector;

1
src/yolo_v2_class.hpp
View File

@ -45,7 +45,6 @@ struct bbox_t_container {
#include "opencv2/imgproc/imgproc_c.h" // C #include "opencv2/imgproc/imgproc_c.h" // C
#endif // OPENCV #endif // OPENCV
extern "C" YOLODLL_API int max_objects();
extern "C" YOLODLL_API int init(const char *configurationFilename, const char *weightsFilename, int gpu); extern "C" YOLODLL_API int init(const char *configurationFilename, const char *weightsFilename, int gpu);
extern "C" YOLODLL_API int detect_image(const char *filename, bbox_t_container &container); extern "C" YOLODLL_API int detect_image(const char *filename, bbox_t_container &container);
extern "C" YOLODLL_API int detect_mat(const uint8_t* data, const size_t data_length, bbox_t_container &container); extern "C" YOLODLL_API int detect_mat(const uint8_t* data, const size_t data_length, bbox_t_container &container);