Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add short support with vpImageConvert::convert() cv::Mat to vpImage<float> #1488

Merged
merged 2 commits into from
Nov 4, 2024
Merged

Add short support with vpImageConvert::convert() cv::Mat to vpImage<float> #1488

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c892bf6
Add short support with vpImageConvert::convert(const cv::Mat &src, vp…
s-trinh Oct 21, 2024
29b54e8
Merge branch 'master' into add_vpImageConvert_convert_mat_to_float_sh…
fspindle Nov 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions modules/core/src/image/vpImageConvert_opencv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,9 @@
}

/*!
* Converts cv::Mat CV_32FC1 format to ViSP vpImage<float>.
* Converts cv::Mat CV_32FC1 / CV_16SC1 format to ViSP vpImage<float>.
*
* \param[in] src : OpenCV image in CV_32FC1 format.
* \param[in] src : OpenCV image in CV_32FC1 / CV_16SC1 format.
* \param[out] dest : ViSP image in float format.
* \param[in] flip : When true during conversion flip image vertically.
*/
Expand All @@ -296,7 +296,7 @@
unsigned int destCols = dest.getCols();

if (src.type() == CV_32FC1) {
for (unsigned int i = 0; i < destRows; ++i)
for (unsigned int i = 0; i < destRows; ++i) {

Check warning on line 299 in modules/core/src/image/vpImageConvert_opencv.cpp

View check run for this annotation

Codecov / codecov/patch

modules/core/src/image/vpImageConvert_opencv.cpp#L299 

Added line #L299 was not covered by tests
for (unsigned int j = 0; j < destCols; ++j) {
if (flip) {
dest[dest.getRows() - i - 1][j] = src.at<float>(static_cast<int>(i), static_cast<int>(j));
Expand All @@ -305,6 +305,19 @@
dest[i][j] = src.at<float>(static_cast<int>(i), static_cast<int>(j));
}
}
}
}
else if (src.type() == CV_16SC1) {
for (unsigned int i = 0; i < destRows; ++i) {
for (unsigned int j = 0; j < destCols; ++j) {
if (flip) {
dest[dest.getRows() - i - 1][j] = src.at<short>(static_cast<int>(i), static_cast<int>(j));

Check warning on line 314 in modules/core/src/image/vpImageConvert_opencv.cpp

View check run for this annotation

Codecov / codecov/patch

modules/core/src/image/vpImageConvert_opencv.cpp#L310-L314 

Added lines #L310 - L314 were not covered by tests
}
else {
dest[i][j] = src.at<short>(static_cast<int>(i), static_cast<int>(j));

Check warning on line 317 in modules/core/src/image/vpImageConvert_opencv.cpp

View check run for this annotation

Codecov / codecov/patch

modules/core/src/image/vpImageConvert_opencv.cpp#L317 

Added line #L317 was not covered by tests
}
}
}
}
else {
throw vpException(vpException::badValue, "cv::Mat type is not supported!");
Expand Down
Loading