Merge branch 'ahcorde/update/ogre2.2' of https://github.com/ignitionr…

…obotics/ign-rendering into ahcorde/update/ogre2.2
gazebosim · Mar 25, 2021 · fcf51b1 · fcf51b1
2 parents bc12f40 + db609f3
commit fcf51b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ogre2/src/Ogre2RenderEngine.cc b/ogre2/src/Ogre2RenderEngine.cc
@@ -119,7 +119,7 @@ void Ogre2RenderEngine::Destroy()
   this->ogreOverlaySystem = nullptr;
 
   // Clean up any textures that may still be in flight.
-  Ogre::TextureGpuManager *mgr = 
+  Ogre::TextureGpuManager *mgr =
     this->ogreRoot->getRenderSystem()->getTextureGpuManager();
 
   auto entries = mgr->getEntries();

diff --git a/ogre2/src/Ogre2ThermalCamera.cc b/ogre2/src/Ogre2ThermalCamera.cc
@@ -893,7 +893,8 @@ void Ogre2ThermalCamera::PostRender()
     {
       unsigned int rawDataRowIdx = i * box.bytesPerRow / bytesPerChannel;
       unsigned int rowIdx = i * width * channelCount;
-      memcpy(&this->dataPtr->thermalImage[rowIdx], &thermalBuffer[rawDataRowIdx],
+      memcpy(&this->dataPtr->thermalImage[rowIdx],
+          &thermalBuffer[rawDataRowIdx],
           width * channelCount * bytesPerChannel);
     }
   }