tami/MYNT-EYE-S-SDK
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 14.04 complie error

Browse Source
This commit is contained in:
TinyOh 2019-04-12 14:42:08 +08:00
parent 089c1b1b0c
commit 1a080d438f
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wrappers/ros/src/mynt_eye_ros_wrapper/src/wrapper_nodelet.cc
View File

@ -1304,14 +1304,12 @@ class ROSWrapperNodelet : public nodelet::Nodelet {
if (stream == Stream::RIGHT || if (stream == Stream::RIGHT ||
stream == Stream::RIGHT_RECTIFIED) { stream == Stream::RIGHT_RECTIFIED) {
if (info_pair->right.distortion_model == "KANNALA_BRANDT") { if (info_pair->right.distortion_model == "KANNALA_BRANDT") {
camera_info->distortion_model = camera_info->distortion_model = "KANNALA_BRANDT";
sensor_msgs::distortion_models::EQUIDISTANT;
for (size_t i; i < 4; i++) { for (size_t i; i < 4; i++) {
camera_info->D.push_back(info_pair->right.D[i]); camera_info->D.push_back(info_pair->right.D[i]);
} }
} else if (info_pair->right.distortion_model == "PINHOLE") { } else if (info_pair->right.distortion_model == "PINHOLE") {
camera_info->distortion_model = camera_info->distortion_model = "plumb_bob";
sensor_msgs::distortion_models::PLUMB_BOB;
for (size_t i; i < 5; i++) { for (size_t i; i < 5; i++) {
camera_info->D.push_back(info_pair->right.D[i]); camera_info->D.push_back(info_pair->right.D[i]);
} }
@ -1331,21 +1329,18 @@ class ROSWrapperNodelet : public nodelet::Nodelet {
bool is_laserscan = false; bool is_laserscan = false;
private_nh_.getParamCached("is_laserscan", is_laserscan); private_nh_.getParamCached("is_laserscan", is_laserscan);
if (!is_laserscan) { if (!is_laserscan) {
camera_info->distortion_model = camera_info->distortion_model = "KANNALA_BRANDT";
sensor_msgs::distortion_models::EQUIDISTANT;
for (size_t i; i < 4; i++) { for (size_t i; i < 4; i++) {
camera_info->D.push_back(info_pair->left.D[i]); camera_info->D.push_back(info_pair->left.D[i]);
} }
} else { } else {
camera_info->distortion_model = camera_info->distortion_model = "plumb_bob";
sensor_msgs::distortion_models::PLUMB_BOB;
for (size_t i; i < 4; i++) { for (size_t i; i < 4; i++) {
camera_info->D.push_back(0.0); camera_info->D.push_back(0.0);
} }
} }
} else if (info_pair->left.distortion_model == "PINHOLE") { } else if (info_pair->left.distortion_model == "PINHOLE") {
camera_info->distortion_model = camera_info->distortion_model = "plumb_bob";
sensor_msgs::distortion_models::PLUMB_BOB;
for (size_t i; i < 5; i++) { for (size_t i; i < 5; i++) {
camera_info->D.push_back(info_pair->left.D[i]); camera_info->D.push_back(info_pair->left.D[i]);
} }