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

[trunk] fix bug during random access to tile (tile already decoded)

This commit is contained in:
Mickael Savinaud 2011-11-30 17:31:47 +00:00
parent 563b56e09c
commit 8c2d8bc85f
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -14,6 +14,7 @@ November 30, 2011
- change types related to size of stream to OPJ_UINT64_T - change types related to size of stream to OPJ_UINT64_T
- change calls to fseek/ftell to LFS-capable OPJ_SEEK/OPJ_TELL - change calls to fseek/ftell to LFS-capable OPJ_SEEK/OPJ_TELL
* [mickael] fix error about the way to detect the additional test suite * [mickael] fix error about the way to detect the additional test suite
* [mickael] fix bug during random access to tile (tile already decoded)
November 29, 2011 November 29, 2011
* [mickael] fix error with new way to detect kdu_expand * [mickael] fix error with new way to detect kdu_expand

32
libopenjpeg/j2k.c
View File

@ -125,6 +125,12 @@ static const struct opj_dec_memory_marker_handler * j2k_get_marker_handler (OPJ_
*/ */
static void j2k_tcp_destroy (opj_tcp_v2_t *p_tcp); static void j2k_tcp_destroy (opj_tcp_v2_t *p_tcp);
/**
* Destroys the data inside a tile coding parameter structure.
*
* @param p_tcp the tile coding parameter which contain data to destroy.
*/
static void j2k_tcp_data_destroy (opj_tcp_v2_t *p_tcp);
/** /**
* Destroys a coding parameter structure. * Destroys a coding parameter structure.
@ -6488,12 +6494,23 @@ void j2k_tcp_destroy (opj_tcp_v2_t *p_tcp)
p_tcp->mct_norms = 00; p_tcp->mct_norms = 00;
} }
if (p_tcp->m_data) { j2k_tcp_data_destroy(p_tcp);
opj_free(p_tcp->m_data);
p_tcp->m_data = 00;
}
} }
/**
* Destroys the data inside a tile coding parameter structure.
*
* @param p_tcp the tile coding parameter which contain data to destroy.
*/
void j2k_tcp_data_destroy (opj_tcp_v2_t *p_tcp)
{
if (p_tcp->m_data) {
opj_free(p_tcp->m_data);
p_tcp->m_data = NULL;
p_tcp->m_data_size = 0;
}
}
/** /**
* Destroys a coding parameter structure. * Destroys a coding parameter structure.
@ -6803,8 +6820,11 @@ opj_bool j2k_decode_tile ( opj_j2k_v2_t * p_j2k,
return OPJ_FALSE; return OPJ_FALSE;
} }
j2k_tcp_destroy(l_tcp); /* To avoid to destroy the tcp which can be useful when we try to decode a tile decoded before (cf j2k_random_tile_access)
p_j2k->m_tcd->tcp = 0; * we destroy just the data which will be re-read in read_tile_header*/
/*j2k_tcp_destroy(l_tcp);
p_j2k->m_tcd->tcp = 0;*/
j2k_tcp_data_destroy(l_tcp);
p_j2k->m_specific_param.m_decoder.m_can_decode = 0; p_j2k->m_specific_param.m_decoder.m_can_decode = 0;
p_j2k->m_specific_param.m_decoder.m_state &= (~ (0x0080));// FIXME J2K_DEC_STATE_DATA); p_j2k->m_specific_param.m_decoder.m_state &= (~ (0x0080));// FIXME J2K_DEC_STATE_DATA);