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

bug fixed when asking for an index with more than (layer*resolutions*100) packets per tile

This commit is contained in:
Antonin Descampe 2005-09-20 15:40:13 +00:00
parent 8f4d6bbeba
commit a0513798bb
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libopenjpeg/j2k.c
View File

@ -875,10 +875,6 @@ void j2k_write_sod()
if (info_IM.index_on) { if (info_IM.index_on) {
info_IM.tile[j2k_curtileno].end_header = info_IM.tile[j2k_curtileno].end_header =
cio_tell() + pos_correction - 1; cio_tell() + pos_correction - 1;
info_IM.tile[j2k_curtileno].packet =
(info_packet *) calloc(info_IM.Comp * info_IM.Layer *
(info_IM.Decomposition + 1) * 100,
sizeof(info_packet));
} }
/* << INDEX */ /* << INDEX */

5
libopenjpeg/tcd.c
View File

@ -1156,7 +1156,7 @@ tcd_encode_tile_pxm(int tileno, unsigned char *dest, int len,
info_image * info_IM) info_image * info_IM)
{ {
int compno; int compno;
int l, i; int l, i, npck=0;
clock_t time7; clock_t time7;
tcd_tile_t *tile; tcd_tile_t *tile;
j2k_tcp_t *tcp = &tcd_cp->tcps[0]; j2k_tcp_t *tcp = &tcd_cp->tcps[0];
@ -1177,10 +1177,13 @@ tcd_encode_tile_pxm(int tileno, unsigned char *dest, int len,
info_IM->tile[tileno].pw[i] = res_idx->pw; info_IM->tile[tileno].pw[i] = res_idx->pw;
info_IM->tile[tileno].ph[i] = res_idx->ph; info_IM->tile[tileno].ph[i] = res_idx->ph;
npck+=res_idx->pw * res_idx->ph;
info_IM->tile[tileno].pdx[i] = tccp->prcw[i]; info_IM->tile[tileno].pdx[i] = tccp->prcw[i];
info_IM->tile[tileno].pdy[i] = tccp->prch[i]; info_IM->tile[tileno].pdy[i] = tccp->prch[i];
} }
info_IM->tile[tileno].packet = (info_packet *) calloc(info_IM->Comp * info_IM->Layer * npck, sizeof(info_packet));
} }
/* << INDEX */ /* << INDEX */