From 0c853f9c71a13d2a43a74524843476db08e15c8c Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 02 七月 2019 20:56:54 +0800
Subject: [PATCH] 人脸大图路径截取
---
insertdata/insertDataToEs.go | 3 +--
util/image.go | 19 -------------------
ruleserver/ruleToformula.go | 1 -
3 files changed, 1 insertions(+), 22 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 1d375df..2d6e35b 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -126,7 +126,6 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- log.Println("======================================鐪嬬湅杩欎釜妗嗭細",face.Location)
bytes := util.SubImg(i, int(face.Location.X), int(face.Location.Y), int(face.Location.X+face.Location.Width), int(face.Location.Y+face.Location.Height))
resp, err := util.PostFormBufferData1(weedfsUrl, bytes, uuid.NewV4().String())
if err != nil {
@@ -137,7 +136,7 @@
msg.Cid,
msg.Caddr,
time.Now().Format("2006-01-02 15:04:05"),
- bigPhotoUrl["fileUrl"].(string),
+ strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
face.SdkName,
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index db993e3..1784bdc 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -356,7 +356,6 @@
if rule.SdkId == am.sdkId {
if len(am.filterData) > 0 {
for _, data := range am.filterData {
- log.Println("---------------------------------------------------------------------鏈夎繖涓猟ata",data)
faces = append(faces, data)
}
}
diff --git a/util/image.go b/util/image.go
index 794215c..8c245a7 100644
--- a/util/image.go
+++ b/util/image.go
@@ -4,29 +4,10 @@
"basic.com/pubsub/protomsg.git"
"gocv.io/x/gocv"
"image"
- "log"
)
// 鎸夊昂瀵稿幓鍒囧浘
func SubImg(i protomsg.Image,x0,y0,x1,y1 int,) []byte{
- //bbb := bytes.NewBuffer(dbyte) // 蹇呴』鍔犱竴涓猙uffer 涓嶇劧娌℃湁read鏂规硶灏变細鎶ラ敊
- ////log.Println("==================鐪嬬湅杩欎釜buffer",bbb)
- //m, _, _ := image.Decode(bbb) // 鍥剧墖鏂囦欢瑙ｇ爜
- //rgbImg := m.(*image.YCbCr)
- //subImg := rgbImg.SubImage(image.Rect(x0, y0, x1, y1)) //鍥剧墖瑁佸壀x0 y0 x1 y1
- //fmt.Println(reflect.TypeOf(subImg))
- ////f, _ := os.Create("./test.jpg") //鍒涘缓鏂囦欢
- ////defer f.Close() //鍏抽棴鏂囦欢
- //emptyBuff := bytes.NewBuffer(nil) //寮�杈熶竴涓柊鐨勭┖buff
- //jpeg.Encode(emptyBuff, subImg, nil) //img鍐欏叆鍒癰uff
- //bytes := emptyBuff.Bytes()
- //i := protomsg.Image{}
- //proto.Unmarshal(bytes,&i)
- //return i
- //f, _ := os.Create("./test.jpg") //鍒涘缓鏂囦欢
- //defer f.Close() //鍏抽棴鏂囦欢
- //jpeg.Encode(f, subImg, nil) //鍐欏叆鏂囦欢
- log.Println("--------------------------鍥涘ぇ閲戝垰锛�",x0,y0,x1,y1)
img,_ := gocv.NewMatFromBytes(int(i.Height),int(i.Width),gocv.MatTypeCV8UC3,i.Data)
rect := image.Rect(x0,y0,x1,y1)
region := img.Region(rect)
--
Gitblit v1.8.0