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 changes

Browse Source
This commit is contained in:
Tino Hager
2018-06-27 23:49:41 +02:00
parent 393eaec160
commit ab5368e279
1 changed files with 209 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/yolo_v2_class.cpp
View File

@ -22,24 +22,18 @@ extern "C" {
#define FRAMES 3
static Detector* detector;
//static std::unique_ptr<Detector> detector;
//static Detector* detector = NULL;
static std::unique_ptr<Detector> detector;
int init(const char *configurationFilename, const char *weightsFilename, int gpu) {
std::string configurationFilenameString;
configurationFilenameString = configurationFilename;
std::string weightsFilenameString;
weightsFilenameString = weightsFilename;
detector = new Detector(configurationFilenameString, weightsFilenameString, gpu);
int init(const char *configurationFilename, const char *weightsFilename, int gpu)
{
detector.reset(new Detector(configurationFilename, weightsFilename, gpu));
return 1;
}
int detect_image(const char *filename, bbox_t_container &container) {
std::string filenameString;
filenameString = filename;
std::vector<bbox_t> detection = detector->detect(filenameString);
int detect_image(const char *filename, bbox_t_container &container)
{
std::vector<bbox_t> detection = detector->detect(filename);
for (size_t i = 0; i < detection.size() && i < C_SHARP_MAX_OBJECTS; ++i)
container.candidates[i] = detection[i];
return detection.size();
@ -60,8 +54,9 @@ int detect_mat(const uint8_t* data, const size_t data_length, bbox_t_container &
}
int dispose() {
detector->~Detector();
//detector.reset();
//if (detector != NULL) delete detector;
//detector = NULL;
detector.reset();
return 1;
}