diff options
| author | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2007-08-28 10:13:58 +0000 |
|---|---|---|
| committer | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2007-08-28 10:13:58 +0000 |
| commit | d07fa5d9d0b5f3452831e4c0c9da1f03d30a1299 (patch) | |
| tree | d974ff8729b08bb9caa998c95996591debf83cd5 /libopenjpeg | |
| parent | c101f8049c23a01fa0d37e0eb586c7dff6c75869 (diff) | |
Fixed wrong destructors called in openjpeg.c
Fixed bug in j2k_decode_jpt_stream
Diffstat (limited to 'libopenjpeg')
| -rw-r--r-- | libopenjpeg/j2k.c | 1 | ||||
| -rw-r--r-- | libopenjpeg/openjpeg.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index c380782f..cbf6a1fa 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -1816,6 +1816,7 @@ opj_image_t* j2k_decode_jpt_stream(opj_j2k_t *j2k, opj_cio_t *cio) { /* create an empty image */ image = opj_image_create0(); + j2k->image = image; j2k->state = J2K_STATE_MHSOC; diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c index f7363b9b..ba3ac6d8 100644 --- a/libopenjpeg/openjpeg.c +++ b/libopenjpeg/openjpeg.c @@ -203,10 +203,10 @@ void OPJ_CALLCONV opj_destroy_compress(opj_cinfo_t *cinfo) { /* destroy the codec */ switch(cinfo->codec_format) { case CODEC_J2K: - j2k_destroy_decompress((opj_j2k_t*)cinfo->j2k_handle); + j2k_destroy_compress((opj_j2k_t*)cinfo->j2k_handle); break; case CODEC_JP2: - jp2_destroy_decompress((opj_jp2_t*)cinfo->jp2_handle); + jp2_destroy_compress((opj_jp2_t*)cinfo->jp2_handle); break; case CODEC_JPT: case CODEC_UNKNOWN: |