From 201ba0c95333cb07be9f955a936cd06a929e2e8f Mon Sep 17 00:00:00 2001 From: 554325746@qq.com <554325746@qq.com> Date: 星期四, 06 二月 2020 20:37:20 +0800 Subject: [PATCH] change golang/protobuf to gogo/protobuf --- sdk.pb.go | 398 ++++++++++++++++++++------------------------------------ 1 files changed, 140 insertions(+), 258 deletions(-) diff --git a/sdk.pb.go b/sdk.pb.go index db17fce..e74b1df 100644 --- a/sdk.pb.go +++ b/sdk.pb.go @@ -1414,15 +1414,12 @@ } type HumanTrack struct { - Left int32 `protobuf:"varint,1,opt,name=left,proto3" json:"left,omitempty"` - Right int32 `protobuf:"varint,2,opt,name=right,proto3" json:"right,omitempty"` - Top int32 `protobuf:"varint,3,opt,name=top,proto3" json:"top,omitempty"` - Bottom int32 `protobuf:"varint,4,opt,name=bottom,proto3" json:"bottom,omitempty"` - Confidence float32 `protobuf:"fixed32,5,opt,name=confidence,proto3" json:"confidence,omitempty"` - X int32 `protobuf:"varint,6,opt,name=x,proto3" json:"x,omitempty"` - Y int32 `protobuf:"varint,7,opt,name=y,proto3" json:"y,omitempty"` - Id int32 `protobuf:"varint,8,opt,name=id,proto3" json:"id,omitempty"` - Feature []float32 `protobuf:"fixed32,9,rep,packed,name=feature,proto3" json:"feature,omitempty"` + RcHuman *Rect `protobuf:"bytes,1,opt,name=rcHuman,proto3" json:"rcHuman,omitempty"` + Confidence float32 `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"` + X int32 `protobuf:"varint,3,opt,name=x,proto3" json:"x,omitempty"` + Y int32 `protobuf:"varint,4,opt,name=y,proto3" json:"y,omitempty"` + Id int32 `protobuf:"varint,5,opt,name=id,proto3" json:"id,omitempty"` + Feature []float32 `protobuf:"fixed32,6,rep,packed,name=feature,proto3" json:"feature,omitempty"` } func (m *HumanTrack) Reset() { *m = HumanTrack{} } @@ -1458,32 +1455,11 @@ var xxx_messageInfo_HumanTrack proto.InternalMessageInfo -func (m *HumanTrack) GetLeft() int32 { +func (m *HumanTrack) GetRcHuman() *Rect { if m != nil { - return m.Left + return m.RcHuman } - return 0 -} - -func (m *HumanTrack) GetRight() int32 { - if m != nil { - return m.Right - } - return 0 -} - -func (m *HumanTrack) GetTop() int32 { - if m != nil { - return m.Top - } - return 0 -} - -func (m *HumanTrack) GetBottom() int32 { - if m != nil { - return m.Bottom - } - return 0 + return nil } func (m *HumanTrack) GetConfidence() float32 { @@ -1523,7 +1499,6 @@ type HumanTrackResult struct { Result []*HumanTrack `protobuf:"bytes,1,rep,name=result,proto3" json:"result,omitempty"` - Count int32 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"` } func (m *HumanTrackResult) Reset() { *m = HumanTrackResult{} } @@ -1566,13 +1541,6 @@ return nil } -func (m *HumanTrackResult) GetCount() int32 { - if m != nil { - return m.Count - } - return 0 -} - func init() { proto.RegisterType((*Image)(nil), "protomsg.Image") proto.RegisterType((*FaceAngle)(nil), "protomsg.FaceAngle") @@ -1597,95 +1565,94 @@ func init() { proto.RegisterFile("sdk.proto", fileDescriptor_70decb0fb6f436df) } var fileDescriptor_70decb0fb6f436df = []byte{ - // 1407 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xef, 0xda, 0x59, 0x3b, 0x7e, 0x49, 0x13, 0x77, 0x5a, 0xa1, 0x55, 0x84, 0x2c, 0x6b, 0x41, - 0xad, 0x81, 0x12, 0xda, 0x50, 0xc1, 0x95, 0x26, 0x69, 0xd5, 0x48, 0x6d, 0x1a, 0x4d, 0xab, 0x20, - 0x8e, 0xe3, 0xdd, 0xb1, 0xbd, 0xc9, 0xee, 0xce, 0xb2, 0x1e, 0xb7, 0xb1, 0xf8, 0x04, 0xdc, 0xf8, - 0x10, 0x9c, 0xf9, 0x18, 0x88, 0x63, 0x8f, 0x1c, 0x51, 0x0b, 0x1f, 0x81, 0x3b, 0x7a, 0x6f, 0x66, - 0xff, 0xd8, 0x71, 0x5b, 0x21, 0x71, 0xe4, 0xe4, 0xf9, 0xbd, 0x79, 0x9e, 0xf7, 0xef, 0xf7, 0xde, - 0xcc, 0x42, 0x67, 0x1a, 0x9e, 0xef, 0x66, 0xb9, 0xd2, 0x8a, 0xad, 0xd3, 0x4f, 0x32, 0x1d, 0xef, - 0xc0, 0x50, 0x4c, 0xa5, 0x91, 0xfa, 0x3f, 0x3a, 0xe0, 0x1e, 0x25, 0x62, 0x2c, 0xd9, 0x0d, 0x70, - 0x5f, 0x46, 0xa1, 0x9e, 0x78, 0x4e, 0xdf, 0x19, 0xb8, 0xdc, 0x00, 0xf6, 0x01, 0xb4, 0x26, 0x32, - 0x1a, 0x4f, 0xb4, 0xd7, 0x20, 0xb1, 0x45, 0x8c, 0xc1, 0x5a, 0x28, 0xb4, 0xf0, 0x9a, 0x7d, 0x67, - 0xb0, 0xc9, 0x69, 0xcd, 0x3e, 0x84, 0x8e, 0x8e, 0x12, 0x39, 0xd5, 0x22, 0xc9, 0xbc, 0xb5, 0xbe, - 0x33, 0xe8, 0xf0, 0x4a, 0xc0, 0xb6, 0xa0, 0x11, 0x85, 0x9e, 0xdb, 0x77, 0x06, 0x4d, 0xde, 0x88, - 0x42, 0xd6, 0x85, 0x66, 0x10, 0x85, 0x5e, 0x8b, 0xf4, 0x70, 0xe9, 0x8f, 0xa1, 0xf3, 0x50, 0x04, - 0xf2, 0x7e, 0x3a, 0x8e, 0x25, 0x6e, 0xcf, 0xc5, 0x4b, 0xeb, 0x0c, 0x2e, 0xd1, 0xc1, 0x2c, 0xd2, - 0xc1, 0xc4, 0x7a, 0x62, 0x00, 0x3a, 0x92, 0xab, 0x38, 0x26, 0x47, 0x5c, 0x4e, 0x6b, 0xd6, 0x03, - 0x08, 0x54, 0x3a, 0x8a, 0x42, 0x99, 0x06, 0x92, 0x3c, 0x69, 0xf0, 0x9a, 0xc4, 0xbf, 0x00, 0x78, - 0x3e, 0x19, 0x69, 0x2e, 0xa7, 0xb3, 0x58, 0x63, 0x88, 0x63, 0x99, 0x86, 0x32, 0xb7, 0xc6, 0x2c, - 0x42, 0x0f, 0xc4, 0x58, 0x5a, 0x6b, 0xb8, 0x24, 0x5b, 0x22, 0x90, 0xa5, 0x2d, 0x11, 0x48, 0xfc, - 0xf7, 0x50, 0x8a, 0x99, 0x9e, 0x93, 0x1d, 0x97, 0x5b, 0x84, 0xde, 0x4e, 0x93, 0x28, 0x96, 0x14, - 0xb1, 0xcb, 0x0d, 0xf0, 0xff, 0x6c, 0x40, 0x1b, 0x63, 0x3c, 0x51, 0x53, 0x76, 0x13, 0x5a, 0x79, - 0x80, 0x80, 0xec, 0x6e, 0xec, 0x6d, 0xed, 0x16, 0x15, 0xda, 0xe5, 0x32, 0xd0, 0xdc, 0xee, 0xb2, - 0xcf, 0xa1, 0x93, 0xe9, 0xc7, 0x72, 0xa4, 0x1f, 0xcc, 0x8d, 0x37, 0x1b, 0x7b, 0xdb, 0x95, 0xea, - 0x89, 0x8a, 0x52, 0xcd, 0x2b, 0x0d, 0xf6, 0x05, 0x40, 0xa6, 0x39, 0x16, 0x09, 0xf5, 0x9b, 0xab, - 0xf5, 0x6b, 0x2a, 0xec, 0x13, 0x68, 0x67, 0xfa, 0x89, 0x9a, 0xe9, 0x09, 0x85, 0xb0, 0x42, 0xbb, - 0xd8, 0x67, 0xb7, 0xa0, 0x95, 0xe9, 0x63, 0x35, 0x35, 0x51, 0xad, 0xd0, 0xb4, 0xdb, 0xec, 0x33, - 0x68, 0x8d, 0xa8, 0x8e, 0x54, 0xdf, 0x8d, 0xbd, 0xeb, 0x95, 0x62, 0x59, 0x62, 0x6e, 0x55, 0x98, - 0x07, 0xed, 0xef, 0x67, 0x22, 0x8e, 0xf4, 0xdc, 0x6b, 0x53, 0xb2, 0x0a, 0x88, 0x85, 0x1c, 0x89, - 0x20, 0x12, 0xf1, 0x21, 0x72, 0x6d, 0x9d, 0xb8, 0x56, 0x93, 0x60, 0xf2, 0x47, 0x22, 0x90, 0x47, - 0x87, 0x5e, 0xa7, 0xef, 0x0c, 0xd6, 0xb8, 0x45, 0xfe, 0x5f, 0x0d, 0x58, 0x47, 0x3b, 0x47, 0xe9, - 0x48, 0xfd, 0x9f, 0xe7, 0xff, 0x3a, 0xcf, 0xcd, 0x32, 0xcf, 0xe7, 0xd0, 0x7e, 0x3a, 0x3c, 0xa3, - 0x2c, 0x7f, 0x0c, 0x6e, 0x1e, 0x3c, 0x1d, 0x9e, 0xbd, 0x25, 0xc9, 0x66, 0x13, 0x7b, 0x4a, 0xcf, - 0xb3, 0xa2, 0xa7, 0xf4, 0x3c, 0xc3, 0x9e, 0xca, 0x72, 0x35, 0xa4, 0x04, 0x36, 0x38, 0xad, 0xb1, - 0x77, 0xd4, 0xf0, 0xec, 0xe8, 0x90, 0xf2, 0xb4, 0xc6, 0x0d, 0xf0, 0x7f, 0x80, 0xae, 0xe9, 0x58, - 0x8c, 0xec, 0x50, 0x6a, 0x19, 0x68, 0xf6, 0x11, 0x34, 0x33, 0x35, 0xb5, 0x36, 0xaf, 0x2d, 0x06, - 0x7f, 0xa2, 0xa6, 0x1c, 0x77, 0xd9, 0x6d, 0x68, 0xe5, 0xf4, 0x47, 0x5b, 0xd5, 0x1b, 0x95, 0x5e, - 0x35, 0x06, 0xb8, 0xd5, 0x41, 0xe3, 0x23, 0x29, 0xf4, 0xd4, 0x8e, 0x36, 0x03, 0xfc, 0x6f, 0x60, - 0xf3, 0x44, 0xe4, 0x22, 0x29, 0x9a, 0xf7, 0x0e, 0xb8, 0x98, 0x03, 0x34, 0xdd, 0x1c, 0x6c, 0xec, - 0xed, 0xd4, 0xc3, 0x5d, 0xf4, 0x91, 0x1b, 0x45, 0xff, 0xac, 0xee, 0xfe, 0x83, 0x0b, 0x7d, 0xa0, - 0x92, 0xca, 0x96, 0x53, 0xb3, 0x85, 0x29, 0x09, 0x54, 0x62, 0xb2, 0xb4, 0xc9, 0x69, 0xcd, 0x6e, - 0x9b, 0x40, 0x0d, 0xcd, 0xde, 0x65, 0x0d, 0xd5, 0xfc, 0x47, 0xd0, 0x2d, 0xbd, 0x7d, 0x28, 0x85, - 0x9e, 0xe5, 0x92, 0xdd, 0x83, 0xb6, 0x24, 0xab, 0x78, 0xf0, 0x5b, 0x7d, 0x36, 0x8e, 0xf1, 0x42, - 0xd5, 0xff, 0xda, 0xc6, 0xfd, 0x9d, 0x8a, 0x15, 0x16, 0xf0, 0x16, 0xb8, 0x51, 0x3a, 0x52, 0x45, - 0xdc, 0xb5, 0x94, 0x5b, 0x22, 0x70, 0xb3, 0xef, 0x3f, 0x84, 0xd6, 0x33, 0x45, 0xcc, 0x30, 0x83, - 0xdf, 0xa1, 0x39, 0x8f, 0x83, 0x1f, 0x27, 0x63, 0x78, 0x7e, 0x14, 0x52, 0x7c, 0x1d, 0x6e, 0x00, - 0x52, 0x6c, 0xaa, 0x8e, 0x45, 0x62, 0x5a, 0xa9, 0xc3, 0x2d, 0xf2, 0xff, 0x5e, 0x83, 0xf6, 0x49, - 0x2c, 0xb4, 0x3c, 0x3a, 0x44, 0x02, 0xc7, 0x51, 0x20, 0xd3, 0xa9, 0xb4, 0xc7, 0x15, 0x10, 0xcf, - 0x0c, 0x54, 0xac, 0xf2, 0xe2, 0x4c, 0x02, 0x78, 0x66, 0x7a, 0x40, 0x62, 0x33, 0xb1, 0x2d, 0x42, - 0xed, 0xf4, 0xf9, 0x3c, 0x93, 0x76, 0x64, 0x1b, 0xc0, 0xfa, 0xb0, 0x91, 0x1e, 0x54, 0xd7, 0x86, - 0x99, 0xdb, 0x75, 0x11, 0xda, 0x4f, 0xf7, 0x73, 0xba, 0x0d, 0x5b, 0xa6, 0x81, 0x2c, 0xc4, 0x06, - 0x4a, 0x0f, 0xa3, 0x5c, 0x06, 0x3a, 0x52, 0xa9, 0xed, 0xae, 0x9a, 0x84, 0xed, 0x02, 0xe4, 0xc1, - 0x63, 0x15, 0x08, 0xda, 0x5f, 0x5f, 0xd9, 0x22, 0x35, 0x0d, 0xe3, 0x61, 0x94, 0x48, 0xea, 0x37, - 0xf2, 0x30, 0x4a, 0x24, 0x59, 0x39, 0x10, 0xb9, 0x75, 0x01, 0xac, 0x95, 0x52, 0x82, 0x17, 0xf0, - 0xf1, 0x81, 0xc8, 0x4d, 0xc8, 0x1b, 0xb4, 0x5d, 0x09, 0xd8, 0x0e, 0xac, 0xa3, 0xee, 0x63, 0x35, - 0x56, 0xde, 0x26, 0x6d, 0x96, 0xb8, 0xd8, 0xa3, 0xa4, 0x5c, 0xad, 0xf6, 0x28, 0x2f, 0x3b, 0xb0, - 0x9e, 0x61, 0x01, 0xf6, 0xa3, 0xd4, 0xdb, 0x22, 0x4a, 0x96, 0x98, 0xdd, 0x84, 0xad, 0x74, 0x3f, - 0x4a, 0xa9, 0x40, 0xdf, 0xd2, 0xeb, 0x61, 0x9b, 0x34, 0x96, 0xa4, 0x6c, 0x00, 0xdb, 0xa5, 0xe4, - 0x91, 0x79, 0x4f, 0x74, 0x49, 0x71, 0x59, 0xcc, 0xbe, 0x82, 0x2d, 0xcc, 0xc3, 0x58, 0x95, 0xd9, - 0xba, 0xb6, 0x32, 0x5b, 0x4b, 0x5a, 0x18, 0x3b, 0x7a, 0xfc, 0x44, 0x85, 0x32, 0xf6, 0x18, 0x9d, - 0x5d, 0x09, 0xd8, 0x1d, 0xb8, 0x5e, 0x82, 0x5a, 0x8d, 0xaf, 0x93, 0xde, 0xaa, 0x2d, 0xff, 0xe7, - 0x26, 0x6c, 0x5a, 0xde, 0x1d, 0xc4, 0x6a, 0x16, 0xbe, 0x83, 0x7c, 0x8b, 0xc5, 0x6d, 0xbc, 0xb7, - 0xb8, 0x4b, 0x44, 0x6b, 0x5e, 0x26, 0xda, 0x6a, 0x82, 0x2e, 0x92, 0xcc, 0xbd, 0x44, 0x32, 0x9b, - 0x02, 0x53, 0x7e, 0x43, 0xd0, 0x4a, 0x50, 0x90, 0x87, 0xc0, 0xdd, 0x92, 0xa2, 0xa5, 0x64, 0x89, - 0x5c, 0xeb, 0x97, 0xc8, 0xe5, 0x41, 0x7b, 0x94, 0x8b, 0x44, 0x1e, 0x2b, 0x4b, 0xca, 0x02, 0xa2, - 0x5d, 0x1c, 0x71, 0xa6, 0xfe, 0x86, 0x95, 0x95, 0xc0, 0xde, 0x2d, 0x45, 0xd5, 0x0d, 0x2b, 0x6b, - 0x12, 0xe6, 0xc3, 0xe6, 0x38, 0x17, 0x73, 0x1a, 0x55, 0xb1, 0x18, 0x5b, 0x6a, 0x2e, 0xc8, 0xd0, - 0x76, 0x30, 0x11, 0xf9, 0xf1, 0x2c, 0xb1, 0xec, 0x2c, 0xa0, 0xff, 0x8b, 0x0b, 0x5b, 0xb6, 0x4c, - 0xa7, 0x72, 0x12, 0x05, 0xb1, 0x49, 0x13, 0x89, 0xe8, 0x38, 0xc7, 0x06, 0x52, 0x4a, 0x6a, 0x53, - 0xa1, 0xb1, 0x7a, 0x2a, 0x34, 0xeb, 0x49, 0xaf, 0x95, 0x7d, 0x6d, 0xb1, 0xec, 0xef, 0x9f, 0x17, - 0xd4, 0x55, 0xd6, 0xef, 0x56, 0xd1, 0x55, 0x06, 0x53, 0x47, 0xe0, 0xba, 0x76, 0x42, 0xbb, 0xdf, - 0x1c, 0xb8, 0x7c, 0x59, 0xfc, 0xaf, 0x67, 0xc7, 0x3d, 0xb8, 0x9a, 0x07, 0xd4, 0xd8, 0xf6, 0x2f, - 0x9d, 0x95, 0x7f, 0x59, 0x54, 0xc2, 0x68, 0x5e, 0x98, 0x04, 0x52, 0x0e, 0x80, 0x62, 0xad, 0x8b, - 0xb0, 0x50, 0x16, 0xee, 0xe7, 0x22, 0x0d, 0xa9, 0x94, 0x1d, 0xbe, 0x20, 0xc3, 0xdc, 0x5b, 0xfc, - 0x6c, 0x36, 0xa4, 0x52, 0x76, 0x78, 0x4d, 0x52, 0x3b, 0x03, 0x8f, 0xbc, 0x4b, 0xd5, 0xac, 0xce, - 0x20, 0x19, 0x11, 0xed, 0x45, 0x88, 0x09, 0xa0, 0x71, 0xd3, 0xe0, 0x05, 0x24, 0x2a, 0xe1, 0xc2, - 0xa4, 0x6b, 0xdb, 0xbc, 0xeb, 0x2b, 0x09, 0xfb, 0x14, 0xba, 0xe9, 0x69, 0x69, 0xcc, 0x8c, 0x82, - 0x2e, 0xe5, 0xfd, 0x92, 0x9c, 0x26, 0xd7, 0x69, 0xe1, 0x3a, 0x51, 0xf3, 0x1a, 0x69, 0x2e, 0x49, - 0xeb, 0x7a, 0xb6, 0x75, 0xd8, 0xa2, 0x9e, 0x6d, 0x9f, 0x65, 0xbd, 0x3d, 0x1a, 0x2e, 0xcb, 0x7a, - 0x7b, 0xfe, 0x7d, 0xb8, 0x6a, 0xf9, 0x6a, 0x3f, 0x3f, 0xee, 0x94, 0xaf, 0x13, 0x73, 0xa5, 0x7a, - 0xb5, 0xb7, 0xde, 0x02, 0xb1, 0x8b, 0x17, 0x8a, 0xff, 0xab, 0x03, 0xf0, 0x68, 0x96, 0x88, 0xf4, - 0x79, 0x2e, 0x82, 0x73, 0x7c, 0x2e, 0xc4, 0x72, 0xa4, 0x2d, 0xd3, 0x69, 0x8d, 0x5c, 0xce, 0x6b, - 0x5f, 0x6d, 0x06, 0xd0, 0xeb, 0x4b, 0x65, 0x96, 0xdf, 0xb8, 0xa4, 0xaf, 0x17, 0xa5, 0xb5, 0x4a, - 0xca, 0xaf, 0x17, 0x42, 0x4b, 0x5f, 0x50, 0xee, 0xf2, 0x17, 0x14, 0xdb, 0x04, 0xe7, 0xc2, 0x52, - 0xda, 0xb9, 0x40, 0x54, 0x3c, 0x29, 0x9d, 0xb9, 0xbd, 0xef, 0xcd, 0x00, 0xc1, 0xfb, 0x1e, 0xeb, - 0x69, 0xde, 0x20, 0x5e, 0xa7, 0xdf, 0xa4, 0x7a, 0x1a, 0xe8, 0x9f, 0x42, 0xb7, 0x8a, 0xc3, 0xa6, - 0xe3, 0xf6, 0x52, 0x3a, 0x6a, 0x8f, 0xb5, 0x9a, 0x6e, 0xed, 0xb1, 0x16, 0xa8, 0x59, 0x5a, 0xc6, - 0x49, 0x60, 0xdf, 0xfb, 0xed, 0x75, 0xcf, 0x79, 0xf5, 0xba, 0xe7, 0xfc, 0xf1, 0xba, 0xe7, 0xfc, - 0xf4, 0xa6, 0x77, 0xe5, 0xd5, 0x9b, 0xde, 0x95, 0xdf, 0xdf, 0xf4, 0xae, 0x0c, 0x5b, 0x74, 0xd8, - 0x97, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x13, 0x00, 0xcd, 0x8c, 0x18, 0x0f, 0x00, 0x00, + // 1379 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0xcd, 0x6e, 0xdb, 0xc6, + 0x13, 0x0f, 0x25, 0x53, 0x1f, 0x63, 0xc5, 0x56, 0x36, 0xc1, 0x1f, 0x84, 0xf1, 0x87, 0x20, 0xb0, + 0x45, 0xa2, 0xb6, 0xa9, 0x9b, 0xb8, 0x41, 0x7b, 0x4d, 0x6c, 0x27, 0x88, 0x81, 0xc4, 0x31, 0x36, + 0x41, 0x8a, 0x1e, 0x57, 0xe4, 0x4a, 0xa2, 0x4d, 0x72, 0x55, 0x6a, 0x95, 0x58, 0xe8, 0x13, 0xf4, + 0xd6, 0x07, 0xe8, 0xb1, 0xe7, 0x3e, 0x47, 0x8f, 0x39, 0xf6, 0x58, 0x24, 0xed, 0x23, 0xf4, 0x5e, + 0xcc, 0xec, 0xf2, 0x43, 0xb2, 0x9c, 0xa0, 0x40, 0x8f, 0x3d, 0x69, 0x7f, 0xb3, 0xa3, 0x9d, 0xaf, + 0xdf, 0xcc, 0x2e, 0xa1, 0x3d, 0x0b, 0xcf, 0x76, 0xa7, 0x99, 0xd2, 0x8a, 0xb5, 0xe8, 0x27, 0x99, + 0x8d, 0x77, 0x60, 0x28, 0x66, 0xd2, 0x48, 0xfd, 0x1f, 0x1c, 0x70, 0x8f, 0x12, 0x31, 0x96, 0xec, + 0x06, 0xb8, 0xaf, 0xa3, 0x50, 0x4f, 0x3c, 0xa7, 0xef, 0x0c, 0x5c, 0x6e, 0x00, 0xfb, 0x1f, 0x34, + 0x26, 0x32, 0x1a, 0x4f, 0xb4, 0x57, 0x23, 0xb1, 0x45, 0x8c, 0xc1, 0x46, 0x28, 0xb4, 0xf0, 0xea, + 0x7d, 0x67, 0xd0, 0xe1, 0xb4, 0x66, 0xff, 0x87, 0xb6, 0x8e, 0x12, 0x39, 0xd3, 0x22, 0x99, 0x7a, + 0x1b, 0x7d, 0x67, 0xd0, 0xe6, 0xa5, 0x80, 0x6d, 0x41, 0x2d, 0x0a, 0x3d, 0xb7, 0xef, 0x0c, 0xea, + 0xbc, 0x16, 0x85, 0xac, 0x0b, 0xf5, 0x20, 0x0a, 0xbd, 0x06, 0xe9, 0xe1, 0xd2, 0x1f, 0x43, 0xfb, + 0x91, 0x08, 0xe4, 0x83, 0x74, 0x1c, 0x4b, 0xdc, 0x5e, 0x88, 0xd7, 0xd6, 0x19, 0x5c, 0xa2, 0x83, + 0xd3, 0x48, 0x07, 0x13, 0xeb, 0x89, 0x01, 0xe8, 0x48, 0xa6, 0xe2, 0x98, 0x1c, 0x71, 0x39, 0xad, + 0x59, 0x0f, 0x20, 0x50, 0xe9, 0x28, 0x0a, 0x65, 0x1a, 0x48, 0xf2, 0xa4, 0xc6, 0x2b, 0x12, 0xff, + 0x1c, 0xe0, 0xc5, 0x64, 0xa4, 0xb9, 0x9c, 0xcd, 0x63, 0x8d, 0x21, 0x8e, 0x65, 0x1a, 0xca, 0xcc, + 0x1a, 0xb3, 0x08, 0x3d, 0x10, 0x63, 0x69, 0xad, 0xe1, 0x92, 0x6c, 0x89, 0x40, 0x16, 0xb6, 0x44, + 0x20, 0xf1, 0xdf, 0x43, 0x29, 0xe6, 0x7a, 0x41, 0x76, 0x5c, 0x6e, 0x11, 0x7a, 0x3b, 0x4b, 0xa2, + 0x58, 0x52, 0xc4, 0x2e, 0x37, 0xc0, 0xff, 0xa3, 0x06, 0x4d, 0x8c, 0xf1, 0x44, 0xcd, 0xd8, 0x4d, + 0x68, 0x64, 0x01, 0x02, 0xb2, 0xbb, 0xb9, 0xb7, 0xb5, 0x9b, 0x57, 0x68, 0x97, 0xcb, 0x40, 0x73, + 0xbb, 0xcb, 0x3e, 0x87, 0xf6, 0x54, 0x3f, 0x91, 0x23, 0xfd, 0x70, 0x61, 0xbc, 0xd9, 0xdc, 0xdb, + 0x2e, 0x55, 0x4f, 0x54, 0x94, 0x6a, 0x5e, 0x6a, 0xb0, 0x2f, 0x00, 0xa6, 0x9a, 0x63, 0x91, 0x50, + 0xbf, 0xbe, 0x5e, 0xbf, 0xa2, 0xc2, 0x3e, 0x81, 0xe6, 0x54, 0x3f, 0x55, 0x73, 0x3d, 0xa1, 0x10, + 0xd6, 0x68, 0xe7, 0xfb, 0xec, 0x16, 0x34, 0xa6, 0xfa, 0x58, 0xcd, 0x4c, 0x54, 0x6b, 0x34, 0xed, + 0x36, 0xfb, 0x0c, 0x1a, 0x23, 0xaa, 0x23, 0xd5, 0x77, 0x73, 0xef, 0x7a, 0xa9, 0x58, 0x94, 0x98, + 0x5b, 0x15, 0xe6, 0x41, 0xf3, 0xbb, 0xb9, 0x88, 0x23, 0xbd, 0xf0, 0x9a, 0x94, 0xac, 0x1c, 0x62, + 0x21, 0x47, 0x22, 0x88, 0x44, 0x7c, 0x88, 0x5c, 0x6b, 0x11, 0xd7, 0x2a, 0x12, 0x4c, 0xfe, 0x48, + 0x04, 0xf2, 0xe8, 0xd0, 0x6b, 0xf7, 0x9d, 0xc1, 0x06, 0xb7, 0xc8, 0xff, 0xb3, 0x06, 0x2d, 0xb4, + 0x73, 0x94, 0x8e, 0xd4, 0x7f, 0x79, 0xfe, 0xb7, 0xf3, 0x5c, 0x2f, 0xf2, 0x7c, 0x06, 0xcd, 0x67, + 0xc3, 0x53, 0xca, 0xf2, 0xc7, 0xe0, 0x66, 0xc1, 0xb3, 0xe1, 0xe9, 0x25, 0x49, 0x36, 0x9b, 0xd8, + 0x53, 0x7a, 0x31, 0xcd, 0x7b, 0x4a, 0x2f, 0xa6, 0xd8, 0x53, 0xd3, 0x4c, 0x0d, 0x29, 0x81, 0x35, + 0x4e, 0x6b, 0xec, 0x1d, 0x35, 0x3c, 0x3d, 0x3a, 0xa4, 0x3c, 0x6d, 0x70, 0x03, 0xfc, 0xef, 0xa1, + 0x6b, 0x3a, 0x16, 0x23, 0x3b, 0x94, 0x5a, 0x06, 0x9a, 0x7d, 0x04, 0xf5, 0xa9, 0x9a, 0x59, 0x9b, + 0xd7, 0x96, 0x83, 0x3f, 0x51, 0x33, 0x8e, 0xbb, 0xec, 0x36, 0x34, 0x32, 0xfa, 0xa3, 0xad, 0xea, + 0x8d, 0x52, 0xaf, 0x1c, 0x03, 0xdc, 0xea, 0xa0, 0xf1, 0x91, 0x14, 0x7a, 0x66, 0x47, 0x9b, 0x01, + 0xfe, 0x7d, 0xe8, 0x9c, 0x88, 0x4c, 0x24, 0x79, 0xf3, 0xde, 0x01, 0x17, 0x73, 0x80, 0xa6, 0xeb, + 0x83, 0xcd, 0xbd, 0x9d, 0x6a, 0xb8, 0xcb, 0x3e, 0x72, 0xa3, 0xe8, 0x9f, 0x56, 0xdd, 0x7f, 0x78, + 0xae, 0x0f, 0x54, 0x52, 0xda, 0x72, 0x2a, 0xb6, 0x30, 0x25, 0x81, 0x4a, 0x4c, 0x96, 0x3a, 0x9c, + 0xd6, 0xec, 0xb6, 0x09, 0xd4, 0xd0, 0xec, 0x7d, 0xd6, 0x50, 0xcd, 0x7f, 0x0c, 0xdd, 0xc2, 0xdb, + 0x47, 0x52, 0xe8, 0x79, 0x26, 0xd9, 0x3d, 0x68, 0x4a, 0xb2, 0x8a, 0x07, 0x5f, 0xea, 0xb3, 0x71, + 0x8c, 0xe7, 0xaa, 0xfe, 0xd7, 0x36, 0xee, 0x6f, 0x55, 0xac, 0xb0, 0x80, 0xb7, 0xc0, 0x8d, 0xd2, + 0x91, 0xca, 0xe3, 0xae, 0xa4, 0xdc, 0x12, 0x81, 0x9b, 0x7d, 0xff, 0x11, 0x34, 0x9e, 0x2b, 0x62, + 0x86, 0x19, 0xfc, 0x0e, 0xcd, 0x79, 0x1c, 0xfc, 0x38, 0x19, 0xc3, 0xb3, 0xa3, 0x90, 0xe2, 0x6b, + 0x73, 0x03, 0x90, 0x62, 0x33, 0x75, 0x2c, 0x12, 0xd3, 0x4a, 0x6d, 0x6e, 0x91, 0xff, 0xd7, 0x06, + 0x34, 0x4f, 0x62, 0xa1, 0xe5, 0xd1, 0x21, 0x12, 0x38, 0x8e, 0x02, 0x99, 0xce, 0xa4, 0x3d, 0x2e, + 0x87, 0x78, 0x66, 0xa0, 0x62, 0x95, 0xe5, 0x67, 0x12, 0xc0, 0x33, 0xd3, 0x03, 0x12, 0x9b, 0x89, + 0x6d, 0x11, 0x6a, 0xa7, 0x2f, 0x16, 0x53, 0x69, 0x47, 0xb6, 0x01, 0xac, 0x0f, 0x9b, 0xe9, 0x41, + 0x79, 0x6d, 0x98, 0xb9, 0x5d, 0x15, 0xa1, 0xfd, 0x74, 0x3f, 0xa3, 0xdb, 0xb0, 0x61, 0x1a, 0xc8, + 0x42, 0x6c, 0xa0, 0xf4, 0x30, 0xca, 0x64, 0xa0, 0x23, 0x95, 0xda, 0xee, 0xaa, 0x48, 0xd8, 0x2e, + 0x40, 0x16, 0x3c, 0x51, 0x81, 0xa0, 0xfd, 0xd6, 0xda, 0x16, 0xa9, 0x68, 0x18, 0x0f, 0xa3, 0x44, + 0x52, 0xbf, 0x91, 0x87, 0x51, 0x22, 0xc9, 0xca, 0x81, 0xc8, 0xac, 0x0b, 0x60, 0xad, 0x14, 0x12, + 0xbc, 0x80, 0x8f, 0x0f, 0x44, 0x66, 0x42, 0xde, 0xa4, 0xed, 0x52, 0xc0, 0x76, 0xa0, 0x85, 0xba, + 0x4f, 0xd4, 0x58, 0x79, 0x1d, 0xda, 0x2c, 0x70, 0xbe, 0x47, 0x49, 0xb9, 0x5a, 0xee, 0x51, 0x5e, + 0x76, 0xa0, 0x35, 0xc5, 0x02, 0xec, 0x47, 0xa9, 0xb7, 0x45, 0x94, 0x2c, 0x30, 0xbb, 0x09, 0x5b, + 0xe9, 0x7e, 0x94, 0x52, 0x81, 0xbe, 0xa1, 0xd7, 0xc3, 0x36, 0x69, 0xac, 0x48, 0xd9, 0x00, 0xb6, + 0x0b, 0xc9, 0x63, 0xf3, 0x9e, 0xe8, 0x92, 0xe2, 0xaa, 0x98, 0x7d, 0x05, 0x5b, 0x98, 0x87, 0xb1, + 0x2a, 0xb2, 0x75, 0x6d, 0x6d, 0xb6, 0x56, 0xb4, 0x30, 0x76, 0xf4, 0xf8, 0xa9, 0x0a, 0x65, 0xec, + 0x31, 0x3a, 0xbb, 0x14, 0xb0, 0x3b, 0x70, 0xbd, 0x00, 0x95, 0x1a, 0x5f, 0x27, 0xbd, 0x75, 0x5b, + 0xfe, 0xcf, 0x75, 0xe8, 0x58, 0xde, 0x1d, 0xc4, 0x6a, 0x1e, 0xbe, 0x87, 0x7c, 0xcb, 0xc5, 0xad, + 0x7d, 0xb0, 0xb8, 0x2b, 0x44, 0xab, 0x5f, 0x24, 0xda, 0x7a, 0x82, 0x2e, 0x93, 0xcc, 0xbd, 0x40, + 0x32, 0x9b, 0x02, 0x53, 0x7e, 0x43, 0xd0, 0x52, 0x90, 0x93, 0x87, 0xc0, 0xdd, 0x82, 0xa2, 0x85, + 0x64, 0x85, 0x5c, 0xad, 0x0b, 0xe4, 0xf2, 0xa0, 0x39, 0xca, 0x44, 0x22, 0x8f, 0x95, 0x25, 0x65, + 0x0e, 0xd1, 0x2e, 0x8e, 0x38, 0x53, 0x7f, 0xc3, 0xca, 0x52, 0x60, 0xef, 0x96, 0xbc, 0xea, 0x86, + 0x95, 0x15, 0x09, 0xf3, 0xa1, 0x33, 0xce, 0xc4, 0x82, 0x46, 0x55, 0x2c, 0xc6, 0x96, 0x9a, 0x4b, + 0x32, 0xb4, 0x1d, 0x4c, 0x44, 0x76, 0x3c, 0x4f, 0x2c, 0x3b, 0x73, 0xe8, 0xff, 0xe2, 0xc2, 0x96, + 0x2d, 0xd3, 0x4b, 0x39, 0x89, 0x82, 0xd8, 0xa4, 0x89, 0x44, 0x74, 0x9c, 0x63, 0x03, 0x29, 0x24, + 0x95, 0xa9, 0x50, 0x5b, 0x3f, 0x15, 0xea, 0xd5, 0xa4, 0x57, 0xca, 0xbe, 0xb1, 0x5c, 0xf6, 0x0f, + 0xcf, 0x0b, 0xea, 0x2a, 0xeb, 0x77, 0x23, 0xef, 0x2a, 0x83, 0xa9, 0x23, 0x70, 0x5d, 0x39, 0xa1, + 0xd9, 0xaf, 0x0f, 0x5c, 0xbe, 0x2a, 0xfe, 0xc7, 0xb3, 0xe3, 0x1e, 0x5c, 0xcd, 0x02, 0x6a, 0x6c, + 0xfb, 0x97, 0xf6, 0xda, 0xbf, 0x2c, 0x2b, 0x61, 0x34, 0xaf, 0x4c, 0x02, 0x29, 0x07, 0x40, 0xb1, + 0x56, 0x45, 0x58, 0x28, 0x0b, 0xf7, 0x33, 0x91, 0x86, 0x54, 0xca, 0x36, 0x5f, 0x92, 0x61, 0xee, + 0x2d, 0x7e, 0x3e, 0x1f, 0x52, 0x29, 0xdb, 0xbc, 0x22, 0xa9, 0x9c, 0x81, 0x47, 0xde, 0xa5, 0x6a, + 0x96, 0x67, 0x90, 0x8c, 0x88, 0xf6, 0x2a, 0xc4, 0x04, 0xd0, 0xb8, 0xa9, 0xf1, 0x1c, 0x12, 0x95, + 0x70, 0x61, 0xd2, 0xb5, 0x6d, 0xde, 0xf5, 0xa5, 0x84, 0x7d, 0x0a, 0xdd, 0xf4, 0x65, 0x61, 0xcc, + 0x8c, 0x82, 0x2e, 0xe5, 0xfd, 0x82, 0x9c, 0x26, 0xd7, 0xcb, 0xdc, 0x75, 0xa2, 0xe6, 0x35, 0xd2, + 0x5c, 0x91, 0x56, 0xf5, 0x6c, 0xeb, 0xb0, 0x65, 0x3d, 0xdb, 0x3e, 0xab, 0x7a, 0x7b, 0x34, 0x5c, + 0x56, 0xf5, 0xf6, 0xfc, 0x07, 0x70, 0xd5, 0xf2, 0xd5, 0x7e, 0x7e, 0xdc, 0x29, 0x5e, 0x27, 0xe6, + 0x4a, 0xf5, 0x2a, 0x6f, 0xbd, 0x25, 0x62, 0xe7, 0x2f, 0x14, 0xff, 0x27, 0x07, 0xe0, 0xf1, 0x3c, + 0x11, 0xe9, 0x8b, 0x4c, 0x04, 0x67, 0x6c, 0x00, 0xcd, 0x2c, 0x20, 0x7c, 0xc9, 0xdb, 0x2b, 0xdf, + 0x5e, 0xf9, 0x2e, 0xaa, 0xad, 0x7e, 0x17, 0xb1, 0x0e, 0x38, 0xe7, 0x96, 0xfd, 0xce, 0x39, 0xa2, + 0xfc, 0xa3, 0xc6, 0x59, 0x54, 0x3e, 0xdf, 0x5c, 0xba, 0xc5, 0xb1, 0x4a, 0xe6, 0x65, 0xe1, 0x35, + 0xfa, 0x75, 0xaa, 0x92, 0x81, 0xfe, 0x7d, 0xe8, 0x96, 0xde, 0xd9, 0x20, 0x6f, 0xaf, 0x04, 0x59, + 0x79, 0x82, 0x55, 0x74, 0xad, 0xce, 0xbe, 0xf7, 0xeb, 0xdb, 0x9e, 0xf3, 0xe6, 0x6d, 0xcf, 0xf9, + 0xfd, 0x6d, 0xcf, 0xf9, 0xf1, 0x5d, 0xef, 0xca, 0x9b, 0x77, 0xbd, 0x2b, 0xbf, 0xbd, 0xeb, 0x5d, + 0x19, 0x36, 0xe8, 0x6f, 0x5f, 0xfe, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x90, 0x69, 0x91, 0xd8, + 0x0e, 0x00, 0x00, } func (m *Image) Marshal() (dAtA []byte, err error) { @@ -2686,54 +2653,44 @@ _ = i var l int _ = l - if m.Left != 0 { - dAtA[i] = 0x8 + if m.RcHuman != nil { + dAtA[i] = 0xa i++ - i = encodeVarintSdk(dAtA, i, uint64(m.Left)) - } - if m.Right != 0 { - dAtA[i] = 0x10 - i++ - i = encodeVarintSdk(dAtA, i, uint64(m.Right)) - } - if m.Top != 0 { - dAtA[i] = 0x18 - i++ - i = encodeVarintSdk(dAtA, i, uint64(m.Top)) - } - if m.Bottom != 0 { - dAtA[i] = 0x20 - i++ - i = encodeVarintSdk(dAtA, i, uint64(m.Bottom)) + i = encodeVarintSdk(dAtA, i, uint64(m.RcHuman.Size())) + n24, err24 := m.RcHuman.MarshalTo(dAtA[i:]) + if err24 != nil { + return 0, err24 + } + i += n24 } if m.Confidence != 0 { - dAtA[i] = 0x2d + dAtA[i] = 0x15 i++ encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Confidence)))) i += 4 } if m.X != 0 { - dAtA[i] = 0x30 + dAtA[i] = 0x18 i++ i = encodeVarintSdk(dAtA, i, uint64(m.X)) } if m.Y != 0 { - dAtA[i] = 0x38 + dAtA[i] = 0x20 i++ i = encodeVarintSdk(dAtA, i, uint64(m.Y)) } if m.Id != 0 { - dAtA[i] = 0x40 + dAtA[i] = 0x28 i++ i = encodeVarintSdk(dAtA, i, uint64(m.Id)) } if len(m.Feature) > 0 { - dAtA[i] = 0x4a + dAtA[i] = 0x32 i++ i = encodeVarintSdk(dAtA, i, uint64(len(m.Feature)*4)) for _, num := range m.Feature { - f24 := math.Float32bits(float32(num)) - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f24)) + f25 := math.Float32bits(float32(num)) + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f25)) i += 4 } } @@ -2766,11 +2723,6 @@ } i += n } - } - if m.Count != 0 { - dAtA[i] = 0x10 - i++ - i = encodeVarintSdk(dAtA, i, uint64(m.Count)) } return i, nil } @@ -3298,17 +3250,9 @@ } var l int _ = l - if m.Left != 0 { - n += 1 + sovSdk(uint64(m.Left)) - } - if m.Right != 0 { - n += 1 + sovSdk(uint64(m.Right)) - } - if m.Top != 0 { - n += 1 + sovSdk(uint64(m.Top)) - } - if m.Bottom != 0 { - n += 1 + sovSdk(uint64(m.Bottom)) + if m.RcHuman != nil { + l = m.RcHuman.Size() + n += 1 + l + sovSdk(uint64(l)) } if m.Confidence != 0 { n += 5 @@ -3339,9 +3283,6 @@ l = e.Size() n += 1 + l + sovSdk(uint64(l)) } - } - if m.Count != 0 { - n += 1 + sovSdk(uint64(m.Count)) } return n } @@ -6932,10 +6873,10 @@ } switch fieldNum { case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Left", wireType) + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field RcHuman", wireType) } - m.Left = 0 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowSdk @@ -6945,69 +6886,29 @@ } b := dAtA[iNdEx] iNdEx++ - m.Left |= int32(b&0x7F) << shift + 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.RcHuman == nil { + m.RcHuman = &Rect{} + } + if err := m.RcHuman.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Right", wireType) - } - m.Right = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSdk - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Right |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Top", wireType) - } - m.Top = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSdk - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Top |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Bottom", wireType) - } - m.Bottom = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSdk - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Bottom |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 5: if wireType != 5 { return fmt.Errorf("proto: wrong wireType = %d for field Confidence", wireType) } @@ -7018,7 +6919,7 @@ v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:])) iNdEx += 4 m.Confidence = float32(math.Float32frombits(v)) - case 6: + case 3: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field X", wireType) } @@ -7037,7 +6938,7 @@ break } } - case 7: + case 4: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Y", wireType) } @@ -7056,7 +6957,7 @@ break } } - case 8: + case 5: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType) } @@ -7075,7 +6976,7 @@ break } } - case 9: + case 6: if wireType == 5 { var v uint32 if (iNdEx + 4) > l { @@ -7216,25 +7117,6 @@ return err } iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Count", wireType) - } - m.Count = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSdk - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Count |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } default: iNdEx = preIndex skippy, err := skipSdk(dAtA[iNdEx:]) -- Gitblit v1.8.0