From: Vadim Pisarevsky <vadim.pisarevsky@itseez.com>
Date: Tue, 28 Aug 2012 10:19:34 +0000 (+0400)
Subject: applied patches from #2311
X-Git-Tag: accepted/2.0/20130307.220821~364^2~215^2~36^2~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2c9e7c3fbd0d95f78f2e61b41c138daa1f00dc8;p=profile%2Fivi%2Fopencv.git

applied patches from #2311
---

diff --git a/modules/highgui/src/cap_libv4l.cpp b/modules/highgui/src/cap_libv4l.cpp
index c27224d..6dcc567 100644
--- a/modules/highgui/src/cap_libv4l.cpp
+++ b/modules/highgui/src/cap_libv4l.cpp
@@ -956,6 +956,7 @@ static int _capture_V4L (CvCaptureCAM_V4L *capture, char *deviceName)
      if (capture->memoryMap == MAP_FAILED) {
         fprintf( stderr, "HIGHGUI ERROR: V4L: Mapping Memmory from video source error: %s\n", strerror(errno));
         icvCloseCAM_V4L(capture);
+        return -1;
      }
 
      /* Set up video_mmap structure pointing to this memory mapped area so each image may be
@@ -1709,6 +1710,7 @@ static void icvCloseCAM_V4L( CvCaptureCAM_V4L* capture ){
      }
 #endif
 
+     free(capture->deviceName);
      //v4l2_free_ranges(capture);
      //cvFree((void **)capture);
    }