From bb94305f87db931aa351c398fba2d1fc01651470 Mon Sep 17 00:00:00 2001
From: Antoine Regimbeau <antoine.regimbeau@c-s.fr>
Date: Thu, 22 Mar 2018 10:41:27 +0100
Subject: [PATCH] REFAC: get rid of duplicate function and use for loop instead
of while
---
.../include/otbWrapperInputImageParameter.h | 5 -----
.../ApplicationEngine/src/otbWrapperApplication.cxx | 10 +++-------
Modules/Wrappers/ApplicationEngine/test/CMakeLists.txt | 1 +
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h
index 29785f0789..29b9ac2866 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h
@@ -109,11 +109,6 @@ public:
void ClearValue() override;
- ImageBaseType::Pointer GetPointer()
- {
- return m_Image;
- }
-
protected:
/** Constructor */
InputImageParameter();
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperApplication.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperApplication.cxx
index 92bf408c70..f1b87de858 100644
--- a/Modules/Wrappers/ApplicationEngine/src/otbWrapperApplication.cxx
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperApplication.cxx
@@ -416,7 +416,7 @@ Application::RegisterPipeline()
dynamic_cast< InputImageParameter * >( param );
if ( !inP->HasValue() )
continue;
- itk::ImageBase< 2 > * inData = inP->GetPointer();
+ ImageBaseType * inData = inP->GetImage< ImageBaseType >();
if ( inData && !inputData.count(inData) )
inputData.insert(inData);
}
@@ -428,13 +428,11 @@ Application::RegisterPipeline()
if ( !inP->HasValue() )
continue;
const FloatVectorImageListType * list = inP->GetImageList();
- auto it = list->Begin();
- while ( it != list->End() )
+ for ( auto it = list->Begin() ; it != list->End() ; ++it )
{
FloatVectorImageType * inData = it.Get().GetPointer();
if ( inData && !inputData.count(inData) )
inputData.insert(inData);
- ++it;
}
}
else if ( GetParameterType(key) == ParameterType_InputVectorData )
@@ -456,13 +454,11 @@ Application::RegisterPipeline()
if ( !inP->HasValue() )
continue;
VectorDataListType * list = inP->GetVectorDataList();
- auto it = list->Begin();
- while ( it != list->End() )
+ for ( auto it = list->Begin() ; it != list->End() ; ++it )
{
VectorDataType * inData = it.Get().GetPointer();
if ( inData && !inputData.count(inData) )
inputData.insert(inData);
- ++it;
}
}
}
diff --git a/Modules/Wrappers/ApplicationEngine/test/CMakeLists.txt b/Modules/Wrappers/ApplicationEngine/test/CMakeLists.txt
index 856191df14..e92b69dc03 100644
--- a/Modules/Wrappers/ApplicationEngine/test/CMakeLists.txt
+++ b/Modules/Wrappers/ApplicationEngine/test/CMakeLists.txt
@@ -190,6 +190,7 @@ otb_add_test(NAME owTuDocExampleStructureNew COMMAND otbApplicationEngineTestDri
otbWrapperDocExampleStructureNew
)
+# Warning this test require otbapp_Smoothing and otbapp_ConcatenateImages to be built
otb_add_test(NAME owTvApplicationMemoryConnectTest COMMAND otbApplicationEngineTestDriver otbApplicationMemoryConnectTest
$<TARGET_FILE_DIR:otbapp_Smoothing>
${INPUTDATA}/poupees.tif
--
GitLab