Skip to content
Snippets Groups Projects
Commit 31a26ff9 authored by Angel Santamaria-Navarro's avatar Angel Santamaria-Navarro
Browse files

working with opencv3.0. ROS indigo has problems with it...trying top set compatibility with opencv2

parent e37ccb29
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
......@@ -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
......
......@@ -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
*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment