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

use unique_ptr (backport #3152) #3184

Merged
merged 1 commit into from
Feb 21, 2025
Merged

use unique_ptr (backport #3152) #3184

merged 1 commit into from
Feb 21, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 20, 2025


This is an automatic backport of pull request #3152 done by [Mergify](https://mergify.com).

Copy link
Contributor Author

mergify bot commented Feb 20, 2025

Cherry-pick of ecfb739 has failed:

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

You are currently cherry-picking commit ecfb739e.
  (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:
	modified:   src/makernote_int.cpp
	modified:   src/makernote_int.hpp
	modified:   src/tiffcomposite_int.cpp
	modified:   src/tiffcomposite_int.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/tiffvisitor_int.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

@mergify mergify bot added the conflicts label Feb 20, 2025
@mergify mergify bot mentioned this pull request Feb 20, 2025
Signed-off-by: Rosen Penev <rosenp@gmail.com>
@kevinbackhouse kevinbackhouse force-pushed the mergify/bp/0.28.x/pr-3152 branch from 2b1a223 to 8005494 Compare February 20, 2025 21:08
@kevinbackhouse kevinbackhouse added this to the v0.28.5 milestone Feb 20, 2025
@kmilos kmilos merged commit ac47957 into 0.28.x Feb 21, 2025
62 checks passed
@kmilos kmilos added refactoring Cleanup / Simplify code -> more readable / robust and removed conflicts labels Feb 21, 2025
@mergify mergify bot deleted the mergify/bp/0.28.x/pr-3152 branch February 21, 2025 07:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
refactoring Cleanup / Simplify code -> more readable / robust
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants