Commit 6da8d7cb authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

temporarily disable 16-bit input in cap_dc1394_v2.cpp (ticket #296). thanks to…

temporarily disable 16-bit input in cap_dc1394_v2.cpp (ticket #296). thanks to sebastians for the patch!
parent 6cf6a227
...@@ -296,9 +296,7 @@ bool CvCaptureCAM_DC1394_v2_CPP::startCapture() ...@@ -296,9 +296,7 @@ bool CvCaptureCAM_DC1394_v2_CPP::startCapture()
if ((int)width == frameWidth || (int)height == frameHeight) if ((int)width == frameWidth || (int)height == frameHeight)
{ {
if (colorCoding == DC1394_COLOR_CODING_RGB8 || if (colorCoding == DC1394_COLOR_CODING_RGB8 ||
colorCoding == DC1394_COLOR_CODING_RGB16 || colorCoding == DC1394_COLOR_CODING_RAW8)
colorCoding == DC1394_COLOR_CODING_RAW8 ||
colorCoding == DC1394_COLOR_CODING_RAW16)
{ {
bestMode = mode; bestMode = mode;
break; break;
...@@ -313,9 +311,7 @@ bool CvCaptureCAM_DC1394_v2_CPP::startCapture() ...@@ -313,9 +311,7 @@ bool CvCaptureCAM_DC1394_v2_CPP::startCapture()
pref = 1; pref = 1;
} }
if (colorCoding == DC1394_COLOR_CODING_MONO8 || if (colorCoding == DC1394_COLOR_CODING_MONO8)
(colorCoding == DC1394_COLOR_CODING_MONO16 &&
pref < 0))
{ {
bestMode = mode; bestMode = mode;
pref = 0; pref = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment