return error code upon errors
authorMathieu Malaterre <mathieu.malaterre@gmail.com>
Tue, 29 Jun 2010 19:08:45 +0000 (19:08 +0000)
committerMathieu Malaterre <mathieu.malaterre@gmail.com>
Tue, 29 Jun 2010 19:08:45 +0000 (19:08 +0000)
codec/j2k_to_image.c

index 2aa7ed49c7bfd69d5236eba836f4b53fe725e5b0..3b1915c74547afce9c7ed4f3235eb53d1ec56724 100644 (file)
@@ -189,7 +189,7 @@ int load_images(dircnt_t *dirptr, char *imgdirpath){
 
 int get_file_format(char *filename) {
        unsigned int i;
-       static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp","tif", "raw", "tga", "png", "j2k", "jp2", "jpt", "j2c", "jpc"  };
+       static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp","tif", "raw", "tga", "png", "j2k", "jp2", "jpt", "j2c", "jpc" };
        static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT, J2K_CFMT };
        char * ext = strrchr(filename, '.');
        if (ext == NULL)
@@ -553,18 +553,18 @@ 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;