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

mshabunin · mshabunin · commit 0d1d452b7973 · 2020-07-31T09:07:35.000Z
diff --git a/modules/imgcodecs/src/grfmt_jpeg2000.cpp b/modules/imgcodecs/src/grfmt_jpeg2000.cpp
@@ -377,7 +377,7 @@ bool  Jpeg2KDecoder::readComponent8u( uchar *data, void *_buffer,
 
     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;
 
         if( xstep == 1 )
@@ -443,7 +443,7 @@ bool  Jpeg2KDecoder::readComponent16u( unsigned short *data, void *_buffer,
 
     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;
 
         if( xstep == 1 )

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ bool Jpeg2KDecoder::readComponent8u( uchar data, void _buffer,`
`377`	`377`
`378`	`378`	`for( y = 0; y < yend - ystart; )`
`379`	`379`	`{`
`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 );`
`381`	`381`	`uchar* dst = data + (y - yoffset) * step - xoffset;`
`382`	`382`
`383`	`383`	`if( xstep == 1 )`
`@@ -443,7 +443,7 @@ bool Jpeg2KDecoder::readComponent16u( unsigned short data, void _buffer,`
`443`	`443`
`444`	`444`	`for( y = 0; y < yend - ystart; )`
`445`	`445`	`{`
`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 );`
`447`	`447`	`ushort* dst = data + (y - yoffset) * step - xoffset;`
`448`	`448`
`449`	`449`	`if( xstep == 1 )`