Skip to content

Commit f66fc19

Browse files
committed
Fix build of grfmt_jpeg2000.cpp
libjasper has recently changed `jas_matrix_get` from a macro to an inline function (389951d071 in https://github.com/jasper-software/jasper), causing the build to fail.
1 parent e4d573a commit f66fc19

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

modules/imgcodecs/src/grfmt_jpeg2000.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ bool Jpeg2KDecoder::readComponent8u( uchar *data, void *_buffer,
377377

378378
for( y = 0; y < yend - ystart; )
379379
{
380-
jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 );
380+
jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 );
381381
uchar* dst = data + (y - yoffset) * step - xoffset;
382382

383383
if( xstep == 1 )
@@ -443,7 +443,7 @@ bool Jpeg2KDecoder::readComponent16u( unsigned short *data, void *_buffer,
443443

444444
for( y = 0; y < yend - ystart; )
445445
{
446-
jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 );
446+
jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 );
447447
ushort* dst = data + (y - yoffset) * step - xoffset;
448448

449449
if( xstep == 1 )

0 commit comments

Comments
 (0)