ran formatter

src/dtt8x8.h

@@ -64,17 +64,16 @@
 
 #define DTTTEST_BLOCK_WIDTH 32
 #define DTTTEST_BLOCK_HEIGHT 16
-#define DTTTEST_BLK_STRIDE     (DTTTEST_BLOCK_WIDTH+1)
-
-//extern __constant__ float idct_signs[4][4][4];
-//extern __constant__ int imclt_indx9[16];
-//extern __constant__ float HWINDOW2[];
+#define DTTTEST_BLK_STRIDE (DTTTEST_BLOCK_WIDTH + 1)
 
+// extern __constant__ float idct_signs[4][4][4];
+// extern __constant__ int imclt_indx9[16];
+// extern __constant__ float HWINDOW2[];
 
 // kernels (not used so far)
 #if 0
 extern "C" __global__ void GPU_DTT24_DRV(float *dst, float *src, int src_stride, int dtt_mode);
-#endif// #if 0
+#endif  // #if 0
 
 //=========================== 2D functions ===============
 extern __device__ void corrUnfoldTile(
@@ -83,19 +82,19 @@ extern __device__ void corrUnfoldTile(
     float* rslt);   //   [DTT_SIZE2M1][DTT_SIZE2M1]) // 15x15
 
 extern __device__ void dttii_2d(
-		float * clt_corr); // shared memory, [4][DTT_SIZE1][DTT_SIZE]
+    float* clt_corr);  // shared memory, [4][DTT_SIZE1][DTT_SIZE]
 
 extern __device__ void dttiv_color_2d(
-		float * clt_tile,
+    float* clt_tile,
     int color);
 extern __device__ void dttiv_mono_2d(
-		float * clt_tile);
+    float* clt_tile);
 extern __device__ void imclt(
-		float * clt_tile,   //        [4][DTT_SIZE][DTT_SIZE1], // +1 to alternate column ports [4][8][9]
-		float * mclt_tile );
+    float* clt_tile,  //        [4][DTT_SIZE][DTT_SIZE1], // +1 to alternate column ports [4][8][9]
+    float* mclt_tile);
 
 extern __device__ void imclt8threads(
     int do_acc,        // 1 - add to previous value, 0 - overwrite
-		float * clt_tile,   //        [4][DTT_SIZE][DTT_SIZE1], // +1 to alternate column ports [4][8][9]
-		float * mclt_tile,  //           [2* DTT_SIZE][DTT_SIZE1+ DTT_SIZE], // +1 to alternate column ports[16][17]
+    float* clt_tile,   //        [4][DTT_SIZE][DTT_SIZE1], // +1 to alternate column ports [4][8][9]
+    float* mclt_tile,  //           [2* DTT_SIZE][DTT_SIZE1+ DTT_SIZE], // +1 to alternate column ports[16][17]
     int debug);

src/geometry_correction.h

@@ -41,18 +41,16 @@
 #include "tp_defines.h"
 #endif
 
-
 #define NVRTC_BUG 1
 #ifndef M_PI
 #define M_PI 3.14159265358979323846 /* pi */
 #endif
 #ifndef offsetof
 #define offsetof(st, m) \
-    ((size_t)&(((st *)0)->m))
+    ((size_t) & (((st *)0)->m))
 //#define offsetof(TYPE, MEMBER) __builtin_offsetof (TYPE, MEMBER)
 #endif
 
-
 #define SCENE_UNITS_SCALE 0.001  // meters from mm
 #define MIN_DISPARITY 0.01       // minimal disparity to try to convert to world coordinates
 struct tp_task {
@@ -68,37 +66,37 @@ struct tp_task {
     float disp_dist[NUM_CAMS][4];  // calculated with getPortsCoordinates()
 };
 
-#define get_task_size(x) (sizeof(struct tp_task)/sizeof(float) - 6 * (NUM_CAMS - x))
+#define get_task_size(x) (sizeof(struct tp_task) / sizeof(float) - 6 * (NUM_CAMS - x))
 #define tp_task_xy_offset 5
 #define tp_task_centerXY_offset 3
 
-struct corr_vector{
-	float tilt    [NUM_CAMS-1]; // 0..2
-	float azimuth [NUM_CAMS-1]; // 3..5
-	float roll    [NUM_CAMS];   // 6..9
-	float zoom    [NUM_CAMS-1]; // 10..12
+struct corr_vector {
+    float tilt[NUM_CAMS - 1];     // 0..2
+    float azimuth[NUM_CAMS - 1];  // 3..5
+    float roll[NUM_CAMS];         // 6..9
+    float zoom[NUM_CAMS - 1];     // 10..12
     // for ERS correction:
-	float imu_rot [3]; // d_tilt/dt (rad/s), d_az/dt, d_roll/dt 13..15
+    float imu_rot[3];   // d_tilt/dt (rad/s), d_az/dt, d_roll/dt 13..15
     float imu_move[3];  // dx/dt, dy/dt, dz/dt 16..19
 };
 #ifdef NVRTC_BUG
-struct trot_deriv{
-	float rots    [NUM_CAMS][3][3];
-	float d_daz   [NUM_CAMS][3][3];
-	float d_tilt  [NUM_CAMS][3][3];
-	float d_roll  [NUM_CAMS][3][3];
-	float d_zoom  [NUM_CAMS][3][3];
+struct trot_deriv {
+    float rots[NUM_CAMS][3][3];
+    float d_daz[NUM_CAMS][3][3];
+    float d_tilt[NUM_CAMS][3][3];
+    float d_roll[NUM_CAMS][3][3];
+    float d_zoom[NUM_CAMS][3][3];
 };
 #else
-union trot_deriv{
+union trot_deriv {
     struct {
-		float rots    [NUM_CAMS][3][3];
-		float d_daz   [NUM_CAMS][3][3];
-		float d_tilt  [NUM_CAMS][3][3];
-		float d_roll  [NUM_CAMS][3][3];
-		float d_zoom  [NUM_CAMS][3][3];
+        float rots[NUM_CAMS][3][3];
+        float d_daz[NUM_CAMS][3][3];
+        float d_tilt[NUM_CAMS][3][3];
+        float d_roll[NUM_CAMS][3][3];
+        float d_zoom[NUM_CAMS][3][3];
     };
-	float matrices [5][NUM_CAMS][3][3];
+    float matrices[5][NUM_CAMS][3][3];
 };
 #endif
 
@@ -116,72 +114,68 @@ struct gc {
             float distortionC;   // r^2
             float distortionB;   // r^3
             float distortionA;   // r^4 (normalized to focal length or to sensor half width?)
-			float distortionA5;     //r^5 (normalized to focal length or to sensor half width?)
-			float distortionA6;     //r^6 (normalized to focal length or to sensor half width?)
-			float distortionA7;     //r^7 (normalized to focal length or to sensor half width?)
-			float distortionA8;     //r^8 (normalized to focal length or to sensor half width?)
+            float distortionA5;  // r^5 (normalized to focal length or to sensor half width?)
+            float distortionA6;  // r^6 (normalized to focal length or to sensor half width?)
+            float distortionA7;  // r^7 (normalized to focal length or to sensor half width?)
+            float distortionA8;  // r^8 (normalized to focal length or to sensor half width?)
 #ifndef NVRTC_BUG
         };
-		float rad_coeff [7];
+        float rad_coeff[7];
     };
 #endif
     // parameters, common for all sensors
     float elevation;  // degrees, up - positive;
     float heading;    // degrees, CW (from top) - positive
 
-	float forward    [NUM_CAMS];
-	float right      [NUM_CAMS];
-	float height     [NUM_CAMS];
-	float roll       [NUM_CAMS];    // degrees, CW (to target) - positive
-	float pXY0       [NUM_CAMS][2];
+    float forward[NUM_CAMS];
+    float right[NUM_CAMS];
+    float height[NUM_CAMS];
+    float roll[NUM_CAMS];  // degrees, CW (to target) - positive
+    float pXY0[NUM_CAMS][2];
     float common_right;        // mm right, camera center
     float common_forward;      // mm forward (to target), camera center
     float common_height;       // mm up, camera center
     float common_roll;         // degrees CW (to target) camera as a whole
-//	float [][] XYZ_he;     // all cameras coordinates transformed to eliminate heading and elevation (rolls preserved)
-//	float [][] XYZ_her = null; // XYZ of the lenses in a corrected CCS (adjusted for to elevation, heading,  common_roll)
-	float rXY        [NUM_CAMS][2]; // XY pairs of the in a normal plane, relative to disparityRadius
-//	float [][] rXY_ideal = {{-0.5, -0.5}, {0.5,-0.5}, {-0.5, 0.5}, {0.5,0.5}};
-// only used for the multi-quad systems
+                               //	float [][] XYZ_he;     // all cameras coordinates transformed to eliminate heading and elevation (rolls preserved)
+                               //	float [][] XYZ_her = null; // XYZ of the lenses in a corrected CCS (adjusted for to elevation, heading,  common_roll)
+    float rXY[NUM_CAMS][2];    // XY pairs of the in a normal plane, relative to disparityRadius
+                               //	float [][] rXY_ideal = {{-0.5, -0.5}, {0.5,-0.5}, {-0.5, 0.5}, {0.5,0.5}};
+                               // only used for the multi-quad systems
     float cameraRadius;        // =0; // average distance from the "mass center" of the sensors to the sensors
     float disparityRadius;     // =150.0; // distance between cameras to normalize disparity units to. sqrt(2)*disparityRadius for quad
-	float woi_tops   [NUM_CAMS]; // used to calculate scanline timing
+    float woi_tops[NUM_CAMS];  // used to calculate scanline timing
 };
 #define RAD_COEFF_LEN 7
 extern "C" __global__ void get_tiles_offsets(
     int uniform_grid,  //==0: use provided centers (as for interscene) , !=0 calculate uniform grid
     int num_cams,
-//		struct tp_task     * gpu_tasks,
-		float              * gpu_ftasks,         // flattened tasks, 27 floats for quad EO, 99 floats for LWIR16
+    //		struct tp_task     * gpu_tasks,
+    float *gpu_ftasks,  // flattened tasks, 27 floats for quad EO, 99 floats for LWIR16
     int num_tiles,      // number of tiles in task
-		struct gc          * gpu_geometry_correction,
-		struct corr_vector * gpu_correction_vector,
-		float *              gpu_rByRDist, // length should match RBYRDIST_LEN
-		trot_deriv   * gpu_rot_deriv);
+    struct gc *gpu_geometry_correction,
+    struct corr_vector *gpu_correction_vector,
+    float *gpu_rByRDist,  // length should match RBYRDIST_LEN
+    trot_deriv *gpu_rot_deriv);
 
 extern "C" __global__ void calculate_tiles_offsets(
     int uniform_grid,  //==0: use provided centers (as for interscene) , !=0 calculate uniform grid
     int num_cams,
-		float              * gpu_ftasks,         // flattened tasks, 27 floats for quad EO, 99 floats for LWIR16
-//		struct tp_task     * gpu_tasks,
+    float *gpu_ftasks,  // flattened tasks, 27 floats for quad EO, 99 floats for LWIR16
+                        //		struct tp_task     * gpu_tasks,
     int num_tiles,      // number of tiles in task
-		struct gc          * gpu_geometry_correction,
-		struct corr_vector * gpu_correction_vector,
-		float *              gpu_rByRDist, // length should match RBYRDIST_LEN
-		trot_deriv   * gpu_rot_deriv);
-
+    struct gc *gpu_geometry_correction,
+    struct corr_vector *gpu_correction_vector,
+    float *gpu_rByRDist,  // length should match RBYRDIST_LEN
+    trot_deriv *gpu_rot_deriv);
 
 // uses NUM_CAMS blocks, (3,3,3) threads
 extern "C" __global__ void calc_rot_deriv(
     int num_cams,
-		struct corr_vector * gpu_correction_vector,
-		trot_deriv   * gpu_rot_deriv);
+    struct corr_vector *gpu_correction_vector,
+    trot_deriv *gpu_rot_deriv);
 
 #define CALC_REVERSE_TABLE_BLOCK_THREADS (NUM_CAMS * 3 * 3 * 3)  // fixed blockDim
 // Use same blocks/threads as with calc_rot_deriv() - NUM_CAMS blocks, (3,3,3) threads
 extern "C" __global__ void calcReverseDistortionTable(
-		struct gc * geometry_correction,
-		float * rByRDist);
-
-
-
+    struct gc *geometry_correction,
+    float *rByRDist);

src/tp_defines.h

@@ -77,7 +77,7 @@
 
 #define RBYRDIST_LEN 5001                     // for doubles 10001 - floats   // length of rByRDist to allocate shared memory
 #define RBYRDIST_STEP 0.0004                  // for doubles, 0.0002 - floats // to fit into GPU shared memory (was 0.001);
-#define TILES_PER_BLOCK_GEOM          (32/NUM_CAMS)   // each tile has NUM_CAMS threads
+#define TILES_PER_BLOCK_GEOM (32 / NUM_CAMS)  // each tile has NUM_CAMS threads
 
 #define DEBUG_ANY 1
 
@@ -87,13 +87,13 @@
 //#define DBG_TILE_X     40
 //#define DBG_TILE_Y     80
 #if TEST_LWIR
-	#define DBG_TILE_X    50 // 52 // 32 // 162 // 151 // 161 // 49
-	#define DBG_TILE_Y    19 //  5 // 36 // 88 // 121 // 69  // 111 // 66
-	#define DBG_TILE    (DBG_TILE_Y * 80 + DBG_TILE_X)
+#define DBG_TILE_X 50  // 52 // 32 // 162 // 151 // 161 // 49
+#define DBG_TILE_Y 19  //  5 // 36 // 88 // 121 // 69  // 111 // 66
+#define DBG_TILE (DBG_TILE_Y * 80 + DBG_TILE_X)
 #else
-	#define DBG_TILE_X     114 // 32 // 162 // 151 // 161 // 49
-	#define DBG_TILE_Y     51  // 52  // 88 // 121 // 69  // 111 // 66
-	#define DBG_TILE    (DBG_TILE_Y * 324 + DBG_TILE_X)
+#define DBG_TILE_X 114  // 32 // 162 // 151 // 161 // 49
+#define DBG_TILE_Y 51   // 52  // 88 // 121 // 69  // 111 // 66
+#define DBG_TILE (DBG_TILE_Y * 324 + DBG_TILE_X)
 #endif
 #undef DBG_MARK_DBG_TILE
 //#undef DBG_TILE
@@ -101,8 +101,7 @@
 //#undef HAS_PRINTF
 #define HAS_PRINTF
 
-
-//7
+// 7
 //#define DEBUG1 1
 //#define DEBUG2 1
 //#define DEBUG3 1
@@ -118,7 +117,7 @@
 #define DEBUG9 1
 */
 //#define DEBUG8A 1 // generate_RBGA_host
-//textures
+// textures
 //#define DEBUG10 1
 //#define DEBUG11 1
 //#define DEBUG12 1
@@ -127,7 +126,6 @@
 // geom
 //#define DEBUG20 1
 
-
 #if (DBG_TILE_X >= 0) && (DBG_TILE_Y >= 0)
 //#define DEBUG20 1 // Geometry Correction
 //#define DEBUG21 1 // Geometry Correction
@@ -140,6 +138,4 @@
 
 #endif  //#ifdef 	DEBUG_ANY
 
-
 #endif  //#ifndef JCUDA
-