From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 13 Aug 2020 15:21:30 +0200
Subject: [PATCH] gnu: opencv: Fix build with Jasper 2.0.19.

Taken verbatim from upstream: <https://github.com/opencv/opencv/issues/17984>.

From f66fc199a20882c546fa31142e9c0f5a8b3cf983 Mon Sep 17 00:00:00 2001
From: Florian Jung <flo@windfis.ch>
Date: Wed, 29 Jul 2020 18:51:55 +0200
Subject: [PATCH] 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.
---
 modules/imgcodecs/src/grfmt_jpeg2000.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/imgcodecs/src/grfmt_jpeg2000.cpp b/modules/imgcodecs/src/grfmt_jpeg2000.cpp
index fe69f80c86f..0f4d28d6f4d 100644
--- 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 )
='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=b63cae13c11dee345632d65ddc57e5e6d4e5cf10'>root</a>/<a href='/guix/log/gnu?id=b63cae13c11dee345632d65ddc57e5e6d4e5cf10'>gnu</a>/<a href='/guix/log/gnu/services?id=b63cae13c11dee345632d65ddc57e5e6d4e5cf10'>services</a>/<a href='/guix/log/gnu/services/audio.scm?id=b63cae13c11dee345632d65ddc57e5e6d4e5cf10'>audio.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/services/audio.scm?id=b63cae13c11dee345632d65ddc57e5e6d4e5cf10&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-12-06 23:18:08 +0100'>2020-12-06</span></td><td><a href='/guix/commit/gnu/services/audio.scm?id=ce3b5e5a8d8566162201cb778c4586f94a626dfa'>services: mpd: Make /var/run/mpd/USER user-owned.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-11-06 23:10:18 +0100'>2020-11-06</span></td><td><a href='/guix/commit/gnu/services/audio.scm?id=bb124f6e9c0af0a23736f233c2ea2c9c9b4a40a6'>services: mpd: Fix daemon startup.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-11-06 22:59:19 +0100'>2020-11-06</span></td><td><a href='/guix/commit/gnu/services/audio.scm?id=7209d7cbc37c108ca1148561a681258bb2222ab1'>services: mpd: Always create the "mpd" user account.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-11-06 08:54:27 -0500'>2020-11-06</span></td><td><a href='/guix/commit/gnu/services/audio.scm?id=0c5d0c57d370b34f3ba677838deaa8baf7bca58a'>services: mpd: Do not eagerly look for a user.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2020-05-13 23:35:57 +0200'>2020-05-13</span></td><td><a href='/guix/commit/gnu/services/audio.scm?id=ad263045b9bf016d6f4fbb1f7fde0f51d3194944'>services: Add missing import.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-11-08 21:32:45 +0100'>2019-11-08</span></td><td><a href='/guix/commit/gnu/services/audio.scm?id=970cb5ceceaa85765230a9f896a43783cdcb4e6c'>services: mpd: Connect to the user's PulseAudio socket.</a><span class='msg-avail'>...</span></td><td>Robert Smith</td></tr>
<tr><td><span title='2019-10-29 15:14:22 +0100'>2019-10-29</span></td><td><a href='/guix/commit/gnu/services/audio.scm?id=878e0e1bb0d15809c6582436d53498f3e6385524'>gnu: mpd-service-type: Support configuration of outputs.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>