From 9fac33ccaf4b602808dbe88d0cf1bcd45ab6d412 Mon Sep 17 00:00:00 2001
From: xlla <xllacyx@hotmail.com>
Date: Wed, 11 May 2022 02:32:22 +0800
Subject: [PATCH 1/2] fix issue #810

Signed-off-by: xlla <xllacyx@hotmail.com>
---
 rviz_rendering/src/rviz_rendering/render_system.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rviz_rendering/src/rviz_rendering/render_system.cpp b/rviz_rendering/src/rviz_rendering/render_system.cpp
index 0a61d64d6..a9d400b23 100644
--- a/rviz_rendering/src/rviz_rendering/render_system.cpp
+++ b/rviz_rendering/src/rviz_rendering/render_system.cpp
@@ -234,6 +234,7 @@ RenderSystem::loadOgrePlugins()
   ogre_root_->loadPlugin(plugin_prefix + "RenderSystem_GL");
 #endif
   ogre_root_->loadPlugin(plugin_prefix + "Codec_STBI");
+  ogre_root_->loadPlugin(plugin_prefix + "Codec_FreeImage");
 // #if __APPLE__
 // #else
 // ogre_root_->loadPlugin(plugin_prefix + "RenderSystem_GL3Plus");

From 381194aa0966b3a332131db1626eb7cf9b240404 Mon Sep 17 00:00:00 2001
From: Chris Lalancette <clalancette@openrobotics.org>
Date: Wed, 1 Jun 2022 18:59:28 +0000
Subject: [PATCH 2/2] Add libfreeimage dependencies to rviz_ogre_vendor.

That way freeimage is available and OGRE support for it is
built when building this vendor package.

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
---
 rviz_ogre_vendor/package.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rviz_ogre_vendor/package.xml b/rviz_ogre_vendor/package.xml
index 571d8f1c9..cdb90ae6f 100644
--- a/rviz_ogre_vendor/package.xml
+++ b/rviz_ogre_vendor/package.xml
@@ -23,8 +23,10 @@
   <build_depend>pkg-config</build_depend>
 
   <build_depend>libfreetype6-dev</build_depend>
+  <build_depend>libfreeimage-dev</build_depend>
   <build_export_depend>libfreetype6-dev</build_export_depend>
   <exec_depend>libfreetype6</exec_depend>
+  <exec_depend>libfreeimage</exec_depend>
 
   <depend>libx11-dev</depend>
   <depend>libxaw</depend>