potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

Merge pull request #7695 from ArkadiuszRaj:aravis-release-bug-fix

Browse Source 
* Aravis: fixing releasing object when no communication with camera is possible

* Removing unnecessary include
This commit is contained in:
Arek
2016-11-21 02:22:43 +01:00
committed by Alexander Alekhin
parent 30807b26c7
commit 866f8eb1e7
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/src/cap_aravis.cpp
+8 -5
View File
@@ -188,11 +188,12 @@ CvCaptureCAM_Aravis::CvCaptureCAM_Aravis()
void CvCaptureCAM_Aravis::close()
{
if(camera)
if(camera) {
stopCapture();
g_object_unref(camera);
camera = NULL;
g_object_unref(camera);
camera = NULL;
}
}
bool CvCaptureCAM_Aravis::getDeviceNameById(int id, std::string &device)
@@ -559,8 +560,10 @@ void CvCaptureCAM_Aravis::stopCapture()
{
arv_camera_stop_acquisition(camera);
g_object_unref(stream);
stream = NULL;
if(stream) {
g_object_unref(stream);
stream = NULL;
}
}
bool CvCaptureCAM_Aravis::startCapture()