[trunk] merge r1322 from branch 1.5 over to trunk
This commit is contained in:
parent
79f090d92b
commit
44a3af51f0
|
@ -639,7 +639,7 @@ static int t2_decode_packet(opj_t2_t* t2, unsigned char *src, int len, opj_tcd_t
|
||||||
|
|
||||||
#endif /* USE_JPWL */
|
#endif /* USE_JPWL */
|
||||||
|
|
||||||
cblk->data = (unsigned char*) opj_realloc(cblk->data, (cblk->len + seg->newlen) * sizeof(unsigned char*));
|
cblk->data = (unsigned char*) opj_realloc(cblk->data, (cblk->len + seg->newlen) * sizeof(unsigned char));
|
||||||
memcpy(cblk->data + cblk->len, c, seg->newlen);
|
memcpy(cblk->data + cblk->len, c, seg->newlen);
|
||||||
if (seg->numpasses == 0) {
|
if (seg->numpasses == 0) {
|
||||||
seg->data = &cblk->data;
|
seg->data = &cblk->data;
|
||||||
|
|
Loading…
Reference in New Issue