diff --git a/modules/dnn/src/dnn.cpp b/modules/dnn/src/dnn.cpp index d8815a5f08ee72b99948a56d3e6e61096abd4aac..ad4741d008c0a4b500db29930b0d8a2eac52f770 100644 --- a/modules/dnn/src/dnn.cpp +++ b/modules/dnn/src/dnn.cpp @@ -588,7 +588,8 @@ struct DataLayer : public Layer lp.precision = InferenceEngine::Precision::FP32; std::shared_ptr ieLayer(new InferenceEngine::ScaleShiftLayer(lp)); - CV_Assert(inputsData.size() == 1, inputsData[0].dims == 4); + CV_CheckEQ(inputsData.size(), (size_t)1, ""); + CV_CheckEQ(inputsData[0].dims, 4, ""); const size_t numChannels = inputsData[0].size[1]; CV_Assert(numChannels <= 4); @@ -1302,7 +1303,7 @@ struct Net::Impl if (!node.empty()) { Ptr ieNode = node.dynamicCast(); - CV_Assert(!ieNode.empty(), !ieNode->net.empty()); + CV_Assert(!ieNode.empty()); CV_Assert(!ieNode->net.empty()); layerNet = ieNode->net; } } @@ -1316,7 +1317,7 @@ struct Net::Impl if (!inpNode.empty()) { Ptr ieInpNode = inpNode.dynamicCast(); - CV_Assert(!ieInpNode.empty(), !ieInpNode->net.empty()); + CV_Assert(!ieInpNode.empty()); CV_Assert(!ieInpNode->net.empty()); if (layerNet != ieInpNode->net) { // layerNet is empty or nodes are from different graphs. @@ -1425,7 +1426,7 @@ struct Net::Impl if (!inpNode.empty()) { Ptr ieInpNode = inpNode.dynamicCast(); - CV_Assert(!ieInpNode.empty(), !ieInpNode->net.empty()); + CV_Assert(!ieInpNode.empty()); CV_Assert(!ieInpNode->net.empty()); if (ieInpNode->net != net) { net = Ptr(); diff --git a/modules/dnn/src/layers/prior_box_layer.cpp b/modules/dnn/src/layers/prior_box_layer.cpp index c1690f996f3baa45155484e5bca6163e345c4418..6be6efa8a66b0fa7e05c3cb59ebe1d3de7e94a5f 100644 --- a/modules/dnn/src/layers/prior_box_layer.cpp +++ b/modules/dnn/src/layers/prior_box_layer.cpp @@ -487,8 +487,8 @@ public: if (_explicitSizes) { - CV_Assert(!_boxWidths.empty(), !_boxHeights.empty(), - _boxWidths.size() == _boxHeights.size()); + CV_Assert(!_boxWidths.empty()); CV_Assert(!_boxHeights.empty()); + CV_Assert(_boxWidths.size() == _boxHeights.size()); ieLayer->params["width"] = format("%f", _boxWidths[0]); ieLayer->params["height"] = format("%f", _boxHeights[0]); for (int i = 1; i < _boxWidths.size(); ++i) @@ -530,7 +530,7 @@ public: ieLayer->params["step_h"] = format("%f", _stepY); ieLayer->params["step_w"] = format("%f", _stepX); } - CV_Assert(_offsetsX.size() == 1, _offsetsY.size() == 1, _offsetsX[0] == _offsetsY[0]); + CV_CheckEQ(_offsetsX.size(), (size_t)1, ""); CV_CheckEQ(_offsetsY.size(), (size_t)1, ""); CV_CheckEQ(_offsetsX[0], _offsetsY[0], ""); ieLayer->params["offset"] = format("%f", _offsetsX[0]); return Ptr(new InfEngineBackendNode(ieLayer));