Merge pull request #16 from LdDl/issue-15

Issue 15

.gitignore

@@ -1,5 +1,4 @@
 example/main
-example/sample.jpg
 example/coco.names
 example/yolov3.cfg
 example/yolov3.weights

Makefile

@@ -2,7 +2,7 @@
 .PHONY: download build clean
 
 # Latest battletested AlexeyAB version of Darknet commit
-LATEST_COMMIT?=d65909fbea471d06e52a2e4a41132380dc2edaa6
+LATEST_COMMIT?=f056fc3b6a11528fa0522a468eca1e909b7004b7
 
 # Temporary folder for building Darknet
 TMP_DIR?=/tmp/

example/base_example/main.go

@@ -9,7 +9,6 @@ import (
 	"log"
 	"math"
 	"os"
-
 	darknet "github.com/LdDl/go-darknet"
 	"github.com/disintegration/imaging"
 )
@@ -61,13 +60,13 @@ func main() {
 	if err != nil {
 		panic(err.Error())
 	}
-	defer imgDarknet.Close()
-
+	
 	dr, err := n.Detect(imgDarknet)
 	if err != nil {
 		printError(err)
 		return
 	}
+	imgDarknet.Close()
 
 	log.Println("Network-only time taken:", dr.NetworkOnlyTimeTaken)
 	log.Println("Overall time taken:", dr.OverallTimeTaken, len(dr.Detections))
@@ -92,6 +91,8 @@ func main() {
 			// }
 		}
 	}
+
+	n.Close()
 }
 
 func imageToBytes(img image.Image) ([]byte, error) {

network.c

@@ -14,7 +14,8 @@ struct network_box_result perform_network_detect(network *n, image *img, int cla
         sized = resize_image(*img, n->w, n->h);
     }
     struct network_box_result result = { NULL };
-    network_predict(*n, sized.data);
+    // mleak at network_predict(), get_network_boxes() and network_predict_ptr()?
+    network_predict_ptr(n, sized.data);
     int nboxes = 0;
     result.detections = get_network_boxes(n, img->w, img->h, thresh, hier_thresh, 0, 1, &result.detections_len, letter_box);
     if (nms) {

network.go

@@ -58,7 +58,7 @@ func (n *YOLONetwork) Close() error {
 	if n.cNet == nil {
 		return errNetworkNotInit
 	}
-	C.free_network(*n.cNet)
+	C.free_network_ptr(n.cNet)
 	n.cNet = nil
 	return nil
 }
@@ -80,4 +80,4 @@ func (n *YOLONetwork) Detect(img *DarknetImage) (*DetectionResult, error) {
 		OverallTimeTaken:     endTimeOverall.Sub(startTime),
 	}
 	return &out, nil
-}
+}