|
|
|
@ -1278,12 +1278,12 @@ static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
y = tile->comp[compno].coord[1][0] - s->image_offset_y; |
|
|
|
|
line = picture->data[plane] + y * picture->linesize[plane]; |
|
|
|
|
line = picture->data[plane] + y / s->cdy[compno] * picture->linesize[plane]; |
|
|
|
|
for (; y < tile->comp[compno].coord[1][1] - s->image_offset_y; y += s->cdy[compno]) { |
|
|
|
|
uint8_t *dst; |
|
|
|
|
|
|
|
|
|
x = tile->comp[compno].coord[0][0] - s->image_offset_x; |
|
|
|
|
dst = line + x * pixelsize + compno*!planar; |
|
|
|
|
dst = line + x / s->cdx[compno] * pixelsize + compno*!planar; |
|
|
|
|
|
|
|
|
|
if (codsty->transform == FF_DWT97) { |
|
|
|
|
for (; x < w; x += s->cdx[compno]) { |
|
|
|
@ -1324,12 +1324,12 @@ static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, |
|
|
|
|
plane = s->cdef[compno] ? s->cdef[compno]-1 : (s->ncomponents-1); |
|
|
|
|
|
|
|
|
|
y = tile->comp[compno].coord[1][0] - s->image_offset_y; |
|
|
|
|
linel = (uint16_t *)picture->data[plane] + y * (picture->linesize[plane] >> 1); |
|
|
|
|
linel = (uint16_t *)picture->data[plane] + y / s->cdy[compno] * (picture->linesize[plane] >> 1); |
|
|
|
|
for (; y < tile->comp[compno].coord[1][1] - s->image_offset_y; y += s->cdy[compno]) { |
|
|
|
|
uint16_t *dst; |
|
|
|
|
|
|
|
|
|
x = tile->comp[compno].coord[0][0] - s->image_offset_x; |
|
|
|
|
dst = linel + (x * pixelsize + compno*!planar); |
|
|
|
|
dst = linel + (x / s->cdx[compno] * pixelsize + compno*!planar); |
|
|
|
|
if (codsty->transform == FF_DWT97) { |
|
|
|
|
for (; x < w; x += s-> cdx[compno]) { |
|
|
|
|
int val = lrintf(*datap) + (1 << (cbps - 1)); |
|
|
|
|