Commit 02f6e62d authored by Andrey Filippov's avatar Andrey Filippov

fixed rByRDist calculation error

parent 9b711009
...@@ -1501,9 +1501,9 @@ public class GPUTileProcessor { ...@@ -1501,9 +1501,9 @@ public class GPUTileProcessor {
for (int i = 0; i < texture_indices.length; i++) { for (int i = 0; i < texture_indices.length; i++) {
if (((texture_indices[i] >> CORR_TEXTURE_BIT) & 1) != 0) { if (((texture_indices[i] >> CORR_TEXTURE_BIT) & 1) != 0) {
int ntile = texture_indices[i] >> CORR_NTILE_SHIFT; int ntile = texture_indices[i] >> CORR_NTILE_SHIFT;
if (ntile == 22507) { // if (ntile == 22507) {
System.out.println("i="+i+", ntile="+ntile); // System.out.println("i="+i+", ntile="+ntile);
} // }
for (int l = 0; l < num_tile_extra; l++) { for (int l = 0; l < num_tile_extra; l++) {
extra[l][ntile] = diff_rgb_combo[i * num_tile_extra + l]; extra[l][ntile] = diff_rgb_combo[i * num_tile_extra + l];
} }
......
...@@ -363,8 +363,8 @@ extern "C" __global__ void get_tiles_offsets( ...@@ -363,8 +363,8 @@ extern "C" __global__ void get_tiles_offsets(
(extrinsic_corr.imu_move[0] != 0.0) || (extrinsic_corr.imu_move[0] != 0.0) ||
(extrinsic_corr.imu_move[1] != 0.0) || (extrinsic_corr.imu_move[1] != 0.0) ||
(extrinsic_corr.imu_move[2] != 0.0); (extrinsic_corr.imu_move[2] != 0.0);
// Temporary
imu_exists = 0;
#ifdef DEBUG21 #ifdef DEBUG21
if ((ncam == DBG_CAM) && (task_num == DBG_TILE)){ if ((ncam == DBG_CAM) && (task_num == DBG_TILE)){
printf("\nTile = %d, camera= %d\n", task_num, ncam); printf("\nTile = %d, camera= %d\n", task_num, ncam);
...@@ -685,15 +685,15 @@ extern "C" __global__ void get_tiles_offsets( ...@@ -685,15 +685,15 @@ extern "C" __global__ void get_tiles_offsets(
pXY[1] += ers_Yci * rD2rND; // added correction to pixel Y pXY[1] += ers_Yci * rD2rND; // added correction to pixel Y
#ifdef DEBUG210 #ifdef DEBUG210
if ((ncam == DBG_CAM) && (task_num == DBG_TILE)){ if ((ncam == DBG_CAM) && (task_num == DBG_TILE)){
printf("k = %f, wdisparity = %f, dwdisp_dz = %f\n", k, wdisparity, dwdisp_dz); printf("k = %f, wdisparity = %f, dwdisp_dz = %f\n", k, wdisparity, dwdisp_dz);
printf("dpXci_pYci_imu_lin[0][0] = %f, dpXci_pYci_imu_lin[0][2] = %f\n", dpXci_pYci_imu_lin[0][0],dpXci_pYci_imu_lin[0][2]); printf("dpXci_pYci_imu_lin[0][0] = %f, dpXci_pYci_imu_lin[0][2] = %f\n", dpXci_pYci_imu_lin[0][0],dpXci_pYci_imu_lin[0][2]);
printf("dpXci_pYci_imu_lin[1][1] = %f, dpXci_pYci_imu_lin[1][2] = %f\n", dpXci_pYci_imu_lin[1][1],dpXci_pYci_imu_lin[1][2]); printf("dpXci_pYci_imu_lin[1][1] = %f, dpXci_pYci_imu_lin[1][2] = %f\n", dpXci_pYci_imu_lin[1][1],dpXci_pYci_imu_lin[1][2]);
printf("delta_t = %f, ers_Xci = %f, ers_Yci = %f\n", delta_t, ers_Xci, ers_Yci); printf("delta_t = %f, ers_Xci = %f, ers_Yci = %f\n", delta_t, ers_Xci, ers_Yci);
printf("pXY[0] = %f, pXY[1] = %f\n", pXY[0], pXY[1]); // OK printf("pXY[0] = %f, pXY[1] = %f\n", pXY[0], pXY[1]); // OK
} }
__syncthreads();// __syncwarp(); __syncthreads();// __syncwarp();
#endif // DEBUG21 #endif // DEBUG21
} }
...@@ -733,7 +733,7 @@ extern "C" __global__ void calcReverseDistortionTable( ...@@ -733,7 +733,7 @@ extern "C" __global__ void calcReverseDistortionTable(
} }
if (i == 0){ if (i == 0){
rByRDist[0]= (float) 1.0/d; rByRDist[0]= (float) 1.0/d;
break; continue;
} }
double rDist = RBYRDIST_STEP * i; double rDist = RBYRDIST_STEP * i;
double r = (p == 0) ? rDist : rPrev; double r = (p == 0) ? rDist : rPrev;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment