[trunk] fix a bug during the creation of the codestream index

diff --git a/CHANGES b/CHANGES
index 6ca91d31011cb40cc391f636d27ecd1b8f5961c1..2e81110fcce0c6fa703c843f16db1e53f51cb795 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ What's New for OpenJPEG
 + : added
 
 December 1, 2011
+* [mickael] fix a bug during the creation of the codestream index
 * [mickael] fix a warning about a recent commit (1104)
 * [jmalik]  fix warnings when printing large integers
 

diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index 660e91b09bc7072e27957de48b14f5598800175c..f1662a69ee94b16323517d0ef5187ef7ef183b66 100644 (file)
--- a/libopenjpeg/j2k.c
+++ b/libopenjpeg/j2k.c
@@ -8114,7 +8114,7 @@ opj_bool j2k_allocate_tile_element_cstr_index(opj_j2k_v2_t *p_j2k)
 {
        OPJ_UINT32 it_tile=0;
 
-       p_j2k->cstr_index->nb_of_tiles = p_j2k->m_cp.tw * p_j2k->m_cp.tw;
+       p_j2k->cstr_index->nb_of_tiles = p_j2k->m_cp.tw * p_j2k->m_cp.th;
        p_j2k->cstr_index->tile_index = (opj_tile_index_t*)opj_calloc(p_j2k->cstr_index->nb_of_tiles, sizeof(opj_tile_index_t));
        if (!p_j2k->cstr_index->tile_index)
                return OPJ_FALSE;

diff --git a/tests/nonregression/test_suite.ctest.in b/tests/nonregression/test_suite.ctest.in
index d61bb5deeb20099eee5d093be5b5adddaff5845e..ce579fffd803ef3981128c892fecba3fc7239920 100644 (file)
--- a/tests/nonregression/test_suite.ctest.in
+++ b/tests/nonregression/test_suite.ctest.in
@@ -113,6 +113,8 @@ j2k_to_image -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_1.j2k_t5.png -t
 j2k_to_image -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_2.j2k_t9.png -t 9 -r 2\r
 j2k_to_image -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_3.j2k_t15.png -t 15 -r 2\r
 \r
+j2k_to_image -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06.j2k_r4.png -r 4\r
+\r
 # prec=4; nb_c=3 ; signd=yes\r
 j2k_to_image -i @INPUT_CONF_PATH@/p0_04.j2k -o @TEMP_PATH@/p0_04.j2k.png -d 0,0,256,256\r
 j2k_to_image -i @INPUT_CONF_PATH@/p0_04.j2k -o @TEMP_PATH@/p0_04_1.j2k.png -d 128,0,256,128\r