--- ../../dev3/gift/FeatureExtraction/extract_block_features.c 2006-11-16 15:44:35.000000000 +0100 +++ FeatureExtraction/extract_block_features.c 2006-11-16 15:37:56.000000000 +0100 @@ -108,32 +108,32 @@ #endif /* this version just does the work. no variable width/height information is taken into account. 256x256. */ -void init_feature_variables(uint32_t colmap_size, uint32_t ** col_counts, uint32_t *** block_gabor_class, uint32_t *** gabor_histogram) { +void init_feature_variables(uint_fast32_t colmap_size, uint_fast32_t ** col_counts, uint_fast32_t *** block_gabor_class, uint_fast32_t *** gabor_histogram) { - uint32_t i, j, k=0; + uint_fast32_t i, j, k=0; /* colour features */ for (i = 0; i < num_colour_scales; i++) { for (j = 0; j < num_blocks_at_scale(i); j++) { - col_counts[k++] = (uint32_t *)malloc(colmap_size*sizeof(uint32_t)); + col_counts[k++] = (uint_fast32_t *)malloc(colmap_size*sizeof(uint_fast32_t)); } } /* Gabor features */ for (i = 0; i < num_gabor_scales; i++) { - block_gabor_class[i] = (uint32_t **)malloc(num_gabors_per_scale*sizeof(uint32_t *)); - gabor_histogram[i] = (uint32_t **)malloc(num_gabors_per_scale*sizeof(uint32_t *)); + block_gabor_class[i] = (uint_fast32_t **)malloc(num_gabors_per_scale*sizeof(uint_fast32_t *)); + gabor_histogram[i] = (uint_fast32_t **)malloc(num_gabors_per_scale*sizeof(uint_fast32_t *)); for (j = 0; j < num_gabors_per_scale; j++) { - block_gabor_class[i][j] = (uint32_t *)malloc(square(image_size/gabor_block_size)*sizeof(uint32_t)); - gabor_histogram[i][j] = (uint32_t *)calloc(num_gabor_ranges, sizeof(uint32_t)); + block_gabor_class[i][j] = (uint_fast32_t *)malloc(square(image_size/gabor_block_size)*sizeof(uint_fast32_t)); + gabor_histogram[i][j] = (uint_fast32_t *)calloc(num_gabor_ranges, sizeof(uint_fast32_t)); } } } -void extract_gabor_features(PPM *im_hsv, uint32_t *** block_gabor_class, uint32_t *** gabor_histogram) { +void extract_gabor_features(PPM *im_hsv, uint_fast32_t *** block_gabor_class, uint_fast32_t *** gabor_histogram) { - int i, j, x, y, k; - int scale, orientation; - int energy_class; + uint_fast32_t i, j, x, y, k; + uint_fast32_t scale, orientation; + uint_fast32_t energy_class; PPM *value_plane; double *value_image_dbl, *filtered_image; double *conv; @@ -199,7 +199,7 @@ } } -void extract_mode_features(PPM *im, uint32_t *colmap, uint32_t colmap_size, uint32_t ** col_counts, byte * block_mode, uint32_t * col_histogram) { +void extract_mode_features(PPM *im, uint_fast32_t *colmap, uint_fast32_t colmap_size, uint_fast32_t ** col_counts, byte * block_mode, uint_fast32_t * col_histogram) { int i, j, k, last_k, k1, m, n, r, x, y; byte colour; @@ -360,7 +360,7 @@ col_counts[k + 2][n] + col_counts[k + 3][n]; } -enum ppm_error write_mode_features(char *out_fname, uint32_t colmap_size, uint32_t * col_histogram, uint32_t *** block_gabor_class, uint32_t *** gabor_histogram, byte * block_mode) { +enum ppm_error write_mode_features(char *out_fname, uint_fast32_t colmap_size, uint_fast32_t * col_histogram, uint_fast32_t *** block_gabor_class, uint_fast32_t *** gabor_histogram, byte * block_mode) { FILE *out_file = NULL; int feature_index; @@ -535,7 +535,7 @@ return(PPM_OK); } -void fts2blocks(char *fts_fname, byte * block_mode, uint32_t * col_histogram) { +void fts2blocks(char *fts_fname, byte * block_mode, uint_fast32_t * col_histogram) { FILE *fts_file, *outfile; int num_features, feature_index;