diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1f87350828b9c1f1ae09e2bb6613030d61d50f60..6037c67c22c61e8c9d7895be5a417c767ec3c5f2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -44,7 +44,7 @@ ADD_LIBRARY(mvbluefox3 SHARED ${sources} ${sources_ex} ${sources_mut}) #if CV then add the libraries if (USE_CV) INCLUDE_DIRECTORIES(${OpenCV_INCLUDE_DIRS}) - TARGET_LINK_LIBRARIES(mvbluefox3 ${mvIMPACT_LIBRARY} ${OpenCV_LIBS}) + TARGET_LINK_LIBRARIES(mvbluefox3 ${mvIMPACT_LIBRARY} ${OpenCV_LIBRARIES}) else(USE_CV) TARGET_LINK_LIBRARIES(mvbluefox3 ${mvIMPACT_LIBRARY}) endif(USE_CV) diff --git a/src/mvbluefox3.cpp b/src/mvbluefox3.cpp index aff28a4a9a779d233e0a54e19a80968973abbb79..bfbe72147004613b5537baa900a1a1e8ba24a21a 100644 --- a/src/mvbluefox3.cpp +++ b/src/mvbluefox3.cpp @@ -229,8 +229,8 @@ void CMvbluefox3::GetImageCV(cv::Mat &image) "Invalid depth. OpenCV Depth not implemented here."); break; } - cv::Mat image2 = cv::Mat(this->params_.height,this->params_.width,type,image_raw); - image = image2.clone(); + image = cv::Mat(this->params_.height,this->params_.width,type,image_raw); + delete [] image_raw; } #endif diff --git a/src/mvbluefox3.h b/src/mvbluefox3.h index d24adc000732362680aad15f26b2649af9623c31..5ad0d1105b71f7c1aa4cce7bb0496e5c406c21c9 100644 --- a/src/mvbluefox3.h +++ b/src/mvbluefox3.h @@ -189,13 +189,6 @@ class CMvbluefox3 */ void OpenDevice(const std::string &serial); - /** - * \brief Close device - * - * Close device. - */ - void CloseDevice(void); - /** * \brief Get image request format * @@ -384,6 +377,13 @@ class CMvbluefox3 */ ~CMvbluefox3(); + /** + * \brief Close device + * + * Close device. + */ + void CloseDevice(void); + /** * \brief Get device product name *