Skip to content

O
opencv
Commit 265cb587 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #13112 from alalek:fix_coverity_reports_3.4

parents b5610e77 801c9430
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
modules/dnn/src/dnn.cpp
View file @ 265cb587
...@@ -1801,7 +1801,7 @@ struct Net::Impl ...@@ -1801,7 +1801,7 @@ struct Net::Impl
nextEltwiseLayer = nextData->layerInstance.dynamicCast<EltwiseLayer>(); nextEltwiseLayer = nextData->layerInstance.dynamicCast<EltwiseLayer>();
if( !nextEltwiseLayer.empty() && pinsToKeep.count(lpNext) == 0 && if( !nextEltwiseLayer.empty() && pinsToKeep.count(lpNext) == 0 &&
nextData->inputBlobsId.size() == 2 ) nextData && nextData->inputBlobsId.size() == 2 )
{ {
LayerData *eltwiseData = nextData; LayerData *eltwiseData = nextData;
......
modules/videoio/src/cap_v4l.cpp
View file @ 265cb587
...@@ -348,7 +348,9 @@ struct CvCaptureCAM_V4L CV_FINAL : public CvCapture ...@@ -348,7 +348,9 @@ struct CvCaptureCAM_V4L CV_FINAL : public CvCapture
/*********************** Implementations ***************************************/ /*********************** Implementations ***************************************/
CvCaptureCAM_V4L::CvCaptureCAM_V4L() : deviceHandle(-1), bufferIndex(-1) CvCaptureCAM_V4L::CvCaptureCAM_V4L() : deviceHandle(-1), bufferIndex(-1)
{} {
memset(&timestamp, 0, sizeof(timestamp));
}
CvCaptureCAM_V4L::~CvCaptureCAM_V4L() { CvCaptureCAM_V4L::~CvCaptureCAM_V4L() {
streaming(false); streaming(false);
...@@ -1739,7 +1741,6 @@ double CvCaptureCAM_V4L::getProperty(int property_id) const ...@@ -1739,7 +1741,6 @@ double CvCaptureCAM_V4L::getProperty(int property_id) const
return value; return value;
} }
} }
return -1.0;
} }
bool CvCaptureCAM_V4L::icvSetFrameSize(int _width, int _height) bool CvCaptureCAM_V4L::icvSetFrameSize(int _width, int _height)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment