Sync with v2 branch

This commit is contained in:
Mathieu Malaterre 2010-06-22 19:06:29 +00:00
parent da0d29e4ab
commit 84f77a71e5
1 changed files with 5 additions and 4 deletions

View File

@ -349,25 +349,26 @@ int main(int argc, char *argv[])
dirptr->filename = (char**) malloc(num_images*sizeof(char*)); dirptr->filename = (char**) malloc(num_images*sizeof(char*));
if(!dirptr->filename_buf){ if(!dirptr->filename_buf){
return 0; return 1;
} }
for(i=0;i<num_images;i++){ for(i=0;i<num_images;i++){
dirptr->filename[i] = dirptr->filename_buf + i*OPJ_PATH_LEN; dirptr->filename[i] = dirptr->filename_buf + i*OPJ_PATH_LEN;
} }
} }
if(load_images(dirptr,img_fol.imgdirpath)==1){ if(load_images(dirptr,img_fol.imgdirpath)==1){
return 0; return 1;
} }
if (num_images==0){ if (num_images==0){
fprintf(stdout,"Folder is empty\n"); fprintf(stdout,"Folder is empty\n");
return 0; return 1;
} }
}else{ }else{
num_images=1; num_images=1;
} }
/*Encoding image one by one*/ /*Encoding image one by one*/
for(imageno = 0; imageno < num_images ; imageno++) { for(imageno = 0; imageno < num_images ; imageno++)
{
image = NULL; image = NULL;
fprintf(stderr,"\n"); fprintf(stderr,"\n");