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

Bug with tk->imagefile pointer fixed

This commit is contained in:
Francois-Olivier Devaux 2004-09-09 13:34:20 +00:00
parent 02e3a4ec77
commit 899439a906
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mj2/mj2.c
View File

@ -581,16 +581,14 @@ int mj2_read_mdat(mj2_movie_t * movie, unsigned char *src, char *outfile)
fclose(f); fclose(f);
for (track_nb = 0; track_nb < movie->next_tk_id - 1; track_nb++) { for (track_nb = 0; track_nb < movie->next_tk_id - 1; track_nb++) {
if ((movie->tk->imagefile != (char *) 0xcdcdcdcd) if (movie->tk[track_nb].imagefile != NULL) {
&& (movie->tk->imagefile != NULL)) {
fprintf(stderr, "%s", movie->tk[track_nb].imagefile); fprintf(stderr, "%s", movie->tk[track_nb].imagefile);
f = fopen(movie->tk->imagefile, "w"); /* Erase content of file if it already exists */ f = fopen(movie->tk[track_nb].imagefile, "w"); // Erase content of file if it already exists
fclose(f); fclose(f);
} }
} }
for (track_nb = 0; for (track_nb = 0;
track_nb < movie->num_htk + movie->num_stk + movie->num_vtk; track_nb < movie->num_htk + movie->num_stk + movie->num_vtk;
track_nb++) { track_nb++) {
@ -602,10 +600,11 @@ int mj2_read_mdat(mj2_movie_t * movie, unsigned char *src, char *outfile)
fprintf(stderr, "Track %d: Width=%d Height=%d\n", track_nb, fprintf(stderr, "Track %d: Width=%d Height=%d\n", track_nb,
tk->w, tk->h); tk->w, tk->h);
fprintf(stderr, "%d Samples\n", tk->num_samples); fprintf(stderr, "%d Samples\n", tk->num_samples);
if ((tk->imagefile == (char *) 0xcdcdcdcd)
|| (movie->tk->imagefile == NULL)) { if (tk->imagefile == NULL) {
tk->imagefile = outfile; tk->imagefile = outfile;
} }
for (i = 0; i < tk->num_samples; i++) { for (i = 0; i < tk->num_samples; i++) {
mj2_sample_t *sample = &tk->sample[i]; mj2_sample_t *sample = &tk->sample[i];
@ -613,7 +612,7 @@ int mj2_read_mdat(mj2_movie_t * movie, unsigned char *src, char *outfile)
j2k_cp_t cp; j2k_cp_t cp;
unsigned char *pos; unsigned char *pos;
fprintf(stderr, "Frame %d: \n", i); fprintf(stderr, "Frame %d / %d: \n", i+1, tk->num_samples);
cio_init(src + sample->offset, 8); cio_init(src + sample->offset, 8);
@ -2813,6 +2812,9 @@ int mj2_read_moov(mj2_movie_t * movie, j2k_image_t * img)
movie->tk = movie->tk =
(mj2_tk_t *) malloc((movie->next_tk_id - 1) * sizeof(mj2_tk_t)); (mj2_tk_t *) malloc((movie->next_tk_id - 1) * sizeof(mj2_tk_t));
for (i=0; i < (unsigned int)movie->next_tk_id - 1; i++)
movie->tk[i].imagefile = NULL;
for (i = 0; cio_tell() - box.init_pos < box.length; i++) { for (i = 0; cio_tell() - box.init_pos < box.length; i++) {
mj2_read_boxhdr(&box2); mj2_read_boxhdr(&box2);
if (box2.type == MJ2_TRAK) { if (box2.type == MJ2_TRAK) {