From 46a5aa51e6b903913a847594a1b57b0a62822b98 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期六, 19 十月 2019 14:30:14 +0800
Subject: [PATCH] class them
---
gosdk.go | 35 -----------------------------------
1 files changed, 0 insertions(+), 35 deletions(-)
diff --git a/gosdk.go b/gosdk.go
index 4f9eb45..f8c5861 100644
--- a/gosdk.go
+++ b/gosdk.go
@@ -84,7 +84,6 @@
var count C.int
cfpos := C.c_api_face_detect(&count, (*C.uchar)(unsafe.Pointer(&data[0])), C.int(w), C.int(h), C.int(ch))
if cfpos != nil {
- defer C.free(unsafe.Pointer(cfpos))
return CFacePosArrayToGoArray(unsafe.Pointer(cfpos), int(count))
}
return nil
@@ -113,7 +112,6 @@
pos := (*C.cFacePos)(unsafe.Pointer(&fpos))
p := C.c_api_face_extract(&featLen, pos, (*C.uchar)(unsafe.Pointer(&data[0])), C.int(w), C.int(h), C.int(ch))
- defer C.free(unsafe.Pointer(p))
b := C.GoBytes(unsafe.Pointer(p), featLen)
return b
}
@@ -122,36 +120,6 @@
func FaceCompare(feat1 []byte, feat2 []byte) float32 {
res := C.c_api_face_compare((*C.uchar)(unsafe.Pointer(&feat1[0])), (*C.uchar)(unsafe.Pointer(&feat2[0])))
return float32(res)
-}
-
-// FaceTrackOnly face tracker face only
-func FaceTrackOnly(img SDKImage, ch int) []CRECT {
- data := img.Data
- w := img.Width
- h := img.Height
-
- var fCount C.int
- rect := C.c_api_face_track_only(&fCount, (*C.uchar)(unsafe.Pointer(&data[0])), C.int(w), C.int(h), C.int(ch))
- if rect != nil {
- defer C.free(unsafe.Pointer(rect))
- return CRECTArrayToGoArray(unsafe.Pointer(rect), int(fCount))
- }
- return nil
-}
-
-// FaceTrackDetect face tracker face detect
-func FaceTrackDetect(img SDKImage, ch int) []CFaceInfo {
- data := img.Data
- w := img.Width
- h := img.Height
-
- var fCount C.int
- finfo := C.c_api_face_track_only(&fCount, (*C.uchar)(unsafe.Pointer(&data[0])), C.int(w), C.int(h), C.int(ch))
- if finfo != nil {
- defer C.free(unsafe.Pointer(finfo))
- return CFaceInfoArrayToGoArray(unsafe.Pointer(finfo), int(fCount))
- }
- return nil
}
// FaceTrackingInfo face track info
@@ -171,7 +139,6 @@
if cFinfo == nil {
return
}
- defer C.free(unsafe.Pointer(cFinfo))
goFinfo := CFaceInfoArrayToGoArray(unsafe.Pointer(cFinfo), int(fCount))
// 绌猴紝娣诲姞
@@ -244,7 +211,6 @@
if cFinfo == nil {
return faces
}
- defer C.free(unsafe.Pointer(cFinfo))
faces = CFaceInfoArrayToGoArray(unsafe.Pointer(cFinfo), int(fCount))
//if len(faces) > 0{
// fmt.Println("faces detected:", len(faces))
@@ -265,7 +231,6 @@
cobjinfo := C.c_api_yolo_detect(handle.handle, &count, (*C.uchar)(unsafe.Pointer(&data[0])), C.int(w), C.int(h), C.float(thrsh), C.int(umns))
if cobjinfo != nil {
- defer C.free(unsafe.Pointer(cobjinfo))
return CYoloObjInfoArrayToGoArray(unsafe.Pointer(cobjinfo), int(count))
}
return nil
--
Gitblit v1.8.0