third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19669 from alalek:fix_static_analyzer_issues_4.x

Browse Source
This commit is contained in:
Alexander Alekhin 2021-03-03 12:26:54 +00:00
commit 2dc157246b
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gapi/src/backends/ie/giebackend.cpp
View File

@ -936,6 +936,7 @@ struct InferList: public cv::detail::KernelTag {
std::vector<cv::Mat> &out_vec = ctx->outVecR<cv::Mat>(i);
IE::Blob::Ptr out_blob = req.GetBlob(ctx->uu.params.output_names[i]);
GAPI_Assert(out_blob);
cv::Mat out_mat(cached_dims[i], toCV(out_blob->getTensorDesc().getPrecision()));
// FIXME: Avoid data copy. Not sure if it is possible though
@ -1103,6 +1104,7 @@ struct InferList2: public cv::detail::KernelTag {
std::vector<cv::Mat> &out_vec = ctx->outVecR<cv::Mat>(i);
IE::Blob::Ptr out_blob = req.GetBlob(ctx->uu.params.output_names[i]);
GAPI_Assert(out_blob);
cv::Mat out_mat(cached_dims[i], toCV(out_blob->getTensorDesc().getPrecision()));
// FIXME: Avoid data copy. Not sure if it is possible though

8
modules/videoio/src/cap_msmf.cpp
View File

@ -615,6 +615,8 @@ protected:
_ComPtr<IMFDXGIDeviceManager> D3DMgr;
#endif
_ComPtr<IMFSourceReader> videoFileSource;
_ComPtr<IMFSample> videoSample;
_ComPtr<IMFSourceReaderCallback> readCallback; // non-NULL for "live" streams (camera capture)
DWORD dwStreamIndex;
MediaType nativeFormat;
MediaType captureFormat;
@ -622,10 +624,8 @@ protected:
bool convertFormat;
MFTIME duration;
LONGLONG frameStep;
_ComPtr<IMFSample> videoSample;
LONGLONG sampleTime;
bool isOpen;
_ComPtr<IMFSourceReaderCallback> readCallback; // non-NULL for "live" streams (camera capture)
};
CvCapture_MSMF::CvCapture_MSMF():
@ -641,8 +641,12 @@ CvCapture_MSMF::CvCapture_MSMF():
#endif
videoFileSource(NULL),
videoSample(NULL),
readCallback(NULL),
dwStreamIndex(0),
outputFormat(CV_CAP_MODE_BGR),
convertFormat(true),
duration(0),
frameStep(0),
sampleTime(0),
isOpen(false)
{