remove defer for image

This commit is contained in:
Dimitrii
2021-01-28 14:20:08 +03:00
parent 81223ac67d
commit 165e59aaf3
2 changed files with 10 additions and 3 deletions

View File

@@ -25,6 +25,12 @@ type DetectionResult struct {
OverallTimeTaken time.Duration OverallTimeTaken time.Duration
} }
// func (dr *DetectionResult) Close() error {
// C.free_detections(dr.Detections, len(dr.Detections))
// dr.Detections = nil
// return nil
// }
func makeDetection(img *DarknetImage, det *C.detection, threshold float32, classes int, classNames []string) *Detection { func makeDetection(img *DarknetImage, det *C.detection, threshold float32, classes int, classNames []string) *Detection {
if det == nil { if det == nil {
return &Detection{} return &Detection{}

View File

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