From 0514f66a2b99f8f2e946fe05f20d75ec6ec2ba4d Mon Sep 17 00:00:00 2001 From: zhangmeng <775834166@qq.com> Date: 星期二, 25 六月 2019 16:05:51 +0800 Subject: [PATCH] update feat --- sdk.pb.go | 148 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 100 insertions(+), 48 deletions(-) diff --git a/sdk.pb.go b/sdk.pb.go index 7824543..a071d71 100644 --- a/sdk.pb.go +++ b/sdk.pb.go @@ -609,8 +609,9 @@ } type ResultFaceExtCom struct { - Feats []byte `protobuf:"bytes,1,opt,name=feats,proto3" json:"feats,omitempty"` - Comp []byte `protobuf:"bytes,2,opt,name=comp,proto3" json:"comp,omitempty"` + Pos []byte `protobuf:"bytes,1,opt,name=pos,proto3" json:"pos,omitempty"` + Feats []byte `protobuf:"bytes,2,opt,name=feats,proto3" json:"feats,omitempty"` + Comp []byte `protobuf:"bytes,3,opt,name=comp,proto3" json:"comp,omitempty"` } func (m *ResultFaceExtCom) Reset() { *m = ResultFaceExtCom{} } @@ -645,6 +646,13 @@ } var xxx_messageInfo_ResultFaceExtCom proto.InternalMessageInfo + +func (m *ResultFaceExtCom) GetPos() []byte { + if m != nil { + return m.Pos + } + return nil +} func (m *ResultFaceExtCom) GetFeats() []byte { if m != nil { @@ -766,49 +774,49 @@ func init() { proto.RegisterFile("sdk.proto", fileDescriptor_70decb0fb6f436df) } var fileDescriptor_70decb0fb6f436df = []byte{ - // 658 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x53, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0xad, 0x93, 0x3a, 0x69, 0xa6, 0x51, 0x29, 0x4b, 0x85, 0xac, 0x0a, 0x59, 0x91, 0x41, 0x34, - 0x08, 0x28, 0xa8, 0x20, 0x71, 0xe1, 0xc0, 0x47, 0x5b, 0x51, 0x09, 0x68, 0xb4, 0x82, 0x03, 0xc7, - 0x8d, 0xbd, 0x76, 0x5c, 0x6c, 0xaf, 0xb1, 0x27, 0x6a, 0xf3, 0x2f, 0xf8, 0x59, 0x1c, 0x38, 0xf4, - 0xc8, 0x11, 0xb5, 0xe2, 0x7f, 0xa0, 0xd9, 0x5d, 0x37, 0xa9, 0x54, 0xb8, 0x70, 0xe5, 0xe4, 0x79, - 0x3b, 0xcf, 0xfb, 0xe6, 0xcd, 0xec, 0x40, 0xaf, 0x8e, 0x3e, 0x6f, 0x97, 0x95, 0x42, 0xc5, 0x56, - 0xf4, 0x27, 0xaf, 0x93, 0x4d, 0x18, 0x8b, 0x5a, 0x9a, 0xd3, 0xe0, 0x18, 0xdc, 0x83, 0x5c, 0x24, - 0x92, 0x6d, 0x80, 0x7b, 0x9c, 0x46, 0x38, 0xf1, 0x9c, 0x81, 0x33, 0x74, 0xb9, 0x01, 0xec, 0x26, - 0x74, 0x26, 0x32, 0x4d, 0x26, 0xe8, 0xb5, 0xf4, 0xb1, 0x45, 0x8c, 0xc1, 0x72, 0x24, 0x50, 0x78, - 0xed, 0x81, 0x33, 0xec, 0x73, 0x1d, 0xb3, 0x5b, 0xd0, 0xc3, 0x34, 0x97, 0x35, 0x8a, 0xbc, 0xf4, - 0x96, 0x07, 0xce, 0xb0, 0xc7, 0xe7, 0x07, 0x6c, 0x0d, 0x5a, 0x69, 0xe4, 0xb9, 0x03, 0x67, 0xd8, - 0xe6, 0xad, 0x34, 0x0a, 0x12, 0xe8, 0xed, 0x8b, 0x50, 0xbe, 0x2c, 0x92, 0x4c, 0xb2, 0x75, 0x68, - 0xcf, 0xc4, 0xb1, 0x95, 0xa6, 0x90, 0xca, 0x29, 0x53, 0x0c, 0x27, 0x56, 0xd7, 0x00, 0x92, 0xad, - 0x54, 0x96, 0x69, 0x59, 0x97, 0xeb, 0x98, 0xf9, 0x00, 0xa1, 0x2a, 0xe2, 0x34, 0x92, 0x45, 0x28, - 0xb5, 0x6e, 0x8b, 0x2f, 0x9c, 0x04, 0x27, 0x00, 0x1f, 0x26, 0x31, 0x72, 0x59, 0x4f, 0x33, 0x24, - 0x43, 0x89, 0x2c, 0x22, 0x59, 0x59, 0x31, 0x8b, 0xa8, 0x02, 0x91, 0x48, 0xab, 0x46, 0xa1, 0xd6, - 0x12, 0xa1, 0xbc, 0xd0, 0x12, 0xa1, 0xa4, 0xbf, 0xc7, 0x52, 0x4c, 0x71, 0xa6, 0x75, 0x5c, 0x6e, - 0x11, 0x55, 0x5b, 0xe7, 0x69, 0x26, 0xb5, 0x3f, 0x97, 0x1b, 0x10, 0x7c, 0x6f, 0x41, 0x97, 0x3c, - 0x8e, 0x54, 0xcd, 0xee, 0x42, 0xa7, 0x0a, 0x09, 0x68, 0xdd, 0xd5, 0x9d, 0xb5, 0xed, 0x66, 0x1c, - 0xdb, 0x5c, 0x86, 0xc8, 0x6d, 0x96, 0x3d, 0x84, 0x5e, 0x89, 0x6f, 0x65, 0x8c, 0x7b, 0x33, 0x53, - 0xcd, 0xea, 0xce, 0xb5, 0x39, 0x75, 0xa4, 0xd2, 0x02, 0xf9, 0x9c, 0xc1, 0x1e, 0x01, 0x94, 0xc8, - 0x69, 0x24, 0xc4, 0x6f, 0x5f, 0xcd, 0x5f, 0xa0, 0xb0, 0x7b, 0xd0, 0x2d, 0xf1, 0x9d, 0x9a, 0xe2, - 0x44, 0x5b, 0xb8, 0x82, 0xdd, 0xe4, 0xd9, 0x16, 0x74, 0x4a, 0x7c, 0xaf, 0x6a, 0xe3, 0xea, 0x0a, - 0xa6, 0x4d, 0xb3, 0xfb, 0xd0, 0x89, 0xf5, 0x1c, 0xbd, 0x8e, 0x26, 0xde, 0x98, 0x13, 0x2f, 0x46, - 0xcc, 0x2d, 0x85, 0x79, 0xd0, 0xfd, 0x32, 0x15, 0x59, 0x8a, 0x33, 0xaf, 0xab, 0x9b, 0xd5, 0x40, - 0x1a, 0x64, 0x2c, 0xc2, 0x54, 0x64, 0xbb, 0xf4, 0xb2, 0x56, 0xf4, 0xcb, 0x5a, 0x38, 0x09, 0x7e, - 0xb5, 0x60, 0x85, 0xee, 0x3b, 0x28, 0x62, 0xf5, 0xbf, 0x9f, 0xff, 0xdc, 0x4f, 0x7a, 0xcc, 0x31, - 0xb5, 0x73, 0xd7, 0xeb, 0xe9, 0xad, 0xb4, 0x28, 0xf8, 0x08, 0xdd, 0xc3, 0xf1, 0x91, 0xee, 0xf2, - 0x1d, 0x70, 0xab, 0xf0, 0x70, 0x7c, 0xf4, 0x87, 0x26, 0x9b, 0x24, 0xed, 0x0e, 0xce, 0xca, 0x66, - 0x77, 0x70, 0x56, 0xd2, 0xee, 0x94, 0x95, 0x1a, 0xeb, 0x06, 0xb6, 0xb8, 0x8e, 0x03, 0x09, 0xeb, - 0x66, 0x07, 0xc9, 0xc3, 0xae, 0x44, 0x19, 0x22, 0xbb, 0x0d, 0xed, 0x52, 0xd5, 0xf6, 0xf6, 0xeb, - 0x97, 0x6d, 0x8e, 0x54, 0xcd, 0x29, 0xcb, 0x1e, 0x40, 0xa7, 0xd2, 0x3f, 0xda, 0xf9, 0x6d, 0xcc, - 0x79, 0xf3, 0xc5, 0xe6, 0x96, 0x13, 0xbc, 0x80, 0xfe, 0x48, 0x54, 0x22, 0x6f, 0x16, 0xef, 0x31, - 0xb8, 0xe4, 0x8b, 0x44, 0xda, 0xc3, 0xd5, 0x9d, 0xcd, 0x45, 0x0b, 0x97, 0xab, 0xe1, 0x86, 0x18, - 0x3c, 0x5f, 0x2c, 0x74, 0xef, 0x04, 0x5f, 0xab, 0x9c, 0x16, 0x3c, 0x96, 0x02, 0x4d, 0xa9, 0x7d, - 0x6e, 0x00, 0xd9, 0x0c, 0x55, 0x6e, 0x9c, 0xf7, 0xb9, 0x8e, 0x83, 0x37, 0xb0, 0x7e, 0xa1, 0xbf, - 0x2f, 0x05, 0x4e, 0x2b, 0xc9, 0x9e, 0x42, 0x57, 0xea, 0x7b, 0xca, 0xbf, 0x55, 0x61, 0xa4, 0x78, - 0x43, 0x0d, 0x9e, 0x59, 0x27, 0x9f, 0x54, 0xa6, 0xa8, 0xcd, 0x5b, 0xe0, 0xa6, 0x45, 0xac, 0x1a, - 0x27, 0x0b, 0xed, 0xb2, 0xe3, 0xe2, 0x26, 0xff, 0xca, 0xfb, 0x76, 0xe6, 0x3b, 0xa7, 0x67, 0xbe, - 0xf3, 0xf3, 0xcc, 0x77, 0xbe, 0x9e, 0xfb, 0x4b, 0xa7, 0xe7, 0xfe, 0xd2, 0x8f, 0x73, 0x7f, 0x69, - 0xdc, 0xd1, 0xbf, 0x3c, 0xf9, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x6a, 0x16, 0x62, 0x30, 0x17, 0x06, - 0x00, 0x00, + // 665 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x54, 0x4d, 0x6f, 0xd3, 0x40, + 0x10, 0xad, 0x9d, 0xda, 0x69, 0xa6, 0x51, 0x29, 0x4b, 0x85, 0xac, 0x0a, 0x59, 0x91, 0x41, 0x34, + 0x08, 0x28, 0xa8, 0x20, 0x71, 0xe5, 0xa3, 0xad, 0xa8, 0x04, 0x6d, 0xb4, 0x82, 0x03, 0xc7, 0x8d, + 0xbd, 0x76, 0x5c, 0x6c, 0xaf, 0xb1, 0x27, 0x6a, 0xf3, 0x2f, 0xf8, 0x59, 0x1c, 0x38, 0xf4, 0xc8, + 0x11, 0xb5, 0xe2, 0x7f, 0xa0, 0x59, 0xaf, 0x9b, 0x54, 0x2a, 0x5c, 0xb8, 0x72, 0xca, 0xcc, 0xce, + 0xf3, 0xbe, 0xf7, 0x66, 0x76, 0x02, 0xbd, 0x3a, 0xfa, 0xbc, 0x5d, 0x56, 0x0a, 0x15, 0x5b, 0xd1, + 0x3f, 0x79, 0x9d, 0x6c, 0xc2, 0x58, 0xd4, 0xb2, 0x39, 0x0d, 0x4e, 0xc0, 0x39, 0xc8, 0x45, 0x22, + 0xd9, 0x06, 0x38, 0x27, 0x69, 0x84, 0x13, 0xcf, 0x1a, 0x58, 0x43, 0x87, 0x37, 0x09, 0xbb, 0x0d, + 0xee, 0x44, 0xa6, 0xc9, 0x04, 0x3d, 0x5b, 0x1f, 0x9b, 0x8c, 0x31, 0x58, 0x8e, 0x04, 0x0a, 0xaf, + 0x33, 0xb0, 0x86, 0x7d, 0xae, 0x63, 0x76, 0x07, 0x7a, 0x98, 0xe6, 0xb2, 0x46, 0x91, 0x97, 0xde, + 0xf2, 0xc0, 0x1a, 0xf6, 0xf8, 0xfc, 0x80, 0xad, 0x81, 0x9d, 0x46, 0x9e, 0x33, 0xb0, 0x86, 0x1d, + 0x6e, 0xa7, 0x51, 0x90, 0x40, 0x6f, 0x5f, 0x84, 0xf2, 0x55, 0x91, 0x64, 0x92, 0xad, 0x43, 0x67, + 0x26, 0x4e, 0x0c, 0x35, 0x85, 0x24, 0xa7, 0x4c, 0x31, 0x9c, 0x18, 0xde, 0x26, 0x21, 0xda, 0x4a, + 0x65, 0x99, 0xa6, 0x75, 0xb8, 0x8e, 0x99, 0x0f, 0x10, 0xaa, 0x22, 0x4e, 0x23, 0x59, 0x84, 0x52, + 0xf3, 0xda, 0x7c, 0xe1, 0x24, 0x38, 0x05, 0xf8, 0x30, 0x89, 0x91, 0xcb, 0x7a, 0x9a, 0x21, 0x19, + 0x4a, 0x64, 0x11, 0xc9, 0xca, 0x90, 0x99, 0x8c, 0x14, 0x88, 0x44, 0x1a, 0x36, 0x0a, 0x35, 0x97, + 0x08, 0xe5, 0x25, 0x97, 0x08, 0x25, 0x7d, 0x3d, 0x96, 0x62, 0x8a, 0x33, 0xcd, 0xe3, 0x70, 0x93, + 0x91, 0xda, 0x3a, 0x4f, 0x33, 0xa9, 0xfd, 0x39, 0xbc, 0x49, 0x82, 0xef, 0x36, 0x74, 0xc9, 0xe3, + 0x48, 0xd5, 0xec, 0x3e, 0xb8, 0x55, 0x48, 0x89, 0xe6, 0x5d, 0xdd, 0x59, 0xdb, 0x6e, 0xc7, 0xb1, + 0xcd, 0x65, 0x88, 0xdc, 0x54, 0xd9, 0x63, 0xe8, 0x95, 0xf8, 0x4e, 0xc6, 0xb8, 0x37, 0x6b, 0xd4, + 0xac, 0xee, 0xdc, 0x98, 0x43, 0x47, 0x2a, 0x2d, 0x90, 0xcf, 0x11, 0xec, 0x09, 0x40, 0x89, 0x9c, + 0x46, 0x42, 0xf8, 0xce, 0xf5, 0xf8, 0x05, 0x08, 0x7b, 0x00, 0xdd, 0x12, 0xdf, 0xab, 0x29, 0x4e, + 0xb4, 0x85, 0x6b, 0xd0, 0x6d, 0x9d, 0x6d, 0x81, 0x5b, 0xe2, 0xa1, 0xaa, 0x1b, 0x57, 0xd7, 0x20, + 0x4d, 0x99, 0x3d, 0x04, 0x37, 0xd6, 0x73, 0xf4, 0x5c, 0x0d, 0xbc, 0x35, 0x07, 0x5e, 0x8e, 0x98, + 0x1b, 0x08, 0xf3, 0xa0, 0xfb, 0x65, 0x2a, 0xb2, 0x14, 0x67, 0x5e, 0x57, 0x37, 0xab, 0x4d, 0x69, + 0x90, 0xb1, 0x08, 0x53, 0x91, 0xed, 0xd2, 0xcb, 0x5a, 0xd1, 0x2f, 0x6b, 0xe1, 0x24, 0xf8, 0x65, + 0xc3, 0x0a, 0xdd, 0x77, 0x50, 0xc4, 0xea, 0x7f, 0x3f, 0xff, 0xb9, 0x9f, 0xf4, 0x98, 0x63, 0x6a, + 0xe7, 0xae, 0xd7, 0xd3, 0x5b, 0x69, 0xb2, 0xe0, 0x23, 0x74, 0x8f, 0xc6, 0xc7, 0xba, 0xcb, 0xf7, + 0xc0, 0xa9, 0xc2, 0xa3, 0xf1, 0xf1, 0x1f, 0x9a, 0xdc, 0x14, 0x69, 0x77, 0x70, 0x56, 0xb6, 0xbb, + 0x83, 0xb3, 0x92, 0x76, 0xa7, 0xac, 0xd4, 0x58, 0x37, 0xd0, 0xe6, 0x3a, 0x0e, 0x24, 0xac, 0x37, + 0x3b, 0x48, 0x1e, 0x76, 0x25, 0xca, 0x10, 0xd9, 0x5d, 0xe8, 0x94, 0xaa, 0x36, 0xb7, 0xdf, 0xbc, + 0x6a, 0x73, 0xa4, 0x6a, 0x4e, 0x55, 0xf6, 0x08, 0xdc, 0x4a, 0x7f, 0x68, 0xe6, 0xb7, 0x31, 0xc7, + 0xcd, 0x17, 0x9b, 0x1b, 0x4c, 0xf0, 0x12, 0xfa, 0x23, 0x51, 0x89, 0xbc, 0x5d, 0xbc, 0xa7, 0xe0, + 0x90, 0x2f, 0x22, 0xe9, 0x0c, 0x57, 0x77, 0x36, 0x17, 0x2d, 0x5c, 0x55, 0xc3, 0x1b, 0x60, 0x70, + 0xb8, 0x28, 0x74, 0xef, 0x14, 0xdf, 0xa8, 0x9c, 0x2c, 0xb6, 0x42, 0xfb, 0x8d, 0xaa, 0x0d, 0x70, + 0x62, 0x29, 0xb0, 0xd6, 0xa2, 0xfa, 0xbc, 0x49, 0xc8, 0x78, 0xa8, 0xf2, 0xb2, 0xfd, 0x5f, 0xa4, + 0x38, 0x78, 0x0b, 0xeb, 0x97, 0x8a, 0xf6, 0xa5, 0xc0, 0x69, 0x25, 0xd9, 0x73, 0xe8, 0x4a, 0x7d, + 0x73, 0xf9, 0x37, 0x5d, 0x0d, 0x39, 0x6f, 0xa1, 0xc1, 0x0b, 0xe3, 0xed, 0x93, 0xca, 0x14, 0x35, + 0x7e, 0x0b, 0x9c, 0xb4, 0x88, 0x55, 0xeb, 0x6d, 0xa1, 0x81, 0x66, 0x80, 0xbc, 0xa9, 0xbf, 0xf6, + 0xbe, 0x9d, 0xfb, 0xd6, 0xd9, 0xb9, 0x6f, 0xfd, 0x3c, 0xf7, 0xad, 0xaf, 0x17, 0xfe, 0xd2, 0xd9, + 0x85, 0xbf, 0xf4, 0xe3, 0xc2, 0x5f, 0x1a, 0xbb, 0xfa, 0x93, 0x67, 0xbf, 0x03, 0x00, 0x00, 0xff, + 0xff, 0x82, 0x5c, 0xa6, 0x5e, 0x29, 0x06, 0x00, 0x00, } func (m *Image) Marshal() (dAtA []byte, err error) { @@ -1243,14 +1251,20 @@ _ = i var l int _ = l - if len(m.Feats) > 0 { + if len(m.Pos) > 0 { dAtA[i] = 0xa + i++ + i = encodeVarintSdk(dAtA, i, uint64(len(m.Pos))) + i += copy(dAtA[i:], m.Pos) + } + if len(m.Feats) > 0 { + dAtA[i] = 0x12 i++ i = encodeVarintSdk(dAtA, i, uint64(len(m.Feats))) i += copy(dAtA[i:], m.Feats) } if len(m.Comp) > 0 { - dAtA[i] = 0x12 + dAtA[i] = 0x1a i++ i = encodeVarintSdk(dAtA, i, uint64(len(m.Comp))) i += copy(dAtA[i:], m.Comp) @@ -1538,6 +1552,10 @@ } var l int _ = l + l = len(m.Pos) + if l > 0 { + n += 1 + l + sovSdk(uint64(l)) + } l = len(m.Feats) if l > 0 { n += 1 + l + sovSdk(uint64(l)) @@ -3062,6 +3080,40 @@ switch fieldNum { case 1: if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pos", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowSdk + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthSdk + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthSdk + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Pos = append(m.Pos[:0], dAtA[iNdEx:postIndex]...) + if m.Pos == nil { + m.Pos = []byte{} + } + iNdEx = postIndex + case 2: + if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Feats", wireType) } var byteLen int @@ -3094,7 +3146,7 @@ m.Feats = []byte{} } iNdEx = postIndex - case 2: + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Comp", wireType) } -- Gitblit v1.8.0