From 4452794b46d66af2f83878855af7571857d946fa Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 05 十二月 2019 18:24:53 +0800
Subject: [PATCH] 多协程模式

---
 util/image.go |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/util/image.go b/util/image.go
index cadc71a..1257d97 100644
--- a/util/image.go
+++ b/util/image.go
@@ -7,12 +7,19 @@
 )
 
 // 鎸夊昂瀵稿幓鍒囧浘
-func SubImg(i protomsg.Image, x0, y0, x1, y1 int, ) []byte {
+func SubImg(i protomsg.Image, x0, y0, x1, y1 int, type1 string ) []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
+	if type1 == "face" {
+		rect := image.Rect(EnlargeSize(x0, y0, x1, y1, i))
+		region := img.Region(rect)
+		bytes, _ := gocv.IMEncode(".jpg", region)
+		return bytes
+	} else {
+		rect := image.Rect(EnlargeSizeForCar(x0, y0, x1, y1, i))
+		region := img.Region(rect)
+		bytes, _ := gocv.IMEncode(".jpg", region)
+		return bytes
+	}
 }
 
 // 闀垮鍙樹负涓�姣斾竴锛屾瘡杈瑰悇鎵╃櫨鍒嗕箣20
@@ -48,3 +55,19 @@
 	}
 	return
 }
+
+// 姣忚竟鍚勬墿鐧惧垎涔�20
+func EnlargeSizeForCar(x0, y0, x1, y1 int, i protomsg.Image) (int,int,int,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)
+	}
+	return x0, y0, x1, y1
+}

--
Gitblit v1.8.0