Fixed segfault problem with cap_unicap (ticket #1112)

1564fe9a · Alexander Reshetnikov · 586ff429 · 1564fe9a
Commit 1564fe9a authored Mar 29, 2012 by Alexander Reshetnikov
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 6 deletions

cap_unicap.cpp modules/highgui/src/cap_unicap.cpp +9 -6

No files found.
--- a/modules/highgui/src/cap_unicap.cpp
+++ b/modules/highgui/src/cap_unicap.cpp
@@ -149,12 +149,15 @@ bool CvCapture_Unicap::initDevice() {
  }
  int i;
-  for (i = format.size_count - 1; i > 0; i--)
+  if (format.sizes)
-    if (format.sizes[i].width == desired_size.width &&
+  {
-	format.sizes[i].height == desired_size.height)
+      for (i = format.size_count - 1; i > 0; i--)
-      break;
+        if (format.sizes[i].width == desired_size.width &&
-  format.size.width = format.sizes[i].width;
+        format.sizes[i].height == desired_size.height)
-  format.size.height = format.sizes[i].height;
+          break;
+      format.size.width = format.sizes[i].width;
+      format.size.height = format.sizes[i].height;
+  }
  if (!SUCCESS(unicap_set_format(handle, &format))) {
    shutdownDevice();