Merge pull request #7 from LdDl/mleak

Closes #6
This commit is contained in:
Dimitrii Lopanov
2020-05-15 16:07:41 +03:00
committed by GitHub
2 changed files with 1 additions and 4 deletions

View File

@@ -14,10 +14,8 @@ struct network_box_result perform_network_detect(network *n, image *img, int cla
sized = resize_image(*img, n->w, n->h); sized = resize_image(*img, n->w, n->h);
} }
struct network_box_result result = { NULL }; struct network_box_result result = { NULL };
float *X = sized.data; network_predict_ptr(n, sized.data);
network_predict(*n, X);
int nboxes = 0; int nboxes = 0;
detection *dets = get_network_boxes(n, img->w, img->h, thresh, hier_thresh, 0, 1, &nboxes, letter_box);
result.detections = get_network_boxes(n, img->w, img->h, thresh, hier_thresh, 0, 1, &result.detections_len, letter_box); result.detections = get_network_boxes(n, img->w, img->h, thresh, hier_thresh, 0, 1, &result.detections_len, letter_box);
if (nms) { if (nms) {
do_nms_sort(result.detections, result.detections_len, classes, nms); do_nms_sort(result.detections, result.detections_len, classes, nms);

View File

@@ -71,7 +71,6 @@ func (n *YOLONetwork) Detect(img *DarknetImage) (*DetectionResult, error) {
startTime := time.Now() startTime := time.Now()
result := C.perform_network_detect(n.cNet, &img.image, C.int(n.Classes), C.float(n.Threshold), C.float(n.hierarchalThreshold), C.float(n.nms), C.int(0)) result := C.perform_network_detect(n.cNet, &img.image, C.int(n.Classes), C.float(n.Threshold), C.float(n.hierarchalThreshold), C.float(n.nms), C.int(0))
endTime := time.Now() endTime := time.Now()
// defer C.free_detections(result.detections, result.detections_len)
ds := makeDetections(img, result.detections, int(result.detections_len), n.Threshold, n.Classes, n.ClassNames) ds := makeDetections(img, result.detections, int(result.detections_len), n.Threshold, n.Classes, n.ClassNames)
C.free_detections(result.detections, result.detections_len) C.free_detections(result.detections, result.detections_len)
endTimeOverall := time.Now() endTimeOverall := time.Now()