From 61a3d7d25d2987b9c72e072ff9d38dbcbb31ab54 Mon Sep 17 00:00:00 2001 From: Vincent Rabaud Date: Tue, 15 Jul 2025 09:17:57 +0200 Subject: [PATCH] Replace deprecated proto2::FieldDescriptor::is_optional It has been marked for inlining, cf https://github.com/protocolbuffers/protobuf/blob/930036a8cf4a489521ea78ea47510a3a6fb9d7c0/src/google/protobuf/descriptor.h#L936 --- modules/dnn/src/caffe/caffe_importer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/dnn/src/caffe/caffe_importer.cpp b/modules/dnn/src/caffe/caffe_importer.cpp index fc6cbcdd28ef..a4afec136a3d 100644 --- a/modules/dnn/src/caffe/caffe_importer.cpp +++ b/modules/dnn/src/caffe/caffe_importer.cpp @@ -217,7 +217,7 @@ class CaffeImporter 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)