From 273a54e2a56de2735d7e51890f7de63b1390afb0 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 06 八月 2019 19:35:08 +0800
Subject: [PATCH] ---

---
 util/image.go |   61 +++++++++++++++++++-----------
 1 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/util/image.go b/util/image.go
index 794215c..cadc71a 100644
--- a/util/image.go
+++ b/util/image.go
@@ -4,32 +4,47 @@
 	"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)                          // 鍥剧墖鏂囦欢瑙g爜
-	//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)
+// 鎸夊昂瀵稿幓鍒囧浘
+func SubImg(i protomsg.Image, x0, y0, x1, y1 int, ) []byte {
+	img, _ := gocv.NewMatFromBytes(int(i.Height), int(i.Width), gocv.MatTypeCV8UC3, i.Data)
+	rect := image.Rect(EnlargeSize(x0, y0, x1, y1, i))
 	region := img.Region(rect)
 	bytes, _ := gocv.IMEncode(".jpg", region)
 	return bytes
 }
+
+// 闀垮鍙樹负涓�姣斾竴锛屾瘡杈瑰悇鎵╃櫨鍒嗕箣20
+func EnlargeSize(x0, y0, x1, y1 int, i protomsg.Image) (x0_new, y0_new, x1_new, y1_new int) {
+	// 鍏堟妸闀垮鍙樹负涓�姣斾竴
+	chazhi := (y1 - y0) - (x1 - x0)
+	x0 = x0 - chazhi/2
+	if x0 < 0 {
+		x0 = 0
+	}
+	x1 = x1 + chazhi/2
+	if x1 > int(i.Width) {
+		x1 = int(i.Width)
+	}
+
+	// 鍐嶆妸姣忚竟鍚勬墿澶х櫨鍒嗕箣20
+	enlarge := float32(0.2)
+	x0_new = int((1+enlarge)*float32(x0) - enlarge*float32(x1))
+	if x0_new < 0 {
+		x0_new = 0
+	}
+	x1_new = int((1+enlarge)*float32(x1) - enlarge*float32(x0))
+	if x1_new > int(i.Width) {
+		x1_new = int(i.Width)
+	}
+	y0_new = int((1+enlarge)*float32(y0) - enlarge*float32(y1))
+	if y0_new < 0 {
+		y0_new = 0
+	}
+	y1_new = int((1+enlarge)*float32(y1) - enlarge*float32(y0))
+	if y1_new > int(i.Height) {
+		y1_new = int(i.Height)
+	}
+	return
+}

--
Gitblit v1.8.0