mirror of
https://github.com/zebrajr/opencv.git
synced 2025-12-06 12:19:50 +01:00
Merge pull request #27545 from vrabaud:png
Replace deprecated proto2::FieldDescriptor::is_optional
This commit is contained in:
commit
1342ca2f95
|
|
@ -217,7 +217,7 @@ public:
|
|||
|
||||
const google::protobuf::UnknownFieldSet& unknownFields = msgRefl->GetUnknownFields(msg);
|
||||
bool hasData = fd->is_required() ||
|
||||
(fd->is_optional() && msgRefl->HasField(msg, fd)) ||
|
||||
(!fd->is_repeated() && !fd->is_required() && msgRefl->HasField(msg, fd)) ||
|
||||
(fd->is_repeated() && msgRefl->FieldSize(msg, fd) > 0) ||
|
||||
!unknownFields.empty();
|
||||
if (!hasData)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user