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.

Sign up for GitHub

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

Jump to bottom

makernotes: workaround for Olympus header corruption #2567

Merged
merged 1 commit into from Mar 30, 2023
Merged

makernotes: workaround for Olympus header corruption #2567

merged 1 commit into from Mar 30, 2023

Conversation

kmilos
Copy link
Collaborator

@kmilos kmilos commented Mar 29, 2023

Addresses #2542 as a workaround rather than a proper solution.

Should be able to parse the data back, but still leaves a "corrupted" file that other apps might have trouble with...

@tenzap I think this should also apply to 0.27 branch (w/ maybe some minimal tweaks), so please feel free to test.

@ghost
Copy link

ghost commented Mar 29, 2023

👇 Click on the image for a new way to code review

Review these changes using an interactive CodeSee Map

Legend

CodeSee Map legend

@codecov
Copy link

codecov bot commented Mar 29, 2023

Codecov Report

Merging #2567 (0f31c85) into main (0fa22ed) will decrease coverage by 0.02%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##             main    #2567      +/-   ##
==========================================
- Coverage   63.90%   63.89%   -0.02%     
==========================================
  Files         103      103              
  Lines       22393    22397       +4     
  Branches    10824    10826       +2     
==========================================
  Hits        14310    14310              
- Misses       5864     5867       +3     
- Partials     2219     2220       +1
Impacted Files Coverage Δ
src/makernote_int.cpp 65.85% <0.00%> (-0.50%) ⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@kmilos kmilos added the makerNote Anything related to one of the various supported MakerNote formats label Mar 29, 2023
@neheb neheb merged commit 0dd0689 into main Mar 30, 2023
134 checks passed
@neheb neheb deleted the workaround_2542 branch March 30, 2023 19:09
@kmilos
Copy link
Collaborator Author

kmilos commented Mar 31, 2023

Is there an appetite to backport for a 0.27.7 hotfix (w/ maybe a few more select cherry-picks)? @nehaljwani @kevinbackhouse @piponazo @postscript-dev @hassec

@kevinbackhouse
Copy link
Collaborator

Is there an appetite to backport for a 0.27.7 hotfix (w/ maybe a few more select cherry-picks)? @nehaljwani @kevinbackhouse @piponazo @postscript-dev @hassec

Yes, that makes sense. My understanding from quickly reading #2542 is that this was a regression from 0.27.5 to 0.27.6.

@kmilos
Copy link
Collaborator Author

kmilos commented Apr 1, 2023

Not a regression per se, as the feature responsible for the bug wasn't there in 0.27.5 at all.

@nehaljwani
Copy link
Collaborator

Feel free to open a pull request for the 0.27-maintenance branch and I'll cut a release after it is merged.

kmilos added a commit that referenced this pull request Apr 4, 2023
@kmilos
makernotes: workaround for Olympus header corruption (backport #2567)
9448f85
@kmilos
Copy link
Collaborator Author

kmilos commented Apr 4, 2023

Great, can you please create a 0.27.7 milestone then as well?

Any other changes we might want to backport? @kevinbackhouse @piponazo @postscript-dev @hassec

kmilos added a commit that referenced this pull request Apr 4, 2023
@kmilos
makernotes: workaround for Olympus header corruption (backport #2567)
04d3a7c
@kevinbackhouse kevinbackhouse linked an issue Apr 7, 2023 that may be closed by this pull request
olympus makernotes get lost or corrupt with 0.27.6 #2542
Open
kmilos added a commit that referenced this pull request Apr 17, 2023
@kmilos
Merge pull request #2579 from Exiv2/bp_pr-2567
d6ea2a8 
makernotes: workaround for Olympus header corruption (backport #2567)
kmilos added a commit that referenced this pull request Apr 17, 2023
@kmilos
Merge pull request #2587 from Exiv2/test_2542
a5d5166 
Add test case (complements #2567)
@nehaljwani nehaljwani mentioned this pull request Apr 30, 2023
Closed
@nehaljwani
Copy link
Collaborator

@kmilos Is now a good time to cut a release with the backports?

@kmilos
Copy link
Collaborator Author

kmilos commented May 12, 2023

@nehaljwani Sure, thanks!

@nehaljwani
Copy link
Collaborator

nehaljwani commented May 13, 2023 •
edited

Exiv2 v0.27.7 2023-05-14

Topic More Info
Remaining ( 0) https://github.com/Exiv2/exiv2/milestone/11
Completed (3) https://github.com/Exiv2/exiv2/milestone/11?closed=1

Exiv2 v0.27.7 Acknowledgements

According to git shortlog -s -n v0.27.6..v0.27.7

Commits Author
8 Miloš Komarčević
2 Peter Kovář
1 Nehal J Wani

Exiv2 v0.27.7 Release Notes

Group PR Topic Issue
Bugs & Fixes #2579 makernotes: workaround for Olympus header corruption #2542
#2578 Corrected JPEG XL file type
#2614 BMFF: fix handling of boxes w/ zero length or type darktable-org/darktable#14473
CI #2604 CI: Bump conan version

If I've failed to acknowledge anyone's contribution, I apologize. Please let me know and I'll update this comment.

ReillyBrogan added a commit to getsolus/packages that referenced this pull request Oct 8, 2023
@ReillyBrogan
exiv2: Update to v0.27.7
ea9b81a 
Release notes:
- [0.27.7](Exiv2/exiv2#2567 (comment))
- [0.27.6](Exiv2/exiv2#2406 (comment))

Signed-off-by: Reilly Brogan <reilly@reillybrogan.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neheb neheb neheb approved these changes

Assignees
No one assigned
Labels
makerNote Anything related to one of the various supported MakerNote formats
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

olympus makernotes get lost or corrupt with 0.27.6
4 participants
@kmilos @kevinbackhouse @nehaljwani @neheb