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

Fixed bugs. Thanks to Dereck !

This commit is contained in:
Francois-Olivier Devaux 2004-08-24 13:36:45 +00:00
parent bc5c5115cb
commit 0abe8e1997
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mj2/mj2.c
View File

@ -585,7 +585,7 @@ int mj2_read_mdat(mj2_movie_t * movie, unsigned char *src, char *outfile)
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->imagefile != (char *) 0xcdcdcdcd)
&& (movie->tk->imagefile != NULL)) { && (movie->tk->imagefile != NULL)) {
fprintf(stderr, "%s", movie->tk->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->imagefile, "w"); /* Erase content of file if it already exists */
fclose(f); fclose(f);
@ -604,7 +604,7 @@ 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 ((movie->tk->imagefile = (char *) 0xcdcdcdcd) if ((tk->imagefile == (char *) 0xcdcdcdcd)
|| (movie->tk->imagefile == NULL)) { || (movie->tk->imagefile == NULL)) {
tk->imagefile = outfile; tk->imagefile = outfile;
} }
@ -799,14 +799,14 @@ int mj2_read_stsz(mj2_tk_t * tk)
sample_size = cio_read(4); sample_size = cio_read(4);
if (sample_size != 0) { /* Samples do not have the same size */ if (sample_size != 0) { /* Samples do have the same size */
tk->same_sample_size = 0; tk->same_sample_size = 1;
for (i = 0; i < tk->num_samples; i++) { for (i = 0; i < tk->num_samples; i++) {
tk->sample[i].sample_size = sample_size; tk->sample[i].sample_size = sample_size;
} }
cio_skip(4); /* Sample count = 1 */ cio_skip(4); /* Sample count = 1 */
} else { } else {
tk->same_sample_size = 1; tk->same_sample_size = 0;
if (tk->num_samples != cio_read(4)) { /* Sample count */ if (tk->num_samples != cio_read(4)) { /* Sample count */
fprintf(stderr, fprintf(stderr,
"Error in STSZ box. Expected that sample-count is number of samples in track\n"); "Error in STSZ box. Expected that sample-count is number of samples in track\n");
@ -1798,7 +1798,7 @@ int mj2_read_dref(mj2_tk_t * tk)
{ {
int i; int i;
int entry_count; int entry_count, marker;
mj2_box_t box; mj2_box_t box;
mj2_read_boxhdr(&box); mj2_read_boxhdr(&box);
@ -1823,12 +1823,13 @@ int mj2_read_dref(mj2_tk_t * tk)
for (i = 0; i < entry_count; i++) { for (i = 0; i < entry_count; i++) {
cio_skip(4); cio_skip(4);
if (cio_read(4) == MJ2_URL) { marker = cio_read(4);
if (marker == MJ2_URL) {
cio_skip(-8); cio_skip(-8);
tk->num_url++; tk->num_url++;
if (mj2_read_url(tk, tk->num_url)) if (mj2_read_url(tk, tk->num_url))
return 1; return 1;
} else if (cio_read(4) == MJ2_URN) { } else if (marker == MJ2_URN) {
cio_skip(-8); cio_skip(-8);
tk->num_urn++; tk->num_urn++;
if (mj2_read_urn(tk, tk->num_urn)) if (mj2_read_urn(tk, tk->num_urn))
@ -1945,7 +1946,7 @@ int mj2_read_vmhd(mj2_tk_t * tk)
} }
if (1 != cio_read(3)) { /* Flags = 1 */ if (1 != cio_read(3)) { /* Flags = 1 */
fprintf(stderr, "Error with flag in VMHD box. Expected flag 0\n"); fprintf(stderr, "Error with flag in VMHD box. Expected flag 1\n");
return 1; return 1;
} }
@ -2153,7 +2154,7 @@ int mj2_read_minf(mj2_tk_t * tk, j2k_image_t * img)
} else if (box_type == MJ2_SMHD) { } else if (box_type == MJ2_SMHD) {
if (mj2_read_smhd(tk)) if (mj2_read_smhd(tk))
return 1; return 1;
} else if (box_type == MJ2_VMHD) { } else if (box_type == MJ2_HMHD) {
if (mj2_read_hmhd(tk)) if (mj2_read_hmhd(tk))
return 1; return 1;
} else { } else {