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

api: properties build fix #1261

Closed

Conversation

bradh
Copy link
Contributor

@bradh bradh commented Aug 8, 2024

Looks like there was a merge problem, leading to this:

https://github.com/strukturag/libheif/actions/runs/10288783492/job/28475023513#step:5:393

This PR cleans that up.

if (*box_other == nullptr) {
return {heif_error_Usage_error, heif_suberror_Invalid_property, "this property is not read as a raw box"};
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should not make find_property() specific only for Box_other.

@farindk
Copy link
Contributor

farindk commented Aug 10, 2024

I'll cherry-pick 1ce3dce into the master branch, as this also fixes the merge error and make sure that find_property is not specific to Box_other.

@farindk farindk closed this Aug 10, 2024
@bradh bradh deleted the properties_build_fix_2024-08-09 branch August 11, 2024 03:13
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.

2 participants