Merge pull request #20998 from alalek:update_protobuf_3.19.1
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 10 Nov 2021 12:03:45 +0000 (15:03 +0300)
committerGitHub <noreply@github.com>
Wed, 10 Nov 2021 12:03:45 +0000 (12:03 +0000)
commitd934bb15b0c44b0ac50f2b2556393d9f4f28a620
tree546f7a41eca6d41b6ba9c2ba663f5313542b7dd5
parent58043dac0f3e24620ba3c2229506a9c029e22ff9
Merge pull request #20998 from alalek:update_protobuf_3.19.1

3rdparty(protobuf): upgrade 3.5.2 => 3.19.1

* 3rdparty(protobuf): upgrade 3.5.2 => 3.19.1

* dnn: update protobuf files (3.19.1)

* 3rdparty(protobuf): re-apply OpenCV patch for custom fields (3.19.1)

* protobuf: suppress new build warnings

* protobuf: remove unused files
247 files changed:
3rdparty/protobuf/CMakeLists.txt
3rdparty/protobuf/LICENSE
3rdparty/protobuf/README.md
3rdparty/protobuf/src/google/protobuf/any.cc
3rdparty/protobuf/src/google/protobuf/any.h
3rdparty/protobuf/src/google/protobuf/any.pb.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/any.pb.h [deleted file]
3rdparty/protobuf/src/google/protobuf/any_lite.cc [new file with mode: 0644]
3rdparty/protobuf/src/google/protobuf/api.pb.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/api.pb.h [deleted file]
3rdparty/protobuf/src/google/protobuf/arena.cc
3rdparty/protobuf/src/google/protobuf/arena.h
3rdparty/protobuf/src/google/protobuf/arena_impl.h
3rdparty/protobuf/src/google/protobuf/arenastring.cc
3rdparty/protobuf/src/google/protobuf/arenastring.h
3rdparty/protobuf/src/google/protobuf/descriptor.cc
3rdparty/protobuf/src/google/protobuf/descriptor.h
3rdparty/protobuf/src/google/protobuf/descriptor.pb.cc
3rdparty/protobuf/src/google/protobuf/descriptor.pb.h
3rdparty/protobuf/src/google/protobuf/descriptor_database.cc
3rdparty/protobuf/src/google/protobuf/descriptor_database.h
3rdparty/protobuf/src/google/protobuf/duration.pb.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/duration.pb.h [deleted file]
3rdparty/protobuf/src/google/protobuf/dynamic_message.cc
3rdparty/protobuf/src/google/protobuf/dynamic_message.h
3rdparty/protobuf/src/google/protobuf/empty.pb.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/empty.pb.h [deleted file]
3rdparty/protobuf/src/google/protobuf/explicitly_constructed.h [moved from 3rdparty/protobuf/src/google/protobuf/stubs/time.h with 52% similarity]
3rdparty/protobuf/src/google/protobuf/extension_set.cc
3rdparty/protobuf/src/google/protobuf/extension_set.h
3rdparty/protobuf/src/google/protobuf/extension_set_heavy.cc
3rdparty/protobuf/src/google/protobuf/extension_set_inl.h [new file with mode: 0644]
3rdparty/protobuf/src/google/protobuf/field_access_listener.h [new file with mode: 0644]
3rdparty/protobuf/src/google/protobuf/field_mask.pb.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/field_mask.pb.h
3rdparty/protobuf/src/google/protobuf/generated_enum_reflection.h
3rdparty/protobuf/src/google/protobuf/generated_enum_util.h
3rdparty/protobuf/src/google/protobuf/generated_message_bases.h [new file with mode: 0644]
3rdparty/protobuf/src/google/protobuf/generated_message_reflection.cc
3rdparty/protobuf/src/google/protobuf/generated_message_reflection.h
3rdparty/protobuf/src/google/protobuf/generated_message_table_driven.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/generated_message_table_driven.h
3rdparty/protobuf/src/google/protobuf/generated_message_table_driven_lite.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/generated_message_table_driven_lite.h [deleted file]
3rdparty/protobuf/src/google/protobuf/generated_message_tctable_decl.h [new file with mode: 0644]
3rdparty/protobuf/src/google/protobuf/generated_message_tctable_impl.h [new file with mode: 0644]
3rdparty/protobuf/src/google/protobuf/generated_message_tctable_impl.inc [new file with mode: 0644]
3rdparty/protobuf/src/google/protobuf/generated_message_util.cc
3rdparty/protobuf/src/google/protobuf/generated_message_util.h
3rdparty/protobuf/src/google/protobuf/has_bits.h
3rdparty/protobuf/src/google/protobuf/implicit_weak_message.cc [moved from 3rdparty/protobuf/src/google/protobuf/stubs/statusor.cc with 64% similarity]
3rdparty/protobuf/src/google/protobuf/implicit_weak_message.h [new file with mode: 0644]
3rdparty/protobuf/src/google/protobuf/inlined_string_field.h [new file with mode: 0644]
3rdparty/protobuf/src/google/protobuf/io/coded_stream.cc
3rdparty/protobuf/src/google/protobuf/io/coded_stream.h
3rdparty/protobuf/src/google/protobuf/io/coded_stream_inl.h [deleted file]
3rdparty/protobuf/src/google/protobuf/io/gzip_stream.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/io/gzip_stream.h [deleted file]
3rdparty/protobuf/src/google/protobuf/io/io_win32.cc [moved from 3rdparty/protobuf/src/google/protobuf/stubs/io_win32.cc with 79% similarity]
3rdparty/protobuf/src/google/protobuf/io/io_win32.h [moved from 3rdparty/protobuf/src/google/protobuf/stubs/io_win32.h with 58% similarity]
3rdparty/protobuf/src/google/protobuf/io/package_info.h
3rdparty/protobuf/src/google/protobuf/io/printer.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/io/printer.h [deleted file]
3rdparty/protobuf/src/google/protobuf/io/strtod.cc
3rdparty/protobuf/src/google/protobuf/io/strtod.h
3rdparty/protobuf/src/google/protobuf/io/tokenizer.cc
3rdparty/protobuf/src/google/protobuf/io/tokenizer.h
3rdparty/protobuf/src/google/protobuf/io/zero_copy_stream.h
3rdparty/protobuf/src/google/protobuf/io/zero_copy_stream_impl.cc
3rdparty/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h
3rdparty/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc
3rdparty/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h
3rdparty/protobuf/src/google/protobuf/map.cc [moved from 3rdparty/protobuf/src/google/protobuf/util/internal/error_listener.cc with 92% similarity]
3rdparty/protobuf/src/google/protobuf/map.h
3rdparty/protobuf/src/google/protobuf/map_entry.h
3rdparty/protobuf/src/google/protobuf/map_entry_lite.h
3rdparty/protobuf/src/google/protobuf/map_field.cc
3rdparty/protobuf/src/google/protobuf/map_field.h
3rdparty/protobuf/src/google/protobuf/map_field_inl.h
3rdparty/protobuf/src/google/protobuf/map_field_lite.h
3rdparty/protobuf/src/google/protobuf/map_type_handler.h
3rdparty/protobuf/src/google/protobuf/message.cc
3rdparty/protobuf/src/google/protobuf/message.h
3rdparty/protobuf/src/google/protobuf/message_lite.cc
3rdparty/protobuf/src/google/protobuf/message_lite.h
3rdparty/protobuf/src/google/protobuf/metadata.h
3rdparty/protobuf/src/google/protobuf/metadata_lite.h
3rdparty/protobuf/src/google/protobuf/package_info.h [deleted file]
3rdparty/protobuf/src/google/protobuf/parse_context.cc [new file with mode: 0644]
3rdparty/protobuf/src/google/protobuf/parse_context.h [new file with mode: 0644]
3rdparty/protobuf/src/google/protobuf/port.h [moved from 3rdparty/protobuf/src/google/protobuf/service.cc with 82% similarity]
3rdparty/protobuf/src/google/protobuf/port_def.inc [new file with mode: 0644]
3rdparty/protobuf/src/google/protobuf/port_undef.inc [new file with mode: 0644]
3rdparty/protobuf/src/google/protobuf/reflection.h
3rdparty/protobuf/src/google/protobuf/reflection_internal.h
3rdparty/protobuf/src/google/protobuf/reflection_ops.cc
3rdparty/protobuf/src/google/protobuf/reflection_ops.h
3rdparty/protobuf/src/google/protobuf/repeated_field.cc
3rdparty/protobuf/src/google/protobuf/repeated_field.h
3rdparty/protobuf/src/google/protobuf/repeated_ptr_field.cc [new file with mode: 0644]
3rdparty/protobuf/src/google/protobuf/repeated_ptr_field.h [new file with mode: 0644]
3rdparty/protobuf/src/google/protobuf/service.h [deleted file]
3rdparty/protobuf/src/google/protobuf/source_context.pb.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/source_context.pb.h [deleted file]
3rdparty/protobuf/src/google/protobuf/struct.pb.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/struct.pb.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/atomic_sequence_num.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/atomicops.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_arm64_gcc.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_gcc.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_qnx.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_c11_atomic.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_mips_gcc.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_power.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_ppc_gcc.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_solaris.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_tsan.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/bytestream.cc
3rdparty/protobuf/src/google/protobuf/stubs/bytestream.h
3rdparty/protobuf/src/google/protobuf/stubs/callback.h
3rdparty/protobuf/src/google/protobuf/stubs/casts.h
3rdparty/protobuf/src/google/protobuf/stubs/common.cc
3rdparty/protobuf/src/google/protobuf/stubs/common.h
3rdparty/protobuf/src/google/protobuf/stubs/fastmem.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/hash.h
3rdparty/protobuf/src/google/protobuf/stubs/int128.cc
3rdparty/protobuf/src/google/protobuf/stubs/int128.h
3rdparty/protobuf/src/google/protobuf/stubs/logging.h
3rdparty/protobuf/src/google/protobuf/stubs/macros.h
3rdparty/protobuf/src/google/protobuf/stubs/map_util.h
3rdparty/protobuf/src/google/protobuf/stubs/mathlimits.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/mathlimits.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/mathutil.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/mutex.h
3rdparty/protobuf/src/google/protobuf/stubs/once.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/once.h
3rdparty/protobuf/src/google/protobuf/stubs/platform_macros.h
3rdparty/protobuf/src/google/protobuf/stubs/port.h
3rdparty/protobuf/src/google/protobuf/stubs/scoped_ptr.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/shared_ptr.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/singleton.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/status.cc
3rdparty/protobuf/src/google/protobuf/stubs/status.h
3rdparty/protobuf/src/google/protobuf/stubs/status_macros.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/statusor.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/stl_util.h
3rdparty/protobuf/src/google/protobuf/stubs/stringpiece.cc
3rdparty/protobuf/src/google/protobuf/stubs/stringpiece.h
3rdparty/protobuf/src/google/protobuf/stubs/stringprintf.cc
3rdparty/protobuf/src/google/protobuf/stubs/stringprintf.h
3rdparty/protobuf/src/google/protobuf/stubs/structurally_valid.cc
3rdparty/protobuf/src/google/protobuf/stubs/strutil.cc
3rdparty/protobuf/src/google/protobuf/stubs/strutil.h
3rdparty/protobuf/src/google/protobuf/stubs/substitute.cc
3rdparty/protobuf/src/google/protobuf/stubs/substitute.h
3rdparty/protobuf/src/google/protobuf/stubs/template_util.h [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/time.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/stubs/type_traits.h [deleted file]
3rdparty/protobuf/src/google/protobuf/text_format.cc
3rdparty/protobuf/src/google/protobuf/text_format.h
3rdparty/protobuf/src/google/protobuf/timestamp.pb.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/timestamp.pb.h [deleted file]
3rdparty/protobuf/src/google/protobuf/type.pb.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/type.pb.h [deleted file]
3rdparty/protobuf/src/google/protobuf/unknown_field_set.cc
3rdparty/protobuf/src/google/protobuf/unknown_field_set.h
3rdparty/protobuf/src/google/protobuf/util/delimited_message_util.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/util/delimited_message_util.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/field_comparator.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/util/field_comparator.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/field_mask_util.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/util/field_mask_util.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/constants.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/datapiece.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/datapiece.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/error_listener.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/expecting_objectwriter.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/field_mask_utility.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/field_mask_utility.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/json_escaping.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/json_escaping.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/json_objectwriter.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/json_objectwriter.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/json_stream_parser.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/json_stream_parser.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/location_tracker.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/mock_error_listener.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/object_location_tracker.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/object_source.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/object_writer.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/object_writer.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/proto_writer.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/proto_writer.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/protostream_objectsource.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/structured_objectwriter.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/type_info.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/type_info.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/utility.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/util/internal/utility.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/json_util.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/util/json_util.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/message_differencer.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/util/message_differencer.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/package_info.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/time_util.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/util/time_util.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/type_resolver.h [deleted file]
3rdparty/protobuf/src/google/protobuf/util/type_resolver_util.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/util/type_resolver_util.h [deleted file]
3rdparty/protobuf/src/google/protobuf/wire_format.cc
3rdparty/protobuf/src/google/protobuf/wire_format.h
3rdparty/protobuf/src/google/protobuf/wire_format_lite.cc
3rdparty/protobuf/src/google/protobuf/wire_format_lite.h
3rdparty/protobuf/src/google/protobuf/wire_format_lite_inl.h [deleted file]
3rdparty/protobuf/src/google/protobuf/wrappers.pb.cc [deleted file]
3rdparty/protobuf/src/google/protobuf/wrappers.pb.h [deleted file]
modules/dnn/CMakeLists.txt
modules/dnn/misc/caffe/opencv-caffe.pb.cc
modules/dnn/misc/caffe/opencv-caffe.pb.h
modules/dnn/misc/onnx/opencv-onnx.pb.cc
modules/dnn/misc/onnx/opencv-onnx.pb.h
modules/dnn/misc/tensorflow/attr_value.pb.cc
modules/dnn/misc/tensorflow/attr_value.pb.h
modules/dnn/misc/tensorflow/function.pb.cc
modules/dnn/misc/tensorflow/function.pb.h
modules/dnn/misc/tensorflow/graph.pb.cc
modules/dnn/misc/tensorflow/graph.pb.h
modules/dnn/misc/tensorflow/op_def.pb.cc
modules/dnn/misc/tensorflow/op_def.pb.h
modules/dnn/misc/tensorflow/tensor.pb.cc
modules/dnn/misc/tensorflow/tensor.pb.h
modules/dnn/misc/tensorflow/tensor_shape.pb.cc
modules/dnn/misc/tensorflow/tensor_shape.pb.h
modules/dnn/misc/tensorflow/types.pb.cc
modules/dnn/misc/tensorflow/types.pb.h
modules/dnn/misc/tensorflow/versions.pb.cc
modules/dnn/misc/tensorflow/versions.pb.h