Change CMakeLists.txt to build examples by default (image_to_j2k and j2k_to_image).

[openjpeg.git] / codec / j2k_dump.c

diff --git a/codec/j2k_dump.c b/codec/j2k_dump.c
index a63c9946f1e9873219136f2a8a59958280be5803..5042f47a5f20a8c25081c2ae1a1f7d5f6e3615b2 100644 (file)
--- a/codec/j2k_dump.c
+++ b/codec/j2k_dump.c
@@ -302,8 +302,6 @@ void info_callback(const char *msg, void *client_data) {
        fprintf(stdout, "[INFO] %s", msg);
 }
 
-//void j2k_dump_cp(FILE *fd, opj_image_t * img, opj_cp_t * cp);
-
 /* -------------------------------------------------------------------------- */
 
 int main(int argc, char *argv[])
@@ -351,25 +349,26 @@ int main(int argc, char *argv[])
                        dirptr->filename = (char**) malloc(num_images*sizeof(char*));
 
                        if(!dirptr->filename_buf){
-                               return 0;
+                               return 1;
                        }
                        for(i=0;i<num_images;i++){
                                dirptr->filename[i] = dirptr->filename_buf + i*OPJ_PATH_LEN;
                        }
                }
                if(load_images(dirptr,img_fol.imgdirpath)==1){
-                       return 0;
+                       return 1;
                }
                if (num_images==0){
                        fprintf(stdout,"Folder is empty\n");
-                       return 0;
+                       return 1;
                }
        }else{
                num_images=1;
        }
 
        /*Encoding image one by one*/
-       for(imageno = 0; imageno < num_images ; imageno++)      {
+       for(imageno = 0; imageno < num_images ; imageno++)
+  {
                image = NULL;
                fprintf(stderr,"\n");
 
@@ -425,7 +424,10 @@ int main(int argc, char *argv[])
                                opj_cio_close(cio);
                                return 1;
                        }
-                       /* dump */
+                       /* dump image */
+      j2k_dump_image(stdout, image);
+
+                       /* dump cp */
       j2k_dump_cp(stdout, image, ((opj_j2k_t*)dinfo->j2k_handle)->cp);
 
                        /* close the byte stream */
@@ -469,7 +471,10 @@ int main(int argc, char *argv[])
                                opj_cio_close(cio);
                                return 1;
                        }
-                       /* dump */
+                       /* dump image */
+      j2k_dump_image(stdout, image);
+
+                       /* dump cp */
       j2k_dump_cp(stdout, image, ((opj_jp2_t*)dinfo->jp2_handle)->j2k->cp);
 
                        /* close the byte stream */