Revert "Added overflow check to get_num_images, defined num_images as unsigned for conformity, relocated check for num images for exicution before allocation and image loading"
This reverts commit ab6c7c7203
.
This commit is contained in:
parent
957a6cd70e
commit
cbc8b26fb9
|
@ -486,10 +486,6 @@ static unsigned int get_num_images(char *imgdirpath)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
num_images++;
|
num_images++;
|
||||||
if(num_images == 0) {
|
|
||||||
fprintf(stderr, "Integer overflow detected when reading %s\n", imgdirpath);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
closedir(dir);
|
closedir(dir);
|
||||||
return num_images;
|
return num_images;
|
||||||
|
@ -1961,11 +1957,6 @@ 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(
|
||||||
|
@ -1983,7 +1974,11 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
|
@ -374,7 +374,7 @@ int get_num_images(char *imgdirpath)
|
||||||
{
|
{
|
||||||
DIR *dir;
|
DIR *dir;
|
||||||
struct dirent* content;
|
struct dirent* content;
|
||||||
unsigned int num_images = 0;
|
int num_images = 0;
|
||||||
|
|
||||||
/*Reading the input images from given input directory*/
|
/*Reading the input images from given input directory*/
|
||||||
|
|
||||||
|
@ -389,10 +389,6 @@ int get_num_images(char *imgdirpath)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
num_images++;
|
num_images++;
|
||||||
if(num_images == 0) {
|
|
||||||
fprintf(stderr, "Integer overflow detected when reading %s\n", imgdirpath);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
closedir(dir);
|
closedir(dir);
|
||||||
return num_images;
|
return num_images;
|
||||||
|
@ -1371,11 +1367,6 @@ 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(¶meters);
|
destroy_parameters(¶meters);
|
||||||
|
@ -1403,7 +1394,11 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
|
@ -126,7 +126,7 @@ static int get_num_images(char *imgdirpath)
|
||||||
{
|
{
|
||||||
DIR *dir;
|
DIR *dir;
|
||||||
struct dirent* content;
|
struct dirent* content;
|
||||||
unsigned int num_images = 0;
|
int num_images = 0;
|
||||||
|
|
||||||
/*Reading the input images from given input directory*/
|
/*Reading the input images from given input directory*/
|
||||||
|
|
||||||
|
@ -141,10 +141,6 @@ static int get_num_images(char *imgdirpath)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
num_images++;
|
num_images++;
|
||||||
if(num_images == 0) {
|
|
||||||
fprintf(stderr, "Integer overflow detected when reading images from %s\n", imgdirpath);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
closedir(dir);
|
closedir(dir);
|
||||||
return num_images;
|
return num_images;
|
||||||
|
@ -514,10 +510,7 @@ 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(stdout, "Folder is empty\n");
|
|
||||||
goto fails;
|
|
||||||
}
|
|
||||||
dirptr = (dircnt_t*)malloc(sizeof(dircnt_t));
|
dirptr = (dircnt_t*)malloc(sizeof(dircnt_t));
|
||||||
if (!dirptr) {
|
if (!dirptr) {
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
|
@ -543,7 +536,10 @@ int main(int argc, char *argv[])
|
||||||
if (load_images(dirptr, img_fol.imgdirpath) == 1) {
|
if (load_images(dirptr, img_fol.imgdirpath) == 1) {
|
||||||
goto fails;
|
goto fails;
|
||||||
}
|
}
|
||||||
|
if (num_images == 0) {
|
||||||
|
fprintf(stdout, "Folder is empty\n");
|
||||||
|
goto fails;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
num_images = 1;
|
num_images = 1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue