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

Add support for HEJ2K mime type (backport #2841) #3087

Merged
merged 1 commit into from
Dec 7, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 7, 2024

See https://www.itu.int/rec/T-REC-T.815/en


This is an automatic backport of pull request #2841 done by Mergify.

@mergify mergify bot added the conflicts label Dec 7, 2024
Copy link
Contributor Author

mergify bot commented Dec 7, 2024

Cherry-pick of 5645fe6 has failed:

On branch mergify/bp/0.28.x/pr-2841
Your branch is up to date with 'origin/0.28.x'.

You are currently cherry-picking commit 5645fe6c8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   test/data/Reagan.hej2
	new file:   test/data/test_reference_files/Reagan.hej2.out

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/bmffimage.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@kmilos kmilos added enhancement feature / functionality enhancements imageHandler Anything related to specific ImageHandlers labels Dec 7, 2024
(cherry picked from commit 5645fe6)

# Conflicts:
#	src/bmffimage.cpp
@kmilos kmilos force-pushed the mergify/bp/0.28.x/pr-2841 branch from 4b7d836 to e282a38 Compare December 7, 2024 16:35
@kmilos kmilos removed the conflicts label Dec 7, 2024
@kmilos kmilos added this to the v0.28.4 milestone Dec 7, 2024
@kmilos kmilos merged commit 16a0598 into 0.28.x Dec 7, 2024
62 checks passed
@mergify mergify bot deleted the mergify/bp/0.28.x/pr-2841 branch December 7, 2024 16:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement feature / functionality enhancements imageHandler Anything related to specific ImageHandlers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant