From f39fc0703c910cd68652a19be6c33b1fcebd5242 Mon Sep 17 00:00:00 2001
From: Manuel Grizonnet <manuel.grizonnet@orfeo-toolbox.org>
Date: Tue, 23 Sep 2014 10:03:48 +0200
Subject: [PATCH] ENH: move smoothing application to filtering directory
---
Applications/Filtering/CMakeLists.txt | 4 ++-
.../{Utils => Filtering}/otbSmoothing.cxx | 0
Applications/Utils/CMakeLists.txt | 4 ---
Testing/Applications/CMakeLists.txt | 1 +
Testing/Applications/Filtering/CMakeLists.txt | 29 +++++++++++++++++++
5 files changed, 33 insertions(+), 5 deletions(-)
rename Applications/{Utils => Filtering}/otbSmoothing.cxx (100%)
create mode 100644 Testing/Applications/Filtering/CMakeLists.txt
diff --git a/Applications/Filtering/CMakeLists.txt b/Applications/Filtering/CMakeLists.txt
index 67f3812784..4518e9f9c0 100644
--- a/Applications/Filtering/CMakeLists.txt
+++ b/Applications/Filtering/CMakeLists.txt
@@ -2,4 +2,6 @@ OTB_CREATE_APPLICATION(NAME Despeckle
SOURCES otbDespeckle.cxx
LINK_LIBRARIES OTBIO;OTBCommon;OTBBasicFilters)
-
+OTB_CREATE_APPLICATION(NAME Smoothing
+ SOURCES otbSmoothing.cxx
+ LINK_LIBRARIES OTBIO;OTBCommon;OTBBasicFilters)
diff --git a/Applications/Utils/otbSmoothing.cxx b/Applications/Filtering/otbSmoothing.cxx
similarity index 100%
rename from Applications/Utils/otbSmoothing.cxx
rename to Applications/Filtering/otbSmoothing.cxx
diff --git a/Applications/Utils/CMakeLists.txt b/Applications/Utils/CMakeLists.txt
index 929493b6fe..c873eea0e3 100644
--- a/Applications/Utils/CMakeLists.txt
+++ b/Applications/Utils/CMakeLists.txt
@@ -7,10 +7,6 @@ OTB_CREATE_APPLICATION(NAME Rescale
SOURCES otbRescale.cxx
LINK_LIBRARIES OTBIO;OTBCommon;OTBBasicFilters)
-OTB_CREATE_APPLICATION(NAME Smoothing
- SOURCES otbSmoothing.cxx
- LINK_LIBRARIES OTBIO;OTBCommon;OTBBasicFilters)
-
OTB_CREATE_APPLICATION(NAME ReadImageInfo
SOURCES otbReadImageInfo.cxx
LINK_LIBRARIES OTBIO;OTBCommon;OTBBasicFilters)
diff --git a/Testing/Applications/CMakeLists.txt b/Testing/Applications/CMakeLists.txt
index f15da6e2aa..5b278561d8 100644
--- a/Testing/Applications/CMakeLists.txt
+++ b/Testing/Applications/CMakeLists.txt
@@ -53,6 +53,7 @@ add_subdirectory(ChangeDetection)
add_subdirectory(Classification)
add_subdirectory(DisparityMap)
add_subdirectory(FeatureExtraction)
+add_subdirectory(Filtering)
add_subdirectory(Fusion)
add_subdirectory(Hyperspectral)
add_subdirectory(Projections)
diff --git a/Testing/Applications/Filtering/CMakeLists.txt b/Testing/Applications/Filtering/CMakeLists.txt
new file mode 100644
index 0000000000..ec00887067
--- /dev/null
+++ b/Testing/Applications/Filtering/CMakeLists.txt
@@ -0,0 +1,29 @@
+#--- Smoothing ---#
+OTB_TEST_APPLICATION(NAME apTvUtSmoothingTest
+ APP Smoothing
+ OPTIONS -in ${INPUTDATA}/poupees.tif
+ -out ${TEMP}/apTvUtSmoothingTest.tif
+ -type mean
+ VALID --compare-image ${NOTOL}
+ ${BASELINE}/apTvUtSmoothingTest.tif
+ ${TEMP}/apTvUtSmoothingTest.tif)
+
+OTB_TEST_APPLICATION(NAME apTvUtSmoothingTest_OutXML
+ APP Smoothing
+ OPTIONS -in ${INPUTDATA}/poupees.tif
+ -out ${TEMP}/apTvUtSmoothingTest_OutXML.tif
+ -type mean
+ -outxml ${TEMP}/apTvUtSmoothingTest_OutXML.xml
+ VALID --compare-image ${NOTOL}
+ ${BASELINE}/apTvUtSmoothingTest.tif
+ ${TEMP}/apTvUtSmoothingTest_OutXML.tif)
+
+OTB_TEST_APPLICATION(NAME apTvUtSmoothingTest_InXML
+ APP Smoothing
+ OPTIONS -inxml ${INPUTDATA}/apTvUtSmoothingTest_OutXML.xml
+ -in ${INPUTDATA}/poupees.tif
+ -out ${TEMP}/apTvUtSmoothingTest_InXML.tif
+ -type mean
+ VALID --compare-image ${NOTOL}
+ ${BASELINE}/apTvUtSmoothingTest.tif
+ ${TEMP}/apTvUtSmoothingTest_InXML.tif)
--
GitLab