Fix build of grfmt_jpeg2000.cpp#17983
Merged
opencv-pushbot merged 1 commit intoopencv:3.4from Jul 31, 2020
Merged
Conversation
3 tasks
Contributor
|
@Windfisch Thanks for the contribution. I tested the patch with Ubuntu 18.04 and it works as designed. The same issue is reproducible with branch 3.4 too. Could you re-base your branch to 3.4 and re-target the PR 3.4 branch. You can do it in-place, no need to create new one. We will merge changes from 3.4 into master regularly (weekly/bi-weekly). So, please:
|
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.
87cad1d to
f66fc19
Compare
Contributor
Author
|
Thank you for your feedback, @asmorkalov! I have rebased this PR, and I have additionally created PR #17996 to backport this fix into 2.4. Hope this is fine. |
asmorkalov
approved these changes
Jul 30, 2020
Contributor
|
@mshabunin I think we can merge the patch. |
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
libjasper has recently changed
jas_matrix_getfrom a macro to an inline function (389951d07 @ https://github.com/jasper-software/jasper), causing the build to fail witherror: lvalue required as unary ‘&’ operand.This likely also affects the Opencv 3 and 2 branches; I can create a PR for these, too, if desired.
Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request