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

fix(rectify): fix conflict

Browse Source
This commit is contained in:
kalman 2019-01-14 18:54:22 +08:00
commit e203c57ff8
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mynteye/api/processor/rectify_processor.cc
View File

@ -339,7 +339,6 @@ void RectifyProcessor::InitParams(
generateCameraFromIntrinsicsEquidistant(in_left); generateCameraFromIntrinsicsEquidistant(in_left);
camodocal::CameraPtr camera_odo_ptr_right = camodocal::CameraPtr camera_odo_ptr_right =
generateCameraFromIntrinsicsEquidistant(in_right); generateCameraFromIntrinsicsEquidistant(in_right);
<<<<<<< HEAD
auto calib_infos_temp = auto calib_infos_temp =
stereoRectify(camera_odo_ptr_left, stereoRectify(camera_odo_ptr_left,
camera_odo_ptr_right, camera_odo_ptr_right,
@ -347,14 +346,12 @@ void RectifyProcessor::InitParams(
in_right, in_right,
ex_right_to_left); ex_right_to_left);
*calib_infos = *calib_infos_temp; *calib_infos = *calib_infos_temp;
=======
auto calib_info_tmp = stereoRectify(camera_odo_ptr_left, auto calib_info_tmp = stereoRectify(camera_odo_ptr_left,
camera_odo_ptr_right, camera_odo_ptr_right,
in_left, in_left,
in_right, in_right,
ex_right_to_left); ex_right_to_left);
*calib_infos = *calib_info_tmp; *calib_infos = *calib_info_tmp;
>>>>>>> e56bf190f6df8a0af3b1c90b0e2008c8ae68309f
cv::Mat rect_R_l = cv::Mat rect_R_l =
cv::Mat::eye(3, 3, CV_32F), rect_R_r = cv::Mat::eye(3, 3, CV_32F); cv::Mat::eye(3, 3, CV_32F), rect_R_r = cv::Mat::eye(3, 3, CV_32F);
for (size_t i = 0; i < 3; i++) { for (size_t i = 0; i < 3; i++) {
@ -390,10 +387,6 @@ RectifyProcessor::RectifyProcessor(
std::int32_t proc_period) std::int32_t proc_period)
: Processor(std::move(proc_period)), : Processor(std::move(proc_period)),
calib_model(CalibrationModel::UNKNOW) { calib_model(CalibrationModel::UNKNOW) {
<<<<<<< HEAD
=======
VLOG(2) << __func__ << ": proc_period=" << proc_period;
>>>>>>> e56bf190f6df8a0af3b1c90b0e2008c8ae68309f
calib_infos = std::make_shared<struct camera_calib_info_pair>(); calib_infos = std::make_shared<struct camera_calib_info_pair>();
InitParams( InitParams(
*std::dynamic_pointer_cast<IntrinsicsEquidistant>(intr_left), *std::dynamic_pointer_cast<IntrinsicsEquidistant>(intr_left),