Fixed signed issues in print statements, correced addtional signed issues in opj_compress.c related to signed integer use
This commit is contained in:
parent
8bb3ea7e71
commit
2947bf2850
|
@ -553,7 +553,7 @@ static char * get_file_name(char *name)
|
||||||
return fname;
|
return fname;
|
||||||
}
|
}
|
||||||
|
|
||||||
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_cparameters_t *parameters)
|
opj_cparameters_t *parameters)
|
||||||
{
|
{
|
||||||
char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],
|
char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],
|
||||||
|
@ -561,7 +561,7 @@ static char get_next_file(int imageno, dircnt_t *dirptr, img_fol_t *img_fol,
|
||||||
char *temp_p, temp1[OPJ_PATH_LEN] = "";
|
char *temp_p, temp1[OPJ_PATH_LEN] = "";
|
||||||
|
|
||||||
strcpy(image_filename, dirptr->filename[imageno]);
|
strcpy(image_filename, dirptr->filename[imageno]);
|
||||||
fprintf(stderr, "File Number %d \"%s\"\n", imageno, image_filename);
|
fprintf(stderr, "File Number %u \"%s\"\n", imageno, image_filename);
|
||||||
parameters->decod_format = get_file_format(image_filename);
|
parameters->decod_format = get_file_format(image_filename);
|
||||||
if (parameters->decod_format == -1) {
|
if (parameters->decod_format == -1) {
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -1995,7 +1995,7 @@ int main(int argc, char **argv)
|
||||||
fprintf(stderr, "\n");
|
fprintf(stderr, "\n");
|
||||||
|
|
||||||
if (img_fol.set_imgdir == 1) {
|
if (img_fol.set_imgdir == 1) {
|
||||||
if (get_next_file((int)imageno, dirptr, &img_fol, ¶meters)) {
|
if (get_next_file(imageno, dirptr, &img_fol, ¶meters)) {
|
||||||
fprintf(stderr, "skipping file...\n");
|
fprintf(stderr, "skipping file...\n");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -2250,7 +2250,7 @@ int main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
for (i = 0; i < l_nb_tiles; ++i) {
|
for (i = 0; i < l_nb_tiles; ++i) {
|
||||||
if (! opj_write_tile(l_codec, i, l_data, l_data_size, l_stream)) {
|
if (! opj_write_tile(l_codec, i, l_data, l_data_size, l_stream)) {
|
||||||
fprintf(stderr, "ERROR -> test_tile_encoder: failed to write the tile %d!\n",
|
fprintf(stderr, "ERROR -> test_tile_encoder: failed to write the tile %u!\n",
|
||||||
i);
|
i);
|
||||||
opj_stream_destroy(l_stream);
|
opj_stream_destroy(l_stream);
|
||||||
opj_destroy_codec(l_codec);
|
opj_destroy_codec(l_codec);
|
||||||
|
|
|
@ -483,7 +483,7 @@ char get_next_file(unsigned int imageno, dircnt_t *dirptr, img_fol_t *img_fol,
|
||||||
char *temp_p, temp1[OPJ_PATH_LEN] = "";
|
char *temp_p, temp1[OPJ_PATH_LEN] = "";
|
||||||
|
|
||||||
strcpy(image_filename, dirptr->filename[imageno]);
|
strcpy(image_filename, dirptr->filename[imageno]);
|
||||||
fprintf(stderr, "File Number %d \"%s\"\n", imageno, image_filename);
|
fprintf(stderr, "File Number %u \"%s\"\n", imageno, image_filename);
|
||||||
if (strlen(img_fol->imgdirpath) + strlen(path_separator) + strlen(
|
if (strlen(img_fol->imgdirpath) + strlen(path_separator) + strlen(
|
||||||
image_filename) + 1 > sizeof(infilename)) {
|
image_filename) + 1 > sizeof(infilename)) {
|
||||||
return 1;
|
return 1;
|
||||||
|
|
|
@ -230,7 +230,7 @@ static char get_next_file(unsigned int imageno, dircnt_t *dirptr,
|
||||||
char *temp_p, temp1[OPJ_PATH_LEN] = "";
|
char *temp_p, temp1[OPJ_PATH_LEN] = "";
|
||||||
|
|
||||||
strcpy(image_filename, dirptr->filename[imageno]);
|
strcpy(image_filename, dirptr->filename[imageno]);
|
||||||
fprintf(stderr, "File Number %d \"%s\"\n", imageno, image_filename);
|
fprintf(stderr, "File Number %u \"%s\"\n", imageno, image_filename);
|
||||||
parameters->decod_format = get_file_format(image_filename);
|
parameters->decod_format = get_file_format(image_filename);
|
||||||
if (parameters->decod_format == -1) {
|
if (parameters->decod_format == -1) {
|
||||||
return 1;
|
return 1;
|
||||||
|
|
Loading…
Reference in New Issue