[trunk] modify image_to_j2k and the lib to support functionalities given by the v2...

[openjpeg.git] / applications / codec / j2k_to_image.c

diff --git a/applications/codec/j2k_to_image.c b/applications/codec/j2k_to_image.c
index da39b25ffe638be260eb11c2108538d114c221e3..30d808628e187eaa36688edf7c5445f3f13da137 100644 (file)
--- a/applications/codec/j2k_to_image.c
+++ b/applications/codec/j2k_to_image.c
@@ -244,7 +244,7 @@ char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparamet
        sprintf(infilename,"%s/%s",img_fol->imgdirpath,image_filename);
        strncpy(parameters->infile, infilename, sizeof(infilename));
 
-       //Set output file
+       /*Set output file*/
        strcpy(temp_ofname,strtok(image_filename,"."));
        while((temp_p = strtok(NULL,".")) != NULL){
                strcat(temp_ofname,temp1);
@@ -269,6 +269,7 @@ static int infile_format(const char *fname)
        const char *s, *magic_s;
        int ext_format, magic_format;
        unsigned char buf[12];
+       unsigned int l_nb_read;
 
        reader = fopen(fname, "rb");
 
@@ -276,7 +277,7 @@ static int infile_format(const char *fname)
                return -1;
 
        memset(buf, 0, 12);
-       unsigned int l_nb_read = fread(buf, 1, 12, reader);
+       l_nb_read = fread(buf, 1, 12, reader);
        fclose(reader);
        if (l_nb_read != 12)
                return -1;
@@ -708,7 +709,7 @@ int main(int argc, char **argv)
 
                dirptr=(dircnt_t*)malloc(sizeof(dircnt_t));
                if(dirptr){
-                       dirptr->filename_buf = (char*)malloc(num_images*OPJ_PATH_LEN*sizeof(char));     /* Stores at max 10 image file names */
+                       dirptr->filename_buf = (char*)malloc(num_images*OPJ_PATH_LEN*sizeof(char));     /* Stores at max 10 image file names*/
                        dirptr->filename = (char**) malloc(num_images*sizeof(char*));
 
                        if(!dirptr->filename_buf){
@@ -953,7 +954,7 @@ int main(int argc, char **argv)
        }
        return EXIT_SUCCESS;
 }
-//end main
+/*end main*/