From e0ccd3026760bcf08ddce96606b1312e481fa895 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Fri, 10 Feb 2017 11:32:58 +0100
Subject: [PATCH] BUG: Mantis-1361: fix ld.so message by cleaning app registry
before end of main
---
Modules/Visualization/Mapla/src/mvdMaplaApplication.cxx | 2 ++
Modules/Visualization/Monteverdi/src/mvdApplication.cxx | 8 ++++++++
2 files changed, 10 insertions(+)
diff --git a/Modules/Visualization/Mapla/src/mvdMaplaApplication.cxx b/Modules/Visualization/Mapla/src/mvdMaplaApplication.cxx
index 4a1a871a27..0096d801ee 100644
--- a/Modules/Visualization/Mapla/src/mvdMaplaApplication.cxx
+++ b/Modules/Visualization/Mapla/src/mvdMaplaApplication.cxx
@@ -31,6 +31,7 @@
//
// OTB includes (sorted by alphabetic order)
+#include "otbWrapperApplicationRegistry.h"
//
// Monteverdi includes (sorted by alphabetic order)
@@ -74,6 +75,7 @@ MaplaApplication
MaplaApplication
::~MaplaApplication()
{
+ otb::Wrapper::ApplicationRegistry::CleanRegistry();
}
/*******************************************************************************/
diff --git a/Modules/Visualization/Monteverdi/src/mvdApplication.cxx b/Modules/Visualization/Monteverdi/src/mvdApplication.cxx
index e42c38f39a..265818ade7 100644
--- a/Modules/Visualization/Monteverdi/src/mvdApplication.cxx
+++ b/Modules/Visualization/Monteverdi/src/mvdApplication.cxx
@@ -34,6 +34,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
+#include "mvdMainWindow.h"
#include "mvdStackedLayerModel.h"
//
@@ -41,6 +42,10 @@
# include "mvdOTBApplicationsModel.h"
#endif
+#if USE_OTB_APPS
+#include "otbWrapperApplicationRegistry.h"
+#endif
+
//
// Class implementation.
namespace mvd
@@ -76,6 +81,9 @@ Application
Application
::~Application()
{
+#if USE_OTB_APPS
+ otb::Wrapper::ApplicationRegistry::CleanRegistry();
+#endif
}
/*******************************************************************************/
--
GitLab