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 )
d589c9db245fa'/><select name='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=e526b8b11debb184929abd013b7d589c9db245fa'>root</a>/<a href='/guix/log/gnu?id=e526b8b11debb184929abd013b7d589c9db245fa'>gnu</a>/<a href='/guix/log/gnu/system?id=e526b8b11debb184929abd013b7d589c9db245fa'>system</a>/<a href='/guix/log/gnu/system/images?id=e526b8b11debb184929abd013b7d589c9db245fa'>images</a>/<a href='/guix/log/gnu/system/images/hurd.scm?id=e526b8b11debb184929abd013b7d589c9db245fa'>hurd.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/system/images/hurd.scm?id=e526b8b11debb184929abd013b7d589c9db245fa&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-11-11 07:28:33 +0100'>2024-11-11</span></td><td><a href='/guix/commit/gnu/system/images/hurd.scm?id=6dbfe1a118dcded3a9d77f8321aa43fbdd255011'>system: hurd: Remove qemu networking from %base-services/hurd.</a><span class='msg-avail'>...<span class='msg-tooltip'>This allows us to use %base-services/hurd for services in a Hurd config for a
real machine without removing static-networking.

* gnu/system/hurd.scm (%base-services/hurd): Factor networking out to...
(%base-services+qemu-networking/hurd): ..this new variable.
* gnu/system/examples/bare-hurd.tmpl (%hurd-os): Use it.
* gnu/services/virtualization.scm (%hurd-vm-operating-system): Use it.
* gnu/system/images/hurd.scm (hurd-barebones-os): Use it.  Add comment about
QEMU and networking for a real machine.

Change-Id: I777a63410383b9bf8b5740e4513dbc1e9fb0fd41
</span></span></td><td>Janneke Nieuwenhuizen</td></tr>
<tr><td><span title='2022-09-24 14:49:07 +0200'>2022-09-24</span></td><td><a href='/guix/commit/gnu/system/images/hurd.scm?id=08a7eb187f09aeefbb03b8b28b0d67aab33d4a06'>platforms: x86: Rename Hurd hurd to i586-gnu.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/platforms/x86.scm (hurd): Rename it to ...
(i586-gnu): ... this variable.
* gnu/system/images/hurd.scm (hurd-disk-image, hurd-barebones-disk-image,
hurd-barebones-qcow2-image): Adapt those.
</span></span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2022-09-24 14:20:36 +0200'>2022-09-24</span></td><td><a href='/guix/commit/gnu/system/images/hurd.scm?id=c009c286a23f48b56731c3e7bc4875a9e88857c4'>image: Make the operating-system field mandatory.</a><span class='msg-avail'>...<span class='msg-tooltip'>Make the operating-system field mandatory as creating an image without it
makes no sense. Introduce a new macro, image-without-os for the specific cases
where the image is only created to be inherited from afterwards.

* gnu/image.scm (&lt;image&gt;)[operating-system]: Make it mandatory.
* gnu/system/image.scm (image-without-os): New macro.
(efi-disk-image, efi32-disk-image, iso9660-image, docker-image,
raw-with-offset-disk-image): Use it.
* gnu/system/images/hurd.scm (hurd-disk-image): Ditto.
</span></span></td><td>Mathieu Othacehe</td></tr>