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

4 -> 5 #349

Merged
merged 11 commits into from
Jun 22, 2021
Merged

4 -> 5 #349

merged 11 commits into from
Jun 22, 2021

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Jun 21, 2021

➡️ Forward port

Port ign-rendering4 to ign-rendering5

Branch comparison: ign-rendering5...ign-rendering4

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

darksylinc and others added 11 commits June 14, 2021 13:43
Fixes #332
Fixes #108

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
* update test

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* reenable macos test

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* fix typo

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
* Fix heap overflow when reading (#337)

PF_RGB is 3 bytes. But later on Ogre2SelectionBuffer::OnSelectionClick
will try to read 4 bytes from it.

Fixed by ensuring it's always at least 4 bytes and zero-initializing
those 4 bytes.

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>

Co-authored-by: Ian Chen <ichen@osrfoundation.org>

* Fix new [] / delete mismatch (#338)

Using a custom deallocator to avoid breaking ABI

Alternatively C++17 supports the following syntax, which was not used:

`typedef std::shared_ptr<unsigned char[]> DataPtr;`

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>

Co-authored-by: darksylinc <dark_sylinc@yahoo.com.ar>
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
@osrf-triage osrf-triage added this to Inbox in Core development Jun 21, 2021
@github-actions github-actions bot added the 🏢 edifice Ignition Edifice label Jun 21, 2021
@codecov
Copy link

codecov bot commented Jun 21, 2021

Codecov Report

Merging #349 (9be3487) into ign-rendering5 (76aa471) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@               Coverage Diff               @@
##           ign-rendering5     #349   +/-   ##
===============================================
  Coverage           57.80%   57.80%           
===============================================
  Files                 161      161           
  Lines               15851    15851           
===============================================
  Hits                 9163     9163           
  Misses               6688     6688           
Impacted Files Coverage Δ
ogre2/src/Ogre2RenderTarget.cc 81.25% <100.00%> (ø)

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 76aa471...9be3487. Read the comment docs.

Core development automation moved this from Inbox to In review Jun 22, 2021
@iche033 iche033 merged commit 9d9896f into ign-rendering5 Jun 22, 2021
@iche033 iche033 deleted the merge_4_5_062121 branch June 22, 2021 04:37
Core development automation moved this from In review to Done Jun 22, 2021
@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
🏢 edifice Ignition Edifice
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants