walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Same as last

This commit is contained in:
Eharve14 2022-01-13 16:29:42 -05:00
parent 912a144c27
commit 96c6587801
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/jp2/opj_compress.c
View File

@ -486,6 +486,9 @@ static unsigned int get_num_images(char *imgdirpath)
continue; continue;
} }
num_images++; num_images++;
if (num_images == 0) {
fprintf(stderr,"Too many files in folder %s\n", imgdirpath);
}
} }
closedir(dir); closedir(dir);
return num_images; return num_images;
@ -1957,6 +1960,11 @@ int main(int argc, char **argv)
/* Read directory if necessary */ /* Read directory if necessary */
if (img_fol.set_imgdir == 1) { if (img_fol.set_imgdir == 1) {
num_images = get_num_images(img_fol.imgdirpath); 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)); dirptr = (dircnt_t*)malloc(sizeof(dircnt_t));
if (dirptr) { if (dirptr) {
dirptr->filename_buf = (char*)calloc(num_images, OPJ_PATH_LEN * sizeof( dirptr->filename_buf = (char*)calloc(num_images, OPJ_PATH_LEN * sizeof(
@ -1974,11 +1982,7 @@ int main(int argc, char **argv)
ret = 0; ret = 0;
goto fin; goto fin;
} }
if (num_images == 0) {
fprintf(stdout, "Folder is empty\n");
ret = 0;
goto fin;
}
} else { } else {
num_images = 1; num_images = 1;
} }

16
src/bin/jp2/opj_decompress.c
View File

@ -374,7 +374,7 @@ int get_num_images(char *imgdirpath)
{ {
DIR *dir; DIR *dir;
struct dirent* content; struct dirent* content;
int num_images = 0; unsigned int num_images = 0;
/*Reading the input images from given input directory*/ /*Reading the input images from given input directory*/
@ -389,6 +389,9 @@ int get_num_images(char *imgdirpath)
continue; continue;
} }
num_images++; num_images++;
if (num_images == 0) {
fprintf(stderr,"Too many files in folder %s\n", imgdirpath);
}
} }
closedir(dir); closedir(dir);
return num_images; return num_images;
@ -1367,6 +1370,11 @@ int main(int argc, char **argv)
if (img_fol.set_imgdir == 1) { if (img_fol.set_imgdir == 1) {
int it_image; int it_image;
num_images = get_num_images(img_fol.imgdirpath); 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)); dirptr = (dircnt_t*)calloc(1, sizeof(dircnt_t));
if (!dirptr) { if (!dirptr) {
destroy_parameters(&parameters); destroy_parameters(&parameters);
@ -1394,11 +1402,7 @@ int main(int argc, char **argv)
failed = 1; failed = 1;
goto fin; goto fin;
} }
if (num_images == 0) {
fprintf(stderr, "Folder is empty\n");
failed = 1;
goto fin;
}
} else { } else {
num_images = 1; num_images = 1;
} }