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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restore format conversion in Ogre2RenderTarget::Copy #564

Merged

Conversation

darksylinc
Copy link
Contributor

@darksylinc darksylinc commented Feb 19, 2022

馃 Bug fix

No ticket has been associated with this issue

Summary

When ignition moved to Ogre 2.2+; Ogre2RenderTarget::Copy lost the ability to convert between src & dst formats. This PR restores it.

It also should be faster because we avoid an unnecessary extra copy.

Additionally, Ogre2Conversions::ogrePixelFormats had a missing entry which could trigger bugs if the not-so-popular PF_R8G8B8A8 format is used

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
This fixes a regression. Now tests pass again

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
@github-actions github-actions bot added the 馃彲 fortress Ignition Fortress label Feb 19, 2022
@osrf-triage osrf-triage added this to Inbox in Core development Feb 19, 2022
Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
@codecov
Copy link

codecov bot commented Feb 19, 2022

Codecov Report

Merging #564 (b4d8cc9) into ign-rendering6 (e0ed1b1) will increase coverage by 0.00%.
The diff coverage is 92.30%.

Impacted file tree graph

@@               Coverage Diff               @@
##           ign-rendering6     #564   +/-   ##
===============================================
  Coverage           54.36%   54.37%           
===============================================
  Files                 198      198           
  Lines               20151    20146    -5     
===============================================
- Hits                10956    10955    -1     
+ Misses               9195     9191    -4     
Impacted Files Coverage 螖
ogre2/src/Ogre2Conversions.cc 100.00% <酶> (+7.14%) 猬嗭笍
ogre2/src/Ogre2RenderTarget.cc 86.60% <92.30%> (-0.40%) 猬囷笍
...e/ignition/rendering/base/BaseGaussianNoisePass.hh 100.00% <0.00%> (+3.33%) 猬嗭笍
src/Image.cc 84.61% <0.00%> (+7.69%) 猬嗭笍

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 e0ed1b1...b4d8cc9. Read the comment docs.

Copy link
Contributor

@iche033 iche033 left a comment

Choose a reason for hiding this comment

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

looks good to me.

Core development automation moved this from Inbox to In review Feb 22, 2022
@iche033 iche033 merged commit 3bf2575 into gazebosim:ign-rendering6 Feb 22, 2022
Core development automation moved this from In review to Done Feb 22, 2022
@osrf-triage
Copy link

This pull request has been mentioned on Gazebo Community. There might be relevant details there:

https://community.gazebosim.org/t/new-ignition-releases-2022-03-01-citadel-edifice-fortress/1313/1

@j-rivero j-rivero removed this from Done in Core development May 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
馃彲 fortress Ignition Fortress
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants