Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

decoder_openjpeg: Add OPJ_CALLCONV to unique_ptr deleter #1263

Merged
merged 1 commit into from
Aug 10, 2024

Conversation

lazka
Copy link
Contributor

@lazka lazka commented Aug 9, 2024

Fixes calling convention mismatch in unique_ptr declaration by adding OPJ_CALLCONV to the deleter function pointer type.

This fixes the build for 32bit Windows, where the default calling convention doesn't match OPJ_CALLCONV, which is used by all three functions.

This issue was introduced in 4851124
(and later adjusted in 242331c)

Fixes #1262

Fixes calling convention mismatch in unique_ptr declaration
by adding OPJ_CALLCONV to the deleter function pointer type.

This fixes the build for 32bit Windows, where the default
calling convention doesn't match OPJ_CALLCONV, which is used by
all three functions.

This issue was introduced in 4851124
(and later adjusted in 242331c)

Fixes strukturag#1262
@lazka
Copy link
Contributor Author

lazka commented Aug 9, 2024

Only tested against 1.18.2, since master doesn't build right now.

@farindk farindk merged commit 9d6fcc9 into strukturag:master Aug 10, 2024
2 of 36 checks passed
@farindk
Copy link
Contributor

farindk commented Aug 10, 2024

Thank you. I've merged this into master and also v1.18.x.

@lazka
Copy link
Contributor Author

lazka commented Aug 10, 2024

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1.18.2 fails to build for 32bit Windows
2 participants