mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-09 02:23:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #12542 (#12603)

Browse Source 
* Fix #12542

* Remove ignore of non-virtual-dtor error
This commit is contained in:
Dmitry Kurtaev 2018-09-26 16:08:51 +03:00 committed by Vadim Pisarevsky
parent 43e66e7ff9
commit c8f3579f93
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/dnn/CMakeLists.txt
View File

@ -36,7 +36,6 @@ else()
-Wunused-parameter -Wunused-local-typedefs -Wsign-compare -Wsign-promo -Wunused-parameter -Wunused-local-typedefs -Wsign-compare -Wsign-promo
-Wundef -Wtautological-undefined-compare -Wignored-qualifiers -Wextra -Wundef -Wtautological-undefined-compare -Wignored-qualifiers -Wextra
-Wunused-function -Wunused-const-variable -Wdeprecated-declarations -Wunused-function -Wunused-const-variable -Wdeprecated-declarations
-Werror=non-virtual-dtor
) )
endif() endif()

2
modules/dnn/src/onnx/onnx_importer.cpp
View File

@ -213,7 +213,7 @@ LayerParams ONNXImporter::getLayerParams(const opencv_onnx::NodeProto& node_prot
else if (attribute_proto.floats_size() > 0) else if (attribute_proto.floats_size() > 0)
{ {
lp.set(attribute_name, DictValue::arrayReal( lp.set(attribute_name, DictValue::arrayReal(
(float*)attribute_proto.mutable_floats(), attribute_proto.floats_size())); attribute_proto.floats().data(), attribute_proto.floats_size()));
} }
else if (attribute_proto.ints_size() > 0) else if (attribute_proto.ints_size() > 0)
{ {

2
modules/dnn/src/tensorflow/tf_graph_simplifier.cpp
View File

@ -20,6 +20,8 @@ using ::google::protobuf::MapPair;
class Subgraph // Interface to match and replace TensorFlow subgraphs. class Subgraph // Interface to match and replace TensorFlow subgraphs.
{ {
public: public:
virtual ~Subgraph() {}
// Add a node to be matched in the origin graph. Specify ids of nodes that // Add a node to be matched in the origin graph. Specify ids of nodes that
// are expected to be inputs. Returns id of a newly added node. // are expected to be inputs. Returns id of a newly added node.
// TODO: Replace inputs to std::vector<int> in C++11 // TODO: Replace inputs to std::vector<int> in C++11