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

Remove unnecessary field (backport #3137) #3139

Merged
merged 4 commits into from
Feb 1, 2025
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 31, 2025

Remove CiffDirectory::cc_. It's a raw pointer, so it's ownership is unclear. There also doesn't seem to be any reason to store it in the object.


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

@mergify mergify bot added the conflicts label Jan 31, 2025
Copy link
Contributor Author

mergify bot commented Jan 31, 2025

Cherry-pick of db8b8c2 has failed:

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

You are currently cherry-picking commit db8b8c26.
  (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/crwimage_int.hpp

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

Cherry-pick of 03bdced has failed:

On branch mergify/bp/0.28.x/pr-3137
Your branch is ahead of 'origin/0.28.x' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 03bdced4.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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 mentioned this pull request Jan 31, 2025
@kmilos kmilos added this to the v0.28.4 milestone Jan 31, 2025
neheb and others added 4 commits January 31, 2025 18:22
find_if is too heavy to use here.

Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit 289eb76)
(cherry picked from commit db8b8c2)
(cherry picked from commit b2fdeca)
(cherry picked from commit 03bdced)
@neheb neheb force-pushed the mergify/bp/0.28.x/pr-3137 branch from 16e1d8b to 5173509 Compare February 1, 2025 02:23
@neheb neheb merged commit 4ef2c03 into 0.28.x Feb 1, 2025
62 checks passed
@neheb neheb deleted the mergify/bp/0.28.x/pr-3137 branch February 1, 2025 02:57
@kmilos kmilos added bug makerNote Anything related to one of the various supported MakerNote formats and removed conflicts labels Feb 1, 2025
@kmilos
Copy link
Collaborator

kmilos commented Feb 1, 2025

@kevinbackhouse @nehaljwani Any appetite for a 0.28.4 release?

@kevinbackhouse
Copy link
Collaborator

@kevinbackhouse @nehaljwani Any appetite for a 0.28.4 release?

Yes, I can help with that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug makerNote Anything related to one of the various supported MakerNote formats
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants