From d3b3f6b835cb7fcbb3712f876e84c8ed625170a2 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 15 一月 2020 11:30:08 +0800
Subject: [PATCH] Merge branch 'cuda-8.0' of ssh://192.168.5.5:29418/libgowrapper/face into cuda-8.0

---
 goface.go |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/goface.go b/goface.go
index 8a77244..7891acf 100644
--- a/goface.go
+++ b/goface.go
@@ -4,7 +4,7 @@
 #cgo CFLAGS: -I${SRCDIR}/sdk/include -w -g
 #cgo CXXFLAGS: -I${SRCDIR}/sdk/include -w -g -std=c++11
 #cgo LDFLAGS: -L/usr/local/cuda-8.0/lib64 -L${SRCDIR}/sdk/lib
-//#cgo LDFLAGS: -Wl,-rpath,${SRCDIR}/sdk/lib
+#cgo LDFLAGS: -Wl,-rpath,${SRCDIR}/sdk/lib
 #cgo LDFLAGS: -lTHFaceImage -lTHFeature -lTHFaceProperty -lTHFaceTracking
 #cgo LDFLAGS: -lcudart -lcublas -lcurand -lrt -ldl -lpthread
 #include <stdlib.h>
@@ -291,7 +291,7 @@
 
 		//杩愯sd
 		dec := FaceInfo2FacePos(d)
-		p := s.Propertize(dec, data, w, h, c, dchan)
+		p := s.Propertize(dec, data, w, h, c, 0)
 		feat := s.Extract(dec, data, w, h, c, dchan)
 
 		/// filter rules
@@ -299,7 +299,7 @@
 		// size := (d.RcFace.Right - d.RcFace.Left) * (d.RcFace.Bottom - d.RcFace.Top)
 		// angle := d.FAngle
 		// if !filter(rMsg.Msg.Tasklab.Taskid, sdkid, angle.Confidence, float32(angle.Yaw), int(size)) {
-		// 	continue
+		//     continue
 		// }
 		/// filter rules
 

--
Gitblit v1.8.0