From efc9f6931df7c351c46795e54538ee68f0e89b7f Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 24 五月 2019 11:14:38 +0800
Subject: [PATCH] update facepos;
---
protomsg.proto | 2
protomsg.pb.go | 62 +++++++++++++++----------------
2 files changed, 31 insertions(+), 33 deletions(-)
diff --git a/protomsg.pb.go b/protomsg.pb.go
index fd9f9cf..4aead0e 100644
--- a/protomsg.pb.go
+++ b/protomsg.pb.go
@@ -1797,8 +1797,8 @@
// sdk face property
type ParamFacePos struct {
- Pos []*FacePos `protobuf:"bytes,1,rep,name=pos,proto3" json:"pos,omitempty"`
- Img *Image `protobuf:"bytes,2,opt,name=img,proto3" json:"img,omitempty"`
+ Pos *FacePos `protobuf:"bytes,1,opt,name=pos,proto3" json:"pos,omitempty"`
+ Img *Image `protobuf:"bytes,2,opt,name=img,proto3" json:"img,omitempty"`
}
func (m *ParamFacePos) Reset() { *m = ParamFacePos{} }
@@ -1834,7 +1834,7 @@
var xxx_messageInfo_ParamFacePos proto.InternalMessageInfo
-func (m *ParamFacePos) GetPos() []*FacePos {
+func (m *ParamFacePos) GetPos() *FacePos {
if m != nil {
return m.Pos
}
@@ -1931,7 +1931,7 @@
func init() { proto.RegisterFile("protomsg.proto", fileDescriptor_32de24555f916688) }
var fileDescriptor_32de24555f916688 = []byte{
- // 1561 bytes of a gzipped FileDescriptorProto
+ // 1559 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0x4f, 0x6f, 0x1b, 0x45,
0x14, 0xaf, 0xff, 0x7b, 0x9f, 0x9d, 0xd0, 0x2e, 0x05, 0xb6, 0x05, 0x42, 0xba, 0x8d, 0x20, 0x08,
0x51, 0x44, 0x7a, 0x47, 0x72, 0x1b, 0x82, 0x2c, 0xb5, 0x69, 0x98, 0x84, 0x22, 0x71, 0xb1, 0xc6,
@@ -2023,13 +2023,13 @@
0xa7, 0xc5, 0xd6, 0x60, 0x0e, 0x85, 0xdf, 0x41, 0xe7, 0xc9, 0xf8, 0x19, 0xb1, 0xbc, 0x03, 0x2d,
0x15, 0x3d, 0x19, 0x3f, 0x7b, 0x03, 0xc9, 0xd6, 0x48, 0xab, 0x60, 0xb1, 0x5c, 0x05, 0x0b, 0xfb,
0xe2, 0x57, 0xf9, 0x98, 0x08, 0xac, 0x33, 0x92, 0xc3, 0xa7, 0xd0, 0x3f, 0xe2, 0x8a, 0xcf, 0xca,
- 0x89, 0xb8, 0x0b, 0x8d, 0x22, 0xd7, 0x41, 0x8d, 0xf6, 0xfc, 0x8d, 0xf5, 0x2b, 0x1e, 0xe5, 0x9a,
- 0xa1, 0xd5, 0xbf, 0x03, 0x8d, 0x64, 0x16, 0x5f, 0x2e, 0x1c, 0xfd, 0x5f, 0x63, 0x68, 0x0b, 0xbf,
- 0x82, 0xeb, 0x55, 0xdc, 0x87, 0xf9, 0x0c, 0xff, 0x56, 0xe1, 0x3c, 0x4e, 0x24, 0x37, 0x5f, 0x52,
- 0xde, 0x7d, 0x66, 0x41, 0xa9, 0xdd, 0xa3, 0x70, 0x4e, 0xbb, 0xf7, 0x20, 0x78, 0xf1, 0x6a, 0xab,
- 0xf6, 0xf2, 0xd5, 0x56, 0xed, 0x8f, 0x57, 0x5b, 0xb5, 0x9f, 0x5f, 0x6f, 0x5d, 0x7b, 0xf9, 0x7a,
- 0xeb, 0xda, 0x6f, 0xaf, 0xb7, 0xae, 0x8d, 0xdb, 0x74, 0xdc, 0xfd, 0x7f, 0x02, 0x00, 0x00, 0xff,
- 0xff, 0x5f, 0x7f, 0x61, 0xfe, 0xf0, 0x0e, 0x00, 0x00,
+ 0x89, 0xb8, 0x0b, 0x8d, 0x22, 0xd7, 0x2e, 0xf2, 0x8d, 0xf5, 0x2b, 0x1e, 0xe5, 0x9a, 0xa1, 0xd5,
+ 0xbf, 0x03, 0x8d, 0x64, 0x16, 0x5f, 0x2e, 0x1c, 0xfd, 0x5f, 0x63, 0x68, 0x0b, 0xbf, 0x82, 0xeb,
+ 0x55, 0xdc, 0x87, 0xf9, 0x0c, 0xff, 0x56, 0xe1, 0x3c, 0x4e, 0x24, 0x37, 0x5f, 0x52, 0xf4, 0x3e,
+ 0xb3, 0xa0, 0xd4, 0xee, 0x51, 0x38, 0xa7, 0xdd, 0x7b, 0x10, 0xbc, 0x78, 0xb5, 0x55, 0x7b, 0xf9,
+ 0x6a, 0xab, 0xf6, 0xc7, 0xab, 0xad, 0xda, 0xcf, 0xaf, 0xb7, 0xae, 0xbd, 0x7c, 0xbd, 0x75, 0xed,
+ 0xb7, 0xd7, 0x5b, 0xd7, 0xc6, 0x6d, 0x3a, 0xee, 0xfe, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xde,
+ 0x0e, 0xb8, 0xe3, 0xf0, 0x0e, 0x00, 0x00,
}
func (m *TaskLabel) Marshal() (dAtA []byte, err error) {
@@ -3280,27 +3280,25 @@
_ = i
var l int
_ = l
- if len(m.Pos) > 0 {
- for _, msg := range m.Pos {
- dAtA[i] = 0xa
- i++
- i = encodeVarintProtomsg(dAtA, i, uint64(msg.Size()))
- n, err := msg.MarshalTo(dAtA[i:])
- if err != nil {
- return 0, err
- }
- i += n
+ if m.Pos != nil {
+ dAtA[i] = 0xa
+ i++
+ i = encodeVarintProtomsg(dAtA, i, uint64(m.Pos.Size()))
+ n17, err17 := m.Pos.MarshalTo(dAtA[i:])
+ if err17 != nil {
+ return 0, err17
}
+ i += n17
}
if m.Img != nil {
dAtA[i] = 0x12
i++
i = encodeVarintProtomsg(dAtA, i, uint64(m.Img.Size()))
- n17, err17 := m.Img.MarshalTo(dAtA[i:])
- if err17 != nil {
- return 0, err17
+ n18, err18 := m.Img.MarshalTo(dAtA[i:])
+ if err18 != nil {
+ return 0, err18
}
- i += n17
+ i += n18
}
return i, nil
}
@@ -4004,11 +4002,9 @@
}
var l int
_ = l
- if len(m.Pos) > 0 {
- for _, e := range m.Pos {
- l = e.Size()
- n += 1 + l + sovProtomsg(uint64(l))
- }
+ if m.Pos != nil {
+ l = m.Pos.Size()
+ n += 1 + l + sovProtomsg(uint64(l))
}
if m.Img != nil {
l = m.Img.Size()
@@ -8657,8 +8653,10 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.Pos = append(m.Pos, &FacePos{})
- if err := m.Pos[len(m.Pos)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ if m.Pos == nil {
+ m.Pos = &FacePos{}
+ }
+ if err := m.Pos.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
diff --git a/protomsg.proto b/protomsg.proto
index decc42e..6040f32 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -198,7 +198,7 @@
// sdk face property
message ParamFacePos{
- repeated FacePos pos = 1;
+ FacePos pos = 1;
Image img = 2;
}
// sdk face extract
--
Gitblit v1.8.0