From ad379d891965550fbd31e006958f0d2a1657d62c Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 18 六月 2019 14:46:39 +0800
Subject: [PATCH] remove images fromsdk param
---
sdk.pb.go | 193 +++++++++--------------------------------------
1 files changed, 38 insertions(+), 155 deletions(-)
diff --git a/sdk.pb.go b/sdk.pb.go
index 4914303..eebeec3 100644
--- a/sdk.pb.go
+++ b/sdk.pb.go
@@ -499,7 +499,6 @@
type ParamFacePos struct {
Pos *FacePos `protobuf:"bytes,1,opt,name=pos,proto3" json:"pos,omitempty"`
Result *ThftResult `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
- Img *Image `protobuf:"bytes,3,opt,name=img,proto3" json:"img,omitempty"`
}
func (m *ParamFacePos) Reset() { *m = ParamFacePos{} }
@@ -545,13 +544,6 @@
func (m *ParamFacePos) GetResult() *ThftResult {
if m != nil {
return m.Result
- }
- return nil
-}
-
-func (m *ParamFacePos) GetImg() *Image {
- if m != nil {
- return m.Img
}
return nil
}
@@ -612,7 +604,6 @@
// sdk yolo detect
type ParamYoloObj struct {
Infos []*ObjInfo `protobuf:"bytes,1,rep,name=infos,proto3" json:"infos,omitempty"`
- Img *Image `protobuf:"bytes,2,opt,name=img,proto3" json:"img,omitempty"`
}
func (m *ParamYoloObj) Reset() { *m = ParamYoloObj{} }
@@ -655,13 +646,6 @@
return nil
}
-func (m *ParamYoloObj) GetImg() *Image {
- if m != nil {
- return m.Img
- }
- return nil
-}
-
func init() {
proto.RegisterType((*Image)(nil), "protomsg.Image")
proto.RegisterType((*FaceAngle)(nil), "protomsg.FaceAngle")
@@ -677,45 +661,44 @@
func init() { proto.RegisterFile("sdk.proto", fileDescriptor_70decb0fb6f436df) }
var fileDescriptor_70decb0fb6f436df = []byte{
- // 598 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x54, 0xcd, 0x6e, 0xd3, 0x40,
- 0x10, 0xae, 0xed, 0xda, 0x69, 0xa6, 0x15, 0x94, 0xa5, 0x42, 0x16, 0x07, 0x2b, 0x18, 0x44, 0x83,
- 0x80, 0x22, 0xc2, 0x1d, 0x09, 0x28, 0x48, 0x91, 0x80, 0x46, 0x2b, 0x38, 0xc0, 0x6d, 0xed, 0xac,
- 0x7f, 0x8a, 0xed, 0x35, 0xf6, 0x46, 0xc5, 0x77, 0x1e, 0x80, 0xc7, 0xe2, 0xc0, 0xa1, 0x47, 0x8e,
- 0x28, 0x11, 0xef, 0x81, 0x76, 0xbc, 0x4e, 0x52, 0x91, 0x9e, 0xb8, 0x72, 0xca, 0x7c, 0x33, 0x5f,
- 0xe6, 0xe7, 0x9b, 0x1d, 0x43, 0xbf, 0x9e, 0x7e, 0x3a, 0x2a, 0x2b, 0x21, 0x05, 0xd9, 0xc1, 0x9f,
- 0xbc, 0x8e, 0x6f, 0x42, 0xc0, 0x6a, 0xde, 0x7a, 0xfd, 0x31, 0xd8, 0xe3, 0x9c, 0xc5, 0x9c, 0x1c,
- 0x80, 0x7d, 0x96, 0x4e, 0x65, 0xe2, 0x1a, 0x03, 0x63, 0x68, 0xd3, 0x16, 0x90, 0x1b, 0xe0, 0x24,
- 0x3c, 0x8d, 0x13, 0xe9, 0x9a, 0xe8, 0xd6, 0x88, 0x10, 0xd8, 0x9e, 0x32, 0xc9, 0x5c, 0x6b, 0x60,
- 0x0c, 0xf7, 0x28, 0xda, 0x7e, 0x0c, 0xfd, 0x57, 0x2c, 0xe4, 0xcf, 0x8a, 0x38, 0xe3, 0x64, 0x1f,
- 0xac, 0x86, 0x9d, 0xe9, 0x64, 0xca, 0x54, 0x05, 0xca, 0x54, 0x86, 0x89, 0xce, 0xd4, 0x02, 0x95,
- 0xa8, 0x12, 0x59, 0x86, 0x89, 0x6c, 0x8a, 0x36, 0xf1, 0x00, 0x42, 0x51, 0x44, 0xe9, 0x94, 0x17,
- 0x21, 0x77, 0xb7, 0x07, 0xc6, 0xd0, 0xa4, 0x6b, 0x1e, 0xff, 0x0b, 0xc0, 0xbb, 0x24, 0x92, 0x94,
- 0xd7, 0xb3, 0x4c, 0xaa, 0x16, 0x63, 0x5e, 0x4c, 0x79, 0xa5, 0x8b, 0x69, 0xa4, 0x3a, 0x60, 0x31,
- 0xd7, 0xd5, 0x94, 0x89, 0xb5, 0x58, 0xc8, 0x97, 0xb5, 0x58, 0xc8, 0xd5, 0xbf, 0x03, 0xce, 0x66,
- 0xb2, 0xc1, 0x3a, 0x36, 0xd5, 0x48, 0x75, 0x5b, 0xe7, 0x69, 0xc6, 0x5d, 0xbb, 0xed, 0x16, 0x81,
- 0xff, 0xc3, 0x84, 0x9e, 0x9a, 0x71, 0x22, 0x6a, 0x72, 0x17, 0x9c, 0x2a, 0x54, 0x00, 0xeb, 0xee,
- 0x8e, 0xae, 0x1c, 0x75, 0x02, 0x1f, 0x51, 0x1e, 0x4a, 0xaa, 0xa3, 0xe4, 0x21, 0xf4, 0x4b, 0xf9,
- 0x9a, 0x47, 0xf2, 0x65, 0xd3, 0x76, 0xb3, 0x3b, 0xba, 0xba, 0xa2, 0x4e, 0x44, 0x5a, 0x48, 0xba,
- 0x62, 0x90, 0x47, 0x00, 0xa5, 0xa4, 0x4a, 0x64, 0xc5, 0xb7, 0x36, 0xf3, 0xd7, 0x28, 0xe4, 0x1e,
- 0xf4, 0x4a, 0xf9, 0x46, 0xcc, 0x64, 0x82, 0x23, 0x6c, 0x60, 0x77, 0x71, 0x72, 0x08, 0x4e, 0x29,
- 0xdf, 0x8a, 0xba, 0x9d, 0x6a, 0x03, 0x53, 0x87, 0xc9, 0x7d, 0x70, 0x22, 0xdc, 0xa3, 0xeb, 0x20,
- 0xf1, 0xfa, 0x8a, 0xb8, 0x5c, 0x31, 0xd5, 0x14, 0xe2, 0x42, 0xef, 0xf3, 0x8c, 0x65, 0xa9, 0x6c,
- 0xdc, 0x1e, 0x8a, 0xd5, 0x41, 0xb5, 0xc8, 0x88, 0x85, 0x29, 0xcb, 0x8e, 0xd5, 0x5b, 0xd9, 0xc1,
- 0xb7, 0xb2, 0xe6, 0xf1, 0x7f, 0x9b, 0xb0, 0xa3, 0xf2, 0x8d, 0x8b, 0x48, 0xfc, 0xd7, 0xf3, 0x9f,
- 0xf5, 0x54, 0x8f, 0x39, 0x52, 0x72, 0x1e, 0xbb, 0xfd, 0x81, 0x31, 0xb4, 0xa8, 0x46, 0xfe, 0x7b,
- 0xe8, 0x9d, 0x04, 0xa7, 0xa8, 0xf2, 0x1d, 0xb0, 0xab, 0xf0, 0x24, 0x38, 0xbd, 0x44, 0xe4, 0x36,
- 0xa8, 0x6e, 0x47, 0x36, 0x65, 0x77, 0x3b, 0xb2, 0x29, 0xd5, 0xed, 0x94, 0x95, 0x08, 0x50, 0x40,
- 0x93, 0xa2, 0xed, 0x7f, 0x35, 0x60, 0x6f, 0xc2, 0x2a, 0x96, 0x77, 0x27, 0x71, 0x1b, 0xac, 0x52,
- 0xd4, 0x3a, 0xf5, 0xb5, 0x8b, 0x33, 0x4e, 0x44, 0x4d, 0x55, 0x94, 0x3c, 0x00, 0xa7, 0xc2, 0xcb,
- 0xd5, 0xcb, 0x3b, 0x58, 0xf1, 0x56, 0x57, 0x4d, 0x35, 0x87, 0xdc, 0x02, 0x2b, 0xcd, 0xe3, 0xbf,
- 0xf7, 0x86, 0x1f, 0x2d, 0xaa, 0x62, 0xfe, 0x53, 0xd8, 0x5f, 0x76, 0xf1, 0x42, 0xe4, 0x25, 0xab,
- 0xf0, 0x6b, 0x16, 0x71, 0x26, 0x1f, 0x63, 0x2f, 0x7b, 0xb4, 0x05, 0x9d, 0x77, 0x84, 0x95, 0xb5,
- 0x77, 0xe4, 0x7f, 0xd4, 0x53, 0x7c, 0x10, 0x99, 0x50, 0xc3, 0x1f, 0x82, 0x9d, 0x16, 0x11, 0xce,
- 0x61, 0x5d, 0x9c, 0x43, 0x8b, 0x48, 0xdb, 0x78, 0xd7, 0x9b, 0x79, 0x79, 0x6f, 0xcf, 0xdd, 0xef,
- 0x73, 0xcf, 0x38, 0x9f, 0x7b, 0xc6, 0xaf, 0xb9, 0x67, 0x7c, 0x5b, 0x78, 0x5b, 0xe7, 0x0b, 0x6f,
- 0xeb, 0xe7, 0xc2, 0xdb, 0x0a, 0x1c, 0xa4, 0x3f, 0xf9, 0x13, 0x00, 0x00, 0xff, 0xff, 0x19, 0xbd,
- 0x52, 0xcd, 0xa2, 0x05, 0x00, 0x00,
+ // 579 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x54, 0x4d, 0x6f, 0xd3, 0x40,
+ 0x10, 0xad, 0xe3, 0xda, 0x69, 0xa6, 0x11, 0x94, 0xa5, 0x42, 0x16, 0x07, 0x2b, 0x32, 0x88, 0x06,
+ 0x01, 0x41, 0x84, 0x03, 0x37, 0x24, 0xa0, 0x20, 0x45, 0x02, 0x1a, 0xad, 0xe0, 0xc0, 0x71, 0xed,
+ 0xac, 0x3f, 0x8a, 0xe3, 0x5d, 0xec, 0x8d, 0x8a, 0xff, 0x05, 0x3f, 0x8b, 0x03, 0x87, 0x1e, 0x39,
+ 0xa2, 0x44, 0xfc, 0x0f, 0xb4, 0xe3, 0x75, 0x92, 0x4a, 0xe1, 0xc4, 0x95, 0x53, 0xf6, 0xcd, 0x3c,
+ 0xcf, 0x9b, 0x79, 0xbb, 0x13, 0xe8, 0x55, 0xb3, 0xcf, 0x23, 0x59, 0x0a, 0x25, 0xc8, 0x01, 0xfe,
+ 0xcc, 0xab, 0xe4, 0x36, 0x84, 0xac, 0xe2, 0x4d, 0x34, 0x98, 0x80, 0x33, 0x99, 0xb3, 0x84, 0x93,
+ 0x63, 0x70, 0x2e, 0xb2, 0x99, 0x4a, 0x3d, 0x6b, 0x60, 0x0d, 0x1d, 0xda, 0x00, 0x72, 0x0b, 0xdc,
+ 0x94, 0x67, 0x49, 0xaa, 0xbc, 0x0e, 0x86, 0x0d, 0x22, 0x04, 0xf6, 0x67, 0x4c, 0x31, 0xcf, 0x1e,
+ 0x58, 0xc3, 0x3e, 0xc5, 0x73, 0x90, 0x40, 0xef, 0x0d, 0x8b, 0xf8, 0x8b, 0x22, 0xc9, 0x39, 0x39,
+ 0x02, 0xbb, 0x66, 0x17, 0xa6, 0x98, 0x3e, 0x6a, 0x01, 0x99, 0xa9, 0x28, 0x35, 0x95, 0x1a, 0xa0,
+ 0x0b, 0x95, 0x22, 0xcf, 0xb1, 0x90, 0x43, 0xf1, 0x4c, 0x7c, 0x80, 0x48, 0x14, 0x71, 0x36, 0xe3,
+ 0x45, 0xc4, 0xbd, 0xfd, 0x81, 0x35, 0xec, 0xd0, 0xad, 0x48, 0xf0, 0x15, 0xe0, 0x43, 0x1a, 0x2b,
+ 0xca, 0xab, 0x45, 0xae, 0x74, 0x8b, 0x09, 0x2f, 0x66, 0xbc, 0x34, 0x62, 0x06, 0xe9, 0x0e, 0x58,
+ 0xc2, 0x8d, 0x9a, 0x3e, 0xa2, 0x16, 0x8b, 0xf8, 0x5a, 0x8b, 0x45, 0x5c, 0x7f, 0x1d, 0x72, 0xb6,
+ 0x50, 0x35, 0xea, 0x38, 0xd4, 0x20, 0xdd, 0x6d, 0x35, 0xcf, 0x72, 0xee, 0x39, 0x4d, 0xb7, 0x08,
+ 0x82, 0x1f, 0x1d, 0xe8, 0xea, 0x19, 0xa7, 0xa2, 0x22, 0xf7, 0xc0, 0x2d, 0x23, 0x0d, 0x50, 0xf7,
+ 0x70, 0x7c, 0x6d, 0xd4, 0x1a, 0x3c, 0xa2, 0x3c, 0x52, 0xd4, 0x64, 0xc9, 0x23, 0xe8, 0x49, 0xf5,
+ 0x96, 0xc7, 0xea, 0x75, 0xdd, 0x74, 0x73, 0x38, 0xbe, 0xbe, 0xa1, 0x4e, 0x45, 0x56, 0x28, 0xba,
+ 0x61, 0x90, 0xc7, 0x00, 0x52, 0x51, 0x6d, 0xb2, 0xe6, 0xdb, 0xbb, 0xf9, 0x5b, 0x14, 0x72, 0x1f,
+ 0xba, 0x52, 0xbd, 0x13, 0x0b, 0x95, 0xe2, 0x08, 0x3b, 0xd8, 0x6d, 0x9e, 0x9c, 0x80, 0x2b, 0xd5,
+ 0x7b, 0x51, 0x35, 0x53, 0xed, 0x60, 0x9a, 0x34, 0x79, 0x00, 0x6e, 0x8c, 0xf7, 0xe8, 0xb9, 0x48,
+ 0xbc, 0xb9, 0x21, 0xae, 0xaf, 0x98, 0x1a, 0x0a, 0xf1, 0xa0, 0xfb, 0x65, 0xc1, 0xf2, 0x4c, 0xd5,
+ 0x5e, 0x17, 0xcd, 0x6a, 0xa1, 0xbe, 0xc8, 0x98, 0x45, 0x19, 0xcb, 0x4f, 0xf5, 0x5b, 0x39, 0xc0,
+ 0xb7, 0xb2, 0x15, 0x09, 0x7e, 0x77, 0xe0, 0x40, 0xd7, 0x9b, 0x14, 0xb1, 0xf8, 0xef, 0xe7, 0x3f,
+ 0xfb, 0xa9, 0x1f, 0x73, 0xac, 0xed, 0x3c, 0xf5, 0x7a, 0x03, 0x6b, 0x68, 0x53, 0x83, 0x82, 0x8f,
+ 0xd0, 0x3d, 0x0b, 0xcf, 0xd1, 0xe5, 0xbb, 0xe0, 0x94, 0xd1, 0x59, 0x78, 0xfe, 0x17, 0x93, 0x9b,
+ 0xa4, 0xde, 0x1d, 0x55, 0xcb, 0x76, 0x77, 0x54, 0x2d, 0xf5, 0xee, 0xc8, 0x52, 0x84, 0x68, 0x60,
+ 0x87, 0xe2, 0x39, 0x60, 0xd0, 0x9f, 0xb2, 0x92, 0xcd, 0xdb, 0x8d, 0xb8, 0x03, 0xb6, 0x14, 0x95,
+ 0xa9, 0x7c, 0xe3, 0xea, 0x88, 0x53, 0x51, 0x51, 0x9d, 0x25, 0x0f, 0xc1, 0x2d, 0x71, 0x71, 0xcd,
+ 0xdd, 0x1d, 0x6f, 0x78, 0x9b, 0xa5, 0xa6, 0x86, 0x13, 0x3c, 0x87, 0xa3, 0xb5, 0xc4, 0x2b, 0x31,
+ 0x97, 0xac, 0xc4, 0x7f, 0xaa, 0x98, 0x33, 0xf5, 0x04, 0x85, 0xfa, 0xb4, 0x01, 0x6d, 0x74, 0x8c,
+ 0x65, 0x4d, 0x74, 0x1c, 0x3c, 0x33, 0x2d, 0x7e, 0x12, 0xb9, 0xd0, 0x83, 0x9d, 0x80, 0x93, 0x15,
+ 0x31, 0x36, 0x69, 0x5f, 0x6d, 0xd2, 0x18, 0x44, 0x9b, 0xfc, 0x4b, 0xef, 0xfb, 0xd2, 0xb7, 0x2e,
+ 0x97, 0xbe, 0xf5, 0x6b, 0xe9, 0x5b, 0xdf, 0x56, 0xfe, 0xde, 0xe5, 0xca, 0xdf, 0xfb, 0xb9, 0xf2,
+ 0xf7, 0x42, 0x17, 0x3f, 0x79, 0xfa, 0x27, 0x00, 0x00, 0xff, 0xff, 0x60, 0x61, 0x8c, 0x27, 0x5b,
+ 0x05, 0x00, 0x00,
}
func (m *Image) Marshal() (dAtA []byte, err error) {
@@ -1091,16 +1074,6 @@
}
i += n15
}
- if m.Img != nil {
- dAtA[i] = 0x1a
- i++
- i = encodeVarintSdk(dAtA, i, uint64(m.Img.Size()))
- n16, err16 := m.Img.MarshalTo(dAtA[i:])
- if err16 != nil {
- return 0, err16
- }
- i += n16
- }
return i, nil
}
@@ -1160,16 +1133,6 @@
}
i += n
}
- }
- if m.Img != nil {
- dAtA[i] = 0x12
- i++
- i = encodeVarintSdk(dAtA, i, uint64(m.Img.Size()))
- n17, err17 := m.Img.MarshalTo(dAtA[i:])
- if err17 != nil {
- return 0, err17
- }
- i += n17
}
return i, nil
}
@@ -1363,10 +1326,6 @@
l = m.Result.Size()
n += 1 + l + sovSdk(uint64(l))
}
- if m.Img != nil {
- l = m.Img.Size()
- n += 1 + l + sovSdk(uint64(l))
- }
return n
}
@@ -1398,10 +1357,6 @@
l = e.Size()
n += 1 + l + sovSdk(uint64(l))
}
- }
- if m.Img != nil {
- l = m.Img.Size()
- n += 1 + l + sovSdk(uint64(l))
}
return n
}
@@ -2696,42 +2651,6 @@
return err
}
iNdEx = postIndex
- case 3:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Img", wireType)
- }
- var msglen int
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowSdk
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- msglen |= int(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- if msglen < 0 {
- return ErrInvalidLengthSdk
- }
- postIndex := iNdEx + msglen
- if postIndex < 0 {
- return ErrInvalidLengthSdk
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- if m.Img == nil {
- m.Img = &Image{}
- }
- if err := m.Img.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
- return err
- }
- iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipSdk(dAtA[iNdEx:])
@@ -2937,42 +2856,6 @@
}
m.Infos = append(m.Infos, &ObjInfo{})
if err := m.Infos[len(m.Infos)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
- return err
- }
- iNdEx = postIndex
- case 2:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Img", wireType)
- }
- var msglen int
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowSdk
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- msglen |= int(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- if msglen < 0 {
- return ErrInvalidLengthSdk
- }
- postIndex := iNdEx + msglen
- if postIndex < 0 {
- return ErrInvalidLengthSdk
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- if m.Img == nil {
- m.Img = &Image{}
- }
- if err := m.Img.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
--
Gitblit v1.8.0