From f10fcffbd257177b71af9d1e76e7ba2651885e29 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 02 六月 2020 19:39:48 +0800
Subject: [PATCH] rm gocv, use godraw
---
service/FaceSdkService.go | 44 +++++++++++---------------------------------
1 files changed, 11 insertions(+), 33 deletions(-)
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index 366ab3d..ff918f7 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -2,10 +2,11 @@
import (
"basic.com/pubsub/protomsg.git"
+ "basic.com/valib/godraw.git"
"basic.com/valib/logger.git"
+ "bytes"
"github.com/gogo/protobuf/proto"
- "github.com/pkg/errors"
- "gocv.io/x/gocv"
+ "image"
"time"
)
@@ -53,44 +54,21 @@
}
func (s *FaceSdkService) readFromUploadImg() (*protomsg.Image,error){
- picMat, err := gocv.IMDecode(s.File, gocv.IMReadColor)
- if err !=nil {
- logger.Debug("gocv.IMDecode err:",err)
- return nil,err
+ bt := bytes.NewBuffer(s.File)
+ img, _, err := image.Decode(bt)
+ if err != nil {
+ return nil, err
}
- logger.Debug("picMat.Data.len:", len(picMat.ToBytes()))
+ bgr := godraw.Image2BGR(img)
- //鍥剧墖缂╁皬鍒嗚鲸鐜�
- //newMat := gocv.NewMat()
- //size := 1024
- //if picMat.Rows() > size || picMat.Cols() > size {
- // fx := float64(size)/float64(picMat.Rows())
- // fy := float64(size)/float64(picMat.Cols())
- // ff := fx
- // if fx > fy{
- // ff = fy
- // }
- // gocv.Resize(picMat,&newMat, image.Pt(0,0), ff, ff, gocv.InterpolationDefault)
- // picMat = newMat
- //}
-
- defer picMat.Close()
-
- if picMat.Empty() {
- logger.Debug("file not exist")
- return nil,errors.New("picMat is empty")
- }
- height := int32(picMat.Rows())
- width := int32(picMat.Cols())
- data := picMat.ToBytes()
timeUnix := time.Now().Unix()
formatTimeStr := time.Unix(timeUnix, 0).Format("2006-01-02 15:04:05")
return &protomsg.Image{
- Width: width,
- Height: height,
+ Width: int32(img.Bounds().Dx()),
+ Height: int32(img.Bounds().Dy()),
Timestamp: formatTimeStr,
- Data: data,
+ Data: bgr,
Id: s.Id,
Cid: faceExtractWebCID,
},nil
--
Gitblit v1.8.0