diff --git a/storm_analysis/L1H/homotopy_general.c b/storm_analysis/L1H/homotopy_general.c index df47eed0..01d2555b 100644 --- a/storm_analysis/L1H/homotopy_general.c +++ b/storm_analysis/L1H/homotopy_general.c @@ -25,6 +25,7 @@ */ /* Include */ +#include #include #include #include @@ -300,7 +301,7 @@ void computeG3(void) * * vis - user supplied storage for the visited vector. */ -void getVisited(int *vis) +void getVisited(int32_t *vis) { int i; diff --git a/storm_analysis/L1H/homotopy_imagea_common.c b/storm_analysis/L1H/homotopy_imagea_common.c index 0cdfee16..e63f921f 100644 --- a/storm_analysis/L1H/homotopy_imagea_common.c +++ b/storm_analysis/L1H/homotopy_imagea_common.c @@ -5,6 +5,7 @@ */ /* Include */ +#include #include #include #include @@ -61,7 +62,7 @@ void finishUp(void) * * returns - number of peaks that were found. */ -int getPeaks(double *hres, double *peak_x, double *peak_y, double *peak_i, int *peak_c, int max_peaks) +int getPeaks(double *hres, double *peak_x, double *peak_y, double *peak_i, int32_t *peak_c, int max_peaks) { int i,j,n,o_size,t1; double xt,yt,t,inv_scale; diff --git a/storm_analysis/L1H/homotopy_imagea_common.h b/storm_analysis/L1H/homotopy_imagea_common.h index e7f17951..6a933dde 100644 --- a/storm_analysis/L1H/homotopy_imagea_common.h +++ b/storm_analysis/L1H/homotopy_imagea_common.h @@ -9,11 +9,13 @@ #ifndef HOMOTOPY_IMAGEA_COMMON_H #define HOMOTOPY_IMAGEA_COMMON_H +#include + /* Function Declarations */ void analyzeImage(double *, double *); void closeFile(void); void finishUp(void); -int getPeaks(double *, double *, double *, double *, int *, int); +int getPeaks(double *, double *, double *, double *, int32_t *, int); int openFile(char *); int saveHighRes(double *, int); void setImageParameters(double *, int, int, int, double, int, int, int, int, int); diff --git a/storm_analysis/dbscan/dbscan.c b/storm_analysis/dbscan/dbscan.c index 6f494b60..21fe3011 100644 --- a/storm_analysis/dbscan/dbscan.c +++ b/storm_analysis/dbscan/dbscan.c @@ -66,7 +66,7 @@ typedef struct // dbscan specific void appendN(intArr *, intArr *); intArr* createIntArr(int); -void dbscan(float *, float *, float *, int *, int *, int, float, int, int); +void dbscan(float *, float *, float *, int32_t *, int32_t *, int, float, int, int); int expandCluster(intArr *, int, float, int, int); void mergeN(intArr *, intArr *); intArr* regionQuery(int *, int, int, int, float); @@ -74,8 +74,8 @@ intArr* regionQueryKD(int *, int, int, int, float); // additional void clusterSize(int *, int *, int, int); -void locClSize(int *, int *, int, int); -void recategorize(int *, int *, int, int, int); +void locClSize(int32_t *, int32_t *, int, int); +void recategorize(int32_t *, int32_t *, int, int, int); /* Global Variables */ @@ -166,7 +166,7 @@ intArr* createIntArr(int n) * min_points - minimum number of points in a cluster. * verbose - print cluster information as we go. */ -void dbscan(float *db_x, float *db_y, float *db_z, int *db_cat, int *db_l, int db_nsize, float eps, int min_points, int verbose) +void dbscan(float *db_x, float *db_y, float *db_z, int32_t *db_cat, int32_t *db_l, int db_nsize, float eps, int min_points, int verbose) { int i,cluster_size,cn,counts,cur_cat; intArr *N; @@ -535,7 +535,7 @@ void clusterSize(int *counts, int *cl_id, int cl_size, int max_id) * cl_size - size of cl_counts (and cl_id). * max_id - maximum cluster id number. */ -void locClSize(int *cl_counts, int *cl_id, int cl_size, int max_id) +void locClSize(int32_t *cl_counts, int32_t *cl_id, int cl_size, int max_id) { int i; int *counts; @@ -562,7 +562,7 @@ void locClSize(int *cl_counts, int *cl_id, int cl_size, int max_id) * max_id - maximum cluster id number. * min_size - minimum acceptable cluster size. */ -void recategorize(int *cl_id, int *category, int cl_size, int max_id, int min_size) +void recategorize(int32_t *cl_id, int32_t *category, int cl_size, int max_id, int min_size) { int i; int *counts; diff --git a/storm_analysis/frc/frc.c b/storm_analysis/frc/frc.c index 77e62070..94630732 100644 --- a/storm_analysis/frc/frc.c +++ b/storm_analysis/frc/frc.c @@ -18,12 +18,13 @@ */ /* Include */ +#include #include #include #include /* Function Declarations */ -void calc_frc(double *, double *, double *, int *, int, int); +void calc_frc(double *, double *, double *, int32_t *, int, int); /* * calc_frc() @@ -42,7 +43,7 @@ void calc_frc(double *, double *, double *, int *, int, int); * y_size - Size of the FFT array in y (arr.shape[0]). * x_size - Size of the FFT array in x (arr.shape[1]). */ -void calc_frc(double *fft1, double *fft2, double *frc, int *frc_counts, int y_size, int x_size) +void calc_frc(double *fft1, double *fft2, double *frc, int32_t *frc_counts, int y_size, int x_size) { int cx,cy,dx,dy,i,j,q; int real,ima; diff --git a/storm_analysis/sa_library/cs_decon_utilities.c b/storm_analysis/sa_library/cs_decon_utilities.c index 63040f7e..4530fc94 100644 --- a/storm_analysis/sa_library/cs_decon_utilities.c +++ b/storm_analysis/sa_library/cs_decon_utilities.c @@ -9,14 +9,15 @@ */ /* Include */ +#include #include #include /* Function Declarations */ int isMaxima(double *, int, int, int, int, int, int); -int label(double *, int *, double, int, int, int, int); +int label(double *, int32_t *, double, int, int, int, int); void labelImage(double *, int *, double, int, int, int, int, int, int, int); -void moments(double *, double *, int *, int, int, int, int); +void moments(double *, double *, int32_t *, int, int, int, int); /* Functions */ @@ -83,7 +84,7 @@ int isMaxima(double *image, int ci, int cj, int ck, int x_size, int y_size, int * * Returns the number of unique labels. */ -int label(double *image, int *labels, double threshold, int margin, int x_size, int y_size, int z_size) +int label(double *image, int32_t *labels, double threshold, int margin, int x_size, int y_size, int z_size) { int i,j,k,t; int cur_label; @@ -170,7 +171,7 @@ void labelImage(double *image, int *labels, double threshold, int cur_label, int * y_size - Image size in y. * z_size - Image size in z. */ -void moments(double *image, double *peaks, int *labels, int counts, int x_size, int y_size, int z_size) +void moments(double *image, double *peaks, int32_t *labels, int counts, int x_size, int y_size, int z_size) { int i,j,k,l,t; diff --git a/storm_analysis/sa_library/grid.c b/storm_analysis/sa_library/grid.c index 308c301e..a16a9f01 100644 --- a/storm_analysis/sa_library/grid.c +++ b/storm_analysis/sa_library/grid.c @@ -18,12 +18,13 @@ */ /* Include */ +#include #include #include -void grid2D(int *, int *, int *, int, int, int); -void grid3D(int *, int *, int *, int *, int, int, int, int); -void grid3DZInclusive(int *, int *, int *, int *, int, int, int, int); +void grid2D(int32_t *, int32_t *, int32_t *, int, int, int); +void grid3D(int32_t *, int32_t *, int32_t *, int32_t *, int, int, int, int); +void grid3DZInclusive(int32_t *, int32_t *, int32_t *, int32_t *, int, int, int, int); /* * grid2D() @@ -37,7 +38,7 @@ void grid3DZInclusive(int *, int *, int *, int *, int, int, int, int); * y_size - grid size in y. * n_x - number of x (and y) locations. */ -void grid2D(int *grid, int *i_x, int *i_y, int x_size, int y_size, int n_x) +void grid2D(int32_t *grid, int32_t *i_x, int32_t *i_y, int x_size, int y_size, int n_x) { int i,x,y; @@ -64,7 +65,7 @@ void grid2D(int *grid, int *i_x, int *i_y, int x_size, int y_size, int n_x) * z_size - grid size in z. * n_x - number of x (and y,z) locations. */ -void grid3D(int *grid, int *i_x, int *i_y, int *i_z, int x_size, int y_size, int z_size, int n_x) +void grid3D(int32_t *grid, int32_t *i_x, int32_t *i_y, int32_t *i_z, int x_size, int y_size, int z_size, int n_x) { int i,x,y,z; @@ -93,7 +94,7 @@ void grid3D(int *grid, int *i_x, int *i_y, int *i_z, int x_size, int y_size, int * z_size - grid size in z. * n_x - number of x (and y,z) locations. */ -void grid3DInclusize(int *grid, int *i_x, int *i_y, int *i_z, int x_size, int y_size, int z_size, int n_x) +void grid3DZInclusive(int32_t *grid, int32_t *i_x, int32_t *i_y, int32_t *i_z, int x_size, int y_size, int z_size, int n_x) { int i,x,y,z;