From b5df418bd3a9a332caa1559e96136c149b6f0e44 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 06 八月 2019 13:57:05 +0800
Subject: [PATCH] log
---
service/FaceSdkService.go | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index 0ac4063..148375f 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -8,9 +8,11 @@
"github.com/pkg/errors"
"github.com/satori/go.uuid"
"gocv.io/x/gocv"
+ "image"
"sync"
"time"
"webserver/extend/logger"
+ "webserver/extend/util"
)
type FaceSdkService struct {
@@ -81,19 +83,20 @@
}
func (s *FaceSdkService) ReadFromUploadImg() (*protomsg.Image,error){
- //defer (*(s.File)).Close()
- //imgB, err := ioutil.ReadAll(*(s.File))
- //if err !=nil{
- // logger.Debug("File.Read err:",err)
- // return nil,err
- //}
-
picMat, err := gocv.IMDecode(s.File, gocv.IMReadColor)
if err !=nil {
logger.Debug("gocv.IMDecode err:",err)
return nil,err
}
+ newMat := gocv.NewMat()
+ if picMat.Rows() > 1000 || picMat.Cols() > 1000 {
+ gocv.Resize(picMat,&newMat, image.Pt(0,0), 0.5, 0.5, gocv.InterpolationDefault)
+ picMat = newMat
+ }
+
defer picMat.Close()
+ defer newMat.Close()
+
if picMat.Empty() {
logger.Debug("file not exist")
return nil,errors.New("picMat is empty")
@@ -213,7 +216,7 @@
return coms,ok
}
-func (f *FeaResult) Delete(id string){
+func (f *FeaResult) Delete(id int64){
f.Lock.Lock()
defer f.Lock.Unlock()
delete(f.FaceM,id)
@@ -262,7 +265,12 @@
if err := proto.Unmarshal(resultBytes, &rMsg); err == nil {
logger.Debug("received MSG:", rMsg.Cid)
i := protomsg.Image{}
- err := proto.Unmarshal(rMsg.Data, &i)
+ bdata, err := util.UnCompress(rMsg.Data)
+ if err !=nil {
+ logger.Debug("uncompress err:",err)
+ continue
+ }
+ err = proto.Unmarshal(bdata, &i)
if err !=nil {
continue
}
--
Gitblit v1.8.0