From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/opencv: fix build with jasper >= 2.0.17
Date: Sun, 16 Aug 2020 22:48:51 +0200 [thread overview]
Message-ID: <20200816204851.GG24264@scaer> (raw)
In-Reply-To: <20200816120902.1118334-1-fontaine.fabrice@gmail.com>
Fabrice, All,
On 2020-08-16 14:09 +0200, Fabrice Fontaine spake thusly:
> Fixes:
> - http://autobuild.buildroot.org/results/656e2232a0566ba8f7826a87b1fab9cc2c3d8e46
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> ...0001-Fix-build-of-grfmt_jpeg2000-cpp.patch | 37 +++++++++++++++++++
> 1 file changed, 37 insertions(+)
> create mode 100644 package/opencv/0001-Fix-build-of-grfmt_jpeg2000-cpp.patch
>
> diff --git a/package/opencv/0001-Fix-build-of-grfmt_jpeg2000-cpp.patch b/package/opencv/0001-Fix-build-of-grfmt_jpeg2000-cpp.patch
> new file mode 100644
> index 0000000000..683dd95d97
> --- /dev/null
> +++ b/package/opencv/0001-Fix-build-of-grfmt_jpeg2000-cpp.patch
> @@ -0,0 +1,37 @@
> +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.
> +
> +[Retrieved (and backported) from:
> +https://github.com/opencv/opencv/commit/f66fc199a20882c546fa31142e9c0f5a8b3cf983]
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +---
> + modules/imgcodecs/src/grfmt_jpeg2000.cpp | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/modules/highgui/src/grfmt_jpeg2000.cpp b/modules/highgui/src/grfmt_jpeg2000.cpp
> +index fe69f80c86f..0f4d28d6f4d 100644
> +--- a/modules/highgui/src/grfmt_jpeg2000.cpp
> ++++ b/modules/highgui/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 )
> --
> 2.27.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2020-08-16 20:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-16 12:09 [Buildroot] [PATCH 1/1] package/opencv: fix build with jasper >= 2.0.17 Fabrice Fontaine
2020-08-16 20:48 ` Yann E. MORIN [this message]
2020-08-28 16:47 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200816204851.GG24264@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox