}img_fol_t;
-void decode_help_display() {
+void decode_help_display(void) {
fprintf(stdout,"HELP for j2k_to_image\n----\n\n");
fprintf(stdout,"- the -h option displays this help information on screen\n\n");
/* -------------------------------------------------------------------------- */
int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol, char *indexfilename) {
/* parse the command line */
- int totlen;
+ int totlen, c;
option_t long_option[]={
{"ImgDir",REQ_ARG, NULL ,'y'},
{"OutFor",REQ_ARG, NULL ,'O'},
"h" ;
totlen=sizeof(long_option);
img_fol->set_out_format = 0;
- while (1) {
- int c = getopt_long(argc, argv,optlist,long_option,totlen);
+ do {
+ c = getopt_long(argc, argv,optlist,long_option,totlen);
if (c == -1)
break;
switch (c) {
fprintf(stderr,"WARNING -> this option is not valid \"-%c %s\"\n",c, optarg);
break;
}
- }
+ }while(c != -1);
/* check for possible errors */
if(img_fol->set_imgdir==1){
int file_length;
int num_images;
int i,imageno;
- dircnt_t *dirptr;
+ dircnt_t *dirptr = NULL;
opj_dinfo_t* dinfo = NULL; /* handle to a decompressor */
opj_cio_t *cio = NULL;
opj_codestream_info_t cstr_info; /* Codestream information structure */
file_length = ftell(fsrc);
fseek(fsrc, 0, SEEK_SET);
src = (unsigned char *) malloc(file_length);
- fread(src, 1, file_length, fsrc);
+ if (fread(src, 1, file_length, fsrc) != (size_t)file_length)
+ {
+ free(src);
+ fclose(fsrc);
+ fprintf(stderr, "\nERROR: fread return a number of element different from the expected.\n");
+ return 1;
+ }
fclose(fsrc);
/* decode the code-stream */
/* Write the index to disk */
if (*indexfilename) {
- char bSuccess;
+ opj_bool bSuccess;
bSuccess = write_index_file(&cstr_info, indexfilename);
if (bSuccess) {
fprintf(stderr, "Failed to output index file\n");
/* Write the index to disk */
if (*indexfilename) {
- char bSuccess;
+ opj_bool bSuccess;
bSuccess = write_index_file(&cstr_info, indexfilename);
if (bSuccess) {
fprintf(stderr, "Failed to output index file\n");
/* Write the index to disk */
if (*indexfilename) {
- char bSuccess;
+ opj_bool bSuccess;
bSuccess = write_index_file(&cstr_info, indexfilename);
if (bSuccess) {
fprintf(stderr, "Failed to output index file\n");