From 87981f30bd29d7c1b336da956bf2d5b39b25bdfe Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 21 十一月 2019 16:34:04 +0800
Subject: [PATCH] 车辆不再扩充
---
util/image.go | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/util/image.go b/util/image.go
index cadc71a..5485c92 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,27 @@
}
return
}
+
+// 姣忚竟鍚勬墿鐧惧垎涔�20
+func EnlargeSizeForCar(x0, y0, x1, y1 int, i protomsg.Image) (x0_new, y0_new, x1_new, y1_new int) {
+
+ // 鍐嶆妸姣忚竟鍚勬墿澶х櫨鍒嗕箣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