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

Improve CR3 preview handling (backport #1978) #1981

Merged
merged 2 commits into from
Oct 21, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 21, 2021

This is an automatic backport of pull request #1978 done by Mergify.
Cherry-pick of 40e5021 has failed:

On branch mergify/bp/0.27-maintenance/pr-1978
Your branch is up to date with 'origin/0.27-maintenance'.

You are currently cherry-picking commit 40e50215.
  (all conflicts fixed: 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)

nothing to commit, working tree clean

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

kmilos and others added 2 commits October 21, 2021 10:08
(cherry picked from commit 40e5021)
@mergify mergify bot added the conflicts label Oct 21, 2021
Copy link
Collaborator

@clanmills clanmills left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right. This looks great. Thanks very much.

@clanmills
Copy link
Collaborator

I'll merge this when the CI is green. I'll finish working on the release notes while waiting for the CI. v0.27.5 will be on exiv2.org today for Team Inspection. I'll ask Alex to announce it tomorrow on Facebook and discuss.pixls.us.

@codecov
Copy link

codecov bot commented Oct 21, 2021

Codecov Report

Merging #1981 (5b2fcf7) into 0.27-maintenance (5bfb4d9) will decrease coverage by 0.00%.
The diff coverage is 27.27%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##           0.27-maintenance    #1981      +/-   ##
====================================================
- Coverage             46.37%   46.36%   -0.01%     
====================================================
  Files                   146      146              
  Lines                 22988    23005      +17     
  Branches              11806    11809       +3     
====================================================
+ Hits                  10660    10666       +6     
- Misses                 6679     6689      +10     
- Partials               5649     5650       +1     
Impacted Files Coverage Δ
include/exiv2/bmffimage.hpp 75.00% <ø> (ø)
src/bmffimage.cpp 43.69% <27.27%> (-0.35%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5bfb4d9...5b2fcf7. Read the comment docs.

@clanmills clanmills merged commit c42684f into 0.27-maintenance Oct 21, 2021
@clanmills clanmills deleted the mergify/bp/0.27-maintenance/pr-1978 branch October 21, 2021 11:09
@kmilos
Copy link
Collaborator

kmilos commented Oct 21, 2021

Fantastic, thanks!

@kmilos kmilos added this to the v0.27.5 milestone Oct 21, 2021
@kmilos kmilos changed the title Limit CR3 previews to JPEG only (backport #1978) Improve CR3 preview handling (backport #1978) Oct 21, 2021
@kmilos kmilos added enhancement feature / functionality enhancements and removed conflicts labels Oct 21, 2021
@kmilos kmilos mentioned this pull request Oct 21, 2021
@clanmills clanmills mentioned this pull request Oct 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement feature / functionality enhancements
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants