From aaef63e086f12d06cf5dae27007c81abf40ca3a2 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期四, 11 六月 2020 19:45:14 +0800
Subject: [PATCH] fix models path
---
extend/util/util.go | 51 ++-------------------------------------------------
1 files changed, 2 insertions(+), 49 deletions(-)
diff --git a/extend/util/util.go b/extend/util/util.go
index 38017e1..f87adf7 100644
--- a/extend/util/util.go
+++ b/extend/util/util.go
@@ -8,7 +8,6 @@
"crypto/tls"
"encoding/hex"
"encoding/json"
- "image"
"io"
"io/ioutil"
"net"
@@ -19,13 +18,10 @@
"time"
"webserver/extend/code"
- "basic.com/pubsub/protomsg.git"
- "github.com/gin-gonic/gin"
- "github.com/pierrec/lz4"
- "gocv.io/x/gocv"
-
"crypto/rand"
"fmt"
+ "github.com/gin-gonic/gin"
+ "github.com/pierrec/lz4"
"reflect"
"strings"
)
@@ -96,49 +92,6 @@
return nil, err
}
return pix, nil
-}
-
-// 鎸夊昂瀵稿幓鍒囧浘
-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
}
func StringIpToInt(ipstring string) int {
--
Gitblit v1.8.0