Skip to content

Commit

Permalink
Merge pull request #606 from gazebosim/7_to_8
Browse files Browse the repository at this point in the history
Merge 7 ➡️ 8
  • Loading branch information
jennuine authored Jan 26, 2024
2 parents d97c6a1 + 8daf543 commit 3b855b4
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ labels: bug
---

<!-- If you're not sure whether your problem is a bug, please ask a question at
http://answers.gazebosim.org instead.-->
https://robotics.stackexchange.com instead.-->

## Environment
* OS Version: <!-- e.g, Ubuntu 20.04 -->
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ labels: enhancement

<!-- If you're not sure on the specifics of the feature or would like a broader
discussion, please consider posting a proposal to
http://community.gazebosim.org/ instead.-->
https://robotics.stackexchange.com instead.-->

## Desired behavior
<!-- Describe the current problem and the feature you want implemented.-->
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Ubuntu Jammy CI
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Compile and test
id: ci
uses: gazebo-tooling/action-gz-ci@jammy
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/image_display/ImageDisplay.cc
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ void ImageDisplay::ProcessImage()
case msgs::PixelFormatType::RGB_INT8:
// copy image data buffer directly to QImage
image = QImage(reinterpret_cast<const uchar *>(
this->dataPtr->imageMsg.data().c_str()), width, height, qFormat);
this->dataPtr->imageMsg.data().c_str()), width, height,
3 * width, qFormat);
break;
// for other cases, convert to RGB common::Image
case msgs::PixelFormatType::R_FLOAT32:
Expand Down

0 comments on commit 3b855b4

Please sign in to comment.