temporarily disable 16-bit input in cap_dc1394_v2.cpp (ticket #296). thanks to sebast...
authorVadim Pisarevsky <no@email>
Thu, 29 Jul 2010 12:44:23 +0000 (12:44 +0000)
committerVadim Pisarevsky <no@email>
Thu, 29 Jul 2010 12:44:23 +0000 (12:44 +0000)
modules/highgui/src/cap_dc1394_v2.cpp

index 12986b7..405c01a 100644 (file)
@@ -296,9 +296,7 @@ bool CvCaptureCAM_DC1394_v2_CPP::startCapture()
             if ((int)width == frameWidth || (int)height == frameHeight)
             {
                 if (colorCoding == DC1394_COLOR_CODING_RGB8 ||
-                        colorCoding == DC1394_COLOR_CODING_RGB16 ||
-                        colorCoding == DC1394_COLOR_CODING_RAW8 ||
-                        colorCoding == DC1394_COLOR_CODING_RAW16)
+                        colorCoding == DC1394_COLOR_CODING_RAW8)
                 {
                     bestMode = mode;
                     break;
@@ -313,9 +311,7 @@ bool CvCaptureCAM_DC1394_v2_CPP::startCapture()
                     pref = 1;
                 }
 
-                if (colorCoding == DC1394_COLOR_CODING_MONO8 ||
-                        (colorCoding == DC1394_COLOR_CODING_MONO16 &&
-                        pref < 0))
+                if (colorCoding == DC1394_COLOR_CODING_MONO8)
                 {
                     bestMode = mode;
                     pref = 0;