diff options
| author | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2007-09-17 15:11:20 +0000 |
|---|---|---|
| committer | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2007-09-17 15:11:20 +0000 |
| commit | 55c4c14352519b84ad79abcb2f8527e1c25b9e54 (patch) | |
| tree | eb3efc84b540eccc43ca1ef19d8ca11ef0370942 /mj2 | |
| parent | 569bbb00776f08211f7184ea4ea94571b652adae (diff) | |
OpenJPEG library interface modified to retain compatibility with version 1.2. Sorry if some of you already adapted their code to the previous interface, but we want to avoid a ABI break....
Diffstat (limited to 'mj2')
| -rw-r--r-- | mj2/meta_out.c | 2 | ||||
| -rw-r--r-- | mj2/mj2_to_frames.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mj2/meta_out.c b/mj2/meta_out.c index b6c99e13..c77ec20a 100644 --- a/mj2/meta_out.c +++ b/mj2/meta_out.c @@ -945,7 +945,7 @@ int xml_out_frame(FILE* file, FILE* xmlout, mj2_sample_t *sample, unsigned int s cio = opj_cio_open((opj_common_ptr)dinfo, frame_codestream, sample->sample_size-8); /* Decode J2K to image: */ - img = opj_decode(dinfo, cio, NULL); /* We don't need cstr_info -> set to NULL */ + img = opj_decode(dinfo, cio); if (!img) { fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n"); opj_destroy_decompress(dinfo); diff --git a/mj2/mj2_to_frames.c b/mj2/mj2_to_frames.c index 6eae57f0..bf4dfe6b 100644 --- a/mj2/mj2_to_frames.c +++ b/mj2/mj2_to_frames.c @@ -160,7 +160,7 @@ int main(int argc, char *argv[]) { /* open a byte stream */ cio = opj_cio_open((opj_common_ptr)dinfo, frame_codestream, sample->sample_size-8); - img = opj_decode(dinfo, cio, NULL); // Decode J2K to image. We will not use the cstr_info afterwards -> set to NULL + img = opj_decode(dinfo, cio); // Decode J2K to image if (((img->numcomps == 3) && (img->comps[0].dx == img->comps[1].dx / 2) && (img->comps[0].dx == img->comps[2].dx / 2 ) && (img->comps[0].dx == 1)) |