From b03b884e22c6ae94834ec40e3ce56d7c3ea2e254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergi=20Hern=C3=A0ndez=20Juan?= <shernand@iri.upc.edu>
Date: Tue, 10 Mar 2015 11:23:00 +0000
Subject: [PATCH] In the get_bayern_pattern function: the video mode must be
FORMAT7, not the current video mode.
---
src/examples/firewire_camera_cont.cpp | 2 +-
src/firewirecamera.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/examples/firewire_camera_cont.cpp b/src/examples/firewire_camera_cont.cpp
index 11e2ad1..a538058 100644
--- a/src/examples/firewire_camera_cont.cpp
+++ b/src/examples/firewire_camera_cont.cpp
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
{
text.str("");
gettimeofday(&start_time,NULL);
- event_server->wait_all(event_list,0);
+ event_server->wait_all(event_list,1000);
camera1->get_image(&image);
filename="image_";
text << i;
diff --git a/src/firewirecamera.cpp b/src/firewirecamera.cpp
index c5be7d6..da9c520 100644
--- a/src/firewirecamera.cpp
+++ b/src/firewirecamera.cpp
@@ -1724,7 +1724,7 @@ void CFirewireCamera::get_bayer_pattern(dc1394color_filter_t *pattern)
{
dc1394error_t error;
- error=dc1394_format7_get_color_filter(this->camera_handle,this->mode,pattern);
+ error=dc1394_format7_get_color_filter(this->camera_handle,DC1394_VIDEO_MODE_FORMAT7_0,pattern);
if ( error != DC1394_SUCCESS )
{
DEBUG_INFO("failed\n");
--
GitLab