raphael/msckf_vio
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed merge conflicts 2

Browse Source
This commit is contained in:
Raphael Maenle
2019-05-22 11:34:26 +02:00
parent 8ff0e9d816
commit 2f130685c8
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/msckf_vio.cpp
View File

@@ -1356,9 +1356,7 @@ void MsckfVio::PhotometricMeasurementJacobian(
r = r_l; r = r_l;
H_x = H_xl; H_x = H_xl;
H_y = H_yl; H_y = H_yl;
<<<<<<< HEAD
// calculate residual
=======
//TODO make this more fluent as well //TODO make this more fluent as well
count = 0; count = 0;
@@ -1372,7 +1370,6 @@ void MsckfVio::PhotometricMeasurementJacobian(
feature.MarkerGeneration(marker_pub, state_server.cam_states); feature.MarkerGeneration(marker_pub, state_server.cam_states);
feature.VisualizePatch(cam_state, cam_state_id, cam0, photo_r, ss, gradientVector, residualVector); feature.VisualizePatch(cam_state, cam_state_id, cam0, photo_r, ss, gradientVector, residualVector);
} }
>>>>>>> photometry-jakobi
return; return;
} }