Same as last
This commit is contained in:
parent
912a144c27
commit
96c6587801
|
@ -486,6 +486,9 @@ static unsigned int get_num_images(char *imgdirpath)
|
|||
continue;
|
||||
}
|
||||
num_images++;
|
||||
if (num_images == 0) {
|
||||
fprintf(stderr,"Too many files in folder %s\n", imgdirpath);
|
||||
}
|
||||
}
|
||||
closedir(dir);
|
||||
return num_images;
|
||||
|
@ -1957,6 +1960,11 @@ int main(int argc, char **argv)
|
|||
/* Read directory if necessary */
|
||||
if (img_fol.set_imgdir == 1) {
|
||||
num_images = get_num_images(img_fol.imgdirpath);
|
||||
if (num_images == 0) {
|
||||
fprintf(stdout, "Folder is empty\n");
|
||||
ret = 0;
|
||||
goto fin;
|
||||
}
|
||||
dirptr = (dircnt_t*)malloc(sizeof(dircnt_t));
|
||||
if (dirptr) {
|
||||
dirptr->filename_buf = (char*)calloc(num_images, OPJ_PATH_LEN * sizeof(
|
||||
|
@ -1974,11 +1982,7 @@ int main(int argc, char **argv)
|
|||
ret = 0;
|
||||
goto fin;
|
||||
}
|
||||
if (num_images == 0) {
|
||||
fprintf(stdout, "Folder is empty\n");
|
||||
ret = 0;
|
||||
goto fin;
|
||||
}
|
||||
|
||||
} else {
|
||||
num_images = 1;
|
||||
}
|
||||
|
|
|
@ -374,7 +374,7 @@ int get_num_images(char *imgdirpath)
|
|||
{
|
||||
DIR *dir;
|
||||
struct dirent* content;
|
||||
int num_images = 0;
|
||||
unsigned int num_images = 0;
|
||||
|
||||
/*Reading the input images from given input directory*/
|
||||
|
||||
|
@ -389,6 +389,9 @@ int get_num_images(char *imgdirpath)
|
|||
continue;
|
||||
}
|
||||
num_images++;
|
||||
if (num_images == 0) {
|
||||
fprintf(stderr,"Too many files in folder %s\n", imgdirpath);
|
||||
}
|
||||
}
|
||||
closedir(dir);
|
||||
return num_images;
|
||||
|
@ -1367,6 +1370,11 @@ int main(int argc, char **argv)
|
|||
if (img_fol.set_imgdir == 1) {
|
||||
int it_image;
|
||||
num_images = get_num_images(img_fol.imgdirpath);
|
||||
if (num_images == 0) {
|
||||
fprintf(stderr, "Folder is empty\n");
|
||||
failed = 1;
|
||||
goto fin;
|
||||
}
|
||||
dirptr = (dircnt_t*)calloc(1, sizeof(dircnt_t));
|
||||
if (!dirptr) {
|
||||
destroy_parameters(¶meters);
|
||||
|
@ -1394,11 +1402,7 @@ int main(int argc, char **argv)
|
|||
failed = 1;
|
||||
goto fin;
|
||||
}
|
||||
if (num_images == 0) {
|
||||
fprintf(stderr, "Folder is empty\n");
|
||||
failed = 1;
|
||||
goto fin;
|
||||
}
|
||||
|
||||
} else {
|
||||
num_images = 1;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue