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

Fix infinite loop in Image::printIFDStructure (backport #1778) #1780

Merged
merged 3 commits into from
Jul 16, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 15, 2021

This is an automatic backport of pull request #1778 done by Mergify.
Cherry-pick of d9fd4c4 has failed:

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

You are currently cherry-picking commit d9fd4c42.
  (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/image.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/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/

@kevinbackhouse kevinbackhouse force-pushed the mergify/bp/main/pr-1778 branch from f0e537f to e4e3362 Compare July 15, 2021 21:35
@codecov
Copy link

codecov bot commented Jul 15, 2021

Codecov Report

Merging #1780 (e4e3362) into main (0208b50) will increase coverage by 0.01%.
The diff coverage is 72.50%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1780      +/-   ##
==========================================
+ Coverage   67.48%   67.49%   +0.01%     
==========================================
  Files         151      151              
  Lines       20805    20815      +10     
==========================================
+ Hits        14041    14050       +9     
- Misses       6764     6765       +1     
Impacted Files Coverage Δ
src/image.cpp 72.91% <72.50%> (+0.40%) ⬆️

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 0208b50...e4e3362. Read the comment docs.

@lgtm-com
Copy link

lgtm-com bot commented Jul 15, 2021

This pull request introduces 1 alert and fixes 1 when merging e4e3362 into 0208b50 - view on LGTM.com

new alerts:

  • 1 for Comparison result is always the same

fixed alerts:

  • 1 for Multiplication result converted to larger type

src/image.cpp Show resolved Hide resolved
@kevinbackhouse kevinbackhouse merged commit 6373fe3 into main Jul 16, 2021
@mergify mergify bot deleted the mergify/bp/main/pr-1778 branch July 16, 2021 13:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants