[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 b76819f7b805616524843e25a8cc7ad3bb50895d..30d808628e187eaa36688edf7c5445f3f13da137 100644 (file)
--- a/applications/codec/j2k_to_image.c
+++ b/applications/codec/j2k_to_image.c
@@ -140,10 +140,14 @@ void decode_help_display(void) {
        fprintf(stdout,"    are decoded.\n");
        fprintf(stdout,"  -x  \n"); 
        fprintf(stdout,"    Create an index file *.Idx (-x index_name.Idx) \n");
-       fprintf(stdout,"  -d <x0,x1,y0,y1>\n");
+       fprintf(stdout,"  -d <x0,y0,x1,y1>\n");
        fprintf(stdout,"    OPTIONAL\n");
        fprintf(stdout,"    Decoding area\n");
-       fprintf(stdout,"    By default all tiles header are read.\n");
+       fprintf(stdout,"    By default all the image is decoded.\n");
+       fprintf(stdout,"  -t <tile_number>\n");
+       fprintf(stdout,"    OPTIONAL\n");
+       fprintf(stdout,"    Set the tile number of the decoded tile. Follow the JPEG2000 convention from left-up to bottom-up\n");
+       fprintf(stdout,"    By default all tiles are decoded.\n");
        fprintf(stdout,"\n");
 /* UniPG>> */
 #ifdef USE_JPWL
@@ -240,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);
@@ -253,6 +257,7 @@ char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparamet
        return 0;
 }
 
+/* -------------------------------------------------------------------------- */
 #define JP2_RFC3745_MAGIC "\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a"
 #define JP2_MAGIC "\x0d\x0a\x87\x0a"
 /* position 45: "\xff\x52" */
@@ -264,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");
 
@@ -271,8 +277,12 @@ static int infile_format(const char *fname)
                return -1;
 
        memset(buf, 0, 12);
-       fread(buf, 1, 12, reader);
+       l_nb_read = fread(buf, 1, 12, reader);
        fclose(reader);
+       if (l_nb_read != 12)
+               return -1;
+
+
 
        ext_format = get_file_format(fname);
 
@@ -316,7 +326,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i
                {"OutFor",REQ_ARG, NULL ,'O'},
        };
 
-       const char optlist[] = "i:o:r:l:x:d:"
+       const char optlist[] = "i:o:r:l:x:d:t:"
 
 /* UniPG>> */
 #ifdef USE_JPWL
@@ -468,6 +478,16 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i
 
                                free(ROI_values);
                        }
+                       break;
+
+                       /* ----------------------------------------------------- */
+
+                       case 't':               /* Input tile index */
+                       {
+                               sscanf(opj_optarg, "%d", &parameters->tile_index);
+                               parameters->nb_tile_to_decode = 1;
+                       }
+                       break;
 
                                /* ----------------------------------------------------- */                                                             
 
@@ -689,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){
@@ -785,37 +805,55 @@ int main(int argc, char **argv)
                        return EXIT_FAILURE;
                }
 
-               if (! opj_set_decode_area(      dinfo, 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");
-                       opj_stream_destroy(cio);
-                       opj_destroy_codec(dinfo);
-                       opj_image_destroy(image);
-                       fclose(fsrc);
-                       return EXIT_FAILURE;
+               if (!parameters.nb_tile_to_decode) {
+                       // Optional if you want decode the entire image
+                       if (!opj_set_decode_area(dinfo, 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");
+                               opj_stream_destroy(cio);
+                               opj_destroy_codec(dinfo);
+                               opj_image_destroy(image);
+                               fclose(fsrc);
+                               return EXIT_FAILURE;
                        }
 
-               /* Get the decoded image */
-               if ( !( opj_decode_v2(dinfo, cio, image) && opj_end_decompress(dinfo,cio) ) ) {
-                       fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
-                       opj_destroy_codec(dinfo);
-                       opj_stream_destroy(cio);
-                       opj_image_destroy(image);
-                       fclose(fsrc);
-                       return EXIT_FAILURE;
+                       /* Get the decoded image */
+                       if (!(opj_decode_v2(dinfo, cio, image) && opj_end_decompress(dinfo,     cio))) {
+                               fprintf(stderr,"ERROR -> j2k_to_image: failed to decode image!\n");
+                               opj_destroy_codec(dinfo);
+                               opj_stream_destroy(cio);
+                               opj_image_destroy(image);
+                               fclose(fsrc);
+                               return EXIT_FAILURE;
+                       }
                }
+               else {
 
-               /*opj_dump_codec(dinfo, OPJ_J2K_MH_IND, stdout );
-
-               cstr_index = opj_get_cstr_index(dinfo);*/
+                       // It is just here to illustrate how to use the resolution after set parameters
+                       /*if (!opj_set_decoded_resolution_factor(dinfo, 5)) {
+                               fprintf(stderr, "ERROR -> j2k_to_image: failed to set the resolution factor tile!\n");
+                               opj_destroy_codec(dinfo);
+                               opj_stream_destroy(cio);
+                               opj_image_destroy(image);
+                               fclose(fsrc);
+                               return EXIT_FAILURE;
+                       }*/
 
-               fprintf(stderr, "image is decoded!\n");
+                       if (!opj_get_decoded_tile(dinfo, cio, image, parameters.tile_index)) {
+                               fprintf(stderr, "ERROR -> j2k_to_image: failed to decode tile!\n");
+                               opj_destroy_codec(dinfo);
+                               opj_stream_destroy(cio);
+                               opj_image_destroy(image);
+                               fclose(fsrc);
+                               return EXIT_FAILURE;
+                       }
+                       fprintf(stdout, "tile %d is decoded!\n\n", parameters.tile_index);
+               }
 
                /* Close the byte stream */
                opj_stream_destroy(cio);
                fclose(fsrc);
 
-
                if(image->color_space == CLRSPC_SYCC){
                        color_sycc_to_rgb(image); /* FIXME */
                }
@@ -916,7 +954,7 @@ int main(int argc, char **argv)
        }
        return EXIT_SUCCESS;
 }
-//end main
+/*end main*/