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

NITF: properly take into account comma-separated list of values for JPEG2000 QUALITY #10930

Merged
merged 1 commit into from
Oct 4, 2024

Conversation

rouault
Copy link
Member

@rouault rouault commented Oct 4, 2024

when JPEG2000_DRIVER=JP2OpenJPEG

Fixes #10927

@rouault rouault force-pushed the nitf_quality branch 2 times, most recently from e96ddbd to c09dd0f Compare October 4, 2024 16:46
@rouault rouault changed the title NITF: do not emit warning for comma-separated list of values for JPEG2000 QUALITY NITF: properly take into account comma-separated list of values for JPEG2000 QUALITY Oct 4, 2024
…PEG2000 QUALITY

when JPEG2000_DRIVER=JP2OpenJPEG

Fixes OSGeo#10927
@rouault rouault merged commit 916280a into OSGeo:master Oct 4, 2024
36 checks passed
@rouault
Copy link
Member Author

rouault commented Oct 4, 2024

The backport to release/3.9 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 881550f6e8... NITF: properly take into account comma-separated list of values for JPEG2000 QUALITY
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging autotest/gdrivers/nitf.py
CONFLICT (content): Merge conflict in autotest/gdrivers/nitf.py
Auto-merging doc/source/drivers/raster/nitf.rst
CONFLICT (content): Merge conflict in doc/source/drivers/raster/nitf.rst
Auto-merging frmts/nitf/nitfdataset.cpp

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release/3.9 release/3.9
# Navigate to the new working tree
cd .worktrees/backport-release/3.9
# Create a new branch
git switch --create backport-10930-to-release/3.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 881550f6e8726d5461c01b90c4273b736125b96d
# Push it to GitHub
git push --set-upstream origin backport-10930-to-release/3.9
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.9

Then, create a pull request where the base branch is release/3.9 and the compare/head branch is backport-10930-to-release/3.9.

@rouault
Copy link
Member Author

rouault commented Oct 5, 2024

cherry-picked to 3.9 per e9a6afe

@rouault rouault added this to the 3.9.3 milestone Oct 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unable to set Quality Layers for a JPEG2000 compressed NITF
1 participant