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

David Fries suggestions. In image_to_j2k and j2k_to_image, strncpy() functions: instead of specifying the path size macro, let the compiler read the length out of the array entry.

This commit is contained in:
Francois-Olivier Devaux 2007-02-13 09:00:37 +00:00
parent dcc6f679bc
commit d084ff59f2
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -6,7 +6,8 @@ What's New for OpenJPEG
+ : added + : added
February 13, 2007 February 13, 2007
! [FOD] Change file modified. -fPIC flag used for 64-bit compilation. Move operation (rather than copy) for the dist library creation, and -p flag added. ! [FOD] David Fries suggestions. In image_to_j2k and j2k_to_image, strncpy() functions: instead of specifying the path size macro, let the compiler read the length out of the array entry.
! [FOD] David Fries suggestions. Makefile modified. -fPIC flag used for 64-bit compilation. Move operation (rather than copy) for the dist library creation, and -p flag added.
January 31, 2007 January 31, 2007
! [FOD] Extra tokens at the end of #endif directive corrected in openjpeg.c, j2k.c and image_to_j2k.c -> no more warnings in linux compilation ! [FOD] Extra tokens at the end of #endif directive corrected in openjpeg.c, j2k.c and image_to_j2k.c -> no more warnings in linux compilation

8
codec/image_to_j2k.c
View File

@ -332,7 +332,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
infile); infile);
return 1; return 1;
} }
strncpy(parameters->infile, infile, OPJ_PATH_LEN); strncpy(parameters->infile, infile, sizeof(parameters->infile)-1);
} }
break; break;
@ -350,7 +350,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
fprintf(stderr, "Unknown output format image %s [only *.j2k, *.jp2]!! \n", outfile); fprintf(stderr, "Unknown output format image %s [only *.j2k, *.jp2]!! \n", outfile);
return 1; return 1;
} }
strncpy(parameters->outfile, outfile, OPJ_PATH_LEN); strncpy(parameters->outfile, outfile, sizeof(parameters->outfile)-1);
} }
break; break;
@ -498,7 +498,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
case 'x': /* creation of index file */ case 'x': /* creation of index file */
{ {
char *index = optarg; char *index = optarg;
strncpy(parameters->index, index, OPJ_PATH_LEN); strncpy(parameters->index, index, sizeof(parameters->index)-1);
parameters->index_on = 1; parameters->index_on = 1;
} }
break; break;
@ -668,7 +668,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
/* we need to enable indexing */ /* we need to enable indexing */
if (!parameters->index_on) { if (!parameters->index_on) {
strncpy(parameters->index, JPWL_PRIVATEINDEX_NAME, OPJ_PATH_LEN); strncpy(parameters->index, JPWL_PRIVATEINDEX_NAME, sizeof(parameters->index)-1);
parameters->index_on = 1; parameters->index_on = 1;
} }

4
codec/j2k_to_image.c
View File

@ -153,7 +153,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters)
infile); infile);
return 1; return 1;
} }
strncpy(parameters->infile, infile, OPJ_PATH_LEN); strncpy(parameters->infile, infile, sizeof(parameters->infile)-1);
} }
break; break;
@ -172,7 +172,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters)
fprintf(stderr, "Unknown output format image %s [only *.pnm, *.pgm, *.ppm, *.pgx or *.bmp]!! \n", outfile); fprintf(stderr, "Unknown output format image %s [only *.pnm, *.pgm, *.ppm, *.pgx or *.bmp]!! \n", outfile);
return 1; return 1;
} }
strncpy(parameters->outfile, outfile, OPJ_PATH_LEN); strncpy(parameters->outfile, outfile, sizeof(parameters->outfile)-1);
} }
break; break;