diff options
| author | mayeut <mayeut@users.noreply.github.com> | 2015-10-17 01:30:23 +0200 |
|---|---|---|
| committer | mayeut <mayeut@users.noreply.github.com> | 2015-10-17 01:30:23 +0200 |
| commit | 83249c318fa9a133cb992973f84e15d3ba3182e0 (patch) | |
| tree | 9ab0a33ee1819fdf5fe9dc85dcae3200ba55aa7f /src/lib/openjp2/j2k.c | |
| parent | dd81b5892d5d0709ab981c9311adca81a7a4cd52 (diff) | |
Fixed crash on encoding
Update #624
Update #625
Diffstat (limited to 'src/lib/openjp2/j2k.c')
| -rw-r--r-- | src/lib/openjp2/j2k.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c index c8d8cf1a..a8dc22b9 100644 --- a/src/lib/openjp2/j2k.c +++ b/src/lib/openjp2/j2k.c @@ -9947,6 +9947,7 @@ OPJ_BOOL opj_j2k_encode(opj_j2k_t * p_j2k, OPJ_UINT32 l_nb_tiles; OPJ_UINT32 l_max_tile_size = 0, l_current_tile_size; OPJ_BYTE * l_current_data = 00; + OPJ_BOOL l_reuse_data = OPJ_FALSE; opj_tcd_t* p_tcd = 00; /* preconditions */ @@ -9957,6 +9958,17 @@ OPJ_BOOL opj_j2k_encode(opj_j2k_t * p_j2k, p_tcd = p_j2k->m_tcd; l_nb_tiles = p_j2k->m_cp.th * p_j2k->m_cp.tw; + if (l_nb_tiles == 1) { + l_reuse_data = OPJ_TRUE; +#ifdef __SSE__ + for (j=0;j<p_j2k->m_tcd->image->numcomps;++j) { + opj_image_comp_t * l_img_comp = p_tcd->image->comps + j; + if (((size_t)l_img_comp->data & 0xFU) != 0U) { /* tile data shall be aligned on 16 bytes */ + l_reuse_data = OPJ_FALSE; + } + } +#endif + } for (i=0;i<l_nb_tiles;++i) { if (! opj_j2k_pre_write_tile(p_j2k,i,p_stream,p_manager)) { if (l_current_data) { @@ -9969,7 +9981,7 @@ OPJ_BOOL opj_j2k_encode(opj_j2k_t * p_j2k, /* otherwise, allocate the data */ for (j=0;j<p_j2k->m_tcd->image->numcomps;++j) { opj_tcd_tilecomp_t* l_tilec = p_tcd->tcd_image->tiles->comps + j; - if (l_nb_tiles == 1) { + if (l_reuse_data) { opj_image_comp_t * l_img_comp = p_tcd->image->comps + j; l_tilec->data = l_img_comp->data; l_tilec->ownsData = OPJ_FALSE; @@ -9984,7 +9996,7 @@ OPJ_BOOL opj_j2k_encode(opj_j2k_t * p_j2k, } } l_current_tile_size = opj_tcd_get_encoded_tile_size(p_j2k->m_tcd); - if (l_nb_tiles > 1) { + if (!l_reuse_data) { if (l_current_tile_size > l_max_tile_size) { OPJ_BYTE *l_new_current_data = (OPJ_BYTE *) opj_realloc(l_current_data, l_current_tile_size); if (! l_new_current_data) { |