Skip to content

3rdparty: OpenJPEG update 2.4.0 => 2.5.0#23682

Merged
asmorkalov merged 2 commits intoopencv:4.xfrom
asmorkalov:as/openjpeg_2.5.0
May 29, 2023
Merged

3rdparty: OpenJPEG update 2.4.0 => 2.5.0#23682
asmorkalov merged 2 commits intoopencv:4.xfrom
asmorkalov:as/openjpeg_2.5.0

Conversation

@asmorkalov
Copy link
Copy Markdown
Contributor

@asmorkalov asmorkalov commented May 25, 2023 •
edited by opencv-alalek
Loading

Previous update: #19660

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
  • The PR is proposed to the proper branch
  • There is a reference to the original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake
build_image:Docs=docs-js:18.04
build_image:Custom=javascript
buildworker:Custom=linux-1,linux-4,linux-f1

@asmorkalov asmorkalov requested a review from mshabunin May 25, 2023 15:02
@asmorkalov asmorkalov added this to the 4.8.0 milestone May 25, 2023
@asmorkalov asmorkalov changed the title OpenJPEG update to 2.5.0 3rdparty: OpenJPEG update 2.4.0 => 2.5.0 May 25, 2023
@mshabunin
Copy link
Copy Markdown
Contributor

mshabunin commented May 26, 2023

LLVM emits a warning (e.g. OSX builders):

/opencv/3rdparty/openjpeg/openjp2/ht_dec.c:1096:10: warning: no previous prototype for function 'opj_t1_ht_decode_cblk' [-Wmissing-prototypes]
OPJ_BOOL opj_t1_ht_decode_cblk(opj_t1_t *t1,
         ^
/opencv/3rdparty/openjpeg/openjp2/ht_dec.c:1096:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
OPJ_BOOL opj_t1_ht_decode_cblk(opj_t1_t *t1,
^
static

@asmorkalov asmorkalov force-pushed the as/openjpeg_2.5.0 branch from f9c2ed1 to a636361 Compare May 26, 2023 11:16
@asmorkalov
Copy link
Copy Markdown
Contributor Author

asmorkalov commented May 26, 2023

Technically, there is function prototype in openjp2/ht_dec.c:1096. It's only place where the function is used. I added warning suppression.

@asmorkalov asmorkalov merged commit 6ad77b2 into opencv:4.x May 29, 2023
@opencv-alalek opencv-alalek mentioned this pull request May 30, 2023
Closed
This was referenced May 31, 2023
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mshabunin mshabunin mshabunin approved these changes

Assignees

@mshabunin mshabunin

Labels

category: imgcodecs category: 3rdparty

Projects

None yet

Milestone

4.8.0

Development

Successfully merging this pull request may close these issues.

2 participants

@asmorkalov @mshabunin