Resloved issue where imagino used to iterate through files retrived was signed, causing possible overflow
This commit is contained in:
parent
fc88a3048b
commit
85b248b1a8
|
@ -164,7 +164,7 @@ typedef struct opj_decompress_params {
|
||||||
unsigned int get_num_images(char *imgdirpath);
|
unsigned int get_num_images(char *imgdirpath);
|
||||||
int load_images(dircnt_t *dirptr, char *imgdirpath);
|
int load_images(dircnt_t *dirptr, char *imgdirpath);
|
||||||
int get_file_format(const char *filename);
|
int get_file_format(const char *filename);
|
||||||
char get_next_file(int imageno, dircnt_t *dirptr, img_fol_t *img_fol,
|
char get_next_file(unsigned int imageno, dircnt_t *dirptr, img_fol_t *img_fol,
|
||||||
opj_decompress_parameters *parameters);
|
opj_decompress_parameters *parameters);
|
||||||
static int infile_format(const char *fname);
|
static int infile_format(const char *fname);
|
||||||
|
|
||||||
|
@ -475,7 +475,7 @@ const char* path_separator = "/";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* -------------------------------------------------------------------------- */
|
/* -------------------------------------------------------------------------- */
|
||||||
char get_next_file(int imageno, dircnt_t *dirptr, img_fol_t *img_fol,
|
char get_next_file(unsigned int imageno, dircnt_t *dirptr, img_fol_t *img_fol,
|
||||||
opj_decompress_parameters *parameters)
|
opj_decompress_parameters *parameters)
|
||||||
{
|
{
|
||||||
char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],
|
char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],
|
||||||
|
@ -1341,8 +1341,7 @@ int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
opj_decompress_parameters parameters; /* decompression parameters */
|
opj_decompress_parameters parameters; /* decompression parameters */
|
||||||
|
|
||||||
unsigned int num_images;
|
unsigned int num_images, imageno;
|
||||||
OPJ_INT32 imageno;
|
|
||||||
img_fol_t img_fol;
|
img_fol_t img_fol;
|
||||||
dircnt_t *dirptr = NULL;
|
dircnt_t *dirptr = NULL;
|
||||||
int failed = 0;
|
int failed = 0;
|
||||||
|
@ -1373,7 +1372,7 @@ int main(int argc, char **argv)
|
||||||
|
|
||||||
/* Initialize reading of directory */
|
/* Initialize reading of directory */
|
||||||
if (img_fol.set_imgdir == 1) {
|
if (img_fol.set_imgdir == 1) {
|
||||||
int it_image;
|
unsigned int it_image;
|
||||||
num_images = get_num_images(img_fol.imgdirpath);
|
num_images = get_num_images(img_fol.imgdirpath);
|
||||||
if (num_images == 0) {
|
if (num_images == 0) {
|
||||||
fprintf(stderr, "Folder is empty\n");
|
fprintf(stderr, "Folder is empty\n");
|
||||||
|
|
|
@ -86,7 +86,7 @@ typedef struct img_folder {
|
||||||
static unsigned int get_num_images(char *imgdirpath);
|
static unsigned int get_num_images(char *imgdirpath);
|
||||||
static int load_images(dircnt_t *dirptr, char *imgdirpath);
|
static int load_images(dircnt_t *dirptr, char *imgdirpath);
|
||||||
static int get_file_format(const char *filename);
|
static int get_file_format(const char *filename);
|
||||||
static char get_next_file(int imageno, dircnt_t *dirptr, img_fol_t *img_fol,
|
static char get_next_file(unsigned int imageno, dircnt_t *dirptr, img_fol_t *img_fol,
|
||||||
opj_dparameters_t *parameters);
|
opj_dparameters_t *parameters);
|
||||||
static int infile_format(const char *fname);
|
static int infile_format(const char *fname);
|
||||||
|
|
||||||
|
@ -220,7 +220,7 @@ static int get_file_format(const char *filename)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -------------------------------------------------------------------------- */
|
/* -------------------------------------------------------------------------- */
|
||||||
static char get_next_file(int imageno, dircnt_t *dirptr, img_fol_t *img_fol,
|
static char get_next_file(unsigned int imageno, dircnt_t *dirptr, img_fol_t *img_fol,
|
||||||
opj_dparameters_t *parameters)
|
opj_dparameters_t *parameters)
|
||||||
{
|
{
|
||||||
char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],
|
char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],
|
||||||
|
@ -492,8 +492,7 @@ int main(int argc, char *argv[])
|
||||||
opj_codestream_info_v2_t* cstr_info = NULL;
|
opj_codestream_info_v2_t* cstr_info = NULL;
|
||||||
opj_codestream_index_t* cstr_index = NULL;
|
opj_codestream_index_t* cstr_index = NULL;
|
||||||
|
|
||||||
unsigned int num_images;
|
unsigned int num_images, imageno;
|
||||||
OPJ_INT32 imageno;
|
|
||||||
img_fol_t img_fol;
|
img_fol_t img_fol;
|
||||||
dircnt_t *dirptr = NULL;
|
dircnt_t *dirptr = NULL;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue