diff --git a/src/examples/firewire_camera_cont.cpp b/src/examples/firewire_camera_cont.cpp index 11e2ad19cc64a761d07c916b2f329a9b5f3126bc..a538058317c0ee26d815581c06d8335e46fdc9e2 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 c5be7d69fe11052e6158f0b1b80eb581d8a67424..da9c5200afb352de90819e1afdd7bc29e464b0c1 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");