From 7777df651a6b415baf40a9fd46009dd77c2d795b Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@orfeo-toolbox.org>
Date: Thu, 10 Oct 2013 12:00:29 +0200
Subject: [PATCH] LSMS integration (moving LSMSMerging app to
 LSMSSmallRegionsMerging)

---
 Applications/Segmentation/CMakeLists.txt                 | 4 ++--
 Applications/Segmentation/otbLSMSSmallRegionsMerging.cxx | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Applications/Segmentation/CMakeLists.txt b/Applications/Segmentation/CMakeLists.txt
index a777e3e356..3856786ba1 100644
--- a/Applications/Segmentation/CMakeLists.txt
+++ b/Applications/Segmentation/CMakeLists.txt
@@ -19,8 +19,8 @@ OTB_CREATE_APPLICATION(NAME           LSMSSegmentation
                        SOURCES        otbLSMSSegmentation.cxx
                        LINK_LIBRARIES OTBBasicFilters;OTBOBIA;OTBOGRAdapters)
 
-OTB_CREATE_APPLICATION(NAME           LSMSMerging
-                       SOURCES        otbLSMSMerging.cxx
+OTB_CREATE_APPLICATION(NAME           LSMSSmallRegionsMerging
+                       SOURCES        otbLSMSSmallRegionsMerging.cxx
                        LINK_LIBRARIES OTBBasicFilters;OTBOBIA;OTBOGRAdapters)
 
 OTB_CREATE_APPLICATION(NAME           LSMSVectorization
diff --git a/Applications/Segmentation/otbLSMSSmallRegionsMerging.cxx b/Applications/Segmentation/otbLSMSSmallRegionsMerging.cxx
index 91ea2059a1..2a28e02974 100644
--- a/Applications/Segmentation/otbLSMSSmallRegionsMerging.cxx
+++ b/Applications/Segmentation/otbLSMSSmallRegionsMerging.cxx
@@ -43,10 +43,10 @@ namespace otb
 {
 namespace Wrapper
 {
-class LSMSMerging : public Application
+class LSMSSmallRegionsMerging : public Application
 {
 public:
-  typedef LSMSMerging Self;
+  typedef LSMSSmallRegionsMerging Self;
   typedef Application Superclass;
   typedef itk::SmartPointer<Self> Pointer;
   typedef itk::SmartPointer<const Self> ConstPointer;
@@ -80,7 +80,7 @@ private:
 
   void DoInit()
   {
-    SetName("LSMSSmallRegionMerging");
+    SetName("LSMSSmallRegionsMerging");
     SetDescription("Third (optional) step of the exact Large-Scale Mean-Shift segmentation workflow.");
 
     SetDocName("Exact Large-Scale Mean-Shift segmentation, step 3 (optional)");
@@ -427,6 +427,6 @@ private:
 }
 }
 
-OTB_APPLICATION_EXPORT(otb::Wrapper::LSMSMerging)
+OTB_APPLICATION_EXPORT(otb::Wrapper::LSMSSmallRegionsMerging)
 
 
-- 
GitLab