From 6da8d7cb525301941ec49430abe271d47c43452c Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Thu, 29 Jul 2010 12:44:23 +0000 Subject: [PATCH] temporarily disable 16-bit input in cap_dc1394_v2.cpp (ticket #296). thanks to sebastians for the patch! --- modules/highgui/src/cap_dc1394_v2.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/highgui/src/cap_dc1394_v2.cpp b/modules/highgui/src/cap_dc1394_v2.cpp index 12986b7..405c01a 100644 --- a/modules/highgui/src/cap_dc1394_v2.cpp +++ b/modules/highgui/src/cap_dc1394_v2.cpp @@ -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; -- 2.7.4