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

checks and fixes from static code analyzers results (2)

Browse Source
This commit is contained in:
Alexander Alekhin 2020-09-03 18:01:38 +00:00
parent 5ae9892170
commit 7e019af50d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/calib3d/src/usac.hpp
View File

@ -405,7 +405,9 @@ struct SPRT_history {
double epsilon, delta, A; double epsilon, delta, A;
// number of samples processed by test // number of samples processed by test
int tested_samples; // k int tested_samples; // k
SPRT_history () { SPRT_history ()
: epsilon(0), delta(0), A(0)
{
tested_samples = 0; tested_samples = 0;
} }
}; };

4
modules/dnn/src/dnn.cpp
View File

@ -2731,6 +2731,7 @@ struct Net::Impl : public detail::NetImplBase
bool fuse_eltwise = false, fuse_activation = false; bool fuse_eltwise = false, fuse_activation = false;
if (IS_DNN_OPENCL_TARGET(preferableTarget) && !nextFusabeleActivLayer.empty() && if (IS_DNN_OPENCL_TARGET(preferableTarget) && !nextFusabeleActivLayer.empty() &&
nextData &&
(!nextData->type.compare("ReLU") || (!nextData->type.compare("ReLU") ||
!nextData->type.compare("ChannelsPReLU") || !nextData->type.compare("ChannelsPReLU") ||
!nextData->type.compare("Power")) && !nextData->type.compare("Power")) &&
@ -2753,7 +2754,7 @@ struct Net::Impl : public detail::NetImplBase
if (currLayer->tryFuse(layer)) if (currLayer->tryFuse(layer))
{ {
fuse_eltwise = true; /* eltwise was successfully fused */ fuse_eltwise = true; /* eltwise was successfully fused */
if (!nextFusabeleActivLayer.empty()) if (!nextFusabeleActivLayer.empty() && nextData)
{ {
if ((!nextData->type.compare("ReLU") || if ((!nextData->type.compare("ReLU") ||
!nextData->type.compare("ReLU6") || !nextData->type.compare("ReLU6") ||
@ -2774,6 +2775,7 @@ struct Net::Impl : public detail::NetImplBase
CV_Assert(!fuse_activation || fuse_eltwise); /* cannot fuse activation without eltwise */ CV_Assert(!fuse_activation || fuse_eltwise); /* cannot fuse activation without eltwise */
if(fuse_eltwise && fuse_activation) if(fuse_eltwise && fuse_activation)
{ {
CV_Assert(nextData);
CV_Assert_N(biasLayerData->outputBlobsWrappers.size() == 1, ld.inputBlobsWrappers.size() == 1); CV_Assert_N(biasLayerData->outputBlobsWrappers.size() == 1, ld.inputBlobsWrappers.size() == 1);
ld.inputBlobsWrappers.push_back(biasLayerData->outputBlobsWrappers[0]); ld.inputBlobsWrappers.push_back(biasLayerData->outputBlobsWrappers[0]);
printf_(("\tfused with %s\n", nextEltwiseLayer->name.c_str())); printf_(("\tfused with %s\n", nextEltwiseLayer->name.c_str()));