diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-15 15:47:56 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-15 15:47:56 +0000 |
| commit | 98682e1073211000495aa378e7da5bfb69b225c9 (patch) | |
| tree | f0879b27e100b989183e787898e52ecd23396751 /src/bin | |
| parent | d6bcb8b7e074c4543ee0243b355f8b3ff0566c9d (diff) | |
[trunk] Remove some warnings about missing prototypes (gcc)
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/jp2/convert.c | 2 | ||||
| -rw-r--r-- | src/bin/jp2/opj_compress.c | 36 | ||||
| -rw-r--r-- | src/bin/jp2/opj_decompress.c | 22 | ||||
| -rw-r--r-- | src/bin/jp2/opj_dump.c | 16 | ||||
| -rw-r--r-- | src/bin/jpip/opj_jpip_compress.c | 32 | ||||
| -rw-r--r-- | src/bin/mj2/opj_mj2_compress.c | 10 | ||||
| -rw-r--r-- | src/bin/mj2/opj_mj2_decompress.c | 6 | ||||
| -rw-r--r-- | src/bin/mj2/opj_mj2_wrap.c | 6 |
8 files changed, 65 insertions, 65 deletions
diff --git a/src/bin/jp2/convert.c b/src/bin/jp2/convert.c index 59af469b..6cfa663c 100644 --- a/src/bin/jp2/convert.c +++ b/src/bin/jp2/convert.c @@ -2921,7 +2921,7 @@ opj_image_t* rawtoimage(const char *filename, opj_cparameters_t *parameters, raw return rawtoimage_common(filename, parameters, raw_cp, OPJ_TRUE); } -int imagetoraw_common(opj_image_t * image, const char *outfile, opj_bool big_endian) +static int imagetoraw_common(opj_image_t * image, const char *outfile, opj_bool big_endian) { FILE *rawFile = NULL; size_t res; diff --git a/src/bin/jp2/opj_compress.c b/src/bin/jp2/opj_compress.c index 4c1cbd83..1824c03e 100644 --- a/src/bin/jp2/opj_compress.c +++ b/src/bin/jp2/opj_compress.c @@ -84,8 +84,8 @@ typedef struct img_folder{ float *rates; }img_fol_t; -void encode_help_display(void) { - fprintf(stdout,"HELP for image_to_j2k\n----\n\n"); +static void encode_help_display(void) { + fprintf(stdout,"HELP for opj_compress\n----\n\n"); fprintf(stdout,"- the -h option displays this help information on screen\n\n"); /* UniPG>> */ @@ -325,7 +325,7 @@ void encode_help_display(void) { fprintf(stdout,"TotalDisto\n\n"); } -OPJ_PROG_ORDER give_progression(char progression[4]) { +static OPJ_PROG_ORDER give_progression(const char progression[4]) { if(strncmp(progression, "LRCP", 4) == 0) { return LRCP; } @@ -345,7 +345,7 @@ OPJ_PROG_ORDER give_progression(char progression[4]) { return PROG_UNKNOWN; } -unsigned int get_num_images(char *imgdirpath){ +static unsigned int get_num_images(char *imgdirpath){ DIR *dir; struct dirent* content; unsigned int num_images = 0; @@ -367,7 +367,7 @@ unsigned int get_num_images(char *imgdirpath){ return num_images; } -int load_images(dircnt_t *dirptr, char *imgdirpath){ +static int load_images(dircnt_t *dirptr, char *imgdirpath){ DIR *dir; struct dirent* content; int i = 0; @@ -392,7 +392,7 @@ int load_images(dircnt_t *dirptr, char *imgdirpath){ return 0; } -int get_file_format(char *filename) { +static int get_file_format(char *filename) { unsigned int i; static const char *extension[] = { "pgx", "pnm", "pgm", "ppm", "pbm", "pam", "bmp", "tif", "raw", "rawl", "tga", "png", "j2k", "jp2", "j2c", "jpc" @@ -412,14 +412,14 @@ int get_file_format(char *filename) { return -1; } -char * get_file_name(char *name){ +static char * get_file_name(char *name){ char *fname; fname= (char*)malloc(OPJ_PATH_LEN*sizeof(char)); fname= strtok(name,"."); return fname; } -char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_cparameters_t *parameters){ +static char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_cparameters_t *parameters){ char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],outfilename[OPJ_PATH_LEN],temp_ofname[OPJ_PATH_LEN]; char *temp_p, temp1[OPJ_PATH_LEN]=""; @@ -462,7 +462,7 @@ static int initialise_4K_poc(opj_poc_t *POC, int numres){ return 2; } -void cinema_parameters(opj_cparameters_t *parameters){ +static void cinema_parameters(opj_cparameters_t *parameters){ parameters->tile_size_on = OPJ_FALSE; parameters->cp_tdx=1; parameters->cp_tdy=1; @@ -495,7 +495,7 @@ void cinema_parameters(opj_cparameters_t *parameters){ } -void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_fol_t *img_fol){ +static void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_fol_t *img_fol){ int i; float temp_rate; @@ -580,7 +580,7 @@ void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_ /* ------------------------------------------------------------------------------------ */ -int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, +static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, img_fol_t *img_fol, raw_cparameters_t *raw_cp, char *indexfilename) { int i, j, totlen, c; opj_option_t long_option[]={ @@ -1535,21 +1535,21 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, /** sample error callback expecting a FILE* client object */ -void error_file_callback(const char *msg, void *client_data) { +static void error_file_callback(const char *msg, void *client_data) { FILE *stream = (FILE*)client_data; fprintf(stream, "[ERROR] %s", msg); } /** sample warning callback expecting a FILE* client object */ -void warning_file_callback(const char *msg, void *client_data) { +static void warning_file_callback(const char *msg, void *client_data) { FILE *stream = (FILE*)client_data; fprintf(stream, "[WARNING] %s", msg); } /** sample debug callback expecting a FILE* client object */ -void info_file_callback(const char *msg, void *client_data) { +static void info_file_callback(const char *msg, void *client_data) { FILE *stream = (FILE*)client_data; fprintf(stream, "[INFO] %s", msg); } @@ -1557,28 +1557,28 @@ void info_file_callback(const char *msg, void *client_data) { /** sample error debug callback expecting no client object */ -void error_callback(const char *msg, void *client_data) { +static void error_callback(const char *msg, void *client_data) { (void)client_data; fprintf(stdout, "[ERROR] %s", msg); } /** sample warning debug callback expecting no client object */ -void warning_callback(const char *msg, void *client_data) { +static void warning_callback(const char *msg, void *client_data) { (void)client_data; fprintf(stdout, "[WARNING] %s", msg); } /** sample debug callback expecting no client object */ -void info_callback(const char *msg, void *client_data) { +static void info_callback(const char *msg, void *client_data) { (void)client_data; fprintf(stdout, "[INFO] %s", msg); } /* -------------------------------------------------------------------------- */ /** - * IMAGE_TO_J2K MAIN + * OPJ_COMPRESS MAIN */ /* -------------------------------------------------------------------------- */ int main(int argc, char **argv) { diff --git a/src/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c index 7edb3c9b..ac5e79c3 100644 --- a/src/bin/jp2/opj_decompress.c +++ b/src/bin/jp2/opj_decompress.c @@ -97,8 +97,8 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i int parse_DA_values( char* inArg, unsigned int *DA_x0, unsigned int *DA_y0, unsigned int *DA_x1, unsigned int *DA_y1); /* -------------------------------------------------------------------------- */ -void decode_help_display(void) { - fprintf(stdout,"HELP for j2k_to_image\n----\n\n"); +static void decode_help_display(void) { + fprintf(stdout,"HELP for opj_decompress\n----\n\n"); fprintf(stdout,"- the -h option displays this help information on screen\n\n"); /* UniPG>> */ @@ -648,28 +648,28 @@ int parse_DA_values( char* inArg, unsigned int *DA_x0, unsigned int *DA_y0, unsi /** sample error callback expecting a FILE* client object */ -void error_callback(const char *msg, void *client_data) { +static void error_callback(const char *msg, void *client_data) { (void)client_data; fprintf(stdout, "[ERROR] %s", msg); } /** sample warning callback expecting a FILE* client object */ -void warning_callback(const char *msg, void *client_data) { +static void warning_callback(const char *msg, void *client_data) { (void)client_data; fprintf(stdout, "[WARNING] %s", msg); } /** sample debug callback expecting no client object */ -void info_callback(const char *msg, void *client_data) { +static void info_callback(const char *msg, void *client_data) { (void)client_data; fprintf(stdout, "[INFO] %s", msg); } /* -------------------------------------------------------------------------- */ /** - * J2K_TO_IMAGE MAIN + * OPJ_DECOMPRESS MAIN */ /* -------------------------------------------------------------------------- */ int main(int argc, char **argv) @@ -802,7 +802,7 @@ int main(int argc, char **argv) /* Read the main header of the codestream and if necessary the JP2 boxes*/ if(! opj_read_header(l_stream, l_codec, &image)){ - fprintf(stderr, "ERROR -> j2k_to_image: failed to read the header\n"); + fprintf(stderr, "ERROR -> opj_decompress: failed to read the header\n"); opj_stream_destroy(l_stream); fclose(fsrc); opj_destroy_codec(l_codec); @@ -814,7 +814,7 @@ int main(int argc, char **argv) /* Optional if you want decode the entire image */ if (!opj_set_decode_area(l_codec, image, parameters.DA_x0, parameters.DA_y0, parameters.DA_x1, parameters.DA_y1)){ - fprintf(stderr, "ERROR -> j2k_to_image: failed to set the decoded area\n"); + fprintf(stderr, "ERROR -> opj_decompress: failed to set the decoded area\n"); opj_stream_destroy(l_stream); opj_destroy_codec(l_codec); opj_image_destroy(image); @@ -824,7 +824,7 @@ int main(int argc, char **argv) /* Get the decoded image */ if (!(opj_decode(l_codec, l_stream, image) && opj_end_decompress(l_codec, l_stream))) { - fprintf(stderr,"ERROR -> j2k_to_image: failed to decode image!\n"); + fprintf(stderr,"ERROR -> opj_decompress: failed to decode image!\n"); opj_destroy_codec(l_codec); opj_stream_destroy(l_stream); opj_image_destroy(image); @@ -836,7 +836,7 @@ int main(int argc, char **argv) /* It is just here to illustrate how to use the resolution after set parameters */ /*if (!opj_set_decoded_resolution_factor(l_codec, 5)) { - fprintf(stderr, "ERROR -> j2k_to_image: failed to set the resolution factor tile!\n"); + fprintf(stderr, "ERROR -> opj_decompress: failed to set the resolution factor tile!\n"); opj_destroy_codec(l_codec); opj_stream_destroy(l_stream); opj_image_destroy(image); @@ -845,7 +845,7 @@ int main(int argc, char **argv) }*/ if (!opj_get_decoded_tile(l_codec, l_stream, image, parameters.tile_index)) { - fprintf(stderr, "ERROR -> j2k_to_image: failed to decode tile!\n"); + fprintf(stderr, "ERROR -> opj_decompress: failed to decode tile!\n"); opj_destroy_codec(l_codec); opj_stream_destroy(l_stream); opj_image_destroy(image); diff --git a/src/bin/jp2/opj_dump.c b/src/bin/jp2/opj_dump.c index 6c63c2ca..ca801d5a 100644 --- a/src/bin/jp2/opj_dump.c +++ b/src/bin/jp2/opj_dump.c @@ -84,8 +84,8 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i int parse_DA_values( char* inArg, unsigned int *DA_x0, unsigned int *DA_y0, unsigned int *DA_x1, unsigned int *DA_y1); /* -------------------------------------------------------------------------- */ -void decode_help_display(void) { - fprintf(stdout,"HELP for j2k_dump\n----\n\n"); +static void decode_help_display(void) { + fprintf(stdout,"HELP for opj_dump\n----\n\n"); fprintf(stdout,"- the -h option displays this help information on screen\n\n"); /* UniPG>> */ @@ -374,28 +374,28 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i /** sample error debug callback expecting no client object */ -void error_callback(const char *msg, void *client_data) { +static void error_callback(const char *msg, void *client_data) { (void)client_data; fprintf(stdout, "[ERROR] %s", msg); } /** sample warning debug callback expecting no client object */ -void warning_callback(const char *msg, void *client_data) { +static void warning_callback(const char *msg, void *client_data) { (void)client_data; fprintf(stdout, "[WARNING] %s", msg); } /** sample debug callback expecting no client object */ -void info_callback(const char *msg, void *client_data) { +static void info_callback(const char *msg, void *client_data) { (void)client_data; fprintf(stdout, "[INFO] %s", msg); } /* -------------------------------------------------------------------------- */ /** - * J2K_DUMP MAIN + * OPJ_DUMP MAIN */ /* -------------------------------------------------------------------------- */ int main(int argc, char *argv[]) @@ -533,7 +533,7 @@ int main(int argc, char *argv[]) /* Setup the decoder decoding parameters using user parameters */ if ( !opj_setup_decoder(l_codec, ¶meters) ){ - fprintf(stderr, "ERROR -> j2k_dump: failed to setup the decoder\n"); + fprintf(stderr, "ERROR -> opj_dump: failed to setup the decoder\n"); opj_stream_destroy(l_stream); fclose(fsrc); opj_destroy_codec(l_codec); @@ -543,7 +543,7 @@ int main(int argc, char *argv[]) /* Read the main header of the codestream and if necessary the JP2 boxes*/ if(! opj_read_header(l_stream, l_codec, &image)){ - fprintf(stderr, "ERROR -> j2k_dump: failed to read the header\n"); + fprintf(stderr, "ERROR -> opj_dump: failed to read the header\n"); opj_stream_destroy(l_stream); fclose(fsrc); opj_destroy_codec(l_codec); diff --git a/src/bin/jpip/opj_jpip_compress.c b/src/bin/jpip/opj_jpip_compress.c index 6c5fd05f..2ff3809e 100644 --- a/src/bin/jpip/opj_jpip_compress.c +++ b/src/bin/jpip/opj_jpip_compress.c @@ -86,7 +86,7 @@ typedef struct img_folder{ float *rates; }img_fol_t; -void encode_help_display(void) { +static void encode_help_display(void) { fprintf(stdout,"HELP for image_to_j2k\n----\n\n"); fprintf(stdout,"- the -h option displays this help information on screen\n\n"); @@ -327,7 +327,7 @@ void encode_help_display(void) { fprintf(stdout,"TotalDisto\n\n"); } -OPJ_PROG_ORDER give_progression(char progression[4]) { +static OPJ_PROG_ORDER give_progression(const char progression[4]) { if(strncmp(progression, "LRCP", 4) == 0) { return LRCP; } @@ -347,7 +347,7 @@ OPJ_PROG_ORDER give_progression(char progression[4]) { return PROG_UNKNOWN; } -unsigned int get_num_images(char *imgdirpath){ +static unsigned int get_num_images(char *imgdirpath){ DIR *dir; struct dirent* content; unsigned int num_images = 0; @@ -369,7 +369,7 @@ unsigned int get_num_images(char *imgdirpath){ return num_images; } -int load_images(dircnt_t *dirptr, char *imgdirpath){ +static int load_images(dircnt_t *dirptr, char *imgdirpath){ DIR *dir; struct dirent* content; int i = 0; @@ -394,7 +394,7 @@ int load_images(dircnt_t *dirptr, char *imgdirpath){ return 0; } -int get_file_format(char *filename) { +static int get_file_format(char *filename) { unsigned int i; static const char *extension[] = { "pgx", "pnm", "pgm", "ppm", "pbm", "pam", "bmp", "tif", "raw", "rawl", "tga", "png", "j2k", "jp2", "j2c", "jpc" @@ -414,14 +414,14 @@ int get_file_format(char *filename) { return -1; } -char * get_file_name(char *name){ +static char * get_file_name(char *name){ char *fname; fname= (char*)opj_malloc(OPJ_PATH_LEN*sizeof(char)); fname= strtok(name,"."); return fname; } -char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_cparameters_t *parameters){ +static char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_cparameters_t *parameters){ char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],outfilename[OPJ_PATH_LEN],temp_ofname[OPJ_PATH_LEN]; char *temp_p, temp1[OPJ_PATH_LEN]=""; @@ -464,7 +464,7 @@ static int initialise_4K_poc(opj_poc_t *POC, int numres){ return 2; } -void cinema_parameters(opj_cparameters_t *parameters){ +static void cinema_parameters(opj_cparameters_t *parameters){ parameters->tile_size_on = OPJ_FALSE; parameters->cp_tdx=1; parameters->cp_tdy=1; @@ -497,7 +497,7 @@ void cinema_parameters(opj_cparameters_t *parameters){ } -void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_fol_t *img_fol){ +static void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_fol_t *img_fol){ int i; float temp_rate; @@ -582,7 +582,7 @@ void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_ /* ------------------------------------------------------------------------------------ */ -int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, +static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, img_fol_t *img_fol, raw_cparameters_t *raw_cp, char *indexfilename) { int i, j, totlen, c; opj_option_t long_option[]={ @@ -1537,21 +1537,21 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, /** sample error callback expecting a FILE* client object */ -void error_file_callback(const char *msg, void *client_data) { +static void error_file_callback(const char *msg, void *client_data) { FILE *stream = (FILE*)client_data; fprintf(stream, "[ERROR] %s", msg); } /** sample warning callback expecting a FILE* client object */ -void warning_file_callback(const char *msg, void *client_data) { +static void warning_file_callback(const char *msg, void *client_data) { FILE *stream = (FILE*)client_data; fprintf(stream, "[WARNING] %s", msg); } /** sample debug callback expecting a FILE* client object */ -void info_file_callback(const char *msg, void *client_data) { +static void info_file_callback(const char *msg, void *client_data) { FILE *stream = (FILE*)client_data; fprintf(stream, "[INFO] %s", msg); } @@ -1559,21 +1559,21 @@ void info_file_callback(const char *msg, void *client_data) { /** sample error debug callback expecting no client object */ -void error_callback(const char *msg, void *client_data) { +static void error_callback(const char *msg, void *client_data) { (void)client_data; fprintf(stdout, "[ERROR] %s", msg); } /** sample warning debug callback expecting no client object */ -void warning_callback(const char *msg, void *client_data) { +static void warning_callback(const char *msg, void *client_data) { (void)client_data; fprintf(stdout, "[WARNING] %s", msg); } /** sample debug callback expecting no client object */ -void info_callback(const char *msg, void *client_data) { +static void info_callback(const char *msg, void *client_data) { (void)client_data; fprintf(stdout, "[INFO] %s", msg); } diff --git a/src/bin/mj2/opj_mj2_compress.c b/src/bin/mj2/opj_mj2_compress.c index fbf25fe3..73ddcbe8 100644 --- a/src/bin/mj2/opj_mj2_compress.c +++ b/src/bin/mj2/opj_mj2_compress.c @@ -50,21 +50,21 @@ Size of memory first allocated for MOOV box /** sample error callback expecting a FILE* client object */ -void error_callback(const char *msg, void *client_data) { +static void error_callback(const char *msg, void *client_data) { FILE *stream = (FILE*)client_data; fprintf(stream, "[ERROR] %s", msg); } /** sample warning callback expecting a FILE* client object */ -void warning_callback(const char *msg, void *client_data) { +static void warning_callback(const char *msg, void *client_data) { FILE *stream = (FILE*)client_data; fprintf(stream, "[WARNING] %s", msg); } /** sample debug callback expecting a FILE* client object */ -void info_callback(const char *msg, void *client_data) { +static void info_callback(const char *msg, void *client_data) { FILE *stream = (FILE*)client_data; fprintf(stream, "[INFO] %s", msg); } @@ -72,7 +72,7 @@ void info_callback(const char *msg, void *client_data) { /* -------------------------------------------------------------------------- */ -void help_display() +static void help_display() { fprintf(stdout,"HELP for frames_to_mj2\n----\n\n"); fprintf(stdout,"- the -h option displays this help information on screen\n\n"); @@ -197,7 +197,7 @@ void help_display() fprintf(stdout,"TotalDisto\n\n"); } -OPJ_PROG_ORDER give_progression(char progression[5]) +static OPJ_PROG_ORDER give_progression(const char progression[5]) { if (progression[0] == 'L' && progression[1] == 'R' && progression[2] == 'C' && progression[3] == 'P') { diff --git a/src/bin/mj2/opj_mj2_decompress.c b/src/bin/mj2/opj_mj2_decompress.c index d4258ef1..ee312f61 100644 --- a/src/bin/mj2/opj_mj2_decompress.c +++ b/src/bin/mj2/opj_mj2_decompress.c @@ -50,21 +50,21 @@ /** sample error callback expecting a FILE* client object */ -void error_callback(const char *msg, void *client_data) { +static void error_callback(const char *msg, void *client_data) { FILE *stream = (FILE*)client_data; fprintf(stream, "[ERROR] %s", msg); } /** sample warning callback expecting a FILE* client object */ -void warning_callback(const char *msg, void *client_data) { +static void warning_callback(const char *msg, void *client_data) { FILE *stream = (FILE*)client_data; fprintf(stream, "[WARNING] %s", msg); } /** sample debug callback expecting a FILE* client object */ -void info_callback(const char *msg, void *client_data) { +static void info_callback(const char *msg, void *client_data) { FILE *stream = (FILE*)client_data; fprintf(stream, "[INFO] %s", msg); } diff --git a/src/bin/mj2/opj_mj2_wrap.c b/src/bin/mj2/opj_mj2_wrap.c index efc08d3d..f0404f89 100644 --- a/src/bin/mj2/opj_mj2_wrap.c +++ b/src/bin/mj2/opj_mj2_wrap.c @@ -183,21 +183,21 @@ fin: /** sample error callback expecting a FILE* client object */ -void error_callback(const char *msg, void *client_data) { +static void error_callback(const char *msg, void *client_data) { FILE *stream = (FILE*)client_data; fprintf(stream, "[ERROR] %s", msg); } /** sample warning callback expecting a FILE* client object */ -void warning_callback(const char *msg, void *client_data) { +static void warning_callback(const char *msg, void *client_data) { FILE *stream = (FILE*)client_data; fprintf(stream, "[WARNING] %s", msg); } /** sample debug callback expecting a FILE* client object */ -void info_callback(const char *msg, void *client_data) { +static void info_callback(const char *msg, void *client_data) { FILE *stream = (FILE*)client_data; fprintf(stream, "[INFO] %s", msg); } |
