From: Alexander Reshetnikov <no@email>
Date: Thu, 29 Mar 2012 11:56:53 +0000 (+0000)
Subject: Updated close method for ieee1394 cameras
X-Git-Tag: accepted/2.0/20130307.220821~926
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee8c4aeb4bbd0f9e407472e96086ee8cd509a678;p=profile%2Fivi%2Fopencv.git

Updated close method for ieee1394 cameras
---

diff --git a/modules/highgui/src/cap_dc1394_v2.cpp b/modules/highgui/src/cap_dc1394_v2.cpp
index 81b2916..a3bce0d 100644
--- a/modules/highgui/src/cap_dc1394_v2.cpp
+++ b/modules/highgui/src/cap_dc1394_v2.cpp
@@ -493,8 +493,11 @@ void CvCaptureCAM_DC1394_v2_CPP::close()
 {
     if (dcCam)
     {
-        if (FD_ISSET(dc1394_capture_get_fileno(dcCam), &dc1394.camFds))
-            FD_CLR(dc1394_capture_get_fileno(dcCam), &dc1394.camFds);
+        // check for fileno valid before using
+        int fileno=dc1394_capture_get_fileno(dcCam);
+
+        if (fileno>=0 && FD_ISSET(fileno, &dc1394.camFds))
+            FD_CLR(fileno, &dc1394.camFds);
         dc1394_video_set_transmission(dcCam, DC1394_OFF);
         dc1394_capture_stop(dcCam);
         dc1394_camera_free(dcCam);