diff --git a/src/examples/ptg_camera.cpp b/src/examples/ptg_camera.cpp index d4a946cd29a6286a0b71ba3cc9daf9016913e3ff..bead0d4de4418ea550d9f7079733cab18447aea3 100755 --- a/src/examples/ptg_camera.cpp +++ b/src/examples/ptg_camera.cpp @@ -24,8 +24,8 @@ int main(int argc, char *argv[]) char *image=NULL; std::string new_frame,filename; std::stringstream text; - uint64_t guid=0x0000b09d01006b6fb5; -// uint64_t guid=0x00B09D01007D6D85LL; + //uint64_t guid=0x0000b09d01006b6fb5; + //uint64_t guid=0x00B09D01007D6D85LL; std::list<std::string> events; try diff --git a/src/firewirecamera.cpp b/src/firewirecamera.cpp index e5441f1db93faca8f47b4639e3bcc513df7f2335..d86d104ba3c30e1184c3e418bd8af3fe45627bf7 100644 --- a/src/firewirecamera.cpp +++ b/src/firewirecamera.cpp @@ -1615,7 +1615,7 @@ void CFirewireCamera::get_image(cv::Mat &image) } char *image_raw=NULL; this->get_image(&image_raw); - cv::Mat image2 = cv::Mat(this->height,this->width,CV_8UC3,image_raw); + cv::Mat image2 = cv::Mat(this->height,this->width,type,image_raw); //this can be avoided returning the Mat with the user allocated image data //but then user is responsible to free both structures with //delete[] image->data;