Merge pull request #17983 from Windfisch:Windfisch-patch-jpeg2000

This commit is contained in:
Maksim Shabunin 2020-07-31 09:07:35 +00:00
commit 0d1d452b79

View File

@ -377,7 +377,7 @@ bool Jpeg2KDecoder::readComponent8u( uchar *data, void *_buffer,
for( y = 0; y < yend - ystart; ) for( y = 0; y < yend - ystart; )
{ {
jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 ); jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 );
uchar* dst = data + (y - yoffset) * step - xoffset; uchar* dst = data + (y - yoffset) * step - xoffset;
if( xstep == 1 ) if( xstep == 1 )
@ -443,7 +443,7 @@ bool Jpeg2KDecoder::readComponent16u( unsigned short *data, void *_buffer,
for( y = 0; y < yend - ystart; ) for( y = 0; y < yend - ystart; )
{ {
jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 ); jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 );
ushort* dst = data + (y - yoffset) * step - xoffset; ushort* dst = data + (y - yoffset) * step - xoffset;
if( xstep == 1 ) if( xstep == 1 )