diff --git a/Documentation/Cookbook/rst/recipes/bandmathx.rst b/Documentation/Cookbook/rst/recipes/bandmathx.rst
index dbe74dc2dfc97ea9850819ded4aab3ff1dfcb4d8..d1036da139043bc626b953df22b2983c6a895c08 100644
--- a/Documentation/Cookbook/rst/recipes/bandmathx.rst
+++ b/Documentation/Cookbook/rst/recipes/bandmathx.rst
@@ -16,16 +16,6 @@ A simple example is given below:
#include "otbBandMathImageFilterX.h"
#include "otbVectorImage.h"
- int otbBandMathImageFilterXNew( int itkNotUsed(argc), char* itkNotUsed(argv) [])
- {
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, 2> ImageType;
- typedef otb::BandMathImageFilterX<ImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
- }
As we can see, the new band math filter works with the class
otb::VectorImage.
diff --git a/Examples/Filtering/SecondDerivativeRecursiveGaussianImageFilter.cxx b/Examples/Filtering/SecondDerivativeRecursiveGaussianImageFilter.cxx
index 9a579075a5804eff4392bfa19b048ae642e22569..7292f9ccf03def522ed37be650d52cdce0d732c5 100644
--- a/Examples/Filtering/SecondDerivativeRecursiveGaussianImageFilter.cxx
+++ b/Examples/Filtering/SecondDerivativeRecursiveGaussianImageFilter.cxx
@@ -122,7 +122,7 @@ int main(int argc, char * argv[])
writer->SetInput(Izz);
outputFileName = outputPrefix + "-Izz.hdr";
- writer->SetFileName(outputFileName.c_str());
+ writer->SetFileName(outputFileName);
writer->Update();
gc->SetDirection(1); // gc now works along Y
@@ -135,7 +135,7 @@ int main(int argc, char * argv[])
writer->SetInput(Iyy);
outputFileName = outputPrefix + "-Iyy.hdr";
- writer->SetFileName(outputFileName.c_str());
+ writer->SetFileName(outputFileName);
writer->Update();
gc->SetDirection(0); // gc now works along X
@@ -148,7 +148,7 @@ int main(int argc, char * argv[])
writer->SetInput(Ixx);
outputFileName = outputPrefix + "-Ixx.hdr";
- writer->SetFileName(outputFileName.c_str());
+ writer->SetFileName(outputFileName);
writer->Update();
ga->SetDirection(0);
@@ -166,7 +166,7 @@ int main(int argc, char * argv[])
writer->SetInput(Iyz);
outputFileName = outputPrefix + "-Iyz.hdr";
- writer->SetFileName(outputFileName.c_str());
+ writer->SetFileName(outputFileName);
writer->Update();
ga->SetDirection(1);
@@ -184,7 +184,7 @@ int main(int argc, char * argv[])
writer->SetInput(Ixz);
outputFileName = outputPrefix + "-Ixz.hdr";
- writer->SetFileName(outputFileName.c_str());
+ writer->SetFileName(outputFileName);
writer->Update();
ga->SetDirection(2);
@@ -202,7 +202,7 @@ int main(int argc, char * argv[])
writer->SetInput(Ixy);
outputFileName = outputPrefix + "-Ixy.hdr";
- writer->SetFileName(outputFileName.c_str());
+ writer->SetFileName(outputFileName);
writer->Update();
// Software Guide : EndCodeSnippet
diff --git a/Examples/IO/HDFReaderExample.cxx b/Examples/IO/HDFReaderExample.cxx
index 5c153b7864e7e66d1517cfb3053832d71070166e..884286f63392817145357d3591068abbd01646fe 100644
--- a/Examples/IO/HDFReaderExample.cxx
+++ b/Examples/IO/HDFReaderExample.cxx
@@ -101,7 +101,7 @@ int main(int itkNotUsed(argc), char * argv[])
// Software Guide : BeginCodeSnippet
otb::GDALImageIO::Pointer readerGDAL = otb::GDALImageIO::New();
- readerGDAL->SetFileName(inputFilename.c_str());
+ readerGDAL->SetFileName(inputFilename);
std::vector<std::string> vectSubdatasetNames;
std::vector<std::string> vectorSubdatasetDescriptions;
@@ -146,7 +146,7 @@ int main(int itkNotUsed(argc), char * argv[])
// Software Guide : EndLatex
// Software Guide : BeginCodeSnippet
- writer->SetFileName(outputFilename.c_str());
+ writer->SetFileName(outputFilename);
writer->SetInput(reader->GetOutput());
writer->Update();
diff --git a/Examples/MultiScale/MorphologicalPyramidSegmentationExample.cxx b/Examples/MultiScale/MorphologicalPyramidSegmentationExample.cxx
index c9c64247015ca643f4126160189a6c71b05920b5..fd82e9f154ff9343226e4f8292d41757d781ad16 100644
--- a/Examples/MultiScale/MorphologicalPyramidSegmentationExample.cxx
+++ b/Examples/MultiScale/MorphologicalPyramidSegmentationExample.cxx
@@ -209,7 +209,7 @@ int main(int itkNotUsed(argc), char * argv[])
oss << outputFilenamePrefix << index << "." << outputFilenameSuffix;
writer = WriterType::New();
writer->SetInput(it.Get());
- writer->SetFileName(oss.str().c_str());
+ writer->SetFileName(oss.str());
writer->Update();
std::cout << oss.str() << " file written." << std::endl;
oss.str("");
diff --git a/Examples/Tutorials/SmarterFilteringPipeline.cxx b/Examples/Tutorials/SmarterFilteringPipeline.cxx
index fd52c72df4ab4ac9cf57aff279721b48ef23186e..2e1d6c01a34cb95b2b85250a150e72aa9691e0c8 100644
--- a/Examples/Tutorials/SmarterFilteringPipeline.cxx
+++ b/Examples/Tutorials/SmarterFilteringPipeline.cxx
@@ -215,8 +215,8 @@ int main(int argc, char * argv[])
// Software Guide : BeginLatex
// Software Guide : BeginCodeSnippet
- reader->SetFileName(parseResult->GetInputImage().c_str());
- writer->SetFileName(parseResult->GetOutputImage().c_str());
+ reader->SetFileName(parseResult->GetInputImage());
+ writer->SetFileName(parseResult->GetOutputImage());
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRExtendedFilenameToOptions.h b/Modules/Adapters/GdalAdapters/include/otbOGRExtendedFilenameToOptions.h
index 6ae631531fd5d2de3f6198851deace861b11b1ec..467cb38d688c4d3fad115dd5a95ca9e0f3d1510e 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRExtendedFilenameToOptions.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRExtendedFilenameToOptions.h
@@ -71,8 +71,10 @@ public:
std::unordered_map< std::string , std::string > gdalOptions;
};
- /** Set extended filename */
- void SetExtendedFileName(const char * extFname) override;
+ /** \deprecated const char* overload of SetExtendedFileName is deprecated, use std::string instead */
+ void SetExtendedFileName(const char* extFname) override;
+
+ void SetExtendedFileName(const std::string& extFname) override;
/** Get the GDAL option for type operation */
GDALOptionType GetGDALOptions( const std::string & type ) const ;
diff --git a/Modules/Adapters/GdalAdapters/src/otbOGRExtendedFilenameToOptions.cxx b/Modules/Adapters/GdalAdapters/src/otbOGRExtendedFilenameToOptions.cxx
index a34e70947138645f0d660570c6abdefedb7aa141..96f3ba580148fae3198bffe17ea33bd503f5ac4c 100644
--- a/Modules/Adapters/GdalAdapters/src/otbOGRExtendedFilenameToOptions.cxx
+++ b/Modules/Adapters/GdalAdapters/src/otbOGRExtendedFilenameToOptions.cxx
@@ -48,10 +48,21 @@ GetGDALLayerOptionsHelper( const GDALOptionType & options )
return res;
}
+void
+OGRExtendedFilenameToOptions::
+SetExtendedFileName(const char* extFname)
+{
+ if (extFname == nullptr)
+ {
+ itkGenericExceptionMacro( << "Filename is NULL" );
+ }
+
+ this->SetExtendedFileName(std::string(extFname));
+}
void
OGRExtendedFilenameToOptions::
-SetExtendedFileName(const char *extFname)
+SetExtendedFileName(const std::string& extFname)
{
Superclass::SetExtendedFileName(extFname);
m_HasFileName = true;
diff --git a/Modules/Adapters/OSSIMAdapters/test/CMakeLists.txt b/Modules/Adapters/OSSIMAdapters/test/CMakeLists.txt
index 8dadc14ff05f911b3fa0af4cca37e05592cecced..807fb5c7aa79456f5ad216ac635358c85a187c33 100644
--- a/Modules/Adapters/OSSIMAdapters/test/CMakeLists.txt
+++ b/Modules/Adapters/OSSIMAdapters/test/CMakeLists.txt
@@ -193,12 +193,6 @@ otb_add_test(NAME prTvossimElevManagerTest4 COMMAND otbOSSIMAdaptersTestDriver
# LARGEINPUT{TERRASARX/2008-03-10_GrandCanyon_SSC//TSX1_SAR__SSC______SM_S_SRA_20080310T133220_20080310T133228/TSX1_SAR__SSC______SM_S_SRA_20080310T133220_20080310T133228.xml}
# ${TEMP}/uaTvPlatformPositionComputeBaselineTest.txt)
-otb_add_test(NAME uaTvGeometricSarSensorModelAdapterNew COMMAND otbOSSIMAdaptersTestDriver
- otbGeometricSarSensorModelAdapterNewTest)
-
-otb_add_test(NAME uaTvPlatformPositionComputeBaselineNew COMMAND otbOSSIMAdaptersTestDriver
- otbPlatformPositionComputeBaselineNewTest)
-
otb_add_test(NAME uaTvDEMHandler_AboveEllipsoid_NoSRTM_NoGeoid_NoData COMMAND otbOSSIMAdaptersTestDriver
otbDEMHandlerTest
no
diff --git a/Modules/Adapters/OSSIMAdapters/test/otbGeometricSarSensorModelAdapter.cxx b/Modules/Adapters/OSSIMAdapters/test/otbGeometricSarSensorModelAdapter.cxx
index 561e62c8b4b03acc3ce2f64d2d677cd8d6e2eb32..99fb81070d6545e28605a8b4c2c9468dae577804 100644
--- a/Modules/Adapters/OSSIMAdapters/test/otbGeometricSarSensorModelAdapter.cxx
+++ b/Modules/Adapters/OSSIMAdapters/test/otbGeometricSarSensorModelAdapter.cxx
@@ -25,13 +25,6 @@
#include "otbImageFileReader.h"
#include "otbGeometricSarSensorModelAdapter.h"
-int otbGeometricSarSensorModelAdapterNewTest(int itkNotUsed(argc), char* itkNotUsed(argv)[])
-{
- typedef otb::GeometricSarSensorModelAdapter SarSensorModelType;
- SarSensorModelType::Pointer masterPlatform = SarSensorModelType::New();
- return EXIT_SUCCESS;
-}
-
int otbGeometricSarSensorModelAdapterTest(int argc, char* argv[])
{
if (argc != 3)
diff --git a/Modules/Adapters/OSSIMAdapters/test/otbOSSIMAdaptersTestDriver.cxx b/Modules/Adapters/OSSIMAdapters/test/otbOSSIMAdaptersTestDriver.cxx
index 5f7295d6dffdb208aafde1ab1326ecdd544bd24f..72d7d2a63bfbbf4c4b47e42c752dca41aa4df5ff 100644
--- a/Modules/Adapters/OSSIMAdapters/test/otbOSSIMAdaptersTestDriver.cxx
+++ b/Modules/Adapters/OSSIMAdapters/test/otbOSSIMAdaptersTestDriver.cxx
@@ -27,9 +27,7 @@ void RegisterTests()
REGISTER_TEST(otbMapProjectionAdapterTest);
REGISTER_TEST(otbOssimElevManagerTest2);
REGISTER_TEST(otbOssimElevManagerTest4);
- REGISTER_TEST(otbGeometricSarSensorModelAdapterNewTest);
REGISTER_TEST(otbGeometricSarSensorModelAdapterTest);
- REGISTER_TEST(otbPlatformPositionComputeBaselineNewTest);
REGISTER_TEST(otbPlatformPositionComputeBaselineTest);
REGISTER_TEST(otbDEMHandlerTest);
REGISTER_TEST(otbRPCSolverAdapterTest);
diff --git a/Modules/Adapters/OSSIMAdapters/test/otbPlatformPositionAdapter.cxx b/Modules/Adapters/OSSIMAdapters/test/otbPlatformPositionAdapter.cxx
index b93984862cda503a82b22fc739db5c2602506e1d..32d2d0f76bebcf7d2627f18f4928d0763bca7f98 100644
--- a/Modules/Adapters/OSSIMAdapters/test/otbPlatformPositionAdapter.cxx
+++ b/Modules/Adapters/OSSIMAdapters/test/otbPlatformPositionAdapter.cxx
@@ -22,13 +22,6 @@
#include "otbImageFileReader.h"
#include "otbPlatformPositionAdapter.h"
-int otbPlatformPositionComputeBaselineNewTest(int itkNotUsed(argc), char* itkNotUsed(argv)[])
-{
- typedef otb::PlatformPositionAdapter PlatformType;
- PlatformType::Pointer masterPlatform = PlatformType::New();
- return EXIT_SUCCESS;
-}
-
int otbPlatformPositionComputeBaselineTest(int argc, char* argv[])
{
if (argc != 3)
diff --git a/Modules/Applications/AppClassification/app/otbSampleAugmentation.cxx b/Modules/Applications/AppClassification/app/otbSampleAugmentation.cxx
index 093e690739de5eba191f11ac0dba3c48e93ae64d..a9fbff3aa10f57bea7c6e5641bfe704a50b16690 100644
--- a/Modules/Applications/AppClassification/app/otbSampleAugmentation.cxx
+++ b/Modules/Applications/AppClassification/app/otbSampleAugmentation.cxx
@@ -173,11 +173,9 @@ private:
std::string tmpKey="field."+key.substr(0, end - key.begin());
AddChoice(tmpKey,item);
}
- if( fieldType == OFTInteger || ogr::version_proxy::IsOFTInteger64( fieldType ) || fieldType == OFTReal )
- {
- std::string tmpKey = "exclude." + key.substr( 0, static_cast<unsigned long>( end - key.begin() ) );
- AddChoice( tmpKey, item );
- }
+
+ std::string tmpKey = "exclude." + key.substr( 0, static_cast<unsigned long>( end - key.begin() ) );
+ AddChoice( tmpKey, item );
}
}
}
diff --git a/Modules/Applications/AppClassification/include/otbTrainVectorBase.hxx b/Modules/Applications/AppClassification/include/otbTrainVectorBase.hxx
index 676cd0eeb3354d7a9da0b02d2303a9725cff3e21..482fa32e0f02c1cb8df01fcb74469072a398050e 100644
--- a/Modules/Applications/AppClassification/include/otbTrainVectorBase.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainVectorBase.hxx
@@ -215,7 +215,7 @@ TrainVectorBase::GetStatistics(unsigned int nbFeatures)
{
StatisticsReader::Pointer statisticsReader = StatisticsReader::New();
std::string XMLfile = GetParameterString( "io.stats" );
- statisticsReader->SetFileName( XMLfile.c_str() );
+ statisticsReader->SetFileName( XMLfile );
measurement.meanMeasurementVector = statisticsReader->GetStatisticVectorByName( "mean" );
measurement.stddevMeasurementVector = statisticsReader->GetStatisticVectorByName( "stddev" );
}
diff --git a/Modules/Applications/AppImageUtils/app/otbExtractROI.cxx b/Modules/Applications/AppImageUtils/app/otbExtractROI.cxx
index d5f22f9b358bd1d7639beabb4230ac9f91bf1809..521b0aec1ac2c962f9a4c6ed7091e1dd99739128 100644
--- a/Modules/Applications/AppImageUtils/app/otbExtractROI.cxx
+++ b/Modules/Applications/AppImageUtils/app/otbExtractROI.cxx
@@ -61,6 +61,12 @@ public:
typedef ExtractROIFilterType::InputImageType ImageType;
+protected:
+ ExtractROI()
+ : m_IsExtentInverted(false)
+ {
+ }
+
private:
void
DoInit() override
@@ -424,10 +430,11 @@ private:
inImage->TransformPhysicalPointToIndex(ulp_out,uli);
inImage->TransformPhysicalPointToIndex(lrp_out,lri);
}
- SetParameterInt( "startx", uli[0]);
- SetParameterInt( "starty", uli[1]);
- SetParameterInt( "sizex", lri[0] - uli[0] + 1);
- SetParameterInt( "sizey", lri[1] - uli[1] + 1);
+ m_IsExtentInverted = ( lri[0] < uli[0] || lri[1] < uli[1] );
+ SetParameterInt( "startx", uli[0]);
+ SetParameterInt( "starty", uli[1]);
+ SetParameterInt( "sizex", lri[0] - uli[0] + 1);
+ SetParameterInt( "sizey", lri[1] - uli[1] + 1);
}
void
@@ -786,6 +793,13 @@ private:
SetParameterInt("sizey",lri[1]-uli[1]);
}
+ else if( GetParameterString( "mode" ) == "extent" )
+ {
+ if(m_IsExtentInverted)
+ {
+ otbAppLogFATAL(<< "Extent coordinates are inverted!");
+ }
+ }
if ( !CropRegionOfInterest() )
otbAppLogWARNING(<<"Could not extract the ROI as it is out of the "
@@ -806,6 +820,9 @@ private:
SetParameterOutputImage("out", extractROIFilter->GetOutput());
RegisterPipeline();
}
+
+ /** flag to check if given extent was inverted */
+ bool m_IsExtentInverted;
};
}
diff --git a/Modules/Applications/AppProjection/app/otbOrthoRectification.cxx b/Modules/Applications/AppProjection/app/otbOrthoRectification.cxx
index 1d42d243f56044b5d9da1bcc356c978282dcfeff..546ce9d1adb08c213d42e67694a732870a6364e8 100644
--- a/Modules/Applications/AppProjection/app/otbOrthoRectification.cxx
+++ b/Modules/Applications/AppProjection/app/otbOrthoRectification.cxx
@@ -269,30 +269,14 @@ private:
genericRSEstimator->SetOutputProjectionRef(m_OutputProjectionRef);
genericRSEstimator->Compute();
- // Fill the Gui with the computed parameters
- if (!HasUserValue("outputs.sizex"))
- SetParameterInt("outputs.sizex",genericRSEstimator->GetOutputSize()[0]);
-
- if (!HasUserValue("outputs.sizey"))
- SetParameterInt("outputs.sizey",genericRSEstimator->GetOutputSize()[1]);
-
- if (!HasUserValue("outputs.spacingx"))
- SetParameterFloat("outputs.spacingx",genericRSEstimator->GetOutputSpacing()[0]);
-
- if (!HasUserValue("outputs.spacingy"))
- SetParameterFloat("outputs.spacingy",genericRSEstimator->GetOutputSpacing()[1]);
-
- if (!HasUserValue("outputs.ulx"))
- SetParameterFloat("outputs.ulx",genericRSEstimator->GetOutputOrigin()[0] - 0.5 * genericRSEstimator->GetOutputSpacing()[0]);
-
- if (!HasUserValue("outputs.uly"))
- SetParameterFloat("outputs.uly",genericRSEstimator->GetOutputOrigin()[1] - 0.5 * genericRSEstimator->GetOutputSpacing()[1]);
-
- if (!HasUserValue("outputs.lrx"))
- SetParameterFloat("outputs.lrx",GetParameterFloat("outputs.ulx") + GetParameterFloat("outputs.spacingx") * static_cast<double>(GetParameterInt("outputs.sizex")));
-
- if (!HasUserValue("outputs.lry"))
- SetParameterFloat("outputs.lry",GetParameterFloat("outputs.uly") + GetParameterFloat("outputs.spacingy") * static_cast<double>(GetParameterInt("outputs.sizey")));
+ SetDefaultParameterInt("outputs.sizex", genericRSEstimator->GetOutputSize()[0]);
+ SetDefaultParameterInt("outputs.sizey", genericRSEstimator->GetOutputSize()[1]);
+ SetDefaultParameterFloat("outputs.spacingx", genericRSEstimator->GetOutputSpacing()[0]);
+ SetDefaultParameterFloat("outputs.spacingy", genericRSEstimator->GetOutputSpacing()[1]);
+ SetDefaultParameterFloat("outputs.ulx", genericRSEstimator->GetOutputOrigin()[0] - 0.5 * genericRSEstimator->GetOutputSpacing()[0]);
+ SetDefaultParameterFloat("outputs.uly", genericRSEstimator->GetOutputOrigin()[1] - 0.5 * genericRSEstimator->GetOutputSpacing()[1]);
+ SetDefaultParameterFloat("outputs.lrx", GetParameterFloat("outputs.ulx") + GetParameterFloat("outputs.spacingx") * static_cast<double>(GetParameterInt("outputs.sizex")));
+ SetDefaultParameterFloat("outputs.lry", GetParameterFloat("outputs.uly") + GetParameterFloat("outputs.spacingy") * static_cast<double>(GetParameterInt("outputs.sizey")));
// Handle the spacing and size field following the mode
// chose by the user
@@ -300,16 +284,6 @@ private:
{
case Mode_UserDefined:
{
- // Automatic set to off except lower right coordinates
- AutomaticValueOff("outputs.ulx");
- AutomaticValueOff("outputs.uly");
- AutomaticValueOff("outputs.sizex");
- AutomaticValueOff("outputs.sizey");
- AutomaticValueOff("outputs.spacingx");
- AutomaticValueOff("outputs.spacingy");
- AutomaticValueOn("outputs.lrx");
- AutomaticValueOn("outputs.lry");
-
// Enable all the parameters except lower right coordinates
EnableParameter("outputs.ulx");
EnableParameter("outputs.uly");
@@ -350,16 +324,6 @@ private:
DisableParameter("outputs.lry");
DisableParameter("outputs.ortho");
- // Update the automatic value mode of each filed
- AutomaticValueOn("outputs.ulx");
- AutomaticValueOn("outputs.uly");
- AutomaticValueOn("outputs.sizex");
- AutomaticValueOn("outputs.sizey");
- AutomaticValueOff("outputs.spacingx");
- AutomaticValueOff("outputs.spacingy");
- AutomaticValueOn("outputs.lrx");
- AutomaticValueOn("outputs.lry");
-
// Adapat the status of the param to this mode
MandatoryOff("outputs.ulx");
MandatoryOff("outputs.uly");
@@ -404,16 +368,6 @@ private:
DisableParameter("outputs.lry");
DisableParameter("outputs.ortho");
- // Update the automatic value mode of each filed
- AutomaticValueOn("outputs.ulx");
- AutomaticValueOn("outputs.uly");
- AutomaticValueOn("outputs.spacingx");
- AutomaticValueOn("outputs.spacingy");
- AutomaticValueOff("outputs.sizex");
- AutomaticValueOff("outputs.sizey");
- AutomaticValueOn("outputs.lrx");
- AutomaticValueOn("outputs.lry");
-
// Adapat the status of the param to this mode
MandatoryOff("outputs.ulx");
MandatoryOff("outputs.uly");
@@ -459,16 +413,6 @@ private:
EnableParameter("outputs.lry");
DisableParameter("outputs.ortho");
- // Update the automatic value mode of each filed
- AutomaticValueOff("outputs.ulx");
- AutomaticValueOff("outputs.uly");
- AutomaticValueOn("outputs.sizex");
- AutomaticValueOn("outputs.sizey");
- AutomaticValueOff("outputs.spacingx");
- AutomaticValueOff("outputs.spacingy");
- AutomaticValueOff("outputs.lrx");
- AutomaticValueOff("outputs.lry");
-
// Adapt the status of the param to this mode
MandatoryOn("outputs.ulx");
MandatoryOn("outputs.uly");
@@ -517,16 +461,6 @@ private:
if (HasValue("outputs.ortho"))
{
- // Automatic set to on
- AutomaticValueOn("outputs.ulx");
- AutomaticValueOn("outputs.uly");
- AutomaticValueOn("outputs.sizex");
- AutomaticValueOn("outputs.sizey");
- AutomaticValueOn("outputs.spacingx");
- AutomaticValueOn("outputs.spacingy");
- AutomaticValueOn("outputs.lrx");
- AutomaticValueOn("outputs.lry");
-
// input image
FloatVectorImageType::Pointer inOrtho = GetParameterImage("outputs.ortho");
diff --git a/Modules/Core/Common/include/otbExtendedFilenameHelper.h b/Modules/Core/Common/include/otbExtendedFilenameHelper.h
index 983f101eeb3b3eeea6d3fde133271f3e1919898d..8bac5586ce9624c11cf56c967f95acf7218632df 100644
--- a/Modules/Core/Common/include/otbExtendedFilenameHelper.h
+++ b/Modules/Core/Common/include/otbExtendedFilenameHelper.h
@@ -55,7 +55,11 @@ public:
typedef std::map< std::string, std::string > OptionMapType;
+ /** \deprecated const char* overload of SetExtendedFileName is deprecated, use std::string instead */
virtual void SetExtendedFileName(const char * extFname);
+
+ virtual void SetExtendedFileName(const std::string& extFname);
+
const OptionMapType & GetOptionMap(void) const;
itkGetStringMacro(ExtendedFileName);
diff --git a/Modules/Core/Common/src/otbExtendedFilenameHelper.cxx b/Modules/Core/Common/src/otbExtendedFilenameHelper.cxx
index dae75783057064fc464bab42073f70a4fb7025d5..052c4587543ce299f2e6920f314e84c5b81c57ba 100644
--- a/Modules/Core/Common/src/otbExtendedFilenameHelper.cxx
+++ b/Modules/Core/Common/src/otbExtendedFilenameHelper.cxx
@@ -42,6 +42,14 @@ ExtendedFilenameHelper
{
itkGenericExceptionMacro( << "Filename is NULL" );
}
+
+ this->SetExtendedFileName(std::string(extFname));
+}
+
+void
+ExtendedFilenameHelper
+::SetExtendedFileName(const std::string& extFname)
+{
this->m_ExtendedFileName = extFname;
this->m_OptionMap.clear();
std::vector<std::string> tmp1;
diff --git a/Modules/Core/Common/test/CMakeLists.txt b/Modules/Core/Common/test/CMakeLists.txt
index fe6010af79b6cd37290f2598f538b0a6680fd7a0..64d981ebc4f6d31a8ba8611d1a7bc165e9790972 100644
--- a/Modules/Core/Common/test/CMakeLists.txt
+++ b/Modules/Core/Common/test/CMakeLists.txt
@@ -22,17 +22,13 @@ otb_module_test()
set(OTBCommonTests
otbCommonTestDriver.cxx
-otbVariableLengthVectorConverter.cxx
otbImageRegionTileMapSplitter.cxx
otbImageRegionAdaptativeSplitter.cxx
otbRGBAPixelConverter.cxx
otbRectangle.cxx
-otbImageRegionNonUniformMultidimensionalSplitterNew.cxx
otbSystemTest.cxx
otbImageRegionSquareTileSplitter.cxx
-otbImageRegionTileMapSplitterNew.cxx
otbImageRegionNonUniformMultidimensionalSplitter.cxx
-otbRectangleNew.cxx
otbConfigurationManagerTest.cxx
otbStandardFilterWatcherNew.cxx
otbStandardOneLineFilterWatcherTest.cxx
@@ -47,10 +43,6 @@ otb_module_target_label(otbCommonTestDriver)
# Tests Declaration
-otb_add_test(NAME coTuVariableLengthVectorConverter COMMAND otbCommonTestDriver
- otbVariableLengthVectorConverterNew
- )
-
otb_add_test(NAME coTvImageRegionTileMapSplitter COMMAND otbCommonTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/coImageRegionTileMapSplitter.txt
@@ -59,10 +51,6 @@ otb_add_test(NAME coTvImageRegionTileMapSplitter COMMAND otbCommonTestDriver
${TEMP}/coImageRegionTileMapSplitter.txt
)
-
-otb_add_test(NAME coTuImageRegionAdaptativeSplitterNew COMMAND otbCommonTestDriver
- otbImageRegionAdaptativeSplitterNew)
-
otb_add_test(NAME coTvImageRegionAdaptativeSplitterStripSmallStream COMMAND otbCommonTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/coTvImageRegionAdaptativeSplitterStripSmallStreamOutput.txt
@@ -129,10 +117,6 @@ otb_add_test(NAME coTvImageRegionAdaptativeSplitterDivideBlock COMMAND otbCommon
${TEMP}/coTvImageRegionAdaptativeSplitterDivideBlock.txt
)
-otb_add_test(NAME coTuRGBAPixelConverter COMMAND otbCommonTestDriver
- otbRGBAPixelConverterNew
- )
-
otb_add_test(NAME coTvRGBAPixelConverter COMMAND otbCommonTestDriver
otbRGBAPixelConverter
)
@@ -146,22 +130,6 @@ otb_add_test(NAME coTvRectangle COMMAND otbCommonTestDriver
2.12 2.35 12.54 2.45 3. 0.15 1. 1.
)
-
-
-
-
-
-otb_add_test(NAME coTuImageRegionNonUniformMultidimensionalSplitterNew COMMAND otbCommonTestDriver
- otbImageRegionNonUniformMultidimensionalSplitterNew
- )
-
-
-
-
-
-
-
-
otb_add_test(NAME coTuSystemTests_IsA_Methods COMMAND otbCommonTestDriver
otbSystemTest
${OTB_DATA_ROOT}/README-OTB-Data
@@ -177,10 +145,6 @@ otb_add_test(NAME coTvParseHdfSubsetName COMMAND otbCommonTestDriver
otb_add_test(NAME coTvParseHdfFileName COMMAND otbCommonTestDriver
otbParseHdfFileName)
-otb_add_test(NAME coTuImageRegionSquareTileSplitterNew COMMAND otbCommonTestDriver
- otbImageRegionSquareTileSplitterNew
- )
-
otb_add_test(NAME coTvImageRegionSquareTileSplitter COMMAND otbCommonTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/coImageRegionSquareTileSplitter.txt
@@ -189,18 +153,6 @@ otb_add_test(NAME coTvImageRegionSquareTileSplitter COMMAND otbCommonTestDriver
${TEMP}/coImageRegionSquareTileSplitter.txt
)
-
-
-
-
-
-otb_add_test(NAME coTuImageRegionTileMapSplitterNew COMMAND otbCommonTestDriver
- otbImageRegionTileMapSplitterNew
- )
-
-
-
-
otb_add_test(NAME coTvImageRegionNonUniformMultidimensionalSplitter COMMAND otbCommonTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/coImageRegionNonUniformMultidimensionalSplitter.txt
@@ -213,10 +165,6 @@ otb_add_test(NAME coTvImageRegionNonUniformMultidimensionalSplitter COMMAND otbC
${TEMP}/coImageRegionNonUniformMultidimensionalSplitter.txt
)
-
-otb_add_test(NAME coTuRectangleNew COMMAND otbCommonTestDriver
- otbRectangleNew)
-
otb_add_test(NAME coTvConfigurationManagerDefault COMMAND otbCommonTestDriver
otbConfigurationManagerTest
128)
diff --git a/Modules/Core/Common/test/otbCommonTestDriver.cxx b/Modules/Core/Common/test/otbCommonTestDriver.cxx
index b38f3885a27c179e75cf5d84377b2fe4edc62ae8..29a45deb76e23d598f65c0038da13e38c21514af 100644
--- a/Modules/Core/Common/test/otbCommonTestDriver.cxx
+++ b/Modules/Core/Common/test/otbCommonTestDriver.cxx
@@ -22,23 +22,16 @@
void RegisterTests()
{
- REGISTER_TEST(otbVariableLengthVectorConverterNew);
REGISTER_TEST(otbImageRegionTileMapSplitter);
- REGISTER_TEST(otbImageRegionAdaptativeSplitterNew);
REGISTER_TEST(otbImageRegionAdaptativeSplitter);
- REGISTER_TEST(otbRGBAPixelConverterNew);
REGISTER_TEST(otbRGBAPixelConverter);
REGISTER_TEST(otbRectangle);
- REGISTER_TEST(otbImageRegionNonUniformMultidimensionalSplitterNew);
REGISTER_TEST(otbSystemTest);
REGISTER_TEST(otbStopwatchTest);
REGISTER_TEST(otbParseHdfSubsetName);
REGISTER_TEST(otbParseHdfFileName);
- REGISTER_TEST(otbImageRegionSquareTileSplitterNew);
REGISTER_TEST(otbImageRegionSquareTileSplitter);
- REGISTER_TEST(otbImageRegionTileMapSplitterNew);
REGISTER_TEST(otbImageRegionNonUniformMultidimensionalSplitter);
- REGISTER_TEST(otbRectangleNew);
REGISTER_TEST(otbConfigurationManagerTest);
REGISTER_TEST(otbStandardFilterWatcherNew);
REGISTER_TEST(otbStandardOneLineFilterWatcherTest);
diff --git a/Modules/Core/Common/test/otbImageRegionAdaptativeSplitter.cxx b/Modules/Core/Common/test/otbImageRegionAdaptativeSplitter.cxx
index 960b90db8a5964e30495b28584b3efe1fd71499c..274ff873cf6346822b8ef5d9ce061f33227c9b05 100644
--- a/Modules/Core/Common/test/otbImageRegionAdaptativeSplitter.cxx
+++ b/Modules/Core/Common/test/otbImageRegionAdaptativeSplitter.cxx
@@ -27,14 +27,6 @@ typedef SplitterType::RegionType RegionType;
typedef RegionType::SizeType SizeType;
typedef RegionType::IndexType IndexType;
-int otbImageRegionAdaptativeSplitterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- SplitterType::Pointer splitter = SplitterType::New();
-
- std::cout<<splitter<<std::endl;
-
- return EXIT_SUCCESS;
-}
int otbImageRegionAdaptativeSplitter(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Core/Common/test/otbImageRegionNonUniformMultidimensionalSplitterNew.cxx b/Modules/Core/Common/test/otbImageRegionNonUniformMultidimensionalSplitterNew.cxx
deleted file mode 100644
index 46341daa2c85c62aad85ee87dee916ace8bd9354..0000000000000000000000000000000000000000
--- a/Modules/Core/Common/test/otbImageRegionNonUniformMultidimensionalSplitterNew.cxx
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbImageRegionNonUniformMultidimensionalSplitter.h"
-
-int otbImageRegionNonUniformMultidimensionalSplitterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const int Dimension = 2;
- typedef otb::ImageRegionNonUniformMultidimensionalSplitter<Dimension> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Common/test/otbImageRegionSquareTileSplitter.cxx b/Modules/Core/Common/test/otbImageRegionSquareTileSplitter.cxx
index 938364d04eef890ae6780be8fc37cbd225942891..9e02b3ccc33d147f0d166f7a0dac9e5109ef017a 100644
--- a/Modules/Core/Common/test/otbImageRegionSquareTileSplitter.cxx
+++ b/Modules/Core/Common/test/otbImageRegionSquareTileSplitter.cxx
@@ -28,14 +28,6 @@ typedef SquareTileSplitterType::SizeType SizeType;
typedef SquareTileSplitterType::RegionType RegionType;
-int otbImageRegionSquareTileSplitterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- SquareTileSplitterType::Pointer splitter = SquareTileSplitterType::New();
-
- std::cout << splitter << std::endl;
-
- return EXIT_SUCCESS;
-}
int TestSplitter(const RegionType& region, unsigned int PixelSize, unsigned int MaxTileSize, std::ostream& os)
{
diff --git a/Modules/Core/Common/test/otbImageRegionTileMapSplitterNew.cxx b/Modules/Core/Common/test/otbImageRegionTileMapSplitterNew.cxx
deleted file mode 100644
index 2dcd9a4f2414ffa8fc8a3612dad2e44ccf38d9c0..0000000000000000000000000000000000000000
--- a/Modules/Core/Common/test/otbImageRegionTileMapSplitterNew.cxx
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbImageRegionTileMapSplitter.h"
-
-int otbImageRegionTileMapSplitterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const int Dimension = 2;
- typedef otb::ImageRegionTileMapSplitter<Dimension> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Common/test/otbRGBAPixelConverter.cxx b/Modules/Core/Common/test/otbRGBAPixelConverter.cxx
index 83e148a164441ac3f8147d90b99d9abf2f5de0be..2acd9766e5047f903c7021721ed3f8c8e78b19c9 100644
--- a/Modules/Core/Common/test/otbRGBAPixelConverter.cxx
+++ b/Modules/Core/Common/test/otbRGBAPixelConverter.cxx
@@ -24,31 +24,6 @@
#include "otbRGBAPixelConverter.h"
-int otbRGBAPixelConverterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned char PixelType0;
- typedef double PixelType1;
- typedef itk::RGBAPixel<unsigned char> PixelType2;
- typedef itk::RGBPixel<double> PixelType3;
-
- typedef otb::RGBAPixelConverter<PixelType0, PixelType0> ConverterType0;
- typedef otb::RGBAPixelConverter<PixelType1, PixelType1> ConverterType1;
- typedef otb::RGBAPixelConverter<PixelType0, PixelType2> ConverterType2;
- typedef otb::RGBAPixelConverter<PixelType0, PixelType3> ConverterType3;
-
- // Instantiating object
- ConverterType0::Pointer converter0 = ConverterType0::New();
- ConverterType1::Pointer converter1 = ConverterType1::New();
- ConverterType2::Pointer converter2 = ConverterType2::New();
- ConverterType3::Pointer converter3 = ConverterType3::New();
-
- std::cout << converter0 << std::endl;
- std::cout << converter1 << std::endl;
- std::cout << converter2 << std::endl;
- std::cout << converter3 << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbRGBAPixelConverter(int itkNotUsed(argc), char * itkNotUsed(argv) [])
{
diff --git a/Modules/Core/Common/test/otbRectangleNew.cxx b/Modules/Core/Common/test/otbRectangleNew.cxx
deleted file mode 100644
index 6481ec48a5cb10d2720c5cbf614ed638d4b73b91..0000000000000000000000000000000000000000
--- a/Modules/Core/Common/test/otbRectangleNew.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbRectangle.h"
-
-int otbRectangleNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Rectangle<> RectangleType;
-
- //Instantiating object
- RectangleType::Pointer polygon = RectangleType::New();
-
- std::cout << polygon << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Common/test/otbVariableLengthVectorConverter.cxx b/Modules/Core/Common/test/otbVariableLengthVectorConverter.cxx
deleted file mode 100644
index ebfbd62cafa5112bd9b1fe177c2007993b813b3c..0000000000000000000000000000000000000000
--- a/Modules/Core/Common/test/otbVariableLengthVectorConverter.cxx
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <cstdlib>
-#include <cmath>
-
-#include "otbVariableLengthVectorConverter.h"
-
-int otbVariableLengthVectorConverterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef itk::VariableLengthVector<double> InputType0;
- typedef std::vector< std::vector< double > > InputType1;
- typedef std::vector< std::vector< std::complex< double > > > InputType2;
- typedef itk::FixedArray<double> InputType3;
-
- typedef float PrecisionType;
-
- typedef otb::VariableLengthVectorConverter<InputType0, PrecisionType>
- ConverterType0;
- typedef otb::VariableLengthVectorConverter<InputType1, PrecisionType>
- ConverterType1;
- typedef otb::VariableLengthVectorConverter<InputType2, PrecisionType>
- ConverterType2;
- typedef otb::VariableLengthVectorConverter<InputType3, PrecisionType>
- ConverterType3;
-
- // Instantiating object
- ConverterType0::Pointer converter0 = ConverterType0::New();
- ConverterType1::Pointer converter1 = ConverterType1::New();
- ConverterType2::Pointer converter2 = ConverterType2::New();
- ConverterType3::Pointer converter3 = ConverterType3::New();
-
- std::cout << converter0 << std::endl;
- std::cout << converter1 << std::endl;
- std::cout << converter2 << std::endl;
- std::cout << converter3 << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/ComplexImage/test/CMakeLists.txt b/Modules/Core/ComplexImage/test/CMakeLists.txt
index ee2b44519d191e93fc554982db844ab95fd87dd3..82d8404e59e075f5f73c5c7ecc0dfbcf5115ae79 100644
--- a/Modules/Core/ComplexImage/test/CMakeLists.txt
+++ b/Modules/Core/ComplexImage/test/CMakeLists.txt
@@ -21,7 +21,6 @@
otb_module_test()
set(OTBComplexImageTests
otbAmplitudePhaseToRGBFunctor.cxx
- otbAmplitudePhaseToRGBFunctorNew.cxx
otbComplexImageTestDriver.cxx )
add_executable(otbComplexImageTestDriver ${OTBComplexImageTests})
@@ -35,5 +34,3 @@ otb_add_test(NAME bfTvAmplitudePhaseToRGBFunctor COMMAND otbComplexImageTestDriv
${INPUTDATA}/RSAT_imagery_HH.tif
${TEMP}/bfTvAmplitudePhaseToRGBFunctor.png
)
-otb_add_test(NAME bfTuAmplitudePhaseToRGBFunctorNew COMMAND otbComplexImageTestDriver
- otbAmplitudePhaseToRGBFunctorNew)
diff --git a/Modules/Core/ComplexImage/test/otbAmplitudePhaseToRGBFunctorNew.cxx b/Modules/Core/ComplexImage/test/otbAmplitudePhaseToRGBFunctorNew.cxx
deleted file mode 100644
index 0b2596c1fc626cfc59ac6316ad350ee5ea24a381..0000000000000000000000000000000000000000
--- a/Modules/Core/ComplexImage/test/otbAmplitudePhaseToRGBFunctorNew.cxx
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "otbImage.h"
-
-#include "itkTernaryFunctorImageFilter.h"
-#include "otbAmplitudePhaseToRGBFunctor.h"
-
-int otbAmplitudePhaseToRGBFunctorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- typedef double PixelType;
- typedef otb::Image<PixelType, 2> ImageType;
-
- typedef itk::RGBPixel<unsigned char> RGBPixelType;
- typedef otb::Image<RGBPixelType, 2> RGBImageType;
-
- typedef otb::Functor::AmplitudePhaseToRGBFunctor
- <PixelType, PixelType, PixelType, RGBPixelType> ColorMapFunctorType;
- typedef itk::TernaryFunctorImageFilter
- <ImageType, ImageType, ImageType, RGBImageType, ColorMapFunctorType> ColorMapFilterType;
- ColorMapFilterType::Pointer colormapper = ColorMapFilterType::New();
- colormapper->GetFunctor().SetMaximum(150);
- colormapper->GetFunctor().SetMinimum(70);
-
- std::cout << colormapper << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/ComplexImage/test/otbComplexImageTestDriver.cxx b/Modules/Core/ComplexImage/test/otbComplexImageTestDriver.cxx
index 8e311c98e279257095037140ed70e5ada8981e94..ed69629c06dd97985485d907a977e15703f6c47d 100644
--- a/Modules/Core/ComplexImage/test/otbComplexImageTestDriver.cxx
+++ b/Modules/Core/ComplexImage/test/otbComplexImageTestDriver.cxx
@@ -23,5 +23,4 @@
void RegisterTests()
{
REGISTER_TEST(otbAmplitudePhaseToRGBFunctor);
- REGISTER_TEST(otbAmplitudePhaseToRGBFunctorNew);
}
diff --git a/Modules/Core/ImageBase/test/CMakeLists.txt b/Modules/Core/ImageBase/test/CMakeLists.txt
index e56967b74c7281442e8ad6fb9b0313222ead10f9..b2ac501075ef0e5e3488aa02d722a56af9168154 100644
--- a/Modules/Core/ImageBase/test/CMakeLists.txt
+++ b/Modules/Core/ImageBase/test/CMakeLists.txt
@@ -23,7 +23,6 @@ otb_module_test()
set(OTBImageBaseTests
otbImageBaseTestDriver.cxx
otbFlexibleDistanceWithMissingValue.cxx
- otbImageAndVectorImageOperationFilterNew.cxx
otbImagePCAShapeModelEstimatorTest.cxx
otbFunctionToImageFilter.cxx
otbExtractROI2.cxx
@@ -33,20 +32,13 @@ set(OTBImageBaseTests
otbExtractROITestMetaData.cxx
otbTestMultiExtractMultiUpdate.cxx
otbExtractROI.cxx
- otbFunctionToImageFilterNew.cxx
- otbVectorImageToASImageAdaptorNew.cxx
otbImageAndVectorImageOperationFilterTest.cxx
otbImageOfVectorsToMonoChannelExtractROI.cxx
- otbImageOfVectorsToMonoChannelExtractROINew.cxx
- otbExtractROINew.cxx
otbExtractROI_RGB.cxx
otbComplexToIntensityFilterTest.cxx
- otbMultiToMonoChannelExtractROINew.cxx
otbMultiToMonoChannelExtractROI.cxx
otbImageTest.cxx
- otbFlexibleDistanceWithMissingValueNew.cxx
otbImageFunctionAdaptor.cxx
- otbMultiChannelExtractROINew.cxx
otbMetaImageFunction.cxx
)
@@ -63,9 +55,6 @@ otb_add_test(NAME bfTvFlexibleDistanceWithMissingValue COMMAND otbImageBaseTestD
0.000001
)
-otb_add_test(NAME bfTuImageAndVectorImageOperationFilterNew COMMAND otbImageBaseTestDriver
- otbImageAndVectorImageOperationFilterNew)
-
otb_add_test(NAME bfTvItkImagePCAShapeModelEstimatorTest COMMAND otbImageBaseTestDriver
--compare-n-images ${EPSILON_7} 4
${TEMP}/bfITKimagePCAShapeModelEstimatorTest_eigen_vectors1.tif
@@ -118,9 +107,6 @@ otb_add_test(NAME bfTvComplexToVectorImageCastFilterTest COMMAND otbImageBaseTes
${TEMP}/bfTvVectorComplexToVectorImageCastFilterTest.tif
)
-otb_add_test(NAME bfTuComplexToVectorImageCastFilterNew COMMAND otbImageBaseTestDriver
- otbComplexToVectorImageCastFilterNew
- )
otb_add_test(NAME coTvMultiChannelROI_RGB2RGB_PNG3 COMMAND otbImageBaseTestDriver
--compare-image ${NOTOL} ${BASELINE}/coMultiChannelExtractROI_RGB2RGB_PNG_300_10_250_50_channels_321.png
@@ -272,13 +258,7 @@ otb_add_test(NAME coTvExtractROIQB COMMAND otbImageBaseTestDriver
0 0 70 70
)
-otb_add_test(NAME bfTuFunctionToImageFilterNew COMMAND otbImageBaseTestDriver
- otbFunctionToImageFilterNew
- )
-otb_add_test(NAME coTuVectorImageToASImageAdaptorNew COMMAND otbImageBaseTestDriver
- otbVectorImageToASImageAdaptorNew
- )
otb_add_test(NAME bfTvImageAndVectorImageOperationFilterTest COMMAND otbImageBaseTestDriver
--compare-n-images ${NOTOL} 4
@@ -310,12 +290,6 @@ otb_add_test(NAME coTvImageOfVectorsToMonoChannelExtractROI COMMAND otbImageBase
${TEMP}/coImageOfVectorsToMonoChannelExtractROI.png
)
-otb_add_test(NAME coTuImageOfVectorsToMonoChannelExtractROINew COMMAND otbImageBaseTestDriver
- otbImageOfVectorsToMonoChannelExtractROINew
- )
-otb_add_test(NAME coTuExtractROINew COMMAND otbImageBaseTestDriver
- otbExtractROINew)
-
otb_add_test(NAME coTvExtractROI_RGB COMMAND otbImageBaseTestDriver
--compare-image ${NOTOL} ${BASELINE}/coExtractROI_RGB_300_10_200_50.png
${TEMP}/coExtractROI_RGB_300_10_200_50.png
@@ -337,9 +311,6 @@ otb_add_test(NAME coTvExtractROI_QB COMMAND otbImageBaseTestDriver
otb_add_test(NAME bfTvComplexToIntensityFilterTest COMMAND otbImageBaseTestDriver
otbComplexToIntensityFilterTest)
-otb_add_test(NAME coTuMultiToMonoROINew COMMAND otbImageBaseTestDriver
- otbMultiToMonoChannelExtractROINew)
-
otb_add_test(NAME coTvMultiToMonoROI_RGB2NG_PNG COMMAND otbImageBaseTestDriver
--compare-image ${NOTOL} ${BASELINE}/coMultiToMonoChannelExtractROI_RGB2NG_PNG_300_10_250_50_channel_1.png
${TEMP}/coMultiToMonoChannelExtractROI_RGB2NG_PNG_300_10_250_50_channel_1.png
@@ -363,20 +334,11 @@ otb_add_test(NAME ioTvOtbImageTestRadarsat COMMAND otbImageBaseTestDriver
LARGEINPUT{RADARSAT1/GOMA/SCENE01/}
${TEMP}/ioOtbImageTestRadarsat.txt)
-otb_add_test(NAME bfTuFlexibleDistanceWithMissingValueNew COMMAND otbImageBaseTestDriver
- otbFlexibleDistanceWithMissingValueNew)
-
otb_add_test(NAME feTvImageFunctionAdaptor COMMAND otbImageBaseTestDriver
otbImageFunctionAdaptor
${INPUTDATA}/poupees.png
)
-otb_add_test(NAME feTuImageFunctionAdaptorNew COMMAND otbImageBaseTestDriver
- otbImageFunctionAdaptorNew
- )
-
-otb_add_test(NAME coTuMultiChannelROINew COMMAND otbImageBaseTestDriver
- otbMultiChannelExtractROINew)
otb_add_test(NAME feTvMetaImageFunction COMMAND otbImageBaseTestDriver
--compare-ascii ${EPSILON_8}
@@ -387,9 +349,6 @@ otb_add_test(NAME feTvMetaImageFunction COMMAND otbImageBaseTestDriver
${TEMP}/feTvMetaImageFunction.txt
451846.014047961 5412466.57452216
)
-otb_add_test(NAME feTuMetaImageFunctionNew COMMAND otbImageBaseTestDriver
- otbMetaImageFunctionNew
- )
if(OTB_DATA_USE_LARGEINPUT)
set( GenericTestPHR_TESTNB 0)
diff --git a/Modules/Core/ImageBase/test/otbComplexToVectorImageCastFilter.cxx b/Modules/Core/ImageBase/test/otbComplexToVectorImageCastFilter.cxx
index 20ed6d37a4418c5b265ab04729c6edb4e1572ed3..8d1db89e3f8549ed806e3653379215372d8047ca 100644
--- a/Modules/Core/ImageBase/test/otbComplexToVectorImageCastFilter.cxx
+++ b/Modules/Core/ImageBase/test/otbComplexToVectorImageCastFilter.cxx
@@ -27,20 +27,6 @@
#include "otbImageFileWriter.h"
-int otbComplexToVectorImageCastFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef std::complex<float> ComplexType;
- typedef otb::VectorImage<ComplexType, 2> CplxImageType;
- typedef otb::VectorImage<float, 2> VectorImageType;
-
- typedef otb::ComplexToVectorImageCastFilter<CplxImageType, VectorImageType> FilterType;
-
- // Instantiating object
- FilterType::Pointer caster = FilterType::New();
-
-
- return EXIT_SUCCESS;
-}
int otbComplexToVectorImageCastFilterTest(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Core/ImageBase/test/otbExtractROINew.cxx b/Modules/Core/ImageBase/test/otbExtractROINew.cxx
deleted file mode 100644
index bdaecd393e86951d27953570a3b3d5a33d4da5fc..0000000000000000000000000000000000000000
--- a/Modules/Core/ImageBase/test/otbExtractROINew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbExtractROI.h"
-
-int otbExtractROINew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef std::complex<float> InputPixelType;
- typedef std::complex<double> OutputPixelType;
-
- typedef otb::ExtractROI<InputPixelType, OutputPixelType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/ImageBase/test/otbFlexibleDistanceWithMissingValueNew.cxx b/Modules/Core/ImageBase/test/otbFlexibleDistanceWithMissingValueNew.cxx
deleted file mode 100644
index 4a10d64132c4014aaa410fe2d442f46c068c4a30..0000000000000000000000000000000000000000
--- a/Modules/Core/ImageBase/test/otbFlexibleDistanceWithMissingValueNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- * Copyright (C) 2007-2012 Institut Mines Telecom / Telecom Bretagne
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include <iostream>
-#include <cstdlib>
-#include "itkVariableLengthVector.h"
-#include "otbFlexibleDistanceWithMissingValue.h"
-
-int otbFlexibleDistanceWithMissingValueNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- typedef itk::VariableLengthVector<double> VectorType;
- typedef otb::Statistics::FlexibleDistanceWithMissingValue<VectorType> DistanceType;
-
- float a = 1.0;
- float b = 0.1;
- DistanceType::SetAlphaBeta(a, b);
-
- DistanceType::Pointer dist = DistanceType::New();
-
- std::cout << dist << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/ImageBase/test/otbFunctionToImageFilterNew.cxx b/Modules/Core/ImageBase/test/otbFunctionToImageFilterNew.cxx
deleted file mode 100644
index ce5acb4aa5bea5f32fce983532aec0b05c15362e..0000000000000000000000000000000000000000
--- a/Modules/Core/ImageBase/test/otbFunctionToImageFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbImage.h"
-#include "otbFunctionToImageFilter.h"
-#include "itkVarianceImageFunction.h"
-
-int otbFunctionToImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef itk::VarianceImageFunction<ImageType> FunctionType;
-
- typedef otb::FunctionToImageFilter<ImageType, ImageType, FunctionType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/ImageBase/test/otbImageAndVectorImageOperationFilterNew.cxx b/Modules/Core/ImageBase/test/otbImageAndVectorImageOperationFilterNew.cxx
deleted file mode 100644
index 35eea416a12ad45d9c4094b4efd3a93fee71d41a..0000000000000000000000000000000000000000
--- a/Modules/Core/ImageBase/test/otbImageAndVectorImageOperationFilterNew.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "itkMacro.h"
-#include <iostream>
-
-#include "otbImage.h"
-#include "otbVectorImage.h"
-#include "otbImageAndVectorImageOperationFilter.h"
-
-int otbImageAndVectorImageOperationFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double PixelType;
- typedef otb::Image<PixelType, 2> ScalarImageType;
- typedef otb::VectorImage<PixelType, 2> VectorImageType;
- typedef otb::ImageAndVectorImageOperationFilter<ScalarImageType, VectorImageType, VectorImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/ImageBase/test/otbImageBaseTestDriver.cxx b/Modules/Core/ImageBase/test/otbImageBaseTestDriver.cxx
index 5fd51d7d91c011c46456c97834b63a72e1ef7a86..991c0dc8593ac117d09d82a8bca12d4cb93b3461 100644
--- a/Modules/Core/ImageBase/test/otbImageBaseTestDriver.cxx
+++ b/Modules/Core/ImageBase/test/otbImageBaseTestDriver.cxx
@@ -23,11 +23,9 @@
void RegisterTests()
{
REGISTER_TEST(otbFlexibleDistanceWithMissingValue);
- REGISTER_TEST(otbImageAndVectorImageOperationFilterNew);
REGISTER_TEST(otbImagePCAShapeModelEstimatorTest);
REGISTER_TEST(otbFunctionToImageFilter);
REGISTER_TEST(otbExtractROI2);
- REGISTER_TEST(otbComplexToVectorImageCastFilterNew);
REGISTER_TEST(otbComplexToVectorImageCastFilterTest);
REGISTER_TEST(otbMultiChannelExtractROI);
REGISTER_TEST(otbVectorImageLegacyTest);
@@ -35,21 +33,12 @@ void RegisterTests()
REGISTER_TEST(otbExtractROITestMetaData);
REGISTER_TEST(otbTestMultiExtractMultiUpdate);
REGISTER_TEST(otbExtractROI);
- REGISTER_TEST(otbFunctionToImageFilterNew);
- REGISTER_TEST(otbVectorImageToASImageAdaptorNew);
REGISTER_TEST(otbImageAndVectorImageOperationFilterTest);
REGISTER_TEST(otbImageOfVectorsToMonoChannelExtractROI);
- REGISTER_TEST(otbImageOfVectorsToMonoChannelExtractROINew);
- REGISTER_TEST(otbExtractROINew);
REGISTER_TEST(otbExtractROI_RGB);
REGISTER_TEST(otbComplexToIntensityFilterTest);
- REGISTER_TEST(otbMultiToMonoChannelExtractROINew);
REGISTER_TEST(otbMultiToMonoChannelExtractROI);
REGISTER_TEST(otbImageTest);
- REGISTER_TEST(otbFlexibleDistanceWithMissingValueNew);
- REGISTER_TEST(otbImageFunctionAdaptorNew);
REGISTER_TEST(otbImageFunctionAdaptor);
- REGISTER_TEST(otbMultiChannelExtractROINew);
REGISTER_TEST(otbMetaImageFunction);
- REGISTER_TEST(otbMetaImageFunctionNew);
}
diff --git a/Modules/Core/ImageBase/test/otbImageFunctionAdaptor.cxx b/Modules/Core/ImageBase/test/otbImageFunctionAdaptor.cxx
index a24f75cc92e6942f240e8a17f72315efb129f2fb..26800415060d2d41d0a737d9b61d5de2f051c39b 100644
--- a/Modules/Core/ImageBase/test/otbImageFunctionAdaptor.cxx
+++ b/Modules/Core/ImageBase/test/otbImageFunctionAdaptor.cxx
@@ -35,48 +35,6 @@
#include "otbLocalHistogramImageFunction.h"
-int otbImageFunctionAdaptorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double InputPixelType;
- typedef double PrecisionType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
-
- typedef otb::FourierMellinDescriptorsImageFunction<InputImageType> FMDFunctionType;
- typedef otb::RealMomentsImageFunction<InputImageType> RMFunctionType;
- typedef otb::ComplexMomentsImageFunction<InputImageType> CMFunctionType;
- typedef otb::FlusserMomentsImageFunction<InputImageType> FMFunctionType;
- typedef otb::HuMomentsImageFunction<InputImageType> HMFunctionType;
- typedef otb::RadiometricMomentsImageFunction<InputImageType> RaMFunctionType;
- typedef otb::LocalHistogramImageFunction<InputImageType> LHFunctionType;
-
- typedef otb::ImageFunctionAdaptor<FMDFunctionType, PrecisionType> FMDImageFunctionAdaptorType;
- typedef otb::ImageFunctionAdaptor<RMFunctionType, PrecisionType> RMImageFunctionAdaptorType;
- typedef otb::ImageFunctionAdaptor<CMFunctionType, PrecisionType> CMImageFunctionAdaptorType;
- typedef otb::ImageFunctionAdaptor<FMFunctionType, PrecisionType> FMImageFunctionAdaptorType;
- typedef otb::ImageFunctionAdaptor<HMFunctionType, PrecisionType> HMImageFunctionAdaptorType;
- typedef otb::ImageFunctionAdaptor<RaMFunctionType, PrecisionType> RaMImageFunctionAdaptorType;
- typedef otb::ImageFunctionAdaptor<LHFunctionType, PrecisionType> LHImageFunctionAdaptorType;
-
- // Instantiating objects
- FMDImageFunctionAdaptorType::Pointer FMDadaptedFunction = FMDImageFunctionAdaptorType::New();
- std::cout << FMDadaptedFunction << std::endl;
- RMImageFunctionAdaptorType::Pointer RMadaptedFunction = RMImageFunctionAdaptorType::New();
- std::cout << RMadaptedFunction << std::endl;
- CMImageFunctionAdaptorType::Pointer CMadaptedFunction = CMImageFunctionAdaptorType::New();
- std::cout << CMadaptedFunction << std::endl;
- FMImageFunctionAdaptorType::Pointer FMadaptedFunction = FMImageFunctionAdaptorType::New();
- std::cout << FMadaptedFunction << std::endl;
- HMImageFunctionAdaptorType::Pointer HMadaptedFunction = HMImageFunctionAdaptorType::New();
- std::cout << HMadaptedFunction << std::endl;
- RaMImageFunctionAdaptorType::Pointer RaMadaptedFunction = RaMImageFunctionAdaptorType::New();
- std::cout << RaMadaptedFunction << std::endl;
- LHImageFunctionAdaptorType::Pointer LHadaptedFunction = LHImageFunctionAdaptorType::New();
- std::cout << LHadaptedFunction << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbImageFunctionAdaptor(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Core/ImageBase/test/otbImageOfVectorsToMonoChannelExtractROINew.cxx b/Modules/Core/ImageBase/test/otbImageOfVectorsToMonoChannelExtractROINew.cxx
deleted file mode 100644
index 52d35f4f22bea4bf84a50268d377353a1f53b65e..0000000000000000000000000000000000000000
--- a/Modules/Core/ImageBase/test/otbImageOfVectorsToMonoChannelExtractROINew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbImageOfVectorsToMonoChannelExtractROI.h"
-
-int otbImageOfVectorsToMonoChannelExtractROINew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const int Dimension = 2;
- typedef unsigned char ScalarPixelType;
- typedef itk::Vector<double, Dimension> VectorPixelType;
-
- typedef otb::Image<ScalarPixelType, Dimension> ScalarImageType;
- typedef otb::Image<VectorPixelType, Dimension> VectorImageType;
- typedef otb::ImageOfVectorsToMonoChannelExtractROI<VectorImageType, ScalarImageType> FilterType;
-
- // Instantiating object
- FilterType::Pointer object = FilterType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/ImageBase/test/otbMetaImageFunction.cxx b/Modules/Core/ImageBase/test/otbMetaImageFunction.cxx
index aeaebea9376481504ee6528a2fc2eed5c198f1b5..442fddb88c21079af9f0a502db288725ef8d15ff 100644
--- a/Modules/Core/ImageBase/test/otbMetaImageFunction.cxx
+++ b/Modules/Core/ImageBase/test/otbMetaImageFunction.cxx
@@ -39,12 +39,6 @@ typedef otb::MetaImageFunction<PrecisionType, double> MetaImageF
typedef MetaImageFunctionType::PointType PointType;
typedef MetaImageFunctionType::OutputType OutputType;
-int otbMetaImageFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- MetaImageFunctionType::Pointer function = MetaImageFunctionType::New();
-
- return EXIT_SUCCESS;
-}
int otbMetaImageFunction(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Core/ImageBase/test/otbMultiChannelExtractROINew.cxx b/Modules/Core/ImageBase/test/otbMultiChannelExtractROINew.cxx
deleted file mode 100644
index 045acf45d40e962e15ffdf07d2b619c454b9f291..0000000000000000000000000000000000000000
--- a/Modules/Core/ImageBase/test/otbMultiChannelExtractROINew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbMultiChannelExtractROI.h"
-
-int otbMultiChannelExtractROINew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- // typedef unsigned char InputPixelType;
- // typedef unsigned char OutputPixelType;
-
- typedef std::complex<float> InputPixelType;
- typedef std::complex<double> OutputPixelType;
-
- typedef otb::MultiChannelExtractROI<InputPixelType,
- OutputPixelType> ExtractROIFilterType;
-
- ExtractROIFilterType::Pointer extractROIFilter = ExtractROIFilterType::New();
-
- std::cout << extractROIFilter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/ImageBase/test/otbMultiToMonoChannelExtractROINew.cxx b/Modules/Core/ImageBase/test/otbMultiToMonoChannelExtractROINew.cxx
deleted file mode 100644
index dec6e93bf193e0de9aecd3708de26e07b2c88e37..0000000000000000000000000000000000000000
--- a/Modules/Core/ImageBase/test/otbMultiToMonoChannelExtractROINew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbMultiToMonoChannelExtractROI.h"
-
-int otbMultiToMonoChannelExtractROINew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- // typedef unsigned char InputPixelType;
- // typedef unsigned char OutputPixelType;
-
- typedef std::complex<float> InputPixelType;
- typedef std::complex<double> OutputPixelType;
-
- typedef otb::MultiToMonoChannelExtractROI<InputPixelType,
- OutputPixelType> ExtractROIFilterType;
-
- ExtractROIFilterType::Pointer extractROIFilter = ExtractROIFilterType::New();
-
- std::cout << extractROIFilter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/ImageBase/test/otbVectorImageToASImageAdaptorNew.cxx b/Modules/Core/ImageBase/test/otbVectorImageToASImageAdaptorNew.cxx
deleted file mode 100644
index 63ba49babccdb5942aca18e8ae9683a4243d687d..0000000000000000000000000000000000000000
--- a/Modules/Core/ImageBase/test/otbVectorImageToASImageAdaptorNew.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include <cstdlib>
-
-#include "otbVectorImageToASImageAdaptor.h"
-#include "otbVectorImage.h"
-
-int otbVectorImageToASImageAdaptorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::VectorImage<double, 2> ImageType;
- typedef otb::VectorImageToASImageAdaptor<ImageType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Interpolation/test/CMakeLists.txt b/Modules/Core/Interpolation/test/CMakeLists.txt
index bc38dcc01777bff4a3cf856aebb426215d877727..0b419700fa5f48461187ebaad3a10d1f429ac7f1 100644
--- a/Modules/Core/Interpolation/test/CMakeLists.txt
+++ b/Modules/Core/Interpolation/test/CMakeLists.txt
@@ -22,25 +22,14 @@ otb_module_test()
set(OTBInterpolationTests
otbInterpolationTestDriver.cxx
-otbWindowedSincInterpolateImageCosineFunctionNew.cxx
otbWindowedSincInterpolateImageLanczosFunction.cxx
-otbWindowedSincInterpolateImageLanczosFunctionNew.cxx
-otbWindowedSincInterpolateImageFunctionBaseNew.cxx
-otbProlateInterpolateImageFunctionNew.cxx
-otbBSplineDecompositionImageFilterNew.cxx
-otbBSplineInterpolateImageFunctionNew.cxx
otbWindowedSincInterpolateImageBlackmanFunction.cxx
otbBSplineDecompositionImageFilter.cxx
-otbWindowedSincInterpolateImageWelchFunctionNew.cxx
otbWindowedSincInterpolateImageGaussianFunction.cxx
-otbGenericInterpolateImageFunctionNew.cxx
-otbWindowedSincInterpolateImageBlackmanFunctionNew.cxx
otbWindowedSincInterpolateImageCosineFunction.cxx
otbWindowedSincInterpolateImageHammingFunction.cxx
otbWindowedSincInterpolateImageWelchFunction.cxx
otbBSplineInterpolateImageFunction.cxx
-otbWindowedSincInterpolateImageGaussianFunctionNew.cxx
-otbWindowedSincInterpolateImageHammingFunctionNew.cxx
otbStreamingTraits.cxx
otbBCOInterpolateImageFunction.cxx
otbProlateInterpolateImageFunction.cxx
@@ -53,9 +42,6 @@ otb_module_target_label(otbInterpolationTestDriver)
# Tests Declaration
-otb_add_test(NAME bfTuWindowedSincInterpolateImageCosineFunctionNew COMMAND otbInterpolationTestDriver
- otbWindowedSincInterpolateImageCosineFunctionNew)
-
otb_add_test(NAME bfTvWindowedSincInterpolateImageLanczosFunction COMMAND otbInterpolationTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/bfWindowedSincInterpolateImageLanczosFunctionOutput.txt
@@ -74,21 +60,6 @@ otb_add_test(NAME bfTvWindowedSincInterpolateImageLanczosFunction COMMAND otbInt
-1 -1
)
-otb_add_test(NAME bfTuWindowedSincInterpolateImageLanczosFunctionNew COMMAND otbInterpolationTestDriver
- otbWindowedSincInterpolateImageLanczosFunctionNew)
-
-otb_add_test(NAME bfTuWindowedSincInterpolateImageFunctionBaseNew COMMAND otbInterpolationTestDriver
- otbWindowedSincInterpolateImageFunctionBaseNew)
-
-otb_add_test(NAME bfTuProlateInterpolateImageFunctionNew COMMAND otbInterpolationTestDriver
- otbProlateInterpolateImageFunctionNew)
-
-otb_add_test(NAME bfTuBSplineDecompositionImageFilterNew COMMAND otbInterpolationTestDriver
- otbBSplineDecompositionImageFilterNew)
-
-otb_add_test(NAME bfTuBSplineInterpolateImageFunctionNew COMMAND otbInterpolationTestDriver
- otbBSplineInterpolateImageFunctionNew)
-
otb_add_test(NAME bfTvWindowedSincInterpolateImageBlackmanFunction COMMAND otbInterpolationTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/bfWindowedSincInterpolateImageBlackmanFunctionOutput.txt
@@ -116,9 +87,6 @@ otb_add_test(NAME bfTvBSplineDecompositionImageFilter COMMAND otbInterpolationTe
${TEMP}/bfBSplineDecompositionImageFilterOutput.tif
)
-otb_add_test(NAME bfTuWindowedSincInterpolateImageWelchFunctionNew COMMAND otbInterpolationTestDriver
- otbWindowedSincInterpolateImageWelchFunctionNew)
-
otb_add_test(NAME bfTvWindowedSincInterpolateImageGaussianFunction COMMAND otbInterpolationTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/bfWindowedSincInterpolateImageGaussianFunctionOutput.txt
@@ -137,12 +105,6 @@ otb_add_test(NAME bfTvWindowedSincInterpolateImageGaussianFunction COMMAND otbIn
-1 -1
)
-otb_add_test(NAME coTuGenericInterpolateImageFunctionNew COMMAND otbInterpolationTestDriver
- otbGenericInterpolateImageFunctionNew
- )
-
-otb_add_test(NAME bfTuWindowedSincInterpolateImageBlackmanFunctionNew COMMAND otbInterpolationTestDriver
- otbWindowedSincInterpolateImageBlackmanFunctionNew)
otb_add_test(NAME bfTvWindowedSincInterpolateImageCosineFunction COMMAND otbInterpolationTestDriver
--compare-ascii ${NOTOL}
@@ -215,12 +177,6 @@ otb_add_test(NAME bfTvBSplineInterpolateImageFunction COMMAND otbInterpolationTe
-1 -1
)
-otb_add_test(NAME bfTuWindowedSincInterpolateImageGaussianFunctionNew COMMAND otbInterpolationTestDriver
- otbWindowedSincInterpolateImageGaussianFunctionNew)
-
-otb_add_test(NAME bfTuWindowedSincInterpolateImageHammingFunctionNew COMMAND otbInterpolationTestDriver
- otbWindowedSincInterpolateImageHammingFunctionNew)
-
otb_add_test(NAME bfTuStreamingTraitsVectorImage COMMAND otbInterpolationTestDriver
otbStreamingTraitsVectorImage
)
@@ -249,9 +205,6 @@ otb_add_test(NAME bfTvBCOInterpolateImageFunctionTest COMMAND otbInterpolationTe
3 # radius
-0.5 # optimised bicubic
)
-otb_add_test(NAME bfTuBCOInterpolateImageFunctionNew COMMAND otbInterpolationTestDriver
- otbBCOInterpolateImageFunctionNew
- )
otb_add_test(NAME bfTvBCOInterpolateImageFunctionOverVectorImage COMMAND otbInterpolationTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/bfTvBCOInterpolateImageFunctionOverVectorImageOutput.txt
@@ -270,8 +223,6 @@ otb_add_test(NAME bfTvBCOInterpolateImageFunctionOverVectorImage COMMAND otbInte
127.255 128.73
-1 -1
)
-otb_add_test(NAME bfTuBCOInterpolateImageFunctionOverVectorImageNew COMMAND otbInterpolationTestDriver
- otbBCOInterpolateImageFunctionOverVectorImageNew)
otb_add_test(NAME bfTvBCOInterpolateImageFunction2 COMMAND otbInterpolationTestDriver
otbBCOInterpolateImageFunction2
3 # radius
diff --git a/Modules/Core/Interpolation/test/otbBCOInterpolateImageFunction.cxx b/Modules/Core/Interpolation/test/otbBCOInterpolateImageFunction.cxx
index a99e8d8931781a236372522124463eddc773bd24..7cf139fef510195c8b2174d720892506bc9fd37c 100644
--- a/Modules/Core/Interpolation/test/otbBCOInterpolateImageFunction.cxx
+++ b/Modules/Core/Interpolation/test/otbBCOInterpolateImageFunction.cxx
@@ -27,18 +27,6 @@
#include "otbStreamingResampleImageFilter.h"
-int otbBCOInterpolateImageFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Image<double, 2> ImageType;
- typedef otb::BCOInterpolateImageFunction<ImageType, double> InterpolatorType;
-
- // Instantiating object
- InterpolatorType::Pointer interp = InterpolatorType::New();
-
- std::cout << interp << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbBCOInterpolateImageFunction(int argc, char * argv[])
{
@@ -183,16 +171,6 @@ int otbBCOInterpolateImageFunction2(int argc, char * argv[])
-int otbBCOInterpolateImageFunctionOverVectorImageNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::VectorImage<double, 2> ImageType;
- typedef otb::BCOInterpolateImageFunction<ImageType, double> InterpolatorType;
-
- // Instantiating object
- InterpolatorType::Pointer filter = InterpolatorType::New();
-
- return EXIT_SUCCESS;
-}
int otbBCOInterpolateImageFunctionOverVectorImage(int argc, char * argv[])
diff --git a/Modules/Core/Interpolation/test/otbBSplineDecompositionImageFilterNew.cxx b/Modules/Core/Interpolation/test/otbBSplineDecompositionImageFilterNew.cxx
deleted file mode 100644
index 277965a5f3d7424447595b3b51fd2f70ec5b4fbe..0000000000000000000000000000000000000000
--- a/Modules/Core/Interpolation/test/otbBSplineDecompositionImageFilterNew.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbBSplineDecompositionImageFilter.h"
-#include "otbImage.h"
-
-int otbBSplineDecompositionImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Image<double, 2> ImageType;
- typedef otb::BSplineDecompositionImageFilter<ImageType, ImageType> BSplineDecompositionImageFilterType;
-
- // Instantiating object
- BSplineDecompositionImageFilterType::Pointer filter = BSplineDecompositionImageFilterType::New();
-
- std::cout << filter << std::endl;
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Interpolation/test/otbBSplineInterpolateImageFunctionNew.cxx b/Modules/Core/Interpolation/test/otbBSplineInterpolateImageFunctionNew.cxx
deleted file mode 100644
index 0a1e39f5d9cf1f23d54ad6a2ea383f0355088a4e..0000000000000000000000000000000000000000
--- a/Modules/Core/Interpolation/test/otbBSplineInterpolateImageFunctionNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbBSplineInterpolateImageFunction.h"
-#include "otbImage.h"
-
-int otbBSplineInterpolateImageFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Image<double, 2> ImageType;
- typedef otb::BSplineInterpolateImageFunction<ImageType, double, double> InterpolatorType;
-
- // Instantiating object
- InterpolatorType::Pointer filter = InterpolatorType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Interpolation/test/otbGenericInterpolateImageFunctionNew.cxx b/Modules/Core/Interpolation/test/otbGenericInterpolateImageFunctionNew.cxx
deleted file mode 100644
index 0c3e28264cc1a6e125407ce8e5d4be4d57dc6bdd..0000000000000000000000000000000000000000
--- a/Modules/Core/Interpolation/test/otbGenericInterpolateImageFunctionNew.cxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbGenericInterpolateImageFunction.h"
-#include "otbImage.h"
-
-namespace Function
-{
-template<class TInput = double, class TOutput = double>
-class SameFunction
-{
-public:
- void SetRadius(unsigned int rad)
- {
- m_Radius = rad;
- }
- unsigned int GetRadius() const
- {
- return m_Radius;
- }
- inline TOutput operator ()(const TInput& A) const
- {
- return static_cast<TOutput>(A);
- }
- unsigned int m_Radius;
-};
-
-}
-
-int otbGenericInterpolateImageFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- typedef double InputPixelType;
- const int Dimension = 2;
- typedef otb::Image<InputPixelType, Dimension> ImageType;
- typedef Function::SameFunction<InputPixelType, InputPixelType> FunctionType;
- typedef itk::ConstantBoundaryCondition<ImageType> BoundaryConditionType;
- typedef double CoordRepType;
-
- typedef otb::GenericInterpolateImageFunction<ImageType, FunctionType, BoundaryConditionType,
- CoordRepType> GenericFunctionType;
-
- // Instantiating object
- GenericFunctionType::Pointer generic = GenericFunctionType::New();
-
- std::cout << generic << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Interpolation/test/otbInterpolationTestDriver.cxx b/Modules/Core/Interpolation/test/otbInterpolationTestDriver.cxx
index 8a92053bf1262a23fbdabed68fe82ee022a2efe4..43c83ec7235bba385c0aeee057e8ba011c8d479a 100644
--- a/Modules/Core/Interpolation/test/otbInterpolationTestDriver.cxx
+++ b/Modules/Core/Interpolation/test/otbInterpolationTestDriver.cxx
@@ -22,31 +22,18 @@
void RegisterTests()
{
- REGISTER_TEST(otbWindowedSincInterpolateImageCosineFunctionNew);
REGISTER_TEST(otbWindowedSincInterpolateImageLanczosFunction);
- REGISTER_TEST(otbWindowedSincInterpolateImageLanczosFunctionNew);
- REGISTER_TEST(otbWindowedSincInterpolateImageFunctionBaseNew);
- REGISTER_TEST(otbProlateInterpolateImageFunctionNew);
- REGISTER_TEST(otbBSplineDecompositionImageFilterNew);
- REGISTER_TEST(otbBSplineInterpolateImageFunctionNew);
REGISTER_TEST(otbWindowedSincInterpolateImageBlackmanFunction);
REGISTER_TEST(otbBSplineDecompositionImageFilter);
- REGISTER_TEST(otbWindowedSincInterpolateImageWelchFunctionNew);
REGISTER_TEST(otbWindowedSincInterpolateImageGaussianFunction);
- REGISTER_TEST(otbGenericInterpolateImageFunctionNew);
- REGISTER_TEST(otbWindowedSincInterpolateImageBlackmanFunctionNew);
REGISTER_TEST(otbWindowedSincInterpolateImageCosineFunction);
REGISTER_TEST(otbWindowedSincInterpolateImageHammingFunction);
REGISTER_TEST(otbWindowedSincInterpolateImageWelchFunction);
REGISTER_TEST(otbBSplineInterpolateImageFunction);
- REGISTER_TEST(otbWindowedSincInterpolateImageGaussianFunctionNew);
- REGISTER_TEST(otbWindowedSincInterpolateImageHammingFunctionNew);
REGISTER_TEST(otbStreamingTraitsImage);
REGISTER_TEST(otbStreamingTraitsVectorImage);
REGISTER_TEST(otbBCOInterpolateImageFunction);
- REGISTER_TEST(otbBCOInterpolateImageFunctionNew);
REGISTER_TEST(otbBCOInterpolateImageFunction2);
- REGISTER_TEST(otbBCOInterpolateImageFunctionOverVectorImageNew);
REGISTER_TEST(otbBCOInterpolateImageFunctionOverVectorImage);
REGISTER_TEST(otbBCOInterpolateImageFunctionTest);
REGISTER_TEST(otbBCOInterpolateImageFunctionVectorImageTest);
diff --git a/Modules/Core/Interpolation/test/otbProlateInterpolateImageFunctionNew.cxx b/Modules/Core/Interpolation/test/otbProlateInterpolateImageFunctionNew.cxx
deleted file mode 100644
index e23d4cfb8a5bdb46b1ac29f804bb178d1a517d0a..0000000000000000000000000000000000000000
--- a/Modules/Core/Interpolation/test/otbProlateInterpolateImageFunctionNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbProlateInterpolateImageFunction.h"
-#include "otbImage.h"
-
-int otbProlateInterpolateImageFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Image<double, 2> ImageType;
- typedef otb::ProlateInterpolateImageFunction<ImageType> ProlateInterpolatorType;
-
- // Instantiating object
- ProlateInterpolatorType::Pointer prolate = ProlateInterpolatorType::New();
-
- std::cout << prolate << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageBlackmanFunctionNew.cxx b/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageBlackmanFunctionNew.cxx
deleted file mode 100644
index 80ca34ef9a7f37bb9c4b9198adf03ad25920ff47..0000000000000000000000000000000000000000
--- a/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageBlackmanFunctionNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbWindowedSincInterpolateImageBlackmanFunction.h"
-#include "otbImage.h"
-
-int otbWindowedSincInterpolateImageBlackmanFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Image<double, 2> ImageType;
- typedef otb::WindowedSincInterpolateImageBlackmanFunction<ImageType> InterpolatorType;
-
- // Instantiating objects
- InterpolatorType::Pointer interp = InterpolatorType::New();
-
- std::cout << interp << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageCosineFunctionNew.cxx b/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageCosineFunctionNew.cxx
deleted file mode 100644
index fcc7abfb36986791311190529968113cd1c02a96..0000000000000000000000000000000000000000
--- a/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageCosineFunctionNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbWindowedSincInterpolateImageCosineFunction.h"
-#include "otbImage.h"
-
-int otbWindowedSincInterpolateImageCosineFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Image<double, 2> ImageType;
- typedef otb::WindowedSincInterpolateImageCosineFunction<ImageType> InterpolatorType;
-
- // Instantiating objects
- InterpolatorType::Pointer interp = InterpolatorType::New();
-
- std::cout << interp << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageFunctionBaseNew.cxx b/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageFunctionBaseNew.cxx
deleted file mode 100644
index 1391a886f1177c2f95f020bef01f043c053920b6..0000000000000000000000000000000000000000
--- a/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageFunctionBaseNew.cxx
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbWindowedSincInterpolateImageFunctionBase.h"
-#include "itkConstantBoundaryCondition.h"
-#include "otbImage.h"
-
-namespace Function
-{
-template<class TInput = double, class TOutput = double>
-class SameFunction
-{
-public:
- void SetRadius(unsigned int rad)
- {
- m_Radius = rad;
- }
- unsigned int GetRadius() const
- {
- return m_Radius;
- }
- inline TOutput operator ()(const TInput& A) const
- {
- return static_cast<TOutput>(A);
- }
- unsigned int m_Radius;
-};
-
-}
-
-int otbWindowedSincInterpolateImageFunctionBaseNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Image<double, 2> ImageType;
- typedef Function::SameFunction<double, double> FunctionType;
- typedef otb::WindowedSincInterpolateImageFunctionBase<ImageType, FunctionType> WindowedSincInterpolatorType;
-
- // Instantiating object
- WindowedSincInterpolatorType::Pointer winInterp = WindowedSincInterpolatorType::New();
-
- std::cout << winInterp << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageGaussianFunctionNew.cxx b/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageGaussianFunctionNew.cxx
deleted file mode 100644
index a172618bd2ef6f2fadbc7406990cdd84c724ae7a..0000000000000000000000000000000000000000
--- a/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageGaussianFunctionNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbWindowedSincInterpolateImageGaussianFunction.h"
-#include "otbImage.h"
-
-int otbWindowedSincInterpolateImageGaussianFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Image<double, 2> ImageType;
- typedef otb::WindowedSincInterpolateImageGaussianFunction<ImageType> InterpolatorType;
-
- // Instantiating objects
- InterpolatorType::Pointer interp = InterpolatorType::New();
-
- std::cout << interp << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageHammingFunctionNew.cxx b/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageHammingFunctionNew.cxx
deleted file mode 100644
index 41186663091757bc59e854e074caf654eb76cde8..0000000000000000000000000000000000000000
--- a/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageHammingFunctionNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbWindowedSincInterpolateImageHammingFunction.h"
-#include "otbImage.h"
-
-int otbWindowedSincInterpolateImageHammingFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Image<double, 2> ImageType;
- typedef otb::WindowedSincInterpolateImageHammingFunction<ImageType> InterpolatorType;
-
- // Instantiating objects
- InterpolatorType::Pointer interp = InterpolatorType::New();
-
- std::cout << interp << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageLanczosFunctionNew.cxx b/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageLanczosFunctionNew.cxx
deleted file mode 100644
index f824e1293a31ce46376229bcbe757aeaa10f0fb4..0000000000000000000000000000000000000000
--- a/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageLanczosFunctionNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbWindowedSincInterpolateImageLanczosFunction.h"
-#include "otbImage.h"
-
-int otbWindowedSincInterpolateImageLanczosFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Image<double, 2> ImageType;
- typedef otb::WindowedSincInterpolateImageLanczosFunction<ImageType> InterpolatorType;
-
- // Instantiating objects
- InterpolatorType::Pointer interp = InterpolatorType::New();
-
- std::cout << interp << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageWelchFunctionNew.cxx b/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageWelchFunctionNew.cxx
deleted file mode 100644
index 88e3d37b6be7aae4bc9724d9630775bcd28a178f..0000000000000000000000000000000000000000
--- a/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageWelchFunctionNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbWindowedSincInterpolateImageWelchFunction.h"
-#include "otbImage.h"
-
-int otbWindowedSincInterpolateImageWelchFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Image<double, 2> ImageType;
- typedef otb::WindowedSincInterpolateImageWelchFunction<ImageType> InterpolatorType;
-
- // Instantiating objects
- InterpolatorType::Pointer interp = InterpolatorType::New();
-
- std::cout << interp << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/LabelMap/test/CMakeLists.txt b/Modules/Core/LabelMap/test/CMakeLists.txt
index 5b73f8066c0406a4ae6096580322dd1a05885052..bc6bc2d5169886bb70687e8c259a2ba4d9ecbc80 100644
--- a/Modules/Core/LabelMap/test/CMakeLists.txt
+++ b/Modules/Core/LabelMap/test/CMakeLists.txt
@@ -22,25 +22,14 @@ otb_module_test()
set(OTBLabelMapTests
otbLabelMapTestDriver.cxx
-otbAttributesMapLabelObjectWithClassLabelNew.cxx
otbLabelObjectMapVectorizer.cxx
-otbAttributesMapOpeningLabelMapFilterNew.cxx
otbLabelImageToLabelMapWithAdjacencyFilter.cxx
-otbStatisticsAttributesLabelMapFilterNew.cxx
-otbLabelObjectToPolygonFunctorNew.cxx
-otbLabelMapWithClassLabelToLabeledSampleListFilterNew.cxx
-otbAttributesMapLabelObjectNew.cxx
-otbLabelMapToSampleListFilterNew.cxx
-otbLabelMapSourceNew.cxx
-otbLabelMapToAttributeImageFilterNew.cxx
otbImageToLabelMapWithAttributesFilter.cxx
-otbImageToLabelMapWithAttributesFilterNew.cxx
otbKMeansAttributesLabelMapFilter.cxx
otbLabelMapToSampleListFilter.cxx
otbLabelMapWithClassLabelToLabeledSampleListFilter.cxx
otbMinMaxAttributesLabelMapFilter.cxx
otbNormalizeAttributesLabelMapFilter.cxx
-otbShapeAttributesLabelMapFilterNew.cxx
otbBandsStatisticsAttributesLabelMapFilter.cxx
)
@@ -50,20 +39,11 @@ otb_module_target_label(otbLabelMapTestDriver)
# Tests Declaration
-otb_add_test(NAME obTuAttributesMapLabelObjectWithClassLabelNew COMMAND otbLabelMapTestDriver
- otbAttributesMapLabelObjectWithClassLabelNew)
-
otb_add_test(NAME obTvLabelObjectMapVectorizer COMMAND otbLabelMapTestDriver
otbLabelObjectMapVectorizer
${INPUTDATA}/rcc8_mire1.png
rcc8_mire1_label_vectorizer.gml)
-otb_add_test(NAME obTuAttributesMapOpeningLabelMapFilterNew COMMAND otbLabelMapTestDriver
- otbAttributesMapOpeningLabelMapFilterNew)
-
-otb_add_test(NAME obTuLabelImageToLabelMapWithAdjacencyFilterNew COMMAND otbLabelMapTestDriver
- otbLabelImageToLabelMapWithAdjacencyFilterNew)
-
otb_add_test(NAME obTvLabelImageToLabelMapWithAdjacencyFilter COMMAND otbLabelMapTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/obTvLabelImageToLabelMapWithAdjacencyFilterOutput.txt
@@ -73,40 +53,15 @@ otb_add_test(NAME obTvLabelImageToLabelMapWithAdjacencyFilter COMMAND otbLabelMa
${TEMP}/obTvLabelImageToLabelMapWithAdjacencyFilterOutput.txt
)
-otb_add_test(NAME obTuStatisticsAttributesLabelMapFilterNew COMMAND otbLabelMapTestDriver
- otbStatisticsAttributesLabelMapFilterNew)
-
-otb_add_test(NAME obTuLabelObjectToPolygonFunctorNew COMMAND otbLabelMapTestDriver
- otbLabelObjectToPolygonFunctorNew)
-
-otb_add_test(NAME obTuLabelMapWithClassLabelToLabeledSampleListFilterNew COMMAND otbLabelMapTestDriver
- otbLabelMapWithClassLabelToLabeledSampleListFilterNew)
-
-otb_add_test(NAME obTuAttributesMapLabelObjectNew COMMAND otbLabelMapTestDriver
- otbAttributesMapLabelObjectNew)
-
-otb_add_test(NAME obTuLabelMapToSampleListFilterNew COMMAND otbLabelMapTestDriver
- otbLabelMapToSampleListFilterNew)
-
-otb_add_test(NAME obTuLabelMapSourceNew COMMAND otbLabelMapTestDriver
- otbLabelMapSourceNew)
-
-otb_add_test(NAME obTuLabelMapToAttributeImageFilterNew COMMAND otbLabelMapTestDriver
- otbLabelMapToAttributeImageFilterNew)
-
otb_add_test(NAME obTvImageToLabelMapWithAttributesFilter COMMAND otbLabelMapTestDriver
otbImageToLabelMapWithAttributesFilter
${INPUTDATA}/maur.tif
${INPUTDATA}/maur_labelled.tif)
-otb_add_test(NAME obTuImageToLabelMapWithAttributesFilterNew COMMAND otbLabelMapTestDriver
- otbImageToLabelMapWithAttributesFilterNew)
otb_add_test(NAME obTvKMeansAttributesLabelMapFilter COMMAND otbLabelMapTestDriver
otbKMeansAttributesLabelMapFilter
${INPUTDATA}/maur.tif
${INPUTDATA}/maur_labelled.tif
${TEMP}/obTvKMeansAttributesLabelMapFilter.txt)
-otb_add_test(NAME obTuKMeansAttributesLabelMapFilterNew COMMAND otbLabelMapTestDriver
- otbKMeansAttributesLabelMapFilterNew)
otb_add_test(NAME obTvLabelMapToSampleListFilter COMMAND otbLabelMapTestDriver
otbLabelMapToSampleListFilter
${OTB_DATA_ROOT}/Input/rcc8_mire1.png
@@ -119,8 +74,6 @@ otb_add_test(NAME obTvLabelMapWithClassLabelToLabeledSampleListFilter COMMAND ot
SHAPE::Flusser01 SHAPE::Flusser02 SHAPE::Flusser03 SHAPE::Flusser04
SHAPE::Flusser05 SHAPE::Flusser06 SHAPE::Flusser07 SHAPE::Flusser08
SHAPE::Flusser09 SHAPE::Flusser10 SHAPE::Flusser11)
-otb_add_test(NAME obTuMinMaxAttributesLabelMapFilterNew COMMAND otbLabelMapTestDriver
- otbMinMaxAttributesLabelMapFilterNew)
otb_add_test(NAME obTvMinMaxAttributesLabelMapFilter COMMAND otbLabelMapTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/obTvMinMaxAttributesLabelMapFilter.txt
@@ -129,8 +82,6 @@ otb_add_test(NAME obTvMinMaxAttributesLabelMapFilter COMMAND otbLabelMapTestDriv
${INPUTDATA}/maur.tif
${INPUTDATA}/maur_labelled.tif
${TEMP}/obTvMinMaxAttributesLabelMapFilter.txt)
-otb_add_test(NAME obTuNormalizeAttributesLabelMapFilterNew COMMAND otbLabelMapTestDriver
- otbNormalizeAttributesLabelMapFilterNew)
otb_add_test(NAME obTvNormalizeAttributesLabelMapFilter COMMAND otbLabelMapTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/obTvNormalizeAttributesLabelMapFilter.txt
@@ -139,10 +90,6 @@ otb_add_test(NAME obTvNormalizeAttributesLabelMapFilter COMMAND otbLabelMapTestD
${INPUTDATA}/maur.tif
${INPUTDATA}/maur_labelled.tif
${TEMP}/obTvNormalizeAttributesLabelMapFilter.txt)
-otb_add_test(NAME obTuShapeAttributesLabelMapFilterNew COMMAND otbLabelMapTestDriver
- otbShapeAttributesLabelMapFilterNew)
-otb_add_test(NAME obTuBandsStatisticsAttributesLabelMapFilterNew COMMAND otbLabelMapTestDriver
- otbBandsStatisticsAttributesLabelMapFilterNew)
otb_add_test(NAME obTvBandsStatisticsAttributesLabelMapFilter COMMAND otbLabelMapTestDriver
otbBandsStatisticsAttributesLabelMapFilter
${INPUTDATA}/maur.tif
diff --git a/Modules/Core/LabelMap/test/otbAttributesMapLabelObjectNew.cxx b/Modules/Core/LabelMap/test/otbAttributesMapLabelObjectNew.cxx
deleted file mode 100644
index 8620975107339f24afedc0756e5cc53dd529ae57..0000000000000000000000000000000000000000
--- a/Modules/Core/LabelMap/test/otbAttributesMapLabelObjectNew.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbAttributesMapLabelObject.h"
-
-int otbAttributesMapLabelObjectNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::AttributesMapLabelObject<unsigned short, 2, double> LabelObjectType;
-
- // instantiation
- LabelObjectType::Pointer object = LabelObjectType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/LabelMap/test/otbAttributesMapLabelObjectWithClassLabelNew.cxx b/Modules/Core/LabelMap/test/otbAttributesMapLabelObjectWithClassLabelNew.cxx
deleted file mode 100644
index d259dd69ff99a8169c987b53ecd9a2898a47269c..0000000000000000000000000000000000000000
--- a/Modules/Core/LabelMap/test/otbAttributesMapLabelObjectWithClassLabelNew.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbAttributesMapLabelObjectWithClassLabel.h"
-
-int otbAttributesMapLabelObjectWithClassLabelNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::AttributesMapLabelObjectWithClassLabel<unsigned short, 2, double, unsigned short> LabelObjectType;
-
- // instantiation
- LabelObjectType::Pointer object = LabelObjectType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/LabelMap/test/otbAttributesMapOpeningLabelMapFilterNew.cxx b/Modules/Core/LabelMap/test/otbAttributesMapOpeningLabelMapFilterNew.cxx
deleted file mode 100644
index c8f563d16ae61f1a284d866a8c691b40f6f78865..0000000000000000000000000000000000000000
--- a/Modules/Core/LabelMap/test/otbAttributesMapOpeningLabelMapFilterNew.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "itkLabelMap.h"
-#include "otbAttributesMapOpeningLabelMapFilter.h"
-
-int otbAttributesMapOpeningLabelMapFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::AttributesMapLabelObject<unsigned short, 2, double> LabelObjectType;
- typedef itk::LabelMap<LabelObjectType> LabelMapType;
- typedef otb::AttributesMapOpeningLabelMapFilter<LabelMapType> LabelMapFilterType;
-
- // instantiation
- LabelMapFilterType::Pointer filter = LabelMapFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/LabelMap/test/otbBandsStatisticsAttributesLabelMapFilter.cxx b/Modules/Core/LabelMap/test/otbBandsStatisticsAttributesLabelMapFilter.cxx
index 08d63c20c8490312957ebf19776cce20ebc39c6d..a04335d90b2e3f990c5ae73ad9eda980ce09f767 100644
--- a/Modules/Core/LabelMap/test/otbBandsStatisticsAttributesLabelMapFilter.cxx
+++ b/Modules/Core/LabelMap/test/otbBandsStatisticsAttributesLabelMapFilter.cxx
@@ -48,11 +48,6 @@ typedef itk::LabelImageToLabelMapFilter<LabeledImageType, LabelMapType>
typedef otb::BandsStatisticsAttributesLabelMapFilter<LabelMapType, VectorImageType> BandsStatisticsFilterType;
-int otbBandsStatisticsAttributesLabelMapFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- BandsStatisticsFilterType::Pointer object = BandsStatisticsFilterType::New();
- return EXIT_SUCCESS;
-}
int otbBandsStatisticsAttributesLabelMapFilter(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/Core/LabelMap/test/otbImageToLabelMapWithAttributesFilterNew.cxx b/Modules/Core/LabelMap/test/otbImageToLabelMapWithAttributesFilterNew.cxx
deleted file mode 100644
index 17b8e7446ab2086d75031452265f82ffc102fff9..0000000000000000000000000000000000000000
--- a/Modules/Core/LabelMap/test/otbImageToLabelMapWithAttributesFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "otbImage.h"
-#include "otbVectorImage.h"
-#include "otbImageToLabelMapWithAttributesFilter.h"
-
-int otbImageToLabelMapWithAttributesFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
-
- typedef otb::VectorImage<double, 2> ImageType;
- typedef otb::Image<unsigned int, 2> LabeledImageType;
- typedef otb::AttributesMapLabelObjectWithClassLabel<double, 2, double, double> LabelObjectType;
- typedef otb::ImageToLabelMapWithAttributesFilter<ImageType, LabeledImageType, unsigned int , LabelObjectType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/LabelMap/test/otbKMeansAttributesLabelMapFilter.cxx b/Modules/Core/LabelMap/test/otbKMeansAttributesLabelMapFilter.cxx
index c6e0f2ccbe50118da5404b1566424ae907ad3b38..e3dca5e9aa69f225296987462495c6856713ab66 100644
--- a/Modules/Core/LabelMap/test/otbKMeansAttributesLabelMapFilter.cxx
+++ b/Modules/Core/LabelMap/test/otbKMeansAttributesLabelMapFilter.cxx
@@ -47,11 +47,6 @@ typedef itk::LabelImageToLabelMapFilter<LabeledImageType, LabelMapType>
typedef otb::ShapeAttributesLabelMapFilter<LabelMapType> ShapeFilterType;
typedef otb::KMeansAttributesLabelMapFilter<LabelMapType> KMeansAttributesLabelMapFilterType;
-int otbKMeansAttributesLabelMapFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- KMeansAttributesLabelMapFilterType::Pointer radiometricLabelMapFilter = KMeansAttributesLabelMapFilterType::New();
- return EXIT_SUCCESS;
-}
int otbKMeansAttributesLabelMapFilter(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Core/LabelMap/test/otbLabelImageToLabelMapWithAdjacencyFilter.cxx b/Modules/Core/LabelMap/test/otbLabelImageToLabelMapWithAdjacencyFilter.cxx
index 4d7c467de78b30e136e91b2ab8a3b1d2b67bda87..fe259ba3a55ec9d6de3e1d230728619542c00817 100644
--- a/Modules/Core/LabelMap/test/otbLabelImageToLabelMapWithAdjacencyFilter.cxx
+++ b/Modules/Core/LabelMap/test/otbLabelImageToLabelMapWithAdjacencyFilter.cxx
@@ -37,13 +37,6 @@ typedef otb::LabelImageToLabelMapWithAdjacencyFilter
< LabelImageType, LabelMapType> FilterType;
-int otbLabelImageToLabelMapWithAdjacencyFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- // Instantiation
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbLabelImageToLabelMapWithAdjacencyFilter(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Core/LabelMap/test/otbLabelMapSourceNew.cxx b/Modules/Core/LabelMap/test/otbLabelMapSourceNew.cxx
deleted file mode 100644
index bcf277a2e0f14dd90848143f6a76bb0d31e055fc..0000000000000000000000000000000000000000
--- a/Modules/Core/LabelMap/test/otbLabelMapSourceNew.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbLabelMapSource.h"
-#include "itkLabelMap.h"
-#include "otbAttributesMapLabelObject.h"
-
-int otbLabelMapSourceNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef unsigned short LabelType;
-
- typedef otb::AttributesMapLabelObject<LabelType, Dimension, double> LabelObjectType;
-
- typedef itk::LabelMap<LabelObjectType> InputLabelMapType;
- typedef otb::LabelMapSource<InputLabelMapType> LabelMapSourceType;
-
- // Instantiating LabelMapSource object
- LabelMapSourceType::Pointer labelMap = LabelMapSourceType::New();
-
- std::cout << labelMap << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/LabelMap/test/otbLabelMapTestDriver.cxx b/Modules/Core/LabelMap/test/otbLabelMapTestDriver.cxx
index 99bee7202f24fead79c99ec9cbba9427b870024d..d530396e70dd9ad18e4bd390c59c38d0b34c5e9e 100644
--- a/Modules/Core/LabelMap/test/otbLabelMapTestDriver.cxx
+++ b/Modules/Core/LabelMap/test/otbLabelMapTestDriver.cxx
@@ -22,29 +22,13 @@
void RegisterTests()
{
- REGISTER_TEST(otbAttributesMapLabelObjectWithClassLabelNew);
REGISTER_TEST(otbLabelObjectMapVectorizer);
- REGISTER_TEST(otbAttributesMapOpeningLabelMapFilterNew);
- REGISTER_TEST(otbLabelImageToLabelMapWithAdjacencyFilterNew);
REGISTER_TEST(otbLabelImageToLabelMapWithAdjacencyFilter);
- REGISTER_TEST(otbStatisticsAttributesLabelMapFilterNew);
- REGISTER_TEST(otbLabelObjectToPolygonFunctorNew);
- REGISTER_TEST(otbLabelMapWithClassLabelToLabeledSampleListFilterNew);
- REGISTER_TEST(otbAttributesMapLabelObjectNew);
- REGISTER_TEST(otbLabelMapToSampleListFilterNew);
- REGISTER_TEST(otbLabelMapSourceNew);
- REGISTER_TEST(otbLabelMapToAttributeImageFilterNew);
REGISTER_TEST(otbImageToLabelMapWithAttributesFilter);
- REGISTER_TEST(otbImageToLabelMapWithAttributesFilterNew);
- REGISTER_TEST(otbKMeansAttributesLabelMapFilterNew);
REGISTER_TEST(otbKMeansAttributesLabelMapFilter);
REGISTER_TEST(otbLabelMapToSampleListFilter);
REGISTER_TEST(otbLabelMapWithClassLabelToLabeledSampleListFilter);
REGISTER_TEST(otbMinMaxAttributesLabelMapFilter);
- REGISTER_TEST(otbMinMaxAttributesLabelMapFilterNew);
REGISTER_TEST(otbNormalizeAttributesLabelMapFilter);
- REGISTER_TEST(otbNormalizeAttributesLabelMapFilterNew);
- REGISTER_TEST(otbShapeAttributesLabelMapFilterNew);
REGISTER_TEST(otbBandsStatisticsAttributesLabelMapFilter);
- REGISTER_TEST(otbBandsStatisticsAttributesLabelMapFilterNew);
}
diff --git a/Modules/Core/LabelMap/test/otbLabelMapToAttributeImageFilterNew.cxx b/Modules/Core/LabelMap/test/otbLabelMapToAttributeImageFilterNew.cxx
deleted file mode 100644
index 07fe2fd988f88f8d22da98541d560036b8faf338..0000000000000000000000000000000000000000
--- a/Modules/Core/LabelMap/test/otbLabelMapToAttributeImageFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbLabelMapToAttributeImageFilter.h"
-
-#include "itkLabelMap.h"
-#include "otbVectorImage.h"
-
-int otbLabelMapToAttributeImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::AttributesMapLabelObject<unsigned int, 2, float> LabelObjectType;
- typedef itk::LabelMap<LabelObjectType> LabelMapType;
- typedef otb::VectorImage<float, 2> VectorImageType;
- typedef otb::LabelMapToAttributeImageFilter
- <LabelMapType, VectorImageType> LabelMapToAttributeImageFilterType;
-
- // instantiation
- LabelMapToAttributeImageFilterType::Pointer object = LabelMapToAttributeImageFilterType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/LabelMap/test/otbLabelMapToSampleListFilterNew.cxx b/Modules/Core/LabelMap/test/otbLabelMapToSampleListFilterNew.cxx
deleted file mode 100644
index 4ec601fcbcf2f0c5db43c85390636dcbdce3d101..0000000000000000000000000000000000000000
--- a/Modules/Core/LabelMap/test/otbLabelMapToSampleListFilterNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "itkLabelMap.h"
-#include "otbLabelMapToSampleListFilter.h"
-#include "itkVariableLengthVector.h"
-#include "itkListSample.h"
-
-int otbLabelMapToSampleListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::AttributesMapLabelObject<unsigned short, 2, double> LabelObjectType;
- typedef itk::LabelMap<LabelObjectType> LabelMapType;
- typedef itk::VariableLengthVector<double> VectorType;
- typedef itk::Statistics::ListSample<VectorType> ListSampleType;
- typedef otb::LabelMapToSampleListFilter<LabelMapType,
- ListSampleType> LabelMapFilterType;
-
- // instantiation
- LabelMapFilterType::Pointer filter = LabelMapFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/LabelMap/test/otbLabelMapWithClassLabelToLabeledSampleListFilterNew.cxx b/Modules/Core/LabelMap/test/otbLabelMapWithClassLabelToLabeledSampleListFilterNew.cxx
deleted file mode 100644
index ec6870e981a2b1242f94a04309b5b97848771836..0000000000000000000000000000000000000000
--- a/Modules/Core/LabelMap/test/otbLabelMapWithClassLabelToLabeledSampleListFilterNew.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbAttributesMapLabelObjectWithClassLabel.h"
-#include "itkLabelMap.h"
-#include "otbLabelMapWithClassLabelToLabeledSampleListFilter.h"
-#include "itkVariableLengthVector.h"
-#include "itkListSample.h"
-
-int otbLabelMapWithClassLabelToLabeledSampleListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::AttributesMapLabelObjectWithClassLabel
- <unsigned short, 2, double, unsigned short> LabelObjectType;
- typedef itk::LabelMap<LabelObjectType> LabelMapType;
- typedef itk::FixedArray<unsigned short, 1> LabelVectorType;
- typedef itk::VariableLengthVector<double> VectorType;
- typedef itk::Statistics::ListSample<VectorType> ListSampleType;
- typedef itk::Statistics::ListSample<LabelVectorType> TrainingListSampleType;
- typedef otb::LabelMapWithClassLabelToLabeledSampleListFilter<LabelMapType, ListSampleType, TrainingListSampleType> LabelMapFilterType;
-
- // instantiation
- LabelMapFilterType::Pointer filter = LabelMapFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/LabelMap/test/otbLabelObjectToPolygonFunctorNew.cxx b/Modules/Core/LabelMap/test/otbLabelObjectToPolygonFunctorNew.cxx
deleted file mode 100644
index 684ac7cc3aa5228d8ace251efe4689fcee5675e0..0000000000000000000000000000000000000000
--- a/Modules/Core/LabelMap/test/otbLabelObjectToPolygonFunctorNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbLabelObjectToPolygonFunctor.h"
-#include "otbAttributesMapLabelObject.h"
-#include <cstdlib>
-
-int otbLabelObjectToPolygonFunctorNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef unsigned short LabelType;
-
- typedef otb::AttributesMapLabelObject<LabelType, Dimension, double> LabelObjectType;
- typedef otb::Polygon<double> PolygonType;
- typedef otb::Functor::LabelObjectToPolygonFunctor<LabelObjectType, PolygonType> FunctorType;
- //typedef FunctorType::Pointer FunctorPointerType;
- // Instantiation
- //FunctorPointerType myFunctor = FunctorType::New();
-
- FunctorType myFunctor;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/LabelMap/test/otbMinMaxAttributesLabelMapFilter.cxx b/Modules/Core/LabelMap/test/otbMinMaxAttributesLabelMapFilter.cxx
index 51af227ee8fcdbe3a0a4171c96e6d612dec578e5..2f60b168258165c093463ba00743c4928a67c9ab 100644
--- a/Modules/Core/LabelMap/test/otbMinMaxAttributesLabelMapFilter.cxx
+++ b/Modules/Core/LabelMap/test/otbMinMaxAttributesLabelMapFilter.cxx
@@ -45,11 +45,6 @@ typedef otb::LabelImageToLabelMapWithAdjacencyFilter<LabeledImageType, LabelMapT
typedef otb::ShapeAttributesLabelMapFilter<LabelMapType> ShapeFilterType;
typedef otb::MinMaxAttributesLabelMapFilter<LabelMapType> MinMaxAttributesLabelMapFilterType;
-int otbMinMaxAttributesLabelMapFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- MinMaxAttributesLabelMapFilterType::Pointer radiometricLabelMapFilter = MinMaxAttributesLabelMapFilterType::New();
- return EXIT_SUCCESS;
-}
int otbMinMaxAttributesLabelMapFilter(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Core/LabelMap/test/otbNormalizeAttributesLabelMapFilter.cxx b/Modules/Core/LabelMap/test/otbNormalizeAttributesLabelMapFilter.cxx
index fd325c980f50ad4cf672c5a984e171fc90ce6782..bd2ac5e7b09ebd2545e84553d7d52861fd02c666 100644
--- a/Modules/Core/LabelMap/test/otbNormalizeAttributesLabelMapFilter.cxx
+++ b/Modules/Core/LabelMap/test/otbNormalizeAttributesLabelMapFilter.cxx
@@ -47,11 +47,6 @@ typedef otb::ShapeAttributesLabelMapFilter<LabelMapType>
typedef otb::MinMaxAttributesLabelMapFilter<LabelMapType> MinMaxAttributesLabelMapFilterType;
typedef otb::NormalizeAttributesLabelMapFilter<LabelMapType> NormalizeAttributesLabelMapFilterType;
-int otbNormalizeAttributesLabelMapFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- NormalizeAttributesLabelMapFilterType::Pointer normalizeLabelMapFilter = NormalizeAttributesLabelMapFilterType::New();
- return EXIT_SUCCESS;
-}
int otbNormalizeAttributesLabelMapFilter(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Core/LabelMap/test/otbShapeAttributesLabelMapFilterNew.cxx b/Modules/Core/LabelMap/test/otbShapeAttributesLabelMapFilterNew.cxx
deleted file mode 100644
index 4d7655c36fd2eecbc54c7844dc3f83ea9cd8bede..0000000000000000000000000000000000000000
--- a/Modules/Core/LabelMap/test/otbShapeAttributesLabelMapFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbAttributesMapLabelObject.h"
-#include "itkLabelMap.h"
-#include "otbShapeAttributesLabelMapFilter.h"
-
-int otbShapeAttributesLabelMapFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::AttributesMapLabelObject<unsigned short, 2, double> LabelObjectType;
- typedef itk::LabelMap<LabelObjectType> LabelMapType;
- typedef otb::ShapeAttributesLabelMapFilter<LabelMapType> LabelMapFilterType;
-
- // instantiation
- LabelMapFilterType::Pointer filter = LabelMapFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/LabelMap/test/otbStatisticsAttributesLabelMapFilterNew.cxx b/Modules/Core/LabelMap/test/otbStatisticsAttributesLabelMapFilterNew.cxx
deleted file mode 100644
index 914721ef5311d2fb0ffc597b38059e48d7e4a13e..0000000000000000000000000000000000000000
--- a/Modules/Core/LabelMap/test/otbStatisticsAttributesLabelMapFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbAttributesMapLabelObject.h"
-#include "otbStatisticsAttributesLabelMapFilter.h"
-#include "otbImage.h"
-
-int otbStatisticsAttributesLabelMapFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::Image<double, 2> ImageType;
- typedef otb::AttributesMapLabelObject<unsigned short, 2, double> LabelObjectType;
- typedef itk::LabelMap<LabelObjectType> LabelMapType;
- typedef otb::StatisticsAttributesLabelMapFilter<LabelMapType, ImageType> LabelMapFilterType;
-
- // instantiation
- LabelMapFilterType::Pointer filter = LabelMapFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Metadata/test/CMakeLists.txt b/Modules/Core/Metadata/test/CMakeLists.txt
index 8a1569b460940c6d02998b6f7001a6ca0ec691cf..6ca4d55bf8de48b17c15fda6f498043b9257e25d 100644
--- a/Modules/Core/Metadata/test/CMakeLists.txt
+++ b/Modules/Core/Metadata/test/CMakeLists.txt
@@ -22,30 +22,15 @@ otb_module_test()
set(OTBMetadataTests
otbMetadataTestDriver.cxx
-otbOpticalDefaultImageMetadataInterfaceNew.cxx
otbSarImageMetadataInterfaceTest.cxx
-otbDefaultImageMetadataInterfaceFactoryNew.cxx
-otbOpticalDefaultImageMetadataInterfaceFactoryNew.cxx
-otbPleiadesImageMetadataInterfaceNew.cxx
otbImageMetadataInterfaceBaseTest.cxx
otbSarDefaultImageMetadataInterface.cxx
-otbSarDefaultImageMetadataInterfaceNew.cxx
otbOpticalImageMetadataInterfaceTest.cxx
-otbSarDefaultImageMetadataInterfaceFactoryNew.cxx
-otbFormosatImageMetadataInterfaceNew.cxx
otbOpticalDefaultImageMetadataInterface.cxx
-otbSpot6ImageMetadataInterfaceNew.cxx
-otbSpotImageMetadataInterfaceNew.cxx
-otbQuickBirdImageMetadataInterfaceNew.cxx
-otbIkonosImageMetadataInterfaceNew.cxx
-otbTerraSarImageMetadataInterfaceNew.cxx
-otbSentinel1ImageMetadataInterfaceNew.cxx
-otbWorldView2ImageMetadataInterfaceNew.cxx
otbDefaultImageMetadataInterface.cxx
otbImageMetadataInterfaceTest2.cxx
otbNoDataHelperTest.cxx
otbSarCalibrationLookupDataTest.cxx
-otbRadarsat2ImageMetadataInterfaceNew.cxx
)
add_executable(otbMetadataTestDriver ${OTBMetadataTests})
@@ -54,9 +39,6 @@ otb_module_target_label(otbMetadataTestDriver)
# Tests Declaration
-otb_add_test(NAME ioTuOpticalDefaultImageMetadataInterfaceNew COMMAND otbMetadataTestDriver
- otbOpticalDefaultImageMetadataInterfaceNew )
-
#otb_add_test(NAME ioTvSarImageMetadataInterfaceTest_TSX1dims COMMAND otbMetadataTestDriver
#--compare-ascii ${EPSILON_9} ${BASELINE_FILES}/ioTvSarImageMetadataInterface_TSX1dims.txt
#${TEMP}/ioTvSarImageMetadataInterface_TSX1dims.txt
@@ -113,21 +95,6 @@ otb_add_test(NAME ioTuOpticalDefaultImageMetadataInterfaceNew COMMAND otbMetadat
#${TEMP}/ioTvImageMetadataInterfaceBase_RADARSAT2.txt
#)
-otb_add_test(NAME ioTuSentinel1ImageMetadataInterfaceNew COMMAND otbMetadataTestDriver
- otbSentinel1ImageMetadataInterfaceNew )
-
-otb_add_test(NAME ioTuRadarsat2ImageMetadataInterfaceNew COMMAND otbMetadataTestDriver
- otbRadarsat2ImageMetadataInterfaceNew )
-
-otb_add_test(NAME ioTuDefaultImageMetadataInterfaceFactoryNew COMMAND otbMetadataTestDriver
- otbDefaultImageMetadataInterfaceFactoryNew )
-
-otb_add_test(NAME ioTuOpticalDefaultImageMetadataInterfaceFactoryNew COMMAND otbMetadataTestDriver
- otbOpticalDefaultImageMetadataInterfaceFactoryNew )
-
-otb_add_test(NAME ioTuPleiadesImageMetadataInterfaceNew COMMAND otbMetadataTestDriver
- otbPleiadesImageMetadataInterfaceNew
- )
#otb_add_test(NAME ioTvImageMetadataInterfaceBaseTest_SPOT COMMAND otbMetadataTestDriver
#--compare-ascii ${NOTOL} ${BASELINE_FILES}/ioTvImageMetadataInterfaceBase_SPOT.txt
@@ -236,9 +203,6 @@ otb_add_test(NAME ioTuPleiadesImageMetadataInterfaceNew COMMAND otbMetadataTestD
otb_add_test(NAME ioTuSarDefaultImageMetadataInterface COMMAND otbMetadataTestDriver
otbSarDefaultImageMetadataInterface )
-otb_add_test(NAME ioTuSarDefaultImageMetadataInterfaceNew COMMAND otbMetadataTestDriver
- otbSarDefaultImageMetadataInterfaceNew )
-
otb_add_test(NAME ioTvOpticalImageMetadataInterfaceTest_QBCevennes COMMAND otbMetadataTestDriver
--compare-ascii ${NOTOL} ${BASELINE_FILES}/ioTvOpticalImageMetadataInterface_QBCevennes.txt
${TEMP}/ioTvOpticalImageMetadataInterface_QBCevennes.txt
@@ -303,39 +267,15 @@ otb_add_test(NAME ioTvOpticalImageMetadataInterfaceTest_FORMOSAT2 COMMAND otbMet
${TEMP}/ioTvOpticalImageMetadataInterface_FORMOSAT2.txt
)
-otb_add_test(NAME ioTuSarDefaultImageMetadataInterfaceFactoryNew COMMAND otbMetadataTestDriver
- otbSarDefaultImageMetadataInterfaceFactoryNew )
-
-otb_add_test(NAME ioTuFormosatImageMetadataInterfaceNew COMMAND otbMetadataTestDriver
- otbFormosatImageMetadataInterfaceNew
- )
otb_add_test(NAME ioTuOpticalDefaultImageMetadataInterface COMMAND otbMetadataTestDriver
otbOpticalDefaultImageMetadataInterface )
-otb_add_test(NAME ioTuSpot6ImageMetadataInterfaceNew COMMAND otbMetadataTestDriver
- otbSpot6ImageMetadataInterfaceNew
- )
-otb_add_test(NAME ioTuSpotImageMetadataInterfaceNew COMMAND otbMetadataTestDriver
- otbSpotImageMetadataInterfaceNew
- )
-otb_add_test(NAME ioTuQuickBirdImageMetadataInterfaceNew COMMAND otbMetadataTestDriver
- otbQuickBirdImageMetadataInterfaceNew
- )
-otb_add_test(NAME ioTuIkonosImageMetadataInterfaceNew COMMAND otbMetadataTestDriver
- otbIkonosImageMetadataInterfaceNew
- )
-otb_add_test(NAME ioTuTerraSarImageMetadataInterfaceNew COMMAND otbMetadataTestDriver
- otbTerraSarImageMetadataInterfaceNew
- )
-otb_add_test(NAME ioTuWorldView2ImageMetadataInterfaceNew COMMAND otbMetadataTestDriver
- otbWorldView2ImageMetadataInterfaceNew
- )
otb_add_test(NAME ioTuDefaultImageMetadataInterface COMMAND otbMetadataTestDriver
otbDefaultImageMetadataInterface )
diff --git a/Modules/Core/Metadata/test/otbDefaultImageMetadataInterfaceFactoryNew.cxx b/Modules/Core/Metadata/test/otbDefaultImageMetadataInterfaceFactoryNew.cxx
deleted file mode 100644
index 6976109e44613677c04b464207810afb852bf293..0000000000000000000000000000000000000000
--- a/Modules/Core/Metadata/test/otbDefaultImageMetadataInterfaceFactoryNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-
-#include "otbDefaultImageMetadataInterfaceFactory.h"
-
-int otbDefaultImageMetadataInterfaceFactoryNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::DefaultImageMetadataInterfaceFactory ObjectType;
-
- ObjectType::Pointer object = ObjectType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Metadata/test/otbFormosatImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbFormosatImageMetadataInterfaceNew.cxx
deleted file mode 100644
index 9e063d3b7a6b74d859b00ec3def13c15dbc0a559..0000000000000000000000000000000000000000
--- a/Modules/Core/Metadata/test/otbFormosatImageMetadataInterfaceNew.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-
-#include <iostream>
-
-#include "otbFormosatImageMetadataInterface.h"
-
-int otbFormosatImageMetadataInterfaceNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- otb::FormosatImageMetadataInterface::Pointer object = otb::FormosatImageMetadataInterface::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Metadata/test/otbIkonosImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbIkonosImageMetadataInterfaceNew.cxx
deleted file mode 100644
index e90271a386577924cbd6e06820964b767c64d9e5..0000000000000000000000000000000000000000
--- a/Modules/Core/Metadata/test/otbIkonosImageMetadataInterfaceNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-
-#include <iostream>
-
-#include "otbIkonosImageMetadataInterface.h"
-
-int otbIkonosImageMetadataInterfaceNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- otb::IkonosImageMetadataInterface::Pointer object = otb::IkonosImageMetadataInterface::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Metadata/test/otbMetadataTestDriver.cxx b/Modules/Core/Metadata/test/otbMetadataTestDriver.cxx
index efffa0eddb91d383ab9359a294ab4421b1848e23..91e618dc9240306ee5cee98ba619134ff534d4ed 100644
--- a/Modules/Core/Metadata/test/otbMetadataTestDriver.cxx
+++ b/Modules/Core/Metadata/test/otbMetadataTestDriver.cxx
@@ -22,28 +22,13 @@
void RegisterTests()
{
- REGISTER_TEST(otbOpticalDefaultImageMetadataInterfaceNew);
REGISTER_TEST(otbSarImageMetadataInterfaceTest);
- REGISTER_TEST(otbDefaultImageMetadataInterfaceFactoryNew);
- REGISTER_TEST(otbOpticalDefaultImageMetadataInterfaceFactoryNew);
- REGISTER_TEST(otbPleiadesImageMetadataInterfaceNew);
REGISTER_TEST(otbImageMetadataInterfaceBaseTest);
REGISTER_TEST(otbSarDefaultImageMetadataInterface);
- REGISTER_TEST(otbSarDefaultImageMetadataInterfaceNew);
REGISTER_TEST(otbOpticalImageMetadataInterfaceTest);
- REGISTER_TEST(otbSarDefaultImageMetadataInterfaceFactoryNew);
- REGISTER_TEST(otbFormosatImageMetadataInterfaceNew);
REGISTER_TEST(otbOpticalDefaultImageMetadataInterface);
- REGISTER_TEST(otbSpot6ImageMetadataInterfaceNew);
- REGISTER_TEST(otbSpotImageMetadataInterfaceNew);
- REGISTER_TEST(otbQuickBirdImageMetadataInterfaceNew);
- REGISTER_TEST(otbIkonosImageMetadataInterfaceNew);
- REGISTER_TEST(otbTerraSarImageMetadataInterfaceNew);
- REGISTER_TEST(otbSentinel1ImageMetadataInterfaceNew);
- REGISTER_TEST(otbWorldView2ImageMetadataInterfaceNew);
REGISTER_TEST(otbDefaultImageMetadataInterface);
REGISTER_TEST(otbImageMetadataInterfaceTest2);
REGISTER_TEST(otbNoDataHelperTest);
REGISTER_TEST(otbSarCalibrationLookupDataTest);
- REGISTER_TEST(otbRadarsat2ImageMetadataInterfaceNew);
}
diff --git a/Modules/Core/Metadata/test/otbOpticalDefaultImageMetadataInterfaceFactoryNew.cxx b/Modules/Core/Metadata/test/otbOpticalDefaultImageMetadataInterfaceFactoryNew.cxx
deleted file mode 100644
index 76a3591e5e5fbb5899aa335998fb84b9bbca7f2c..0000000000000000000000000000000000000000
--- a/Modules/Core/Metadata/test/otbOpticalDefaultImageMetadataInterfaceFactoryNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-
-#include "otbOpticalDefaultImageMetadataInterfaceFactory.h"
-
-int otbOpticalDefaultImageMetadataInterfaceFactoryNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::OpticalDefaultImageMetadataInterfaceFactory ObjectType;
-
- ObjectType::Pointer object = ObjectType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Metadata/test/otbOpticalDefaultImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbOpticalDefaultImageMetadataInterfaceNew.cxx
deleted file mode 100644
index f84ff21c7b6a8369a6d674bf9cd4bebbbb46c70d..0000000000000000000000000000000000000000
--- a/Modules/Core/Metadata/test/otbOpticalDefaultImageMetadataInterfaceNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-
-#include "otbOpticalDefaultImageMetadataInterface.h"
-
-int otbOpticalDefaultImageMetadataInterfaceNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::OpticalDefaultImageMetadataInterface ObjectType;
-
- ObjectType::Pointer object = ObjectType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Metadata/test/otbPleiadesImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbPleiadesImageMetadataInterfaceNew.cxx
deleted file mode 100644
index dbac0b24b4ddc0b0581e874cc6b6e6c5225360ae..0000000000000000000000000000000000000000
--- a/Modules/Core/Metadata/test/otbPleiadesImageMetadataInterfaceNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-
-#include <iostream>
-
-#include "otbPleiadesImageMetadataInterface.h"
-
-int otbPleiadesImageMetadataInterfaceNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- otb::PleiadesImageMetadataInterface::Pointer object = otb::PleiadesImageMetadataInterface::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Metadata/test/otbQuickBirdImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbQuickBirdImageMetadataInterfaceNew.cxx
deleted file mode 100644
index 9d0c4525f21ec84513660b68009c8b7a54f94f68..0000000000000000000000000000000000000000
--- a/Modules/Core/Metadata/test/otbQuickBirdImageMetadataInterfaceNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-
-#include <iostream>
-
-#include "otbQuickBirdImageMetadataInterface.h"
-
-int otbQuickBirdImageMetadataInterfaceNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- otb::QuickBirdImageMetadataInterface::Pointer object = otb::QuickBirdImageMetadataInterface::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Metadata/test/otbRadarsat2ImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbRadarsat2ImageMetadataInterfaceNew.cxx
deleted file mode 100644
index 361a9c11673e1e1f3af295672c72be53ceff3a08..0000000000000000000000000000000000000000
--- a/Modules/Core/Metadata/test/otbRadarsat2ImageMetadataInterfaceNew.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-#include <iostream>
-#include "otbRadarsat2ImageMetadataInterface.h"
-
-int otbRadarsat2ImageMetadataInterfaceNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- otb::Radarsat2ImageMetadataInterface::Pointer object = otb::Radarsat2ImageMetadataInterface::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Metadata/test/otbSarDefaultImageMetadataInterfaceFactoryNew.cxx b/Modules/Core/Metadata/test/otbSarDefaultImageMetadataInterfaceFactoryNew.cxx
deleted file mode 100644
index de159b57e0a5ad1954cc957c0027e17973709957..0000000000000000000000000000000000000000
--- a/Modules/Core/Metadata/test/otbSarDefaultImageMetadataInterfaceFactoryNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-
-#include "otbSarDefaultImageMetadataInterfaceFactory.h"
-
-int otbSarDefaultImageMetadataInterfaceFactoryNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::SarDefaultImageMetadataInterfaceFactory ObjectType;
-
- ObjectType::Pointer object = ObjectType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Metadata/test/otbSarDefaultImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbSarDefaultImageMetadataInterfaceNew.cxx
deleted file mode 100644
index 73cdd72d6b5723a22380ea1e47db0d911e6c5f31..0000000000000000000000000000000000000000
--- a/Modules/Core/Metadata/test/otbSarDefaultImageMetadataInterfaceNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-
-#include "otbSarDefaultImageMetadataInterface.h"
-
-int otbSarDefaultImageMetadataInterfaceNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::SarDefaultImageMetadataInterface ObjectType;
-
- ObjectType::Pointer object = ObjectType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Metadata/test/otbSentinel1ImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbSentinel1ImageMetadataInterfaceNew.cxx
deleted file mode 100644
index 16d6613c8ee88cb42b40f77987e2d512018ab161..0000000000000000000000000000000000000000
--- a/Modules/Core/Metadata/test/otbSentinel1ImageMetadataInterfaceNew.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-#include <iostream>
-#include "otbSentinel1ImageMetadataInterface.h"
-
-int otbSentinel1ImageMetadataInterfaceNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- otb::Sentinel1ImageMetadataInterface::Pointer object = otb::Sentinel1ImageMetadataInterface::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Metadata/test/otbSpot6ImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbSpot6ImageMetadataInterfaceNew.cxx
deleted file mode 100644
index f320012c8d6ab27cac348283f11f618dd967e0c9..0000000000000000000000000000000000000000
--- a/Modules/Core/Metadata/test/otbSpot6ImageMetadataInterfaceNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-
-#include <iostream>
-
-#include "otbSpot6ImageMetadataInterface.h"
-
-int otbSpot6ImageMetadataInterfaceNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- otb::Spot6ImageMetadataInterface::Pointer object = otb::Spot6ImageMetadataInterface::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Metadata/test/otbSpotImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbSpotImageMetadataInterfaceNew.cxx
deleted file mode 100644
index cd950d60d58a2772c7a3df9543d4685d4e83a293..0000000000000000000000000000000000000000
--- a/Modules/Core/Metadata/test/otbSpotImageMetadataInterfaceNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-
-#include <iostream>
-
-#include "otbSpotImageMetadataInterface.h"
-
-int otbSpotImageMetadataInterfaceNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- otb::SpotImageMetadataInterface::Pointer object = otb::SpotImageMetadataInterface::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Metadata/test/otbTerraSarImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbTerraSarImageMetadataInterfaceNew.cxx
deleted file mode 100644
index 35fbd70d35e8c52a9d1764b6852df13c07bc6ccd..0000000000000000000000000000000000000000
--- a/Modules/Core/Metadata/test/otbTerraSarImageMetadataInterfaceNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-
-#include <fstream>
-#include <iostream>
-#include "otbVectorImage.h"
-#include "otbImageFileReader.h"
-#include "otbTerraSarImageMetadataInterface.h"
-
-int otbTerraSarImageMetadataInterfaceNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- otb::TerraSarImageMetadataInterface::Pointer object = otb::TerraSarImageMetadataInterface::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Metadata/test/otbWorldView2ImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbWorldView2ImageMetadataInterfaceNew.cxx
deleted file mode 100644
index 95a394ce0b7fa9891471973d6d4688da207d8550..0000000000000000000000000000000000000000
--- a/Modules/Core/Metadata/test/otbWorldView2ImageMetadataInterfaceNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-
-#include <iostream>
-
-#include "otbWorldView2ImageMetadataInterface.h"
-
-int otbWorldView2ImageMetadataInterfaceNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- otb::WorldView2ImageMetadataInterface::Pointer object = otb::WorldView2ImageMetadataInterface::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/ObjectList/test/CMakeLists.txt b/Modules/Core/ObjectList/test/CMakeLists.txt
index 32f3ffbf576d1b3c60c4b247c12bc60fab1eb180..d00a1da0c2545ded46895027e4a01ee91a796385 100644
--- a/Modules/Core/ObjectList/test/CMakeLists.txt
+++ b/Modules/Core/ObjectList/test/CMakeLists.txt
@@ -21,22 +21,12 @@
otb_module_test()
set(OTBObjectListTests
otbObjectList.cxx
- otbObjectListNew.cxx
otbImageList.cxx
- otbImageListNew.cxx
- otbImageListSourceNew.cxx
- otbImageListToImageFilterNew.cxx
otbImageListToImageListApplyFilter.cxx
- otbImageListToImageListApplyFilterNew.cxx
- otbImageListToImageListFilterNew.cxx
otbImageListToVectorImageFilter2.cxx
otbImageListToVectorImageFilter.cxx
- otbImageListToVectorImageFilterNew.cxx
otbObjectList2.cxx
- otbObjectListToObjectListFilterNew.cxx
- otbImageToImageListFilterNew.cxx
otbVectorImageToImageListFilter.cxx
- otbVectorImageToImageListFilterNew.cxx
otbObjectListTestDriver.cxx )
add_executable(otbObjectListTestDriver ${OTBObjectListTests})
@@ -48,8 +38,6 @@ otb_add_test(NAME coTvObjectList COMMAND otbObjectListTestDriver
${INPUTDATA}/poupees.png
${INPUTDATA}/couleurs_extrait.png
)
-otb_add_test(NAME coTuObjectListNew COMMAND otbObjectListTestDriver
- otbObjectListNew)
otb_add_test(NAME coTvImageList COMMAND otbObjectListTestDriver
--compare-image ${NOTOL} ${INPUTDATA}/amst.png
${TEMP}/amst.png
@@ -57,12 +45,6 @@ otb_add_test(NAME coTvImageList COMMAND otbObjectListTestDriver
${INPUTDATA}/amst.png
${TEMP}/amst.png
)
-otb_add_test(NAME coTuImageListNew COMMAND otbObjectListTestDriver
- otbImageListNew)
-otb_add_test(NAME coTuImageListSourceNew COMMAND otbObjectListTestDriver
- otbImageListSourceNew)
-otb_add_test(NAME coTuImageListToImageFilterNew COMMAND otbObjectListTestDriver
- otbImageListToImageFilterNew)
otb_add_test(NAME bfTvImageListToImageListApplyFilter COMMAND otbObjectListTestDriver
--compare-n-images ${EPSILON_7} 3
${BASELINE}/bfTvImageListToImageListApplyFilterBand1.png
@@ -79,10 +61,6 @@ otb_add_test(NAME bfTvImageListToImageListApplyFilter COMMAND otbObjectListTestD
${TEMP}/bfTvImageListToImageListApplyFilterBand2.png
${TEMP}/bfTvImageListToImageListApplyFilterBand3.png
)
-otb_add_test(NAME bfTuImageListToImageListApplyFilterNew COMMAND otbObjectListTestDriver
- otbImageListToImageListApplyFilterNew)
-otb_add_test(NAME coTvImageListToImageListFilterNew COMMAND otbObjectListTestDriver
- otbImageListToImageListFilterNew)
otb_add_test(NAME coTvImageListToVectorImageFilter2 COMMAND otbObjectListTestDriver
otbImageListToVectorImageFilter2
${INPUTDATA}/poupees_c1.hdr
@@ -99,15 +77,9 @@ otb_add_test(NAME coTvImageListToVectorImageFilter COMMAND otbObjectListTestDriv
${INPUTDATA}/poupees_c3.hdr
${TEMP}/coTvImageListToVectorImageFilter.png
)
-otb_add_test(NAME coTuImageListToVectorImageFilterNew COMMAND otbObjectListTestDriver
- otbImageListToVectorImageFilterNew)
otb_add_test(NAME coTvObjectListTestNotValid COMMAND otbObjectListTestDriver
otbObjectList2
)
-otb_add_test(NAME coTuObjectListToObjectListFilterNew COMMAND otbObjectListTestDriver
- otbObjectListToObjectListFilterNew)
-otb_add_test(NAME coTuImageToImageListFilterNew COMMAND otbObjectListTestDriver
- otbImageToImageListFilterNew)
otb_add_test(NAME bfTvVectorImageToImageListFilter COMMAND otbObjectListTestDriver
--compare-n-images ${EPSILON_7} 3
${BASELINE}/bfTvVectorImageToImageListFilterBand1.png
@@ -148,5 +120,3 @@ otb_add_test(NAME bfTvVectorImageToImageListFilterIt2 COMMAND otbObjectListTestD
${TEMP}/bfTvVectorImageToImageListFilterIt2
tif
)
-otb_add_test(NAME bfTuVectorImageToImageListFilterNew COMMAND otbObjectListTestDriver
- otbVectorImageToImageListFilterNew)
diff --git a/Modules/Core/ObjectList/test/otbImageListNew.cxx b/Modules/Core/ObjectList/test/otbImageListNew.cxx
deleted file mode 100644
index 1f6f7de6103254b2295557bd53779d53486069b1..0000000000000000000000000000000000000000
--- a/Modules/Core/ObjectList/test/otbImageListNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbImageList.h"
-#include "otbImage.h"
-
-int otbImageListNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- const unsigned int Dimension = 2;
- typedef unsigned char InputPixelType;
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::ImageList<InputImageType> ImageListType;
-
- // Instantiating ImageList object
- ImageListType::Pointer imageList = ImageListType::New();
-
- std::cout << imageList << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/ObjectList/test/otbImageListSourceNew.cxx b/Modules/Core/ObjectList/test/otbImageListSourceNew.cxx
deleted file mode 100644
index dba73e02b167fbb974ad943da00edf3fff4421f5..0000000000000000000000000000000000000000
--- a/Modules/Core/ObjectList/test/otbImageListSourceNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbImageListSource.h"
-#include "otbImage.h"
-
-int otbImageListSourceNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char InputPixelType;
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::ImageListSource<InputImageType> ImageListSourceType;
-
- // Instantiating ImageListSource object
- ImageListSourceType::Pointer imageList = ImageListSourceType::New();
-
- std::cout << imageList << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/ObjectList/test/otbImageListToImageFilterNew.cxx b/Modules/Core/ObjectList/test/otbImageListToImageFilterNew.cxx
deleted file mode 100644
index 8d05a88b51a433ea5c51ca503bc103c218e60e5c..0000000000000000000000000000000000000000
--- a/Modules/Core/ObjectList/test/otbImageListToImageFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbImageListToImageFilter.h"
-#include "otbImage.h"
-
-int otbImageListToImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char InputPixelType;
- typedef unsigned char OutputPixelType;
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
- typedef otb::ImageListToImageFilter<InputImageType, OutputImageType> ImageListToImageFilterType;
-
- // Instantiating ImageListSource object
- ImageListToImageFilterType::Pointer imageList = ImageListToImageFilterType::New();
-
- std::cout << imageList << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/ObjectList/test/otbImageListToImageListApplyFilterNew.cxx b/Modules/Core/ObjectList/test/otbImageListToImageListApplyFilterNew.cxx
deleted file mode 100644
index dc766d7ba37f0ff20e78728671c0a2cec614584a..0000000000000000000000000000000000000000
--- a/Modules/Core/ObjectList/test/otbImageListToImageListApplyFilterNew.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbImageListToImageListApplyFilter.h"
-#include "otbImageList.h"
-#include "otbImage.h"
-#include "itkUnaryFunctorImageFilter.h"
-#include "itkMeanImageFilter.h"
-
-int otbImageListToImageListApplyFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::ImageList<ImageType> ImageListType;
- typedef itk::MeanImageFilter<ImageType, ImageType> MeanFilterType;
-
- typedef otb::ImageListToImageListApplyFilter<ImageListType, ImageListType, MeanFilterType>
- ImageListToImageListApplyFilterType;
-
- // Instantiating object
- ImageListToImageListApplyFilterType::Pointer filter = ImageListToImageListApplyFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/ObjectList/test/otbImageListToImageListFilterNew.cxx b/Modules/Core/ObjectList/test/otbImageListToImageListFilterNew.cxx
deleted file mode 100644
index 40afe85ada35fbe9c055e4c7fd34d0d2fdf04872..0000000000000000000000000000000000000000
--- a/Modules/Core/ObjectList/test/otbImageListToImageListFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbImageListToImageListFilter.h"
-#include "otbImage.h"
-
-int otbImageListToImageListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char InputPixelType;
- typedef unsigned char OutputPixelType;
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
- typedef otb::ImageListToImageListFilter<InputImageType, OutputImageType> ImageToImageListFilterType;
-
- // Instantiating ImageListSource object
- ImageToImageListFilterType::Pointer imageList = ImageToImageListFilterType::New();
-
- std::cout << imageList << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/ObjectList/test/otbImageListToVectorImageFilterNew.cxx b/Modules/Core/ObjectList/test/otbImageListToVectorImageFilterNew.cxx
deleted file mode 100644
index fca0f74c75cd9f72bf8a6c8b41fd12c1acf76ec2..0000000000000000000000000000000000000000
--- a/Modules/Core/ObjectList/test/otbImageListToVectorImageFilterNew.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbImageListToVectorImageFilter.h"
-#include "otbVectorImage.h"
-#include "otbImage.h"
-#include "otbImageList.h"
-
-int otbImageListToVectorImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
-
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::VectorImage<PixelType, Dimension> VectorImageType;
- typedef otb::ImageList<ImageType> ImageListType;
-
- typedef otb::ImageListToVectorImageFilter<ImageListType, VectorImageType> ImageListToVectorImageFilterType;
-
- // Instantiating object
- ImageListToVectorImageFilterType::Pointer filter = ImageListToVectorImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/ObjectList/test/otbImageToImageListFilterNew.cxx b/Modules/Core/ObjectList/test/otbImageToImageListFilterNew.cxx
deleted file mode 100644
index 96b038665362040c74deabbdaaab0602f4cadf66..0000000000000000000000000000000000000000
--- a/Modules/Core/ObjectList/test/otbImageToImageListFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbImageToImageListFilter.h"
-#include "otbImage.h"
-
-int otbImageToImageListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char InputPixelType;
- typedef unsigned char OutputPixelType;
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
- typedef otb::ImageToImageListFilter<InputImageType, OutputImageType> ImageToImageListFilterType;
-
- // Instantiating ImageListSource object
- ImageToImageListFilterType::Pointer imageList = ImageToImageListFilterType::New();
-
- std::cout << imageList << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/ObjectList/test/otbObjectListNew.cxx b/Modules/Core/ObjectList/test/otbObjectListNew.cxx
deleted file mode 100644
index d67866f082202cf7614936036eb38fecf250f9c0..0000000000000000000000000000000000000000
--- a/Modules/Core/ObjectList/test/otbObjectListNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbObjectList.h"
-#include "otbImage.h"
-
-int otbObjectListNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::ObjectList<ImageType> ImageListType;
-
- ImageListType::Pointer imageList = ImageListType::New();
-
- std::cout << imageList << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/ObjectList/test/otbObjectListTestDriver.cxx b/Modules/Core/ObjectList/test/otbObjectListTestDriver.cxx
index 3870be5bac9bbdc144779c3c210b889034e122a6..d95255ce2c569a24e34359a61e0866d27345fe4b 100644
--- a/Modules/Core/ObjectList/test/otbObjectListTestDriver.cxx
+++ b/Modules/Core/ObjectList/test/otbObjectListTestDriver.cxx
@@ -23,21 +23,11 @@
void RegisterTests()
{
REGISTER_TEST(otbObjectList);
- REGISTER_TEST(otbObjectListNew);
REGISTER_TEST(otbImageList);
- REGISTER_TEST(otbImageListNew);
- REGISTER_TEST(otbImageListSourceNew);
- REGISTER_TEST(otbImageListToImageFilterNew);
REGISTER_TEST(otbImageListToImageListApplyFilter);
- REGISTER_TEST(otbImageListToImageListApplyFilterNew);
- REGISTER_TEST(otbImageListToImageListFilterNew);
REGISTER_TEST(otbImageListToVectorImageFilter2);
REGISTER_TEST(otbImageListToVectorImageFilter);
- REGISTER_TEST(otbImageListToVectorImageFilterNew);
REGISTER_TEST(otbObjectList2);
- REGISTER_TEST(otbObjectListToObjectListFilterNew);
- REGISTER_TEST(otbImageToImageListFilterNew);
REGISTER_TEST(otbVectorImageToImageListFilter);
- REGISTER_TEST(otbVectorImageToImageListFilterNew);
REGISTER_TEST(otbVectorImageToImageListFilterIterator);
}
diff --git a/Modules/Core/ObjectList/test/otbObjectListToObjectListFilterNew.cxx b/Modules/Core/ObjectList/test/otbObjectListToObjectListFilterNew.cxx
deleted file mode 100644
index aa04426d51609bb5b3cbd69f8a752f8b71cdd650..0000000000000000000000000000000000000000
--- a/Modules/Core/ObjectList/test/otbObjectListToObjectListFilterNew.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbObjectListToObjectListFilter.h"
-#include "otbObjectList.h"
-#include <complex>
-#include "otbPolygon.h"
-
-int otbObjectListToObjectListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::PolyLineParametricPathWithValue<std::complex<int>, 2> InputObjectType;
- typedef otb::Polygon<unsigned char> OutputObjectType;
-
- typedef otb::ObjectList<InputObjectType> InputListType;
- typedef otb::ObjectList<OutputObjectType> OutputListType;
-
- typedef otb::ObjectListToObjectListFilter<InputListType, OutputListType> ObjectListFilterType;
-
- ObjectListFilterType::Pointer objectList = ObjectListFilterType::New();
-
- std::cout << objectList << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/ObjectList/test/otbVectorImageToImageListFilter.cxx b/Modules/Core/ObjectList/test/otbVectorImageToImageListFilter.cxx
index 57a20c7b40331b410fd1150e01388c88018554e8..c53e328615ef9e9ce7eb379e74fb903b732a09ed 100644
--- a/Modules/Core/ObjectList/test/otbVectorImageToImageListFilter.cxx
+++ b/Modules/Core/ObjectList/test/otbVectorImageToImageListFilter.cxx
@@ -117,7 +117,7 @@ int otbVectorImageToImageListFilterIterator(int itkNotUsed(argc), char * argv[])
writer->SetInput(itOutput.Get());
- writer->SetFileName(oss.str().c_str());
+ writer->SetFileName(oss.str());
writer->SetNumberOfDivisionsTiledStreaming(8);
writer->Update();
@@ -135,7 +135,7 @@ int otbVectorImageToImageListFilterIterator(int itkNotUsed(argc), char * argv[])
writer->SetInput(itOutput.Get());
- writer->SetFileName(oss.str().c_str());
+ writer->SetFileName(oss.str());
writer->Update();
diff --git a/Modules/Core/ObjectList/test/otbVectorImageToImageListFilterNew.cxx b/Modules/Core/ObjectList/test/otbVectorImageToImageListFilterNew.cxx
deleted file mode 100644
index 62dff77329d456e49d643716a0038ff2e2650107..0000000000000000000000000000000000000000
--- a/Modules/Core/ObjectList/test/otbVectorImageToImageListFilterNew.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbVectorImageToImageListFilter.h"
-#include "otbVectorImage.h"
-#include "otbImageList.h"
-#include "otbImage.h"
-
-int otbVectorImageToImageListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
-
- typedef unsigned char PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::VectorImage<PixelType, Dimension> VectorImageType;
- typedef otb::ImageList<ImageType> ImageListType;
-
- typedef otb::VectorImageToImageListFilter<VectorImageType, ImageListType> VectorImageToImageListFilterType;
-
- // Instantiating object
- VectorImageToImageListFilterType::Pointer filter = VectorImageToImageListFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/PointSet/test/CMakeLists.txt b/Modules/Core/PointSet/test/CMakeLists.txt
index 237a55f1cffdd0922c39ec4d143faed300326c9c..bd39df8b8ccc9b83ecec801239851b8354f2816d 100644
--- a/Modules/Core/PointSet/test/CMakeLists.txt
+++ b/Modules/Core/PointSet/test/CMakeLists.txt
@@ -25,7 +25,6 @@ otbPointSetTestDriver.cxx
otbPointSetSourceTest.cxx
otbPointSetExtractROITest.cxx
otbSimplePointCountStrategyTest.cxx
-otbThresholdImageToPointSetFilterNew.cxx
otbRandomPointSetSourceTest.cxx
otbImageToPointSetFilterTest.cxx
otbTransformPointSetFilterTest.cxx
@@ -47,9 +46,6 @@ otb_add_test(NAME bfTvPointSetExtractROI COMMAND otbPointSetTestDriver
otb_add_test(NAME feTvSimplePointCountStrategyTest COMMAND otbPointSetTestDriver
otbSimplePointCountStrategyTest)
-otb_add_test(NAME feTuThresholdImageToPointSetFilterNew COMMAND otbPointSetTestDriver
- otbThresholdImageToPointSetFilterNew
- )
otb_add_test(NAME bfTvRandomPointSetSource COMMAND otbPointSetTestDriver
otbRandomPointSetSourceTest)
diff --git a/Modules/Core/PointSet/test/otbPointSetTestDriver.cxx b/Modules/Core/PointSet/test/otbPointSetTestDriver.cxx
index 6744a41ae2f7606881aa375eaaeb61e3b374edc1..af5be22689ebde319fe7e14079ca3178bf2e3d98 100644
--- a/Modules/Core/PointSet/test/otbPointSetTestDriver.cxx
+++ b/Modules/Core/PointSet/test/otbPointSetTestDriver.cxx
@@ -25,7 +25,6 @@ void RegisterTests()
REGISTER_TEST(otbPointSetSourceTest);
REGISTER_TEST(otbPointSetExtractROITest);
REGISTER_TEST(otbSimplePointCountStrategyTest);
- REGISTER_TEST(otbThresholdImageToPointSetFilterNew);
REGISTER_TEST(otbRandomPointSetSourceTest);
REGISTER_TEST(otbImageToPointSetFilterTest);
REGISTER_TEST(otbTransformPointSetFilterTest);
diff --git a/Modules/Core/PointSet/test/otbThresholdImageToPointSetFilterNew.cxx b/Modules/Core/PointSet/test/otbThresholdImageToPointSetFilterNew.cxx
deleted file mode 100644
index c4f0342891969c7c8c0df079555c043efc43bfcf..0000000000000000000000000000000000000000
--- a/Modules/Core/PointSet/test/otbThresholdImageToPointSetFilterNew.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-
-#include "otbThresholdImageToPointSetFilter.h"
-#include "otbImage.h"
-
-#include <iostream>
-
-int otbThresholdImageToPointSetFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef itk::PointSet<PixelType, Dimension> PointSetType;
-
- typedef otb::ThresholdImageToPointSetFilter<ImageType, PointSetType> FilterThresholdType;
-
- FilterThresholdType::Pointer filter = FilterThresholdType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/SpatialObjects/test/CMakeLists.txt b/Modules/Core/SpatialObjects/test/CMakeLists.txt
index 19c52b307de98f385d7cb3146e112c7280faafc1..97598189272c8b96c2778beeaf46b97f8aba6397 100644
--- a/Modules/Core/SpatialObjects/test/CMakeLists.txt
+++ b/Modules/Core/SpatialObjects/test/CMakeLists.txt
@@ -22,17 +22,10 @@ otb_module_test()
set(OTBSpatialObjectsTests
otbSpatialObjectsTestDriver.cxx
-otbLineSpatialObjectListToPointSetFilterNew.cxx
otbSpatialObjectToImageDrawingFilter.cxx
otbDrawLineSpatialObject.cxx
-otbSpatialObjectToImageDrawingFilterNew.cxx
otbLineSpatialObjectList.cxx
-otbLineSpatialObjectNew.cxx
-otbDrawLineSpatialObjectListNew.cxx
otbDrawLineSpatialObjectList.cxx
-otbSpatialObjectSourceNew.cxx
-otbImageToLineSpatialObjectListNew.cxx
-otbDrawLineSpatialObjectNew.cxx
)
add_executable(otbSpatialObjectsTestDriver ${OTBSpatialObjectsTests})
@@ -40,11 +33,6 @@ target_link_libraries(otbSpatialObjectsTestDriver ${OTBSpatialObjects-Test_LIBRA
otb_module_target_label(otbSpatialObjectsTestDriver)
# Tests Declaration
-
-
-otb_add_test(NAME coTuLineSpatialObjectListToPointSetFilter COMMAND otbSpatialObjectsTestDriver
- otbLineSpatialObjectListToPointSetFilterNew)
-
otb_add_test(NAME bfTvSpatialObjectToImageDrawingFilterWithoutInputImage COMMAND otbSpatialObjectsTestDriver
--compare-image ${NOTOL}
${BASELINE}/bfTvSpatialObjectDrawingNoInput.png
@@ -61,30 +49,11 @@ otb_add_test(NAME coTuDrawLineSpatialObject COMMAND otbSpatialObjectsTestDriver
${INPUTDATA}/ImageLineDir.bsq
${TEMP}/coFiltreDrawLine_ImageLineDir.png 10. 22. 38. 42.)
-otb_add_test(NAME bfTuSpatialObjectToImageDrawingFilterNew COMMAND otbSpatialObjectsTestDriver
- otbSpatialObjectToImageDrawingFilterNew)
-
otb_add_test(NAME coTuLineSpatialObjectList COMMAND otbSpatialObjectsTestDriver
otbLineSpatialObjectList
)
-otb_add_test(NAME coTuLineSpatialObjectNew COMMAND otbSpatialObjectsTestDriver
- otbLineSpatialObjectNew)
-
-otb_add_test(NAME coTuDrawLineSpatialObjectListNew COMMAND otbSpatialObjectsTestDriver
- otbDrawLineSpatialObjectListNew)
-
otb_add_test(NAME coTuDrawLineSpatialObjectList COMMAND otbSpatialObjectsTestDriver
otbDrawLineSpatialObjectList
${INPUTDATA}/ImageLineDir.bsq
${TEMP}/coFiltreDrawLineList_ImageLineDir.png )
-
-otb_add_test(NAME coTuSpatialObjectSourceNew COMMAND otbSpatialObjectsTestDriver
- otbSpatialObjectSourceNew)
-
-otb_add_test(NAME coTuImageToLineSpatialObjectListNew COMMAND otbSpatialObjectsTestDriver
- otbImageToLineSpatialObjectListNew)
-
-otb_add_test(NAME coTuDrawLineSpatialObjectNew COMMAND otbSpatialObjectsTestDriver
- otbDrawLineSpatialObjectNew)
-
diff --git a/Modules/Core/SpatialObjects/test/otbDrawLineSpatialObjectListNew.cxx b/Modules/Core/SpatialObjects/test/otbDrawLineSpatialObjectListNew.cxx
deleted file mode 100644
index 4690c9ed80aedf46addcaef3a63491c502c63cb7..0000000000000000000000000000000000000000
--- a/Modules/Core/SpatialObjects/test/otbDrawLineSpatialObjectListNew.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-#include <iostream>
-
-#include "otbImage.h"
-#include "otbDrawLineSpatialObjectListFilter.h"
-
-int otbDrawLineSpatialObjectListNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double InputPixelType;
- typedef unsigned char OutputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
-
- typedef otb::DrawLineSpatialObjectListFilter<InputImageType, OutputImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/SpatialObjects/test/otbDrawLineSpatialObjectNew.cxx b/Modules/Core/SpatialObjects/test/otbDrawLineSpatialObjectNew.cxx
deleted file mode 100644
index e9344757db8ecd5754d7e7e67a77b5bd0d18a71e..0000000000000000000000000000000000000000
--- a/Modules/Core/SpatialObjects/test/otbDrawLineSpatialObjectNew.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-#include <iostream>
-
-#include "otbImage.h"
-#include "otbDrawLineSpatialObjectFilter.h"
-
-int otbDrawLineSpatialObjectNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double InputPixelType;
- typedef double OutputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
-
- typedef otb::DrawLineSpatialObjectFilter<InputImageType, OutputImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/SpatialObjects/test/otbImageToLineSpatialObjectListNew.cxx b/Modules/Core/SpatialObjects/test/otbImageToLineSpatialObjectListNew.cxx
deleted file mode 100644
index 38758f708eca0897bf269b3149dcf7182c2ac8c4..0000000000000000000000000000000000000000
--- a/Modules/Core/SpatialObjects/test/otbImageToLineSpatialObjectListNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-#include <iostream>
-
-#include "otbImage.h"
-#include "otbImageToLineSpatialObjectListFilter.h"
-
-int otbImageToLineSpatialObjectListNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned char InputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
-
- typedef otb::ImageToLineSpatialObjectListFilter<InputImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/SpatialObjects/test/otbLineSpatialObjectListToPointSetFilterNew.cxx b/Modules/Core/SpatialObjects/test/otbLineSpatialObjectListToPointSetFilterNew.cxx
deleted file mode 100644
index 7e8d5e74bff63af35a5dfb1315b39d0c3fde02f4..0000000000000000000000000000000000000000
--- a/Modules/Core/SpatialObjects/test/otbLineSpatialObjectListToPointSetFilterNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkPointSet.h"
-#include <iostream>
-
-#include "otbLineSpatialObjectListToPointSetFilter.h"
-
-int otbLineSpatialObjectListToPointSetFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef float InputPixelType;
- typedef otb::LineSpatialObjectList LinesListType;
- typedef itk::PointSet<InputPixelType> PointSetType;
-
- typedef otb::LineSpatialObjectListToPointSetFilter<LinesListType,
- PointSetType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/SpatialObjects/test/otbLineSpatialObjectNew.cxx b/Modules/Core/SpatialObjects/test/otbLineSpatialObjectNew.cxx
deleted file mode 100644
index 31d6fc2987b9256ab07c90e96730fcd427c8f8ac..0000000000000000000000000000000000000000
--- a/Modules/Core/SpatialObjects/test/otbLineSpatialObjectNew.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbLineSpatialObject.h"
-
-int otbLineSpatialObjectNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::LineSpatialObject<2> LineSpatialObjectType;
-
- // Instantiating object
- LineSpatialObjectType::Pointer object = LineSpatialObjectType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/SpatialObjects/test/otbSpatialObjectSourceNew.cxx b/Modules/Core/SpatialObjects/test/otbSpatialObjectSourceNew.cxx
deleted file mode 100644
index 45434429569b03e7d9ce6965a82e85c0ee41359f..0000000000000000000000000000000000000000
--- a/Modules/Core/SpatialObjects/test/otbSpatialObjectSourceNew.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbSpatialObjectSource.h"
-#include "itkGroupSpatialObject.h"
-
-int otbSpatialObjectSourceNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef itk::GroupSpatialObject<Dimension> SpatialObjectType;
- typedef otb::SpatialObjectSource<SpatialObjectType> SpatialObjectSourceType;
-
- // Instantiation
- SpatialObjectSourceType::Pointer source = SpatialObjectSourceType::New();
-
- std::cout << source << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/SpatialObjects/test/otbSpatialObjectToImageDrawingFilterNew.cxx b/Modules/Core/SpatialObjects/test/otbSpatialObjectToImageDrawingFilterNew.cxx
deleted file mode 100644
index 9b5da7628bc2b14ae2fd89413d16f17858d1a41e..0000000000000000000000000000000000000000
--- a/Modules/Core/SpatialObjects/test/otbSpatialObjectToImageDrawingFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbSpatialObjectToImageDrawingFilter.h"
-#include "itkGroupSpatialObject.h"
-#include "otbImage.h"
-
-int otbSpatialObjectToImageDrawingFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef itk::GroupSpatialObject<Dimension> SpatialObjectType;
- typedef otb::SpatialObjectToImageDrawingFilter<SpatialObjectType, ImageType> SpatialObjectToImageDrawingFilterType;
- // Instantiating object
- SpatialObjectToImageDrawingFilterType::Pointer filter = SpatialObjectToImageDrawingFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/SpatialObjects/test/otbSpatialObjectsTestDriver.cxx b/Modules/Core/SpatialObjects/test/otbSpatialObjectsTestDriver.cxx
index 7c5b2f5ef6f0c26a852aa690a076ce280262e04e..0c3fdbb4ec04911b383eb696657b2116f1ce8d08 100644
--- a/Modules/Core/SpatialObjects/test/otbSpatialObjectsTestDriver.cxx
+++ b/Modules/Core/SpatialObjects/test/otbSpatialObjectsTestDriver.cxx
@@ -22,15 +22,8 @@
void RegisterTests()
{
- REGISTER_TEST(otbLineSpatialObjectListToPointSetFilterNew);
REGISTER_TEST(otbSpatialObjectToImageDrawingFilter);
REGISTER_TEST(otbDrawLineSpatialObject);
- REGISTER_TEST(otbSpatialObjectToImageDrawingFilterNew);
REGISTER_TEST(otbLineSpatialObjectList);
- REGISTER_TEST(otbLineSpatialObjectNew);
- REGISTER_TEST(otbDrawLineSpatialObjectListNew);
REGISTER_TEST(otbDrawLineSpatialObjectList);
- REGISTER_TEST(otbSpatialObjectSourceNew);
- REGISTER_TEST(otbImageToLineSpatialObjectListNew);
- REGISTER_TEST(otbDrawLineSpatialObjectNew);
}
diff --git a/Modules/Core/Streaming/test/CMakeLists.txt b/Modules/Core/Streaming/test/CMakeLists.txt
index 09b52ccaf2282cde99ebd643803f9f85be588614..41f518b8479a4312fadc8a3b00c92adc6f69ffe4 100644
--- a/Modules/Core/Streaming/test/CMakeLists.txt
+++ b/Modules/Core/Streaming/test/CMakeLists.txt
@@ -64,9 +64,6 @@ otb_add_test(NAME coTvRAMDrivenTiledStreamingManager COMMAND otbStreamingTestDri
${TEMP}/coTvRAMDrivenTiledStreamingManager.txt
)
-otb_add_test(NAME coTuStreamingManagerNew COMMAND otbStreamingTestDriver
- otbStreamingManagerNew
- )
otb_add_test(NAME coTvTileDimensionTiledStreamingManager COMMAND otbStreamingTestDriver
--compare-ascii ${NOTOL}
@@ -84,6 +81,3 @@ otb_add_test(NAME coTvPipelineMemoryPrintCalculator COMMAND otbStreamingTestDriv
${INPUTDATA}/qb_RoadExtract.img
${TEMP}/coTvPipelineMemoryPrintCalculatorOutput.txt
)
-otb_add_test(NAME coTuPipelineMemoryPrintCalculatorNew COMMAND otbStreamingTestDriver
- otbPipelineMemoryPrintCalculatorNew
- )
diff --git a/Modules/Core/Streaming/test/otbPipelineMemoryPrintCalculatorTest.cxx b/Modules/Core/Streaming/test/otbPipelineMemoryPrintCalculatorTest.cxx
index b63893843ff8e15c00865b224abde9b612ec4a43..21ce77e04f5fc1089ec1e3fa2211b2be1f13000d 100644
--- a/Modules/Core/Streaming/test/otbPipelineMemoryPrintCalculatorTest.cxx
+++ b/Modules/Core/Streaming/test/otbPipelineMemoryPrintCalculatorTest.cxx
@@ -25,12 +25,6 @@
#include "otbImageFileReader.h"
#include "otbVectorImageToIntensityImageFilter.h"
-int otbPipelineMemoryPrintCalculatorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- otb::PipelineMemoryPrintCalculator::Pointer calculator = otb::PipelineMemoryPrintCalculator::New();
-
- return EXIT_SUCCESS;
-}
int otbPipelineMemoryPrintCalculatorTest(int itkNotUsed(argc), char * argv[])
diff --git a/Modules/Core/Streaming/test/otbStreamingManager.cxx b/Modules/Core/Streaming/test/otbStreamingManager.cxx
index b128f7fb13c5da7cf6df0a892e28b7ed00374662..3bb2259bfd5e437f377db92f9a52b18c78217319 100644
--- a/Modules/Core/Streaming/test/otbStreamingManager.cxx
+++ b/Modules/Core/Streaming/test/otbStreamingManager.cxx
@@ -52,25 +52,6 @@ ImageType::Pointer makeImage(ImageType::RegionType region)
return image;
}
-int otbStreamingManagerNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- NbLinesStrippedStreamingManagerType::Pointer streamingManager1 = NbLinesStrippedStreamingManagerType::New();
- std::cout << streamingManager1 << std::endl;
-
- RAMDrivenStrippedStreamingManagerType::Pointer streamingManager2 = RAMDrivenStrippedStreamingManagerType::New();
- std::cout << streamingManager2 << std::endl;
-
- TileDimensionTiledStreamingManagerType::Pointer streamingManager3 = TileDimensionTiledStreamingManagerType::New();
- std::cout << streamingManager3 << std::endl;
-
- RAMDrivenTiledStreamingManagerType::Pointer streamingManager4 = RAMDrivenTiledStreamingManagerType::New();
- std::cout << streamingManager4 << std::endl;
-
- RAMDrivenAdaptativeStreamingManagerType::Pointer streamingManager5 = RAMDrivenAdaptativeStreamingManagerType::New();
- std::cout<<streamingManager5<<std::endl;
-
- return EXIT_SUCCESS;
-}
int otbNumberOfLinesStrippedStreamingManager(int itkNotUsed(argc), char * argv[])
diff --git a/Modules/Core/Streaming/test/otbStreamingTestDriver.cxx b/Modules/Core/Streaming/test/otbStreamingTestDriver.cxx
index fb30be369b4a634e3849b8794d3b0cca2f64f72b..1121e9859ccaea63e03311cd0236188f216b9aad 100644
--- a/Modules/Core/Streaming/test/otbStreamingTestDriver.cxx
+++ b/Modules/Core/Streaming/test/otbStreamingTestDriver.cxx
@@ -22,12 +22,10 @@
void RegisterTests()
{
- REGISTER_TEST(otbStreamingManagerNew);
REGISTER_TEST(otbNumberOfLinesStrippedStreamingManager);
REGISTER_TEST(otbRAMDrivenStrippedStreamingManager);
REGISTER_TEST(otbTileDimensionTiledStreamingManager);
REGISTER_TEST(otbRAMDrivenTiledStreamingManager);
REGISTER_TEST(otbRAMDrivenAdaptativeStreamingManager);
REGISTER_TEST(otbPipelineMemoryPrintCalculatorTest);
- REGISTER_TEST(otbPipelineMemoryPrintCalculatorNew);
}
diff --git a/Modules/Core/Transform/test/CMakeLists.txt b/Modules/Core/Transform/test/CMakeLists.txt
index 8bfb511aa378dcb8728fc1bd2b8b07ad03d2e5cb..58aa22bd30e551b5be61fa4da44aec87057f8bf3 100644
--- a/Modules/Core/Transform/test/CMakeLists.txt
+++ b/Modules/Core/Transform/test/CMakeLists.txt
@@ -27,19 +27,12 @@ otbCreateInverseForwardSensorModel.cxx
otbGenericRSTransform.cxx
otbCreateProjectionWithOSSIM.cxx
otbLogPolarTransformResample.cxx
-otbStreamingWarpImageFilterNew.cxx
otbLogPolarTransform.cxx
-otbGenericRSTransformNew.cxx
-otbLogPolarTransformNew.cxx
otbGeocentricTransform.cxx
otbCreateProjectionWithOTB.cxx
-otbGeocentricTransformNew.cxx
otbGenericMapProjection.cxx
otbStreamingWarpImageFilter.cxx
-otbSensorModelsNew.cxx
-otbGenericMapProjectionNew.cxx
otbInverseLogPolarTransform.cxx
-otbInverseLogPolarTransformNew.cxx
otbInverseLogPolarTransformResample.cxx
otbStreamingResampleImageFilterWithAffineTransform.cxx
)
@@ -106,9 +99,6 @@ otb_add_test(NAME bfTvLogPolarTransformResample COMMAND otbTransformTestDriver
${TEMP}/bfLogPolarTransformResampleOutput.hdr
)
-otb_add_test(NAME dmTuStreamingWarpImageFilterNew COMMAND otbTransformTestDriver
- otbStreamingWarpImageFilterNew)
-
otb_add_test(NAME bfTvLogPolarTransform COMMAND otbTransformTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/bfLogPolarTransformResults.txt
@@ -119,13 +109,6 @@ otb_add_test(NAME bfTvLogPolarTransform COMMAND otbTransformTestDriver
5 0 0 0 10 45 0 3.14 3.14 18 1
)
-otb_add_test(NAME prTuGenericRSTransformNew COMMAND otbTransformTestDriver otbGenericRSTransformNew )
-
-otb_add_test(NAME bfTuLogPolarTransformNew COMMAND otbTransformTestDriver
- otbLogPolarTransformNew)
-
-
-
otb_add_test(NAME prTvGeocentricTransform COMMAND otbTransformTestDriver
--compare-ascii ${EPSILON_4} ${BASELINE_FILES}/prTvGeocentricTransform.txt
${TEMP}/prTvGeocentricTransform.txt
@@ -143,8 +126,6 @@ otb_add_test(NAME prTvTestCreateProjectionWithOTB_Cevennes COMMAND otbTransformT
LARGEINPUT{QUICKBIRD/CEVENNES/06FEB12104912-P1BS-005533998070_01_P001.TIF}
)
-otb_add_test(NAME prTuGeocentricTransformNew COMMAND otbTransformTestDriver otbGeocentricTransformNew )
-
otb_add_test(NAME dmTvStreamingWarpImageFilter COMMAND otbTransformTestDriver
--compare-image ${EPSILON_10}
${BASELINE}/dmStreamingWarpImageFilterOutput.tif
@@ -156,9 +137,6 @@ otb_add_test(NAME dmTvStreamingWarpImageFilter COMMAND otbTransformTestDriver
5
)
-otb_add_test(NAME prTuSensorModelsNew COMMAND otbTransformTestDriver otbSensorModelsNew )
-
-otb_add_test(NAME prTuGenericMapProjectionNew COMMAND otbTransformTestDriver otbGenericMapProjectionNew )
# Forward / Backward projection consistency checking
set(FWDBWDChecking_INPUTS
@@ -190,8 +168,6 @@ otb_add_test(NAME bfTvInverseLogPolarTransform COMMAND otbTransformTestDriver
${TEMP}/bfInverseLogPolarTransformResults.txt
6 0 0 10 20 45 60 3.14 3.14 1 0 0 1
)
-otb_add_test(NAME bfTuInverseLogPolarTransformNew COMMAND otbTransformTestDriver
- otbInverseLogPolarTransformNew)
otb_add_test(NAME bfTvInverseLogPolarTransformResample COMMAND otbTransformTestDriver
--compare-image ${NOTOL} ${BASELINE}/bfInverseLogPolarTransformResampleOutput.hdr
${TEMP}/bfInverseLogPolarTransformResampleOutput.hdr
@@ -205,6 +181,3 @@ otb_add_test(NAME bfTvStreamingResampleImageFilterWithAffineTransform COMMAND ot
500
${TEMP}/bfTvotbStreamingResampledImageWithAffineTransform.tif
)
-otb_add_test(NAME bfTuStreamingResampleImageFilterWithAffineTransformNew COMMAND otbTransformTestDriver
- otbStreamingResampleImageFilterWithAffineTransform
- )
diff --git a/Modules/Core/Transform/test/otbGenericMapProjectionNew.cxx b/Modules/Core/Transform/test/otbGenericMapProjectionNew.cxx
deleted file mode 100644
index ce25d4b499c1cf771465546df8a61cad076e0863..0000000000000000000000000000000000000000
--- a/Modules/Core/Transform/test/otbGenericMapProjectionNew.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include <iostream>
-
-#include "otbGenericMapProjection.h"
-
-int otbGenericMapProjectionNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
-
- typedef otb::GenericMapProjection<otb::TransformDirection::FORWARD> MapProjectionType;
- MapProjectionType::Pointer mapProjection = MapProjectionType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Transform/test/otbGenericRSTransformNew.cxx b/Modules/Core/Transform/test/otbGenericRSTransformNew.cxx
deleted file mode 100644
index 1eb4ba9d167dd1bae1ee91d8d9bb6659218cb81f..0000000000000000000000000000000000000000
--- a/Modules/Core/Transform/test/otbGenericRSTransformNew.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include <iostream>
-
-#include "otbGenericRSTransform.h"
-
-int otbGenericRSTransformNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
-
- typedef otb::GenericRSTransform<> TransformType;
- TransformType::Pointer transform = TransformType::New();
-
- std::cout << transform << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Transform/test/otbGeocentricTransformNew.cxx b/Modules/Core/Transform/test/otbGeocentricTransformNew.cxx
deleted file mode 100644
index 938255eb909898df43f3adc314bb6b03ca8f1e7c..0000000000000000000000000000000000000000
--- a/Modules/Core/Transform/test/otbGeocentricTransformNew.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbMacro.h"
-#include "otbImage.h"
-#include "otbGeocentricTransform.h"
-
-int otbGeocentricTransformNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
-
- typedef otb::GeocentricTransform<otb::TransformDirection::FORWARD> ProjectionType;
- ProjectionType::Pointer projection = ProjectionType::New();
-
- std::cout << projection << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Transform/test/otbInverseLogPolarTransformNew.cxx b/Modules/Core/Transform/test/otbInverseLogPolarTransformNew.cxx
deleted file mode 100644
index 6e304cdedd7344c0f41c4e01ee0109e49dbb1d80..0000000000000000000000000000000000000000
--- a/Modules/Core/Transform/test/otbInverseLogPolarTransformNew.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbInverseLogPolarTransform.h"
-#include <cstdlib>
-
-int otbInverseLogPolarTransformNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double PrecisionType;
- typedef otb::InverseLogPolarTransform<PrecisionType> InverseLogPolarTransformType;
-
- // Instantiation
- InverseLogPolarTransformType::Pointer transform = InverseLogPolarTransformType::New();
-
- std::cout << transform << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Transform/test/otbLogPolarTransformNew.cxx b/Modules/Core/Transform/test/otbLogPolarTransformNew.cxx
deleted file mode 100644
index 417071f31196886a92ad28774c83b8fda46999a8..0000000000000000000000000000000000000000
--- a/Modules/Core/Transform/test/otbLogPolarTransformNew.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbLogPolarTransform.h"
-#include <cstdlib>
-
-int otbLogPolarTransformNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double PrecisionType;
- typedef otb::LogPolarTransform<PrecisionType> LogPolarTransformType;
-
- // Instantiation
- LogPolarTransformType::Pointer transform = LogPolarTransformType::New();
-
- std::cout << transform << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Transform/test/otbSensorModelsNew.cxx b/Modules/Core/Transform/test/otbSensorModelsNew.cxx
deleted file mode 100644
index 0c5b4369a0f2184a8ebec86d052da1b28b8ff762..0000000000000000000000000000000000000000
--- a/Modules/Core/Transform/test/otbSensorModelsNew.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include <iostream>
-
-#include "otbForwardSensorModel.h"
-#include "otbInverseSensorModel.h"
-
-int otbSensorModelsNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::SensorModelBase<double> SensorModelBaseType;
- SensorModelBaseType::Pointer lSensorModelBase = SensorModelBaseType::New();
-
- std::cout << lSensorModelBase << std::endl;
-
- typedef otb::InverseSensorModel<double> InverseSensorModelType;
- InverseSensorModelType::Pointer lInverseSensorModel = InverseSensorModelType::New();
-
- std::cout << lInverseSensorModel << std::endl;
-
- typedef otb::ForwardSensorModel<double> ForwardSensorModelType;
- ForwardSensorModelType::Pointer lForwardSensorModel = ForwardSensorModelType::New();
-
- std::cout << lForwardSensorModel << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Transform/test/otbStreamingWarpImageFilterNew.cxx b/Modules/Core/Transform/test/otbStreamingWarpImageFilterNew.cxx
deleted file mode 100644
index fe00c8bb2572e2a785bfbff913b1a57d07b84ae0..0000000000000000000000000000000000000000
--- a/Modules/Core/Transform/test/otbStreamingWarpImageFilterNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbImage.h"
-#include "itkVector.h"
-#include "otbStreamingWarpImageFilter.h"
-
-int otbStreamingWarpImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- // Images definition
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef itk::Vector<PixelType, 2> DisplacementValueType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::Image<DisplacementValueType, 2> DisplacementFieldType;
-
- // Warper
- typedef otb::StreamingWarpImageFilter<ImageType, ImageType, DisplacementFieldType> ImageWarperType;
-
- // Objects creation
- ImageWarperType::Pointer warper = ImageWarperType::New();
-
- std::cout << warper << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/Transform/test/otbTransformTestDriver.cxx b/Modules/Core/Transform/test/otbTransformTestDriver.cxx
index fd51a8dbd44c95b93adf8a8d726969192b66e1b9..06127105a2dd4452774615dc6c000f2641f9e98e 100644
--- a/Modules/Core/Transform/test/otbTransformTestDriver.cxx
+++ b/Modules/Core/Transform/test/otbTransformTestDriver.cxx
@@ -27,19 +27,12 @@ void RegisterTests()
REGISTER_TEST(otbGenericRSTransform);
REGISTER_TEST(otbCreateProjectionWithOSSIM);
REGISTER_TEST(otbLogPolarTransformResample);
- REGISTER_TEST(otbStreamingWarpImageFilterNew);
REGISTER_TEST(otbLogPolarTransform);
- REGISTER_TEST(otbGenericRSTransformNew);
- REGISTER_TEST(otbLogPolarTransformNew);
REGISTER_TEST(otbGeocentricTransform);
REGISTER_TEST(otbCreateProjectionWithOTB);
- REGISTER_TEST(otbGeocentricTransformNew);
REGISTER_TEST(otbGenericMapProjection);
REGISTER_TEST(otbStreamingWarpImageFilter);
- REGISTER_TEST(otbSensorModelsNew);
- REGISTER_TEST(otbGenericMapProjectionNew);
REGISTER_TEST(otbInverseLogPolarTransform);
- REGISTER_TEST(otbInverseLogPolarTransformNew);
REGISTER_TEST(otbInverseLogPolarTransformResample);
REGISTER_TEST(otbStreamingResampleImageFilterWithAffineTransform);
}
diff --git a/Modules/Core/VectorDataBase/test/CMakeLists.txt b/Modules/Core/VectorDataBase/test/CMakeLists.txt
index ca80730e389e10acd7f1a21e9a54ecf304f0f62d..73fb862b83e435cbdbea340a90251ff66d4bf0a0 100644
--- a/Modules/Core/VectorDataBase/test/CMakeLists.txt
+++ b/Modules/Core/VectorDataBase/test/CMakeLists.txt
@@ -25,13 +25,8 @@ otbVectorDataBaseTestDriver.cxx
otbVectorData.cxx
otbVectorDataKeywordlistTest.cxx
otbPolygon.cxx
-otbVectorDataSourceNew.cxx
otbDataNodeTest.cxx
otbRemoteSensingRegion.cxx
-otbPolygonNew.cxx
-otbPolyLineParametricPathWithValueNew.cxx
-otbRemoteSensingRegionNew.cxx
-otbVectorDataNew.cxx
)
add_executable(otbVectorDataBaseTestDriver ${OTBVectorDataBaseTests})
@@ -49,9 +44,6 @@ otb_add_test(NAME coTvVectorData COMMAND otbVectorDataBaseTestDriver
${TEMP}/coTvVectorData.txt
)
-otb_add_test(NAME ioTuVectorDataKeywordlistNew COMMAND otbVectorDataBaseTestDriver
- otbVectorDataKeywordlistNew
- )
otb_add_test(NAME ioTvVectorDataKeywordlist COMMAND otbVectorDataBaseTestDriver
--compare-ascii ${EPSILON_9}
@@ -72,11 +64,6 @@ otb_add_test(NAME coTvPolygon COMMAND otbVectorDataBaseTestDriver
next 6 10 11 10 11 2 4 2 3 4 8 4 8 7 6 7
)
-otb_add_test(NAME coTuVectorDataSource COMMAND otbVectorDataBaseTestDriver
- otbVectorDataSourceNew
- )
-
-
otb_add_test(NAME coTvDataNode COMMAND otbVectorDataBaseTestDriver
otbDataNodeTest
)
@@ -86,18 +73,3 @@ otb_add_test(NAME coTvRemoteSensingRegion COMMAND otbVectorDataBaseTestDriver
1.21 2.33 58.47 59.49 #size et index of the region
0. 0. # Point to check
)
-
-otb_add_test(NAME coTuPolygonNew COMMAND otbVectorDataBaseTestDriver
- otbPolygonNew)
-
-otb_add_test(NAME coTuPolyLineParametricPathWithValueNew COMMAND otbVectorDataBaseTestDriver
- otbPolyLineParametricPathWithValueNew)
-
-otb_add_test(NAME coTuRemoteSensingRegionNew COMMAND otbVectorDataBaseTestDriver
- otbRemoteSensingRegionNew )
-
-
-otb_add_test(NAME coTuVectorData COMMAND otbVectorDataBaseTestDriver
- otbVectorDataNew
- )
-
diff --git a/Modules/Core/VectorDataBase/test/otbPolyLineParametricPathWithValueNew.cxx b/Modules/Core/VectorDataBase/test/otbPolyLineParametricPathWithValueNew.cxx
deleted file mode 100644
index 2d174ec7c8853ba948b06a6350346ab5525da035..0000000000000000000000000000000000000000
--- a/Modules/Core/VectorDataBase/test/otbPolyLineParametricPathWithValueNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include <cstdlib>
-
-#include "otbPolyLineParametricPathWithValue.h"
-
-int otbPolyLineParametricPathWithValueNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double ValueType;
- typedef otb::PolyLineParametricPathWithValue<ValueType, Dimension> PolyLineParametricPathWithValueType;
-
- // Instantiating object
- PolyLineParametricPathWithValueType::Pointer object = PolyLineParametricPathWithValueType::New();
- object->SetValue(0);
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/VectorDataBase/test/otbPolygonNew.cxx b/Modules/Core/VectorDataBase/test/otbPolygonNew.cxx
deleted file mode 100644
index 42da05cf0a4053b16a3e658c534cebf0f8077cfa..0000000000000000000000000000000000000000
--- a/Modules/Core/VectorDataBase/test/otbPolygonNew.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include <cstdlib>
-
-#include "otbPolygon.h"
-
-int otbPolygonNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Polygon<> PolygonType;
-
- // Instantiating object
- PolygonType::Pointer polygon = PolygonType::New();
-
- std::cout << polygon << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/VectorDataBase/test/otbRemoteSensingRegionNew.cxx b/Modules/Core/VectorDataBase/test/otbRemoteSensingRegionNew.cxx
deleted file mode 100644
index b57888299af9552e21bd69552f6457a6837303d2..0000000000000000000000000000000000000000
--- a/Modules/Core/VectorDataBase/test/otbRemoteSensingRegionNew.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbRemoteSensingRegion.h"
-
-int otbRemoteSensingRegionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- typedef double Type;
- typedef otb::RemoteSensingRegion<Type> TypedRegion;
-
- TypedRegion Cartoregion;
-
- std::cout << Cartoregion << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/VectorDataBase/test/otbVectorDataBaseTestDriver.cxx b/Modules/Core/VectorDataBase/test/otbVectorDataBaseTestDriver.cxx
index 238421a1f8413aab17a2a2311a31aab1f2ec9eb0..08f7a360925ed8dabf103366c3fc0da89ee41342 100644
--- a/Modules/Core/VectorDataBase/test/otbVectorDataBaseTestDriver.cxx
+++ b/Modules/Core/VectorDataBase/test/otbVectorDataBaseTestDriver.cxx
@@ -23,14 +23,8 @@
void RegisterTests()
{
REGISTER_TEST(otbVectorData);
- REGISTER_TEST(otbVectorDataKeywordlistNew);
REGISTER_TEST(otbVectorDataKeywordlist);
REGISTER_TEST(otbPolygon);
- REGISTER_TEST(otbVectorDataSourceNew);
REGISTER_TEST(otbDataNodeTest);
REGISTER_TEST(otbRemoteSensingRegion);
- REGISTER_TEST(otbPolygonNew);
- REGISTER_TEST(otbPolyLineParametricPathWithValueNew);
- REGISTER_TEST(otbRemoteSensingRegionNew);
- REGISTER_TEST(otbVectorDataNew);
}
diff --git a/Modules/Core/VectorDataBase/test/otbVectorDataKeywordlistTest.cxx b/Modules/Core/VectorDataBase/test/otbVectorDataKeywordlistTest.cxx
index 1f3caf484ef3d5e743d3259e2150de32cff1847c..6c4861bb27edbce22be4fa6b6184a3750df9b375 100644
--- a/Modules/Core/VectorDataBase/test/otbVectorDataKeywordlistTest.cxx
+++ b/Modules/Core/VectorDataBase/test/otbVectorDataKeywordlistTest.cxx
@@ -26,12 +26,6 @@
#include "otbVectorDataFileReader.h"
#include "otbMetaDataKey.h"
-int otbVectorDataKeywordlistNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- otb::VectorDataKeywordlist kwl;
- std::cout << kwl << std::endl;
- return EXIT_SUCCESS;
-}
int otbVectorDataKeywordlist(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Core/VectorDataBase/test/otbVectorDataNew.cxx b/Modules/Core/VectorDataBase/test/otbVectorDataNew.cxx
deleted file mode 100644
index 68f3a4033ac256b1894d3825dfe16812cf06761d..0000000000000000000000000000000000000000
--- a/Modules/Core/VectorDataBase/test/otbVectorDataNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbMacro.h"
-
-#include "otbVectorData.h"
-
-int otbVectorDataNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- typedef otb::VectorData<double, 2> VectorDataType;
-
- //Instantiation
- VectorDataType::Pointer data = VectorDataType::New();
-
- std::cout << data << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Core/VectorDataBase/test/otbVectorDataSourceNew.cxx b/Modules/Core/VectorDataBase/test/otbVectorDataSourceNew.cxx
deleted file mode 100644
index 26468a05d5c0ab293b79a8e2964ff73273d6ce47..0000000000000000000000000000000000000000
--- a/Modules/Core/VectorDataBase/test/otbVectorDataSourceNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbVectorDataSource.h"
-#include "otbVectorData.h"
-
-int otbVectorDataSourceNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double InputPixelType;
- typedef otb::VectorData<InputPixelType, Dimension> InputVectorDataType;
- typedef otb::VectorDataSource<InputVectorDataType> VectorDataSourceType;
-
- // Instantiating VectorDataSource object
- VectorDataSourceType::Pointer vectorData = VectorDataSourceType::New();
-
- std::cout << vectorData << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Detection/CloudDetection/test/CMakeLists.txt b/Modules/Detection/CloudDetection/test/CMakeLists.txt
index 4263622d1b60999b0aee87616b1c3293ebbbd6ce..50472f0e902fc26e0c9921a0fe2cb7c36fb51d5a 100644
--- a/Modules/Detection/CloudDetection/test/CMakeLists.txt
+++ b/Modules/Detection/CloudDetection/test/CMakeLists.txt
@@ -25,8 +25,6 @@ otbCloudDetectionTestDriver.cxx
otbCloudEstimatorDefaultFilter.cxx
otbCloudDetectionFilter.cxx
otbCloudEstimatorFilter.cxx
-otbCloudEstimatorFilterNew.cxx
-otbCloudDetectionFilterNew.cxx
)
add_executable(otbCloudDetectionTestDriver ${OTBCloudDetectionTests})
@@ -78,9 +76,3 @@ otb_add_test(NAME feTvCloudEstimatorFilter COMMAND otbCloudDetectionTestDriver
0.25 # variance
)
-otb_add_test(NAME feTuCloudEstimatorFilterNew COMMAND otbCloudDetectionTestDriver
- otbCloudEstimatorFilterNew)
-
-otb_add_test(NAME feTuCloudDetectionFilterNew COMMAND otbCloudDetectionTestDriver
- otbCloudDetectionFilterNew)
-
diff --git a/Modules/Detection/CloudDetection/test/otbCloudDetectionFilterNew.cxx b/Modules/Detection/CloudDetection/test/otbCloudDetectionFilterNew.cxx
deleted file mode 100644
index 1b631649cd4999041ef125bdf71fd77ef92a9828..0000000000000000000000000000000000000000
--- a/Modules/Detection/CloudDetection/test/otbCloudDetectionFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbImage.h"
-#include "otbVectorImage.h"
-#include "otbCloudDetectionFilter.h"
-
-int otbCloudDetectionFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::VectorImage<PixelType, Dimension> VectorImageType;
- typedef otb::CloudDetectionFilter<VectorImageType, ImageType> CloudDetectionFilterType;
-
- // Instantiating object
- CloudDetectionFilterType::Pointer filter = CloudDetectionFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Detection/CloudDetection/test/otbCloudDetectionTestDriver.cxx b/Modules/Detection/CloudDetection/test/otbCloudDetectionTestDriver.cxx
index 0bd38968e43772c239893a73262dbd9484224a85..b396fd1ab849e96cca30029d9679ee5b9dee0f83 100644
--- a/Modules/Detection/CloudDetection/test/otbCloudDetectionTestDriver.cxx
+++ b/Modules/Detection/CloudDetection/test/otbCloudDetectionTestDriver.cxx
@@ -25,6 +25,4 @@ void RegisterTests()
REGISTER_TEST(otbCloudEstimatorDefaultFilter);
REGISTER_TEST(otbCloudDetectionFilter);
REGISTER_TEST(otbCloudEstimatorFilter);
- REGISTER_TEST(otbCloudEstimatorFilterNew);
- REGISTER_TEST(otbCloudDetectionFilterNew);
}
diff --git a/Modules/Detection/CloudDetection/test/otbCloudEstimatorFilterNew.cxx b/Modules/Detection/CloudDetection/test/otbCloudEstimatorFilterNew.cxx
deleted file mode 100644
index adf583233b70659103df05b67e516f81862e5bcd..0000000000000000000000000000000000000000
--- a/Modules/Detection/CloudDetection/test/otbCloudEstimatorFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbImage.h"
-#include "otbVectorImage.h"
-#include "otbCloudEstimatorFilter.h"
-
-int otbCloudEstimatorFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::VectorImage<PixelType, Dimension> VectorImageType;
- typedef otb::CloudEstimatorFilter<VectorImageType, ImageType> CloudEstimatorFilterType;
-
- // Instantiating object
- CloudEstimatorFilterType::Pointer filter = CloudEstimatorFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Detection/ObjectDetection/test/CMakeLists.txt b/Modules/Detection/ObjectDetection/test/CMakeLists.txt
index 3408fe2a0eb5d1e9225599e2e043c77807a1da60..6f22f1276c479df353ed4ad043a9240b614de6cc 100644
--- a/Modules/Detection/ObjectDetection/test/CMakeLists.txt
+++ b/Modules/Detection/ObjectDetection/test/CMakeLists.txt
@@ -34,9 +34,6 @@ otb_module_target_label(otbObjectDetectionTestDriver)
# Tests Declaration
-otb_add_test(NAME odTuLabeledSampleLocalizationGeneratorNew COMMAND otbObjectDetectionTestDriver
- otbLabeledSampleLocalizationGeneratorNew
- )
otb_add_test(NAME odTvLabeledSampleLocalizationGenerator COMMAND otbObjectDetectionTestDriver
--compare-ogr ${NOTOL}
@@ -48,9 +45,6 @@ otb_add_test(NAME odTvLabeledSampleLocalizationGenerator COMMAND otbObjectDetect
${TEMP}/TvLabeledSampleLocalizationGeneratorOutput.shp
)
-otb_add_test(NAME odTuStandardMetaImageFunctionBuilderNew COMMAND otbObjectDetectionTestDriver
- otbStandardMetaImageFunctionBuilderNew
- )
otb_add_test(NAME odTvStandardMetaImageFunctionBuilder COMMAND otbObjectDetectionTestDriver
otbStandardMetaImageFunctionBuilder
@@ -94,13 +88,7 @@ otb_add_test(NAME odTvDescriptorsListSampleGeneratorNoStreaming COMMAND otbObjec
5 # neighborhood radius
)
-otb_add_test(NAME odTuDescriptorsListSampleGeneratorNew COMMAND otbObjectDetectionTestDriver
- otbDescriptorsListSampleGeneratorNew
- )
-otb_add_test(NAME odTuObjectDetectionClassifierNew COMMAND otbObjectDetectionTestDriver
- otbObjectDetectionClassifierNew
- )
otb_add_test(NAME odTvObjectDetectionClassifierStreaming COMMAND otbObjectDetectionTestDriver
--compare-ascii ${NOTOL}
diff --git a/Modules/Detection/ObjectDetection/test/otbDescriptorsListSampleGenerator.cxx b/Modules/Detection/ObjectDetection/test/otbDescriptorsListSampleGenerator.cxx
index 2996c1ef79cc5866379db747dd7b2e030ff23e0a..e11050f4acef044c6e0390b92348631d6800781c 100644
--- a/Modules/Detection/ObjectDetection/test/otbDescriptorsListSampleGenerator.cxx
+++ b/Modules/Detection/ObjectDetection/test/otbDescriptorsListSampleGenerator.cxx
@@ -100,15 +100,6 @@ std::ostream &operator<<(std::ostream &stream, SampleEntry entry)
return stream;
}
-int otbDescriptorsListSampleGeneratorNew(int itkNotUsed(argc), char* itkNotUsed(argv)[])
-{
- // instantiation
- DescriptorsListSampleGeneratorType::Pointer generator = DescriptorsListSampleGeneratorType::New();
-
- std::cout << generator << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbDescriptorsListSampleGenerator(int argc, char* argv[])
{
diff --git a/Modules/Detection/ObjectDetection/test/otbLabeledSampleLocalizationGenerator.cxx b/Modules/Detection/ObjectDetection/test/otbLabeledSampleLocalizationGenerator.cxx
index 39165615ed77eaf2ab3a1c2d7b0b8aa6e6722033..25e2124c1e1000904b9cdec5b9a565cd26d8e827 100644
--- a/Modules/Detection/ObjectDetection/test/otbLabeledSampleLocalizationGenerator.cxx
+++ b/Modules/Detection/ObjectDetection/test/otbLabeledSampleLocalizationGenerator.cxx
@@ -24,18 +24,6 @@
#include "otbVectorDataFileWriter.h"
#include "otbLabeledSampleLocalizationGenerator.h"
-int otbLabeledSampleLocalizationGeneratorNew(int itkNotUsed(argc), char* itkNotUsed(argv)[])
-{
- typedef otb::VectorData<> VectorDataType;
- typedef otb::LabeledSampleLocalizationGenerator<VectorDataType> GeneratorType;
-
- // instantiation
- GeneratorType::Pointer generator = GeneratorType::New();
-
- std::cout << generator << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbLabeledSampleLocalizationGenerator(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/Detection/ObjectDetection/test/otbObjectDetectionClassifier.cxx b/Modules/Detection/ObjectDetection/test/otbObjectDetectionClassifier.cxx
index 8d12d62a618130ad4524ad274a74d5c197259d8f..d196b5324940563be99c3cda4eb7b86135b5e531 100644
--- a/Modules/Detection/ObjectDetection/test/otbObjectDetectionClassifier.cxx
+++ b/Modules/Detection/ObjectDetection/test/otbObjectDetectionClassifier.cxx
@@ -88,12 +88,6 @@ std::ostream &operator<<(std::ostream &stream, PointType p)
return stream;
}
-int otbObjectDetectionClassifierNew(int itkNotUsed(argc), char* itkNotUsed(argv)[])
-{
- ObjectDetectionClassifierType::Pointer object = ObjectDetectionClassifierType::New();
- std::cout << object << std::endl;
- return EXIT_SUCCESS;
-}
int otbObjectDetectionClassifier(int argc, char* argv[])
diff --git a/Modules/Detection/ObjectDetection/test/otbObjectDetectionTestDriver.cxx b/Modules/Detection/ObjectDetection/test/otbObjectDetectionTestDriver.cxx
index afed2f209e643e5dde468565067defbfcc18175e..2076038e6a0d32fd0abe91c74cf44da7bb2a9510 100644
--- a/Modules/Detection/ObjectDetection/test/otbObjectDetectionTestDriver.cxx
+++ b/Modules/Detection/ObjectDetection/test/otbObjectDetectionTestDriver.cxx
@@ -22,13 +22,9 @@
void RegisterTests()
{
- REGISTER_TEST(otbLabeledSampleLocalizationGeneratorNew);
REGISTER_TEST(otbLabeledSampleLocalizationGenerator);
- REGISTER_TEST(otbStandardMetaImageFunctionBuilderNew);
REGISTER_TEST(otbStandardMetaImageFunctionBuilder);
- REGISTER_TEST(otbDescriptorsListSampleGeneratorNew);
REGISTER_TEST(otbDescriptorsListSampleGenerator);
REGISTER_TEST(otbDescriptorsSVMModelCreation);
- REGISTER_TEST(otbObjectDetectionClassifierNew);
REGISTER_TEST(otbObjectDetectionClassifier);
}
diff --git a/Modules/Detection/ObjectDetection/test/otbStandardMetaImageFunctionBuilder.cxx b/Modules/Detection/ObjectDetection/test/otbStandardMetaImageFunctionBuilder.cxx
index d27b3b46e82a5b8687400498c4ac6aa8712e253d..8ee002920134a22f2b5cf112d33985d75d4cbc59 100644
--- a/Modules/Detection/ObjectDetection/test/otbStandardMetaImageFunctionBuilder.cxx
+++ b/Modules/Detection/ObjectDetection/test/otbStandardMetaImageFunctionBuilder.cxx
@@ -32,18 +32,6 @@
#include "otbHaralickTexturesImageFunction.h"
-int otbStandardMetaImageFunctionBuilderNew(int itkNotUsed(argc), char* itkNotUsed(argv)[])
-{
- typedef double PrecisionType;
- typedef otb::StandardMetaImageFunctionBuilder<PrecisionType> BuilderType;
-
- // instantiation
- BuilderType::Pointer builder = BuilderType::New();
-
- std::cout << builder << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbStandardMetaImageFunctionBuilder(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/Detection/RoadExtraction/test/CMakeLists.txt b/Modules/Detection/RoadExtraction/test/CMakeLists.txt
index 3f857fa329b37c688740ef70dc3fcf7984500699..c33f442a42837be77675eee3eee58c389dff8d57 100644
--- a/Modules/Detection/RoadExtraction/test/CMakeLists.txt
+++ b/Modules/Detection/RoadExtraction/test/CMakeLists.txt
@@ -23,24 +23,13 @@ otb_module_test()
set(OTBRoadExtractionTests
otbRoadExtractionTestDriver.cxx
otbLikelihoodPathListFilter.cxx
-otbParallelLinePathListFilterNew.cxx
otbRemoveWrongDirectionFilter.cxx
otbSimplifyPathListFilter.cxx
-otbRoadExtractionFilterNew.cxx
-otbRemoveIsolatedByDirectionFilterNew.cxx
otbAlignImageToPath.cxx
-otbNonMaxRemovalByDirectionFilterNew.cxx
-otbNeighborhoodScalarProductFilterNew.cxx
-otbRemoveTortuousPathListFilterNew.cxx
otbNonMaxRemovalByDirectionFilter.cxx
-otbRemoveWrongDirectionFilterNew.cxx
otbRoadExtractionFilter.cxx
otbLinkPathListFilter.cxx
-otbModulusAndDirectionImageFiltersNew.cxx
-otbSimplifyPathListFilterNew.cxx
otbRemoveTortuousPathListFilter.cxx
-otbLinkPathListFilterNew.cxx
-otbLikelihoodPathListFilterNew.cxx
otbParallelLinePathListFilter.cxx
otbRemoveIsolatedByDirectionFilter.cxx
otbVectorDataToRoadDescriptionFilter.cxx
@@ -48,7 +37,6 @@ otbSimplifyManyPathListFilter.cxx
otbNeighborhoodScalarProductFilter.cxx
otbDrawPathAlign.cxx
otbBreakAngularPathListFilter.cxx
-otbBreakAngularPathListFilterNew.cxx
)
add_executable(otbRoadExtractionTestDriver ${OTBRoadExtractionTests})
@@ -69,9 +57,6 @@ otb_add_test(NAME feTvLikelihoodPathListFilter COMMAND otbRoadExtractionTestDriv
73 160 126 173
)
-otb_add_test(NAME feTuParallelLinePathListFilterNew COMMAND otbRoadExtractionTestDriver
- otbParallelLinePathListFilterNew)
-
otb_add_test(NAME feTvRemoveWrongDirectionFilter COMMAND otbRoadExtractionTestDriver
--compare-image ${EPSILON_8}
${BASELINE}/feTvRemoveWrongDirectionOutput.hdr
@@ -95,12 +80,6 @@ otb_add_test(NAME feTvSimplifyPathListFilter COMMAND otbRoadExtractionTestDriver
1 1 5 1 7 1 11 1 21 11 31 11 41 11 58 11 70 11
)
-otb_add_test(NAME feTuRoadExtractionFilterNew COMMAND otbRoadExtractionTestDriver
- otbRoadExtractionFilterNew)
-
-otb_add_test(NAME feTuRemoveIsolatedByDirectionFilterNew COMMAND otbRoadExtractionTestDriver
- otbRemoveIsolatedByDirectionFilterNew)
-
otb_add_test(NAME feTvAlignMV2ITK COMMAND otbRoadExtractionTestDriver
--compare-ascii ${EPSILON_3} ${BASELINE_FILES}/feAlign.txt
${TEMP}/feAlign.txt
@@ -108,15 +87,6 @@ otb_add_test(NAME feTvAlignMV2ITK COMMAND otbRoadExtractionTestDriver
${INPUTDATA}/poupees.hdr
${TEMP}/feAlign.txt)
-otb_add_test(NAME feTuNonMaxRemovalByDirectionFilterNew COMMAND otbRoadExtractionTestDriver
- otbNonMaxRemovalByDirectionFilterNew)
-
-otb_add_test(NAME feTuNeighborhoodScalarProductFilterNew COMMAND otbRoadExtractionTestDriver
- otbNeighborhoodScalarProductFilterNew)
-
-otb_add_test(NAME feTuRemoveTortuousPathListFilterNew COMMAND otbRoadExtractionTestDriver
- otbRemoveTortuousPathListFilterNew)
-
otb_add_test(NAME feTvNonMaxRemovalByDirectionFilter COMMAND otbRoadExtractionTestDriver
--compare-image ${EPSILON_8}
${BASELINE}/feTvNonMaxRemovalByDirectionOutput.hdr
@@ -127,9 +97,6 @@ otb_add_test(NAME feTvNonMaxRemovalByDirectionFilter COMMAND otbRoadExtractionTe
${TEMP}/feTvNonMaxRemovalByDirectionOutput.hdr
)
-otb_add_test(NAME feTuRemoveWrongDirectionFilterNew COMMAND otbRoadExtractionTestDriver
- otbRemoveWrongDirectionFilterNew)
-
otb_add_test(NAME feTvRoadExtractionFilter COMMAND otbRoadExtractionTestDriver
--compare-image ${EPSILON_8}
${BASELINE}/feTvOutputRoadDetection.hdr
@@ -169,12 +136,6 @@ otb_add_test(NAME feTvLinkPathListFilter COMMAND otbRoadExtractionTestDriver
11 171 11 141
)
-otb_add_test(NAME feTuModulusAndDirectionImageFiltersNew COMMAND otbRoadExtractionTestDriver
- otbModulusAndDirectionImageFiltersNew)
-
-otb_add_test(NAME feTuSimplifyPathListFilterNew COMMAND otbRoadExtractionTestDriver
- otbSimplifyPathListFilterNew)
-
otb_add_test(NAME feTvRemoveTortuousPathListFilter COMMAND otbRoadExtractionTestDriver
--compare-ascii ${EPSILON_3}
${BASELINE_FILES}/feTvRemoveTortuousPathOutput.txt
@@ -188,12 +149,6 @@ otb_add_test(NAME feTvRemoveTortuousPathListFilter COMMAND otbRoadExtractionTest
1 1 5 1 7 1 11 1 21 11 31 11 41 11 58 11 70 11
)
-otb_add_test(NAME feTuLinkPathListFilterNew COMMAND otbRoadExtractionTestDriver
- otbLinkPathListFilterNew)
-
-otb_add_test(NAME feTuLikelihoodPathListFilterNew COMMAND otbRoadExtractionTestDriver
- otbLikelihoodPathListFilterNew)
-
otb_add_test(NAME feTvParallelLinePathListFilter COMMAND otbRoadExtractionTestDriver
otbParallelLinePathListFilter)
@@ -207,9 +162,6 @@ otb_add_test(NAME feTvRemoveIsolatedByDirectionFilter COMMAND otbRoadExtractionT
${TEMP}/feTvRemoveIsolatedByDirectionOutput.hdr
)
-otb_add_test(NAME fzTuVectorDataToRoadDescriptionFilterNew COMMAND otbRoadExtractionTestDriver
- otbVectorDataToRoadDescriptionFilterNew)
-
otb_add_test(NAME fzTvVectorDataToRoadDescriptionFilter COMMAND otbRoadExtractionTestDriver
--compare-ogr ${NOTOL}
${BASELINE_FILES}/fzTvVectorDataToRoadDescriptionFilterOutput.shp
@@ -249,9 +201,6 @@ otb_add_test(NAME feTvDrawPathTestAlign COMMAND otbRoadExtractionTestDriver
${INPUTDATA}/DeuxTraits.png
${TEMP}/feDrawPathAlignDeuxTraits.png)
-otb_add_test(NAME feTuBreakAngularPathListFilterNew COMMAND otbRoadExtractionTestDriver
- otbBreakAngularPathListFilterNew)
-
otb_add_test(NAME feTvBreakAngularPathListFilter COMMAND otbRoadExtractionTestDriver
--compare-ascii ${NOTOL} ${BASELINE_FILES}/feBreakAngularPathListOutput.txt
${TEMP}/feBreakAngularPathListOutput.txt
diff --git a/Modules/Detection/RoadExtraction/test/otbBreakAngularPathListFilterNew.cxx b/Modules/Detection/RoadExtraction/test/otbBreakAngularPathListFilterNew.cxx
deleted file mode 100644
index ab1fc3297b97af1037997973b41e7e307d20b113..0000000000000000000000000000000000000000
--- a/Modules/Detection/RoadExtraction/test/otbBreakAngularPathListFilterNew.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbBreakAngularPathListFilter.h"
-#include "itkPolyLineParametricPath.h"
-#include <cstdlib>
-
-int otbBreakAngularPathListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef itk::PolyLineParametricPath<Dimension> PathType;
- typedef otb::BreakAngularPathListFilter<PathType> BreakAngularPathListFilterType;
-
- // Instantiating object
- BreakAngularPathListFilterType::Pointer filter = BreakAngularPathListFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Detection/RoadExtraction/test/otbLikelihoodPathListFilterNew.cxx b/Modules/Detection/RoadExtraction/test/otbLikelihoodPathListFilterNew.cxx
deleted file mode 100644
index b4c3c34702d0c46c163baa750442b7a31083be33..0000000000000000000000000000000000000000
--- a/Modules/Detection/RoadExtraction/test/otbLikelihoodPathListFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbLikelihoodPathListFilter.h"
-#include "otbPolyLineParametricPathWithValue.h"
-#include "otbImage.h"
-
-int otbLikelihoodPathListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::PolyLineParametricPathWithValue<double, Dimension> PathType;
- typedef otb::LikelihoodPathListFilter<PathType, ImageType> LinkPathListFilterType;
-
- // Instantiating object
- LinkPathListFilterType::Pointer filter = LinkPathListFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Detection/RoadExtraction/test/otbLinkPathListFilterNew.cxx b/Modules/Detection/RoadExtraction/test/otbLinkPathListFilterNew.cxx
deleted file mode 100644
index 0306a1713c615b2020efcdf66036aa7a7db75356..0000000000000000000000000000000000000000
--- a/Modules/Detection/RoadExtraction/test/otbLinkPathListFilterNew.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbLinkPathListFilter.h"
-#include "itkPolyLineParametricPath.h"
-#include <cstdlib>
-
-int otbLinkPathListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef itk::PolyLineParametricPath<Dimension> PathType;
- typedef otb::LinkPathListFilter<PathType> LinkPathListFilterType;
-
- // Instantiating object
- LinkPathListFilterType::Pointer filter = LinkPathListFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Detection/RoadExtraction/test/otbModulusAndDirectionImageFiltersNew.cxx b/Modules/Detection/RoadExtraction/test/otbModulusAndDirectionImageFiltersNew.cxx
deleted file mode 100644
index 248ddc799e5107a7630f0799adb219bedb9b958c..0000000000000000000000000000000000000000
--- a/Modules/Detection/RoadExtraction/test/otbModulusAndDirectionImageFiltersNew.cxx
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "itkMacro.h"
-#include "otbImage.h"
-#include <iostream>
-
-#include "otbImageToModulusAndDirectionImageFilter.h"
-#include "otbModulusAndDirectionImageToImageFilter.h"
-
-int otbModulusAndDirectionImageFiltersNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned char InputPixelType;
- typedef double OutputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> InputImageDirectionType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageDirectionType;
-
- typedef otb::ImageToModulusAndDirectionImageFilter<InputImageType,
- OutputImageType> FilterType;
- typedef otb::ImageToModulusAndDirectionImageFilter<InputImageType, OutputImageType,
- OutputImageDirectionType> Filter2Type;
-
- FilterType::Pointer filter = FilterType::New();
- Filter2Type::Pointer filter2 = Filter2Type::New();
-
- typedef otb::ModulusAndDirectionImageToImageFilter<InputImageType, InputImageDirectionType,
- OutputImageType> Filter3Type;
- Filter3Type::Pointer filter3 = Filter3Type::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Detection/RoadExtraction/test/otbNeighborhoodScalarProductFilterNew.cxx b/Modules/Detection/RoadExtraction/test/otbNeighborhoodScalarProductFilterNew.cxx
deleted file mode 100644
index 8fdab4967d5203d6ceea39df9fdc4d8bceda9322..0000000000000000000000000000000000000000
--- a/Modules/Detection/RoadExtraction/test/otbNeighborhoodScalarProductFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbNeighborhoodScalarProductFilter.h"
-#include "otbImage.h"
-
-int otbNeighborhoodScalarProductFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef itk::CovariantVector<PixelType, Dimension> VectorPixelType;
- typedef otb::Image<VectorPixelType, Dimension> InputImageType;
- typedef otb::Image<PixelType, Dimension> OutputImageType;
- typedef otb::NeighborhoodScalarProductFilter<InputImageType, OutputImageType, OutputImageType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Detection/RoadExtraction/test/otbNonMaxRemovalByDirectionFilterNew.cxx b/Modules/Detection/RoadExtraction/test/otbNonMaxRemovalByDirectionFilterNew.cxx
deleted file mode 100644
index ec555e745475c5a2a6f6f244d5550b4c524d5057..0000000000000000000000000000000000000000
--- a/Modules/Detection/RoadExtraction/test/otbNonMaxRemovalByDirectionFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbNonMaxRemovalByDirectionFilter.h"
-#include "otbImage.h"
-
-int otbNonMaxRemovalByDirectionFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::NonMaxRemovalByDirectionFilter<ImageType, ImageType, ImageType> NonMaxRemovalByDirectionFilterType;
-
- // Instantiating object
- NonMaxRemovalByDirectionFilterType::Pointer filter = NonMaxRemovalByDirectionFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Detection/RoadExtraction/test/otbParallelLinePathListFilterNew.cxx b/Modules/Detection/RoadExtraction/test/otbParallelLinePathListFilterNew.cxx
deleted file mode 100644
index c3be707a252d0f1ebb47c95b7aa21f33a12a500e..0000000000000000000000000000000000000000
--- a/Modules/Detection/RoadExtraction/test/otbParallelLinePathListFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbParallelLinePathListFilter.h"
-#include "itkPolyLineParametricPath.h"
-#include <cstdlib>
-
-int otbParallelLinePathListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef itk::PolyLineParametricPath<Dimension> PathType;
-
- typedef otb::ParallelLinePathListFilter<PathType> ParallelLinePathType;
-
- // Instantiating object
- ParallelLinePathType::Pointer filter = ParallelLinePathType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Detection/RoadExtraction/test/otbRemoveIsolatedByDirectionFilterNew.cxx b/Modules/Detection/RoadExtraction/test/otbRemoveIsolatedByDirectionFilterNew.cxx
deleted file mode 100644
index 5683278275b2425e58e10c8cb2e99e46dfb29450..0000000000000000000000000000000000000000
--- a/Modules/Detection/RoadExtraction/test/otbRemoveIsolatedByDirectionFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbRemoveIsolatedByDirectionFilter.h"
-#include "otbImage.h"
-
-int otbRemoveIsolatedByDirectionFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::RemoveIsolatedByDirectionFilter<ImageType, ImageType, ImageType> RemoveIsolatedByDirectionFilterType;
-
- // Instantiating object
- RemoveIsolatedByDirectionFilterType::Pointer filter = RemoveIsolatedByDirectionFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Detection/RoadExtraction/test/otbRemoveTortuousPathListFilterNew.cxx b/Modules/Detection/RoadExtraction/test/otbRemoveTortuousPathListFilterNew.cxx
deleted file mode 100644
index 36a74710c7c882fbda574c5c95accb9176b105a7..0000000000000000000000000000000000000000
--- a/Modules/Detection/RoadExtraction/test/otbRemoveTortuousPathListFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbRemoveTortuousPathListFilter.h"
-#include "itkPolyLineParametricPath.h"
-#include <cstdlib>
-
-int otbRemoveTortuousPathListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef itk::PolyLineParametricPath<Dimension> PathType;
- typedef otb::RemoveTortuousPathListFilter<PathType> RemoveTortuousPathListFilterType;
-
- // Instantiating object
- RemoveTortuousPathListFilterType::Pointer filter = RemoveTortuousPathListFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Detection/RoadExtraction/test/otbRemoveWrongDirectionFilterNew.cxx b/Modules/Detection/RoadExtraction/test/otbRemoveWrongDirectionFilterNew.cxx
deleted file mode 100644
index 336b13916052d1e880f3fc56610c5450dd6a5c0e..0000000000000000000000000000000000000000
--- a/Modules/Detection/RoadExtraction/test/otbRemoveWrongDirectionFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbRemoveWrongDirectionFilter.h"
-#include "otbImage.h"
-
-int otbRemoveWrongDirectionFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::RemoveWrongDirectionFilter<ImageType, ImageType, ImageType> RemoveWrongDirectionFilterType;
-
- // Instantiating object
- RemoveWrongDirectionFilterType::Pointer filter = RemoveWrongDirectionFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Detection/RoadExtraction/test/otbRoadExtractionFilterNew.cxx b/Modules/Detection/RoadExtraction/test/otbRoadExtractionFilterNew.cxx
deleted file mode 100644
index 28e3a7b883f0463d34223af3700e4143be876378..0000000000000000000000000000000000000000
--- a/Modules/Detection/RoadExtraction/test/otbRoadExtractionFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "itkPolyLineParametricPath.h"
-#include "otbRoadExtractionFilter.h"
-
-int otbRoadExtractionFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef otb::VectorImage<double, Dimension> InputImageType;
- typedef itk::PolyLineParametricPath<Dimension> PathType;
-
- typedef otb::RoadExtractionFilter<InputImageType, PathType> RoadExtractionFilterType;
-
- // Instantiating object
- RoadExtractionFilterType::Pointer filter = RoadExtractionFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Detection/RoadExtraction/test/otbRoadExtractionTestDriver.cxx b/Modules/Detection/RoadExtraction/test/otbRoadExtractionTestDriver.cxx
index 15601a17c252d960031508ec331addf47ebe1814..d4718ef2847b83cffb612eee8582e5dacf1705ab 100644
--- a/Modules/Detection/RoadExtraction/test/otbRoadExtractionTestDriver.cxx
+++ b/Modules/Detection/RoadExtraction/test/otbRoadExtractionTestDriver.cxx
@@ -23,31 +23,18 @@
void RegisterTests()
{
REGISTER_TEST(otbLikelihoodPathListFilter);
- REGISTER_TEST(otbParallelLinePathListFilterNew);
REGISTER_TEST(otbRemoveWrongDirectionFilter);
REGISTER_TEST(otbSimplifyPathListFilter);
- REGISTER_TEST(otbRoadExtractionFilterNew);
- REGISTER_TEST(otbRemoveIsolatedByDirectionFilterNew);
REGISTER_TEST(otbAlignImageToPath);
- REGISTER_TEST(otbNonMaxRemovalByDirectionFilterNew);
- REGISTER_TEST(otbNeighborhoodScalarProductFilterNew);
- REGISTER_TEST(otbRemoveTortuousPathListFilterNew);
REGISTER_TEST(otbNonMaxRemovalByDirectionFilter);
- REGISTER_TEST(otbRemoveWrongDirectionFilterNew);
REGISTER_TEST(otbRoadExtractionFilter);
REGISTER_TEST(otbLinkPathListFilter);
- REGISTER_TEST(otbModulusAndDirectionImageFiltersNew);
- REGISTER_TEST(otbSimplifyPathListFilterNew);
REGISTER_TEST(otbRemoveTortuousPathListFilter);
- REGISTER_TEST(otbLinkPathListFilterNew);
- REGISTER_TEST(otbLikelihoodPathListFilterNew);
REGISTER_TEST(otbParallelLinePathListFilter);
REGISTER_TEST(otbRemoveIsolatedByDirectionFilter);
- REGISTER_TEST(otbVectorDataToRoadDescriptionFilterNew);
REGISTER_TEST(otbVectorDataToRoadDescriptionFilter);
REGISTER_TEST(otbSimplifyManyPathListFilter);
REGISTER_TEST(otbNeighborhoodScalarProductFilter);
REGISTER_TEST(otbDrawPathAlign);
REGISTER_TEST(otbBreakAngularPathListFilter);
- REGISTER_TEST(otbBreakAngularPathListFilterNew);
}
diff --git a/Modules/Detection/RoadExtraction/test/otbSimplifyPathListFilterNew.cxx b/Modules/Detection/RoadExtraction/test/otbSimplifyPathListFilterNew.cxx
deleted file mode 100644
index 1099633dffdcf78951716a43b1b9db5a17291950..0000000000000000000000000000000000000000
--- a/Modules/Detection/RoadExtraction/test/otbSimplifyPathListFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbSimplifyPathListFilter.h"
-#include "itkPolyLineParametricPath.h"
-#include <cstdlib>
-
-int otbSimplifyPathListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef itk::PolyLineParametricPath<Dimension> PathType;
- typedef otb::SimplifyPathListFilter<PathType> SimplifyPathListFilterType;
-
- // Instantiating object
- SimplifyPathListFilterType::Pointer filter = SimplifyPathListFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Detection/RoadExtraction/test/otbVectorDataToRoadDescriptionFilter.cxx b/Modules/Detection/RoadExtraction/test/otbVectorDataToRoadDescriptionFilter.cxx
index b670b926073c895f4192991f124c28831c07771e..11648b341a56430fe2ffd3b2c54e77b3ee4eea58 100644
--- a/Modules/Detection/RoadExtraction/test/otbVectorDataToRoadDescriptionFilter.cxx
+++ b/Modules/Detection/RoadExtraction/test/otbVectorDataToRoadDescriptionFilter.cxx
@@ -33,22 +33,6 @@
-int otbVectorDataToRoadDescriptionFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef double PrecisionType;
- typedef otb::VectorData<PrecisionType> VectorDataType;
- typedef otb::VectorImage<PrecisionType> ImageType;
-
- typedef otb::VectorDataToRoadDescriptionFilter<VectorDataType, ImageType>
- VectorDataToRoadDescriptionFilterType;
-
- VectorDataToRoadDescriptionFilterType::Pointer filter =
- VectorDataToRoadDescriptionFilterType::New();
-
- std::cout<<filter<<std::endl;
-
- return EXIT_SUCCESS;
-}
int otbVectorDataToRoadDescriptionFilter(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/Detection/UrbanArea/test/CMakeLists.txt b/Modules/Detection/UrbanArea/test/CMakeLists.txt
index 8fb50f554b9ddda84bebfe96cb1b5da1137a35fe..5c8099dc02c5eed071a0e1b89e0bd0dd09425fb1 100644
--- a/Modules/Detection/UrbanArea/test/CMakeLists.txt
+++ b/Modules/Detection/UrbanArea/test/CMakeLists.txt
@@ -22,7 +22,6 @@ otb_module_test()
set(OTBUrbanAreaTests
otbUrbanAreaTestDriver.cxx
-otbUrbanAreaDetectionImageFilterNew.cxx
otbUrbanAreaDetectionImageFilter.cxx
)
@@ -32,9 +31,6 @@ otb_module_target_label(otbUrbanAreaTestDriver)
# Tests Declaration
-otb_add_test(NAME raTuUrbanAreaDetectionImageFilterNew COMMAND otbUrbanAreaTestDriver
- otbUrbanAreaDetectionImageFilterNew
- )
otb_add_test(NAME raTvUrbanAreaDetectionImageFilter COMMAND otbUrbanAreaTestDriver
--compare-image ${EPSILON_8} ${BASELINE}/raTvUrbanAreaDetection.png
diff --git a/Modules/Detection/UrbanArea/test/otbUrbanAreaDetectionImageFilterNew.cxx b/Modules/Detection/UrbanArea/test/otbUrbanAreaDetectionImageFilterNew.cxx
deleted file mode 100644
index 8020d82f36306b7570255bf7bfc8355c6d9bb2fc..0000000000000000000000000000000000000000
--- a/Modules/Detection/UrbanArea/test/otbUrbanAreaDetectionImageFilterNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbVectorImage.h"
-#include "otbUrbanAreaDetectionImageFilter.h"
-
-int otbUrbanAreaDetectionImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> InputVectorImageType;
- typedef otb::Image<unsigned char, Dimension> OutputImageType;
-
- typedef otb::UrbanAreaDetectionImageFilter<InputVectorImageType,
- OutputImageType> UrbanAreaDetectionFilterType;
-
- // Instantiating objects
- UrbanAreaDetectionFilterType::Pointer filter = UrbanAreaDetectionFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Detection/UrbanArea/test/otbUrbanAreaTestDriver.cxx b/Modules/Detection/UrbanArea/test/otbUrbanAreaTestDriver.cxx
index a4f6dfec16eb41fba3e2e0667e970fa36fbd2796..72897a1364904cbd767a8623d0460e925f254feb 100644
--- a/Modules/Detection/UrbanArea/test/otbUrbanAreaTestDriver.cxx
+++ b/Modules/Detection/UrbanArea/test/otbUrbanAreaTestDriver.cxx
@@ -22,6 +22,5 @@
void RegisterTests()
{
- REGISTER_TEST(otbUrbanAreaDetectionImageFilterNew);
REGISTER_TEST(otbUrbanAreaDetectionImageFilter);
}
diff --git a/Modules/Feature/Corner/test/CMakeLists.txt b/Modules/Feature/Corner/test/CMakeLists.txt
index 65ebd925d747d5e6185f5f7d3847829d4302155e..b2e4394d997857131cdc1d9168ea014a44a422cf 100644
--- a/Modules/Feature/Corner/test/CMakeLists.txt
+++ b/Modules/Feature/Corner/test/CMakeLists.txt
@@ -25,7 +25,6 @@ otbCornerTestDriver.cxx
otbLineSpatialObjectListToRightAnglePointSetFilter.cxx
otbVectorDataToRightAngleVectorDataFilter.cxx
otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.cxx
-otbLineSpatialObjectListToRightAnglePointSetFilterNew.cxx
otbHarrisImage.cxx
otbHarrisToPointSet.cxx
)
@@ -54,9 +53,6 @@ otb_add_test(NAME feTvVectorDataToRightAngleVectorDataFilter COMMAND otbCornerTe
${TEMP}/feTvVectorDataToRightAngleVectorDataFilterOutput.shp #output text file
)
-otb_add_test(NAME feTuVectorDataToRightAngleVectorDataFilterNew COMMAND otbCornerTestDriver
- otbVectorDataToRightAngleVectorDataFilterNew)
-
otb_add_test(NAME feTvLineSpatialObjectListToRightAnglePointSetFilterBySteps COMMAND otbCornerTestDriver
--compare-ascii ${EPSILON_3}
${BASELINE_FILES}/feTvLineSpatialObjectListToRightAnglePointSetFilterOutputAscii.txt
@@ -66,9 +62,6 @@ otb_add_test(NAME feTvLineSpatialObjectListToRightAnglePointSetFilterBySteps COM
${TEMP}/feTvLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.txt
)
-otb_add_test(NAME feTuLineSpatialObjectListToRightAnglePointSetFilterNew COMMAND otbCornerTestDriver
- otbLineSpatialObjectListToRightAnglePointSetFilterNew)
-
otb_add_test(NAME feTvHarrisImage COMMAND otbCornerTestDriver
--compare-image ${NOTOL} ${BASELINE}/feHarrisImage.png
${TEMP}/feHarrisImage.png
diff --git a/Modules/Feature/Corner/test/otbCornerTestDriver.cxx b/Modules/Feature/Corner/test/otbCornerTestDriver.cxx
index aba4bbe69763223d1d87432a080d3d7512770169..5c6ff74c99da49e61137fc1137d08411b9dcd216 100644
--- a/Modules/Feature/Corner/test/otbCornerTestDriver.cxx
+++ b/Modules/Feature/Corner/test/otbCornerTestDriver.cxx
@@ -23,10 +23,8 @@
void RegisterTests()
{
REGISTER_TEST(otbLineSpatialObjectListToRightAnglePointSetFilter);
- REGISTER_TEST(otbVectorDataToRightAngleVectorDataFilterNew);
REGISTER_TEST(otbVectorDataToRightAngleVectorDataFilter);
REGISTER_TEST(otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii);
- REGISTER_TEST(otbLineSpatialObjectListToRightAnglePointSetFilterNew);
REGISTER_TEST(otbHarrisImage);
REGISTER_TEST(otbHarrisToPointSet);
}
diff --git a/Modules/Feature/Corner/test/otbLineSpatialObjectListToRightAnglePointSetFilterNew.cxx b/Modules/Feature/Corner/test/otbLineSpatialObjectListToRightAnglePointSetFilterNew.cxx
deleted file mode 100644
index 7ae2f913d1d72f4aee14105b05f6974884d35bfc..0000000000000000000000000000000000000000
--- a/Modules/Feature/Corner/test/otbLineSpatialObjectListToRightAnglePointSetFilterNew.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbLineSpatialObjectListToRightAnglePointSetFilter.h"
-#include "otbImage.h"
-#include "otbLineSpatialObjectList.h"
-
-int otbLineSpatialObjectListToRightAnglePointSetFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef float PixelType;
-
- /** Typedefs */
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::LineSpatialObjectList LinesListType;
- typedef LinesListType::LineType LineType;
- typedef std::vector<LineType *> VectorLines;
- typedef itk::PointSet<VectorLines, Dimension> PointSetType;
- typedef otb::LineSpatialObjectListToRightAnglePointSetFilter<ImageType, LinesListType,
- PointSetType> RightAngleFilterType;
-
- RightAngleFilterType::Pointer filter = RightAngleFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Corner/test/otbVectorDataToRightAngleVectorDataFilter.cxx b/Modules/Feature/Corner/test/otbVectorDataToRightAngleVectorDataFilter.cxx
index f66f1dff140adbd0111d52b738f68edd49fe03db..6a91b54b26de032670278071ae6d2b802d4cf905 100644
--- a/Modules/Feature/Corner/test/otbVectorDataToRightAngleVectorDataFilter.cxx
+++ b/Modules/Feature/Corner/test/otbVectorDataToRightAngleVectorDataFilter.cxx
@@ -29,19 +29,6 @@
#include "otbImageFileWriter.h"
-int otbVectorDataToRightAngleVectorDataFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- /** Typedefs */
- typedef otb::VectorData< > VectorDataType;
- typedef otb::VectorDataToRightAngleVectorDataFilter<VectorDataType>
- RightAngleFilterType;
-
- RightAngleFilterType::Pointer filter = RightAngleFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbVectorDataToRightAngleVectorDataFilter(int itkNotUsed(argc), char * argv[])
diff --git a/Modules/Feature/Density/test/CMakeLists.txt b/Modules/Feature/Density/test/CMakeLists.txt
index 0cec55a612df0102f0466f25d5499ef13ec19f2c..64825b2452537d609b9c326b83809740e436f10d 100644
--- a/Modules/Feature/Density/test/CMakeLists.txt
+++ b/Modules/Feature/Density/test/CMakeLists.txt
@@ -22,14 +22,9 @@ otb_module_test()
set(OTBDensityTests
otbDensityTestDriver.cxx
-otbPointSetDensityFunctionNew.cxx
-otbPointSetDensityGaussianFunctionNew.cxx
-otbPointSetToDensityImageFilterNew.cxx
otbPointSetDensityGaussianFunctionTest.cxx
-otbPointSetDensityEpanechnikovFunctionNew.cxx
otbPointSetDensityEpanechnikovFunctionTest.cxx
otbKeyPointDensityImageFilterTest.cxx
-otbKeyPointDensityImageFilterNew.cxx
otbPointSetToDensityImageFilterTest.cxx
otbPointSetDensityFunctionTest.cxx
)
@@ -40,16 +35,7 @@ otb_module_target_label(otbDensityTestDriver)
# Tests Declaration
-otb_add_test(NAME bfTuPointSetDensityFunctionNew COMMAND otbDensityTestDriver
- otbPointSetDensityFunctionNew
- )
-
-otb_add_test(NAME bfTuPointSetDensityGaussianFunctionNew COMMAND otbDensityTestDriver
- otbPointSetDensityGaussianFunctionNew
- )
-otb_add_test(NAME bfTuPointSetToDensityImageFilterNew COMMAND otbDensityTestDriver
- otbPointSetToDensityImageFilterNew)
otb_add_test(NAME bfTvPointSetDensityGaussianFunctionTest COMMAND otbDensityTestDriver
--compare-ascii ${NOTOL}
@@ -59,9 +45,6 @@ otb_add_test(NAME bfTvPointSetDensityGaussianFunctionTest COMMAND otbDensityTest
${TEMP}/bfTvPointSetDensityGaussianFunctionOutputAscii.txt
)
-otb_add_test(NAME bfTuPointSetDensityEpanechnikovFunctionNew COMMAND otbDensityTestDriver
- otbPointSetDensityEpanechnikovFunctionNew
- )
otb_add_test(NAME bfTvPointSetDensityEpanechnikovFunctionTest COMMAND otbDensityTestDriver
--compare-ascii ${NOTOL}
@@ -81,9 +64,6 @@ otb_add_test(NAME bfTvKeyPointDensityImageFilterOutputImage COMMAND otbDensityTe
3 5 10
)
-otb_add_test(NAME bfTuKeyPointDensityImageFilterNew COMMAND otbDensityTestDriver
- otbKeyPointDensityImageFilterNew
- )
otb_add_test(NAME bfTvPointSetToDensityImageFilterTest COMMAND otbDensityTestDriver
--compare-image ${NOTOL}
diff --git a/Modules/Feature/Density/test/otbDensityTestDriver.cxx b/Modules/Feature/Density/test/otbDensityTestDriver.cxx
index 87c771f10a697c4a7c227deab61586259a5fd75f..acd99f8505eb9dc14d0e157b9faa2f6cbafb288a 100644
--- a/Modules/Feature/Density/test/otbDensityTestDriver.cxx
+++ b/Modules/Feature/Density/test/otbDensityTestDriver.cxx
@@ -22,14 +22,9 @@
void RegisterTests()
{
- REGISTER_TEST(otbPointSetDensityFunctionNew);
- REGISTER_TEST(otbPointSetDensityGaussianFunctionNew);
- REGISTER_TEST(otbPointSetToDensityImageFilterNew);
REGISTER_TEST(otbPointSetDensityGaussianFunctionTest);
- REGISTER_TEST(otbPointSetDensityEpanechnikovFunctionNew);
REGISTER_TEST(otbPointSetDensityEpanechnikovFunctionTest);
REGISTER_TEST(otbKeyPointDensityImageFilterTest);
- REGISTER_TEST(otbKeyPointDensityImageFilterNew);
REGISTER_TEST(otbPointSetToDensityImageFilterTest);
REGISTER_TEST(otbPointSetDensityFunctionTest);
}
diff --git a/Modules/Feature/Density/test/otbKeyPointDensityImageFilterNew.cxx b/Modules/Feature/Density/test/otbKeyPointDensityImageFilterNew.cxx
deleted file mode 100644
index 00b6c7b10261914165772b3861704804f359363c..0000000000000000000000000000000000000000
--- a/Modules/Feature/Density/test/otbKeyPointDensityImageFilterNew.cxx
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include <stdio.h>
-
-#include "otbKeyPointDensityImageFilter.h"
-#include "otbImageToSIFTKeyPointSetFilter.h"
-#include "itkPointSet.h"
-#include "itkVariableLengthVector.h"
-#include "otbImage.h"
-
-int otbKeyPointDensityImageFilterNew(int, char*[])
-{
-
- const unsigned int Dimension = 2;
- typedef float PixelType;
-
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef itk::VariableLengthVector<PixelType> RealVectorType;
- typedef itk::PointSet<RealVectorType, Dimension> PointSetType;
- typedef otb::ImageToSIFTKeyPointSetFilter<ImageType, PointSetType> DetectorType;
-
- typedef otb::KeyPointDensityImageFilter<ImageType, ImageType, DetectorType> FilterType;
-
- /**Instantiation of an object*/
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Density/test/otbPointSetDensityEpanechnikovFunctionNew.cxx b/Modules/Feature/Density/test/otbPointSetDensityEpanechnikovFunctionNew.cxx
deleted file mode 100644
index 0ba0f43bf83e410b718494cf670900331b515d1f..0000000000000000000000000000000000000000
--- a/Modules/Feature/Density/test/otbPointSetDensityEpanechnikovFunctionNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include <stdio.h>
-
-#include "otbPointSetDensityEpanechnikovFunction.h"
-#include "itkPointSet.h"
-#include "itkVariableLengthVector.h"
-
-int otbPointSetDensityEpanechnikovFunctionNew(int, char*[])
-{
-
- const unsigned int Dimension = 2;
- typedef float PixelType;
-
- typedef itk::VariableLengthVector<PixelType> RealVectorType;
- typedef itk::PointSet<RealVectorType, Dimension> PointSetType;
- typedef otb::PointSetDensityEpanechnikovFunction <PointSetType, PixelType> FunctionType;
-
- /**Instantiation of a Smart Pointer*/
- FunctionType::Pointer filter = FunctionType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Density/test/otbPointSetDensityFunctionNew.cxx b/Modules/Feature/Density/test/otbPointSetDensityFunctionNew.cxx
deleted file mode 100644
index 1ea9d1f0901344e61c23d5932d4cad1b8bf58021..0000000000000000000000000000000000000000
--- a/Modules/Feature/Density/test/otbPointSetDensityFunctionNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include <stdio.h>
-
-#include "otbPointSetDensityFunction.h"
-#include "itkPointSet.h"
-#include "itkVariableLengthVector.h"
-
-int otbPointSetDensityFunctionNew(int, char*[])
-{
-
- const unsigned int Dimension = 2;
- typedef float PixelType;
-
- typedef itk::VariableLengthVector<PixelType> RealVectorType;
- typedef itk::PointSet<RealVectorType, Dimension> PointSetType;
- typedef otb::PointSetDensityFunction <PointSetType, PixelType> FunctionType;
-
- /**Instantiation of a Smart Pointer*/
- FunctionType::Pointer filter = FunctionType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Density/test/otbPointSetDensityGaussianFunctionNew.cxx b/Modules/Feature/Density/test/otbPointSetDensityGaussianFunctionNew.cxx
deleted file mode 100644
index 66cd7f821f57f54e81ef1af675d312121be1bd4b..0000000000000000000000000000000000000000
--- a/Modules/Feature/Density/test/otbPointSetDensityGaussianFunctionNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include <stdio.h>
-
-#include "otbPointSetDensityGaussianFunction.h"
-#include "itkPointSet.h"
-#include "itkVariableLengthVector.h"
-
-int otbPointSetDensityGaussianFunctionNew(int, char*[])
-{
-
- const unsigned int Dimension = 2;
- typedef float PixelType;
-
- typedef itk::VariableLengthVector<PixelType> RealVectorType;
- typedef itk::PointSet<RealVectorType, Dimension> PointSetType;
- typedef otb::PointSetDensityGaussianFunction <PointSetType, PixelType> FunctionType;
-
- /**Instantiation of a Smart Pointer*/
- FunctionType::Pointer filter = FunctionType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Density/test/otbPointSetToDensityImageFilterNew.cxx b/Modules/Feature/Density/test/otbPointSetToDensityImageFilterNew.cxx
deleted file mode 100644
index f0864c4ec5728a726fc8d15cab2ccb0de2c9d772..0000000000000000000000000000000000000000
--- a/Modules/Feature/Density/test/otbPointSetToDensityImageFilterNew.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include <stdio.h>
-#include "otbImage.h"
-#include "otbPointSetToDensityImageFilter.h"
-#include "itkVariableLengthVector.h"
-
-int otbPointSetToDensityImageFilterNew(int, char*[])
-{
-
- const unsigned int Dimension = 2;
- typedef float PixelType;
-
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef itk::VariableLengthVector<PixelType> RealVectorType;
- typedef itk::PointSet<RealVectorType, Dimension> PointSetType;
- typedef otb::PointSetToDensityImageFilter <PointSetType, ImageType> FunctionType;
-
- /**Instantiation of an object*/
-
- FunctionType::Pointer filter = FunctionType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Descriptors/test/CMakeLists.txt b/Modules/Feature/Descriptors/test/CMakeLists.txt
index 6382e7b260145bece389dcc81ded8032f926bee1..fd88b492462d80b1c872f472443dfafe04c3d4e9 100644
--- a/Modules/Feature/Descriptors/test/CMakeLists.txt
+++ b/Modules/Feature/Descriptors/test/CMakeLists.txt
@@ -23,13 +23,9 @@ otb_module_test()
set(OTBDescriptorsTests
otbDescriptorsTestDriver.cxx
otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx
-otbKeyPointSetsMatchingFilterNew.cxx
otbImageToSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
otbHistogramOfOrientedGradientCovariantImageFunction.cxx
otbImageToSURFKeyPointSetFilterOutputInterestPointAscii.cxx
-otbImageToSURFKeyPointSetFilterNew.cxx
-otbLandmarkNew.cxx
-otbImageToSIFTKeyPointSetFilterNew.cxx
otbKeyPointSetsMatchingFilter.cxx
otbImageToSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
otbImageToSIFTKeyPointSetFilterOutputAscii.cxx
@@ -38,13 +34,10 @@ otbImageToHessianDeterminantImageFilter.cxx
otbImageToSIFTKeyPointSetFilterOutputImage.cxx
otbFourierMellinDescriptors.cxx
otbImageToSIFTKeyPointSetFilterDistanceMap.cxx
-otbImageToHessianDeterminantImageFilterNew.cxx
-otbFourierMellinImageFilterNew.cxx
)
if(OTB_USE_SIFTFAST)
list(APPEND OTBDescriptorsTests
- otbImageToFastSIFTKeyPointSetFilterNew.cxx
otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
)
@@ -67,9 +60,6 @@ otb_add_test(NAME feTvImageToSURFKeyPointSetFilterSceneOutputDescriptorAscii COM
)
-otb_add_test(NAME feTuKeyPointSetsMatchingFilterNew COMMAND otbDescriptorsTestDriver
- otbKeyPointSetsMatchingFilterNew)
-
otb_add_test(NAME feTvImageToSIFTKeyPointSetFilterSceneOutputInterestPointAscii COMMAND otbDescriptorsTestDriver
--ignore-order --compare-ascii ${EPSILON_3}
${BASELINE_FILES}/feTvImageToSIFTKeyPointSetFilterSceneKeysOutputInterestPoint.txt
@@ -80,9 +70,6 @@ otb_add_test(NAME feTvImageToSIFTKeyPointSetFilterSceneOutputInterestPointAscii
6 3 0.08 10.0
)
-otb_add_test(NAME feTuHistogramOfOrientedGradientCovariantImageFunction COMMAND otbDescriptorsTestDriver
- otbHistogramOfOrientedGradientCovariantImageFunctionNew)
-
otb_add_test(NAME feTvHistogramOfOrientedGradientCovariantImageFunction COMMAND otbDescriptorsTestDriver
--compare-ascii ${EPSILON_8}
${BASELINE_FILES}/feTvHistogramOfOrientedGradientCovariantImageFunction.txt
@@ -103,15 +90,6 @@ otb_add_test(NAME feTvImageToSURFKeyPointSetFilterSceneOutputInterestPointAscii
3 3
)
-otb_add_test(NAME feTuImageToSURFKeyPointSetFilterNew COMMAND otbDescriptorsTestDriver
- otbImageToSURFKeyPointSetFilterNew)
-
-otb_add_test(NAME feTuLandmarkNew COMMAND otbDescriptorsTestDriver
- otbLandmarkNew)
-
-otb_add_test(NAME feTuImageToSIFTKeyPointSetFilterNew COMMAND otbDescriptorsTestDriver
- otbImageToSIFTKeyPointSetFilterNew)
-
otb_add_test(NAME feTvKeyPointSetsMatchingFilter COMMAND otbDescriptorsTestDriver
--compare-ascii ${EPSILON_3}
${BASELINE_FILES}/feTvKeyPointSetsMatchingFilterOutputAscii.txt
@@ -240,9 +218,6 @@ otb_add_test(NAME feTvFourierMellinDescriptorsRotationInvariant COMMAND otbDescr
90
)
-otb_add_test(NAME feTuFourierMellinDescriptorsNew COMMAND otbDescriptorsTestDriver
- otbFourierMellinDescriptorsNew
- )
otb_add_test(NAME feTvFourierMellinDescriptorsScaleInvariant COMMAND otbDescriptorsTestDriver
otbFourierMellinDescriptorsScaleInvariant
@@ -263,7 +238,7 @@ otb_add_test(NAME feTvFourierMellinDescriptors COMMAND otbDescriptorsTestDriver
)
otb_add_test(NAME feTvImageToSIFTKeyPointSetFilterDistanceMap COMMAND otbDescriptorsTestDriver
- --compare-ascii ${EPSILON_3}
+ --compare-ascii ${EPSILON_3}
${BASELINE_FILES}/feTvImageToSIFTKeyPointSetFilterDistanceMap.txt
${TEMP}/feTvImageToSIFTKeyPointSetFilterDistanceMap.txt
--ignore-lines-with 2 INFO DEBUG
@@ -276,16 +251,7 @@ otb_add_test(NAME feTvImageToSIFTKeyPointSetFilterDistanceMap COMMAND otbDescrip
${TEMP}/feTvImageToSIFTKeyPointSetFilterDistanceMap.txt
)
-otb_add_test(NAME feTuImageToHessianDeterminantImageFilterNew COMMAND otbDescriptorsTestDriver
- otbImageToHessianDeterminantImageFilterNew)
-
-otb_add_test(NAME feTuForwardFourierMellinImageFilterNew COMMAND otbDescriptorsTestDriver
- otbFourierMellinImageFilterNew)
-
if(OTB_USE_SIFTFAST)
-otb_add_test(NAME feTuImageToFastSIFTKeyPointSetFilterNew COMMAND otbDescriptorsTestDriver
- otbImageToFastSIFTKeyPointSetFilterNew)
-
otb_add_test(NAME feTvImageToFastSIFTKeyPointSetFilterSceneOutputInterestPointAscii COMMAND otbDescriptorsTestDriver
--ignore-order --compare-ascii ${EPSILON_3}
${BASELINE_FILES}/feTvImageToFastSIFTKeyPointSetFilterSceneKeysOutputInterestPoint.txt
diff --git a/Modules/Feature/Descriptors/test/otbDescriptorsTestDriver.cxx b/Modules/Feature/Descriptors/test/otbDescriptorsTestDriver.cxx
index a3632f847477e6ca2ce6d27516f6797066a7ad23..23b366ce65c437537448a0efc55fa263d42b1b3a 100644
--- a/Modules/Feature/Descriptors/test/otbDescriptorsTestDriver.cxx
+++ b/Modules/Feature/Descriptors/test/otbDescriptorsTestDriver.cxx
@@ -23,29 +23,20 @@
void RegisterTests()
{
REGISTER_TEST(otbImageToSURFKeyPointSetFilterOutputDescriptorAscii);
- REGISTER_TEST(otbKeyPointSetsMatchingFilterNew);
REGISTER_TEST(otbImageToSIFTKeyPointSetFilterOutputInterestPointAscii);
- REGISTER_TEST(otbHistogramOfOrientedGradientCovariantImageFunctionNew);
REGISTER_TEST(otbHistogramOfOrientedGradientCovariantImageFunction);
REGISTER_TEST(otbImageToSURFKeyPointSetFilterOutputInterestPointAscii);
- REGISTER_TEST(otbImageToSURFKeyPointSetFilterNew);
- REGISTER_TEST(otbLandmarkNew);
- REGISTER_TEST(otbImageToSIFTKeyPointSetFilterNew);
REGISTER_TEST(otbKeyPointSetsMatchingFilter);
REGISTER_TEST(otbImageToSIFTKeyPointSetFilterOutputDescriptorAscii);
REGISTER_TEST(otbImageToSIFTKeyPointSetFilterOutputAscii);
REGISTER_TEST(otbFourierMellinImageFilter);
REGISTER_TEST(otbImageToHessianDeterminantImageFilter);
REGISTER_TEST(otbImageToSIFTKeyPointSetFilterOutputImage);
- REGISTER_TEST(otbFourierMellinDescriptorsNew);
REGISTER_TEST(otbFourierMellinDescriptors);
REGISTER_TEST(otbFourierMellinDescriptorsScaleInvariant);
REGISTER_TEST(otbFourierMellinDescriptorsRotationInvariant);
REGISTER_TEST(otbImageToSIFTKeyPointSetFilterDistanceMap);
- REGISTER_TEST(otbImageToHessianDeterminantImageFilterNew);
- REGISTER_TEST(otbFourierMellinImageFilterNew);
#ifdef OTB_USE_SIFTFAST
- REGISTER_TEST(otbImageToFastSIFTKeyPointSetFilterNew);
REGISTER_TEST(otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii);
REGISTER_TEST(otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii);
#endif
diff --git a/Modules/Feature/Descriptors/test/otbFourierMellinDescriptors.cxx b/Modules/Feature/Descriptors/test/otbFourierMellinDescriptors.cxx
index 5bfe656e020e182b35e4a71e3411f02599198934..42e0785daf023834f7e3d588bdafc1c28dde60ca 100644
--- a/Modules/Feature/Descriptors/test/otbFourierMellinDescriptors.cxx
+++ b/Modules/Feature/Descriptors/test/otbFourierMellinDescriptors.cxx
@@ -31,21 +31,6 @@
#include "itkAffineTransform.h"
-int otbFourierMellinDescriptorsNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double InputPixelType;
-
- typedef otb::Image<InputPixelType, Dimension> ImageType;
- typedef otb::FourierMellinDescriptorsImageFunction<ImageType> FunctionType;
-
- // Instantiating object
- FunctionType::Pointer function = FunctionType::New();
-
- std::cout << function << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbFourierMellinDescriptors(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Feature/Descriptors/test/otbFourierMellinImageFilterNew.cxx b/Modules/Feature/Descriptors/test/otbFourierMellinImageFilterNew.cxx
deleted file mode 100644
index fc0ad04fca72f6d417a28036624593e5ba7c2fb7..0000000000000000000000000000000000000000
--- a/Modules/Feature/Descriptors/test/otbFourierMellinImageFilterNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "otbForwardFourierMellinTransformImageFilter.h"
-
-int otbFourierMellinImageFilterNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
-
- typedef double PixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<PixelType, Dimension> InputImageType;
-
- typedef itk::LinearInterpolateImageFunction<InputImageType, double> InterpolatorType;
- typedef otb::ForwardFourierMellinTransformImageFilter<PixelType,
- InterpolatorType, Dimension> FourierMellinTransformType;
-
- FourierMellinTransformType::Pointer filter = FourierMellinTransformType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Descriptors/test/otbHistogramOfOrientedGradientCovariantImageFunction.cxx b/Modules/Feature/Descriptors/test/otbHistogramOfOrientedGradientCovariantImageFunction.cxx
index 1732f66d59f15abdfda9afde43628549d5abc1fa..0a26112ffae0a381c9c909999b9113c3e817929c 100644
--- a/Modules/Feature/Descriptors/test/otbHistogramOfOrientedGradientCovariantImageFunction.cxx
+++ b/Modules/Feature/Descriptors/test/otbHistogramOfOrientedGradientCovariantImageFunction.cxx
@@ -41,15 +41,6 @@ typedef GradientFilterType::OutputImageType
typedef otb::HistogramOfOrientedGradientCovariantImageFunction<CovariantImageType> FunctionType;
-int otbHistogramOfOrientedGradientCovariantImageFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- // Instantiating object
- FunctionType::Pointer function = FunctionType::New();
-
- std::cout << function << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbHistogramOfOrientedGradientCovariantImageFunction(int itkNotUsed(argc), char * argv[])
diff --git a/Modules/Feature/Descriptors/test/otbImageToFastSIFTKeyPointSetFilterNew.cxx b/Modules/Feature/Descriptors/test/otbImageToFastSIFTKeyPointSetFilterNew.cxx
deleted file mode 100644
index d6610d20f212597cf94256bd5e334f48025bff69..0000000000000000000000000000000000000000
--- a/Modules/Feature/Descriptors/test/otbImageToFastSIFTKeyPointSetFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbSiftFastImageFilter.h"
-#include "itkPointSet.h"
-#include "itkVariableLengthVector.h"
-
-int otbImageToFastSIFTKeyPointSetFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef float RealType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<RealType, Dimension> ImageType;
- typedef itk::VariableLengthVector<RealType> RealVectorType;
- typedef itk::PointSet<RealVectorType, Dimension> PointSetType;
- typedef otb::SiftFastImageFilter<ImageType, PointSetType> ImageToFastSIFTKeyPointSetFilterType;
-
- // Instantiating object
- ImageToFastSIFTKeyPointSetFilterType::Pointer filter = ImageToFastSIFTKeyPointSetFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Descriptors/test/otbImageToHessianDeterminantImageFilterNew.cxx b/Modules/Feature/Descriptors/test/otbImageToHessianDeterminantImageFilterNew.cxx
deleted file mode 100644
index 56500bae46d866fc5ac81098a39ef886c03e16c9..0000000000000000000000000000000000000000
--- a/Modules/Feature/Descriptors/test/otbImageToHessianDeterminantImageFilterNew.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbImageToHessianDeterminantImageFilter.h"
-
-int otbImageToHessianDeterminantImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::ImageToHessianDeterminantImageFilter<ImageType, ImageType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Descriptors/test/otbImageToSIFTKeyPointSetFilterNew.cxx b/Modules/Feature/Descriptors/test/otbImageToSIFTKeyPointSetFilterNew.cxx
deleted file mode 100644
index 8b320d47edadc734e7ff3b6241938cd4fbb3298e..0000000000000000000000000000000000000000
--- a/Modules/Feature/Descriptors/test/otbImageToSIFTKeyPointSetFilterNew.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbImageToSIFTKeyPointSetFilter.h"
-#include "otbImage.h"
-#include "itkPointSet.h"
-#include "itkVariableLengthVector.h"
-
-int otbImageToSIFTKeyPointSetFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef float RealType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<RealType, Dimension> ImageType;
- typedef itk::VariableLengthVector<RealType> RealVectorType;
- typedef itk::PointSet<RealVectorType, Dimension> PointSetType;
- typedef otb::ImageToSIFTKeyPointSetFilter<ImageType, PointSetType> ImageToSIFTKeyPointSetFilterType;
-
- // Instantiating object
- ImageToSIFTKeyPointSetFilterType::Pointer filter = ImageToSIFTKeyPointSetFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Descriptors/test/otbImageToSURFKeyPointSetFilterNew.cxx b/Modules/Feature/Descriptors/test/otbImageToSURFKeyPointSetFilterNew.cxx
deleted file mode 100644
index 61bfb505bdbae1d90633b85e64bd895428f6a911..0000000000000000000000000000000000000000
--- a/Modules/Feature/Descriptors/test/otbImageToSURFKeyPointSetFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbImageToSURFKeyPointSetFilter.h"
-#include "otbImage.h"
-#include "itkVariableLengthVector.h"
-
-int otbImageToSURFKeyPointSetFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
-
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef itk::VariableLengthVector<PixelType> RealVectorType;
- typedef itk::PointSet<RealVectorType, Dimension> PointSetType;
- typedef otb::ImageToSURFKeyPointSetFilter<ImageType, PointSetType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Descriptors/test/otbKeyPointSetsMatchingFilterNew.cxx b/Modules/Feature/Descriptors/test/otbKeyPointSetsMatchingFilterNew.cxx
deleted file mode 100644
index 94570dc50c0e225a04c46fc2905f310a69ea693f..0000000000000000000000000000000000000000
--- a/Modules/Feature/Descriptors/test/otbKeyPointSetsMatchingFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkPointSet.h"
-#include "itkVariableLengthVector.h"
-#include "otbKeyPointSetsMatchingFilter.h"
-
-int otbKeyPointSetsMatchingFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef float RealType;
- const unsigned int Dimension = 2;
-
- typedef itk::VariableLengthVector<RealType> RealVectorType;
- typedef itk::PointSet<RealVectorType, Dimension> PointSetType;
- typedef otb::KeyPointSetsMatchingFilter<PointSetType> EuclideanDistanceMetricMatchingFilterType;
-
- // Instantiating object
- EuclideanDistanceMetricMatchingFilterType::Pointer filter = EuclideanDistanceMetricMatchingFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Descriptors/test/otbLandmarkNew.cxx b/Modules/Feature/Descriptors/test/otbLandmarkNew.cxx
deleted file mode 100644
index 6416dbe29efbf116bec7dc4505d722e4264a6479..0000000000000000000000000000000000000000
--- a/Modules/Feature/Descriptors/test/otbLandmarkNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbLandmark.h"
-
-#include "itkVariableLengthVector.h"
-#include "itkPoint.h"
-
-int otbLandmarkNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef itk::Point<double, 2> PointType;
- typedef itk::VariableLengthVector<double> PointDataType;
- typedef otb::Landmark<PointType, PointDataType, double> LandmarkType;
-
- // instantiation
- LandmarkType::Pointer landmark = LandmarkType::New();
-
- std::cout << landmark << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Edge/test/0000094-PolygonsVectorization.cxx b/Modules/Feature/Edge/test/0000094-PolygonsVectorization.cxx
index 98b784170ddedf7183639a97a7990bc8deb3da30..d40ce5cbded8190bd4f03c2e5504e69cf07bce7e 100644
--- a/Modules/Feature/Edge/test/0000094-PolygonsVectorization.cxx
+++ b/Modules/Feature/Edge/test/0000094-PolygonsVectorization.cxx
@@ -110,7 +110,7 @@ int main(int argc, char * argv[])
//-----------------------------------------------------------------
//read image
ReaderType::Pointer reader = ReaderType::New();
- reader->SetFileName(parseResult->GetInputImage().c_str());
+ reader->SetFileName(parseResult->GetInputImage());
reader->UpdateOutputInformation();
///////////////////////////////////////////////////////////////////
@@ -258,7 +258,7 @@ int main(int argc, char * argv[])
//-----------------------------------------------------------------
//write image
WriterType::Pointer writer = WriterType::New();
- writer->SetFileName(parseResult->GetOutputImage().c_str());
+ writer->SetFileName(parseResult->GetOutputImage());
writer->SetInput(rescaler->GetOutput());
try
diff --git a/Modules/Feature/Edge/test/CMakeLists.txt b/Modules/Feature/Edge/test/CMakeLists.txt
index f76cf2ad5ff2e0cd877bc751ed060d185b0693df..58725177180eb05ec902252798e76ca802450301 100644
--- a/Modules/Feature/Edge/test/CMakeLists.txt
+++ b/Modules/Feature/Edge/test/CMakeLists.txt
@@ -22,41 +22,28 @@ otb_module_test()
set(OTBEdgeTests
otbEdgeTestDriver.cxx
-otbPixelSuppressionByDirectionNew.cxx
otbEdgeDetectorImageFilter.cxx
otbHorizontalSobelVectorImageFilter.cxx
otbAsymmetricFusionOfLineDetector.cxx
otbLocalHoughDraw.cxx
otbAssociativeSymmetricalSum.cxx
-otbPersistentVectorizationFilterNew.cxx
-otbLineCorrelationDetectorNew.cxx
otbPersistentVectorizationFilter.cxx
otbEdgeDensityImageFilter.cxx
otbLineCorrelationDetector.cxx
otbSobelVectorImageFilter.cxx
-otbAssociativeSymmetricalSumNew.cxx
otbHoughTransform2DLinesImageTest.cxx
otbPixelSuppressionByDirection.cxx
-otbLocalHoughNew.cxx
-otbEdgeDetectorImageFilterNew.cxx
-otbEdgeDensityImageFilterNew.cxx
otbLocalHough.cxx
otbExtractSegments.cxx
-otbExtractSegmentsNew.cxx
-otbAsymmetricFusionOfLineDetectorNew.cxx
otbLineRatioDetector.cxx
otbTouziEdgeDetectorDirection.cxx
-otbTouziEdgeDetectorNew.cxx
otbVerticalSobelVectorImageFilter.cxx
otbStreamingLineSegmentDetector.cxx
-otbLineRatioDetectorNew.cxx
otbTouziEdgeDetector.cxx
otbLineRatioDetectorLinear.cxx
otbLineSegmentDetector.cxx
otbLineCorrelationDetectorLinear.cxx
-otbLineDetectorBaseNew.cxx
otbFillGapsFilter.cxx
-otbFillGapsFilterNew.cxx
)
add_executable(otbEdgeTestDriver ${OTBEdgeTests})
@@ -65,9 +52,6 @@ otb_module_target_label(otbEdgeTestDriver)
# Tests Declaration
-otb_add_test(NAME feTuPixelSuppressionByDirectionNew COMMAND otbEdgeTestDriver
- otbPixelSuppressionByDirectionNew)
-
otb_add_test(NAME bfTvEdgeDetectorImageFilter COMMAND otbEdgeTestDriver
--compare-image ${NOTOL}
${BASELINE}/bfTvEdgeDetectorImageFilter.tif
@@ -87,9 +71,6 @@ otb_add_test(NAME bfTvHorizontalSobelVectorImageFilter COMMAND otbEdgeTestDriver
-in ${INPUTDATA}/cupriteSubHsi.tif
-out ${TEMP}/bfTvHorizontalSobelVectorImageFilter.tif)
-otb_add_test(NAME bfTuHorizontalSobelVectorImageFilterNew COMMAND otbEdgeTestDriver
- otbHorizontalSobelVectorImageFilterNewTest)
-
otb_add_test(NAME feTvAsymmetricFusionOfLineDetector COMMAND otbEdgeTestDriver
--compare-image ${EPSILON_8} ${BASELINE}/feFiltreAsymmetricFusion_amst_2_3.hdr
${TEMP}/feFiltreAsymmetricFusion_amst_2_3.hdr
@@ -133,12 +114,6 @@ otb_add_test(NAME feTvAssociativeSymmetricalSum COMMAND otbEdgeTestDriver
-otb_add_test(NAME bfTuPersistentVectorizationImageFilterNew COMMAND otbEdgeTestDriver
- otbPersistentVectorizationFilterNew
- )
-
-otb_add_test(NAME feTuLineCorrelationNew COMMAND otbEdgeTestDriver
- otbLineCorrelationDetectorNew)
otb_add_test(NAME bfTvPersistentVectorizationImageFilter COMMAND otbEdgeTestDriver
--compare-ascii ${NOTOL}
@@ -168,9 +143,6 @@ otb_add_test(NAME feTvLineCorrelation COMMAND otbEdgeTestDriver
${TEMP}/feFiltreLineCorrelation_amst_2_3.hdr
2 3)
-otb_add_test(NAME bfTuSobelVectorImageFilterNew COMMAND otbEdgeTestDriver
- otbSobelVectorImageFilterNewTest)
-
otb_add_test(NAME bfTvSobelVectorImageFilter COMMAND otbEdgeTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfTvSobelVectorImageFilter.tif
@@ -179,9 +151,6 @@ otb_add_test(NAME bfTvSobelVectorImageFilter COMMAND otbEdgeTestDriver
-in ${INPUTDATA}/cupriteSubHsi.tif
-out ${TEMP}/bfTvSobelVectorImageFilter.tif)
-otb_add_test(NAME feTuAssociativeSymmetricalSumNew COMMAND otbEdgeTestDriver
- otbAssociativeSymmetricalSumNew)
-
otb_add_test(NAME feTvHoughTransform2DLinesImage COMMAND otbEdgeTestDriver
--compare-image ${EPSILON_8}
${BASELINE}/feFilterHoughTransformDraw.tif
@@ -199,16 +168,7 @@ otb_add_test(NAME feTvPixelSuppressionByDirection COMMAND otbEdgeTestDriver
${TEMP}/feFiltrePixelSuppr_ImageLine_2_0_3.hdr
2 0.3)
-otb_add_test(NAME feTuLocalHoughNew COMMAND otbEdgeTestDriver
- otbLocalHoughNew)
-
-otb_add_test(NAME bfTuEdgeDetectorImageFilterNew COMMAND otbEdgeTestDriver
- otbEdgeDetectorImageFilterNew
- )
-otb_add_test(NAME bfTuEdgeDensityImageFilterNew COMMAND otbEdgeTestDriver
- otbEdgeDensityImageFilterNew
- )
otb_add_test(NAME feTvLocalHough COMMAND otbEdgeTestDriver
--compare-ascii ${EPSILON_3} ${BASELINE_FILES}/feTvLocaLHoughLinesDetected.txt
@@ -227,12 +187,6 @@ otb_add_test(NAME feTvExtractSegments COMMAND otbEdgeTestDriver
${TEMP}/feFiltreExtractSegments_ImageLine.hdr
10 0.3 10 10 3 10 0.5)
-otb_add_test(NAME feTuExtractSegmentsNew COMMAND otbEdgeTestDriver
- otbExtractSegmentsNew)
-
-otb_add_test(NAME feTuAsymmetricFusionOfLineDetectorNew COMMAND otbEdgeTestDriver
- otbAsymmetricFusionOfLineDetectorNew)
-
otb_add_test(NAME feTvLineRatio COMMAND otbEdgeTestDriver
--compare-image ${EPSILON_8} ${BASELINE}/feFiltreLineRatio_amst_2_3.hdr
${TEMP}/feFiltreLineRatio_amst_2_3.hdr
@@ -249,9 +203,6 @@ otb_add_test(NAME feTvTouziDir COMMAND otbEdgeTestDriver
${TEMP}/feFiltreTouzi_amst_dir_3.hdr
3)
-otb_add_test(NAME feTuTouziNew COMMAND otbEdgeTestDriver
- otbTouziEdgeDetectorNew)
-
otb_add_test(NAME bfTvVerticalSobelVectorImageFilter COMMAND otbEdgeTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfTvVerticalSobelVectorImageFilter.tif
@@ -260,12 +211,6 @@ otb_add_test(NAME bfTvVerticalSobelVectorImageFilter COMMAND otbEdgeTestDriver
-in ${INPUTDATA}/cupriteSubHsi.tif
-out ${TEMP}/bfTvVerticalSobelVectorImageFilter.tif)
-otb_add_test(NAME bfTuVerticalSobelVectorImageFilterNew COMMAND otbEdgeTestDriver
- otbVerticalSobelVectorImageFilterNewTest)
-
-otb_add_test(NAME feTuStreamingLineSegmentDetectorNew COMMAND otbEdgeTestDriver
- otbStreamingLineSegmentDetectorNew)
-
otb_add_test(NAME feTvStreamingLineSegmentDetector10 COMMAND otbEdgeTestDriver
--compare-ogr ${EPSILON_8}
${BASELINE_FILES}/feTvStreamingLineSegmentDetectorOutput10.shp
@@ -286,9 +231,6 @@ otb_add_test(NAME feTvStreamingLineSegmentDetector1000 COMMAND otbEdgeTestDriver
1000
)
-otb_add_test(NAME feTuLineRatioNew COMMAND otbEdgeTestDriver
- otbLineRatioDetectorNew)
-
otb_add_test(NAME feTvTouzi COMMAND otbEdgeTestDriver
--compare-image ${EPSILON_8} ${BASELINE}/feFiltreTouzi_amst_3.hdr
${TEMP}/feFiltreTouzi_amst_3.hdr
@@ -321,9 +263,6 @@ otb_add_test(NAME feTvLineRatioLinear COMMAND otbEdgeTestDriver
${TEMP}/feFiltreLineRatioLinear_amst_dir_2_3.hdr
2 3)
-otb_add_test(NAME feTuLineSegmentDetectorNew COMMAND otbEdgeTestDriver
- otbLineSegmentDetectorNew)
-
otb_add_test(NAME feTvLineSegmentDetector COMMAND otbEdgeTestDriver
--compare-ogr ${EPSILON_8}
${BASELINE_FILES}/feTvLineSegmentDetectorOutput.shp
@@ -345,9 +284,6 @@ otb_add_test(NAME feTvLineCorrelationLinear COMMAND otbEdgeTestDriver
${TEMP}/feFiltreLineCorrelationLinear_amst_dir_2_3.hdr
2 3)
-otb_add_test(NAME feTuLineDetectorBaseNew COMMAND otbEdgeTestDriver
- otbLineDetectorBaseNew)
-
otb_add_test(NAME feTvFillGapsFilter COMMAND otbEdgeTestDriver
--compare-image ${EPSILON_8}
${BASELINE}/feTvFillGapfilter.png
@@ -355,5 +291,3 @@ otb_add_test(NAME feTvFillGapsFilter COMMAND otbEdgeTestDriver
otbFillGapsFilter
${INPUTDATA}/ImageLine.bsq.hdr
${TEMP}/feTvFillGapfilter.png)
-otb_add_test(NAME feTuFillGapsFilterNew COMMAND otbEdgeTestDriver
- otbFillGapsFilterNew)
diff --git a/Modules/Feature/Edge/test/otbAssociativeSymmetricalSumNew.cxx b/Modules/Feature/Edge/test/otbAssociativeSymmetricalSumNew.cxx
deleted file mode 100644
index 960188617116dca798819b1715ec9d8408078a6e..0000000000000000000000000000000000000000
--- a/Modules/Feature/Edge/test/otbAssociativeSymmetricalSumNew.cxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-#include "otbImage.h"
-#include <iostream>
-
-#include "otbAssociativeSymmetricalSumImageFilter.h"
-
-int otbAssociativeSymmetricalSumNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double InputPixelType;
- typedef double OutputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType1;
- typedef otb::Image<InputPixelType, Dimension> InputImageType2;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
-
- typedef otb::AssociativeSymmetricalSumImageFilter<InputImageType1, InputImageType2, OutputImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Edge/test/otbAsymmetricFusionOfLineDetectorNew.cxx b/Modules/Feature/Edge/test/otbAsymmetricFusionOfLineDetectorNew.cxx
deleted file mode 100644
index ce7592ee19a0b1336403e473dd980951fa750fbb..0000000000000000000000000000000000000000
--- a/Modules/Feature/Edge/test/otbAsymmetricFusionOfLineDetectorNew.cxx
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-
-#include <iostream>
-
-#include "otbImage.h"
-#include "otbImageFileReader.h"
-#include "otbImageFileWriter.h"
-
-#include "otbAsymmetricFusionOfLineDetectorImageFilter.h"
-
-int otbAsymmetricFusionOfLineDetectorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned char InputPixelType;
- typedef double OutputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageDirectionType;
-
- typedef itk::LinearInterpolateImageFunction<InputImageType, double> InterpolatorType;
-
- typedef otb::AsymmetricFusionOfLineDetectorImageFilter<InputImageType, OutputImageType, OutputImageDirectionType,
- InterpolatorType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Edge/test/otbEdgeDensityImageFilterNew.cxx b/Modules/Feature/Edge/test/otbEdgeDensityImageFilterNew.cxx
deleted file mode 100644
index 56537287e299e78d9f9ccc1f685d5e2badf8892a..0000000000000000000000000000000000000000
--- a/Modules/Feature/Edge/test/otbEdgeDensityImageFilterNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbImage.h"
-#include "otbEdgeDensityImageFilter.h"
-#include "otbBinaryImageDensityFunction.h"
-#include "itkCannyEdgeDetectionImageFilter.h"
-
-int otbEdgeDensityImageFilterNew(int, char*[])
-{
-
- const unsigned int Dimension = 2;
- typedef float PixelType;
-
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::BinaryImageDensityFunction<ImageType> CountFunctionType;
- typedef itk::CannyEdgeDetectionImageFilter<ImageType, ImageType> CannyDetectorType;
-
- typedef otb::EdgeDensityImageFilter<ImageType, ImageType, CannyDetectorType, CountFunctionType> EdgeDensityFilterType;
-
- /**Instantiation of an object*/
- EdgeDensityFilterType::Pointer filter = EdgeDensityFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Edge/test/otbEdgeDetectorImageFilterNew.cxx b/Modules/Feature/Edge/test/otbEdgeDetectorImageFilterNew.cxx
deleted file mode 100644
index f84686c13e4b64b33ddacca72002cb1de3b995eb..0000000000000000000000000000000000000000
--- a/Modules/Feature/Edge/test/otbEdgeDetectorImageFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbImage.h"
-#include "otbEdgeDetectorImageFilter.h"
-#include "itkSobelEdgeDetectionImageFilter.h"
-
-int otbEdgeDetectorImageFilterNew(int, char*[])
-{
- typedef double PixelType;
-
- typedef otb::Image<PixelType, 2> ImageType;
- typedef itk::SobelEdgeDetectionImageFilter<ImageType, ImageType> SobelType;
- typedef otb::EdgeDetectorImageFilter<ImageType, ImageType, SobelType> FilterType;
-
- /**Instantiation of an object*/
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Edge/test/otbEdgeTestDriver.cxx b/Modules/Feature/Edge/test/otbEdgeTestDriver.cxx
index aa99528b3d8138d0480d967b3288b9045ee74b3d..486c4f179c24d8e1357b6e7c3b80e6cdf192cb69 100644
--- a/Modules/Feature/Edge/test/otbEdgeTestDriver.cxx
+++ b/Modules/Feature/Edge/test/otbEdgeTestDriver.cxx
@@ -22,45 +22,27 @@
void RegisterTests()
{
- REGISTER_TEST(otbPixelSuppressionByDirectionNew);
REGISTER_TEST(otbEdgeDetectorImageFilter);
- REGISTER_TEST(otbHorizontalSobelVectorImageFilterNewTest);
REGISTER_TEST(otbHorizontalSobelVectorImageFilterTest);
REGISTER_TEST(otbAsymmetricFusionOfLineDetector);
REGISTER_TEST(otbLocalHoughDraw);
REGISTER_TEST(otbAssociativeSymmetricalSum);
- REGISTER_TEST(otbPersistentVectorizationFilterNew);
- REGISTER_TEST(otbLineCorrelationDetectorNew);
REGISTER_TEST(otbPersistentVectorizationFilter);
REGISTER_TEST(otbEdgeDensityImageFilter);
REGISTER_TEST(otbLineCorrelationDetector);
- REGISTER_TEST(otbSobelVectorImageFilterNewTest);
REGISTER_TEST(otbSobelVectorImageFilterTest);
- REGISTER_TEST(otbAssociativeSymmetricalSumNew);
REGISTER_TEST(otbHoughTransform2DLinesImageTest);
REGISTER_TEST(otbPixelSuppressionByDirection);
- REGISTER_TEST(otbLocalHoughNew);
- REGISTER_TEST(otbEdgeDetectorImageFilterNew);
- REGISTER_TEST(otbEdgeDensityImageFilterNew);
REGISTER_TEST(otbLocalHough);
REGISTER_TEST(otbExtractSegments);
- REGISTER_TEST(otbExtractSegmentsNew);
- REGISTER_TEST(otbAsymmetricFusionOfLineDetectorNew);
REGISTER_TEST(otbLineRatioDetector);
REGISTER_TEST(otbTouziEdgeDetectorDirection);
- REGISTER_TEST(otbTouziEdgeDetectorNew);
- REGISTER_TEST(otbVerticalSobelVectorImageFilterNewTest);
REGISTER_TEST(otbVerticalSobelVectorImageFilterTest);
- REGISTER_TEST(otbStreamingLineSegmentDetectorNew);
REGISTER_TEST(otbStreamingLineSegmentDetector);
- REGISTER_TEST(otbLineRatioDetectorNew);
REGISTER_TEST(otbTouziEdgeDetector);
REGISTER_TEST(otbLineRatioDetectorLinear);
- REGISTER_TEST(otbLineSegmentDetectorNew);
REGISTER_TEST(otbLineSegmentDetector);
REGISTER_TEST(otbLineSegmentDetector_8b_16b_compare);
REGISTER_TEST(otbLineCorrelationDetectorLinear);
- REGISTER_TEST(otbLineDetectorBaseNew);
REGISTER_TEST(otbFillGapsFilter);
- REGISTER_TEST(otbFillGapsFilterNew);
}
diff --git a/Modules/Feature/Edge/test/otbExtractSegmentsNew.cxx b/Modules/Feature/Edge/test/otbExtractSegmentsNew.cxx
deleted file mode 100644
index 484aec7fef6ad78e2a99573b1c1d3173fb57e611..0000000000000000000000000000000000000000
--- a/Modules/Feature/Edge/test/otbExtractSegmentsNew.cxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-#include <iostream>
-
-#include "otbImage.h"
-#include "otbImageFileReader.h"
-#include "otbImageFileWriter.h"
-#include "otbExtractSegmentsImageFilter.h"
-
-int otbExtractSegmentsNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double InputPixelType;
- typedef unsigned char OutputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
-
- typedef otb::ExtractSegmentsImageFilter<InputImageType, OutputImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Edge/test/otbFillGapsFilterNew.cxx b/Modules/Feature/Edge/test/otbFillGapsFilterNew.cxx
deleted file mode 100644
index 591c83e78ec4c7df5b40ec15fc3292694569c948..0000000000000000000000000000000000000000
--- a/Modules/Feature/Edge/test/otbFillGapsFilterNew.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-#include "otbFillGapsFilter.h"
-
-int otbFillGapsFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::FillGapsFilter FillGapsFilterType;
- FillGapsFilterType::Pointer filter = FillGapsFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Edge/test/otbHorizontalSobelVectorImageFilter.cxx b/Modules/Feature/Edge/test/otbHorizontalSobelVectorImageFilter.cxx
index 7c2b80fe958dda5940d8bb8700d6593dd56d38bc..5841609e62dfb79563b99cbbbd811283d7065216 100644
--- a/Modules/Feature/Edge/test/otbHorizontalSobelVectorImageFilter.cxx
+++ b/Modules/Feature/Edge/test/otbHorizontalSobelVectorImageFilter.cxx
@@ -28,18 +28,6 @@
#include "otbHorizontalSobelVectorImageFilter.h"
-int otbHorizontalSobelVectorImageFilterNewTest ( int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage< PixelType, Dimension > ImageType;
- typedef otb::HorizontalSobelVectorImageFilter< ImageType, ImageType >
- FilterType;
- FilterType::Pointer filter = FilterType::New();
- std::cout << filter << std::endl;
- return EXIT_SUCCESS;
-}
-
int otbHorizontalSobelVectorImageFilterTest ( int argc, char* argv[] )
{
typedef otb::CommandLineArgumentParser ParserType;
diff --git a/Modules/Feature/Edge/test/otbLineCorrelationDetectorNew.cxx b/Modules/Feature/Edge/test/otbLineCorrelationDetectorNew.cxx
deleted file mode 100644
index 4eba37acaea8517c7f0ce8b36ac72d9aa7e5d5a9..0000000000000000000000000000000000000000
--- a/Modules/Feature/Edge/test/otbLineCorrelationDetectorNew.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "itkMacro.h"
-#include "otbImage.h"
-#include <iostream>
-
-#include "otbLineCorrelationDetectorImageFilter.h"
-
-int otbLineCorrelationDetectorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned char InputPixelType;
- typedef double OutputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
-
- typedef otb::LineCorrelationDetectorImageFilter<InputImageType, OutputImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Edge/test/otbLineDetectorBaseNew.cxx b/Modules/Feature/Edge/test/otbLineDetectorBaseNew.cxx
deleted file mode 100644
index f4c6c478adf24ba0042b3722e3f71d6b52e1d129..0000000000000000000000000000000000000000
--- a/Modules/Feature/Edge/test/otbLineDetectorBaseNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "itkMacro.h"
-#include <iostream>
-
-#include "otbLineDetectorImageFilterBase.h"
-
-int otbLineDetectorBaseNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned char InputPixelType;
- typedef double OutputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
-
- typedef otb::LineDetectorImageFilterBase<InputImageType, OutputImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Edge/test/otbLineRatioDetectorNew.cxx b/Modules/Feature/Edge/test/otbLineRatioDetectorNew.cxx
deleted file mode 100644
index becd2160c091c3533fdc5a7858bf2cf854b4f2f3..0000000000000000000000000000000000000000
--- a/Modules/Feature/Edge/test/otbLineRatioDetectorNew.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-#include <iostream>
-
-#include "otbImage.h"
-#include "otbLineRatioDetectorImageFilter.h"
-
-int otbLineRatioDetectorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned char InputPixelType;
- typedef double OutputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
-
- typedef otb::LineRatioDetectorImageFilter<InputImageType, OutputImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Edge/test/otbLineSegmentDetector.cxx b/Modules/Feature/Edge/test/otbLineSegmentDetector.cxx
index 88e3787a850fb7cb4c0ce356932bcf382b6269f4..49ada8777e9a10d57c418332a636ed2fa29bbfa2 100644
--- a/Modules/Feature/Edge/test/otbLineSegmentDetector.cxx
+++ b/Modules/Feature/Edge/test/otbLineSegmentDetector.cxx
@@ -25,22 +25,6 @@
#include "otbVectorDataFileWriter.h"
#include "otbImageFileWriter.h"
-int otbLineSegmentDetectorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- typedef float InputPixelType;
- const unsigned int Dimension = 2;
-
- /** Typedefs */
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::LineSegmentDetector<InputImageType, InputPixelType> lsdFilterType;
-
- lsdFilterType::Pointer filter = lsdFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbLineSegmentDetector(int argc, char * argv[])
{
diff --git a/Modules/Feature/Edge/test/otbLocalHoughNew.cxx b/Modules/Feature/Edge/test/otbLocalHoughNew.cxx
deleted file mode 100644
index 1135144fed4383cdea490fbc6e71b1d245d29c9c..0000000000000000000000000000000000000000
--- a/Modules/Feature/Edge/test/otbLocalHoughNew.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-#include "otbImage.h"
-
-#include <iostream>
-
-#include "otbLocalHoughFilter.h"
-
-int otbLocalHoughNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned char InputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
-
- typedef otb::LocalHoughFilter<InputImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Edge/test/otbPersistentVectorizationFilterNew.cxx b/Modules/Feature/Edge/test/otbPersistentVectorizationFilterNew.cxx
deleted file mode 100644
index 52fff4cc1eba1c326d3bd08f456a90febf1c47ff..0000000000000000000000000000000000000000
--- a/Modules/Feature/Edge/test/otbPersistentVectorizationFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbImage.h"
-#include "otbPolygon.h"
-#include "otbPersistentVectorizationImageFilter.h"
-
-int otbPersistentVectorizationFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int ImageDimension = 2;
- typedef unsigned short LabelType;
-
- typedef otb::Image<LabelType, ImageDimension> ImageType;
- typedef otb::Polygon <LabelType> PolygonType;
- typedef otb::PersistentVectorizationImageFilter<ImageType, PolygonType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Edge/test/otbPixelSuppressionByDirectionNew.cxx b/Modules/Feature/Edge/test/otbPixelSuppressionByDirectionNew.cxx
deleted file mode 100644
index 9d4c22f27234b12b42fc64c55194a8b4ced5ee6e..0000000000000000000000000000000000000000
--- a/Modules/Feature/Edge/test/otbPixelSuppressionByDirectionNew.cxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-#include <iostream>
-
-#include "otbImage.h"
-#include "otbImageFileReader.h"
-#include "otbImageFileWriter.h"
-#include "otbPixelSuppressionByDirectionImageFilter.h"
-
-int otbPixelSuppressionByDirectionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double InputPixelType;
- typedef double OutputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
-
- typedef otb::PixelSuppressionByDirectionImageFilter<InputImageType, OutputImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Edge/test/otbSobelVectorImageFilter.cxx b/Modules/Feature/Edge/test/otbSobelVectorImageFilter.cxx
index e57361a652adeb0de9c5670183ef726b0934eda6..e9024e580d2c5f999562845eb81e8d5ead2ee2de 100644
--- a/Modules/Feature/Edge/test/otbSobelVectorImageFilter.cxx
+++ b/Modules/Feature/Edge/test/otbSobelVectorImageFilter.cxx
@@ -28,16 +28,6 @@
#include "otbSobelVectorImageFilter.h"
-int otbSobelVectorImageFilterNewTest ( int itkNotUsed(argc), char * itkNotUsed(argv) [] )
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage< PixelType, Dimension > ImageType;
- typedef otb::SobelVectorImageFilter< ImageType, ImageType > FilterType;
- FilterType::Pointer filter = FilterType::New();
- return EXIT_SUCCESS;
-}
-
int otbSobelVectorImageFilterTest ( int argc, char* argv[] )
{
typedef otb::CommandLineArgumentParser ParserType;
diff --git a/Modules/Feature/Edge/test/otbStreamingLineSegmentDetector.cxx b/Modules/Feature/Edge/test/otbStreamingLineSegmentDetector.cxx
index 32f86652691e93291ec6d3cf69049cbcb5a987a8..3c3609ff3bad039375cad0346316caab5945e408 100644
--- a/Modules/Feature/Edge/test/otbStreamingLineSegmentDetector.cxx
+++ b/Modules/Feature/Edge/test/otbStreamingLineSegmentDetector.cxx
@@ -25,21 +25,6 @@
#include "otbVectorDataFileWriter.h"
-int otbStreamingLineSegmentDetectorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef float InputPixelType;
- const unsigned int Dimension = 2;
-
- /** Typedefs */
- typedef otb::Image<InputPixelType, Dimension> ImageType;
- typedef otb::StreamingLineSegmentDetector<ImageType>::FilterType StreamingLSDFilterType;
-
- StreamingLSDFilterType::Pointer lsdFilter = StreamingLSDFilterType::New();
-
- std::cout << lsdFilter << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbStreamingLineSegmentDetector(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Feature/Edge/test/otbTouziEdgeDetectorNew.cxx b/Modules/Feature/Edge/test/otbTouziEdgeDetectorNew.cxx
deleted file mode 100644
index 9b9b79a85fd444060a36d99a29f5851cd5e94e79..0000000000000000000000000000000000000000
--- a/Modules/Feature/Edge/test/otbTouziEdgeDetectorNew.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-#include <iostream>
-
-#include "otbTouziEdgeDetectorImageFilter.h"
-
-int otbTouziEdgeDetectorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned char InputPixelType;
- typedef double OutputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
-
- typedef otb::TouziEdgeDetectorImageFilter<InputImageType, OutputImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Edge/test/otbVerticalSobelVectorImageFilter.cxx b/Modules/Feature/Edge/test/otbVerticalSobelVectorImageFilter.cxx
index cae07c8d799d08d9faaa8f83d35cdcce9d14d17f..48498b9671f80a6bad4784b399609994e90fa5f9 100644
--- a/Modules/Feature/Edge/test/otbVerticalSobelVectorImageFilter.cxx
+++ b/Modules/Feature/Edge/test/otbVerticalSobelVectorImageFilter.cxx
@@ -28,17 +28,6 @@
#include "otbVerticalSobelVectorImageFilter.h"
-int otbVerticalSobelVectorImageFilterNewTest ( int itkNotUsed(argc), char * itkNotUsed(argv) [] )
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage< PixelType, Dimension > ImageType;
- typedef otb::VerticalSobelVectorImageFilter< ImageType, ImageType >
- FilterType;
- FilterType::Pointer filter = FilterType::New();
- return EXIT_SUCCESS;
-}
-
int otbVerticalSobelVectorImageFilterTest ( int argc, char* argv[] )
{
typedef otb::CommandLineArgumentParser ParserType;
diff --git a/Modules/Feature/Moments/test/CMakeLists.txt b/Modules/Feature/Moments/test/CMakeLists.txt
index 7dc21ff8832a850eebf6d12eebbef8eb4fd89100..71b469f85b87baf55450d9f74c78b3a3871d6fb7 100644
--- a/Modules/Feature/Moments/test/CMakeLists.txt
+++ b/Modules/Feature/Moments/test/CMakeLists.txt
@@ -24,12 +24,9 @@ set(OTBMomentsTests
otbMomentsTestDriver.cxx
otbComplexMomentPathFloat.cxx
otbRadiometricMomentsImageFunction.cxx
-otbComplexMomentPathNew.cxx
otbHuMomentsImageFunction.cxx
otbRealMomentsImageFunction.cxx
otbComplexMomentsImageFunction.cxx
-otbHuPathNew.cxx
-otbFlusserPathNew.cxx
otbFlusserMomentsImageFunction.cxx
otbHuPath.cxx
otbFlusserPath.cxx
@@ -51,9 +48,6 @@ otb_add_test(NAME feTvComplexMomentPathFloat COMMAND otbMomentsTestDriver
1
${TEMP}/feComplexMomentPathFloat.txt)
-otb_add_test(NAME feTuRadiometricMomentsImageFunctionNew COMMAND otbMomentsTestDriver
- otbRadiometricMomentsImageFunctionNew
- )
otb_add_test(NAME feTvRadiometricMomentsImageFunction COMMAND otbMomentsTestDriver
--compare-ascii ${NOTOL} ${BASELINE_FILES}/feTvRadiometricMomentsImageFunction.txt
@@ -64,9 +58,6 @@ otb_add_test(NAME feTvRadiometricMomentsImageFunction COMMAND otbMomentsTestDriv
-otb_add_test(NAME feTuComplexMomentPathNew COMMAND otbMomentsTestDriver
- otbComplexMomentPathNew)
-
otb_add_test(NAME feTvHuMomentsImageFunction COMMAND otbMomentsTestDriver
--compare-ascii ${NOTOL} ${BASELINE_FILES}/feTvHuMomentsImageFunction.txt
${TEMP}/feTvHuMomentsImageFunction.txt
@@ -80,9 +71,6 @@ otb_add_test(NAME feTvHuMomentsImageFunctionScaleInvariant COMMAND otbMomentsTes
${INPUTDATA}/poupees.png
)
-otb_add_test(NAME feTuHuMomentsImageFunctionNew COMMAND otbMomentsTestDriver
- otbHuMomentsImageFunctionNew
- )
otb_add_test(NAME feTvHuMomentsImageFunctionRotationInvariant COMMAND otbMomentsTestDriver
otbHuMomentsImageFunctionRotationInvariant
@@ -90,9 +78,6 @@ otb_add_test(NAME feTvHuMomentsImageFunctionRotationInvariant COMMAND otbMoments
90
)
-otb_add_test(NAME feTuRealMomentsImageFunctionNew COMMAND otbMomentsTestDriver
- otbRealMomentsImageFunctionNew
- )
otb_add_test(NAME feTvRealMomentsImageFunction COMMAND otbMomentsTestDriver
--compare-ascii ${NOTOL} ${BASELINE_FILES}/feTvRealMomentsImageFunction.txt
@@ -115,9 +100,6 @@ otb_add_test(NAME feTvComplexMomentsImageFunction COMMAND otbMomentsTestDriver
${TEMP}/feTvComplexMomentsImageFunction.txt
)
-otb_add_test(NAME feTuComplexMomentsImageFunctionNew COMMAND otbMomentsTestDriver
- otbComplexMomentsImageFunctionNew
- )
otb_add_test(NAME feTvComplexMomentsImageFunctionScaleInvariant COMMAND otbMomentsTestDriver
otbComplexMomentsImageFunctionScaleInvariant
@@ -127,19 +109,10 @@ otb_add_test(NAME feTvComplexMomentsImageFunctionScaleInvariant COMMAND otbMomen
)
-otb_add_test(NAME feTuHuPathNew COMMAND otbMomentsTestDriver
- otbHuPathNew)
-otb_add_test(NAME feTuFlusserPathNew COMMAND otbMomentsTestDriver
- otbFlusserPathNew)
-
-otb_add_test(NAME feTuFlusserMomentsImageFunctionNew COMMAND otbMomentsTestDriver
- otbFlusserMomentsImageFunctionNew
- )
-
otb_add_test(NAME feTvFlusserMomentsImageFunctionScaleInvariant COMMAND otbMomentsTestDriver
otbFlusserMomentsImageFunctionScaleInvariant
${INPUTDATA}/poupees.png
@@ -183,9 +156,6 @@ otb_add_test(NAME feTvComplexMomentPath COMMAND otbMomentsTestDriver
${TEMP}/feComplexMomentPath.txt)
-otb_add_test(NAME feTuRadiometricMomentsImageFilterNew COMMAND otbMomentsTestDriver
- otbRadiometricMomentsImageFilterNew)
-
otb_add_test(NAME feTvRadiometricMomentsImageFilter COMMAND otbMomentsTestDriver
--compare-image ${EPSILON_8}
${BASELINE}/feTvRadiometricMomentsImageFilter.tif
diff --git a/Modules/Feature/Moments/test/otbComplexMomentPathNew.cxx b/Modules/Feature/Moments/test/otbComplexMomentPathNew.cxx
deleted file mode 100644
index df089431b065814ae4c077add691399b9fa70b1c..0000000000000000000000000000000000000000
--- a/Modules/Feature/Moments/test/otbComplexMomentPathNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-#include "otbComplexMomentPathFunction.h"
-#include "itkPolyLineParametricPath.h"
-
-int otbComplexMomentPathNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
-
- typedef itk::PolyLineParametricPath<Dimension> PathType;
- typedef otb::ComplexMomentPathFunction<PathType> CMType;
-
- CMType::Pointer function = CMType::New();
-
- std::cout << function << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Moments/test/otbComplexMomentsImageFunction.cxx b/Modules/Feature/Moments/test/otbComplexMomentsImageFunction.cxx
index 32659c339f838c0d2e8027c3002162380f989ddc..040943a9599dfe3f01cb99b0f052ee83e6ae46df 100644
--- a/Modules/Feature/Moments/test/otbComplexMomentsImageFunction.cxx
+++ b/Modules/Feature/Moments/test/otbComplexMomentsImageFunction.cxx
@@ -32,21 +32,6 @@
#include "otbStreamingResampleImageFilter.h"
-int otbComplexMomentsImageFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double InputPixelType;
-
- typedef otb::Image<InputPixelType, Dimension> ImageType;
- typedef otb::ComplexMomentsImageFunction<ImageType> FunctionType;
-
- // Instantiating object
- FunctionType::Pointer function = FunctionType::New();
-
- std::cout << function << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbComplexMomentsImageFunction(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Feature/Moments/test/otbFlusserMomentsImageFunction.cxx b/Modules/Feature/Moments/test/otbFlusserMomentsImageFunction.cxx
index 56648d16649bb9e22102d6e6ecd41634df7221f9..9ae98712c1f2578134c695c9f1acfca6779edd19 100644
--- a/Modules/Feature/Moments/test/otbFlusserMomentsImageFunction.cxx
+++ b/Modules/Feature/Moments/test/otbFlusserMomentsImageFunction.cxx
@@ -34,21 +34,6 @@
#include "itkAffineTransform.h"
-int otbFlusserMomentsImageFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned char InputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::FlusserMomentsImageFunction<InputImageType> FunctionType;
-
- // Instantiating object
- FunctionType::Pointer function = FunctionType::New();
-
- std::cout << function << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbFlusserMomentsImageFunction(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Feature/Moments/test/otbFlusserPathNew.cxx b/Modules/Feature/Moments/test/otbFlusserPathNew.cxx
deleted file mode 100644
index 7f360112fc314577f40c5b358e280d09366d95f0..0000000000000000000000000000000000000000
--- a/Modules/Feature/Moments/test/otbFlusserPathNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "otbFlusserPathFunction.h"
-#include "itkPolyLineParametricPath.h"
-#include "itkMacro.h"
-
-int otbFlusserPathNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef itk::PolyLineParametricPath<Dimension> PathType;
- typedef otb::FlusserPathFunction<PathType> FunctionType;
-
- FunctionType::Pointer function = FunctionType::New();
-
- std::cout << function << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Moments/test/otbHuMomentsImageFunction.cxx b/Modules/Feature/Moments/test/otbHuMomentsImageFunction.cxx
index f1a2f53d73a909daf6930958144a9313e4db2787..162d3e192a6ecdca7033c071d548bcf2114642a7 100644
--- a/Modules/Feature/Moments/test/otbHuMomentsImageFunction.cxx
+++ b/Modules/Feature/Moments/test/otbHuMomentsImageFunction.cxx
@@ -34,21 +34,6 @@
#include "itkAffineTransform.h"
-int otbHuMomentsImageFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned char InputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::HuMomentsImageFunction<InputImageType> FunctionType;
-
- // Instantiating object
- FunctionType::Pointer function = FunctionType::New();
-
- std::cout << function << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbHuMomentsImageFunction(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Feature/Moments/test/otbHuPathNew.cxx b/Modules/Feature/Moments/test/otbHuPathNew.cxx
deleted file mode 100644
index d746a0b8ffcacf0a2d61df0c2866b72baf598c7c..0000000000000000000000000000000000000000
--- a/Modules/Feature/Moments/test/otbHuPathNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-#include "otbHuPathFunction.h"
-#include "itkPolyLineParametricPath.h"
-
-int otbHuPathNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef itk::PolyLineParametricPath<Dimension> PathType;
- typedef otb::HuPathFunction<PathType> FunctionType;
-
- FunctionType::Pointer function = FunctionType::New();
-
- std::cout << function << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Moments/test/otbMomentsTestDriver.cxx b/Modules/Feature/Moments/test/otbMomentsTestDriver.cxx
index a57c40bb94439e8292761e3fb76ade8287973dbc..887d30d3058a7484712eb2d89313310dbb326ea4 100644
--- a/Modules/Feature/Moments/test/otbMomentsTestDriver.cxx
+++ b/Modules/Feature/Moments/test/otbMomentsTestDriver.cxx
@@ -23,27 +23,18 @@
void RegisterTests()
{
REGISTER_TEST(otbComplexMomentPathFloat);
- REGISTER_TEST(otbRadiometricMomentsImageFunctionNew);
REGISTER_TEST(otbRadiometricMomentsImageFunction);
- REGISTER_TEST(otbComplexMomentPathNew);
- REGISTER_TEST(otbHuMomentsImageFunctionNew);
REGISTER_TEST(otbHuMomentsImageFunction);
REGISTER_TEST(otbHuMomentsImageFunctionScaleInvariant);
REGISTER_TEST(otbHuMomentsImageFunctionRotationInvariant);
- REGISTER_TEST(otbRealMomentsImageFunctionNew);
REGISTER_TEST(otbRealMomentsImageFunction);
REGISTER_TEST(otbComplexMomentsImageFunction);
REGISTER_TEST(otbComplexMomentsImageFunctionScaleInvariant);
- REGISTER_TEST(otbHuPathNew);
- REGISTER_TEST(otbFlusserPathNew);
- REGISTER_TEST(otbFlusserMomentsImageFunctionNew);
REGISTER_TEST(otbFlusserMomentsImageFunction);
REGISTER_TEST(otbFlusserMomentsImageFunctionScaleInvariant);
REGISTER_TEST(otbFlusserMomentsImageFunctionRotationInvariant);
REGISTER_TEST(otbHuPath);
REGISTER_TEST(otbFlusserPath);
REGISTER_TEST(otbComplexMomentPath);
- REGISTER_TEST(otbRadiometricMomentsImageFilterNew);
REGISTER_TEST(otbRadiometricMomentsImageFilter);
- REGISTER_TEST(otbComplexMomentsImageFunctionNew);
}
diff --git a/Modules/Feature/Moments/test/otbRadiometricMomentsImageFilter.cxx b/Modules/Feature/Moments/test/otbRadiometricMomentsImageFilter.cxx
index deabbe90f79c5d489582ff6108db3f31a40e22db..7f6413f62ac4f458de9c3fa0d083a250015dcff6 100644
--- a/Modules/Feature/Moments/test/otbRadiometricMomentsImageFilter.cxx
+++ b/Modules/Feature/Moments/test/otbRadiometricMomentsImageFilter.cxx
@@ -25,23 +25,6 @@
#include "otbImageFileWriter.h"
#include "otbRadiometricMomentsImageFilter.h"
-int otbRadiometricMomentsImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef float InputPixelType;
- const unsigned int Dimension = 2;
-
- /** Typedefs */
- typedef otb::Image<InputPixelType, Dimension> ImageType;
- typedef otb::VectorImage<InputPixelType, Dimension> VectorImageType;
-
- typedef otb::RadiometricMomentsImageFilter<ImageType, VectorImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbRadiometricMomentsImageFilter(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Feature/Moments/test/otbRadiometricMomentsImageFunction.cxx b/Modules/Feature/Moments/test/otbRadiometricMomentsImageFunction.cxx
index 3004cd1b195d8d5ffaa9d95bb44afe46d4d23711..738ba44a435dbfadaebb401577701ae2e9aaba28 100644
--- a/Modules/Feature/Moments/test/otbRadiometricMomentsImageFunction.cxx
+++ b/Modules/Feature/Moments/test/otbRadiometricMomentsImageFunction.cxx
@@ -30,21 +30,6 @@
#include "otbImageFileReader.h"
#include "otbRadiometricMomentsImageFunction.h"
-int otbRadiometricMomentsImageFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned char InputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::RadiometricMomentsImageFunction<InputImageType> FunctionType;
-
- // Instantiating object
- FunctionType::Pointer function = FunctionType::New();
-
- std::cout << function << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbRadiometricMomentsImageFunction(int itkNotUsed(argc), char * argv[])
diff --git a/Modules/Feature/Moments/test/otbRealMomentsImageFunction.cxx b/Modules/Feature/Moments/test/otbRealMomentsImageFunction.cxx
index 50ded7f2e1bcd36a428809ee33bf5d53f3784111..9b560732c2145cd28f3d5cba3ba2fa5356cc606a 100644
--- a/Modules/Feature/Moments/test/otbRealMomentsImageFunction.cxx
+++ b/Modules/Feature/Moments/test/otbRealMomentsImageFunction.cxx
@@ -30,21 +30,6 @@
#include "otbImageFileReader.h"
#include "otbRealMomentsImageFunction.h"
-int otbRealMomentsImageFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned char InputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::RealMomentsImageFunction<InputImageType> FunctionType;
-
- // Instantiating object
- FunctionType::Pointer function = FunctionType::New();
-
- std::cout << function << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbRealMomentsImageFunction(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Feature/SeamCarving/test/CMakeLists.txt b/Modules/Feature/SeamCarving/test/CMakeLists.txt
index 193ec58c8e0feec6579a3bc52fc44cd92eb00ec3..b969b6cbbcf67c11fc37927f7fd451f164098ce1 100644
--- a/Modules/Feature/SeamCarving/test/CMakeLists.txt
+++ b/Modules/Feature/SeamCarving/test/CMakeLists.txt
@@ -22,9 +22,6 @@ otb_module_test()
set(OTBSeamCarvingTests
otbSeamCarvingTestDriver.cxx
-otbRemoveCarvingPathFilterNew.cxx
-otbImageToCarvingPathFilterNew.cxx
-otbAddCarvingPathFilterNew.cxx
)
add_executable(otbSeamCarvingTestDriver ${OTBSeamCarvingTests})
@@ -33,11 +30,3 @@ otb_module_target_label(otbSeamCarvingTestDriver)
# Tests Declaration
-otb_add_test(NAME feTuRemoveCarvingPathFilterNew COMMAND otbSeamCarvingTestDriver
- otbRemoveCarvingPathFilterNew)
-
-otb_add_test(NAME feTuImageToCarvingPathFilterNew COMMAND otbSeamCarvingTestDriver
- otbImageToCarvingPathFilterNew)
-
-otb_add_test(NAME feTuAddCarvingPathFilterNew COMMAND otbSeamCarvingTestDriver
- otbAddCarvingPathFilterNew)
diff --git a/Modules/Feature/SeamCarving/test/otbAddCarvingPathFilterNew.cxx b/Modules/Feature/SeamCarving/test/otbAddCarvingPathFilterNew.cxx
deleted file mode 100644
index 575cfcfbdf1a4f4ba196b398cfc3d2bd3cbf14ef..0000000000000000000000000000000000000000
--- a/Modules/Feature/SeamCarving/test/otbAddCarvingPathFilterNew.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "otbImage.h"
-#include "otbAddCarvingPathFilter.h"
-#include "itkPolyLineParametricPath.h"
-
-int otbAddCarvingPathFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double PixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<PixelType, Dimension> InputImageType;
- typedef otb::Image<PixelType, Dimension> OutputImageType;
- typedef itk::PolyLineParametricPath<Dimension> PathType;
-
- typedef otb::AddCarvingPathFilter<InputImageType, PathType,
- OutputImageType> AddCarvingPathFilterType;
-
- AddCarvingPathFilterType::Pointer filter = AddCarvingPathFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/SeamCarving/test/otbImageToCarvingPathFilterNew.cxx b/Modules/Feature/SeamCarving/test/otbImageToCarvingPathFilterNew.cxx
deleted file mode 100644
index 09586512abf42de0f737296b25054c4b8b7d2682..0000000000000000000000000000000000000000
--- a/Modules/Feature/SeamCarving/test/otbImageToCarvingPathFilterNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "otbImage.h"
-#include "otbImageToCarvingPathFilter.h"
-#include "itkPolyLineParametricPath.h"
-
-int otbImageToCarvingPathFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- typedef double PixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<PixelType, Dimension> InputImageType;
- typedef itk::PolyLineParametricPath<Dimension> PathType;
-
- typedef otb::ImageToCarvingPathFilter<InputImageType, PathType> ImageToCarvingPathFilterType;
-
- ImageToCarvingPathFilterType::Pointer filter = ImageToCarvingPathFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/SeamCarving/test/otbRemoveCarvingPathFilterNew.cxx b/Modules/Feature/SeamCarving/test/otbRemoveCarvingPathFilterNew.cxx
deleted file mode 100644
index 4c12a76612c0641ba720d5fe314c243a43953998..0000000000000000000000000000000000000000
--- a/Modules/Feature/SeamCarving/test/otbRemoveCarvingPathFilterNew.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "otbImage.h"
-#include "otbRemoveCarvingPathFilter.h"
-#include "itkPolyLineParametricPath.h"
-
-int otbRemoveCarvingPathFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double PixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<PixelType, Dimension> InputImageType;
- typedef otb::Image<PixelType, Dimension> OutputImageType;
- typedef itk::PolyLineParametricPath<Dimension> PathType;
-
- typedef otb::RemoveCarvingPathFilter<InputImageType, PathType,
- OutputImageType> RemoveCarvingPathFilterType;
-
- RemoveCarvingPathFilterType::Pointer filter = RemoveCarvingPathFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/SeamCarving/test/otbSeamCarvingTestDriver.cxx b/Modules/Feature/SeamCarving/test/otbSeamCarvingTestDriver.cxx
index 44248a99f8473d6511ac4456e118ee8d77bd867c..1a64b238d42825288d07acf0db16130069de341b 100644
--- a/Modules/Feature/SeamCarving/test/otbSeamCarvingTestDriver.cxx
+++ b/Modules/Feature/SeamCarving/test/otbSeamCarvingTestDriver.cxx
@@ -22,7 +22,4 @@
void RegisterTests()
{
- REGISTER_TEST(otbRemoveCarvingPathFilterNew);
- REGISTER_TEST(otbImageToCarvingPathFilterNew);
- REGISTER_TEST(otbAddCarvingPathFilterNew);
}
diff --git a/Modules/Feature/Textures/test/CMakeLists.txt b/Modules/Feature/Textures/test/CMakeLists.txt
index 5caed051f9e491b9a5150604781813ea24e0ad9f..83257b8e097eb2ceced191381ff63fbaa8455af5 100644
--- a/Modules/Feature/Textures/test/CMakeLists.txt
+++ b/Modules/Feature/Textures/test/CMakeLists.txt
@@ -26,12 +26,7 @@ otbScalarImageToHigherOrderTexturesFilter.cxx
otbHaralickTexturesImageFunction.cxx
otbGreyLevelCooccurrenceIndexedList.cxx
otbScalarImageToTexturesFilter.cxx
-otbScalarImageToTexturesFilterNew.cxx
otbSFSTexturesImageFilterTest.cxx
-otbSFSTexturesImageFilterNew.cxx
-otbScalarImageToPanTexTextureFilterNew.cxx
-otbScalarImageToAdvancedTexturesFilterNew.cxx
-otbGreyLevelCooccurrenceIndexedListNew.cxx
otbScalarImageToAdvancedTexturesFilter.cxx
otbScalarImageToPanTexTextureFilter.cxx
)
@@ -40,17 +35,11 @@ add_executable(otbTexturesTestDriver ${OTBTexturesTests})
target_link_libraries(otbTexturesTestDriver ${OTBTextures-Test_LIBRARIES})
otb_module_target_label(otbTexturesTestDriver)
-otb_add_test(NAME feTuScalarImageToHigherOrderTexturesFilterNew COMMAND otbTexturesTestDriver
- otbScalarImageToHigherOrderTexturesFilterNew
- )
otb_add_test(NAME feTvScalarImageToHigherOrderTexturesFilter COMMAND otbTexturesTestDriver
otbScalarImageToHigherOrderTexturesFilter
${INPUTDATA}/Mire_Cosinus.png)
-otb_add_test(NAME feTuHaralickTexturesImageFunctionNew COMMAND otbTexturesTestDriver
- otbHaralickTexturesImageFunctionNew
- )
otb_add_test(NAME feTvHaralickTexturesImageFunction COMMAND otbTexturesTestDriver
--compare-ascii ${EPSILON_8}
@@ -89,9 +78,6 @@ otb_add_test(NAME feTvScalarImageToTexturesFilter COMMAND otbTexturesTestDriver
${TEMP}/feTvScalarImageToTexturesFilterOutput
8 3 2 2)
-otb_add_test(NAME feTuScalarImageToTexturesFilterNew COMMAND otbTexturesTestDriver
- otbScalarImageToTexturesFilterNew
- )
otb_add_test(NAME feTvSFSTexturesImageFilterTest COMMAND otbTexturesTestDriver
--compare-n-images ${EPSILON_8}
@@ -120,20 +106,8 @@ otb_add_test(NAME feTvSFSTexturesImageFilterTest COMMAND otbTexturesTestDriver
0.6 # alpha value
)
-otb_add_test(NAME feTuSFSTexturesImageFilterNew COMMAND otbTexturesTestDriver
- otbSFSTexturesImageFilterNew)
-otb_add_test(NAME feTuScalarImageToPanTexTextureFilterNew COMMAND otbTexturesTestDriver
- otbScalarImageToPanTexTextureFilterNew
- )
-otb_add_test(NAME feTuScalarImageToAdvancedTexturesFilterNew COMMAND otbTexturesTestDriver
- otbScalarImageToAdvancedTexturesFilterNew
- )
-
-otb_add_test(NAME feTuGreyLevelCooccurrenceIndexedListNew COMMAND otbTexturesTestDriver
- otbGreyLevelCooccurrenceIndexedListNew
- )
otb_add_test(NAME feTvScalarImageToAdvancedTexturesFilter COMMAND otbTexturesTestDriver
--compare-n-images ${NOTOL} 10
diff --git a/Modules/Feature/Textures/test/otbGreyLevelCooccurrenceIndexedListNew.cxx b/Modules/Feature/Textures/test/otbGreyLevelCooccurrenceIndexedListNew.cxx
deleted file mode 100644
index f843850ac6a9d28e9821573235d3a8de15215a58..0000000000000000000000000000000000000000
--- a/Modules/Feature/Textures/test/otbGreyLevelCooccurrenceIndexedListNew.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "itkMacro.h"
-#include "otbGreyLevelCooccurrenceIndexedList.h"
-
-int otbGreyLevelCooccurrenceIndexedListNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef float PixelType;
- typedef otb::GreyLevelCooccurrenceIndexedList< PixelType > CooccurrenceIndexedListType;
- CooccurrenceIndexedListType::Pointer lightObj = CooccurrenceIndexedListType::New();
-
- std::cout << "Printing otb::GreyLevelCooccurrenceIndexedList: " << std::endl;
- lightObj->Print( std::cout );
-
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Textures/test/otbHaralickTexturesImageFunction.cxx b/Modules/Feature/Textures/test/otbHaralickTexturesImageFunction.cxx
index c7bccb00015e7bc00918edc0f503f91d85a52eeb..0cacbc884b1252f862c9aadc4f46b0184d6ca5cf 100644
--- a/Modules/Feature/Textures/test/otbHaralickTexturesImageFunction.cxx
+++ b/Modules/Feature/Textures/test/otbHaralickTexturesImageFunction.cxx
@@ -35,12 +35,6 @@ typedef otb::HaralickTexturesImageFunction<
typedef HaralickTexturesImageFunctionType::PointType PointType;
typedef HaralickTexturesImageFunctionType::OutputType OutputType;
-int otbHaralickTexturesImageFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- HaralickTexturesImageFunctionType::Pointer function = HaralickTexturesImageFunctionType::New();
-
- return EXIT_SUCCESS;
-}
int otbHaralickTexturesImageFunction(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Feature/Textures/test/otbSFSTexturesImageFilterNew.cxx b/Modules/Feature/Textures/test/otbSFSTexturesImageFilterNew.cxx
deleted file mode 100644
index b768e70cecdbfa99da83d13b216f720429b9562b..0000000000000000000000000000000000000000
--- a/Modules/Feature/Textures/test/otbSFSTexturesImageFilterNew.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbSFSTexturesImageFilter.h"
-#include "otbVectorImage.h"
-#include "otbImage.h"
-
-int otbSFSTexturesImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::SFSTexturesImageFilter<ImageType, ImageType> FilterType;
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Textures/test/otbScalarImageToAdvancedTexturesFilterNew.cxx b/Modules/Feature/Textures/test/otbScalarImageToAdvancedTexturesFilterNew.cxx
deleted file mode 100644
index e21dfc95cc1fc2edb97d91223c07fa9d2e9cf166..0000000000000000000000000000000000000000
--- a/Modules/Feature/Textures/test/otbScalarImageToAdvancedTexturesFilterNew.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbScalarImageToAdvancedTexturesFilter.h"
-#include "otbImage.h"
-
-int otbScalarImageToAdvancedTexturesFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::ScalarImageToAdvancedTexturesFilter<ImageType, ImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Textures/test/otbScalarImageToHigherOrderTexturesFilter.cxx b/Modules/Feature/Textures/test/otbScalarImageToHigherOrderTexturesFilter.cxx
index 8c6a7a2623efb894a46fad5c6fc98e6a00186ae3..1cd9ba022cfe695da8742ed2b02f7299ea96d612 100644
--- a/Modules/Feature/Textures/test/otbScalarImageToHigherOrderTexturesFilter.cxx
+++ b/Modules/Feature/Textures/test/otbScalarImageToHigherOrderTexturesFilter.cxx
@@ -38,14 +38,6 @@ typedef RunLengthFeaturesFilterType::OffsetType OffsetType;
typedef RunLengthFeaturesFilterType::OffsetVector OffsetVector;
typedef RunLengthFeaturesFilterType::OffsetVectorPointer OffsetVectorPointer;
-int otbScalarImageToHigherOrderTexturesFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- TexturesFilterType::Pointer filter = TexturesFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
ImageType::Pointer ReadInputImage(const char * filename)
{
diff --git a/Modules/Feature/Textures/test/otbScalarImageToPanTexTextureFilterNew.cxx b/Modules/Feature/Textures/test/otbScalarImageToPanTexTextureFilterNew.cxx
deleted file mode 100644
index cd1541b9a1a9be8e415bf5f19ac3b0d7689a6296..0000000000000000000000000000000000000000
--- a/Modules/Feature/Textures/test/otbScalarImageToPanTexTextureFilterNew.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbScalarImageToPanTexTextureFilter.h"
-#include "otbImage.h"
-
-int otbScalarImageToPanTexTextureFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::ScalarImageToPanTexTextureFilter<ImageType, ImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Textures/test/otbScalarImageToTexturesFilterNew.cxx b/Modules/Feature/Textures/test/otbScalarImageToTexturesFilterNew.cxx
deleted file mode 100644
index 98de400425eff0f428703c38d5af707a5515c9bd..0000000000000000000000000000000000000000
--- a/Modules/Feature/Textures/test/otbScalarImageToTexturesFilterNew.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbScalarImageToTexturesFilter.h"
-#include "otbImage.h"
-
-int otbScalarImageToTexturesFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::ScalarImageToTexturesFilter<ImageType, ImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Feature/Textures/test/otbTexturesTestDriver.cxx b/Modules/Feature/Textures/test/otbTexturesTestDriver.cxx
index c0368f9f87778999984d6947ab91165d8238a2e9..503e1bf8730bbd81f0cb5544cda58957f59af9fc 100644
--- a/Modules/Feature/Textures/test/otbTexturesTestDriver.cxx
+++ b/Modules/Feature/Textures/test/otbTexturesTestDriver.cxx
@@ -22,18 +22,11 @@
void RegisterTests()
{
- REGISTER_TEST(otbScalarImageToHigherOrderTexturesFilterNew);
REGISTER_TEST(otbScalarImageToHigherOrderTexturesFilter);
- REGISTER_TEST(otbHaralickTexturesImageFunctionNew);
REGISTER_TEST(otbHaralickTexturesImageFunction);
REGISTER_TEST(otbGreyLevelCooccurrenceIndexedList);
REGISTER_TEST(otbScalarImageToTexturesFilter);
- REGISTER_TEST(otbScalarImageToTexturesFilterNew);
REGISTER_TEST(otbSFSTexturesImageFilterTest);
- REGISTER_TEST(otbSFSTexturesImageFilterNew);
- REGISTER_TEST(otbScalarImageToPanTexTextureFilterNew);
- REGISTER_TEST(otbScalarImageToAdvancedTexturesFilterNew);
- REGISTER_TEST(otbGreyLevelCooccurrenceIndexedListNew);
REGISTER_TEST(otbScalarImageToAdvancedTexturesFilter);
REGISTER_TEST(otbScalarImageToPanTexTextureFilter);
}
diff --git a/Modules/Filtering/ChangeDetection/test/CMakeLists.txt b/Modules/Filtering/ChangeDetection/test/CMakeLists.txt
index 494b5d01d20f24b293631af4ec1c42d6d5d30c84..f978339e6ebaa8de247f45eb6131c642765671d4 100644
--- a/Modules/Filtering/ChangeDetection/test/CMakeLists.txt
+++ b/Modules/Filtering/ChangeDetection/test/CMakeLists.txt
@@ -29,11 +29,8 @@ otbCBAMIChangeDetectionTest.cxx
otbKullbackLeiblerSupervizedDistanceImageFilter.cxx
otbCorrelChangeDetectionTest.cxx
otbKullbackLeiblerProfileImageFilter.cxx
-otbKullbackLeiblerSupervizedDistanceImageFilterNew.cxx
-otbKullbackLeiblerProfileImageFilterNew.cxx
otbKullbackLeiblerDistanceImageFilter.cxx
otbMeanRatioChangeDetectionTest.cxx
-otbKullbackLeiblerDistanceImageFilterNew.cxx
otbLHMIChangeDetectionTest.cxx
)
@@ -65,9 +62,6 @@ otb_add_test(NAME cdTvMeanDiff COMMAND otbChangeDetectionTestDriver
${TEMP}/cdMeanDiffImage.hdr
)
-otb_add_test(NAME cdTuMultivariateAlterationDetectorImageFilterNew COMMAND otbChangeDetectionTestDriver
- otbMultivariateAlterationDetectorImageFilterNew)
-
otb_add_test(NAME cdTvMultivariateAlterationDetectorImageFilterSameNbBands COMMAND otbChangeDetectionTestDriver
--compare-image 0.025
${BASELINE}/cdTvMultivariateAlterationDetectorImageFilterOutputSameNbBands.tif
@@ -127,12 +121,6 @@ otb_add_test(NAME cdTvKullbackLeiblerProfileImageFilter COMMAND otbChangeDetecti
${TEMP}/cdTVKullbackLeiblerProfileImageFilterOutput.hdr
5 51)
-otb_add_test(NAME cdTuKullbackLeiblerSupervizedDistanceImageFilterNew COMMAND otbChangeDetectionTestDriver
- otbKullbackLeiblerSupervizedDistanceImageFilterNew)
-
-otb_add_test(NAME cdTuKullbackLeiblerProfileImageFilterNew COMMAND otbChangeDetectionTestDriver
- otbKullbackLeiblerProfileImageFilterNew)
-
otb_add_test(NAME cdTvKullbackLeiblerDistanceImageFilter COMMAND otbChangeDetectionTestDriver
--compare-image ${EPSILON_10}
${BASELINE}/cdTVKullbackLeiblerDistanceImageFilterOutput.hdr
@@ -153,9 +141,6 @@ otb_add_test(NAME cdTvMeanRatio COMMAND otbChangeDetectionTestDriver
${TEMP}/cdMeanRatioImage.png
)
-otb_add_test(NAME cdTuKullbackLeiblerDistanceImageFilterNew COMMAND otbChangeDetectionTestDriver
- otbKullbackLeiblerDistanceImageFilterNew)
-
otb_add_test(NAME cdTvLHMI COMMAND otbChangeDetectionTestDriver
otbLHMIChangeDetectionTest
${INPUTDATA}/GomaAvantSousEch.png
diff --git a/Modules/Filtering/ChangeDetection/test/otbChangeDetectionTestDriver.cxx b/Modules/Filtering/ChangeDetection/test/otbChangeDetectionTestDriver.cxx
index dbee60f73db055b11a7b4d489a8fe1d69cd6fb26..5e3792323e2cf5c90cad6fe43384e24eabf8c907 100644
--- a/Modules/Filtering/ChangeDetection/test/otbChangeDetectionTestDriver.cxx
+++ b/Modules/Filtering/ChangeDetection/test/otbChangeDetectionTestDriver.cxx
@@ -24,16 +24,12 @@ void RegisterTests()
{
REGISTER_TEST(otbJHMIChangeDetectionTest);
REGISTER_TEST(otbMeanDiffChangeDetectionTest);
- REGISTER_TEST(otbMultivariateAlterationDetectorImageFilterNew);
REGISTER_TEST(otbMultivariateAlterationDetectorImageFilter);
REGISTER_TEST(otbCBAMIChangeDetectionTest);
REGISTER_TEST(otbKullbackLeiblerSupervizedDistanceImageFilter);
REGISTER_TEST(otbCorrelChangeDetectionTest);
REGISTER_TEST(otbKullbackLeiblerProfileImageFilter);
- REGISTER_TEST(otbKullbackLeiblerSupervizedDistanceImageFilterNew);
- REGISTER_TEST(otbKullbackLeiblerProfileImageFilterNew);
REGISTER_TEST(otbKullbackLeiblerDistanceImageFilter);
REGISTER_TEST(otbMeanRatioChangeDetectionTest);
- REGISTER_TEST(otbKullbackLeiblerDistanceImageFilterNew);
REGISTER_TEST(otbLHMIChangeDetectionTest);
}
diff --git a/Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerDistanceImageFilterNew.cxx b/Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerDistanceImageFilterNew.cxx
deleted file mode 100644
index 9a1f9838a005d0e220361e78390d6dbfc3f4acb1..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerDistanceImageFilterNew.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbImage.h"
-#include "otbKullbackLeiblerDistanceImageFilter.h"
-
-int otbKullbackLeiblerDistanceImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
-
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::KullbackLeiblerDistanceImageFilter<ImageType, ImageType, ImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerProfileImageFilterNew.cxx b/Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerProfileImageFilterNew.cxx
deleted file mode 100644
index e601918d4432e74170c871e65c65438d703e84f3..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerProfileImageFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbImage.h"
-#include "otbVectorImage.h"
-#include "otbKullbackLeiblerProfileImageFilter.h"
-
-int otbKullbackLeiblerProfileImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
-
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::VectorImage<PixelType, Dimension> VectorImageType;
- typedef otb::KullbackLeiblerProfileImageFilter<ImageType, ImageType, VectorImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerSupervizedDistanceImageFilterNew.cxx b/Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerSupervizedDistanceImageFilterNew.cxx
deleted file mode 100644
index 8c7612e74df9bfd6e85d92a3ad0832d005c2d659..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerSupervizedDistanceImageFilterNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbImage.h"
-#include "otbKullbackLeiblerSupervizedDistanceImageFilter.h"
-
-int otbKullbackLeiblerSupervizedDistanceImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef unsigned char TrainingPixelType;
-
- typedef otb::Image<PixelType,
- Dimension> ImageType;
- typedef otb::Image<TrainingPixelType,
- Dimension> TrainingImageType;
- typedef otb::KullbackLeiblerSupervizedDistanceImageFilter<ImageType, ImageType, TrainingImageType,
- ImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ChangeDetection/test/otbMultivariateAlterationDetectorImageFilter.cxx b/Modules/Filtering/ChangeDetection/test/otbMultivariateAlterationDetectorImageFilter.cxx
index 7980a1a727a9e0aa8afc433bc559b161474bbc86..751a720970d5fdc79a8d69ed589c5688213cc54c 100644
--- a/Modules/Filtering/ChangeDetection/test/otbMultivariateAlterationDetectorImageFilter.cxx
+++ b/Modules/Filtering/ChangeDetection/test/otbMultivariateAlterationDetectorImageFilter.cxx
@@ -30,12 +30,6 @@ typedef otb::ImageFileWriter<OutputImageType> WriterType;
typedef otb::MultivariateAlterationDetectorImageFilter<ImageType, OutputImageType> MADFilterType;
-int otbMultivariateAlterationDetectorImageFilterNew(int itkNotUsed(argc), char* itkNotUsed(argv)[])
-{
- MADFilterType::Pointer madFilter = MADFilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbMultivariateAlterationDetectorImageFilter(int itkNotUsed(argc), char* argv[])
diff --git a/Modules/Filtering/ColorMap/test/CMakeLists.txt b/Modules/Filtering/ColorMap/test/CMakeLists.txt
index 1c8ec258c50cb0e12cba0d784096987f8377bced..dcee0249f6f15a27a923152de521f774e30075f3 100644
--- a/Modules/Filtering/ColorMap/test/CMakeLists.txt
+++ b/Modules/Filtering/ColorMap/test/CMakeLists.txt
@@ -23,7 +23,6 @@ otb_module_test()
set(OTBColorMapTests
otbColorMapTestDriver.cxx
otbScalarToRainbowRGBPixelFunctor.cxx
-otbScalarToRainbowRGBPixelFunctorNew.cxx
)
add_executable(otbColorMapTestDriver ${OTBColorMapTests})
@@ -42,7 +41,4 @@ otb_add_test(NAME bfTvScalarToRainbowRGBPixelFunctor COMMAND otbColorMapTestDriv
)
-otb_add_test(NAME bfTuScalarToRainbowRGBPixelFunctorNew COMMAND otbColorMapTestDriver
- otbScalarToRainbowRGBPixelFunctorNew)
-
diff --git a/Modules/Filtering/ColorMap/test/otbColorMapTestDriver.cxx b/Modules/Filtering/ColorMap/test/otbColorMapTestDriver.cxx
index 131337765ee79c32e09d42b8ee74597ed8f8a70a..5c242632d15b310867899f04bdd968e72ab218fe 100644
--- a/Modules/Filtering/ColorMap/test/otbColorMapTestDriver.cxx
+++ b/Modules/Filtering/ColorMap/test/otbColorMapTestDriver.cxx
@@ -23,5 +23,4 @@
void RegisterTests()
{
REGISTER_TEST(otbScalarToRainbowRGBPixelFunctor);
- REGISTER_TEST(otbScalarToRainbowRGBPixelFunctorNew);
}
diff --git a/Modules/Filtering/ColorMap/test/otbScalarToRainbowRGBPixelFunctorNew.cxx b/Modules/Filtering/ColorMap/test/otbScalarToRainbowRGBPixelFunctorNew.cxx
deleted file mode 100644
index 5046235a62e85f44ea3051588b96a13e7376a52c..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ColorMap/test/otbScalarToRainbowRGBPixelFunctorNew.cxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "otbImage.h"
-
-#include "itkUnaryFunctorImageFilter.h"
-#include "otbScalarToRainbowRGBPixelFunctor.h"
-
-int otbScalarToRainbowRGBPixelFunctorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- typedef unsigned char PixelType;
- typedef itk::RGBPixel<PixelType> RGBPixelType;
- typedef otb::Image<PixelType, 2> ImageType;
- typedef otb::Image<RGBPixelType, 2> RGBImageType;
-
- typedef otb::Functor::ScalarToRainbowRGBPixelFunctor<PixelType>
- ColorMapFunctorType;
- typedef itk::UnaryFunctorImageFilter<ImageType,
- RGBImageType, ColorMapFunctorType> ColorMapFilterType;
- ColorMapFilterType::Pointer colormapper = ColorMapFilterType::New();
- colormapper->GetFunctor().SetMaximumInputValue(150);
- colormapper->GetFunctor().SetMinimumInputValue(70);
-
- std::cout << colormapper << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Contrast/test/CMakeLists.txt b/Modules/Filtering/Contrast/test/CMakeLists.txt
index ee6950adaac2463eb8867f66454961453baa3d9b..a29a0c163fb21bed95f3fdbf67fb84de2678eb62 100644
--- a/Modules/Filtering/Contrast/test/CMakeLists.txt
+++ b/Modules/Filtering/Contrast/test/CMakeLists.txt
@@ -22,13 +22,9 @@ otb_module_test()
set(OTBContrastTests
otbContrastTestDriver.cxx
-otbComputeHistoFilterNew.cxx
otbComputeHistoFilter.cxx
-otbApplyGainFilterNew.cxx
otbApplyGainFilter.cxx
-otbComputeGainLutFilterNew.cxx
otbComputeGainLutFilter.cxx
-otbCLHistogramEqualizationFilterNew.cxx
otbCLHistogramEqualizationFilter.cxx
otbHelperCLAHE.cxx
)
@@ -37,18 +33,6 @@ add_executable(otbContrastTestDriver ${OTBContrastTests})
target_link_libraries(otbContrastTestDriver ${OTBContrast-Test_LIBRARIES})
otb_module_target_label(otbContrastTestDriver)
-otb_add_test(NAME bfTuCLHistogramEqualizationFilterNew COMMAND otbContrastTestDriver
- otbCLHistogramEqualizationFilterNew)
-
-otb_add_test(NAME bfTuApplyGainFilterNew COMMAND otbContrastTestDriver
- otbApplyGainFilterNew)
-
-otb_add_test(NAME bfTuComputeGainLutFilterNew COMMAND otbContrastTestDriver
- otbComputeGainLutFilterNew)
-
-otb_add_test(NAME bfTuComputeHistoFilterNew COMMAND otbContrastTestDriver
- otbComputeHistoFilterNew)
-
otb_add_test(NAME bfTvComputeHistoFilter COMMAND otbContrastTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfTvComputeHistoFilter.tif
diff --git a/Modules/Filtering/Contrast/test/otbApplyGainFilterNew.cxx b/Modules/Filtering/Contrast/test/otbApplyGainFilterNew.cxx
deleted file mode 100644
index 47f5101513aae0d798aee4f7cccc66e44fab1fe1..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Contrast/test/otbApplyGainFilterNew.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbImage.h"
-#include "otbVectorImage.h"
-#include "otbApplyGainFilter.h"
-
-int otbApplyGainFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double InputPixelType;
- typedef double OutputPixelType;
- typedef float LutPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image< InputPixelType , Dimension > InputImageType;
- typedef otb::Image< OutputPixelType , Dimension > OutputImageType;
- typedef otb::VectorImage< LutPixelType , Dimension > LutImageType;
- typedef otb::ApplyGainFilter
- < InputImageType , LutImageType , OutputImageType > FilterType;
-
-
- FilterType::Pointer appGain ( FilterType::New() );
-
- std::cout << appGain << std::endl;
-
- return EXIT_SUCCESS;
-}
\ No newline at end of file
diff --git a/Modules/Filtering/Contrast/test/otbCLHistogramEqualizationFilterNew.cxx b/Modules/Filtering/Contrast/test/otbCLHistogramEqualizationFilterNew.cxx
deleted file mode 100644
index 4978121896f0d9480ea16427d590a3a69f55233c..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Contrast/test/otbCLHistogramEqualizationFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbImage.h"
-#include "otbCLHistogramEqualizationFilter.h"
-
-int otbCLHistogramEqualizationFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double InputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image< InputPixelType , Dimension > InputImageType;
- typedef otb::CLHistogramEqualizationFilter< InputImageType , InputImageType >
- FilterType;
-
-
- FilterType::Pointer histoEqualize ( FilterType::New() );
-
- std::cout << histoEqualize << std::endl;
-
- return EXIT_SUCCESS;
-}
\ No newline at end of file
diff --git a/Modules/Filtering/Contrast/test/otbComputeGainLutFilterNew.cxx b/Modules/Filtering/Contrast/test/otbComputeGainLutFilterNew.cxx
deleted file mode 100644
index 642e805fb0e5f8e83b5651bf393b42d1fc7e534f..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Contrast/test/otbComputeGainLutFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbVectorImage.h"
-#include "otbComputeGainLutFilter.h"
-
-int otbComputeGainLutFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double InputPixelType;
- typedef double OutputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::VectorImage< InputPixelType , Dimension > HistoImageType;
- typedef otb::VectorImage< OutputPixelType , Dimension > LutImageType;
- typedef otb::ComputeGainLutFilter< HistoImageType , LutImageType > FilterType;
-
-
- FilterType::Pointer computeGainLut ( FilterType::New() );
-
- std::cout << computeGainLut << std::endl;
-
- return EXIT_SUCCESS;
-}
\ No newline at end of file
diff --git a/Modules/Filtering/Contrast/test/otbComputeHistoFilterNew.cxx b/Modules/Filtering/Contrast/test/otbComputeHistoFilterNew.cxx
deleted file mode 100644
index 4dd79d460e4b9747fa83dd22f1aadf1593ec0c7b..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Contrast/test/otbComputeHistoFilterNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbImage.h"
-#include "otbVectorImage.h"
-#include "otbComputeHistoFilter.h"
-
-int otbComputeHistoFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double InputPixelType;
- typedef double OutputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image< InputPixelType , Dimension > InputImageType;
- typedef otb::VectorImage< OutputPixelType , Dimension > HistoImageType;
- typedef otb::ComputeHistoFilter< InputImageType , HistoImageType > FilterType;
-
-
- FilterType::Pointer computeHisto ( FilterType::New() );
-
- std::cout << computeHisto << std::endl;
-
- return EXIT_SUCCESS;
-}
\ No newline at end of file
diff --git a/Modules/Filtering/Contrast/test/otbContrastTestDriver.cxx b/Modules/Filtering/Contrast/test/otbContrastTestDriver.cxx
index 213bb726f31b703ac603c771dff16564b63ff856..e3c4e18c5b7f6087f994b806ab438d2c2aac242b 100644
--- a/Modules/Filtering/Contrast/test/otbContrastTestDriver.cxx
+++ b/Modules/Filtering/Contrast/test/otbContrastTestDriver.cxx
@@ -22,13 +22,9 @@
void RegisterTests()
{
- REGISTER_TEST(otbComputeHistoFilterNew);
REGISTER_TEST(otbComputeHistoFilter);
- REGISTER_TEST(otbComputeGainLutFilterNew);
REGISTER_TEST(otbComputeGainLutFilter);
- REGISTER_TEST(otbApplyGainFilterNew);
REGISTER_TEST(otbApplyGainFilter);
- REGISTER_TEST(otbCLHistogramEqualizationFilterNew);
REGISTER_TEST(otbCLHistogramEqualizationFilter);
REGISTER_TEST(otbHelperCLAHE);
}
diff --git a/Modules/Filtering/Convolution/test/CMakeLists.txt b/Modules/Filtering/Convolution/test/CMakeLists.txt
index 7502e384a7b1a5dc804065d2d87573594b0ba019..9caa13ffaa98643c2a756845e1f7677ac204147b 100644
--- a/Modules/Filtering/Convolution/test/CMakeLists.txt
+++ b/Modules/Filtering/Convolution/test/CMakeLists.txt
@@ -23,12 +23,9 @@ otb_module_test()
set(OTBConvolutionTests
otbConvolutionTestDriver.cxx
otbConvolutionImageFilter.cxx
-otbConvolutionImageFilterNew.cxx
-otbOverlapSaveConvolutionImageFilterNew.cxx
otbOverlapSaveConvolutionImageFilter.cxx
otbCompareOverlapSaveAndClassicalConvolutionWithGaborFilter.cxx
otbGaborFilterGenerator.cxx
-otbGaborFilterGeneratorNew.cxx
)
add_executable(otbConvolutionTestDriver ${OTBConvolutionTests})
@@ -46,12 +43,6 @@ otb_add_test(NAME bfTvConvolutionImageFilter COMMAND otbConvolutionTestDriver
${TEMP}/bfTvConvolutionImageFilter.tif
)
-otb_add_test(NAME bfTuConvolutionImageFilterNew COMMAND otbConvolutionTestDriver
- otbConvolutionImageFilterNew)
-
-otb_add_test(NAME bfTuOverlapSaveConvolutionImageFilterNew COMMAND otbConvolutionTestDriver
- otbOverlapSaveConvolutionImageFilterNew)
-
if(ITK_USE_FFTWD)
otb_add_test(NAME bfTvOverlapSaveConvolutionImageFilter COMMAND otbConvolutionTestDriver
--compare-image ${EPSILON_7}
@@ -90,6 +81,3 @@ otb_add_test(NAME bfTvGaborFilterGenerator COMMAND otbConvolutionTestDriver
0.0125 0.0125 #u0 v0
0
)
-otb_add_test(NAME bfTuGaborFilterGeneratorNew COMMAND otbConvolutionTestDriver
- otbGaborFilterGeneratorNew
- )
diff --git a/Modules/Filtering/Convolution/test/otbConvolutionImageFilterNew.cxx b/Modules/Filtering/Convolution/test/otbConvolutionImageFilterNew.cxx
deleted file mode 100644
index 342b0d086e999cbd6738a0d4afebca6726c4c51d..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Convolution/test/otbConvolutionImageFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbImage.h"
-#include "otbConvolutionImageFilter.h"
-
-int otbConvolutionImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double InputPixelType;
- typedef double OutputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
- typedef otb::ConvolutionImageFilter<InputImageType, OutputImageType> FilterType;
-
- FilterType::Pointer conv = FilterType::New();
-
- std::cout << conv << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Convolution/test/otbConvolutionTestDriver.cxx b/Modules/Filtering/Convolution/test/otbConvolutionTestDriver.cxx
index 1ce3cfa6de430141ca57de34db4b792c601c6e28..b36f9cb86fd13ea3581e3b65e6cf54ea8ded1081 100644
--- a/Modules/Filtering/Convolution/test/otbConvolutionTestDriver.cxx
+++ b/Modules/Filtering/Convolution/test/otbConvolutionTestDriver.cxx
@@ -23,12 +23,9 @@
void RegisterTests()
{
REGISTER_TEST(otbConvolutionImageFilter);
- REGISTER_TEST(otbConvolutionImageFilterNew);
- REGISTER_TEST(otbOverlapSaveConvolutionImageFilterNew);
#if defined(ITK_USE_FFTWD)
REGISTER_TEST(otbOverlapSaveConvolutionImageFilter);
REGISTER_TEST(otbCompareOverlapSaveAndClassicalConvolutionWithGaborFilter);
#endif
REGISTER_TEST(otbGaborFilterGenerator);
- REGISTER_TEST(otbGaborFilterGeneratorNew);
}
diff --git a/Modules/Filtering/Convolution/test/otbGaborFilterGeneratorNew.cxx b/Modules/Filtering/Convolution/test/otbGaborFilterGeneratorNew.cxx
deleted file mode 100644
index be9d0e0c5c3ecb9f3afb64748607b94166e68a3d..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Convolution/test/otbGaborFilterGeneratorNew.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbGaborFilterGenerator.h"
-
-int otbGaborFilterGeneratorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double PrecisionType;
- typedef otb::GaborFilterGenerator<PrecisionType> GaborGeneratorType;
-
- // Instantiating object
- GaborGeneratorType::Pointer gabor = GaborGeneratorType::New();
-
- std::cout << gabor << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Convolution/test/otbOverlapSaveConvolutionImageFilterNew.cxx b/Modules/Filtering/Convolution/test/otbOverlapSaveConvolutionImageFilterNew.cxx
deleted file mode 100644
index 759b15d0a5635778ccd0dcc381f6db028b4436a2..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Convolution/test/otbOverlapSaveConvolutionImageFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbImage.h"
-#include "otbOverlapSaveConvolutionImageFilter.h"
-
-int otbOverlapSaveConvolutionImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double InputPixelType;
- typedef double OutputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
- typedef otb::OverlapSaveConvolutionImageFilter<InputImageType, OutputImageType> FilterType;
-
- FilterType::Pointer conv = FilterType::New();
-
- std::cout << conv << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/DEM/test/CMakeLists.txt b/Modules/Filtering/DEM/test/CMakeLists.txt
index 0bac71be08e28c65f99ed8238e8c8b00fbfcb699..78ce6fe5e1aa40339c43f6293eb03e9c5db2e19a 100644
--- a/Modules/Filtering/DEM/test/CMakeLists.txt
+++ b/Modules/Filtering/DEM/test/CMakeLists.txt
@@ -21,10 +21,8 @@
otb_module_test()
set(OTBDEMTests
otbDEMToImageGeneratorFromImageTest.cxx
- otbDEMToImageGeneratorNew.cxx
otbDEMToImageGeneratorTest.cxx
otbDEMCaracteristicsExtractor.cxx
- otbDEMCaracteristicsExtractorNew.cxx
otbDEMTestDriver.cxx )
add_executable(otbDEMTestDriver ${OTBDEMTests})
@@ -65,7 +63,6 @@ otb_add_test(NAME ioTvDEMToImageGeneratorFromImageTest2 COMMAND otbDEMTestDriver
${TEMP}/ioTvDEMToImageGeneratorFromImage_DEM_Extract2.tif
10 15 16 64
)
-otb_add_test(NAME ioTuDEMToImageGeneratorNew COMMAND otbDEMTestDriver otbDEMToImageGeneratorNew )
otb_add_test(NAME ioTvDEMToImageGeneratorTest2 COMMAND otbDEMTestDriver
--compare-image ${EPSILON_5} ${BASELINE}/ioTvDEMToImageGenerator2.tif
${TEMP}/ioTvDEMToImageGenerator2.tif
@@ -117,6 +114,3 @@ otb_add_test(NAME raTvDEMCaracteristicsExtractor COMMAND otbDEMTestDriver
${TEMP}/raTvDEMCaracteristicsExtractorIncidence.tif
${TEMP}/raTvDEMCaracteristicsExtractorExitance.tif
)
-otb_add_test(NAME raTuDEMCaracteristicsExtractorNew COMMAND otbDEMTestDriver
- otbDEMCaracteristicsExtractorNew
- )
diff --git a/Modules/Filtering/DEM/test/otbDEMCaracteristicsExtractorNew.cxx b/Modules/Filtering/DEM/test/otbDEMCaracteristicsExtractorNew.cxx
deleted file mode 100644
index 9cb87971c5c3c5e71e80f7f871a8591db360cca0..0000000000000000000000000000000000000000
--- a/Modules/Filtering/DEM/test/otbDEMCaracteristicsExtractorNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbDEMCaracteristicsExtractor.h"
-
-int otbDEMCaracteristicsExtractorNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> InputImageType;
- typedef otb::DEMCaracteristicsExtractor<InputImageType, InputImageType> DEMCaracteristicsExtractorType;
-
- DEMCaracteristicsExtractorType::Pointer filter = DEMCaracteristicsExtractorType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/DEM/test/otbDEMTestDriver.cxx b/Modules/Filtering/DEM/test/otbDEMTestDriver.cxx
index 9d270bb23f8f3c9f8916dbecc8ac287d233cae2d..86b52a38a43e62af89e180c27fc6613c23bb2ad2 100644
--- a/Modules/Filtering/DEM/test/otbDEMTestDriver.cxx
+++ b/Modules/Filtering/DEM/test/otbDEMTestDriver.cxx
@@ -23,8 +23,6 @@
void RegisterTests()
{
REGISTER_TEST(otbDEMToImageGeneratorFromImageTest);
- REGISTER_TEST(otbDEMToImageGeneratorNew);
REGISTER_TEST(otbDEMToImageGeneratorTest);
REGISTER_TEST(otbDEMCaracteristicsExtractor);
- REGISTER_TEST(otbDEMCaracteristicsExtractorNew);
}
diff --git a/Modules/Filtering/DEM/test/otbDEMToImageGeneratorNew.cxx b/Modules/Filtering/DEM/test/otbDEMToImageGeneratorNew.cxx
deleted file mode 100644
index 1daa10d99ece42059ba07eaa4e88cccdcb1b7c2f..0000000000000000000000000000000000000000
--- a/Modules/Filtering/DEM/test/otbDEMToImageGeneratorNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbDEMToImageGenerator.h"
-
-int otbDEMToImageGeneratorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef otb::Image<unsigned char, Dimension> ImageType;
- typedef otb::DEMToImageGenerator<ImageType> DEMToImageGeneratorType;
-
- // Instantiating object
- DEMToImageGeneratorType::Pointer object = DEMToImageGeneratorType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/DimensionalityReduction/test/CMakeLists.txt b/Modules/Filtering/DimensionalityReduction/test/CMakeLists.txt
index ad640d757d4c9ee1e90b9c53deed934cd8a4462f..f80d459c0440806fe74b84ee363d7820652d55a5 100644
--- a/Modules/Filtering/DimensionalityReduction/test/CMakeLists.txt
+++ b/Modules/Filtering/DimensionalityReduction/test/CMakeLists.txt
@@ -22,21 +22,15 @@ otb_module_test()
set(OTBDimensionalityReductionTests
otbDimensionalityReductionTestDriver.cxx
-otbNormalizeInnerProductPCAImageFilterNew.cxx
otbFastICAImageFilter.cxx
otbNormalizeInnerProductPCAImageFilter.cxx
otbMaximumAutocorrelationFactorImageFilter.cxx
otbMNFImageFilter.cxx
otbInnerProductPCAImageFilter.cxx
-otbEstimateInnerProductPCAImageFilterNew.cxx
otbEstimateInnerProductPCAImageFilter.cxx
otbPCAImageFilter.cxx
otbAngularProjectionSetImageFilter.cxx
-otbAngularProjectionSetImageFilterNew.cxx
otbNAPCAImageFilter.cxx
-otbInnerProductPCAImageFilterNew.cxx
-otbSparseWvltToAngleMapperListFilterNew.cxx
-otbAngularProjectionImageFilterNew.cxx
otbAngularProjectionImageFilter.cxx
otbAngularProjectionBinaryImageFilter.cxx
otbSparseWvltToAngleMapperListFilter.cxx
@@ -49,12 +43,6 @@ otb_module_target_label(otbDimensionalityReductionTestDriver)
# Tests Declaration
-otb_add_test(NAME bfTuNormalizeInnerProductPCAImageFilterNew COMMAND otbDimensionalityReductionTestDriver
- otbNormalizeInnerProductPCAImageFilterNew )
-
-otb_add_test(NAME bfTuFastICAImageFilterNew COMMAND otbDimensionalityReductionTestDriver
- otbFastICAImageFilterNewTest)
-
#otb_add_test(NAME bfTvFastICAImageFilter COMMAND otbDimensionalityReductionTestDriver
#--compare-n-images ${EPSILON_7} 2
#${BASELINE}/hyTvFastICAImageFilter.tif
@@ -66,9 +54,6 @@ otb_add_test(NAME bfTuFastICAImageFilterNew COMMAND otbDimensionalityReductionTe
#-inv ${TEMP}/hyTvFastICAImageFilterInv.tif
#-out ${TEMP}/hyTvFastICAImageFilter.tif)
-otb_add_test(NAME bfTuFastICAInternalOptimizerVectorImageFilterNew COMMAND otbDimensionalityReductionTestDriver
- otbFastICAInternalOptimizerVectorImageFilterNewTest)
-
otb_add_test(NAME bfTvNormalizeInnerProductPCAImageFilter COMMAND otbDimensionalityReductionTestDriver
--compare-image ${EPSILON_12}
${BASELINE}/bfNormalizeInnerProductPCAImageFilter.tif
@@ -87,9 +72,6 @@ otb_add_test(NAME bfTvMaximumAutocorrelationFactorImageFilter COMMAND otbDimensi
${TEMP}/bfTvMaximumAutocorrelationFactorImageFilterOutput.tif
)
-otb_add_test(NAME bfTuMaximumAutocorrelationFactorImageFilterNew COMMAND otbDimensionalityReductionTestDriver
- otbMaximumAutocorrelationFactorImageFilterNew
- )
otb_add_test(NAME bfTvMNFImageFilter3 COMMAND otbDimensionalityReductionTestDriver
--compare-n-images ${EPSILON_7} 2
@@ -230,9 +212,6 @@ otb_add_test(NAME bfTvInnerProductPCAImageFilter COMMAND otbDimensionalityReduct
${TEMP}/bfInnerProductPCAImageFilter_pc3.tif
)
-otb_add_test(NAME bfTuEstimateInnerProductPCAImageFilterNew COMMAND otbDimensionalityReductionTestDriver
- otbEstimateInnerProductPCAImageFilterNew )
-
otb_add_test(NAME bfTvEstimateInnerProductPCAImageFilterDisableCenterData COMMAND otbDimensionalityReductionTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfEstimateInnerProductPCAImageFilterDisableCenterData.tif
@@ -277,9 +256,6 @@ otb_add_test(NAME bfTvEstimateInnerProductPCAImageFilter COMMAND otbDimensionali
1 #center data
)
-otb_add_test(NAME bfTuPCAImageFilterNew COMMAND otbDimensionalityReductionTestDriver
- otbPCAImageFilterNewTest)
-
otb_add_test(NAME bfTvPCAImageFilter2 COMMAND otbDimensionalityReductionTestDriver
--compare-image ${EPSILON_7}
${INPUTDATA}/cupriteSubHsi.tif
@@ -348,12 +324,6 @@ otb_add_test(NAME bfTvPCAImageFilter3Norm COMMAND otbDimensionalityReductionTest
-inv ${TEMP}/bfTvPCAImageFilter3InvNorm.tif
-norm)
-otb_add_test(NAME bfTuAngularProjectionSetImageFilterNew COMMAND otbDimensionalityReductionTestDriver
- otbAngularProjectionSetImageFilterNew)
-
-otb_add_test(NAME bfTuNAPCAImageFilterNew COMMAND otbDimensionalityReductionTestDriver
- otbNAPCAImageFilterNewTest)
-
otb_add_test(NAME bfTvNAPCAImageFilter1 COMMAND otbDimensionalityReductionTestDriver
--compare-image ${EPSILON_7}
${INPUTDATA}/cupriteSubHsi.tif
@@ -398,17 +368,6 @@ otb_add_test(NAME bfTvNAPCAImageFilter4 COMMAND otbDimensionalityReductionTestDr
-norm
-n 4)
-otb_add_test(NAME bfTuInnerProductPCAImageFilterNew COMMAND otbDimensionalityReductionTestDriver
- otbInnerProductPCAImageFilterNew )
-
-otb_add_test(NAME bfTuSparseWvltToAngleMapperListFilterNew COMMAND otbDimensionalityReductionTestDriver
- otbSparseWvltToAngleMapperListFilterNew)
-
-otb_add_test(NAME bfTuAngularProjectionImageFilterNew COMMAND otbDimensionalityReductionTestDriver
- otbAngularProjectionImageFilterNew)
-
-otb_add_test(NAME bfTuLocalActivityVectorImageFilterNew COMMAND otbDimensionalityReductionTestDriver
- otbLocalActivityVectorImageFilterNewTest)
otb_add_test(NAME bfTvLocalActivityVectorImageFilter COMMAND otbDimensionalityReductionTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfTvLocalActivityVectorImageFilter.tif
diff --git a/Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionBinaryImageFilter.cxx b/Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionBinaryImageFilter.cxx
index 7606d09aa482b71877a6e1c9b5d6ea4b238d6bfa..e4334507acb95c434e03b5b0256991e6fb208578 100644
--- a/Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionBinaryImageFilter.cxx
+++ b/Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionBinaryImageFilter.cxx
@@ -29,19 +29,6 @@
#include "otbAngularProjectionBinaryImageFilter.h"
-int otbAngularProjectionBinaryImageFilterNewTest ( int itkNotUsed(argc), char * itkNotUsed(argv)[] )
-{
- const unsigned int Dimension = 2;
- typedef float PixelType;
- typedef otb::Image< PixelType, Dimension > ImageType;
- typedef double PrecisionType;
-
- typedef otb::AngularProjectionBinaryImageFilter< ImageType, ImageType, PrecisionType >
- FilterType;
- FilterType::Pointer filter = FilterType::New();
- return EXIT_SUCCESS;
-}
-
int otbAngularProjectionBinaryImageFilterTest ( int argc, char * argv[] )
{
typedef otb::CommandLineArgumentParser ParserType;
@@ -116,7 +103,7 @@ int otbAngularProjectionBinaryImageFilterTest ( int argc, char * argv[] )
title << outputImageName << "_" << i << ".hdr";
writers[i] = WriterType::New();
- writers[i]->SetFileName( title.str().c_str() );
+ writers[i]->SetFileName( title.str() );
writers[i]->SetInput( filter->GetOutput(i) );
writers[i]->Update();
}
diff --git a/Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionImageFilterNew.cxx b/Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionImageFilterNew.cxx
deleted file mode 100644
index cc02fad1c3065c88349f572e16dbb25a133b211d..0000000000000000000000000000000000000000
--- a/Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionImageFilterNew.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "itkFixedArray.h"
-
-#include "otbMath.h"
-#include "otbImage.h"
-#include "otbImageFileReader.h"
-#include "otbImageFileWriter.h"
-#include "otbCommandLineArgumentParser.h"
-
-#include "otbAngularProjectionImageFilter.h"
-
-int otbAngularProjectionImageFilterNew ( int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
-
- typedef float PixelType;
- typedef double PrecisionType;
- typedef itk::FixedArray< PrecisionType, 1 > AngleType;
- typedef otb::Image< PixelType, Dimension > ImageType;
-
- typedef otb::AngularProjectionImageFilter<
- ImageType, ImageType, AngleType, PrecisionType > FilterType;
-
- FilterType::Pointer filter = FilterType::New();
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionSetImageFilter.cxx b/Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionSetImageFilter.cxx
index d9851af975aa97c82bec37a010cfe07b70f51243..642a694620b29b904f9be1f1f71d37ea8a119b5d 100644
--- a/Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionSetImageFilter.cxx
+++ b/Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionSetImageFilter.cxx
@@ -81,7 +81,7 @@ int otbAngularProjectionSetImageFilterTest ( int argc, char * argv[] )
for ( unsigned int i = 0; i < nbInputImages; i++ )
{
reader->SetNthElement(i, ReaderType::New());
- reader->GetNthElement(i)->SetFileName( inputImageName[i].c_str() );
+ reader->GetNthElement(i)->SetFileName( inputImageName[i] );
reader->GetNthElement(i)->Update();
}
@@ -118,7 +118,7 @@ int otbAngularProjectionSetImageFilterTest ( int argc, char * argv[] )
writers->SetNthElement(i, WriterType::New());
WriterType::Pointer writer = writers->GetNthElement(i);
- writer->SetFileName( title.str().c_str() );
+ writer->SetFileName( title.str() );
writer->SetInput( filter->GetOutput()->GetNthElement(i) );
writer->Update();
}
diff --git a/Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionSetImageFilterNew.cxx b/Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionSetImageFilterNew.cxx
deleted file mode 100644
index ae7e87c85eee1c40908225a5690436e9b4cb4b30..0000000000000000000000000000000000000000
--- a/Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionSetImageFilterNew.cxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "itkListSample.h"
-
-#include "otbMath.h"
-#include "otbImage.h"
-#include "otbImageFileReader.h"
-#include "otbImageFileWriter.h"
-#include "otbCommandLineArgumentParser.h"
-
-#include "otbAngularProjectionSetImageFilter.h"
-
-int otbAngularProjectionSetImageFilterNew ( int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- const unsigned int SpaceDimension = 3;
-
- typedef float PixelType;
- typedef double PrecisionType;
- typedef itk::FixedArray< PrecisionType, SpaceDimension > AngleType;
- typedef itk::Statistics::ListSample< AngleType > AngleListType;
- typedef otb::Image< PixelType, Dimension > ImageType;
-
- typedef otb::AngularProjectionSetImageFilter<
- ImageType, ImageType, AngleListType, PrecisionType > FilterType;
-
- FilterType::Pointer filter = FilterType::New();
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/DimensionalityReduction/test/otbDimensionalityReductionTestDriver.cxx b/Modules/Filtering/DimensionalityReduction/test/otbDimensionalityReductionTestDriver.cxx
index 8fbe088285270c7913b2e8ab84f3367e6a1a3ca0..e2b9339837f9814619c890e6604cf352af5b2551 100644
--- a/Modules/Filtering/DimensionalityReduction/test/otbDimensionalityReductionTestDriver.cxx
+++ b/Modules/Filtering/DimensionalityReduction/test/otbDimensionalityReductionTestDriver.cxx
@@ -22,31 +22,17 @@
void RegisterTests()
{
- REGISTER_TEST(otbNormalizeInnerProductPCAImageFilterNew);
- REGISTER_TEST(otbFastICAInternalOptimizerVectorImageFilterNewTest);
- REGISTER_TEST(otbFastICAImageFilterNewTest);
REGISTER_TEST(otbFastICAImageFilterTest);
REGISTER_TEST(otbNormalizeInnerProductPCAImageFilter);
- REGISTER_TEST(otbMaximumAutocorrelationFactorImageFilterNew);
REGISTER_TEST(otbMaximumAutocorrelationFactorImageFilter);
- REGISTER_TEST(otbMNFImageFilterNewTest);
REGISTER_TEST(otbMNFImageFilterTest);
REGISTER_TEST(otbInnerProductPCAImageFilter);
- REGISTER_TEST(otbEstimateInnerProductPCAImageFilterNew);
REGISTER_TEST(otbEstimateInnerProductPCAImageFilter);
- REGISTER_TEST(otbPCAImageFilterNewTest);
REGISTER_TEST(otbPCAImageFilterTest);
REGISTER_TEST(otbAngularProjectionSetImageFilterTest);
- REGISTER_TEST(otbAngularProjectionSetImageFilterNew);
- REGISTER_TEST(otbNAPCAImageFilterNewTest);
REGISTER_TEST(otbNAPCAImageFilterTest);
- REGISTER_TEST(otbInnerProductPCAImageFilterNew);
- REGISTER_TEST(otbSparseWvltToAngleMapperListFilterNew);
- REGISTER_TEST(otbAngularProjectionImageFilterNew);
REGISTER_TEST(otbAngularProjectionImageFilterTest);
- REGISTER_TEST(otbSparseWvltToAngleMapperListFilterNewTest);
- REGISTER_TEST(otbLocalActivityVectorImageFilterNewTest);
REGISTER_TEST(otbLocalActivityVectorImageFilterTest);
- REGISTER_TEST(otbAngularProjectionBinaryImageFilterNewTest);
REGISTER_TEST(otbAngularProjectionBinaryImageFilterTest);
+ REGISTER_TEST(otbSparseWvltToAngleMapperListFilterTest);
}
diff --git a/Modules/Filtering/DimensionalityReduction/test/otbEstimateInnerProductPCAImageFilterNew.cxx b/Modules/Filtering/DimensionalityReduction/test/otbEstimateInnerProductPCAImageFilterNew.cxx
deleted file mode 100644
index 4c8f66e95c56c1a52b6fd8dc77370b13941cd175..0000000000000000000000000000000000000000
--- a/Modules/Filtering/DimensionalityReduction/test/otbEstimateInnerProductPCAImageFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbEstimateInnerProductPCAImageFilter.h"
-#include "otbVectorImage.h"
-
-int otbEstimateInnerProductPCAImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double PixelType;
- const unsigned int Dimension = 2;
-
- // Typedef
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef otb::EstimateInnerProductPCAImageFilter<ImageType, ImageType> FilterType;
-
- // Instantiation object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/DimensionalityReduction/test/otbFastICAImageFilter.cxx b/Modules/Filtering/DimensionalityReduction/test/otbFastICAImageFilter.cxx
index d88e274fd41f9c77979124ae2826ebd691d4004e..9344ec122260aceb4bc6683469ada48a98c2c3db 100644
--- a/Modules/Filtering/DimensionalityReduction/test/otbFastICAImageFilter.cxx
+++ b/Modules/Filtering/DimensionalityReduction/test/otbFastICAImageFilter.cxx
@@ -27,25 +27,6 @@
#include "otbFastICAImageFilter.h"
-int otbFastICAInternalOptimizerVectorImageFilterNewTest ( int itkNotUsed(argc), char* itkNotUsed(argv) [] )
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage< PixelType, Dimension > ImageType;
- typedef otb::FastICAInternalOptimizerVectorImageFilter< ImageType, ImageType > FilterType;
- FilterType::Pointer filter = FilterType::New();
- return EXIT_SUCCESS;
-}
-
-int otbFastICAImageFilterNewTest ( int itkNotUsed(argc), char* itkNotUsed(argv) [] )
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage< PixelType, Dimension > ImageType;
- typedef otb::FastICAImageFilter< ImageType, ImageType, otb::Transform::FORWARD > FilterType;
- FilterType::Pointer filter = FilterType::New();
- return EXIT_SUCCESS;
-}
int otbFastICAImageFilterTest ( int argc, char* argv[] )
{
diff --git a/Modules/Filtering/DimensionalityReduction/test/otbInnerProductPCAImageFilterNew.cxx b/Modules/Filtering/DimensionalityReduction/test/otbInnerProductPCAImageFilterNew.cxx
deleted file mode 100644
index e80f7dd2efaacdecbb3cc105a8d0aaadaefa4721..0000000000000000000000000000000000000000
--- a/Modules/Filtering/DimensionalityReduction/test/otbInnerProductPCAImageFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbInnerProductPCAImageFilter.h"
-#include "otbVectorImage.h"
-
-int otbInnerProductPCAImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double PixelType;
- const unsigned int Dimension = 2;
-
- // Typedef
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef otb::InnerProductPCAImageFilter<ImageType, ImageType> FilterType;
-
- // Instantiation object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/DimensionalityReduction/test/otbLocalActivityVectorImageFilter.cxx b/Modules/Filtering/DimensionalityReduction/test/otbLocalActivityVectorImageFilter.cxx
index 2f363ac7e700e9a67b810842e5cd518a4348d933..181625e18e6acca8531298bc51bf19a384bb170b 100644
--- a/Modules/Filtering/DimensionalityReduction/test/otbLocalActivityVectorImageFilter.cxx
+++ b/Modules/Filtering/DimensionalityReduction/test/otbLocalActivityVectorImageFilter.cxx
@@ -28,15 +28,6 @@
#include "otbLocalActivityVectorImageFilter.h"
-int otbLocalActivityVectorImageFilterNewTest ( int itkNotUsed(argc), char* itkNotUsed(argv) [] )
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage< PixelType, Dimension > ImageType;
- typedef otb::LocalActivityVectorImageFilter< ImageType, ImageType > FilterType;
- FilterType::Pointer filter = FilterType::New();
- return EXIT_SUCCESS;
-}
int otbLocalActivityVectorImageFilterTest ( int argc, char* argv[] )
{
diff --git a/Modules/Filtering/DimensionalityReduction/test/otbMNFImageFilter.cxx b/Modules/Filtering/DimensionalityReduction/test/otbMNFImageFilter.cxx
index f9f6393cfdcb30fb63c11bcfe942de0589f651a8..5b88d51e632ff067a9887eb2a361a8ad1625ed77 100644
--- a/Modules/Filtering/DimensionalityReduction/test/otbMNFImageFilter.cxx
+++ b/Modules/Filtering/DimensionalityReduction/test/otbMNFImageFilter.cxx
@@ -29,25 +29,6 @@
#include "otbLocalActivityVectorImageFilter.h"
-int otbMNFImageFilterNewTest ( int itkNotUsed(argc), char* itkNotUsed(argv) [] )
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage< PixelType, Dimension > ImageType;
-
- typedef otb::LocalActivityVectorImageFilter< ImageType, ImageType > NoiseFilterType;
-
- typedef otb::MNFImageFilter< ImageType, ImageType,
- NoiseFilterType, otb::Transform::FORWARD > FilterType;
- FilterType::Pointer filter = FilterType::New();
-
- typedef otb::MNFImageFilter< ImageType, ImageType,
- NoiseFilterType, otb::Transform::INVERSE > InvFilterType;
- InvFilterType::Pointer invFilter = InvFilterType::New();
-
- return EXIT_SUCCESS;
-}
-
int otbMNFImageFilterTest ( int argc, char* argv[] )
{
typedef otb::CommandLineArgumentParser ParserType;
diff --git a/Modules/Filtering/DimensionalityReduction/test/otbMaximumAutocorrelationFactorImageFilter.cxx b/Modules/Filtering/DimensionalityReduction/test/otbMaximumAutocorrelationFactorImageFilter.cxx
index 04e230cb84dd0313ea2a74bb9bc96ceafd91fded..a4d99a12b19a344da1e0ef28631acd3ee9b16502 100644
--- a/Modules/Filtering/DimensionalityReduction/test/otbMaximumAutocorrelationFactorImageFilter.cxx
+++ b/Modules/Filtering/DimensionalityReduction/test/otbMaximumAutocorrelationFactorImageFilter.cxx
@@ -29,12 +29,6 @@ typedef otb::ImageFileReader<ImageType> ReaderType;
typedef otb::ImageFileWriter<OutputImageType> WriterType;
typedef otb::MaximumAutocorrelationFactorImageFilter<ImageType, OutputImageType> MADFilterType;
-int otbMaximumAutocorrelationFactorImageFilterNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
- MADFilterType::Pointer madFilter = MADFilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbMaximumAutocorrelationFactorImageFilter(int itkNotUsed(argc), char* argv[])
diff --git a/Modules/Filtering/DimensionalityReduction/test/otbNAPCAImageFilter.cxx b/Modules/Filtering/DimensionalityReduction/test/otbNAPCAImageFilter.cxx
index 28c966436c5527ebc2c97d82b58316ce4ec1d372..6dbbb6e0ea89cb491a2c773100acba3b9eaea6d0 100644
--- a/Modules/Filtering/DimensionalityReduction/test/otbNAPCAImageFilter.cxx
+++ b/Modules/Filtering/DimensionalityReduction/test/otbNAPCAImageFilter.cxx
@@ -29,25 +29,6 @@
#include "otbLocalActivityVectorImageFilter.h"
-int otbNAPCAImageFilterNewTest ( int itkNotUsed(argc), char* itkNotUsed(argv) [] )
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage< PixelType, Dimension > ImageType;
-
- typedef otb::LocalActivityVectorImageFilter< ImageType, ImageType > NoiseFilterType;
-
- typedef otb::NAPCAImageFilter< ImageType, ImageType,
- NoiseFilterType, otb::Transform::FORWARD > FilterType;
- FilterType::Pointer filter = FilterType::New();
-
- typedef otb::NAPCAImageFilter< ImageType, ImageType,
- NoiseFilterType, otb::Transform::INVERSE > InvFilterType;
- InvFilterType::Pointer invFilter = InvFilterType::New();
-
- return EXIT_SUCCESS;
-}
-
int otbNAPCAImageFilterTest ( int argc, char* argv[] )
{
typedef otb::CommandLineArgumentParser ParserType;
diff --git a/Modules/Filtering/DimensionalityReduction/test/otbNormalizeInnerProductPCAImageFilterNew.cxx b/Modules/Filtering/DimensionalityReduction/test/otbNormalizeInnerProductPCAImageFilterNew.cxx
deleted file mode 100644
index 111e052fa573eb411186be247079d2a47f9b68b5..0000000000000000000000000000000000000000
--- a/Modules/Filtering/DimensionalityReduction/test/otbNormalizeInnerProductPCAImageFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbNormalizeInnerProductPCAImageFilter.h"
-#include "otbVectorImage.h"
-
-int otbNormalizeInnerProductPCAImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double PixelType;
- const unsigned int Dimension = 2;
-
- // Typedef
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef otb::NormalizeInnerProductPCAImageFilter<ImageType, ImageType> FilterType;
-
- // Instantiation object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/DimensionalityReduction/test/otbPCAImageFilter.cxx b/Modules/Filtering/DimensionalityReduction/test/otbPCAImageFilter.cxx
index c0b42e5c0fe3509b43736732e5b5be96c1861931..410f9987a1865c2a99f8d35e71fc3cdaa9d681d3 100644
--- a/Modules/Filtering/DimensionalityReduction/test/otbPCAImageFilter.cxx
+++ b/Modules/Filtering/DimensionalityReduction/test/otbPCAImageFilter.cxx
@@ -27,21 +27,6 @@
#include "otbPCAImageFilter.h"
-int otbPCAImageFilterNewTest ( int itkNotUsed(argc), char* itkNotUsed(argv) [] )
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage< PixelType, Dimension > ImageType;
-
- typedef otb::PCAImageFilter< ImageType, ImageType, otb::Transform::FORWARD > FilterType;
- FilterType::Pointer filter = FilterType::New();
-
- typedef otb::PCAImageFilter< ImageType, ImageType, otb::Transform::INVERSE > InvFilterType;
- InvFilterType::Pointer invFilter = InvFilterType::New();
-
- return EXIT_SUCCESS;
-}
-
int otbPCAImageFilterTest ( int argc, char* argv[] )
{
typedef otb::CommandLineArgumentParser ParserType;
diff --git a/Modules/Filtering/DimensionalityReduction/test/otbSparseWvltToAngleMapperListFilter.cxx b/Modules/Filtering/DimensionalityReduction/test/otbSparseWvltToAngleMapperListFilter.cxx
index d359c02cade7f7581925ace60201915d2579d259..961de094c3bbb96e36d7c85614931e065632c6da 100644
--- a/Modules/Filtering/DimensionalityReduction/test/otbSparseWvltToAngleMapperListFilter.cxx
+++ b/Modules/Filtering/DimensionalityReduction/test/otbSparseWvltToAngleMapperListFilter.cxx
@@ -31,7 +31,7 @@
#include "otbSparseWvltToAngleMapperListFilter.h"
-int otbSparseWvltToAngleMapperListFilterNewTest ( int argc, char * argv[] )
+int otbSparseWvltToAngleMapperListFilterTest ( int argc, char * argv[] )
{
// number of images to consider
const unsigned int Dimension = 2;
@@ -95,7 +95,7 @@ int otbSparseWvltToAngleMapperListFilterNewTest ( int argc, char * argv[] )
for ( unsigned int i = 0; i < nbInputImages; i++ )
{
reader->SetNthElement(i, ReaderType::New());
- reader->GetNthElement(i)->SetFileName( inputImageName[i].c_str() );
+ reader->GetNthElement(i)->SetFileName( inputImageName[i] );
reader->GetNthElement(i)->Update();
// Here, we will have 'nbInputImages' image lists of one image each only
@@ -121,5 +121,3 @@ int otbSparseWvltToAngleMapperListFilterNewTest ( int argc, char * argv[] )
return EXIT_SUCCESS;
}
-
-
diff --git a/Modules/Filtering/DimensionalityReduction/test/otbSparseWvltToAngleMapperListFilterNew.cxx b/Modules/Filtering/DimensionalityReduction/test/otbSparseWvltToAngleMapperListFilterNew.cxx
deleted file mode 100644
index 4a56dd91838d489cb3de55adc62762729f106ca6..0000000000000000000000000000000000000000
--- a/Modules/Filtering/DimensionalityReduction/test/otbSparseWvltToAngleMapperListFilterNew.cxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbImage.h"
-#include "otbWaveletOperator.h"
-#include "otbWaveletFilterBank.h"
-#include "otbWaveletTransform.h"
-#include "otbImageFileReader.h"
-#include "otbImageFileWriter.h"
-#include "otbCommandLineArgumentParser.h"
-
-#include "itkListSample.h"
-
-#include "otbSparseWvltToAngleMapperListFilter.h"
-
-int otbSparseWvltToAngleMapperListFilterNew ( int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- const unsigned int SpaceDimension = 3;
-
- typedef float PixelType;
- typedef double PrecisionType;
-
- typedef itk::FixedArray< PrecisionType, SpaceDimension > AngleType;
- typedef itk::Statistics::ListSample< AngleType > AngleListType;
-
- typedef otb::Image< PixelType, Dimension > ImageType;
- typedef otb::ImageList< ImageType > ImageListType;
- typedef otb::SparseWvltToAngleMapperListFilter<
- ImageListType, AngleListType, SpaceDimension+1 > AngleListFilterType;
-
- AngleListFilterType::Pointer filter = AngleListFilterType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/CMakeLists.txt b/Modules/Filtering/ImageManipulation/test/CMakeLists.txt
index 834a6d3da072adf5c4dbc385d46db7931132de97..adc522717529ad846c0ebfcc477d431321f2e43b 100644
--- a/Modules/Filtering/ImageManipulation/test/CMakeLists.txt
+++ b/Modules/Filtering/ImageManipulation/test/CMakeLists.txt
@@ -22,73 +22,47 @@ otb_module_test()
set(OTBImageManipulationTests
otbImageManipulationTestDriver.cxx
-otbBinaryImageDensityFunctionNew.cxx
otbPrintableImageFilter.cxx
otbConcatenateScalarValueImageFilterTest.cxx
otbShiftScaleImageAdaptor.cxx
otbImageToVectorImageCastFilter.cxx
otbFunctionWithNeighborhoodToImageFilter.cxx
otbSqrtSpectralAngleImageFilter.cxx
-otbUnaryFunctorNeighborhoodImageFilterNew.cxx
otbStreamingShrinkImageFilter.cxx
-otbUnaryFunctorWithIndexImageFilterNew.cxx
-otbUnaryFunctorImageFilterNew.cxx
otbUnaryImageFunctorWithVectorImageFilter.cxx
-otbImageToVectorImageCastFilterNew.cxx
otbPrintableImageFilterWithMask.cxx
otbStreamingResampleImageFilter.cxx
-otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx
-otbBoxAndWhiskerImageFilterNew.cxx
otbVectorImageToAmplitudeImageFilter.cxx
otbUnaryFunctorNeighborhoodWithOffsetImageFilter.cxx
otbStreamingResampleImageFilterCompareWithITK.cxx
otbRegionProjectionResampler.cxx
-otbVectorImageTo3DScalarImageFilterNew.cxx
otbUnaryFunctorWithIndexImageFilter.cxx
otbMeanFunctorImageTest.cxx
-otbBinaryImageToDensityImageFilterNew.cxx
otbVectorImageTo3DScalarImageFilter.cxx
otbTileImageFilter.cxx
otbMatrixImageFilterTest.cxx
otbMatrixTransposeMatrixImageFilter.cxx
-otbPerBandVectorImageFilterNew.cxx
otbUnaryFunctorNeighborhoodImageFilter.cxx
-otbStreamingResampleImageFilterNew.cxx
otbStreamingInnerProductVectorImageFilter.cxx
otbPhaseFunctorTest.cxx
-otbShiftScaleVectorImageFilterNew.cxx
otbChangeLabelImageFilter.cxx
-otbPrintableImageFilterNew.cxx
-otbShiftScaleImageAdaptorNew.cxx
-otbStreamingInnerProductVectorImageFilterNew.cxx
otbBoxAndWhiskerImageFilter.cxx
-otbStreamingShrinkImageFilterNew.cxx
otbVectorRescaleIntensityImageFilter.cxx
otbLog10ThresholdedImageFilterTest.cxx
-otbChangeLabelImageFilterNew.cxx
-otbMatrixTransposeMatrixImageFilterNew.cxx
otbExtractROIResample.cxx
otbLocalGradientVectorImageFilter.cxx
otbBinaryImageMinimalBoundingRegionCalculator.cxx
otbPerBandVectorImageFilterWithSobelFilter.cxx
otbBinaryImageDensityFunction.cxx
-otbVectorImageToAmplitudeImageFilterNew.cxx
otbThresholdVectorImageFilter.cxx
otbPerBandVectorImageFilterWithMeanFilter.cxx
-otbConcatenateVectorImageFilterNew.cxx
otbAmplitudeFunctorTest.cxx
otbMultiplyByScalarImageTest.cxx
otbClampImageFilter.cxx
otbConcatenateVectorImageFilter.cxx
-otbBinaryImageMinimalBoundingRegionCalculatorNew.cxx
-otbVectorRescaleIntensityImageFilterNew.cxx
-otbSpectralAngleDistanceImageFilterNew.cxx
-otbUnaryImageFunctorWithVectorImageFilterNew.cxx
otbBinaryImageToDensityImageFilter.cxx
otbSpectralAngleDistanceImageFilter.cxx
-otbFunctionWithNeighborhoodToImageFilterNew.cxx
otbEuclideanDistanceMetricWithMissingValue.cxx
-otbEuclideanDistanceMetricWithMissingValueNew.cxx
otbNRIBandImagesToOneNComplexBandsImage.cxx
otbOneRIBandImageToOneComplexBandImage.cxx
otbTwoNRIBandsImageToNComplexBandsImage.cxx
@@ -108,9 +82,6 @@ otb_module_target_label(otbImageManipulationTestDriver)
-otb_add_test(NAME bfTuBinaryImageDensityFunctionNew COMMAND otbImageManipulationTestDriver
- otbBinaryImageDensityFunctionNew
- )
otb_add_test(NAME bfTvPrintableImageFilter COMMAND otbImageManipulationTestDriver
--compare-image ${NOTOL}
@@ -124,9 +95,6 @@ otb_add_test(NAME bfTvPrintableImageFilter COMMAND otbImageManipulationTestDrive
otb_add_test(NAME bfTvConcatenateScalarValueImageFilterTest COMMAND otbImageManipulationTestDriver
otbConcatenateScalarValueImageFilterTest )
-otb_add_test(NAME bfTuConcatenateScalarValueImageFilterNew COMMAND otbImageManipulationTestDriver
- otbConcatenateScalarValueImageFilterNew )
-
otb_add_test(NAME coTvImageToVectorImageCastFilter COMMAND otbImageManipulationTestDriver
--compare-image ${NOTOL}
@@ -156,9 +124,6 @@ otb_add_test(NAME feTvSqrtSpectralAngleImageFilter COMMAND otbImageManipulationT
185 270 150 619 #reference pixel
)
-otb_add_test(NAME coTuUnaryFunctorNeighborhoodImageFilterNew COMMAND otbImageManipulationTestDriver
- otbUnaryFunctorNeighborhoodImageFilterNew
- )
otb_add_test(NAME bfTvStreamingShrinkImageFilterQBPAN COMMAND otbImageManipulationTestDriver
--compare-image ${NOTOL}
@@ -180,13 +145,7 @@ otb_add_test(NAME bfTvStreamingShrinkImageFilterQBMUL COMMAND otbImageManipulati
20
)
-otb_add_test(NAME coTuUnaryFunctorWithIndexImageFilterNew COMMAND otbImageManipulationTestDriver
- otbUnaryFunctorWithIndexImageFilterNew
- )
-
-otb_add_test(NAME bfTuUnaryFunctorImageFilterNew COMMAND otbImageManipulationTestDriver
- otbUnaryFunctorImageFilterNew)
@@ -200,9 +159,6 @@ otb_add_test(NAME bfTvUnaryImageFunctorWithVectorImageFilter COMMAND otbImageMan
${TEMP}/bfTvUnaryImageFunctorWithVectorImageFilter.tif
)
-otb_add_test(NAME coTuImageToVectorImageCastFilter COMMAND otbImageManipulationTestDriver
- otbImageToVectorImageCastFilterNew)
-
otb_add_test(NAME bfTvPrintableImageFilterWithMask COMMAND otbImageManipulationTestDriver
--compare-image ${NOTOL}
${BASELINE}/bfTvPrintableImageFilterWithMask.png
@@ -223,12 +179,6 @@ otb_add_test(NAME bfTvStreamingResampleImageFilter COMMAND otbImageManipulationT
${TEMP}/bfTvStreamingResamplePoupeesTest.tif
)
-otb_add_test(NAME coTuUnaryFunctorNeighborhoodWithOffsetImageFilterNew COMMAND otbImageManipulationTestDriver
- otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew
- )
-
-otb_add_test(NAME bfTuBoxAndWhiskerImageFilterNew COMMAND otbImageManipulationTestDriver
- otbBoxAndWhiskerImageFilterNew )
otb_add_test(NAME bfTvVectorImageToAmplitudeImageFilter COMMAND otbImageManipulationTestDriver
--compare-image ${EPSILON_7}
@@ -290,9 +240,6 @@ otb_add_test(NAME prTvRegionProjectionResamplerCevennes COMMAND otbImageManipula
-0.00001
)
-otb_add_test(NAME bfTuVectorImageTo3DScalarImageFilterNew COMMAND otbImageManipulationTestDriver
- otbVectorImageTo3DScalarImageFilterNew)
-
otb_add_test(NAME coTvUnaryFunctorWithIndexImageFilter COMMAND otbImageManipulationTestDriver
--compare-image ${NOTOL}
${INPUTDATA}/poupees.tif
@@ -312,9 +259,6 @@ otb_add_test(NAME bfTvMeanFunctorImageTest COMMAND otbImageManipulationTestDrive
-otb_add_test(NAME bfTuBinaryImageToImageDensityFilterNew COMMAND otbImageManipulationTestDriver
- otbBinaryImageToDensityImageFilterNew
- )
otb_add_test(NAME bfTvVectorImageTo3DScalarImageFilter COMMAND otbImageManipulationTestDriver
--compare-image ${NOTOL}
@@ -338,13 +282,7 @@ otb_add_test(NAME bfTvTileImageFilter COMMAND otbImageManipulationTestDriver
${INPUTDATA}/ROI_QB_MUL_4.tif
)
-otb_add_test(NAME bfTuTileImageFilterNew COMMAND otbImageManipulationTestDriver
- otbTileImageFilterNew
- )
-otb_add_test(NAME bfTuMatrixImageFilterNew COMMAND otbImageManipulationTestDriver
- otbMatrixImageFilterNew
- )
otb_add_test(NAME bfTvMatrixImageFilterTest_1 COMMAND otbImageManipulationTestDriver
--compare-image ${NOTOL}
@@ -386,9 +324,6 @@ otb_add_test(NAME bfTvMatrixTransposeMatrixImageFilter COMMAND otbImageManipulat
${TEMP}/bfTvMatrixTransposeMatrixImageFilterResults.txt
)
-otb_add_test(NAME bfTuPerBandVectorImageFilterNew COMMAND otbImageManipulationTestDriver
- otbPerBandVectorImageFilterNew)
-
otb_add_test(NAME coTvUnaryFunctorNeighborhoodImageFilter COMMAND otbImageManipulationTestDriver
--compare-image ${NOTOL}
@@ -400,9 +335,6 @@ otb_add_test(NAME coTvUnaryFunctorNeighborhoodImageFilter COMMAND otbImageManipu
3
)
-otb_add_test(NAME bfTuStreamingResampleImageFilterNew COMMAND otbImageManipulationTestDriver
- otbStreamingResampleImageFilterNew)
-
otb_add_test(NAME bfTvStreamingInnerProductVectorImageFilterDisableCenterData COMMAND otbImageManipulationTestDriver
--compare-ascii 0.000001
${BASELINE_FILES}/bfStreamingInnerProductVectorImageFilterResultsDisableCenterData.txt
@@ -427,9 +359,6 @@ otb_add_test(NAME bfTvPhaseFunctorTest COMMAND otbImageManipulationTestDriver
otbPhaseFunctorTest
)
-otb_add_test(NAME bfTuShiftScaleVectorImageFilterNew COMMAND otbImageManipulationTestDriver
- otbShiftScaleVectorImageFilterNew)
-
otb_add_test(NAME bfTvChangeLabelImageFilter COMMAND otbImageManipulationTestDriver
--compare-image ${NOTOL}
${BASELINE}/bfChangeLabelImageFilter.tif
@@ -441,12 +370,6 @@ otb_add_test(NAME bfTvChangeLabelImageFilter COMMAND otbImageManipulationTestDri
255 # upper threshold
)
-otb_add_test(NAME bfTuPrintableImageFilterNew COMMAND otbImageManipulationTestDriver
- otbPrintableImageFilterNew)
-
-otb_add_test(NAME coTuShiftScaleImageAdaptorNew COMMAND otbImageManipulationTestDriver
- otbShiftScaleImageAdaptorNew
- )
otb_add_test(NAME coTvShiftScaleImageAdaptor COMMAND otbImageManipulationTestDriver
--compare-image ${EPSILON_9}
@@ -457,9 +380,6 @@ otb_add_test(NAME coTvShiftScaleImageAdaptor COMMAND otbImageManipulationTestDri
${TEMP}/coTvShiftScaleImageAdaptor.tif
)
-otb_add_test(NAME bfTuStreamingInnerProductVectorImageFilterNew COMMAND otbImageManipulationTestDriver
- otbStreamingInnerProductVectorImageFilterNew
- )
@@ -481,9 +401,6 @@ otb_add_test(NAME bfTvBoxAndWhiskerImageFilter COMMAND otbImageManipulationTestD
${TEMP}/bfBoxAndWhiskerImageFilter_05_05.tif
05 05)
-otb_add_test(NAME bfTuStreamingShrinkImageFilterNew COMMAND otbImageManipulationTestDriver
- otbStreamingShrinkImageFilterNew)
-
otb_add_test(NAME bfTvVectorRescaleIntensityImageFilter COMMAND otbImageManipulationTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfTvVectorRescaleIntensityOutput.png
@@ -502,15 +419,9 @@ otb_add_test(NAME bfTvotbLog10ThresholdedImageFilterTest COMMAND otbImageManipul
${TEMP}/bfTvLog10ThresholdedImageFilterTest.txt
)
-otb_add_test(NAME bfTuChangeLabelImageFilterNew COMMAND otbImageManipulationTestDriver
- otbChangeLabelImageFilterNew
- )
-
-otb_add_test(NAME bfTuMatrixTransposeMatrixImageFilterNew COMMAND otbImageManipulationTestDriver
- otbMatrixTransposeMatrixImageFilterNew)
otb_add_test(NAME bfTvExtractROIResample2 COMMAND otbImageManipulationTestDriver
--compare-image ${NOTOL}
@@ -540,9 +451,6 @@ otb_add_test(NAME bfTvLocalGradientVectorImageFilter COMMAND otbImageManipulatio
-in ${INPUTDATA}/cupriteSubHsi.tif
-out ${TEMP}/bfTvLocalGradientVectorImageFilter.tif)
-otb_add_test(NAME bfTuLocalGradientVectorImageFilterNew COMMAND otbImageManipulationTestDriver
- otbLocalGradientVectorImageFilterNewTest)
-
otb_add_test(NAME bfTvBoundingRegionCalculator COMMAND otbImageManipulationTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/bfBoundingRegionCalculatorOutput.txt
@@ -575,9 +483,6 @@ otb_add_test(NAME bfTvBinaryImageDensityFunction COMMAND otbImageManipulationTes
${TEMP}/bfTvBinaryImageDensityFunctionOutputAscii.txt
)
-otb_add_test(NAME bfTuVectorImageToAmplitudeImageFilterNew COMMAND otbImageManipulationTestDriver
- otbVectorImageToAmplitudeImageFilterNew)
-
otb_add_test(NAME bfTvThresholdVectorImageFilterTest COMMAND otbImageManipulationTestDriver
--compare-image 0.0001
${BASELINE}/bfTvThresholdVectorImageFilterTest_Output.tif
@@ -587,9 +492,6 @@ otb_add_test(NAME bfTvThresholdVectorImageFilterTest COMMAND otbImageManipulatio
${TEMP}/bfTvThresholdVectorImageFilterTest_Output.tif
)
-otb_add_test(NAME bfTuThresholdVectorImageFilterNew COMMAND otbImageManipulationTestDriver
- otbThresholdVectorImageFilterNew
- )
otb_add_test(NAME bfTvPerBandVectorImageFilterWithMeanFilter COMMAND otbImageManipulationTestDriver
--compare-image ${EPSILON_7}
@@ -600,9 +502,6 @@ otb_add_test(NAME bfTvPerBandVectorImageFilterWithMeanFilter COMMAND otbImageMan
${TEMP}/bfTvPerBandVectorImageFilterWithMeanFilterOutput.hdr
)
-otb_add_test(NAME coTuConcatenateVectorImageFilterNew COMMAND otbImageManipulationTestDriver
- otbConcatenateVectorImageFilterNew)
-
otb_add_test(NAME bfTvAmplitudeFunctorTest COMMAND otbImageManipulationTestDriver
otbAmplitudeFunctorTest
)
@@ -610,9 +509,6 @@ otb_add_test(NAME bfTvAmplitudeFunctorTest COMMAND otbImageManipulationTestDrive
otb_add_test(NAME feTvMultiplyByScalarImage COMMAND otbImageManipulationTestDriver
otbMultiplyByScalarImageFilterTest)
-otb_add_test(NAME bfTuClampImageFilterNew COMMAND otbImageManipulationTestDriver
- otbClampImageFilterNew
- )
otb_add_test(NAME bfTvClampImageFilterTest COMMAND otbImageManipulationTestDriver
--compare-image 0.0001
@@ -638,18 +534,6 @@ otb_add_test(NAME coTvConcatenateVectorImageFilter COMMAND otbImageManipulationT
${TEMP}/coConcatenateVectorImageFilterOutput1.hdr
)
-otb_add_test(NAME bfTuBoundingRegionCalculatorNew COMMAND otbImageManipulationTestDriver
- otbBinaryImageMinimalBoundingRegionCalculatorNew)
-
-otb_add_test(NAME bfTuVectorRescaleIntensityImageFilterNew COMMAND otbImageManipulationTestDriver
- otbVectorRescaleIntensityImageFilterNew)
-
-otb_add_test(NAME bfTuSpectralAngleDistanceImageFilterNew COMMAND otbImageManipulationTestDriver
- otbSpectralAngleDistanceImageFilterNew)
-
-otb_add_test(NAME bfTuUnaryImageFunctorWithVectorImageFilterNew COMMAND otbImageManipulationTestDriver
- otbUnaryImageFunctorWithVectorImageFilterNew)
-
otb_add_test(NAME bfTvBinaryImageToDensityImageFilter COMMAND otbImageManipulationTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfTvBinaryImageToDensityImageFilterOutputImage.tif
@@ -679,15 +563,9 @@ otb_add_test(NAME bfTvSpectralAngleDistanceImageFilterOneChannel COMMAND otbImag
)
set_property(TEST bfTvSpectralAngleDistanceImageFilterOneChannel PROPERTY WILL_FAIL true)
-otb_add_test(NAME bfTvFunctionWithNeighborhoodToImageFilterNew COMMAND otbImageManipulationTestDriver
- otbFunctionWithNeighborhoodToImageFilterNew
- )
otb_add_test(NAME bfTvEuclideanDistanceMetricWithMissingValue COMMAND otbImageManipulationTestDriver
otbEuclideanDistanceMetricWithMissingValue)
-otb_add_test(NAME bfTuEuclideanDistanceMetricWithMissingValueNew COMMAND otbImageManipulationTestDriver
- otbEuclideanDistanceMetricWithMissingValueNew)
-
otb_add_test(NAME bfTvTwoNRIBandsImageToNComplexBandsImage COMMAND otbImageManipulationTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfTvNRIBandImagesToOneNComplexBandsImage.tif
@@ -696,19 +574,19 @@ otb_add_test(NAME bfTvTwoNRIBandsImageToNComplexBandsImage COMMAND otbImageManip
${INPUTDATA}/RSAT_imagery_HH_HV_VV.tif
${TEMP}/bfTvTwoNRIBandsImageToNComplexBandsImage.tif
)
-
-
+
+
otb_add_test(NAME bfTvNRIBandImagesToOneNComplexBandsImage COMMAND otbImageManipulationTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfTvNRIBandImagesToOneNComplexBandsImage.tif
${TEMP}/bfTvNRIBandImagesToOneNComplexBandsImage.tif
- otbNRIBandImagesToOneNComplexBandsImage
+ otbNRIBandImagesToOneNComplexBandsImage
${INPUTDATA}/RSAT_imagery_HH.tif
${INPUTDATA}/RSAT_imagery_HV.tif
${INPUTDATA}/RSAT_imagery_VV.tif
${TEMP}/bfTvNRIBandImagesToOneNComplexBandsImage.tif
)
-
+
otb_add_test(NAME bfTvOneRIBandImageToOneComplexBandImage COMMAND otbImageManipulationTestDriver
--compare-image ${EPSILON_3}
${INPUTDATA}/RSAT_imageryC_HH.tif
@@ -731,9 +609,6 @@ otb_add_test(NAME bfTvChangeInformationImageFilter COMMAND otbImageManipulation
otb_add_test(NAME otbGridResampleImageFilter
COMMAND otbImageManipulationTestDriver otbGridResampleImageFilter)
-otb_add_test(NAME bfTuMaskedIteratorDecoratorNew COMMAND otbImageManipulationTestDriver
- otbMaskedIteratorDecoratorNew
-)
otb_add_test(NAME bfTvMaskedIteratorDecoratorNominal COMMAND otbImageManipulationTestDriver
otbMaskedIteratorDecoratorNominal
diff --git a/Modules/Filtering/ImageManipulation/test/otbBinaryImageDensityFunctionNew.cxx b/Modules/Filtering/ImageManipulation/test/otbBinaryImageDensityFunctionNew.cxx
deleted file mode 100644
index f6e87da862e6b2035a4ad59fe7ded9dd3707fd9d..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbBinaryImageDensityFunctionNew.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include <stdio.h>
-
-#include "otbPointSetDensityFunction.h"
-#include "itkPointSet.h"
-#include "itkVariableLengthVector.h"
-
-#include "otbBinaryImageDensityFunction.h"
-#include "otbImage.h"
-
-int otbBinaryImageDensityFunctionNew(int, char*[])
-{
-
- const unsigned int Dimension = 2;
- typedef float PixelType;
- typedef otb::Image<PixelType, Dimension> InputImageType;
-
- typedef otb::BinaryImageDensityFunction<InputImageType> FunctionType;
-
- /**Instantiation of a Smart Pointer*/
- FunctionType::Pointer filter = FunctionType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbBinaryImageMinimalBoundingRegionCalculatorNew.cxx b/Modules/Filtering/ImageManipulation/test/otbBinaryImageMinimalBoundingRegionCalculatorNew.cxx
deleted file mode 100644
index 66536bc7f526066c10e613d574960b63b5e7069a..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbBinaryImageMinimalBoundingRegionCalculatorNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbImage.h"
-#include "otbBinaryImageMinimalBoundingRegionCalculator.h"
-
-int otbBinaryImageMinimalBoundingRegionCalculatorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
-
- typedef unsigned char PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::BinaryImageMinimalBoundingRegionCalculator<ImageType>
- BoundingRegionCalculatorType;
-
- //Instantiation
- BoundingRegionCalculatorType::Pointer brct = BoundingRegionCalculatorType::New();
-
- std::cout << brct << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbBinaryImageToDensityImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbBinaryImageToDensityImageFilterNew.cxx
deleted file mode 100644
index ce19bee879ddbdc8f8d72effc7d4d5beb5edebf3..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbBinaryImageToDensityImageFilterNew.cxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include <stdio.h>
-
-#include "otbPointSetDensityFunction.h"
-#include "itkPointSet.h"
-#include "itkVariableLengthVector.h"
-
-#include "otbBinaryImageDensityFunction.h"
-#include "otbBinaryImageToDensityImageFilter.h"
-#include "otbImage.h"
-
-int otbBinaryImageToDensityImageFilterNew(int, char*[])
-{
-
- const unsigned int Dimension = 2;
- typedef float PixelType;
- typedef otb::Image<PixelType, Dimension> InputImageType;
- typedef otb::BinaryImageDensityFunction<InputImageType> CountFunctionType;
- typedef otb::BinaryImageToDensityImageFilter<InputImageType, InputImageType, CountFunctionType> FilterType;
-
- /**Instantiation of a Smart Pointer*/
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbBoxAndWhiskerImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbBoxAndWhiskerImageFilterNew.cxx
deleted file mode 100644
index 5a2b70b506dcf3cae7a558f574599f25150d22ee..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbBoxAndWhiskerImageFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- * Copyright (C) 2007-2012 Institut Mines Telecom / Telecom Bretagne
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include <iostream>
-#include <cstdlib>
-
-#include "otbVectorImage.h"
-#include "otbBoxAndWhiskerImageFilter.h"
-
-int otbBoxAndWhiskerImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef otb::BoxAndWhiskerImageFilter<ImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbChangeLabelImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbChangeLabelImageFilterNew.cxx
deleted file mode 100644
index b5d515b10baeb31ade6afd96a68e367e58ebc4c9..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbChangeLabelImageFilterNew.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbVectorImage.h"
-#include "otbChangeLabelImageFilter.h"
-#include "itkChangeLabelImageFilter.h"
-#include "otbImage.h"
-
-int otbChangeLabelImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int ImageDimension = 2;
-
- typedef otb::Image<unsigned int, ImageDimension> InputImageType;
- typedef otb::VectorImage<unsigned int, ImageDimension> OutputImageType;
-
- typedef otb::ChangeLabelImageFilter<InputImageType, OutputImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbClampImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbClampImageFilter.cxx
index 29ac5602eacbc38ffda2b5914822024b2a20d0df..86697839c22b02ed25ff830d6a6dc56376096bc9 100644
--- a/Modules/Filtering/ImageManipulation/test/otbClampImageFilter.cxx
+++ b/Modules/Filtering/ImageManipulation/test/otbClampImageFilter.cxx
@@ -40,13 +40,6 @@ typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
typedef otb::ClampImageFilter<InputImageType, OutputImageType> FilterType;
-int otbClampImageFilterNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
- /** instantiating the filter */
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbClampImageFilterTest(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/Filtering/ImageManipulation/test/otbClampVectorImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbClampVectorImageFilter.cxx
index 8f89a7ea200a3e5a54d610a9ec8e7c5293dd848a..9f58a11190deed688d5bc2a28fde3c8f673c7769 100644
--- a/Modules/Filtering/ImageManipulation/test/otbClampVectorImageFilter.cxx
+++ b/Modules/Filtering/ImageManipulation/test/otbClampVectorImageFilter.cxx
@@ -36,13 +36,6 @@ typedef otb::VectorImage<OutputPixelType, Dimension> OutputImageType;
typedef otb::ClampVectorImageFilter<InputImageType, OutputImageType> FilterType;
-int otbClampVectorImageFilterNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
- /** instantiating the filter */
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbClampVectorImageFilterTest(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/Filtering/ImageManipulation/test/otbConcatenateScalarValueImageFilterTest.cxx b/Modules/Filtering/ImageManipulation/test/otbConcatenateScalarValueImageFilterTest.cxx
index 2914b8738578fdf7c565c403aad52311aa5f305f..af25081092d4adaa5f5d4867f1c0bb254574fbed 100644
--- a/Modules/Filtering/ImageManipulation/test/otbConcatenateScalarValueImageFilterTest.cxx
+++ b/Modules/Filtering/ImageManipulation/test/otbConcatenateScalarValueImageFilterTest.cxx
@@ -32,12 +32,6 @@ typedef double PixelType;
typedef otb::VectorImage<PixelType> ImageType;
typedef otb::ConcatenateScalarValueImageFilter<ImageType, ImageType> FilterType;
-int otbConcatenateScalarValueImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- FilterType::Pointer filter = FilterType::New();
- std::cout << filter << std::endl;
- return EXIT_SUCCESS;
-}
int otbConcatenateScalarValueImageFilterTest(int itkNotUsed(argc), char * itkNotUsed(argv) [])
{
diff --git a/Modules/Filtering/ImageManipulation/test/otbConcatenateVectorImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbConcatenateVectorImageFilterNew.cxx
deleted file mode 100644
index 76bd04f7c8e6306531bc51b9ba0293f0d17a7e7d..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbConcatenateVectorImageFilterNew.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbConcatenateVectorImageFilter.h"
-
-int otbConcatenateVectorImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef otb::ConcatenateVectorImageFilter<ImageType, ImageType, ImageType> FilterType;
-
- // Instantiating adaptor object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbEuclideanDistanceMetricWithMissingValueNew.cxx b/Modules/Filtering/ImageManipulation/test/otbEuclideanDistanceMetricWithMissingValueNew.cxx
deleted file mode 100644
index 4063cf31c57588daa073a1f350eea8a777236cbc..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbEuclideanDistanceMetricWithMissingValueNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- * Copyright (C) 2007-2012 Institut Mines Telecom / Telecom Bretagne
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include <iostream>
-#include <cstdlib>
-#include "itkVariableLengthVector.h"
-#include "otbEuclideanDistanceMetricWithMissingValue.h"
-
-int otbEuclideanDistanceMetricWithMissingValueNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- typedef itk::VariableLengthVector<double> VectorType;
- typedef otb::Statistics::EuclideanDistanceMetricWithMissingValue<VectorType> DistanceType;
-
- DistanceType::Pointer dist = DistanceType::New();
-
- std::cout << dist << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbFunctionWithNeighborhoodToImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbFunctionWithNeighborhoodToImageFilterNew.cxx
deleted file mode 100644
index fe170a1c66acb221cb87c86208692c1190aa3acd..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbFunctionWithNeighborhoodToImageFilterNew.cxx
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "itkNeighborhood.h"
-#include "otbImage.h"
-//#include "itkVariableLengthVector.h"
-//#include "itkConstNeighborhoodIterator.h"
-#include "otbTextureImageFunction.h"
-#include "otbFunctionWithNeighborhoodToImageFilter.h"
-//#include "otbTextureFunctorBase.h"
-
-template <class TInputScalarType, class TOutputScalarType> //IterInput1, class TIterInput2, class TOutput>
-class TextureFunctorTest
-{
-public:
- /** Return the texture name */
- virtual std::string GetName() const
- {
- return "TextureFunctorTest";
- }
-
- TextureFunctorTest()
- {
- m_Offset.Fill(1);
- }
- virtual ~TextureFunctorTest() {}
-
- typedef itk::Offset<> OffsetType;
- typedef itk::Neighborhood<TInputScalarType, 2> NeighborhoodType;
-
- void SetOffset(OffsetType off){ m_Offset = off; }
-
- inline TOutputScalarType operator ()(const NeighborhoodType& neigh)
- {
- return static_cast<TOutputScalarType>(neigh.GetCenterValue());
- }
-
-private:
- OffsetType m_Offset;
-};
-
-int otbFunctionWithNeighborhoodToImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef TextureFunctorTest<PixelType, PixelType> FunctorType;
- typedef otb::TextureImageFunction<ImageType, FunctorType> FunctionType;
- typedef otb::FunctionWithNeighborhoodToImageFilter<ImageType, ImageType, FunctionType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbImageManipulationTestDriver.cxx b/Modules/Filtering/ImageManipulation/test/otbImageManipulationTestDriver.cxx
index c5b59f8ef2d62eb790adf085e5c9121db5f28d4a..08aa5acb7d90cf47b890599f0fb7e802e2b37e86 100644
--- a/Modules/Filtering/ImageManipulation/test/otbImageManipulationTestDriver.cxx
+++ b/Modules/Filtering/ImageManipulation/test/otbImageManipulationTestDriver.cxx
@@ -22,80 +22,48 @@
void RegisterTests()
{
- REGISTER_TEST(otbBinaryImageDensityFunctionNew);
REGISTER_TEST(otbPrintableImageFilter);
- REGISTER_TEST(otbConcatenateScalarValueImageFilterNew);
REGISTER_TEST(otbConcatenateScalarValueImageFilterTest);
REGISTER_TEST(otbShiftScaleImageAdaptor);
REGISTER_TEST(otbImageToVectorImageCastFilter);
REGISTER_TEST(otbFunctionWithNeighborhoodToImageFilter);
REGISTER_TEST(otbSqrtSpectralAngleImageFilter);
- REGISTER_TEST(otbUnaryFunctorNeighborhoodImageFilterNew);
REGISTER_TEST(otbStreamingShrinkImageFilter);
- REGISTER_TEST(otbUnaryFunctorWithIndexImageFilterNew);
- REGISTER_TEST(otbUnaryFunctorImageFilterNew);
REGISTER_TEST(otbUnaryImageFunctorWithVectorImageFilter);
- REGISTER_TEST(otbImageToVectorImageCastFilterNew);
REGISTER_TEST(otbPrintableImageFilterWithMask);
REGISTER_TEST(otbStreamingResampleImageFilter);
- REGISTER_TEST(otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew);
- REGISTER_TEST(otbBoxAndWhiskerImageFilterNew);
REGISTER_TEST(otbVectorImageToAmplitudeImageFilter);
REGISTER_TEST(otbUnaryFunctorNeighborhoodWithOffsetImageFilter);
REGISTER_TEST(otbStreamingResampleImageFilterCompareWithITK);
REGISTER_TEST(otbRegionProjectionResampler);
- REGISTER_TEST(otbVectorImageTo3DScalarImageFilterNew);
REGISTER_TEST(otbUnaryFunctorWithIndexImageFilter);
REGISTER_TEST(otbMeanFunctorImageTest);
- REGISTER_TEST(otbBinaryImageToDensityImageFilterNew);
REGISTER_TEST(otbVectorImageTo3DScalarImageFilter);
- REGISTER_TEST(otbTileImageFilterNew);
REGISTER_TEST(otbTileImageFilter);
- REGISTER_TEST(otbMatrixImageFilterNew);
REGISTER_TEST(otbMatrixImageFilterTest);
REGISTER_TEST(otbMatrixTransposeMatrixImageFilter);
- REGISTER_TEST(otbPerBandVectorImageFilterNew);
REGISTER_TEST(otbUnaryFunctorNeighborhoodImageFilter);
- REGISTER_TEST(otbStreamingResampleImageFilterNew);
REGISTER_TEST(otbStreamingInnerProductVectorImageFilter);
REGISTER_TEST(otbPhaseFunctorTest);
- REGISTER_TEST(otbShiftScaleVectorImageFilterNew);
REGISTER_TEST(otbChangeLabelImageFilter);
- REGISTER_TEST(otbPrintableImageFilterNew);
- REGISTER_TEST(otbShiftScaleImageAdaptorNew);
- REGISTER_TEST(otbStreamingInnerProductVectorImageFilterNew);
REGISTER_TEST(otbBoxAndWhiskerImageFilter);
- REGISTER_TEST(otbStreamingShrinkImageFilterNew);
REGISTER_TEST(otbVectorRescaleIntensityImageFilter);
REGISTER_TEST(otbLog10ThresholdedImageFilterTest);
- REGISTER_TEST(otbChangeLabelImageFilterNew);
- REGISTER_TEST(otbMatrixTransposeMatrixImageFilterNew);
REGISTER_TEST(otbExtractROIResample);
- REGISTER_TEST(otbLocalGradientVectorImageFilterNewTest);
REGISTER_TEST(otbLocalGradientVectorImageFilterTest);
REGISTER_TEST(otbBinaryImageMinimalBoundingRegionCalculator);
REGISTER_TEST(otbPerBandVectorImageFilterWithSobelFilter);
REGISTER_TEST(otbBinaryImageDensityFunction);
- REGISTER_TEST(otbVectorImageToAmplitudeImageFilterNew);
- REGISTER_TEST(otbThresholdVectorImageFilterNew);
REGISTER_TEST(otbThresholdVectorImageFilterTest);
REGISTER_TEST(otbPerBandVectorImageFilterWithMeanFilter);
- REGISTER_TEST(otbConcatenateVectorImageFilterNew);
REGISTER_TEST(otbAmplitudeFunctorTest);
REGISTER_TEST(otbMultiplyByScalarImageFilterTest);
- REGISTER_TEST(otbClampImageFilterNew);
REGISTER_TEST(otbClampImageFilterTest);
REGISTER_TEST(otbClampImageFilterConversionTest);
REGISTER_TEST(otbConcatenateVectorImageFilter);
- REGISTER_TEST(otbBinaryImageMinimalBoundingRegionCalculatorNew);
- REGISTER_TEST(otbVectorRescaleIntensityImageFilterNew);
- REGISTER_TEST(otbSpectralAngleDistanceImageFilterNew);
- REGISTER_TEST(otbUnaryImageFunctorWithVectorImageFilterNew);
REGISTER_TEST(otbBinaryImageToDensityImageFilter);
REGISTER_TEST(otbSpectralAngleDistanceImageFilter);
- REGISTER_TEST(otbFunctionWithNeighborhoodToImageFilterNew);
REGISTER_TEST(otbEuclideanDistanceMetricWithMissingValue);
- REGISTER_TEST(otbEuclideanDistanceMetricWithMissingValueNew);
REGISTER_TEST(otbNRIBandImagesToOneNComplexBandsImage);
REGISTER_TEST(otbOneRIBandImageToOneComplexBandImage);
REGISTER_TEST(otbTwoNRIBandsImageToNComplexBandsImage);
@@ -103,7 +71,6 @@ void RegisterTests()
REGISTER_TEST(otbImageToNoDataMaskFilter);
REGISTER_TEST(otbChangeInformationImageFilter);
REGISTER_TEST(otbGridResampleImageFilter);
- REGISTER_TEST(otbMaskedIteratorDecoratorNew);
REGISTER_TEST(otbMaskedIteratorDecoratorNominal);
REGISTER_TEST(otbMaskedIteratorDecoratorDegenerate);
REGISTER_TEST(otbMaskedIteratorDecoratorExtended);
diff --git a/Modules/Filtering/ImageManipulation/test/otbImageToVectorImageCastFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbImageToVectorImageCastFilterNew.cxx
deleted file mode 100644
index ba5df7ed3e1da6c46c529e74316294cb4be29251..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbImageToVectorImageCastFilterNew.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbImageToVectorImageCastFilter.h"
-#include "otbVectorImage.h"
-#include "otbImage.h"
-
-int otbImageToVectorImageCastFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double PixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::VectorImage<PixelType, Dimension> VectorImageType;
-
- typedef otb::ImageToVectorImageCastFilter<ImageType, VectorImageType> VectorImageCastFilterType;
-
- // Instantiation
- VectorImageCastFilterType::Pointer caster = VectorImageCastFilterType::New();
-
- std::cout << caster << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbLocalGradientVectorImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbLocalGradientVectorImageFilter.cxx
index 47494e5835e56d206703914d72ef2cd7df7ad6d1..a30ea54058364fc2f09fdcee7e4635a44c0ec87c 100644
--- a/Modules/Filtering/ImageManipulation/test/otbLocalGradientVectorImageFilter.cxx
+++ b/Modules/Filtering/ImageManipulation/test/otbLocalGradientVectorImageFilter.cxx
@@ -28,18 +28,6 @@
#include "otbLocalGradientVectorImageFilter.h"
-int otbLocalGradientVectorImageFilterNewTest ( int itkNotUsed(argc), char * itkNotUsed(argv) [] )
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage< PixelType, Dimension > ImageType;
- typedef otb::LocalGradientVectorImageFilter< ImageType, ImageType >
- FilterType;
- FilterType::Pointer filter = FilterType::New();
- std::cout << filter << std::endl;
- return EXIT_SUCCESS;
-}
-
int otbLocalGradientVectorImageFilterTest ( int argc, char* argv[] )
{
typedef otb::CommandLineArgumentParser ParserType;
diff --git a/Modules/Filtering/ImageManipulation/test/otbMaskedIteratorDecorator.cxx b/Modules/Filtering/ImageManipulation/test/otbMaskedIteratorDecorator.cxx
index 9f3362d1d43e6a5c2127813b37e567d0bf159a10..f0bdd1adeb9cd226c8ffbf0a67f4d1a9bbe18c05 100644
--- a/Modules/Filtering/ImageManipulation/test/otbMaskedIteratorDecorator.cxx
+++ b/Modules/Filtering/ImageManipulation/test/otbMaskedIteratorDecorator.cxx
@@ -66,16 +66,6 @@ void FillHalf(typename ImageType::Pointer image, const typename ImageType::Regio
}
// Test template instantiation
-int otbMaskedIteratorDecoratorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Image<double, 2> ImageType;
- ImageType::Pointer image = GetTestImage<ImageType>(10, 10);
- ImageType::Pointer mask = GetTestImage<ImageType>(10, 0);
- ImageType::RegionType region(image->GetLargestPossibleRegion());
-
- otb::MaskedIteratorDecorator<itk::ImageRegionIterator<ImageType> > it(mask, image, region);
- return EXIT_SUCCESS;
-}
// ---------------------- Initialization code ----------------------------------
template <typename IteratorType>
diff --git a/Modules/Filtering/ImageManipulation/test/otbMatrixImageFilterTest.cxx b/Modules/Filtering/ImageManipulation/test/otbMatrixImageFilterTest.cxx
index e6afc893cc4e77fbd42841d1f8504540cbdfbce6..2aa9fffaec1c79f997922c5a548a6fef881cd3ca 100644
--- a/Modules/Filtering/ImageManipulation/test/otbMatrixImageFilterTest.cxx
+++ b/Modules/Filtering/ImageManipulation/test/otbMatrixImageFilterTest.cxx
@@ -27,17 +27,6 @@
#include "otbImageFileWriter.h"
#include <complex>
-int otbMatrixImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef std::complex<double> PixelType;
-
- typedef otb::VectorImage<PixelType> ImageType;
- typedef otb::MatrixImageFilter<ImageType, ImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbMatrixImageFilterTest(int itkNotUsed(argc), char * argv[])
diff --git a/Modules/Filtering/ImageManipulation/test/otbMatrixTransposeMatrixImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbMatrixTransposeMatrixImageFilterNew.cxx
deleted file mode 100644
index 8470c695003915abdb7a1fe0cf78bdd98e3a4d37..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbMatrixTransposeMatrixImageFilterNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "itkMacro.h"
-#include "otbImage.h"
-#include "otbVectorImage.h"
-#include "otbStreamingMatrixTransposeMatrixImageFilter.h"
-
-int otbMatrixTransposeMatrixImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char InputPixelType;
-
- typedef otb::VectorImage<InputPixelType, Dimension> InputImage1Type;
- typedef otb::VectorImage<InputPixelType, Dimension> InputImage2Type;
- typedef otb::StreamingMatrixTransposeMatrixImageFilter<InputImage1Type,
- InputImage2Type> MatrixTransposeMatrixImageFilterType;
-
- // Instantiation
- MatrixTransposeMatrixImageFilterType::Pointer filter = MatrixTransposeMatrixImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbPerBandVectorImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbPerBandVectorImageFilterNew.cxx
deleted file mode 100644
index eeea99252dac64f986e98f4d579a9a5c9ffd73d2..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbPerBandVectorImageFilterNew.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbPerBandVectorImageFilter.h"
-#include "otbVectorImage.h"
-#include "itkUnaryFunctorImageFilter.h"
-#include "itkMeanImageFilter.h"
-
-int otbPerBandVectorImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::VectorImage<PixelType, Dimension> VectorImageType;
- typedef itk::MeanImageFilter<ImageType, ImageType> MeanFilterType;
-
- typedef otb::PerBandVectorImageFilter<VectorImageType, VectorImageType, MeanFilterType>
- PerBandVectorImageFilterType;
-
- // Instantiating object
- PerBandVectorImageFilterType::Pointer filter = PerBandVectorImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbPrintableImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbPrintableImageFilterNew.cxx
deleted file mode 100644
index 6e2f8df95364b2af2e8cd87e95e7ec4014036a6d..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbPrintableImageFilterNew.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "itkMacro.h"
-#include "otbVectorImage.h"
-
-#include "otbPrintableImageFilter.h"
-
-int otbPrintableImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double InputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::VectorImage<InputPixelType, Dimension> InputImageType;
-
- typedef otb::PrintableImageFilter<InputImageType> FilterType;
-
- FilterType::Pointer printableImage = FilterType::New();
-
- std::cout << printableImage << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbShiftScaleImageAdaptorNew.cxx b/Modules/Filtering/ImageManipulation/test/otbShiftScaleImageAdaptorNew.cxx
deleted file mode 100644
index 072e4065c94e93a65935a5755c818fceda310b9c..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbShiftScaleImageAdaptorNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "itkMacro.h"
-#include "otbVectorImage.h"
-#include "otbShiftScaleImageAdaptor.h"
-
-int otbShiftScaleImageAdaptorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double InputPixelType;
- typedef otb::VectorImage<InputPixelType, 2> ImageType;
- typedef otb::ShiftScaleImageAdaptor<ImageType, InputPixelType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbShiftScaleVectorImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbShiftScaleVectorImageFilterNew.cxx
deleted file mode 100644
index 7aa4430eb66b97e3404685019b9720c39d552026..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbShiftScaleVectorImageFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbShiftScaleVectorImageFilter.h"
-#include "otbVectorImage.h"
-
-int otbShiftScaleVectorImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double InputPixelType;
- typedef int OutputPixelType;
- typedef otb::VectorImage<InputPixelType, Dimension> InputImageType;
- typedef otb::VectorImage<OutputPixelType, Dimension> OutputImageType;
- typedef otb::ShiftScaleVectorImageFilter<InputImageType, OutputImageType> ShiftScaleVImageFilterType;
-
- // Instantiating object
- ShiftScaleVImageFilterType::Pointer filter = ShiftScaleVImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbSpectralAngleDistanceImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbSpectralAngleDistanceImageFilterNew.cxx
deleted file mode 100644
index 3a9de199fb8a3c8063876b5bb1d353c268962f7c..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbSpectralAngleDistanceImageFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbImage.h"
-#include "otbVectorImage.h"
-#include "otbSpectralAngleDistanceImageFilter.h"
-
-int otbSpectralAngleDistanceImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> InputImageType;
- typedef otb::Image<PixelType, Dimension> OutputImageType;
- typedef otb::SpectralAngleDistanceImageFilter<InputImageType, OutputImageType> DistanceFilterType;
-
- // Instantiating object
- DistanceFilterType::Pointer filter = DistanceFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbStreamingInnerProductVectorImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbStreamingInnerProductVectorImageFilterNew.cxx
deleted file mode 100644
index 9695e719dcd31561c12335a0b8965417adb28e98..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbStreamingInnerProductVectorImageFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbStreamingInnerProductVectorImageFilter.h"
-#include "otbVectorImage.h"
-
-int otbStreamingInnerProductVectorImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double PixelType;
- const unsigned int Dimension = 2;
-
- // Typedef
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef otb::StreamingInnerProductVectorImageFilter<ImageType> FilterType;
-
- // Instantiation object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbStreamingResampleImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbStreamingResampleImageFilterNew.cxx
deleted file mode 100644
index 38e462bc2e2f382c15e4e528938316ea1c53f301..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbStreamingResampleImageFilterNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbStreamingResampleImageFilter.h"
-
-int otbStreamingResampleImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double InputPixelType;
- typedef unsigned char OutputPixelType;
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
- typedef double InterpolatorPrecisionType;
-
- typedef otb::StreamingResampleImageFilter<InputImageType, OutputImageType,
- InterpolatorPrecisionType> StreamingResampleImageFilterType;
-
- // Instantiating object
- StreamingResampleImageFilterType::Pointer filter = StreamingResampleImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbStreamingShrinkImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbStreamingShrinkImageFilterNew.cxx
deleted file mode 100644
index 89724ee98c9b9936e686ba83a6f7f4a1763b989e..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbStreamingShrinkImageFilterNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbVectorImage.h"
-#include "otbStreamingShrinkImageFilter.h"
-
-int otbStreamingShrinkImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
-
- typedef unsigned char PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef otb::StreamingShrinkImageFilter<ImageType, ImageType> ShrinkType;
-
- ShrinkType::Pointer filter = ShrinkType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbThresholdVectorImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbThresholdVectorImageFilter.cxx
index c7b584cfde73436a9ac78b05e8f51650f229732f..0dc1c83e582da73970c54862749bf1165fde710b 100644
--- a/Modules/Filtering/ImageManipulation/test/otbThresholdVectorImageFilter.cxx
+++ b/Modules/Filtering/ImageManipulation/test/otbThresholdVectorImageFilter.cxx
@@ -36,13 +36,6 @@ typedef otb::VectorImage<OutputPixelType, Dimension> OutputImageType;
typedef otb::ThresholdVectorImageFilter<InputImageType, OutputImageType> FilterType;
-int otbThresholdVectorImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- /** instantiating the filter */
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbThresholdVectorImageFilterTest(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/Filtering/ImageManipulation/test/otbTileImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbTileImageFilter.cxx
index 1864f8fefd66d0e8cc5b230dab2fb8c50ee50784..9ac1d38d8c23ac594834c9b6a03e6286998c0992 100644
--- a/Modules/Filtering/ImageManipulation/test/otbTileImageFilter.cxx
+++ b/Modules/Filtering/ImageManipulation/test/otbTileImageFilter.cxx
@@ -32,13 +32,6 @@ typedef otb::ImageFileReader<VectorImageType> VectorImageReaderType;
typedef otb::ImageFileWriter<VectorImageType> VectorImageWriterType;
-int otbTileImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- TileImageFilterType::Pointer tileFilter = TileImageFilterType::New();
- TileVectorImageFilterType::Pointer tileVectorFilter = TileVectorImageFilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbTileImageFilter(int argc, char * argv[])
{
diff --git a/Modules/Filtering/ImageManipulation/test/otbUnaryFunctorImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbUnaryFunctorImageFilterNew.cxx
deleted file mode 100644
index 3c989ead7848263675c1013fcaeff6af7a42f9ee..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbUnaryFunctorImageFilterNew.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbVectorImage.h"
-#include "otbPhaseFunctor.h"
-#include "otbUnaryFunctorImageFilter.h"
-
-int otbUnaryFunctorImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> InputImageType;
- typedef InputImageType::InternalPixelType InternalPixelType;
- typedef otb::Function::PhaseFunctor<InternalPixelType> FunctorType;
-
- typedef otb::UnaryFunctorImageFilter<InputImageType,
- InputImageType,
- FunctorType> FilterType;
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbUnaryFunctorNeighborhoodImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbUnaryFunctorNeighborhoodImageFilterNew.cxx
deleted file mode 100644
index 22a397136acb9071695121070fcee8369a654903..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbUnaryFunctorNeighborhoodImageFilterNew.cxx
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbUnaryFunctorNeighborhoodImageFilter.h"
-#include "otbImage.h"
-
-namespace Functor
-{
-template <class TIter, class TOutput>
-class UnaryFunctorNeighborhoodImageFilterFunctorNewTest
-{
-public:
- UnaryFunctorNeighborhoodImageFilterFunctorNewTest() {}
- ~UnaryFunctorNeighborhoodImageFilterFunctorNewTest() {}
-
- inline TOutput operator ()(const TIter& it)
- {
- return (static_cast<TOutput>(it.GetCenterPixel()));
-
- }
-};
-}
-
-int otbUnaryFunctorNeighborhoodImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double InputPixelType;
- const int Dimension = 2;
- typedef otb::Image<InputPixelType, Dimension> ImageType;
- typedef ImageType::PixelType PixelType;
- typedef itk::ConstNeighborhoodIterator<ImageType> IterType;
- typedef Functor::UnaryFunctorNeighborhoodImageFilterFunctorNewTest<IterType, PixelType> FunctorType;
- typedef otb::UnaryFunctorNeighborhoodImageFilter<ImageType, ImageType,
- FunctorType> UnaryFunctorNeighborhoodImageFilterType;
-
- // Instantiating object
- UnaryFunctorNeighborhoodImageFilterType::Pointer object = UnaryFunctorNeighborhoodImageFilterType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx
deleted file mode 100644
index 34a21e7115e33359ba2783c321e088e12c2dcea3..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h"
-#include "otbVectorImage.h"
-#include "itkOffset.h"
-
-namespace Functor
-{
-template <class TInput, class TOutput>
-class UnaryFunctorNeighborhoodWithOffsetImageFilterFunctorNewTest
-{
-public:
- UnaryFunctorNeighborhoodWithOffsetImageFilterFunctorNewTest() {}
- ~UnaryFunctorNeighborhoodWithOffsetImageFilterFunctorNewTest() {}
-
- typedef TInput InputScalarType;
- typedef TOutput OutputScalarType;
- typedef itk::VariableLengthVector<InputScalarType> InputVectorType;
- typedef itk::VariableLengthVector<OutputScalarType> OutputVectorType;
- typedef itk::Offset<> OffsetType;
- typedef itk::Neighborhood<InputScalarType, 2> NeighborhoodType;
- typedef itk::Neighborhood<InputVectorType, 2> NeighborhoodVectorType;
-
- void SetOffset(OffsetType off)
- {
- m_Offset = off;
- }
- OffsetType GetOffset()
- {
- return m_Offset;
- }
-
- inline OutputScalarType operator ()(const NeighborhoodType& neigh)
- {
- return (static_cast<OutputScalarType>(neigh.GetCenterValue()));
- }
- inline OutputVectorType operator ()(const NeighborhoodVectorType& neigh)
- {
- return (static_cast<OutputVectorType>(neigh.GetCenterValue()));
-
- }
-
-private:
- OffsetType m_Offset;
-};
-}
-
-int otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double InputPixelType;
- const int Dimension = 2;
- typedef otb::VectorImage<InputPixelType,
- Dimension> ImageType;
- typedef Functor::UnaryFunctorNeighborhoodWithOffsetImageFilterFunctorNewTest<InputPixelType,
- InputPixelType> FunctorType;
- typedef otb::UnaryFunctorNeighborhoodWithOffsetImageFilter<ImageType, ImageType,
- FunctorType>
- UnaryFunctorNeighborhoodWithOffsetImageFilterType;
-
- // Instantiating object
- UnaryFunctorNeighborhoodWithOffsetImageFilterType::Pointer filter =
- UnaryFunctorNeighborhoodWithOffsetImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbUnaryFunctorWithIndexImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbUnaryFunctorWithIndexImageFilterNew.cxx
deleted file mode 100644
index dc13da52ea7275a121e4cb42b5d96b7c100265d9..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbUnaryFunctorWithIndexImageFilterNew.cxx
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbUnaryFunctorWithIndexImageFilter.h"
-#include "otbImage.h"
-
-namespace Functor
-{
-template <class TInput, class TOutput>
-class UnaryFunctorWithIndexImageFilterFunctorNewTest
-{
-public:
- UnaryFunctorWithIndexImageFilterFunctorNewTest() {}
- ~UnaryFunctorWithIndexImageFilterFunctorNewTest() {}
-
- typedef itk::Index<2> IndexType;
-
- inline TOutput operator ()(const TInput& inPix, IndexType itkNotUsed(index))
- {
- return (static_cast<TOutput>(inPix));
- }
-};
-}
-
-int otbUnaryFunctorWithIndexImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double InputPixelType;
- typedef otb::Image<InputPixelType, 2> ImageType;
- typedef ImageType::PixelType PixelType;
- typedef Functor::UnaryFunctorWithIndexImageFilterFunctorNewTest<PixelType, PixelType> FunctorType;
- typedef otb::UnaryFunctorWithIndexImageFilter<ImageType, ImageType,
- FunctorType> UnaryFunctorWithIndexImageFilterType;
-
- // Instantiating object
- UnaryFunctorWithIndexImageFilterType::Pointer filter = UnaryFunctorWithIndexImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbUnaryImageFunctorWithVectorImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbUnaryImageFunctorWithVectorImageFilterNew.cxx
deleted file mode 100644
index 7e1380841e09e838bab1d64830a834bdba8a0845..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbUnaryImageFunctorWithVectorImageFilterNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbUnaryImageFunctorWithVectorImageFilter.h"
-#include "otbImage.h"
-#include "itkCosImageFilter.h"
-
-int otbUnaryImageFunctorWithVectorImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> InputImageType;
- typedef InputImageType::InternalPixelType InternalPixelType;
- typedef itk::Functor::Cos<InternalPixelType, InternalPixelType> FunctorType;
- typedef otb::UnaryImageFunctorWithVectorImageFilter<InputImageType,
- InputImageType,
- FunctorType> UnaryImageFunctorWithVectorImageFilterType;
-
- // Instantiating object
- UnaryImageFunctorWithVectorImageFilterType::Pointer filter = UnaryImageFunctorWithVectorImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbVectorImageTo3DScalarImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbVectorImageTo3DScalarImageFilterNew.cxx
deleted file mode 100644
index 85dd0596d85cfcc42ac704e8f2f0a3f5d6094e3e..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbVectorImageTo3DScalarImageFilterNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbVectorImage.h"
-#include "otbImage.h"
-#include "otbVectorImageTo3DScalarImageFilter.h"
-
-int otbVectorImageTo3DScalarImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int BiDimension = 2;
- const unsigned int TriDimension = 3;
-
- typedef double PixelType;
-
- typedef otb::VectorImage<PixelType, BiDimension> VectorImageType;
- typedef otb::Image<PixelType, TriDimension> ImageType;
-
- typedef otb::VectorImageTo3DScalarImageFilter<VectorImageType, ImageType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbVectorImageToAmplitudeImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbVectorImageToAmplitudeImageFilterNew.cxx
deleted file mode 100644
index 3afcc95f029ab0a8d8c63d4ef6943d03540cccb7..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbVectorImageToAmplitudeImageFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbVectorImageToAmplitudeImageFilter.h"
-#include "otbVectorImage.h"
-#include "otbImage.h"
-
-int otbVectorImageToAmplitudeImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
-
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::VectorImage<PixelType, Dimension> VectorImageType;
- typedef otb::VectorImageToAmplitudeImageFilter<VectorImageType, ImageType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageManipulation/test/otbVectorRescaleIntensityImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbVectorRescaleIntensityImageFilterNew.cxx
deleted file mode 100644
index ff3735292b85e3c288696dac4e5de5eb58f7441b..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageManipulation/test/otbVectorRescaleIntensityImageFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbVectorRescaleIntensityImageFilter.h"
-#include "otbVectorImage.h"
-
-int otbVectorRescaleIntensityImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double InputPixelType;
- typedef unsigned char OutputPixelType;
- typedef otb::VectorImage<InputPixelType, Dimension> InputImageType;
- typedef otb::VectorImage<OutputPixelType, Dimension> OutputImageType;
- typedef otb::VectorRescaleIntensityImageFilter<InputImageType, OutputImageType> VectorRescaleIntensityImageFilterType;
-
- // Instantiating object
- VectorRescaleIntensityImageFilterType::Pointer filter = VectorRescaleIntensityImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageNoise/test/CMakeLists.txt b/Modules/Filtering/ImageNoise/test/CMakeLists.txt
index 6ac2a6ae95394a68e930d6b5d6d146a6b9c419c5..1814c9047dbdf98fe1d20ad8a6ec880e78727efb 100644
--- a/Modules/Filtering/ImageNoise/test/CMakeLists.txt
+++ b/Modules/Filtering/ImageNoise/test/CMakeLists.txt
@@ -26,7 +26,6 @@ otbFrostFilter.cxx
otbLeeFilter.cxx
otbGammaMAPFilter.cxx
otbKuanFilter.cxx
-otbFrostFilterNew.cxx
)
add_executable(otbImageNoiseTestDriver ${OTBImageNoiseTests})
@@ -77,6 +76,3 @@ otb_add_test(NAME bfTvFiltreKuan COMMAND otbImageNoiseTestDriver
05 05 12.0)
-otb_add_test(NAME bfTuFrostFilterNew COMMAND otbImageNoiseTestDriver
- otbFrostFilterNew)
-
diff --git a/Modules/Filtering/ImageNoise/test/otbFrostFilterNew.cxx b/Modules/Filtering/ImageNoise/test/otbFrostFilterNew.cxx
deleted file mode 100644
index 1478b6206eab19dbaec7a1f9e6fd8e107fc4465c..0000000000000000000000000000000000000000
--- a/Modules/Filtering/ImageNoise/test/otbFrostFilterNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbImageFileReader.h"
-#include "otbFrostImageFilter.h"
-#include "otbImage.h"
-
-int otbFrostFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned char InputPixelType;
- typedef unsigned char OutputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
-
- typedef otb::FrostImageFilter<InputImageType, OutputImageType> FilterType;
-
- FilterType::Pointer frost = FilterType::New();
-
- std::cout << frost << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/ImageNoise/test/otbImageNoiseTestDriver.cxx b/Modules/Filtering/ImageNoise/test/otbImageNoiseTestDriver.cxx
index 70d9450dd147a70cca1284063a0a0a65996f4cdc..32c6a8064fe0f62a8bccf4796b23317ecf94db86 100644
--- a/Modules/Filtering/ImageNoise/test/otbImageNoiseTestDriver.cxx
+++ b/Modules/Filtering/ImageNoise/test/otbImageNoiseTestDriver.cxx
@@ -26,5 +26,4 @@ void RegisterTests()
REGISTER_TEST(otbLeeFilter);
REGISTER_TEST(otbGammaMAPFilter);
REGISTER_TEST(otbKuanFilter);
- REGISTER_TEST(otbFrostFilterNew);
}
diff --git a/Modules/Filtering/MathParser/test/CMakeLists.txt b/Modules/Filtering/MathParser/test/CMakeLists.txt
index 320d58ef42bea3eb63e7768b5de5bfe24ad7c277..32e29c299e4a4e13a3bab2e2f5f7d279d7ce9bcc 100644
--- a/Modules/Filtering/MathParser/test/CMakeLists.txt
+++ b/Modules/Filtering/MathParser/test/CMakeLists.txt
@@ -22,7 +22,6 @@ otb_module_test()
set(OTBMathParserTests
otbMathParserTestDriver.cxx
-otbMaskMuParserFilterNew.cxx
otbMaskMuParserFilterTest.cxx
otbParserConditionDataNodeFeatureFunction.cxx
otbParserTest.cxx
@@ -38,9 +37,6 @@ otb_module_target_label(otbMathParserTestDriver)
-otb_add_test(NAME bfTuMaskMuParserFilterNew COMMAND otbMathParserTestDriver
- otbMaskMuParserFilterNew
- )
otb_add_test(NAME bfTvMaskMuParserFilterTest COMMAND otbMathParserTestDriver
--compare-image ${NOTOL}
@@ -82,13 +78,6 @@ otb_add_test(NAME coTvParser COMMAND otbMathParserTestDriver
otbParserTest
)
-otb_add_test(NAME coTuParser COMMAND otbMathParserTestDriver
- otbParserTestNew
- )
-
-otb_add_test(NAME bfTuImageListToSingleImageFilterNew COMMAND otbMathParserTestDriver
- otbImageListToSingleImageFilterNew)
-
otb_add_test(NAME bfTvImageListToSingleImageFilter COMMAND otbMathParserTestDriver
--compare-image ${NOTOL}
${BASELINE}/bfTvImageListToSingleImageFilter.tif
@@ -98,20 +87,11 @@ otb_add_test(NAME bfTvImageListToSingleImageFilter COMMAND otbMathParserTestDriv
${TEMP}/bfTvImageListToSingleImageFilterOut.tif
)
-
-
-
-
-
otb_add_test(NAME bfTvBandMathImageFilterWithIdx COMMAND otbMathParserTestDriver
otbBandMathImageFilterWithIdx
${TEMP}/bfTvBandMathImageFilterWithIdx1.tif
${TEMP}/bfTvBandMathImageFilterWithIdx2.tif
)
-otb_add_test(NAME bfTuBandMathImageFilter COMMAND otbMathParserTestDriver
- otbBandMathImageFilterNew)
-
otb_add_test(NAME bfTvBandMathImageFilter COMMAND otbMathParserTestDriver
otbBandMathImageFilter)
-
diff --git a/Modules/Filtering/MathParser/test/otbBandMathImageFilter.cxx b/Modules/Filtering/MathParser/test/otbBandMathImageFilter.cxx
index 69d452b1f47e5d451ae9ec1f5b0361babe20286a..19f77c609dd0386f9b76a1d37ccb10db514dc8d1 100644
--- a/Modules/Filtering/MathParser/test/otbBandMathImageFilter.cxx
+++ b/Modules/Filtering/MathParser/test/otbBandMathImageFilter.cxx
@@ -29,17 +29,6 @@
#include "otbBandMathImageFilter.h"
#include "otbImageFileWriter.h"
-int otbBandMathImageFilterNew( int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
- typedef double PixelType;
- //typedef float PixelType;
- typedef otb::Image<PixelType, 2> ImageType;
- typedef otb::BandMathImageFilter<ImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbBandMathImageFilter( int itkNotUsed(argc), char* itkNotUsed(argv) [])
{
diff --git a/Modules/Filtering/MathParser/test/otbImageListToSingleImageFilterTest.cxx b/Modules/Filtering/MathParser/test/otbImageListToSingleImageFilterTest.cxx
index b6033f22019f5df2975816a7d623705ce8711571..5360bb2f57355271cd39842331cbfa33bfc5f352 100644
--- a/Modules/Filtering/MathParser/test/otbImageListToSingleImageFilterTest.cxx
+++ b/Modules/Filtering/MathParser/test/otbImageListToSingleImageFilterTest.cxx
@@ -28,23 +28,6 @@
#include "otbImageFileWriter.h"
#include "otbBandMathImageFilter.h"
-int otbImageListToSingleImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
-
- typedef unsigned char PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::ImageList<ImageType> ImageListType;
-
- typedef otb::ImageListToSingleImageFilter<ImageListType::ImageType> ImageListToSingleImageFilter;
-
- // Instantiating object
- ImageListToSingleImageFilter::Pointer filter = ImageListToSingleImageFilter::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/MathParser/test/otbMaskMuParserFilterNew.cxx b/Modules/Filtering/MathParser/test/otbMaskMuParserFilterNew.cxx
deleted file mode 100644
index 0b08c0e59f17fef378ff907e20cb8cda643518ac..0000000000000000000000000000000000000000
--- a/Modules/Filtering/MathParser/test/otbMaskMuParserFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbVectorImage.h"
-#include "otbImage.h"
-#include "otbMaskMuParserFilter.h"
-
-int otbMaskMuParserFilterNew( int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- typedef float InputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::VectorImage<InputPixelType, Dimension> InputVectorImageType;
- typedef otb::Image<unsigned int, Dimension> OutputImageType;
- typedef otb::MaskMuParserFilter<InputVectorImageType, OutputImageType> FilterType;
-
-
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/MathParser/test/otbMathParserTestDriver.cxx b/Modules/Filtering/MathParser/test/otbMathParserTestDriver.cxx
index 5c2523d21254d1ddd32c4693cefc9a88109401f0..0969c38950ead1344e283b2f264c6a3d8c84a193 100644
--- a/Modules/Filtering/MathParser/test/otbMathParserTestDriver.cxx
+++ b/Modules/Filtering/MathParser/test/otbMathParserTestDriver.cxx
@@ -22,15 +22,10 @@
void RegisterTests()
{
- REGISTER_TEST(otbMaskMuParserFilterNew);
REGISTER_TEST(otbMaskMuParserFilterTest);
- REGISTER_TEST(otbParserConditionDataNodeFeatureFunctionNew);
REGISTER_TEST(otbParserConditionDataNodeFeatureFunction);
- REGISTER_TEST(otbParserTestNew);
REGISTER_TEST(otbParserTest);
- REGISTER_TEST(otbImageListToSingleImageFilterNew);
REGISTER_TEST(otbImageListToSingleImageFilter);
- REGISTER_TEST(otbBandMathImageFilterNew);
REGISTER_TEST(otbBandMathImageFilter);
REGISTER_TEST(otbBandMathImageFilterWithIdx);
}
diff --git a/Modules/Filtering/MathParser/test/otbParserConditionDataNodeFeatureFunction.cxx b/Modules/Filtering/MathParser/test/otbParserConditionDataNodeFeatureFunction.cxx
index 5c0f0a8b3f1836be95456bfef0f8f99d6da36fcb..1d50eae99d725b56468a6f906f1ead6e9de23d91 100644
--- a/Modules/Filtering/MathParser/test/otbParserConditionDataNodeFeatureFunction.cxx
+++ b/Modules/Filtering/MathParser/test/otbParserConditionDataNodeFeatureFunction.cxx
@@ -29,21 +29,6 @@
#include "otbVectorDataFileWriter.h"
#include "itkPreOrderTreeIterator.h"
-int otbParserConditionDataNodeFeatureFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double CoordRepType;
- typedef double PrecisionType;
- typedef otb::VectorImage<double, 2> ImageType;
- typedef otb::ParserConditionDataNodeFeatureFunction<ImageType, CoordRepType, PrecisionType>
- ParserConditionDataNodeFeaturefunctionType;
-
- ParserConditionDataNodeFeaturefunctionType::Pointer
- ParserConditionFeature = ParserConditionDataNodeFeaturefunctionType::New();
-
- std::cout << ParserConditionFeature << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbParserConditionDataNodeFeatureFunction(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/Filtering/MathParser/test/otbParserTest.cxx b/Modules/Filtering/MathParser/test/otbParserTest.cxx
index 256aa0368c3fdf5a56e865dccb53d44ee098f6a5..19198dbfe1fe2d9db6ac4fc21884910a693c0548 100644
--- a/Modules/Filtering/MathParser/test/otbParserTest.cxx
+++ b/Modules/Filtering/MathParser/test/otbParserTest.cxx
@@ -23,13 +23,6 @@
typedef otb::Parser ParserType;
-int otbParserTestNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- // Instantiating object
- ParserType::Pointer parser = ParserType::New();
- std::cout << parser << std::endl;
- return EXIT_SUCCESS;
-}
void otbParserTest_ThrowIfNotEqual(double output, double ref, std::string testname, double epsilon = 1.0E-12)
{
diff --git a/Modules/Filtering/MathParserX/test/CMakeLists.txt b/Modules/Filtering/MathParserX/test/CMakeLists.txt
index 7e32cdd72f2ae96b98d7efb4087fedaa67239dcf..02bb92f511d1724555cbaac2f3ca4176412f373e 100644
--- a/Modules/Filtering/MathParserX/test/CMakeLists.txt
+++ b/Modules/Filtering/MathParserX/test/CMakeLists.txt
@@ -30,11 +30,7 @@ otb_module_target_label(otbMathParserXTestDriver)
otb_add_test(NAME coTvParserX COMMAND otbMathParserXTestDriver
otbParserXTest
)
-otb_add_test(NAME coTuParserX COMMAND otbMathParserXTestDriver
- otbParserXTestNew
- )
-otb_add_test(NAME bfTuBandMathXImageFilterNew COMMAND otbMathParserXTestDriver
- otbBandMathXImageFilterNew)
+
otb_add_test(NAME bfTvBandMathXImageFilterConv COMMAND otbMathParserXTestDriver
otbBandMathXImageFilterConv
${BASELINE_FILES}/bfTvExportBandMathX.txt
diff --git a/Modules/Filtering/MathParserX/test/otbBandMathXImageFilter.cxx b/Modules/Filtering/MathParserX/test/otbBandMathXImageFilter.cxx
index bc69c6b19fcbf9008903f8253b2e3a42be477e07..ca031cb6aa1f424ce641f8d3c15b43fc14e7909e 100644
--- a/Modules/Filtering/MathParserX/test/otbBandMathXImageFilter.cxx
+++ b/Modules/Filtering/MathParserX/test/otbBandMathXImageFilter.cxx
@@ -31,16 +31,6 @@
#include "itkImageRegionIteratorWithIndex.h"
-int otbBandMathXImageFilterNew( int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, 2> ImageType;
- typedef otb::BandMathXImageFilter<ImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbBandMathXImageFilter( int itkNotUsed(argc), char* itkNotUsed(argv) [])
diff --git a/Modules/Filtering/MathParserX/test/otbMathParserXTestDriver.cxx b/Modules/Filtering/MathParserX/test/otbMathParserXTestDriver.cxx
index ee57c98450c3274a44f355b862031c7ec1d542a1..975fa8fb03d742cd2cdfdc6ca58d2f6ddab811f0 100644
--- a/Modules/Filtering/MathParserX/test/otbMathParserXTestDriver.cxx
+++ b/Modules/Filtering/MathParserX/test/otbMathParserXTestDriver.cxx
@@ -24,8 +24,6 @@ void RegisterTests()
{
REGISTER_TEST(otbParserXTest);
REGISTER_TEST(otbBandMathXImageFilter);
- REGISTER_TEST(otbParserXTestNew);
- REGISTER_TEST(otbBandMathXImageFilterNew);
REGISTER_TEST(otbBandMathXImageFilterConv);
REGISTER_TEST(otbBandMathXImageFilterTxt);
REGISTER_TEST(otbBandMathXImageFilterWithIdx);
diff --git a/Modules/Filtering/MathParserX/test/otbParserXTest.cxx b/Modules/Filtering/MathParserX/test/otbParserXTest.cxx
index fcb016471f9864b398b575255e4bf73c1fc0304d..4e885b14ab105093fa9a192095db21dcaf5da985 100644
--- a/Modules/Filtering/MathParserX/test/otbParserXTest.cxx
+++ b/Modules/Filtering/MathParserX/test/otbParserXTest.cxx
@@ -23,14 +23,6 @@
typedef otb::ParserX ParserType;
-int otbParserXTestNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- // Instantiating object
- ParserType::Pointer parser = ParserType::New();
- std::cout << parser << std::endl;
- return EXIT_SUCCESS;
-}
-
void otbParserXTest_ThrowIfNotEqual(double output, double ref, std::string testname, double epsilon = 1.0E-12)
{
std::cout << "Running test " << testname << std::endl;
diff --git a/Modules/Filtering/MorphologicalPyramid/test/CMakeLists.txt b/Modules/Filtering/MorphologicalPyramid/test/CMakeLists.txt
index c117cb6cf12408e278a41586880114883ffd63c0..560cbb52e8e7d9c3ccc3bc21bc3d429a300d173a 100644
--- a/Modules/Filtering/MorphologicalPyramid/test/CMakeLists.txt
+++ b/Modules/Filtering/MorphologicalPyramid/test/CMakeLists.txt
@@ -22,17 +22,11 @@ otb_module_test()
set(OTBMorphologicalPyramidTests
otbMorphologicalPyramidTestDriver.cxx
-otbMorphologicalPyramidSegmentationFilterNew.cxx
otbMorphologicalPyramidAnalysisFilter.cxx
otbMorphologicalPyramidSegmenter.cxx
-otbMorphologicalPyramidSegmenterNew.cxx
otbMorphologicalPyramidSynthesisFilter.cxx
otbMorphologicalPyramidMRToMSConverter.cxx
-otbMorphologicalPyramidSynthesisFilterNew.cxx
-otbMorphologicalPyramidMRToMSConverterNew.cxx
otbMorphologicalPyramidResampler.cxx
-otbMorphologicalPyramidAnalysisFilterNew.cxx
-otbMorphologicalPyramidResamplerNew.cxx
otbMorphologicalPyramidSegmentationFilter.cxx
)
@@ -42,9 +36,6 @@ otb_module_target_label(otbMorphologicalPyramidTestDriver)
# Tests Declaration
-otb_add_test(NAME msTuMorphoPyrSegmentationFilterNew COMMAND otbMorphologicalPyramidTestDriver
- otbMorphologicalPyramidSegmentationFilterNew)
-
otb_add_test(NAME msTvMorphoPyrAnalysisFilter COMMAND otbMorphologicalPyramidTestDriver
--compare-n-images ${NOTOL} 5
${BASELINE}/msPyrAn_mire_log_an_2.png
@@ -94,9 +85,6 @@ otb_add_test(NAME msTvMorphoPyrSegmentDark COMMAND otbMorphologicalPyramidTestDr
)
set_property(TEST msTvMorphoPyrSegmentDark PROPERTY DEPENDS msTvMorphoPyrMRToMSConverter)
-otb_add_test(NAME msTuMorphoPyrSegmenterNew COMMAND otbMorphologicalPyramidTestDriver
- otbMorphologicalPyramidSegmenterNew)
-
otb_add_test(NAME msTvMorphoPyrSynthesisFilter COMMAND otbMorphologicalPyramidTestDriver
--compare-image ${NOTOL}
${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
@@ -123,12 +111,6 @@ otb_add_test(NAME msTvMorphoPyrMRToMSConverter COMMAND otbMorphologicalPyramidTe
4
2.0)
-otb_add_test(NAME msTuMorphoPyrSynthesisFilterNew COMMAND otbMorphologicalPyramidTestDriver
- otbMorphologicalPyramidSynthesisFilterNew)
-
-otb_add_test(NAME msTuMorphoPyrMRToMSConverterNew COMMAND otbMorphologicalPyramidTestDriver
- otbMorphologicalPyramidMRToMSConverterNew)
-
otb_add_test(NAME msTvMorphoPyrResampler COMMAND otbMorphologicalPyramidTestDriver
--compare-n-images ${EPSILON_8} 2
${BASELINE}/msPyrResampler_IKO_LesHalles_256_2.hdr
@@ -143,12 +125,6 @@ otb_add_test(NAME msTvMorphoPyrResampler COMMAND otbMorphologicalPyramidTestDriv
256
)
-otb_add_test(NAME msTuMorphoPyrAnalysisFilterNew COMMAND otbMorphologicalPyramidTestDriver
- otbMorphologicalPyramidAnalysisFilterNew)
-
-otb_add_test(NAME msTuMorphoPyrResamplerNew COMMAND otbMorphologicalPyramidTestDriver
- otbMorphologicalPyramidResamplerNew)
-
otb_add_test(NAME msTvMorphoPyrSegmentationFilter COMMAND otbMorphologicalPyramidTestDriver
--compare-n-images ${NOTOL} 4
${BASELINE}/msPyrSegmentation_IKO_Halles_2.tif
diff --git a/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidAnalysisFilter.cxx b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidAnalysisFilter.cxx
index cac6ecc8229ac5ef6fdd7608b73ca43989fd67d9..f14d7134bfe31d365f037805fad4667e7665592f 100644
--- a/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidAnalysisFilter.cxx
+++ b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidAnalysisFilter.cxx
@@ -85,28 +85,28 @@ int otbMorphologicalPyramidAnalysisFilter(int itkNotUsed(argc), char * argv[])
{
oss << outputFilenamePrefix << "_an_" << i << "." << outputFilenameSuffix;
writer->SetInput(itAnalyse.Get());
- writer->SetFileName(oss.str().c_str());
+ writer->SetFileName(oss.str());
writer->Update();
oss.str("");
oss << outputFilenamePrefix << "_sf_" << i << "." << outputFilenameSuffix;
writer->SetInput(itSupFilter.Get());
- writer->SetFileName(oss.str().c_str());
+ writer->SetFileName(oss.str());
writer->Update();
oss.str("");
oss << outputFilenamePrefix << "_if_" << i << "." << outputFilenameSuffix;
writer->SetInput(itInfFilter.Get());
- writer->SetFileName(oss.str().c_str());
+ writer->SetFileName(oss.str());
writer->Update();
oss.str("");
oss << outputFilenamePrefix << "_id_" << i << "." << outputFilenameSuffix;
writer->SetInput(itInfDeci.Get());
- writer->SetFileName(oss.str().c_str());
+ writer->SetFileName(oss.str());
writer->Update();
std::cout << "File " << oss.str() << " written" << std::endl;
oss.str("");
oss << outputFilenamePrefix << "_sd_" << i << "." << outputFilenameSuffix;
writer->SetInput(itSupDeci.Get());
- writer->SetFileName(oss.str().c_str());
+ writer->SetFileName(oss.str());
writer->Update();
oss.str("");
++itAnalyse;
diff --git a/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidAnalysisFilterNew.cxx b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidAnalysisFilterNew.cxx
deleted file mode 100644
index 23a2f1b426a133ebc53e874fb5bb8a0353f8a890..0000000000000000000000000000000000000000
--- a/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidAnalysisFilterNew.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbMorphologicalPyramidAnalysisFilter.h"
-#include "otbOpeningClosingMorphologicalFilter.h"
-#include "itkBinaryBallStructuringElement.h"
-#include "otbImage.h"
-
-int otbMorphologicalPyramidAnalysisFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char InputPixelType;
- typedef unsigned char OutputPixelType;
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
- typedef itk::BinaryBallStructuringElement<InputPixelType, Dimension> StructuringElementType;
- typedef otb::OpeningClosingMorphologicalFilter<InputImageType, InputImageType, StructuringElementType>
- OpeningClosingFilterType;
- typedef otb::MorphologicalPyramidAnalysisFilter<InputImageType, OutputImageType, OpeningClosingFilterType>
- PyramidFilterType;
- // Instantiation
- PyramidFilterType::Pointer pyramid = PyramidFilterType::New();
-
- std::cout << pyramid << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidMRToMSConverterNew.cxx b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidMRToMSConverterNew.cxx
deleted file mode 100644
index c94393fb73683f7664c06e1bd824c4689f963dc6..0000000000000000000000000000000000000000
--- a/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidMRToMSConverterNew.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbMorphologicalPyramidMRToMSConverter.h"
-#include "otbImage.h"
-
-int otbMorphologicalPyramidMRToMSConverterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char InputPixelType;
- typedef unsigned char OutputPixelType;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
- typedef otb::MorphologicalPyramid::MRToMSConverter<InputImageType, OutputImageType> MRToMSConverterType;
-
- // Instantiation
- MRToMSConverterType::Pointer mrtoms = MRToMSConverterType::New();
-
- std::cout << mrtoms << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidResamplerNew.cxx b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidResamplerNew.cxx
deleted file mode 100644
index b87b37c55fd94771632a9559709d9e8df42c8c95..0000000000000000000000000000000000000000
--- a/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidResamplerNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbMorphologicalPyramidResampler.h"
-#include "otbImage.h"
-
-int otbMorphologicalPyramidResamplerNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char InputPixelType;
- typedef unsigned char OutputPixelType;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
-
- typedef otb::MorphologicalPyramid::Resampler<InputImageType, OutputImageType>
- ResamplerType;
-
- // Instantiation
- ResamplerType::Pointer resampler = ResamplerType::New();
-
- std::cout << resampler << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSegmentationFilter.cxx b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSegmentationFilter.cxx
index 212474085b49e48476a433dea5c011429900db89..b24e415d1267f1988bea1b7a2e849c9774aae376 100644
--- a/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSegmentationFilter.cxx
+++ b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSegmentationFilter.cxx
@@ -87,7 +87,7 @@ int otbMorphologicalPyramidSegmentationFilter(int itkNotUsed(argc), char * argv[
oss << outputFilenamePrefix << index << "." << outputFilenameSuffix;
writer = WriterType::New();
writer->SetInput(it.Get());
- writer->SetFileName(oss.str().c_str());
+ writer->SetFileName(oss.str());
writer->Update();
std::cout << oss.str() << " file written." << std::endl;
oss.str("");
diff --git a/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSegmentationFilterNew.cxx b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSegmentationFilterNew.cxx
deleted file mode 100644
index 6696f7065772be3067c648739df8735dce9d0abc..0000000000000000000000000000000000000000
--- a/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSegmentationFilterNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbMorphologicalPyramidSegmentationFilter.h"
-#include "otbImage.h"
-
-int otbMorphologicalPyramidSegmentationFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char InputPixelType;
- typedef unsigned short OutputPixelType;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
-
- typedef otb::MorphologicalPyramidSegmentationFilter<InputImageType, OutputImageType>
- SegmentationFilterType;
-
- // Instantiation
- SegmentationFilterType::Pointer filter = SegmentationFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSegmenterNew.cxx b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSegmenterNew.cxx
deleted file mode 100644
index 55911266f523d5632224c8419a764aa3fdc20614..0000000000000000000000000000000000000000
--- a/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSegmenterNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbMorphologicalPyramidSegmenter.h"
-#include "otbImage.h"
-
-int otbMorphologicalPyramidSegmenterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char InputPixelType;
- typedef unsigned short OutputPixelType;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
-
- typedef otb::MorphologicalPyramid::Segmenter<InputImageType, OutputImageType>
- SegmenterType;
-
- // Instantiation
- SegmenterType::Pointer segmenter = SegmenterType::New();
-
- std::cout << segmenter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSynthesisFilterNew.cxx b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSynthesisFilterNew.cxx
deleted file mode 100644
index d06275b3225e8baba9d19711deb74a23f2a990dd..0000000000000000000000000000000000000000
--- a/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSynthesisFilterNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbMorphologicalPyramidSynthesisFilter.h"
-#include "otbImage.h"
-
-int otbMorphologicalPyramidSynthesisFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char InputPixelType;
- typedef unsigned char OutputPixelType;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
-
- typedef otb::MorphologicalPyramidSynthesisFilter<InputImageType, OutputImageType>
- PyramidSynthesisFilterType;
-
- // Instantiation
- PyramidSynthesisFilterType::Pointer filter = PyramidSynthesisFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidTestDriver.cxx b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidTestDriver.cxx
index 5c94295dcfacd2f494c10d76536d64f058898a86..f7f2e8e669094a49c240666af9a594f607a4e503 100644
--- a/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidTestDriver.cxx
+++ b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidTestDriver.cxx
@@ -22,16 +22,10 @@
void RegisterTests()
{
- REGISTER_TEST(otbMorphologicalPyramidSegmentationFilterNew);
REGISTER_TEST(otbMorphologicalPyramidAnalysisFilter);
REGISTER_TEST(otbMorphologicalPyramidSegmenter);
- REGISTER_TEST(otbMorphologicalPyramidSegmenterNew);
REGISTER_TEST(otbMorphologicalPyramidSynthesisFilter);
REGISTER_TEST(otbMorphologicalPyramidMRToMSConverter);
- REGISTER_TEST(otbMorphologicalPyramidSynthesisFilterNew);
- REGISTER_TEST(otbMorphologicalPyramidMRToMSConverterNew);
REGISTER_TEST(otbMorphologicalPyramidResampler);
- REGISTER_TEST(otbMorphologicalPyramidAnalysisFilterNew);
- REGISTER_TEST(otbMorphologicalPyramidResamplerNew);
REGISTER_TEST(otbMorphologicalPyramidSegmentationFilter);
}
diff --git a/Modules/Filtering/Path/test/CMakeLists.txt b/Modules/Filtering/Path/test/CMakeLists.txt
index f3b6e373cc2a565097dee27acf0739499ec17f51..8413691536450fba3ab11bc5c02faa26a62607bc 100644
--- a/Modules/Filtering/Path/test/CMakeLists.txt
+++ b/Modules/Filtering/Path/test/CMakeLists.txt
@@ -23,31 +23,20 @@ otb_module_test()
set(OTBPathTests
otbPathTestDriver.cxx
otbCompacityPathRectangle.cxx
-otbVectorizationPathListFilterNew.cxx
-otbRegionImageToRectangularPathListFilterNew.cxx
otbImageToEdgePathFilter.cxx
otbCompacityPathCircle.cxx
otbDrawPathListFilterWithValue.cxx
-otbImageFittingPolygonListFilterNew.cxx
otbDrawPath.cxx
otbCompacityPathSquare.cxx
otbPathLengthFunctor.cxx
otbPathListToHistogramGenerator.cxx
otbImageFittingPolygonListFilter.cxx
-otbImageToPathFilterNew.cxx
-otbImageToEdgePathFilterNew.cxx
otbDrawPathListFilter.cxx
-otbDrawPathListFilterNew.cxx
otbDrawPathFilter.cxx
otbOrientationPath.cxx
-otbOrientationPathNew.cxx
-otbDrawPathFilterNew.cxx
otbPolyLineImageConstIterator.cxx
otbRegionImageToRectangularPathListFilter.cxx
otbVectorizationPathListFilter.cxx
-otbPathListToPathListFilterNew.cxx
-otbPathListToHistogramGeneratorNew.cxx
-otbCompacityPathNew.cxx
otbClosePathFunctor.cxx
otbPolyLineImageIterator.cxx
)
@@ -61,12 +50,6 @@ otb_module_target_label(otbPathTestDriver)
otb_add_test(NAME feTuCompacityPathRectangle COMMAND otbPathTestDriver
otbCompacityPathRectangle 10.0 20.0)
-otb_add_test(NAME feTuVectorizationPathListFilterNew COMMAND otbPathTestDriver
- otbVectorizationPathListFilterNew)
-
-otb_add_test(NAME feTuRegionImageToRectangularPathListFilterNew COMMAND otbPathTestDriver
- otbRegionImageToRectangularPathListFilterNew)
-
otb_add_test(NAME feTvImageToEdgePathFilterBis COMMAND otbPathTestDriver
--compare-image ${EPSILON_8}
${BASELINE}/feImageToEdgePathFilter_maskrom.png
@@ -99,9 +82,6 @@ otb_add_test(NAME coTvDrawPathListFilterWithValue COMMAND otbPathTestDriver
${TEMP}/coTvDrawPathListFilterWithValueOutput.png
)
-otb_add_test(NAME feTuImageFittingPolygonListFilterNew COMMAND otbPathTestDriver
- otbImageFittingPolygonListFilterNew)
-
otb_add_test(NAME feTvDrawPathTestCarre COMMAND otbPathTestDriver
--compare-image ${NOTOL} ${BASELINE}/feDrawPathDessinCarre.png
${TEMP}/feDrawPathDessinCarre.png
@@ -135,12 +115,6 @@ otb_add_test(NAME feTvImageFittingPolygonListFilter COMMAND otbPathTestDriver
5 10
)
-otb_add_test(NAME coTuImageToPathFilterNew COMMAND otbPathTestDriver
- otbImageToPathFilterNew)
-
-otb_add_test(NAME feTuImageToEdgePathFilterNew COMMAND otbPathTestDriver
- otbImageToEdgePathFilterNew)
-
otb_add_test(NAME coTvDrawPathListFilter COMMAND otbPathTestDriver
--compare-image ${NOTOL}
${BASELINE}/coTvDrawPathListFilterOutput.png
@@ -150,9 +124,6 @@ otb_add_test(NAME coTvDrawPathListFilter COMMAND otbPathTestDriver
${TEMP}/coTvDrawPathListFilterOutput.png
)
-otb_add_test(NAME coTuDrawPathListFilterNew COMMAND otbPathTestDriver
- otbDrawPathListFilterNew)
-
otb_add_test(NAME coTvDrawPatFilter COMMAND otbPathTestDriver
--compare-image ${NOTOL}
${BASELINE}/coTvDrawPathFilterOutput.png
@@ -175,12 +146,6 @@ otb_add_test(NAME feTuOrientationPath_000 COMMAND otbPathTestDriver
otb_add_test(NAME feTuOrientationPath1_80 COMMAND otbPathTestDriver
otbOrientationPath 180.0)
-otb_add_test(NAME feTuOrientationPathNew COMMAND otbPathTestDriver
- otbOrientationPathNew)
-
-otb_add_test(NAME coTuDrawPatFilterNew COMMAND otbPathTestDriver
- otbDrawPathFilterNew
- )
otb_add_test(NAME coTvPolyLineImageConstIterator COMMAND otbPathTestDriver
--compare-ascii ${NOTOL}
@@ -224,15 +189,6 @@ otb_add_test(NAME feTvVectorizationPathListFilterAsciiOutput COMMAND otbPathTest
0.0005
)
-otb_add_test(NAME coTuPathListToPathListFilterNew COMMAND otbPathTestDriver
- otbPathListToPathListFilterNew)
-
-otb_add_test(NAME coTuPathListToHistogramGeneratorNew COMMAND otbPathTestDriver
- otbPathListToHistogramGeneratorNew)
-
-
-otb_add_test(NAME feTuCompacityPathNew COMMAND otbPathTestDriver
- otbCompacityPathNew)
otb_add_test(NAME bfTvClosePathFunctor COMMAND otbPathTestDriver
--compare-ascii ${NOTOL}
diff --git a/Modules/Filtering/Path/test/otbCompacityPathNew.cxx b/Modules/Filtering/Path/test/otbCompacityPathNew.cxx
deleted file mode 100644
index 1395eb90584092133788f1e7adbc58fe00c38772..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Path/test/otbCompacityPathNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include <cstdlib>
-
-#include "otbCompacityPathFunction.h"
-#include "itkPolyLineParametricPath.h"
-#include "itkMacro.h"
-
-int otbCompacityPathNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef itk::PolyLineParametricPath<Dimension> PathType;
- typedef otb::CompacityPathFunction<PathType> FunctionType;
-
- FunctionType::Pointer function = FunctionType::New();
-
- std::cout << function << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Path/test/otbDrawPathFilterNew.cxx b/Modules/Filtering/Path/test/otbDrawPathFilterNew.cxx
deleted file mode 100644
index 07b57233afd76e05c02ef4bc1bcb90f8c68e6e6d..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Path/test/otbDrawPathFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbDrawPathFilter.h"
-#include "otbImageFileWriter.h"
-#include "otbImage.h"
-#include "itkPolyLineParametricPath.h"
-
-int otbDrawPathFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef itk::PolyLineParametricPath<Dimension> PathType;
- typedef otb::DrawPathFilter<ImageType, PathType, ImageType> DrawPathFilterType;
-
- DrawPathFilterType::Pointer filter = DrawPathFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Path/test/otbDrawPathListFilterNew.cxx b/Modules/Filtering/Path/test/otbDrawPathListFilterNew.cxx
deleted file mode 100644
index 700233508b69242ee9fe382392af231a38f0bc0d..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Path/test/otbDrawPathListFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbDrawPathListFilter.h"
-#include "otbImage.h"
-#include "itkPolyLineParametricPath.h"
-
-int otbDrawPathListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef itk::PolyLineParametricPath<Dimension> PathType;
- typedef otb::DrawPathListFilter<ImageType, PathType, ImageType> DrawPathListFilterType;
-
- // Instantiating object
- DrawPathListFilterType::Pointer filter = DrawPathListFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Path/test/otbImageFittingPolygonListFilterNew.cxx b/Modules/Filtering/Path/test/otbImageFittingPolygonListFilterNew.cxx
deleted file mode 100644
index dd1c00c43e800ab6b4dde708b833ce35516b1aca..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Path/test/otbImageFittingPolygonListFilterNew.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbImageFittingPolygonListFilter.h"
-#include "otbPolygon.h"
-#include "otbImage.h"
-#include <cstdlib>
-
-int otbImageFittingPolygonListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef otb::Polygon<double> PolygonType;
- typedef otb::Image<double, Dimension> ImageType;
-
- typedef otb::ImageFittingPolygonListFilter<PolygonType, ImageType> FittingPolygonType;
-
- // Instantiating object
- FittingPolygonType::Pointer filter = FittingPolygonType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Path/test/otbImageToEdgePathFilterNew.cxx b/Modules/Filtering/Path/test/otbImageToEdgePathFilterNew.cxx
deleted file mode 100644
index 674a06f1b3b35a9e3cd5ae5f6f8da9364b4b8d80..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Path/test/otbImageToEdgePathFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "itkPolyLineParametricPath.h"
-#include "otbImageToEdgePathFilter.h"
-#include "otbImage.h"
-
-int otbImageToEdgePathFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef itk::PolyLineParametricPath<Dimension> PathType;
-
- typedef otb::ImageToEdgePathFilter<ImageType, PathType> ImageToEdgePathFilterType;
-
- ImageToEdgePathFilterType::Pointer filter = ImageToEdgePathFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Path/test/otbImageToPathFilterNew.cxx b/Modules/Filtering/Path/test/otbImageToPathFilterNew.cxx
deleted file mode 100644
index b558324db12ef20a09d393c3d47e6d6bdafd7f31..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Path/test/otbImageToPathFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "itkPolyLineParametricPath.h"
-#include "otbImageToPathFilter.h"
-#include "otbImage.h"
-
-int otbImageToPathFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef itk::PolyLineParametricPath<Dimension> PathType;
-
- typedef otb::ImageToPathFilter<ImageType, PathType> ImageToPathFilterType;
-
- ImageToPathFilterType::Pointer pathFilter = ImageToPathFilterType::New();
-
- std::cout << pathFilter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Path/test/otbOrientationPathNew.cxx b/Modules/Filtering/Path/test/otbOrientationPathNew.cxx
deleted file mode 100644
index fe20bc10e327dde72059f9535324e2f417f670bd..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Path/test/otbOrientationPathNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include <cstdlib>
-#include "otbOrientationPathFunction.h"
-#include "itkPolyLineParametricPath.h"
-#include "itkMacro.h"
-
-int otbOrientationPathNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef itk::PolyLineParametricPath<Dimension> PathType;
- typedef otb::OrientationPathFunction<PathType> FunctionType;
-
- FunctionType::Pointer function = FunctionType::New();
-
- std::cout << function << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Path/test/otbPathListToHistogramGeneratorNew.cxx b/Modules/Filtering/Path/test/otbPathListToHistogramGeneratorNew.cxx
deleted file mode 100644
index 237f663ff3ade6380c642f70e72629c4a57574d8..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Path/test/otbPathListToHistogramGeneratorNew.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-#include "itkPolyLineParametricPath.h"
-#include "otbOrientationPathFunction.h"
-#include "otbPathListToHistogramGenerator.h"
-
-int otbPathListToHistogramGeneratorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef itk::PolyLineParametricPath<Dimension> PathType;
- typedef otb::OrientationPathFunction<PathType> FunctionType;
-
- typedef otb::PathListToHistogramGenerator<PathType, FunctionType> GeneratorType;
-
- GeneratorType::Pointer histogram = GeneratorType::New();
-
- std::cout << histogram << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Path/test/otbPathListToPathListFilterNew.cxx b/Modules/Filtering/Path/test/otbPathListToPathListFilterNew.cxx
deleted file mode 100644
index de19819353cca2b4591cafd55a1842c037f77d20..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Path/test/otbPathListToPathListFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include <cstdlib>
-#include "otbPathListToPathListFilter.h"
-#include "itkPolyLineParametricPath.h"
-
-int otbPathListToPathListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef itk::PolyLineParametricPath<Dimension> PathType;
- typedef otb::PathListToPathListFilter<PathType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Path/test/otbPathTestDriver.cxx b/Modules/Filtering/Path/test/otbPathTestDriver.cxx
index 4945268d0302c342a965ff113886b30301652532..61a7ebb8f1e40689dbf0747f69feb1dce4e516df 100644
--- a/Modules/Filtering/Path/test/otbPathTestDriver.cxx
+++ b/Modules/Filtering/Path/test/otbPathTestDriver.cxx
@@ -23,31 +23,20 @@
void RegisterTests()
{
REGISTER_TEST(otbCompacityPathRectangle);
- REGISTER_TEST(otbVectorizationPathListFilterNew);
- REGISTER_TEST(otbRegionImageToRectangularPathListFilterNew);
REGISTER_TEST(otbImageToEdgePathFilter);
REGISTER_TEST(otbCompacityPathCircle);
REGISTER_TEST(otbDrawPathListFilterWithValue);
- REGISTER_TEST(otbImageFittingPolygonListFilterNew);
REGISTER_TEST(otbDrawPathDessinCarre);
REGISTER_TEST(otbCompacityPathSquare);
REGISTER_TEST(otbPathLengthFunctor);
REGISTER_TEST(otbPathListToHistogramGenerator);
REGISTER_TEST(otbImageFittingPolygonListFilter);
- REGISTER_TEST(otbImageToPathFilterNew);
- REGISTER_TEST(otbImageToEdgePathFilterNew);
REGISTER_TEST(otbDrawPathListFilter);
- REGISTER_TEST(otbDrawPathListFilterNew);
REGISTER_TEST(otbDrawPathFilter);
REGISTER_TEST(otbOrientationPath);
- REGISTER_TEST(otbOrientationPathNew);
- REGISTER_TEST(otbDrawPathFilterNew);
REGISTER_TEST(otbPolyLineImageConstIterator);
REGISTER_TEST(otbRegionImageToRectangularPathListFilter);
REGISTER_TEST(otbVectorizationPathListFilter);
- REGISTER_TEST(otbPathListToPathListFilterNew);
- REGISTER_TEST(otbPathListToHistogramGeneratorNew);
- REGISTER_TEST(otbCompacityPathNew);
REGISTER_TEST(otbClosePathFunctor);
REGISTER_TEST(otbPolyLineImageIterator);
}
diff --git a/Modules/Filtering/Path/test/otbRegionImageToRectangularPathListFilterNew.cxx b/Modules/Filtering/Path/test/otbRegionImageToRectangularPathListFilterNew.cxx
deleted file mode 100644
index 52eb324f233244ca8a5deb9ddc6badcd35d37207..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Path/test/otbRegionImageToRectangularPathListFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbRegionImageToRectangularPathListFilter.h"
-#include "itkPolyLineParametricPath.h"
-
-int otbRegionImageToRectangularPathListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned short InputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
-
- typedef otb::PolyLineParametricPathWithValue<double, Dimension> PathType;
- typedef otb::RegionImageToRectangularPathListFilter<InputImageType, PathType>
- RectangleListFilterType;
-
- RectangleListFilterType::Pointer filter = RectangleListFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Path/test/otbVectorizationPathListFilterNew.cxx b/Modules/Filtering/Path/test/otbVectorizationPathListFilterNew.cxx
deleted file mode 100644
index d94a14483fd6727510b1d31bfc912544fc494577..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Path/test/otbVectorizationPathListFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbVectorizationPathListFilter.h"
-#include "itkPolyLineParametricPath.h"
-
-int otbVectorizationPathListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef itk::PolyLineParametricPath<Dimension> PathType;
- typedef otb::VectorizationPathListFilter<ImageType, ImageType, PathType> VectorizationPathListFilterType;
-
- // Instantiating object
- VectorizationPathListFilterType::Pointer filter = VectorizationPathListFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Polarimetry/test/CMakeLists.txt b/Modules/Filtering/Polarimetry/test/CMakeLists.txt
index d1c77627cf5316b3353b3eab49f760faca17a690..e507a14bb8deb3b102cfc8dd3e1bf5955aca4721 100644
--- a/Modules/Filtering/Polarimetry/test/CMakeLists.txt
+++ b/Modules/Filtering/Polarimetry/test/CMakeLists.txt
@@ -25,32 +25,24 @@ otbPolarimetryTestDriver.cxx
otbMuellerToPolarisationDegreeAndPowerImageFilter.cxx
otbVectorMultiChannelsPolarimetricSynthesisFilter.cxx
otbReciprocalHAlphaImageFilter.cxx
-otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilterNew.cxx
otbReciprocalCovarianceToReciprocalCoherencyImageFilter.cxx
-otbReciprocalHAlphaImageFilterNew.cxx
otbSinclairToCoherencyMatrixFunctor.cxx
otbPolarimetricSynthesisFunctor.cxx
otbMultiChannelsPolarimetricSynthesisFilter.cxx
otbSinclairImageFilter.cxx
-otbReciprocalCovarianceToReciprocalCoherencyImageFilterNew.cxx
otbSinclairToCircularCovarianceMatrixFunctor.cxx
otbSinclairReciprocalImageFilter.cxx
otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.cxx
otbReciprocalCoherencyToReciprocalMuellerImageFilter.cxx
otbSinclairToReciprocalCovarianceMatrixFunctor.cxx
-otbReciprocalCovarianceToCoherencyDegreeImageFilterNew.cxx
otbMuellerToReciprocalCovarianceImageFilter.cxx
-otbReciprocalCoherencyToReciprocalMuellerImageFilterNew.cxx
otbSinclairToMuellerMatrixFunctor.cxx
otbMuellerToReciprocalCovarianceFunctor.cxx
otbPolarimetricData.cxx
-otbMuellerToReciprocalCovarianceImageFilterNew.cxx
otbSinclairToReciprocalCoherencyMatrixFunctor.cxx
otbSinclairToReciprocalCircularCovarianceMatrixFunctor.cxx
-otbMultiChannelsPolarimetricSynthesisFilterNew.cxx
otbSinclairToCovarianceMatrixFunctor.cxx
otbReciprocalCovarianceToCoherencyDegreeImageFilter.cxx
-otbMuellerToPolarisationDegreeAndPowerImageFilterNew.cxx
otbReciprocalBarnesDecomp.cxx
otbReciprocalHuynenDecomp.cxx
otbReciprocalPauliDecomp.cxx
@@ -125,9 +117,6 @@ otb_add_test(NAME saTvReciprocalPauliDecompImageFilter COMMAND otbPolarimetryTes
${TEMP}/saTvReciprocalPauliDecompImageFilter.tif
)
-otb_add_test(NAME saTuReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilterNew COMMAND otbPolarimetryTestDriver
- otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilterNew
- )
otb_add_test(NAME saTvReciprocalCovarianceToReciprocalCoherencyImageFilter COMMAND otbPolarimetryTestDriver
--compare-image ${EPSILON_7} ${BASELINE}/saTvSinclairImageFilter_SinclairToReciprocalCoherency.tif
@@ -137,21 +126,9 @@ otb_add_test(NAME saTvReciprocalCovarianceToReciprocalCoherencyImageFilter COMMA
${TEMP}/saTvMLCToCoherencyImageFilter.tif
)
-otb_add_test(NAME saTuReciprocalHAlphaImageFilterNew COMMAND otbPolarimetryTestDriver
- otbReciprocalHAlphaImageFilterNew
- )
-otb_add_test(NAME saTuReciprocalBarnesDecompImageFilterNew COMMAND otbPolarimetryTestDriver
- otbReciprocalBarnesDecompImageFilterNew
- )
-otb_add_test(NAME saTuReciprocalHuynenDecompImageFilterNew COMMAND otbPolarimetryTestDriver
- otbReciprocalHuynenDecompImageFilterNew
- )
-otb_add_test(NAME saTuReciprocalPauliDecompImageFilterNew COMMAND otbPolarimetryTestDriver
- otbReciprocalPauliDecompImageFilterNew
- )
otb_add_test(NAME saTuSinclairToCoherencyMatrixFunctor COMMAND otbPolarimetryTestDriver
otbSinclairToCoherencyMatrixFunctor
@@ -232,9 +209,6 @@ otb_add_test(NAME saTvSinclairImageFilter_SinclairToCovariance_C COMMAND otbPola
${TEMP}/saTvSinclairImageFilter_SinclairToCovariance_C.tif
)
-otb_add_test(NAME saTuSinclairImageFilterNew COMMAND otbPolarimetryTestDriver
- otbSinclairImageFilterNew
- )
otb_add_test(NAME saTvSinclairImageFilter_SinclairToCircularCovarianceMatrix COMMAND otbPolarimetryTestDriver
--compare-image ${EPSILON_7} ${BASELINE}/saTvSinclairImageFilter_SinclairToCircularCovarianceMatrix.tif
@@ -280,17 +254,11 @@ otb_add_test(NAME saTvSinclairImageFilter_SinclairToCoherency_C COMMAND otbPolar
${TEMP}/saTvSinclairImageFilter_SinclairToCoherency_C.tif
)
-otb_add_test(NAME saTuReciprocalCovarianceToReciprocalCoherencyImageFilterNew COMMAND otbPolarimetryTestDriver
- otbReciprocalCovarianceToReciprocalCoherencyImageFilterNew
- )
otb_add_test(NAME saTuSinclairToCircularCovarianceMatrixFunctor COMMAND otbPolarimetryTestDriver
otbSinclairToCircularCovarianceMatrixFunctor
)
-otb_add_test(NAME saTuSinclairReciprocalImageFilterNew COMMAND otbPolarimetryTestDriver
- otbSinclairReciprocalImageFilterNew
- )
otb_add_test(NAME saTvSinclairReciprocalImageFilter_SinclairToReciprocalCovariance COMMAND otbPolarimetryTestDriver
--compare-image ${EPSILON_7} ${BASELINE}/saTvSinclairImageFilter_SinclairToReciprocalCovariance.tif
@@ -380,9 +348,6 @@ otb_add_test(NAME saTuSinclairToReciprocalCovarianceMatrixFunctor COMMAND otbPol
otbSinclairToReciprocalCovarianceMatrixFunctor
)
-otb_add_test(NAME saTuReciprocalCovarianceToCoherencyDegreeImageFilterNew COMMAND otbPolarimetryTestDriver
- otbReciprocalCovarianceToCoherencyDegreeImageFilterNew
- )
otb_add_test(NAME saTvMuellerToReciprocalCovarianceImageFilter COMMAND otbPolarimetryTestDriver
--compare-image ${EPSILON_7} ${BASELINE}/saTvSinclairImageFilter_SinclairToReciprocalCovariance.tif
@@ -392,9 +357,6 @@ otb_add_test(NAME saTvMuellerToReciprocalCovarianceImageFilter COMMAND otbPolari
${TEMP}/saTvMuellerToMLCImageFilter.tif
)
-otb_add_test(NAME saTuReciprocalCoherencyToReciprocalMuellerImageFilterNew COMMAND otbPolarimetryTestDriver
- otbReciprocalCoherencyToReciprocalMuellerImageFilterNew
- )
otb_add_test(NAME saTuSinclairToMuellerMatrixFunctor COMMAND otbPolarimetryTestDriver
otbSinclairToMuellerMatrixFunctor
@@ -404,17 +366,11 @@ otb_add_test(NAME saTvMuellerToReciprocalCovarianceFunctor COMMAND otbPolarimetr
otbMuellerToReciprocalCovarianceFunctor
)
-otb_add_test(NAME saTuPolarimetricDataNew COMMAND otbPolarimetryTestDriver
- otbPolarimetricDataNew
- )
otb_add_test(NAME saTvPolarimetricDataTest COMMAND otbPolarimetryTestDriver
otbPolarimetricDataTest
)
-otb_add_test(NAME saTuMuellerToReciprocalCovarianceImageFilterNew COMMAND otbPolarimetryTestDriver
- otbMuellerToReciprocalCovarianceImageFilterNew
- )
otb_add_test(NAME saTuSinclairToReciprocalCoherencyMatrixFunctor COMMAND otbPolarimetryTestDriver
otbSinclairToReciprocalCoherencyMatrixFunctor
@@ -424,9 +380,6 @@ otb_add_test(NAME saTuSinclairToReciprocalCircularCovarianceMatrixFunctor COMMAN
otbSinclairToReciprocalCircularCovarianceMatrixFunctor
)
-otb_add_test(NAME saTuMultiChannelsPolarimetricSynthesisFilterNew COMMAND otbPolarimetryTestDriver
- otbMultiChannelsPolarimetricSynthesisFilterNew
- )
otb_add_test(NAME saTuSinclairToCovarianceMatrixFunctor COMMAND otbPolarimetryTestDriver
otbSinclairToCovarianceMatrixFunctor
@@ -440,7 +393,4 @@ otb_add_test(NAME saTvReciprocalCovarianceToCoherencyDegreeImageFilter COMMAND o
${TEMP}/saTvMLCToCoherencyDegreeImageFilter.tif
)
-otb_add_test(NAME saTuMuellerToPolarisationDegreeAndPowerImageFilterNew COMMAND otbPolarimetryTestDriver
- otbMuellerToPolarisationDegreeAndPowerImageFilterNew
- )
diff --git a/Modules/Filtering/Polarimetry/test/otbMuellerToPolarisationDegreeAndPowerImageFilterNew.cxx b/Modules/Filtering/Polarimetry/test/otbMuellerToPolarisationDegreeAndPowerImageFilterNew.cxx
deleted file mode 100644
index f0cbafb6d0aaaa59f5f7feb64e815fd3ba390a44..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Polarimetry/test/otbMuellerToPolarisationDegreeAndPowerImageFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "itkMacro.h"
-#include <iostream>
-
-#include "otbVectorImage.h"
-#include "otbMuellerToPolarisationDegreeAndPowerImageFilter.h"
-
-int otbMuellerToPolarisationDegreeAndPowerImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
-
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
-
- typedef otb::MuellerToPolarisationDegreeAndPowerImageFilter<ImageType, ImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Polarimetry/test/otbMuellerToReciprocalCovarianceImageFilterNew.cxx b/Modules/Filtering/Polarimetry/test/otbMuellerToReciprocalCovarianceImageFilterNew.cxx
deleted file mode 100644
index a7b6f0d51f84a3cea9d338de627bee66e8e41d20..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Polarimetry/test/otbMuellerToReciprocalCovarianceImageFilterNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "itkMacro.h"
-#include <iostream>
-
-#include "otbVectorImage.h"
-#include "otbMuellerToReciprocalCovarianceImageFilter.h"
-
-int otbMuellerToReciprocalCovarianceImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
-
- typedef double PixelType;
- typedef std::complex<PixelType> ComplexPixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef otb::VectorImage<ComplexPixelType, Dimension> ComplexImageType;
-
- typedef otb::MuellerToReciprocalCovarianceImageFilter<ImageType, ComplexImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Polarimetry/test/otbMultiChannelsPolarimetricSynthesisFilterNew.cxx b/Modules/Filtering/Polarimetry/test/otbMultiChannelsPolarimetricSynthesisFilterNew.cxx
deleted file mode 100644
index 6c35703e39abd9f8f5766abbbb180f6f2b8c50ae..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Polarimetry/test/otbMultiChannelsPolarimetricSynthesisFilterNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "itkMacro.h"
-#include <iostream>
-
-#include "otbImage.h"
-#include "otbVectorImage.h"
-#include "otbMultiChannelsPolarimetricSynthesisFilter.h"
-
-int otbMultiChannelsPolarimetricSynthesisFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef double InputPixelType;
- typedef double OutputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::VectorImage<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
-
- typedef otb::MultiChannelsPolarimetricSynthesisFilter<InputImageType, OutputImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Polarimetry/test/otbPolarimetricData.cxx b/Modules/Filtering/Polarimetry/test/otbPolarimetricData.cxx
index 39e012e28eab760893112da85ed7baedab24cdbf..453f8803a8face99cc031ba682bb617290c8cbd2 100644
--- a/Modules/Filtering/Polarimetry/test/otbPolarimetricData.cxx
+++ b/Modules/Filtering/Polarimetry/test/otbPolarimetricData.cxx
@@ -24,12 +24,6 @@
#include "otbPolarimetricData.h"
-int otbPolarimetricDataNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- otb::PolarimetricData::Pointer data = otb::PolarimetricData::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Polarimetry/test/otbPolarimetryTestDriver.cxx b/Modules/Filtering/Polarimetry/test/otbPolarimetryTestDriver.cxx
index 92f5754e22d3a4188f4bb7236631e24cc31dabe5..0bb002a70c4de6d71b9c5c3c3c82d99ebc8956d2 100644
--- a/Modules/Filtering/Polarimetry/test/otbPolarimetryTestDriver.cxx
+++ b/Modules/Filtering/Polarimetry/test/otbPolarimetryTestDriver.cxx
@@ -25,39 +25,25 @@ void RegisterTests()
REGISTER_TEST(otbMuellerToPolarisationDegreeAndPowerImageFilter);
REGISTER_TEST(otbVectorMultiChannelsPolarimetricSynthesisFilter);
REGISTER_TEST(otbReciprocalHAlphaImageFilter);
- REGISTER_TEST(otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilterNew);
REGISTER_TEST(otbReciprocalCovarianceToReciprocalCoherencyImageFilter);
- REGISTER_TEST(otbReciprocalHAlphaImageFilterNew);
REGISTER_TEST(otbSinclairToCoherencyMatrixFunctor);
REGISTER_TEST(otbPolarimetricSynthesisFunctor);
REGISTER_TEST(otbMultiChannelsPolarimetricSynthesisFilter);
- REGISTER_TEST(otbSinclairImageFilterNew);
REGISTER_TEST(otbSinclairImageFilter);
- REGISTER_TEST(otbReciprocalCovarianceToReciprocalCoherencyImageFilterNew);
REGISTER_TEST(otbSinclairToCircularCovarianceMatrixFunctor);
- REGISTER_TEST(otbSinclairReciprocalImageFilterNew);
REGISTER_TEST(otbSinclairReciprocalImageFilter);
REGISTER_TEST(otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter);
REGISTER_TEST(otbReciprocalCoherencyToReciprocalMuellerImageFilter);
REGISTER_TEST(otbSinclairToReciprocalCovarianceMatrixFunctor);
- REGISTER_TEST(otbReciprocalCovarianceToCoherencyDegreeImageFilterNew);
REGISTER_TEST(otbMuellerToReciprocalCovarianceImageFilter);
- REGISTER_TEST(otbReciprocalCoherencyToReciprocalMuellerImageFilterNew);
REGISTER_TEST(otbSinclairToMuellerMatrixFunctor);
REGISTER_TEST(otbMuellerToReciprocalCovarianceFunctor);
- REGISTER_TEST(otbPolarimetricDataNew);
REGISTER_TEST(otbPolarimetricDataTest);
- REGISTER_TEST(otbMuellerToReciprocalCovarianceImageFilterNew);
REGISTER_TEST(otbSinclairToReciprocalCoherencyMatrixFunctor);
REGISTER_TEST(otbSinclairToReciprocalCircularCovarianceMatrixFunctor);
- REGISTER_TEST(otbMultiChannelsPolarimetricSynthesisFilterNew);
REGISTER_TEST(otbSinclairToCovarianceMatrixFunctor);
REGISTER_TEST(otbReciprocalCovarianceToCoherencyDegreeImageFilter);
- REGISTER_TEST(otbMuellerToPolarisationDegreeAndPowerImageFilterNew);
- REGISTER_TEST(otbReciprocalBarnesDecompImageFilterNew);
REGISTER_TEST(otbReciprocalBarnesDecompImageFilter);
- REGISTER_TEST(otbReciprocalHuynenDecompImageFilterNew);
REGISTER_TEST(otbReciprocalHuynenDecompImageFilter);
- REGISTER_TEST(otbReciprocalPauliDecompImageFilterNew);
REGISTER_TEST(otbReciprocalPauliDecompImageFilter);
}
diff --git a/Modules/Filtering/Polarimetry/test/otbReciprocalBarnesDecomp.cxx b/Modules/Filtering/Polarimetry/test/otbReciprocalBarnesDecomp.cxx
index db54c3e5649a9a826cfeaee4fe271a9e687affb0..989d79ca367c1f57872faae4251e282af49e8bf6 100644
--- a/Modules/Filtering/Polarimetry/test/otbReciprocalBarnesDecomp.cxx
+++ b/Modules/Filtering/Polarimetry/test/otbReciprocalBarnesDecomp.cxx
@@ -32,19 +32,6 @@
#include "otbSinclairReciprocalImageFilter.h"
#include "otbSinclairToReciprocalCoherencyMatrixFunctor.h"
-int otbReciprocalBarnesDecompImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
-
- typedef std::complex<double> PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
-
- typedef otb::ReciprocalBarnesDecompImageFilter<ImageType, ImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbReciprocalBarnesDecompImageFilter(int itkNotUsed(argc), char * argv[])
diff --git a/Modules/Filtering/Polarimetry/test/otbReciprocalCoherencyToReciprocalMuellerImageFilterNew.cxx b/Modules/Filtering/Polarimetry/test/otbReciprocalCoherencyToReciprocalMuellerImageFilterNew.cxx
deleted file mode 100644
index 0726c7fe156538e2abe80d685a31a72279c97865..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Polarimetry/test/otbReciprocalCoherencyToReciprocalMuellerImageFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "itkMacro.h"
-#include <iostream>
-
-#include "otbVectorImage.h"
-#include "otbReciprocalCoherencyToReciprocalMuellerImageFilter.h"
-
-int otbReciprocalCoherencyToReciprocalMuellerImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
-
- typedef std::complex<double> PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
-
- typedef otb::ReciprocalCoherencyToReciprocalMuellerImageFilter<ImageType, ImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Polarimetry/test/otbReciprocalCovarianceToCoherencyDegreeImageFilterNew.cxx b/Modules/Filtering/Polarimetry/test/otbReciprocalCovarianceToCoherencyDegreeImageFilterNew.cxx
deleted file mode 100644
index ff054a2b6b2605c511524985bff0e26d864177cd..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Polarimetry/test/otbReciprocalCovarianceToCoherencyDegreeImageFilterNew.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "itkMacro.h"
-#include <iostream>
-
-#include "otbVectorImage.h"
-#include "otbReciprocalCovarianceToCoherencyDegreeImageFilter.h"
-
-int otbReciprocalCovarianceToCoherencyDegreeImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
-
- typedef std::complex<double> PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
-
-
- typedef otb::ReciprocalCovarianceToCoherencyDegreeImageFilter<ImageType, ImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Polarimetry/test/otbReciprocalCovarianceToReciprocalCoherencyImageFilterNew.cxx b/Modules/Filtering/Polarimetry/test/otbReciprocalCovarianceToReciprocalCoherencyImageFilterNew.cxx
deleted file mode 100644
index 572ce4fe5ec233399f0fe66e59859af1f2340fda..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Polarimetry/test/otbReciprocalCovarianceToReciprocalCoherencyImageFilterNew.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "itkMacro.h"
-#include <iostream>
-
-#include "otbVectorImage.h"
-#include "otbReciprocalCovarianceToReciprocalCoherencyImageFilter.h"
-
-int otbReciprocalCovarianceToReciprocalCoherencyImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
-
- typedef std::complex<double> PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
-
-
- typedef otb::ReciprocalCovarianceToReciprocalCoherencyImageFilter<ImageType, ImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Polarimetry/test/otbReciprocalHAlphaImageFilterNew.cxx b/Modules/Filtering/Polarimetry/test/otbReciprocalHAlphaImageFilterNew.cxx
deleted file mode 100644
index a2114ae8d8faf80ebf3915f0bda062561a37655e..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Polarimetry/test/otbReciprocalHAlphaImageFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "itkMacro.h"
-#include <iostream>
-
-#include "otbVectorImage.h"
-#include "otbReciprocalHAlphaImageFilter.h"
-
-int otbReciprocalHAlphaImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
-
- typedef std::complex<double> PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
-
- typedef otb::ReciprocalHAlphaImageFilter<ImageType, ImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Polarimetry/test/otbReciprocalHuynenDecomp.cxx b/Modules/Filtering/Polarimetry/test/otbReciprocalHuynenDecomp.cxx
index 96c97e972c850f40772bdfb1246f1b138a858386..9561c7b48cc1dbe3f49568603718fd92c2ba781e 100644
--- a/Modules/Filtering/Polarimetry/test/otbReciprocalHuynenDecomp.cxx
+++ b/Modules/Filtering/Polarimetry/test/otbReciprocalHuynenDecomp.cxx
@@ -32,19 +32,6 @@
#include "otbSinclairReciprocalImageFilter.h"
#include "otbSinclairToReciprocalCoherencyMatrixFunctor.h"
-int otbReciprocalHuynenDecompImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
-
- typedef std::complex<double> PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
-
- typedef otb::ReciprocalHuynenDecompImageFilter<ImageType, ImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbReciprocalHuynenDecompImageFilter(int itkNotUsed(argc), char * argv[])
diff --git a/Modules/Filtering/Polarimetry/test/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilterNew.cxx b/Modules/Filtering/Polarimetry/test/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilterNew.cxx
deleted file mode 100644
index 724d58283c00a196bddaf470b489a3fe0bcd76e0..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Polarimetry/test/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilterNew.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "itkMacro.h"
-#include <iostream>
-
-#include "otbVectorImage.h"
-#include "otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.h"
-
-int otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
-
- typedef std::complex<double> PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
-
-
- typedef otb::ReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter<ImageType, ImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Polarimetry/test/otbReciprocalPauliDecomp.cxx b/Modules/Filtering/Polarimetry/test/otbReciprocalPauliDecomp.cxx
index b82622c51ef478c16f391db0b1dcc3e2d297fdf4..587a33ef650ba410fe03e669b033af6929387180 100644
--- a/Modules/Filtering/Polarimetry/test/otbReciprocalPauliDecomp.cxx
+++ b/Modules/Filtering/Polarimetry/test/otbReciprocalPauliDecomp.cxx
@@ -29,19 +29,6 @@
#include "otbReciprocalPauliDecompImageFilter.h"
#include "otbNRIBandImagesToOneNComplexBandsImage.h"
-int otbReciprocalPauliDecompImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
-
- typedef std::complex<double> PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
-
- typedef otb::ReciprocalPauliDecompImageFilter<ImageType, ImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbReciprocalPauliDecompImageFilter(int itkNotUsed(argc), char * argv[])
diff --git a/Modules/Filtering/Polarimetry/test/otbSinclairImageFilter.cxx b/Modules/Filtering/Polarimetry/test/otbSinclairImageFilter.cxx
index 07e3fda0f10771104d089407328f18f99df31945..2e2c24245cd6ddcd643f3727f22bde08f3210c63 100644
--- a/Modules/Filtering/Polarimetry/test/otbSinclairImageFilter.cxx
+++ b/Modules/Filtering/Polarimetry/test/otbSinclairImageFilter.cxx
@@ -33,20 +33,6 @@
#include "otbMultiChannelExtractROI.h"
-int otbSinclairImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef std::complex<float> ComplexType;
- typedef otb::Image<ComplexType, 2> CplxImageType;
- typedef otb::VectorImage<ComplexType, 2> VCplxImageType;
-
- typedef otb::SinclairImageFilter<CplxImageType, CplxImageType, CplxImageType, CplxImageType, VCplxImageType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
-
- return EXIT_SUCCESS;
-}
template<class TInputPixel, class TOutputPixel, class TFunction>
diff --git a/Modules/Filtering/Polarimetry/test/otbSinclairReciprocalImageFilter.cxx b/Modules/Filtering/Polarimetry/test/otbSinclairReciprocalImageFilter.cxx
index 9091c64726fe8b082067be9a34eb4d01192e73ce..471c300ecf8ec0943648c9398898774b75afa45a 100644
--- a/Modules/Filtering/Polarimetry/test/otbSinclairReciprocalImageFilter.cxx
+++ b/Modules/Filtering/Polarimetry/test/otbSinclairReciprocalImageFilter.cxx
@@ -32,20 +32,6 @@
#include "otbMultiChannelExtractROI.h"
-int otbSinclairReciprocalImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef std::complex<float> ComplexType;
- typedef otb::Image<ComplexType, 2> CplxImageType;
- typedef otb::VectorImage<ComplexType, 2> VCplxImageType;
-
- typedef otb::SinclairReciprocalImageFilter<CplxImageType, CplxImageType, CplxImageType, VCplxImageType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
-
- return EXIT_SUCCESS;
-}
template<class TInputPixel, class TOutputPixel, class TFunction>
diff --git a/Modules/Filtering/Projection/test/CMakeLists.txt b/Modules/Filtering/Projection/test/CMakeLists.txt
index 022daa7b56d1c82b62f3118785246c1807c3cb74..76d7f0bb1f39d2317f3a8f84a17191b42a2aaed5 100644
--- a/Modules/Filtering/Projection/test/CMakeLists.txt
+++ b/Modules/Filtering/Projection/test/CMakeLists.txt
@@ -25,22 +25,16 @@ otbSensorModel.cxx
otbProjectionTestDriver.cxx
otbVectorDataProjectionFilterFromGeoToMap.cxx
otbOrthoRectificationFilter.cxx
-otbGCPsToRPCSensorModelImageFilterNew.cxx
otbMapProjection.cxx
otbGenericRSResampleImageFilter.cxx
otbGeometriesProjectionFilter.cxx
otbGenericRSTransformGenericTest.cxx
-otbLeastSquareAffineTransformEstimatorNew.cxx
otbVectorDataTransformFilter.cxx
otbRationalTransformToDisplacementFieldSource.cxx
-otbImportGeoInformationImageFilterNew.cxx
otbVectorDataProjectionFilterFromMapToSensor.cxx
-otbCompositeTransformNew.cxx
otbRationalTransform.cxx
otbGeometriesProjectionFilterFromMapToSensor.cxx
otbImageToEnvelopeVectorDataFilter.cxx
-otbMapProjectionsNew.cxx
-otbOrthoRectificationFilterNew.cxx
otbImageToGenericRSOutputParameters.cxx
otbGeometriesProjectionFilterFromMapToGeo.cxx
otbROIdataConversion.cxx
@@ -52,7 +46,6 @@ otbGenericRSTransformFromImage.cxx
otbCompositeTransform.cxx
otbLeastSquareAffineTransformEstimator.cxx
otbSpectralAngleDataNodeFeatureFunction.cxx
-otbROIdataConversionNew.cxx
otbGCPsToRPCSensorModelImageFilterCheckRpcModel.cxx
otbGeographicalDistance.cxx
otbTileImageFilterRSTransformTest.cxx
@@ -64,7 +57,6 @@ otbGeometriesProjectionFilterFromMapToImage.cxx
otbGeometriesProjectionFilterFromMapToEPSG.cxx
otbVectorDataProjectionFilter.cxx
otbUtmMapProjection.cxx
-otbVectorDataProjectionFilterNew.cxx
otbTileMapTransform.cxx
otbImportGeoInformationImageFilter.cxx
)
@@ -349,9 +341,6 @@ endforeach()
#------------------------------------------------------------------------
-otb_add_test(NAME prTuGCPsToRPCSensorModelImageFilterNew COMMAND otbProjectionTestDriver
- otbGCPsToRPCSensorModelImageFilterNew)
-
otb_add_test(NAME prTvMapProjection COMMAND otbProjectionTestDriver
--compare-ascii ${EPSILON_4} ${BASELINE_FILES}/prTvMapProjection.txt
${TEMP}/prTvMapProjection.txt
@@ -359,10 +348,6 @@ otb_add_test(NAME prTvMapProjection COMMAND otbProjectionTestDriver
${TEMP}/prTvMapProjection.txt
)
-otb_add_test(NAME prTuotbGenericRSResampleImageFilterNew COMMAND otbProjectionTestDriver
- otbGenericRSResampleImageFilterNew
- )
-
otb_add_test(NAME prTvotbGenericRSResampleImageFilter COMMAND otbProjectionTestDriver
--compare-image ${EPSILON_4}
${BASELINE}/prTvotbGenericRSResampleImageFilterOutput.tif
@@ -415,11 +400,6 @@ otb_add_test(NAME prTvGenericRSTransformGenericTestEPSG4326toEPSG4326 COMMAND ot
otbGenericRSTransformGenericTest
1.35617289802566 43.4876035537 1.35617289802566 43.4876035537 EPSG 4326 EPSG 4326 GEO 1e-6 GEO 1e-6 NOELEV)
-otb_add_test(NAME prTuLeastSquareAffineTransformEstimatorNew COMMAND otbProjectionTestDriver
- otbLeastSquareAffineTransformEstimatorNew)
-
-otb_add_test(NAME prTuVectorDataTransformFilterNew COMMAND otbProjectionTestDriver
- otbVectorDataTransformFilterNew)
otb_add_test(NAME prTvVectorDataTransformFilter COMMAND otbProjectionTestDriver
--compare-ogr ${EPSILON_4}
@@ -438,10 +418,6 @@ otb_add_test(NAME prTvRationalTransformToDisplacementFieldSourceTest COMMAND otb
${TEMP}/prTvRationalTransformToDisplacementFieldSourceTest.hdr
)
-otb_add_test(NAME bfTuImportGeoInformationImageFilterNew COMMAND otbProjectionTestDriver
- otbImportGeoInformationImageFilterNew)
-
-
otb_add_test(NAME prTvVectorDataProjectionFilterFromMapToSensor COMMAND otbProjectionTestDriver
--compare-ogr ${NOTOL}
${BASELINE_FILES}/prTvVectorDataProjectionFilterFromMapToSensor.shp
@@ -452,8 +428,6 @@ otb_add_test(NAME prTvVectorDataProjectionFilterFromMapToSensor COMMAND otbProje
${TEMP}/prTvVectorDataProjectionFilterFromMapToSensor.shp
)
-otb_add_test(NAME prTuCompositeTransformNew COMMAND otbProjectionTestDriver otbCompositeTransformNew )
-
otb_add_test(NAME prTvRationalTransform COMMAND otbProjectionTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/otbRationalTransformOutput.txt
@@ -466,9 +440,6 @@ otb_add_test(NAME prTvRationalTransform COMMAND otbProjectionTestDriver
-10 -10
)
-otb_add_test(NAME prTuRationalTransformNew COMMAND otbProjectionTestDriver
- otbRationalTransformNew)
-
otb_add_test(NAME prTvGeometriesProjectionFilterFromMapToSensor COMMAND otbProjectionTestDriver
--compare-ogr ${NOTOL}
${BASELINE_FILES}/prTvVectorDataProjectionFilterFromMapToSensor.shp
@@ -488,22 +459,13 @@ otb_add_test(NAME prTvImageToEnvelopeVectorDataFilter COMMAND otbProjectionTestD
${TEMP}/prTvImageToEnvelopeVectorDataFilterOutput.kml
)
-otb_add_test(NAME prTuImageToEnvelopeVectorDataFilterNew COMMAND otbProjectionTestDriver
- otbImageToEnvelopeVectorDataFilterNew)
-
-otb_add_test(NAME prTuMapProjectionsNew COMMAND otbProjectionTestDriver otbMapProjectionsNew )
-
otb_add_test(NAME prTvMapProjectionsTest COMMAND otbProjectionTestDriver
--compare-ascii ${EPSILON_4} ${BASELINE_FILES}/prTvMapProjectionsTest.txt
${TEMP}/prTvMapProjectionsTest.txt
- otbMapProjectionsTest
+ otbMapProjectionAccessorsTest
${TEMP}/prTvMapProjectionsTest.txt
)
-
-otb_add_test(NAME prTuOrthoRectificationFilterNew COMMAND otbProjectionTestDriver
- otbOrthoRectificationFilterNew )
-
otb_add_test(NAME prTvImageToGenericRSOutputParameters COMMAND otbProjectionTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/prTvImageToGenericRSOutputParametersOutput.txt
@@ -513,9 +475,6 @@ otb_add_test(NAME prTvImageToGenericRSOutputParameters COMMAND otbProjectionTest
${TEMP}/prTvImageToGenericRSOutputParametersOutput.txt
)
-otb_add_test(NAME prTuImageToGenericRSOutputParametersNew COMMAND otbProjectionTestDriver
- otbImageToGenericRSOutputParametersNew)
-
otb_add_test(NAME prTvGeometriesProjectionFilterFromMapToGeo COMMAND otbProjectionTestDriver
--compare-ogr ${NOTOL}
${BASELINE_FILES}/prTvVectorDataProjectionFilterFromMapToGeo.kml
@@ -551,10 +510,6 @@ otb_add_test(NAME prTvPhysicalToRPCSensorModelImageFilter COMMAND otbProjectionT
${TEMP}/prTvotbPhysicalToRPCSensorModelImageFilter.tif
)
-otb_add_test(NAME prTuPhysicalToRPCSensorModelImageFilterNew COMMAND otbProjectionTestDriver
- otbPhysicalToRPCSensorModelImageFilter
- )
-
otb_add_test(NAME prTuGeometriesProjectionFilterFromGeoToMap COMMAND otbProjectionTestDriver
otbGeometriesProjectionFilterFromGeoToMap
${INPUTDATA}/ToulousePointsWGS.sqlite
@@ -658,10 +613,6 @@ otb_add_test(NAME bfTvSpectralAngleDataNodeFeatureFunction_Polygon COMMAND otbPr
${TEMP}/bfTvSpectralAngleDataNodeFeatureFunctionOutput_Polygon.shp
0 )
-otb_add_test(NAME bfTuSpectralAngleDataNodeFeatureFunctionNew COMMAND otbProjectionTestDriver
- otbSpectralAngleDataNodeFeatureFunctionNew
- )
-
otb_add_test(NAME bfTvSpectralAngleDataNodeFeatureFunction_Line COMMAND otbProjectionTestDriver
--compare-ogr ${NOTOL}
${BASELINE_FILES}/bfTvSpectralAngleDataNodeFeatureFunctionOutput_Line.shp
@@ -674,9 +625,6 @@ otb_add_test(NAME bfTvSpectralAngleDataNodeFeatureFunction_Line COMMAND otbProje
0
)
-otb_add_test(NAME leTuROIdataConversionNew COMMAND otbProjectionTestDriver
- otbROIdataConversionNew)
-
otb_add_test(NAME prTvGCPsToRPCSensorModelImageCheckInputGcpPointsProjection_WithDEM COMMAND otbProjectionTestDriver
otbGCPsToRPCSensorModelImageFilterCheckRpcModel
-in ${INPUTDATA}/QB_TOULOUSE_MUL_Extract_500_500.tif
@@ -892,9 +840,6 @@ otb_add_test(NAME prTvGCPsToRPCSensorModelImageCheckInputGcpPointsProjection_Wit
-err 10 # Tolerance in meters, the first goal of this test
)
-otb_add_test(NAME prTuGeographicalDistanceNew COMMAND otbProjectionTestDriver
- otbGeographicalDistanceNew)
-
otb_add_test(NAME prTvGeographicalDistance COMMAND otbProjectionTestDriver
otbGeographicalDistance
-1.84944 53.14722
@@ -1212,8 +1157,6 @@ otb_add_test(NAME prTvUtmMapProjection COMMAND otbProjectionTestDriver
${TEMP}/prTvUtmMapProjection.txt
)
-otb_add_test(NAME prTuVectorDataProjectionFilterNew COMMAND otbProjectionTestDriver otbVectorDataProjectionFilterNew )
-
otb_add_test(NAME prTvTileMapTransform COMMAND otbProjectionTestDriver
--compare-ascii ${EPSILON_4} ${BASELINE_FILES}/prTvTileMapTransform.txt
${TEMP}/prTvTileMapTransform.txt
diff --git a/Modules/Filtering/Projection/test/otbCompositeTransformNew.cxx b/Modules/Filtering/Projection/test/otbCompositeTransformNew.cxx
deleted file mode 100644
index d6758de1fe5457d5999c098d7e16de81af9c76eb..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Projection/test/otbCompositeTransformNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include <iostream>
-
-#include "otbCompositeTransform.h"
-#include "otbMapProjections.h"
-#include "otbInverseSensorModel.h"
-
-int otbCompositeTransformNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::UtmInverseProjection MapProjectionType;
- typedef otb::InverseSensorModel<double> SensorModelType;
-
- typedef otb::CompositeTransform<MapProjectionType, SensorModelType> CompositeTransformType;
- CompositeTransformType::Pointer transform = CompositeTransformType::New();
-
- std::cout << transform << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Projection/test/otbGCPsToRPCSensorModelImageFilterNew.cxx b/Modules/Filtering/Projection/test/otbGCPsToRPCSensorModelImageFilterNew.cxx
deleted file mode 100644
index 9bdbd98bfdf961db878124b5b8494a754cd0ff8c..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Projection/test/otbGCPsToRPCSensorModelImageFilterNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbMacro.h"
-#include "otbImage.h"
-#include "otbGCPsToRPCSensorModelImageFilter.h"
-
-int otbGCPsToRPCSensorModelImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::Image<float, 2> ImageType;
- typedef otb::GCPsToRPCSensorModelImageFilter<ImageType> GCPToSensorModelFilterType;
-
- // Instantiation
- GCPToSensorModelFilterType::Pointer filter = GCPToSensorModelFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Projection/test/otbGenericRSResampleImageFilter.cxx b/Modules/Filtering/Projection/test/otbGenericRSResampleImageFilter.cxx
index 0873af5c2424ef4db86896cdbcc9edc5692070ba..ae63c4d8eac60270f60d8193b41fdee2ff770b80 100644
--- a/Modules/Filtering/Projection/test/otbGenericRSResampleImageFilter.cxx
+++ b/Modules/Filtering/Projection/test/otbGenericRSResampleImageFilter.cxx
@@ -43,13 +43,6 @@ typedef ImageResamplerType::SpacingType SpacingType;
typedef otb::ImageFileReader<ImageType> ReaderType;
typedef otb::ImageFileWriter<ImageType> WriterType;
-int otbGenericRSResampleImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- // SmartPointer instantiation
- ImageResamplerType::Pointer resampler = ImageResamplerType::New();
- std::cout << resampler << std::endl;
- return EXIT_SUCCESS;
-}
int otbGenericRSResampleImageFilter(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/Filtering/Projection/test/otbGeographicalDistance.cxx b/Modules/Filtering/Projection/test/otbGeographicalDistance.cxx
index c22069156ffa02f5bf3f512ad72eb76579d74e99..4ccce61ac52f54cac3b2bbb2aca4f7a733e65467 100644
--- a/Modules/Filtering/Projection/test/otbGeographicalDistance.cxx
+++ b/Modules/Filtering/Projection/test/otbGeographicalDistance.cxx
@@ -21,16 +21,6 @@
#include "itkPoint.h"
#include "otbGeographicalDistance.h"
-int otbGeographicalDistanceNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef itk::Point<double, 2> PointType;
- typedef otb::GeographicalDistance<PointType> DistanceType;
-
- // Instantiation
- DistanceType::Pointer distance = DistanceType::New();
-
- return EXIT_SUCCESS;
-}
int otbGeographicalDistance(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Filtering/Projection/test/otbImageToEnvelopeVectorDataFilter.cxx b/Modules/Filtering/Projection/test/otbImageToEnvelopeVectorDataFilter.cxx
index e2b5ccb6f91168d4afc2bd568ef4d61fd6af7485..4969adf7ba141515ba229b4e124c3a829b877b7e 100644
--- a/Modules/Filtering/Projection/test/otbImageToEnvelopeVectorDataFilter.cxx
+++ b/Modules/Filtering/Projection/test/otbImageToEnvelopeVectorDataFilter.cxx
@@ -33,13 +33,6 @@ typedef otb::VectorDataFileWriter<VectorDataType> WriterType;
typedef otb::ImageToEnvelopeVectorDataFilter
<ImageType, VectorDataType> FilterType;
-int otbImageToEnvelopeVectorDataFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- // Instantiation
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbImageToEnvelopeVectorDataFilter(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/Filtering/Projection/test/otbImageToGenericRSOutputParameters.cxx b/Modules/Filtering/Projection/test/otbImageToGenericRSOutputParameters.cxx
index 465aa65bd103f3fc8d156989876e372e90704c3e..913963df6e5f2387f07403f0c49bb79cb77fce1f 100644
--- a/Modules/Filtering/Projection/test/otbImageToGenericRSOutputParameters.cxx
+++ b/Modules/Filtering/Projection/test/otbImageToGenericRSOutputParameters.cxx
@@ -31,13 +31,6 @@
typedef otb::VectorImage<double, 2> ImageType;
typedef otb::ImageToGenericRSOutputParameters<ImageType> FilterType;
-int otbImageToGenericRSOutputParametersNew (int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
-
int otbImageToGenericRSOutputParameters (int itkNotUsed(argc), char * argv[])
{
const char * infname = argv[1];
diff --git a/Modules/Filtering/Projection/test/otbImportGeoInformationImageFilterNew.cxx b/Modules/Filtering/Projection/test/otbImportGeoInformationImageFilterNew.cxx
deleted file mode 100644
index 4e73ec154f31bbe1849a982f894cc516f80b7b18..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Projection/test/otbImportGeoInformationImageFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbImportGeoInformationImageFilter.h"
-#include "otbImage.h"
-
-int otbImportGeoInformationImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::ImportGeoInformationImageFilter<ImageType, ImageType> ImportGeoInformationImageFilterType;
-
- // Instantiating object
- ImportGeoInformationImageFilterType::Pointer filter = ImportGeoInformationImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Projection/test/otbLeastSquareAffineTransformEstimatorNew.cxx b/Modules/Filtering/Projection/test/otbLeastSquareAffineTransformEstimatorNew.cxx
deleted file mode 100644
index f612d3a21da0899fc992f78e9277b6e3efc9a158..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Projection/test/otbLeastSquareAffineTransformEstimatorNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbMacro.h"
-#include "otbLeastSquareAffineTransformEstimator.h"
-#include "itkPoint.h"
-
-int otbLeastSquareAffineTransformEstimatorNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef itk::Point<float, 2> PointType;
- typedef otb::LeastSquareAffineTransformEstimator<PointType> EstimatorType;
-
- // instantiation
- EstimatorType::Pointer estimator = EstimatorType::New();
-
- std::cout << estimator << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Projection/test/otbMapProjection.cxx b/Modules/Filtering/Projection/test/otbMapProjection.cxx
index b98e839787448e3e66c4c811a09f5820de145009..827089490cf62f568ee0afc527a8310c82b2fb98 100644
--- a/Modules/Filtering/Projection/test/otbMapProjection.cxx
+++ b/Modules/Filtering/Projection/test/otbMapProjection.cxx
@@ -130,3 +130,83 @@ int otbMapProjection(int itkNotUsed(argc), char* argv[])
return EXIT_SUCCESS;
}
+
+
+//Test the specific accessors for some map projection
+int otbMapProjectionAccessorsTest(int itkNotUsed(argc), char * argv[])
+{
+ char * filename = argv[1];
+ std::ofstream file;
+ file.open(filename);
+
+ otb::Eckert4InverseProjection::Pointer lEckert4Projection = otb::Eckert4InverseProjection::New();
+ file << lEckert4Projection->GetFalseEasting() << std::endl;
+ file << lEckert4Projection->GetFalseNorthing() << std::endl;
+ lEckert4Projection->SetFalseEasting(500000);
+ lEckert4Projection->SetFalseNorthing(500000);
+ file << lEckert4Projection->GetFalseEasting() << std::endl;
+ file << lEckert4Projection->GetFalseNorthing() << std::endl;
+ lEckert4Projection->SetParameters(200000, 300000);
+ file << lEckert4Projection->GetFalseEasting() << std::endl;
+ file << lEckert4Projection->GetFalseNorthing() << std::endl;
+
+ otb::Eckert4ForwardProjection::Pointer lEckert4Projection2 = otb::Eckert4ForwardProjection::New();
+ file << lEckert4Projection2->GetFalseEasting() << std::endl;
+ file << lEckert4Projection2->GetFalseNorthing() << std::endl;
+ lEckert4Projection2->SetFalseEasting(500000);
+ lEckert4Projection2->SetFalseNorthing(500000);
+ file << lEckert4Projection2->GetFalseEasting() << std::endl;
+ file << lEckert4Projection2->GetFalseNorthing() << std::endl;
+ lEckert4Projection2->SetParameters(200000, 300000);
+ file << lEckert4Projection2->GetFalseEasting() << std::endl;
+ file << lEckert4Projection2->GetFalseNorthing() << std::endl;
+
+
+ otb::MollweidInverseProjection::Pointer lMollweidProjection = otb::MollweidInverseProjection::New();
+ file << lMollweidProjection->GetFalseEasting() << std::endl;
+ file << lMollweidProjection->GetFalseNorthing() << std::endl;
+ lMollweidProjection->SetFalseEasting(500000);
+ lMollweidProjection->SetFalseNorthing(500000);
+ file << lMollweidProjection->GetFalseEasting() << std::endl;
+ file << lMollweidProjection->GetFalseNorthing() << std::endl;
+ lMollweidProjection->SetParameters(200000, 300000);
+ file << lMollweidProjection->GetFalseEasting() << std::endl;
+ file << lMollweidProjection->GetFalseNorthing() << std::endl;
+
+
+ otb::MollweidForwardProjection::Pointer lMollweidProjection2 = otb::MollweidForwardProjection::New();
+ file << lMollweidProjection2->GetFalseEasting() << std::endl;
+ file << lMollweidProjection2->GetFalseNorthing() << std::endl;
+ lMollweidProjection2->SetFalseEasting(500000);
+ lMollweidProjection2->SetFalseNorthing(500000);
+ file << lMollweidProjection2->GetFalseEasting() << std::endl;
+ file << lMollweidProjection2->GetFalseNorthing() << std::endl;
+ lMollweidProjection2->SetParameters(200000, 300000);
+ file << lMollweidProjection2->GetFalseEasting() << std::endl;
+ file << lMollweidProjection2->GetFalseNorthing() << std::endl;
+
+ otb::SinusoidalInverseProjection::Pointer lSinusoidalProjection = otb::SinusoidalInverseProjection::New();
+ file << lSinusoidalProjection->GetFalseEasting() << std::endl;
+ file << lSinusoidalProjection->GetFalseNorthing() << std::endl;
+ lSinusoidalProjection->SetFalseEasting(500000);
+ lSinusoidalProjection->SetFalseNorthing(500000);
+ file << lSinusoidalProjection->GetFalseEasting() << std::endl;
+ file << lSinusoidalProjection->GetFalseNorthing() << std::endl;
+ lSinusoidalProjection->SetParameters(200000, 300000);
+ file << lSinusoidalProjection->GetFalseEasting() << std::endl;
+ file << lSinusoidalProjection->GetFalseNorthing() << std::endl;
+
+ otb::SinusoidalForwardProjection::Pointer lSinusoidalProjection2 = otb::SinusoidalForwardProjection::New();
+ file << lSinusoidalProjection2->GetFalseEasting() << std::endl;
+ file << lSinusoidalProjection2->GetFalseNorthing() << std::endl;
+ lSinusoidalProjection2->SetFalseEasting(500000);
+ lSinusoidalProjection2->SetFalseNorthing(500000);
+ file << lSinusoidalProjection2->GetFalseEasting() << std::endl;
+ file << lSinusoidalProjection2->GetFalseNorthing() << std::endl;
+ lSinusoidalProjection2->SetParameters(200000, 300000);
+ file << lSinusoidalProjection2->GetFalseEasting() << std::endl;
+ file << lSinusoidalProjection2->GetFalseNorthing() << std::endl;
+
+ file.close();
+ return EXIT_SUCCESS;
+}
diff --git a/Modules/Filtering/Projection/test/otbMapProjectionsNew.cxx b/Modules/Filtering/Projection/test/otbMapProjectionsNew.cxx
deleted file mode 100644
index f29644125f041f53e74452508beb949a7d929d3c..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Projection/test/otbMapProjectionsNew.cxx
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include <iostream>
-#include <fstream>
-
-#include "itkMacro.h"
-#include "otbImage.h"
-#include "otbMapProjections.h"
-
-int otbMapProjectionsNew(int itkNotUsed(argc), char* itkNotUsed(argv)[])
-{
- otb::Eckert4InverseProjection::Pointer lEckert4Projection = otb::Eckert4InverseProjection::New();
- otb::Eckert4ForwardProjection::Pointer lEckert4Projection2 = otb::Eckert4ForwardProjection::New();
- otb::LambertConformalConicInverseProjection::Pointer lLambertConformalConicProjection =
- otb::LambertConformalConicInverseProjection::New();
- otb::LambertConformalConicForwardProjection::Pointer lLambertConformalConicProjection2 =
- otb::LambertConformalConicForwardProjection::New();
- otb::Lambert2EtenduInverseProjection::Pointer lLambert2Etendu = otb::Lambert2EtenduInverseProjection::New();
- otb::Lambert2EtenduForwardProjection::Pointer lLambert2Etendu2 = otb::Lambert2EtenduForwardProjection::New();
- otb::Lambert3CartoSudInverseProjection::Pointer lLambert3CartoSud = otb::Lambert3CartoSudInverseProjection::New();
- otb::Lambert3CartoSudForwardProjection::Pointer lLambert3CartoSud2 = otb::Lambert3CartoSudForwardProjection::New();
- otb::Lambert93InverseProjection::Pointer lLambert93 = otb::Lambert93InverseProjection::New();
- otb::Lambert93ForwardProjection::Pointer lLambert93_2 = otb::Lambert93ForwardProjection::New();
- otb::MollweidInverseProjection::Pointer lMollweidProjection = otb::MollweidInverseProjection::New();
- otb::MollweidForwardProjection::Pointer lMollweidProjection2 = otb::MollweidForwardProjection::New();
- otb::SinusoidalInverseProjection::Pointer lSinusoidalProjection = otb::SinusoidalInverseProjection::New();
- otb::SinusoidalForwardProjection::Pointer lSinusoidalProjection2 = otb::SinusoidalForwardProjection::New();
- otb::SVY21InverseProjection::Pointer lSVY21 = otb::SVY21InverseProjection::New();
- otb::SVY21ForwardProjection::Pointer lSVY21_2 = otb::SVY21ForwardProjection::New();
- otb::TransMercatorInverseProjection::Pointer lTransMercatorProjection =
- otb::TransMercatorInverseProjection::New();
- otb::TransMercatorForwardProjection::Pointer lTransMercatorProjection2 =
- otb::TransMercatorForwardProjection::New();
- otb::UtmInverseProjection::Pointer lUtmProjection = otb::UtmInverseProjection::New();
- otb::UtmForwardProjection::Pointer lUtmProjection2 = otb::UtmForwardProjection::New();
-
- return EXIT_SUCCESS;
-}
-
-
-//Test the specific accessors for some map projection
-int otbMapProjectionsTest(int itkNotUsed(argc), char * argv[])
-{
- char * filename = argv[1];
- std::ofstream file;
- file.open(filename);
-
- otb::Eckert4InverseProjection::Pointer lEckert4Projection = otb::Eckert4InverseProjection::New();
- file << lEckert4Projection->GetFalseEasting() << std::endl;
- file << lEckert4Projection->GetFalseNorthing() << std::endl;
- lEckert4Projection->SetFalseEasting(500000);
- lEckert4Projection->SetFalseNorthing(500000);
- file << lEckert4Projection->GetFalseEasting() << std::endl;
- file << lEckert4Projection->GetFalseNorthing() << std::endl;
- lEckert4Projection->SetParameters(200000, 300000);
- file << lEckert4Projection->GetFalseEasting() << std::endl;
- file << lEckert4Projection->GetFalseNorthing() << std::endl;
-
- otb::Eckert4ForwardProjection::Pointer lEckert4Projection2 = otb::Eckert4ForwardProjection::New();
- file << lEckert4Projection2->GetFalseEasting() << std::endl;
- file << lEckert4Projection2->GetFalseNorthing() << std::endl;
- lEckert4Projection2->SetFalseEasting(500000);
- lEckert4Projection2->SetFalseNorthing(500000);
- file << lEckert4Projection2->GetFalseEasting() << std::endl;
- file << lEckert4Projection2->GetFalseNorthing() << std::endl;
- lEckert4Projection2->SetParameters(200000, 300000);
- file << lEckert4Projection2->GetFalseEasting() << std::endl;
- file << lEckert4Projection2->GetFalseNorthing() << std::endl;
-
-
- otb::MollweidInverseProjection::Pointer lMollweidProjection = otb::MollweidInverseProjection::New();
- file << lMollweidProjection->GetFalseEasting() << std::endl;
- file << lMollweidProjection->GetFalseNorthing() << std::endl;
- lMollweidProjection->SetFalseEasting(500000);
- lMollweidProjection->SetFalseNorthing(500000);
- file << lMollweidProjection->GetFalseEasting() << std::endl;
- file << lMollweidProjection->GetFalseNorthing() << std::endl;
- lMollweidProjection->SetParameters(200000, 300000);
- file << lMollweidProjection->GetFalseEasting() << std::endl;
- file << lMollweidProjection->GetFalseNorthing() << std::endl;
-
-
- otb::MollweidForwardProjection::Pointer lMollweidProjection2 = otb::MollweidForwardProjection::New();
- file << lMollweidProjection2->GetFalseEasting() << std::endl;
- file << lMollweidProjection2->GetFalseNorthing() << std::endl;
- lMollweidProjection2->SetFalseEasting(500000);
- lMollweidProjection2->SetFalseNorthing(500000);
- file << lMollweidProjection2->GetFalseEasting() << std::endl;
- file << lMollweidProjection2->GetFalseNorthing() << std::endl;
- lMollweidProjection2->SetParameters(200000, 300000);
- file << lMollweidProjection2->GetFalseEasting() << std::endl;
- file << lMollweidProjection2->GetFalseNorthing() << std::endl;
-
- otb::SinusoidalInverseProjection::Pointer lSinusoidalProjection = otb::SinusoidalInverseProjection::New();
- file << lSinusoidalProjection->GetFalseEasting() << std::endl;
- file << lSinusoidalProjection->GetFalseNorthing() << std::endl;
- lSinusoidalProjection->SetFalseEasting(500000);
- lSinusoidalProjection->SetFalseNorthing(500000);
- file << lSinusoidalProjection->GetFalseEasting() << std::endl;
- file << lSinusoidalProjection->GetFalseNorthing() << std::endl;
- lSinusoidalProjection->SetParameters(200000, 300000);
- file << lSinusoidalProjection->GetFalseEasting() << std::endl;
- file << lSinusoidalProjection->GetFalseNorthing() << std::endl;
-
- otb::SinusoidalForwardProjection::Pointer lSinusoidalProjection2 = otb::SinusoidalForwardProjection::New();
- file << lSinusoidalProjection2->GetFalseEasting() << std::endl;
- file << lSinusoidalProjection2->GetFalseNorthing() << std::endl;
- lSinusoidalProjection2->SetFalseEasting(500000);
- lSinusoidalProjection2->SetFalseNorthing(500000);
- file << lSinusoidalProjection2->GetFalseEasting() << std::endl;
- file << lSinusoidalProjection2->GetFalseNorthing() << std::endl;
- lSinusoidalProjection2->SetParameters(200000, 300000);
- file << lSinusoidalProjection2->GetFalseEasting() << std::endl;
- file << lSinusoidalProjection2->GetFalseNorthing() << std::endl;
-
- file.close();
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Projection/test/otbOrthoRectificationFilterNew.cxx b/Modules/Filtering/Projection/test/otbOrthoRectificationFilterNew.cxx
deleted file mode 100644
index 234d51f7f085bf4368e07da5b9c93e15f570933a..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Projection/test/otbOrthoRectificationFilterNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbMacro.h"
-#include "otbMapProjections.h"
-#include "otbOrthoRectificationFilter.h"
-
-int otbOrthoRectificationFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::Image<double, 2> ImageType;
- typedef otb::UtmInverseProjection UtmMapProjectionType;
- typedef otb::OrthoRectificationFilter<ImageType, ImageType, UtmMapProjectionType> OrthoRectifFilterType;
-
- OrthoRectifFilterType::Pointer filter = OrthoRectifFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Projection/test/otbProjectionTestDriver.cxx b/Modules/Filtering/Projection/test/otbProjectionTestDriver.cxx
index 1f249676ab2ef6a796052c400d3b3e33390b57c4..563cf216a72184968144688709e96679c98a11cb 100644
--- a/Modules/Filtering/Projection/test/otbProjectionTestDriver.cxx
+++ b/Modules/Filtering/Projection/test/otbProjectionTestDriver.cxx
@@ -25,29 +25,18 @@ void RegisterTests()
REGISTER_TEST(otbSensorModel);
REGISTER_TEST(otbVectorDataProjectionFilterFromGeoToMap);
REGISTER_TEST(otbOrthoRectificationFilter);
- REGISTER_TEST(otbGCPsToRPCSensorModelImageFilterNew);
REGISTER_TEST(otbMapProjection);
- REGISTER_TEST(otbGenericRSResampleImageFilterNew);
REGISTER_TEST(otbGenericRSResampleImageFilter);
REGISTER_TEST(otbGenericRSResampleImageFilterFromMap);
REGISTER_TEST(otbGeometriesProjectionFilter);
REGISTER_TEST(otbGenericRSTransformGenericTest);
- REGISTER_TEST(otbLeastSquareAffineTransformEstimatorNew);
- REGISTER_TEST(otbVectorDataTransformFilterNew);
REGISTER_TEST(otbVectorDataTransformFilter);
REGISTER_TEST(otbRationalTransformToDisplacementFieldSourceTest);
- REGISTER_TEST(otbImportGeoInformationImageFilterNew);
REGISTER_TEST(otbVectorDataProjectionFilterFromMapToSensor);
- REGISTER_TEST(otbCompositeTransformNew);
- REGISTER_TEST(otbRationalTransformNew);
REGISTER_TEST(otbRationalTransform);
REGISTER_TEST(otbGeometriesProjectionFilterFromMapToSensor);
- REGISTER_TEST(otbImageToEnvelopeVectorDataFilterNew);
REGISTER_TEST(otbImageToEnvelopeVectorDataFilter);
- REGISTER_TEST(otbMapProjectionsNew);
- REGISTER_TEST(otbMapProjectionsTest);
- REGISTER_TEST(otbOrthoRectificationFilterNew);
- REGISTER_TEST(otbImageToGenericRSOutputParametersNew);
+ REGISTER_TEST(otbMapProjectionAccessorsTest);
REGISTER_TEST(otbImageToGenericRSOutputParameters);
REGISTER_TEST(otbGeometriesProjectionFilterFromMapToGeo);
REGISTER_TEST(otbROIdataConversion);
@@ -59,11 +48,8 @@ void RegisterTests()
REGISTER_TEST(otbGenericRSTransformImageAndMNTToWGS84ConversionChecking);
REGISTER_TEST(otbCompositeTransform);
REGISTER_TEST(otbLeastSquareAffineTransformEstimator);
- REGISTER_TEST(otbSpectralAngleDataNodeFeatureFunctionNew);
REGISTER_TEST(otbSpectralAngleDataNodeFeatureFunction);
- REGISTER_TEST(otbROIdataConversionNew);
REGISTER_TEST(otbGCPsToRPCSensorModelImageFilterCheckRpcModel);
- REGISTER_TEST(otbGeographicalDistanceNew);
REGISTER_TEST(otbGeographicalDistance);
REGISTER_TEST(otbTileImageFilterRSTransformTest);
REGISTER_TEST(otbGCPsToRPCSensorModelImageFilterAndOrtho);
@@ -74,7 +60,6 @@ void RegisterTests()
REGISTER_TEST(otbGeometriesProjectionFilterFromMapToEPSG);
REGISTER_TEST(otbVectorDataProjectionFilter);
REGISTER_TEST(otbUtmMapProjection);
- REGISTER_TEST(otbVectorDataProjectionFilterNew);
REGISTER_TEST(otbTileMapTransform);
REGISTER_TEST(otbImportGeoInformationImageFilter);
}
diff --git a/Modules/Filtering/Projection/test/otbROIdataConversionNew.cxx b/Modules/Filtering/Projection/test/otbROIdataConversionNew.cxx
deleted file mode 100644
index 2a879349d6b6fef583f373dcf3b9173287a613fe..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Projection/test/otbROIdataConversionNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "otbROIdataConversion.h"
-#include "otbVectorImage.h"
-
-int otbROIdataConversionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double PixelType;
- const unsigned int Dimension = 2;
- typedef otb::VectorImage<PixelType, Dimension> InputImageType;
- typedef otb::Image<PixelType, Dimension> ROIImageType;
- typedef otb::ROIdataConversion<InputImageType, ROIImageType> ConverterType;
-
- ConverterType::Pointer converter = ConverterType::New();
-
- std::cout << converter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Projection/test/otbRationalTransform.cxx b/Modules/Filtering/Projection/test/otbRationalTransform.cxx
index 4838026e57dd446418b83ba810dfc4d11c7cdaea..8126760ba71419fc5f067cd61433b5198416ac71 100644
--- a/Modules/Filtering/Projection/test/otbRationalTransform.cxx
+++ b/Modules/Filtering/Projection/test/otbRationalTransform.cxx
@@ -23,15 +23,6 @@
#include "otbRationalTransform.h"
#include <fstream>
-int otbRationalTransformNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::RationalTransform<> RationalTransformType;
-
- // Instantiation
- RationalTransformType::Pointer rt = RationalTransformType::New();
-
- return EXIT_SUCCESS;
-}
int otbRationalTransform(int argc, char* argv[])
{
diff --git a/Modules/Filtering/Projection/test/otbRationalTransformToDisplacementFieldSource.cxx b/Modules/Filtering/Projection/test/otbRationalTransformToDisplacementFieldSource.cxx
index 2c68e4bdab562c45f37032091992a15443b0fd4c..cf5fa0f706e90b44a53094940a3f3e48c45b3ef0 100644
--- a/Modules/Filtering/Projection/test/otbRationalTransformToDisplacementFieldSource.cxx
+++ b/Modules/Filtering/Projection/test/otbRationalTransformToDisplacementFieldSource.cxx
@@ -132,7 +132,7 @@ int otbRationalTransformToDisplacementFieldSourceTest(int argc, char* argv[])
/** Write deformation field to disk. */
WriterType::Pointer writer = WriterType::New();
writer->SetInput( defGenerator->GetOutput() );
- writer->SetFileName( fileName.c_str() );
+ writer->SetFileName( fileName );
try
{
diff --git a/Modules/Filtering/Projection/test/otbSpectralAngleDataNodeFeatureFunction.cxx b/Modules/Filtering/Projection/test/otbSpectralAngleDataNodeFeatureFunction.cxx
index 011d5464c3919a3abe42a4fa493b7bef1f179cb1..a38c74e55b9144573e7bbc57e7118fd472e10f1c 100644
--- a/Modules/Filtering/Projection/test/otbSpectralAngleDataNodeFeatureFunction.cxx
+++ b/Modules/Filtering/Projection/test/otbSpectralAngleDataNodeFeatureFunction.cxx
@@ -30,20 +30,6 @@
#include "otbVectorDataFileWriter.h"
#include "itkPreOrderTreeIterator.h"
-int otbSpectralAngleDataNodeFeatureFunctionNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
- typedef double CoordRepType;
- typedef double PrecisionType;
- typedef otb::VectorImage<double, 2> ImageType;
- typedef otb::SpectralAngleDataNodeFeatureFunction<ImageType, CoordRepType, PrecisionType>
- DataNodeFeaturefunctionType;
-
- DataNodeFeaturefunctionType::Pointer featureFunction = DataNodeFeaturefunctionType::New();
-
- std::cout << featureFunction << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbSpectralAngleDataNodeFeatureFunction(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/Filtering/Projection/test/otbVectorDataProjectionFilterNew.cxx b/Modules/Filtering/Projection/test/otbVectorDataProjectionFilterNew.cxx
deleted file mode 100644
index 2a3c7c6358a0ffe893297c036f660deeedb8d03d..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Projection/test/otbVectorDataProjectionFilterNew.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbVectorDataProjectionFilter.h"
-#include "otbVectorData.h"
-
-int otbVectorDataProjectionFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
-
- typedef otb::VectorData<double> InputVectorDataType;
- typedef otb::VectorData<double> OutputVectorDataType;
-
- typedef otb::VectorDataProjectionFilter<InputVectorDataType, OutputVectorDataType> VectorDataFilterType;
-
- VectorDataFilterType::Pointer vectorData = VectorDataFilterType::New();
-
- std::cout << vectorData << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Projection/test/otbVectorDataTransformFilter.cxx b/Modules/Filtering/Projection/test/otbVectorDataTransformFilter.cxx
index e0f5ee5ee81c7c0c1e2e668c610afe13b1b663cf..7d6427ac44bf9ae99fa5b9bc319eea9515fc7671 100644
--- a/Modules/Filtering/Projection/test/otbVectorDataTransformFilter.cxx
+++ b/Modules/Filtering/Projection/test/otbVectorDataTransformFilter.cxx
@@ -34,12 +34,6 @@ typedef otb::VectorData<> VectorDataType;
typedef otb::VectorDataTransformFilter
<VectorDataType, VectorDataType> VectorDataTransformType;
-int otbVectorDataTransformFilterNew (int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- VectorDataTransformType::Pointer transformFilter = VectorDataTransformType::New();
- return EXIT_SUCCESS;
-}
-
int otbVectorDataTransformFilter (int itkNotUsed(argc), char * argv[])
{
typedef otb::VectorImage<double, 2> ImageType;
diff --git a/Modules/Filtering/Smoothing/test/CMakeLists.txt b/Modules/Filtering/Smoothing/test/CMakeLists.txt
index 8fa73f3b46235f426d9f0d4d38231991e043af08..58266709fa75cc4b18bec9ee14ff02c7a5ab885f 100644
--- a/Modules/Filtering/Smoothing/test/CMakeLists.txt
+++ b/Modules/Filtering/Smoothing/test/CMakeLists.txt
@@ -24,7 +24,6 @@ set(OTBSmoothingTests
otbSmoothingTestDriver.cxx
otbMeanShiftSmoothingImageFilter.cxx
otbMeanShiftSmoothingImageFilterSpatialStability.cxx
-otbMeanShiftSmoothingImageFilterNew.cxx
otbMeanShiftSmoothingImageFilterThreading.cxx
)
diff --git a/Modules/Filtering/Smoothing/test/otbMeanShiftSmoothingImageFilterNew.cxx b/Modules/Filtering/Smoothing/test/otbMeanShiftSmoothingImageFilterNew.cxx
deleted file mode 100644
index 87c1bf55a7f75e101e6e24297cd9fb29a185a6c5..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Smoothing/test/otbMeanShiftSmoothingImageFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbMeanShiftSmoothingImageFilter.h"
-
-int otbMeanShiftSmoothingImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef short PixelType;
- typedef double OutputPixelType;
- typedef otb::VectorImage<OutputPixelType, Dimension> OutputImageType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef otb::MeanShiftSmoothingImageFilter<ImageType, OutputImageType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Smoothing/test/otbSmoothingTestDriver.cxx b/Modules/Filtering/Smoothing/test/otbSmoothingTestDriver.cxx
index 6d715b2c83cd0d63e91e3c29b4368142f6f01870..d724c221779fc1297e11b493df203b72b8af08d1 100644
--- a/Modules/Filtering/Smoothing/test/otbSmoothingTestDriver.cxx
+++ b/Modules/Filtering/Smoothing/test/otbSmoothingTestDriver.cxx
@@ -24,6 +24,5 @@ void RegisterTests()
{
REGISTER_TEST(otbMeanShiftSmoothingImageFilter);
REGISTER_TEST(otbMeanShiftSmoothingImageFilterSpatialStability);
- REGISTER_TEST(otbMeanShiftSmoothingImageFilterNew);
REGISTER_TEST(otbMeanShiftSmoothingImageFilterThreading);
}
diff --git a/Modules/Filtering/Statistics/test/CMakeLists.txt b/Modules/Filtering/Statistics/test/CMakeLists.txt
index cdd593a5b0f91cd85b348eac8658ce2fc96acf67..dcfa7b37bad30cfda9734b68cd92fb1ef9708719 100644
--- a/Modules/Filtering/Statistics/test/CMakeLists.txt
+++ b/Modules/Filtering/Statistics/test/CMakeLists.txt
@@ -22,14 +22,8 @@ otb_module_test()
set(OTBStatisticsTests
otbStatisticsTestDriver.cxx
-otbListSampleToHistogramListGeneratorNew.cxx
otbStreamingMinMaxImageFilter.cxx
-otbStreamingMinMaxVectorImageFilterNew.cxx
-otbVarianceImageFilterNew.cxx
-otbStreamingStatisticsImageFilterNew.cxx
-otbListSampleToVariableDimensionHistogramGeneratorNew.cxx
otbStreamingHistogramVectorImageFilter.cxx
-otbStreamingStatisticsVectorImageFilterNew.cxx
otbRealImageToComplexImageFilterTest.cxx
otbHistogramStatisticsFunction.cxx
otbContinuousMinimumMaximumImageCalculatorTest.cxx
@@ -37,19 +31,15 @@ otbGaussianAdditiveNoiseSampleListFilter.cxx
otbNormalizeVectorImageFilter.cxx
otbVectorImageToMatrixImageFilter.cxx
otbListSampleToVariableDimensionHistogramGenerator.cxx
-otbStreamingMinMaxImageFilterNew.cxx
otbShiftScaleSampleListFilter.cxx
otbVectorImageToIntensityImageFilter.cxx
otbVarianceImageFilter.cxx
otbConcatenateSampleListFilter.cxx
otbLocalHistogramImageFunctionTest.cxx
-otbVectorImageToIntensityImageFilterNew.cxx
otbProjectiveProjection.cxx
otbShiftScaleVectorImageFilterTest.cxx
-otbContinuousMinimumMaximumImageCalculatorNew.cxx
otbStreamingCompareImageFilter.cxx
otbStreamingStatisticsMapFromLabelImageFilterTest.cxx
-otbLocalHistogramImageFunctionNew.cxx
otbRealAndImaginaryImageToComplexImageFilterTest.cxx
otbStreamingStatisticsImageFilter.cxx
otbListSampleToBalancedListSampleFilter.cxx
@@ -67,9 +57,6 @@ otb_module_target_label(otbStatisticsTestDriver)
# Tests Declaration
-otb_add_test(NAME bfTuListSampleToHistogramListGeneratorNew COMMAND otbStatisticsTestDriver
- otbListSampleToHistogramListGeneratorNew)
-
otb_add_test(NAME bfTvStreamingMinMaxImageFilter COMMAND otbStatisticsTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/bfTvStreamingMinMaxImageFilterResults.txt
@@ -79,29 +66,11 @@ otb_add_test(NAME bfTvStreamingMinMaxImageFilter COMMAND otbStatisticsTestDriver
${TEMP}/bfTvStreamingMinMaxImageFilterResults.txt
)
-otb_add_test(NAME bfTuStreamingMinMaxVectorImageFilterNew COMMAND otbStatisticsTestDriver
- otbStreamingMinMaxVectorImageFilterNew)
-
-otb_add_test(NAME bfTuVarianceImageFilterNew COMMAND otbStatisticsTestDriver
- otbVarianceImageFilterNew)
-
-otb_add_test(NAME bfTuStreamingStatisticsImageFilterNew COMMAND otbStatisticsTestDriver
- otbStreamingStatisticsImageFilterNew)
-
-otb_add_test(NAME bfTuListSampleToVariableDimensionHistogramGeneratorNew COMMAND otbStatisticsTestDriver
- otbListSampleToVariableDimensionHistogramGeneratorNew)
-
-otb_add_test(NAME bfTuStreamingHistogramVIFilterNew COMMAND otbStatisticsTestDriver
- otbStreamingHistogramVectorImageFilterNew
- )
otb_add_test(NAME bfTvStreamingHistogramVIFilterTest COMMAND otbStatisticsTestDriver
otbStreamingHistogramVectorImageFilterTest
)
-otb_add_test(NAME bfTuStreamingStatisticsVectorImageFilterNew COMMAND otbStatisticsTestDriver
- otbStreamingStatisticsVectorImageFilterNew)
-
otb_add_test(NAME bfTvRealImageToComplexImageFilterTest COMMAND otbStatisticsTestDriver
@@ -117,9 +86,6 @@ otb_add_test(NAME bfTvContinuousMinimumMaximumImageCalculatorTest COMMAND otbSta
otbContinuousMinimumMaximumImageCalculatorTest
${INPUTDATA}/QB_Suburb.png )
-otb_add_test(NAME leTuGaussianAdditiveNoiseSampleListFilterNew COMMAND otbStatisticsTestDriver
- otbGaussianAdditiveNoiseSampleListFilterNew)
-
otb_add_test(NAME leTvGaussianAdditiveNoiseSampleListFilter COMMAND otbStatisticsTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/leTvGaussianAdditiveNoiseSampleListFilterOutput.txt
@@ -134,9 +100,6 @@ otb_add_test(NAME leTvGaussianAdditiveNoiseSampleListFilter COMMAND otbStatistic
0 -1
)
-otb_add_test(NAME bfTuNormalizeVectorImageFilter COMMAND otbStatisticsTestDriver
- otbNormalizeVectorImageFilterNewTest)
-
otb_add_test(NAME bfTvNormalizeVectorImageFilter COMMAND otbStatisticsTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfTvNormalizeVectorImageFilter.tif
@@ -145,9 +108,6 @@ otb_add_test(NAME bfTvNormalizeVectorImageFilter COMMAND otbStatisticsTestDriver
-in ${INPUTDATA}/cupriteSubHsi.tif
-out ${TEMP}/bfTvNormalizeVectorImageFilter.tif)
-otb_add_test(NAME bfTuVectorImageToMatrixNew COMMAND otbStatisticsTestDriver
- otbVectorImageToMatrixNewTest)
-
otb_add_test(NAME bfTvVectorImageToMatrix COMMAND otbStatisticsTestDriver
otbVectorImageToMatrixTest)
@@ -161,12 +121,6 @@ otb_add_test(NAME bfTvListSampleToVariableDimensionHistogramGenerator COMMAND ot
10 1
)
-otb_add_test(NAME bfTuStreamingMinMaxImageFilterNew COMMAND otbStatisticsTestDriver
- otbStreamingMinMaxImageFilterNew)
-
-otb_add_test(NAME leTuShiftScaleSampleListFilterNew COMMAND otbStatisticsTestDriver
- otbShiftScaleSampleListFilterNew)
-
otb_add_test(NAME leTvShiftScaleSampleListFilter COMMAND otbStatisticsTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/leTvShiftScaleSampleListFilterOutput.txt
@@ -199,9 +153,6 @@ otb_add_test(NAME bfTvVarianceImageFilter COMMAND otbStatisticsTestDriver
${TEMP}/bfVarianceImageFilter.tif
)
-otb_add_test(NAME leTuConcatenateSampleListFilterNew COMMAND otbStatisticsTestDriver
- otbConcatenateSampleListFilterNew)
-
otb_add_test(NAME leTvConcatenateSampleListFilter COMMAND otbStatisticsTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/leTvConcatenateSampleListFilterOutput.txt
@@ -226,12 +177,6 @@ otb_add_test(NAME feTvLocalHistogramImageFunctionTest COMMAND otbStatisticsTestD
127 127 127 0 128
)
-otb_add_test(NAME bfTuVectorImageToIntensityImageFilterNew COMMAND otbStatisticsTestDriver
- otbVectorImageToIntensityImageFilterNew)
-
-otb_add_test(NAME bfTuProjectiveProjectionNew COMMAND otbStatisticsTestDriver
- otbProjectiveProjectionNew)
-
otb_add_test(NAME bfTvProjectiveProjectionTestHighSNR COMMAND otbStatisticsTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfTvProjectiveProjectionTestHighSNR.tif
@@ -250,12 +195,6 @@ otb_add_test(NAME bfTvShiftScaleVectorImageFilter COMMAND otbStatisticsTestDrive
${TEMP}/bfTvShiftScaleVImageOutput.tif
)
-otb_add_test(NAME bfTuContinuousMinimumMaximumImageCalculatorNew COMMAND otbStatisticsTestDriver
- otbContinuousMinimumMaximumImageCalculatorNew
- )
-
-otb_add_test(NAME bfTuStreamingCompareImageFilterNew COMMAND otbStatisticsTestDriver
- otbStreamingCompareImageFilterNew)
otb_add_test(NAME bfTvStreamingCompareImageFilter COMMAND otbStatisticsTestDriver
--compare-ascii ${NOTOL}
@@ -265,9 +204,6 @@ otb_add_test(NAME bfTvStreamingCompareImageFilter COMMAND otbStatisticsTestDrive
${INPUTDATA}/small_poupees_1canal.hd
${TEMP}/bfStreamingCompareImageFilterResults.txt)
-otb_add_test(NAME feTuLocalHistogramImageFunctionNew COMMAND otbStatisticsTestDriver
- otbLocalHistogramImageFunctionNew
- )
otb_add_test(NAME bfTvRealAndImaginaryImageToComplexImageFilterTest COMMAND otbStatisticsTestDriver
otbRealAndImaginaryImageToComplexImageFilterTest
@@ -328,9 +264,6 @@ foreach(inputFileType "UINT8" "UINT16" "INT16" "UINT32" "INT32" "FLOAT" "DOUBLE"
endforeach()
endforeach()
-otb_add_test(NAME leTuListSampleToBalancedListSampleFilterNew COMMAND otbStatisticsTestDriver
- otbListSampleToBalancedListSampleFilterNew)
-
otb_add_test(NAME leTvListSampleToBalancedListSampleFilter COMMAND otbStatisticsTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/leTvListSampleToBalancedListSampleFilterOutput.txt
@@ -392,9 +325,6 @@ otb_add_test(NAME bfTvStreamingMinMaxVectorImageFilter COMMAND otbStatisticsTest
${TEMP}/bfTvStreamingMinMaxVectorImageFilterResults.txt
)
-otb_add_test(NAME leTuListSampleGeneratorNew COMMAND otbStatisticsTestDriver
- otbListSampleGeneratorNew)
-
otb_add_test(NAME leTvListSampleGenerator4 COMMAND otbStatisticsTestDriver
--compare-n-ascii ${NOTOL} 2
${BASELINE_FILES}/leTvListSampleGenerator4.txt
diff --git a/Modules/Filtering/Statistics/test/otbConcatenateSampleListFilter.cxx b/Modules/Filtering/Statistics/test/otbConcatenateSampleListFilter.cxx
index b089928fadd60b90975e76470a34419cdb898912..74ab3bdf800fde5ecb2ef6e00a164958fe312d71 100644
--- a/Modules/Filtering/Statistics/test/otbConcatenateSampleListFilter.cxx
+++ b/Modules/Filtering/Statistics/test/otbConcatenateSampleListFilter.cxx
@@ -30,12 +30,6 @@ typedef itk::Statistics::ListSample<DoubleSampleType> DoubleSampleListType;
typedef otb::Statistics::ConcatenateSampleListFilter<DoubleSampleListType> ConcatenateFilterType;
-int otbConcatenateSampleListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- ConcatenateFilterType::Pointer instance = ConcatenateFilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbConcatenateSampleListFilter(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Filtering/Statistics/test/otbContinuousMinimumMaximumImageCalculatorNew.cxx b/Modules/Filtering/Statistics/test/otbContinuousMinimumMaximumImageCalculatorNew.cxx
deleted file mode 100644
index 58500d6e25ae26f8d660a1a141d52f70e43e4dd5..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Statistics/test/otbContinuousMinimumMaximumImageCalculatorNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbImage.h"
-#include "otbContinuousMinimumMaximumImageCalculator.h"
-
-int otbContinuousMinimumMaximumImageCalculatorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int ImageDimension = 2;
-
- typedef otb::Image<unsigned int, ImageDimension> InputImageType;
-
- typedef otb::ContinuousMinimumMaximumImageCalculator<InputImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Statistics/test/otbGaussianAdditiveNoiseSampleListFilter.cxx b/Modules/Filtering/Statistics/test/otbGaussianAdditiveNoiseSampleListFilter.cxx
index 4bb03a7c9963eb49504ac03e0a5a3357f6d3d719..69ed37c22bf22f556753befad5bd42415b0927ca 100644
--- a/Modules/Filtering/Statistics/test/otbGaussianAdditiveNoiseSampleListFilter.cxx
+++ b/Modules/Filtering/Statistics/test/otbGaussianAdditiveNoiseSampleListFilter.cxx
@@ -34,11 +34,6 @@ typedef otb::Statistics::GaussianAdditiveNoiseSampleListFilter
<FloatSampleListType, DoubleSampleListType> GaussianFilterType;
-int otbGaussianAdditiveNoiseSampleListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- GaussianFilterType::Pointer filter = GaussianFilterType::New();
- return EXIT_SUCCESS;
-}
int otbGaussianAdditiveNoiseSampleListFilter(int argc, char * argv[])
{
diff --git a/Modules/Filtering/Statistics/test/otbListSampleGeneratorTest.cxx b/Modules/Filtering/Statistics/test/otbListSampleGeneratorTest.cxx
index 7f7cb135a30712f1f6d75d3a475fe80b7bdcc35f..a1f225849a92e657b85c86d200b93bed62f36457 100644
--- a/Modules/Filtering/Statistics/test/otbListSampleGeneratorTest.cxx
+++ b/Modules/Filtering/Statistics/test/otbListSampleGeneratorTest.cxx
@@ -27,17 +27,6 @@
#include "otbListSampleGenerator.h"
-int otbListSampleGeneratorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::VectorImage<float, 2> ImageType;
- typedef otb::VectorData<double, 2> VectorDataType;
- typedef otb::ListSampleGenerator<ImageType, VectorDataType> ListSampleGeneratorType;
- ListSampleGeneratorType::Pointer generator = ListSampleGeneratorType::New();
-
- std::cout << generator << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbListSampleGenerator(int argc, char* argv[])
{
diff --git a/Modules/Filtering/Statistics/test/otbListSampleToBalancedListSampleFilter.cxx b/Modules/Filtering/Statistics/test/otbListSampleToBalancedListSampleFilter.cxx
index e11ac632892534bd00a6c10335ed315e8ed36de0..2c2565256a47231ac7efe756471a6c4d959a59cc 100644
--- a/Modules/Filtering/Statistics/test/otbListSampleToBalancedListSampleFilter.cxx
+++ b/Modules/Filtering/Statistics/test/otbListSampleToBalancedListSampleFilter.cxx
@@ -38,11 +38,6 @@ typedef otb::Statistics::ListSampleToBalancedListSampleFilter
<FloatSampleListType, IntegerSampleListType, DoubleSampleListType> BalancingFilterType;
-int otbListSampleToBalancedListSampleFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- BalancingFilterType::Pointer filter = BalancingFilterType::New();
- return EXIT_SUCCESS;
-}
int otbListSampleToBalancedListSampleFilter(int argc, char * argv[])
{
diff --git a/Modules/Filtering/Statistics/test/otbListSampleToHistogramListGeneratorNew.cxx b/Modules/Filtering/Statistics/test/otbListSampleToHistogramListGeneratorNew.cxx
deleted file mode 100644
index 30d3977871160f22835e707dca4cfd1a7734cf2e..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Statistics/test/otbListSampleToHistogramListGeneratorNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbVectorImage.h"
-#include "itkListSample.h"
-#include "otbListSampleToHistogramListGenerator.h"
-
-int otbListSampleToHistogramListGeneratorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- typedef double PixelType;
- typedef otb::VectorImage<PixelType> VectorImageType;
- typedef VectorImageType::PixelType VectorPixelType;
- typedef itk::Statistics::ListSample<VectorPixelType> ListSampleType;
- typedef otb::ListSampleToHistogramListGenerator
- <ListSampleType, PixelType> HistogramGeneratorType;
-
- // Instantiation
- HistogramGeneratorType::Pointer generator = HistogramGeneratorType::New();
-
- std::cout << generator << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Statistics/test/otbListSampleToVariableDimensionHistogramGeneratorNew.cxx b/Modules/Filtering/Statistics/test/otbListSampleToVariableDimensionHistogramGeneratorNew.cxx
deleted file mode 100644
index 9fca6e76a60ff4a4b31899b9a36ade1644ed5cdc..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Statistics/test/otbListSampleToVariableDimensionHistogramGeneratorNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbVectorImage.h"
-#include "itkListSample.h"
-#include "otbListSampleToVariableDimensionHistogramGenerator.h"
-
-int otbListSampleToVariableDimensionHistogramGeneratorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- typedef double PixelType;
- typedef otb::VectorImage<PixelType> VectorImageType;
- typedef VectorImageType::PixelType VectorPixelType;
- typedef itk::Statistics::ListSample<VectorPixelType> ListSampleType;
- typedef otb::ListSampleToVariableDimensionHistogramGenerator
- <ListSampleType, PixelType> HistogramGeneratorType;
-
- // Instantiation
- HistogramGeneratorType::Pointer generator = HistogramGeneratorType::New();
-
- std::cout << generator << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Statistics/test/otbLocalHistogramImageFunctionNew.cxx b/Modules/Filtering/Statistics/test/otbLocalHistogramImageFunctionNew.cxx
deleted file mode 100644
index b472224587402a56cfca22e2936a6e1daf2e2c50..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Statistics/test/otbLocalHistogramImageFunctionNew.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "otbImage.h"
-#include "otbLocalHistogramImageFunction.h"
-
-int otbLocalHistogramImageFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned char InputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::LocalHistogramImageFunction<InputImageType> FunctionType;
-
- FunctionType::Pointer function = FunctionType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Statistics/test/otbNormalizeVectorImageFilter.cxx b/Modules/Filtering/Statistics/test/otbNormalizeVectorImageFilter.cxx
index 2e608cc5dec6b0983491794b63aa8e28d7e0b174..059a793849406199a10fcdccc2cb197df2f1a0ad 100644
--- a/Modules/Filtering/Statistics/test/otbNormalizeVectorImageFilter.cxx
+++ b/Modules/Filtering/Statistics/test/otbNormalizeVectorImageFilter.cxx
@@ -26,18 +26,6 @@
#include "otbNormalizeVectorImageFilter.h"
-int otbNormalizeVectorImageFilterNewTest ( int itkNotUsed(argc), char* itkNotUsed(argv) [] )
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage< PixelType, Dimension > ImageType;
- typedef otb::NormalizeVectorImageFilter< ImageType, ImageType >
- FilterType;
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
-
int otbNormalizeVectorImageFilterTest ( int argc, char* argv[] )
{
typedef otb::CommandLineArgumentParser ParserType;
diff --git a/Modules/Filtering/Statistics/test/otbProjectiveProjection.cxx b/Modules/Filtering/Statistics/test/otbProjectiveProjection.cxx
index 8c5ce355605d4bdb0b18441aa7193c4c5eef6ed1..8d9354b5f451695fb7fe565b06be815735fbc7de 100644
--- a/Modules/Filtering/Statistics/test/otbProjectiveProjection.cxx
+++ b/Modules/Filtering/Statistics/test/otbProjectiveProjection.cxx
@@ -47,12 +47,6 @@ typedef otb::StreamingStatisticsImageFilter<ImageType> StreamingStatisticsImageF
typedef StreamingStatisticsVectorImageFilterType::MatrixType MatrixType;
-int otbProjectiveProjectionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- ProjectiveProjectionImageFilterType::Pointer filter = ProjectiveProjectionImageFilterType::New();
- std::cout << filter << std::endl;
- return EXIT_SUCCESS;
-}
int otbProjectiveProjectionTestHighSNR(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Filtering/Statistics/test/otbShiftScaleSampleListFilter.cxx b/Modules/Filtering/Statistics/test/otbShiftScaleSampleListFilter.cxx
index 6e4f25677861f8f385f50efa71925e6b68e17061..bb9d44d2b724b24e40829854204b17a40e189953 100644
--- a/Modules/Filtering/Statistics/test/otbShiftScaleSampleListFilter.cxx
+++ b/Modules/Filtering/Statistics/test/otbShiftScaleSampleListFilter.cxx
@@ -35,12 +35,6 @@ typedef itk::Statistics::ListSample<FloatSampleType> FloatSampleListType;
typedef otb::Statistics::ShiftScaleSampleListFilter<FloatSampleListType, DoubleSampleListType> ShiftScaleFilterType;
-int otbShiftScaleSampleListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- ShiftScaleFilterType::Pointer instance = ShiftScaleFilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbShiftScaleSampleListFilter(int argc, char * argv[])
{
diff --git a/Modules/Filtering/Statistics/test/otbStatisticsTestDriver.cxx b/Modules/Filtering/Statistics/test/otbStatisticsTestDriver.cxx
index 867b645210667d9a92480f3a374c715ea993b1c7..eeebef7eadde59e878468d8438f2264035662d5c 100644
--- a/Modules/Filtering/Statistics/test/otbStatisticsTestDriver.cxx
+++ b/Modules/Filtering/Statistics/test/otbStatisticsTestDriver.cxx
@@ -22,48 +22,28 @@
void RegisterTests()
{
- REGISTER_TEST(otbListSampleToHistogramListGeneratorNew);
REGISTER_TEST(otbStreamingMinMaxImageFilter);
- REGISTER_TEST(otbStreamingMinMaxVectorImageFilterNew);
- REGISTER_TEST(otbVarianceImageFilterNew);
- REGISTER_TEST(otbStreamingStatisticsImageFilterNew);
- REGISTER_TEST(otbListSampleToVariableDimensionHistogramGeneratorNew);
- REGISTER_TEST(otbStreamingHistogramVectorImageFilterNew);
REGISTER_TEST(otbStreamingHistogramVectorImageFilterTest);
- REGISTER_TEST(otbStreamingStatisticsVectorImageFilterNew);
REGISTER_TEST(otbRealImageToComplexImageFilterTest);
REGISTER_TEST(otbHistogramStatisticsFunction);
- REGISTER_TEST(otbGaussianAdditiveNoiseSampleListFilterNew);
REGISTER_TEST(otbGaussianAdditiveNoiseSampleListFilter);
- REGISTER_TEST(otbNormalizeVectorImageFilterNewTest);
REGISTER_TEST(otbNormalizeVectorImageFilterTest);
- REGISTER_TEST(otbVectorImageToMatrixNewTest);
REGISTER_TEST(otbVectorImageToMatrixTest);
REGISTER_TEST(otbListSampleToVariableDimensionHistogramGenerator);
- REGISTER_TEST(otbStreamingMinMaxImageFilterNew);
- REGISTER_TEST(otbShiftScaleSampleListFilterNew);
REGISTER_TEST(otbShiftScaleSampleListFilter);
REGISTER_TEST(otbVectorImageToIntensityImageFilter);
REGISTER_TEST(otbVarianceImageFilter);
- REGISTER_TEST(otbConcatenateSampleListFilterNew);
REGISTER_TEST(otbConcatenateSampleListFilter);
REGISTER_TEST(otbLocalHistogramImageFunctionTest);
- REGISTER_TEST(otbVectorImageToIntensityImageFilterNew);
- REGISTER_TEST(otbProjectiveProjectionNew);
REGISTER_TEST(otbProjectiveProjectionTestHighSNR);
REGISTER_TEST(otbShiftScaleVectorImageFilterTest);
- REGISTER_TEST(otbContinuousMinimumMaximumImageCalculatorNew);
- REGISTER_TEST(otbStreamingCompareImageFilterNew);
REGISTER_TEST(otbStreamingCompareImageFilter);
REGISTER_TEST(otbStreamingStatisticsMapFromLabelImageFilterTest);
- REGISTER_TEST(otbLocalHistogramImageFunctionNew);
REGISTER_TEST(otbRealAndImaginaryImageToComplexImageFilterTest);
REGISTER_TEST(otbStreamingStatisticsImageFilter);
- REGISTER_TEST(otbListSampleToBalancedListSampleFilterNew);
REGISTER_TEST(otbListSampleToBalancedListSampleFilter);
REGISTER_TEST(otbStreamingStatisticsVectorImageFilter);
REGISTER_TEST(otbStreamingMinMaxVectorImageFilter);
- REGISTER_TEST(otbListSampleGeneratorNew);
REGISTER_TEST(otbListSampleGenerator);
REGISTER_TEST(otbImaginaryImageToComplexImageFilterTest);
REGISTER_TEST(otbListSampleToHistogramListGenerator);
diff --git a/Modules/Filtering/Statistics/test/otbStreamingCompareImageFilter.cxx b/Modules/Filtering/Statistics/test/otbStreamingCompareImageFilter.cxx
index 69bdfbd9a35a9dc0910f4be2a4e4686e136e2342..45ff54a1c969a6932898c7b51f9470f8aa01463b 100644
--- a/Modules/Filtering/Statistics/test/otbStreamingCompareImageFilter.cxx
+++ b/Modules/Filtering/Statistics/test/otbStreamingCompareImageFilter.cxx
@@ -27,21 +27,6 @@
#include <fstream>
#include "otbStreamingTraits.h"
-int otbStreamingCompareImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
-
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::StreamingCompareImageFilter<ImageType> StreamingCompareImageFilterType;
-
- // Instantiating object
- StreamingCompareImageFilterType::Pointer filter = StreamingCompareImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbStreamingCompareImageFilter(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Filtering/Statistics/test/otbStreamingHistogramVectorImageFilter.cxx b/Modules/Filtering/Statistics/test/otbStreamingHistogramVectorImageFilter.cxx
index fed119904237886e6093714d01817bc5dbebf93d..f5f9262988d3781e52f7decb19a70196a5371a69 100644
--- a/Modules/Filtering/Statistics/test/otbStreamingHistogramVectorImageFilter.cxx
+++ b/Modules/Filtering/Statistics/test/otbStreamingHistogramVectorImageFilter.cxx
@@ -33,15 +33,6 @@ typedef itk::Statistics::Histogram< MeasurementType > Histogram;
typedef otb::ObjectList< Histogram > HistogramList;
-int otbStreamingHistogramVectorImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- SHVIFType::Pointer SHVIFFilter = SHVIFType::New();
-
- std::cout << SHVIFFilter << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbStreamingHistogramVectorImageFilterTest(int itkNotUsed(argc), char * itkNotUsed(argv) [])
{
diff --git a/Modules/Filtering/Statistics/test/otbStreamingMinMaxImageFilterNew.cxx b/Modules/Filtering/Statistics/test/otbStreamingMinMaxImageFilterNew.cxx
deleted file mode 100644
index 971fd96d03555ce80625d4743bc9a680d5242c8d..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Statistics/test/otbStreamingMinMaxImageFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbStreamingMinMaxImageFilter.h"
-#include "otbImage.h"
-
-int otbStreamingMinMaxImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
-
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::StreamingMinMaxImageFilter<ImageType> StreamingMinMaxImageFilterType;
-
- // Instantiating object
- StreamingMinMaxImageFilterType::Pointer filter = StreamingMinMaxImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Statistics/test/otbStreamingMinMaxVectorImageFilterNew.cxx b/Modules/Filtering/Statistics/test/otbStreamingMinMaxVectorImageFilterNew.cxx
deleted file mode 100644
index 3fe8fa9cbbc9d08ef50295a29cd5e724815d0c4b..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Statistics/test/otbStreamingMinMaxVectorImageFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbStreamingMinMaxVectorImageFilter.h"
-#include "otbVectorImage.h"
-
-int otbStreamingMinMaxVectorImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
-
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef otb::StreamingMinMaxVectorImageFilter<ImageType> StreamingMinMaxVectorImageFilterType;
-
- // Instantiating object
- StreamingMinMaxVectorImageFilterType::Pointer filter = StreamingMinMaxVectorImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Statistics/test/otbStreamingStatisticsImageFilterNew.cxx b/Modules/Filtering/Statistics/test/otbStreamingStatisticsImageFilterNew.cxx
deleted file mode 100644
index b8cb1ccc82c1e7329c2e62957aeef45f946b4b3e..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Statistics/test/otbStreamingStatisticsImageFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbStreamingStatisticsImageFilter.h"
-#include "otbImage.h"
-
-int otbStreamingStatisticsImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
-
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::StreamingStatisticsImageFilter<ImageType> StreamingStatisticsImageFilterType;
-
- // Instantiating object
- StreamingStatisticsImageFilterType::Pointer filter = StreamingStatisticsImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Statistics/test/otbStreamingStatisticsVectorImageFilterNew.cxx b/Modules/Filtering/Statistics/test/otbStreamingStatisticsVectorImageFilterNew.cxx
deleted file mode 100644
index fc4d30487f72a18c0e7ac28cc9807553db383318..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Statistics/test/otbStreamingStatisticsVectorImageFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbStreamingStatisticsVectorImageFilter.h"
-#include "otbVectorImage.h"
-
-int otbStreamingStatisticsVectorImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
-
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef otb::StreamingStatisticsVectorImageFilter<ImageType> StreamingStatisticsVectorImageFilterType;
-
- // Instantiating object
- StreamingStatisticsVectorImageFilterType::Pointer filter = StreamingStatisticsVectorImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Statistics/test/otbVarianceImageFilterNew.cxx b/Modules/Filtering/Statistics/test/otbVarianceImageFilterNew.cxx
deleted file mode 100644
index dbbda8a61dd891e2f647274fede3f7d20532978c..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Statistics/test/otbVarianceImageFilterNew.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbVarianceImageFilter.h"
-#include "otbImage.h"
-
-int otbVarianceImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
-
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::VarianceImageFilter<ImageType, ImageType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Statistics/test/otbVectorImageToIntensityImageFilterNew.cxx b/Modules/Filtering/Statistics/test/otbVectorImageToIntensityImageFilterNew.cxx
deleted file mode 100644
index 3487c2145a85391eae7a2e5d88db74fce9eac38b..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Statistics/test/otbVectorImageToIntensityImageFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbImage.h"
-#include "otbVectorImage.h"
-#include "otbVectorImageToIntensityImageFilter.h"
-
-int otbVectorImageToIntensityImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> InputImageType;
- typedef otb::Image<PixelType, Dimension> OutputImageType;
- typedef otb::VectorImageToIntensityImageFilter<InputImageType, OutputImageType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Statistics/test/otbVectorImageToMatrixImageFilter.cxx b/Modules/Filtering/Statistics/test/otbVectorImageToMatrixImageFilter.cxx
index c4a78991d037e8891ce564b5ef85a1624f9340ef..5006b3fb78a23fdabf75bd12ba815d814630c047 100644
--- a/Modules/Filtering/Statistics/test/otbVectorImageToMatrixImageFilter.cxx
+++ b/Modules/Filtering/Statistics/test/otbVectorImageToMatrixImageFilter.cxx
@@ -30,13 +30,6 @@ typedef otb::VectorImage<PixelType, Dimension> ImageType;
typedef otb::VectorImageToMatrixImageFilter<ImageType> VectorImageToMatrixImageFilterType;
typedef VectorImageToMatrixImageFilterType::MatrixType MatrixType;
-int otbVectorImageToMatrixNewTest(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- VectorImageToMatrixImageFilterType::Pointer vim2matrix = VectorImageToMatrixImageFilterType::New();
- std::cout << vim2matrix << std::endl;
- return EXIT_SUCCESS;
-}
-
int otbVectorImageToMatrixTest(int itkNotUsed(argc), char * itkNotUsed(argv) [])
{
ImageType::Pointer image = ImageType::New();
diff --git a/Modules/Filtering/TimeSeries/test/CMakeLists.txt b/Modules/Filtering/TimeSeries/test/CMakeLists.txt
index 1ece932531b118cc42a6312b9575245340397100..aa868f82d1afb14ba869abe6df51cb7deea7ba7b 100644
--- a/Modules/Filtering/TimeSeries/test/CMakeLists.txt
+++ b/Modules/Filtering/TimeSeries/test/CMakeLists.txt
@@ -22,9 +22,7 @@ otb_module_test()
set(OTBTimeSeriesTests
otbEnvelopeSavitzkyGolayInterpolationFunctorTest.cxx
otbPolynomialTimeSeriesTest.cxx
- otbSavitzkyGolayInterpolationFunctorNew.cxx
otbSavitzkyGolayInterpolationFunctorTest.cxx
- otbTimeSeriesLeastSquareFittingFunctorNew.cxx
otbTimeSeriesLeastSquareFittingFunctorTest.cxx
otbTimeSeriesLeastSquareFittingFunctorWeightsTest.cxx
otbTimeSeriesTestDriver.cxx )
@@ -38,15 +36,9 @@ otb_add_test(NAME mtTvEnvelopeSavitzkyGolayInterpolationFunctorTest COMMAND otbT
otb_add_test(NAME mtTvPolynomialTimeSeriesTest1 COMMAND otbTimeSeriesTestDriver
otbPolynomialTimeSeriesTest
)
-otb_add_test(NAME mtTuSavitzkyGolayInterpolationFunctor COMMAND otbTimeSeriesTestDriver
- otbSavitzkyGolayInterpolationFunctorNew
- )
otb_add_test(NAME mtTvSavitzkyGolayInterpolationFunctorTest COMMAND otbTimeSeriesTestDriver
otbSavitzkyGolayInterpolationFunctorTest
)
-otb_add_test(NAME mtTuTimeSeriesLeastSquaresFittingFunctor COMMAND otbTimeSeriesTestDriver
- otbTimeSeriesLeastSquareFittingFunctorNew
- )
otb_add_test(NAME mtTvTimeSeriesLeastSquaresFittingFunctor2 COMMAND otbTimeSeriesTestDriver
otbTimeSeriesLeastSquareFittingFunctorTest
10 0.3 3.123
diff --git a/Modules/Filtering/TimeSeries/test/otbSavitzkyGolayInterpolationFunctorNew.cxx b/Modules/Filtering/TimeSeries/test/otbSavitzkyGolayInterpolationFunctorNew.cxx
deleted file mode 100644
index 68db3f67c2be82a030df6f8109729341c57215b2..0000000000000000000000000000000000000000
--- a/Modules/Filtering/TimeSeries/test/otbSavitzkyGolayInterpolationFunctorNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbSavitzkyGolayInterpolationFunctor.h"
-
-int otbSavitzkyGolayInterpolationFunctorNew(int itkNotUsed(argc), char* itkNotUsed(argv)[])
-{
-
- typedef float PixelType;
- typedef unsigned int DoYType;
- typedef itk::FixedArray< PixelType > SeriesType;
- typedef itk::FixedArray< DoYType > DatesType;
- const unsigned int Radius = 2;
-
- typedef otb::Functor::SavitzkyGolayInterpolationFunctor<Radius, SeriesType, DatesType> FunctorType;
-
- FunctorType f;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/TimeSeries/test/otbTimeSeriesLeastSquareFittingFunctorNew.cxx b/Modules/Filtering/TimeSeries/test/otbTimeSeriesLeastSquareFittingFunctorNew.cxx
deleted file mode 100644
index 84206362ed42d4cf64b45e3b9c67e7583b19b788..0000000000000000000000000000000000000000
--- a/Modules/Filtering/TimeSeries/test/otbTimeSeriesLeastSquareFittingFunctorNew.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbTimeSeriesLeastSquareFittingFunctor.h"
-#include "otbTimeSeries.h"
-
-int otbTimeSeriesLeastSquareFittingFunctorNew(int itkNotUsed(argc), char* itkNotUsed(argv)[])
-{
-
- typedef float PixelType;
- typedef unsigned int DoYType;
- typedef itk::FixedArray< PixelType > SeriesType;
- typedef itk::FixedArray< DoYType > DatesType;
- typedef double CoefficientPrecisionType;
- const unsigned int Degree = 2;
- typedef otb::PolynomialTimeSeries< Degree, CoefficientPrecisionType > FunctionType;
-
- typedef otb::Functor::TimeSeriesLeastSquareFittingFunctor<SeriesType, FunctionType, DatesType> FunctorType;
-
- FunctorType f;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/TimeSeries/test/otbTimeSeriesTestDriver.cxx b/Modules/Filtering/TimeSeries/test/otbTimeSeriesTestDriver.cxx
index d45c1f245f64b1f9639d4e71ceb7be901660b606..f01e4b995fb28def309e7cbd13e89af39a565f9e 100644
--- a/Modules/Filtering/TimeSeries/test/otbTimeSeriesTestDriver.cxx
+++ b/Modules/Filtering/TimeSeries/test/otbTimeSeriesTestDriver.cxx
@@ -24,9 +24,7 @@ void RegisterTests()
{
REGISTER_TEST(otbEnvelopeSavitzkyGolayInterpolationFunctorTest);
REGISTER_TEST(otbPolynomialTimeSeriesTest);
- REGISTER_TEST(otbSavitzkyGolayInterpolationFunctorNew);
REGISTER_TEST(otbSavitzkyGolayInterpolationFunctorTest);
- REGISTER_TEST(otbTimeSeriesLeastSquareFittingFunctorNew);
REGISTER_TEST(otbTimeSeriesLeastSquareFittingFunctorTest);
REGISTER_TEST(otbTimeSeriesLeastSquareFittingFunctorWeightsTest);
}
diff --git a/Modules/Filtering/VectorDataManipulation/test/CMakeLists.txt b/Modules/Filtering/VectorDataManipulation/test/CMakeLists.txt
index 904686f9999da509b0d25b43fbd63e9d3b8fe7f5..a786c9fbd926229428781211ac24d9ac8c3e9755 100644
--- a/Modules/Filtering/VectorDataManipulation/test/CMakeLists.txt
+++ b/Modules/Filtering/VectorDataManipulation/test/CMakeLists.txt
@@ -24,12 +24,9 @@ set(OTBVectorDataManipulationTests
otbVectorDataManipulationTestDriver.cxx
otbDBOverlapDataNodeFeatureFunction.cxx
otbVectorDataExtractROI.cxx
-otbVectorDataToSpecificDescriptionFilterBase.cxx
-otbVectorDataToVectorDataFilterNew.cxx
otbPolygonCompacityFunctor.cxx
otbVectorDataToRandomLineGenerator.cxx
otbConcatenateVectorDataFilter.cxx
-otbVectorDataExtractROINew.cxx
otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.cxx
)
@@ -50,9 +47,6 @@ otb_add_test(NAME bfTvDBOverlapDataNodeFeatureFunction COMMAND otbVectorDataMani
0
)
-otb_add_test(NAME bfTuDBOverlapDataNodeFeatureFunctionNew COMMAND otbVectorDataManipulationTestDriver
- otbDBOverlapDataNodeFeatureFunctionNew
- )
otb_add_test(NAME coTvVectorDataExtractROI COMMAND otbVectorDataManipulationTestDriver
--compare-ogr ${NOTOL}
@@ -76,12 +70,6 @@ otb_add_test(NAME coTvVectorDataExtractROI2 COMMAND otbVectorDataManipulationTes
1000.25 25000.2 # Size of the Cartoregion
)
-otb_add_test(NAME fzTuVectorDataToSpecificDescriptionFilterBaseNew COMMAND otbVectorDataManipulationTestDriver
- otbVectorDataToSpecificDescriptionFilterBaseNew)
-
-otb_add_test(NAME coTuVectorDataToVectorDataFilterNew COMMAND otbVectorDataManipulationTestDriver
- otbVectorDataToVectorDataFilterNew)
-
otb_add_test(NAME bfTvPolygonCompacityFunctor COMMAND otbVectorDataManipulationTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/bfPolygonCompacityFunctorTest.txt
@@ -100,13 +88,7 @@ otb_add_test(NAME bfTvVectorDataToRandomLineGenerator COMMAND otbVectorDataManip
${TEMP}/bfTvVectorDataToRandomLineGeneratorOutput.shp
)
-otb_add_test(NAME bfTuVectorDataToRandomLineGeneratorNew COMMAND otbVectorDataManipulationTestDriver
- otbVectorDataToRandomLineGeneratorNew
- )
-otb_add_test(NAME bfTuConcatenateVectorDataFilterNew COMMAND otbVectorDataManipulationTestDriver
- otbConcatenateVectorDataFilterNew
- )
otb_add_test(NAME bfTvConcatenateVectorDataFilter COMMAND otbVectorDataManipulationTestDriver
--compare-ogr ${NOTOL}
@@ -118,9 +100,6 @@ otb_add_test(NAME bfTvConcatenateVectorDataFilter COMMAND otbVectorDataManipulat
-out ${TEMP}/otbConcatenateVectorDataFilter_Output.shp
)
-otb_add_test(NAME coTuVectorDataExtractROINew COMMAND otbVectorDataManipulationTestDriver
- otbVectorDataExtractROINew)
-
otb_add_test(NAME bfTvRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_Polygon COMMAND otbVectorDataManipulationTestDriver
--compare-ogr ${NOTOL}
${BASELINE_FILES}/bfTvRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunctionOutput_Polygon.shp
@@ -131,9 +110,6 @@ otb_add_test(NAME bfTvRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunctio
${INPUTDATA}/DEM/srtm_directory
${TEMP}/bfTvRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunctionOutput_Polygon.shp
0 )
-otb_add_test(NAME bfTuRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunctionNew COMMAND otbVectorDataManipulationTestDriver
- otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunctionNew
- )
otb_add_test(NAME bfTvRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_Line COMMAND otbVectorDataManipulationTestDriver
--compare-ogr ${NOTOL}
${BASELINE_FILES}/bfTvRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunctionOutput_Line.shp
diff --git a/Modules/Filtering/VectorDataManipulation/test/otbConcatenateVectorDataFilter.cxx b/Modules/Filtering/VectorDataManipulation/test/otbConcatenateVectorDataFilter.cxx
index 876adf4f726dd88562b4b4e95bb2ac49c8209603..15dc24398650c9fb5d5677fe39d7ec38b8a5e563 100644
--- a/Modules/Filtering/VectorDataManipulation/test/otbConcatenateVectorDataFilter.cxx
+++ b/Modules/Filtering/VectorDataManipulation/test/otbConcatenateVectorDataFilter.cxx
@@ -34,12 +34,6 @@ typedef otb::VectorDataFileReader<VectorDataType> ReaderType;
typedef otb::VectorDataFileWriter<VectorDataType> WriterType;
typedef otb::ConcatenateVectorDataFilter<VectorDataType> ConcatenateFilterType;
-int otbConcatenateVectorDataFilterNew (int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- ConcatenateFilterType::Pointer concatenate = ConcatenateFilterType::New();
- return EXIT_SUCCESS;
-}
-
int otbConcatenateVectorDataFilter (int argc, char * argv[])
{
// Parse command line parameters
diff --git a/Modules/Filtering/VectorDataManipulation/test/otbDBOverlapDataNodeFeatureFunction.cxx b/Modules/Filtering/VectorDataManipulation/test/otbDBOverlapDataNodeFeatureFunction.cxx
index 19328d8d2a2b27adf4c7346b4e36df8f2f122297..091ff84e6e40078c7de32211091fbfe8bdb488a4 100644
--- a/Modules/Filtering/VectorDataManipulation/test/otbDBOverlapDataNodeFeatureFunction.cxx
+++ b/Modules/Filtering/VectorDataManipulation/test/otbDBOverlapDataNodeFeatureFunction.cxx
@@ -26,19 +26,6 @@
#include "otbVectorDataFileReader.h"
#include "otbVectorDataFileWriter.h"
-int otbDBOverlapDataNodeFeatureFunctionNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
- typedef double CoordRepType;
- typedef double PrecisionType;
- typedef otb::DBOverlapDataNodeFeatureFunction<CoordRepType, PrecisionType>
- DataNodeFeaturefunctionType;
-
- DataNodeFeaturefunctionType::Pointer DBOverlapFeature = DataNodeFeaturefunctionType::New();
-
- std::cout << DBOverlapFeature<< std::endl;
-
- return EXIT_SUCCESS;
-}
int otbDBOverlapDataNodeFeatureFunction(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/Filtering/VectorDataManipulation/test/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.cxx b/Modules/Filtering/VectorDataManipulation/test/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.cxx
index c97a529e10a7b3b54cd02cb70a91ff381d719862..b3b9eff5e35216f7bf24cedc01b2191081aaa0ac 100644
--- a/Modules/Filtering/VectorDataManipulation/test/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.cxx
+++ b/Modules/Filtering/VectorDataManipulation/test/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.cxx
@@ -28,20 +28,6 @@
#include "otbVectorDataFileWriter.h"
#include "itkPreOrderTreeIterator.h"
-int otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunctionNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
- typedef double CoordRepType;
- typedef double PrecisionType;
- typedef otb::VectorImage<double, 2> ImageType;
- typedef otb::RadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction<ImageType, CoordRepType, PrecisionType>
- DataNodeFeaturefunctionType;
-
- DataNodeFeaturefunctionType::Pointer featureFunction = DataNodeFeaturefunctionType::New();
-
- std::cout << featureFunction << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/Filtering/VectorDataManipulation/test/otbVectorDataExtractROINew.cxx b/Modules/Filtering/VectorDataManipulation/test/otbVectorDataExtractROINew.cxx
deleted file mode 100644
index 155be45a9c541867d4dd8ce66319b2c2e21fcefe..0000000000000000000000000000000000000000
--- a/Modules/Filtering/VectorDataManipulation/test/otbVectorDataExtractROINew.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbVectorData.h"
-#include "otbVectorDataExtractROI.h"
-
-int otbVectorDataExtractROINew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::VectorData<> VectorDataType;
- typedef otb::VectorDataExtractROI<VectorDataType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/VectorDataManipulation/test/otbVectorDataManipulationTestDriver.cxx b/Modules/Filtering/VectorDataManipulation/test/otbVectorDataManipulationTestDriver.cxx
index f18bff88fc77e5df100b509e75ebea3be499458e..d3ce1c5a394ed42b13e5b4251d5bc52695620a21 100644
--- a/Modules/Filtering/VectorDataManipulation/test/otbVectorDataManipulationTestDriver.cxx
+++ b/Modules/Filtering/VectorDataManipulation/test/otbVectorDataManipulationTestDriver.cxx
@@ -22,17 +22,10 @@
void RegisterTests()
{
- REGISTER_TEST(otbDBOverlapDataNodeFeatureFunctionNew);
REGISTER_TEST(otbDBOverlapDataNodeFeatureFunction);
REGISTER_TEST(otbVectorDataExtractROI);
- REGISTER_TEST(otbVectorDataToSpecificDescriptionFilterBaseNew);
- REGISTER_TEST(otbVectorDataToVectorDataFilterNew);
REGISTER_TEST(otbPolygonCompacityFunctor);
- REGISTER_TEST(otbVectorDataToRandomLineGeneratorNew);
REGISTER_TEST(otbVectorDataToRandomLineGenerator);
- REGISTER_TEST(otbConcatenateVectorDataFilterNew);
REGISTER_TEST(otbConcatenateVectorDataFilter);
- REGISTER_TEST(otbVectorDataExtractROINew);
- REGISTER_TEST(otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunctionNew);
REGISTER_TEST(otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction);
}
diff --git a/Modules/Filtering/VectorDataManipulation/test/otbVectorDataToRandomLineGenerator.cxx b/Modules/Filtering/VectorDataManipulation/test/otbVectorDataToRandomLineGenerator.cxx
index 181dbb11a20f91d0b98f91cdfb9469ea2d8db97d..30ad67f6a16ef2d5390ba00774507025f08fe0cd 100644
--- a/Modules/Filtering/VectorDataManipulation/test/otbVectorDataToRandomLineGenerator.cxx
+++ b/Modules/Filtering/VectorDataManipulation/test/otbVectorDataToRandomLineGenerator.cxx
@@ -24,18 +24,6 @@
#include "otbVectorDataFileWriter.h"
#include "otbVectorDataToRandomLineGenerator.h"
-int otbVectorDataToRandomLineGeneratorNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
- typedef otb::VectorData<> VectorDataType;
- typedef otb::VectorDataToRandomLineGenerator<VectorDataType> GeneratorType;
-
- // instantiation
- GeneratorType::Pointer generator = GeneratorType::New();
-
- std::cout << generator << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbVectorDataToRandomLineGenerator(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/Filtering/VectorDataManipulation/test/otbVectorDataToSpecificDescriptionFilterBase.cxx b/Modules/Filtering/VectorDataManipulation/test/otbVectorDataToSpecificDescriptionFilterBase.cxx
deleted file mode 100644
index 596c4484b5d3b72cd127ca4b9eb19a1eb9639b83..0000000000000000000000000000000000000000
--- a/Modules/Filtering/VectorDataManipulation/test/otbVectorDataToSpecificDescriptionFilterBase.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbVectorDataToSpecificDescriptionFilterBase.h"
-
-#include "otbVectorData.h"
-
-int otbVectorDataToSpecificDescriptionFilterBaseNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef float PrecisionType;
- typedef otb::VectorData<PrecisionType> VectorDataType;
- typedef otb::VectorDataToSpecificDescriptionFilterBase<VectorDataType>
- VectorDataToSpecificDescriptionFilterType;
-
- VectorDataToSpecificDescriptionFilterType::Pointer filter =
- VectorDataToSpecificDescriptionFilterType::New();
-
- std::cout<<filter<<std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/VectorDataManipulation/test/otbVectorDataToVectorDataFilterNew.cxx b/Modules/Filtering/VectorDataManipulation/test/otbVectorDataToVectorDataFilterNew.cxx
deleted file mode 100644
index 4590a37e1a95ef87694520abe80ddadb6fc93ff3..0000000000000000000000000000000000000000
--- a/Modules/Filtering/VectorDataManipulation/test/otbVectorDataToVectorDataFilterNew.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbVectorDataToVectorDataFilter.h"
-#include "otbVectorData.h"
-
-int otbVectorDataToVectorDataFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- typedef otb::VectorData<double> InputVectorDataType;
- typedef otb::VectorData<unsigned char, 2> OutputVectorDataType;
-
- typedef otb::VectorDataToVectorDataFilter<InputVectorDataType, OutputVectorDataType> VectorDataFilterType;
-
- VectorDataFilterType::Pointer vectorData = VectorDataFilterType::New();
-
- std::cout << vectorData << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/VectorDataRendering/test/CMakeLists.txt b/Modules/Filtering/VectorDataRendering/test/CMakeLists.txt
index 60f81b059887a5801dcd583000613a8d0279f200..fb5e292bcc3442fe472d772807917e92f295f492 100644
--- a/Modules/Filtering/VectorDataRendering/test/CMakeLists.txt
+++ b/Modules/Filtering/VectorDataRendering/test/CMakeLists.txt
@@ -24,7 +24,6 @@ set(OTBVectorDataRenderingTests
otbVectorDataRenderingTestDriver.cxx
otbVectorDataToMapFilterWorld.cxx
otbVectorDataToMapFilter.cxx
-otbVectorDataToMapFilterNew.cxx
otbVectorDataToMapFilterNoFonts.cxx
otbVectorDataToMapFilterSensorModel.cxx
)
@@ -68,9 +67,6 @@ otb_add_test(NAME coTvVectorDataToMapFilter COMMAND otbVectorDataRenderingTestDr
${INPUTDATA}/DejaVuSans.ttf # font
)
-otb_add_test(NAME coTuVectorDataToMapFilterNew COMMAND otbVectorDataRenderingTestDriver
- otbVectorDataToMapFilterNew
- )
otb_add_test(NAME coTvVectorDataToMapFilterNoFonts COMMAND otbVectorDataRenderingTestDriver
--compare-image ${NOTOL}
diff --git a/Modules/Filtering/VectorDataRendering/test/otbVectorDataRenderingTestDriver.cxx b/Modules/Filtering/VectorDataRendering/test/otbVectorDataRenderingTestDriver.cxx
index ceba95df4d5b612bdf08e29ae96fc9574c08704c..468267fa3563a3c26e62cef273be2069f74815b9 100644
--- a/Modules/Filtering/VectorDataRendering/test/otbVectorDataRenderingTestDriver.cxx
+++ b/Modules/Filtering/VectorDataRendering/test/otbVectorDataRenderingTestDriver.cxx
@@ -25,7 +25,6 @@ void RegisterTests()
REGISTER_TEST(otbVectorDataToMapFilterWorld);
REGISTER_TEST(otbVectorDataToMapFilter);
REGISTER_TEST(otbVectorDataToMapFilterBinary);
- REGISTER_TEST(otbVectorDataToMapFilterNew);
REGISTER_TEST(otbVectorDataToMapFilterNoFonts);
REGISTER_TEST(otbVectorDataToMapFilterSensorModel);
}
diff --git a/Modules/Filtering/VectorDataRendering/test/otbVectorDataToMapFilterNew.cxx b/Modules/Filtering/VectorDataRendering/test/otbVectorDataToMapFilterNew.cxx
deleted file mode 100644
index 1e7e4eb51f0f2ccbf1309899777a2f81ef9b247a..0000000000000000000000000000000000000000
--- a/Modules/Filtering/VectorDataRendering/test/otbVectorDataToMapFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "itkRGBAPixel.h"
-#include "otbImage.h"
-#include "otbVectorData.h"
-#include "otbVectorDataToMapFilter.h"
-
-int otbVectorDataToMapFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- typedef otb::VectorData<> VectorDataType;
- typedef itk::RGBAPixel<unsigned char> PixelType;
- typedef otb::Image<PixelType, 2> ImageType;
-
- typedef otb::VectorDataToMapFilter<VectorDataType, ImageType> VectorDataToMapFilterType;
- VectorDataToMapFilterType::Pointer vectorDataRendering = VectorDataToMapFilterType::New();
-
- std::cout << vectorDataRendering << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Wavelet/test/CMakeLists.txt b/Modules/Filtering/Wavelet/test/CMakeLists.txt
index 89b0a5c5232d57475fea1b96da8f3a959be0d22f..3a0e2557a6bd75114686dc102d0a94d56277d0aa 100644
--- a/Modules/Filtering/Wavelet/test/CMakeLists.txt
+++ b/Modules/Filtering/Wavelet/test/CMakeLists.txt
@@ -26,15 +26,7 @@ otbWaveletOperator.cxx
otbWaveletPacketTransform.cxx
otbWaveletTransform.cxx
otbSubsampleImageFilter.cxx
-otbSubsampleImageFilterNew.cxx
-otbWaveletInverseFilterBankNew.cxx
-otbWaveletInverseTransformNew.cxx
-otbWaveletTransformNew.cxx
-otbWaveletPacketInverseTransformNew.cxx
otbWaveletFilterBank.cxx
-otbWaveletPacketTransformNew.cxx
-otbWaveletFilterBankNew.cxx
-otbWaveletOperatorNew.cxx
otbWaveletImageToImageFilter.cxx
)
@@ -549,21 +541,6 @@ otb_add_test(NAME msTvSubsampleImageFilter COMMAND otbWaveletTestDriver
${TEMP}/msSubsampleImageFilterOnePixelOutOf2.tif
)
-otb_add_test(NAME msTuSubsampleImageFilterNew COMMAND otbWaveletTestDriver
- otbSubsampleImageFilterNew)
-
-otb_add_test(NAME msTuWaveletInverseFilterBankNew COMMAND otbWaveletTestDriver
- otbWaveletInverseFilterBankNew)
-
-otb_add_test(NAME msTuWaveletInverseTransformNew COMMAND otbWaveletTestDriver
- otbWaveletInverseTransformNew)
-
-otb_add_test(NAME msTuWaveletTransformNew COMMAND otbWaveletTestDriver
- otbWaveletTransformNew)
-
-otb_add_test(NAME msTuWaveletPacketInverseTransformNew COMMAND otbWaveletTestDriver
- otbWaveletPacketInverseTransformNew)
-
otb_add_test(NAME msTvWaveletMultiScaleFilterBank COMMAND otbWaveletTestDriver
--compare-image ${EPSILON_6}
${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
@@ -584,15 +561,6 @@ otb_add_test(NAME msTvWaveletFilterBank COMMAND otbWaveletTestDriver
${TEMP}/ROI_IKO_PAN_LesHalles_FilterBank.tif
)
-otb_add_test(NAME msTuWaveletPacketTransformNew COMMAND otbWaveletTestDriver
- otbWaveletPacketTransformNew)
-
-otb_add_test(NAME msTuWaveletFilterBankNew COMMAND otbWaveletTestDriver
- otbWaveletFilterBankNew)
-
-otb_add_test(NAME msTuWaveletOperatorNew COMMAND otbWaveletTestDriver
- otbWaveletOperatorNew )
-
otb_add_test(NAME msTvWaveletImageToImageFilter COMMAND otbWaveletTestDriver
--compare-image ${EPSILON_6}
${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif
diff --git a/Modules/Filtering/Wavelet/test/otbSubsampleImageFilterNew.cxx b/Modules/Filtering/Wavelet/test/otbSubsampleImageFilterNew.cxx
deleted file mode 100644
index c32a7a15c5def0511fbcbb62f93735977108d221..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Wavelet/test/otbSubsampleImageFilterNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- * Copyright (C) 2007-2012 Institut Mines Telecom / Telecom Bretagne
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbImage.h"
-#include "otbImageFileReader.h"
-#include "otbImageFileWriter.h"
-
-#include "otbSubsampleImageFilter.h"
-
-int otbSubsampleImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::SubsampleImageFilter<ImageType, ImageType, otb::Wavelet::FORWARD>
- FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Wavelet/test/otbWaveletFilterBankNew.cxx b/Modules/Filtering/Wavelet/test/otbWaveletFilterBankNew.cxx
deleted file mode 100644
index 4680dee66007f813d035289ff82d366684c590b4..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Wavelet/test/otbWaveletFilterBankNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbImage.h"
-#include "otbWaveletOperator.h"
-#include "otbWaveletFilterBank.h"
-
-int otbWaveletFilterBankNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
-
- /* Wavelet choice */
- //const otb::Wavelet::Wavelet wvltID = otb::Wavelet::HAAR;
- const otb::Wavelet::Wavelet wvltID = otb::Wavelet::DB4;
- typedef otb::WaveletOperator<wvltID, otb::Wavelet::FORWARD, PixelType, Dimension> WaveletOperator;
-
- typedef otb::WaveletFilterBank<ImageType, ImageType, WaveletOperator, otb::Wavelet::FORWARD>
- FilterType;
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Wavelet/test/otbWaveletInverseFilterBankNew.cxx b/Modules/Filtering/Wavelet/test/otbWaveletInverseFilterBankNew.cxx
deleted file mode 100644
index d3673b624dfcc88fe0ddedfc2608bda2d23c99bf..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Wavelet/test/otbWaveletInverseFilterBankNew.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbImage.h"
-#include "otbWaveletOperator.h"
-#include "otbWaveletFilterBank.h"
-
-int otbWaveletInverseFilterBankNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
-
- /* Wavelet choice */
- //const otb::Wavelet::Wavelet wvltID = otb::Wavelet::HAAR;
- const otb::Wavelet::Wavelet wvltID = otb::Wavelet::SYMLET8;
-
- /* Inverse Transformation */
- typedef otb::WaveletOperator<wvltID, otb::Wavelet::INVERSE, PixelType, Dimension> WaveletOperator;
- typedef otb::WaveletFilterBank<ImageType, ImageType, WaveletOperator, otb::Wavelet::INVERSE>
- FilterType;
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Wavelet/test/otbWaveletInverseTransformNew.cxx b/Modules/Filtering/Wavelet/test/otbWaveletInverseTransformNew.cxx
deleted file mode 100644
index 99d07510ad573c386ab550fae16062f1dc287b4e..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Wavelet/test/otbWaveletInverseTransformNew.cxx
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- * Copyright (C) 2007-2012 Institut Mines Telecom / Telecom Bretagne
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbImage.h"
-#include "otbWaveletOperator.h"
-#include "otbWaveletFilterBank.h"
-#include "otbWaveletTransform.h"
-
-int otbWaveletInverseTransformNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
-
- /* Wavelet choice */
- const otb::Wavelet::Wavelet wvltID = otb::Wavelet::SYMLET8;
-
- /* Inverse Transformation */
- typedef otb::WaveletOperator<wvltID, otb::Wavelet::INVERSE, PixelType, Dimension>
- InverseWaveletOperator;
- typedef otb::WaveletFilterBank<ImageType, ImageType, InverseWaveletOperator, otb::Wavelet::INVERSE>
- InverseFilterBank;
- typedef otb::WaveletTransform<ImageType, ImageType, InverseFilterBank, otb::Wavelet::INVERSE>
- InvFilterType;
-
- InvFilterType::Pointer invFilter = InvFilterType::New();
-
- std::cout << invFilter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Wavelet/test/otbWaveletOperatorNew.cxx b/Modules/Filtering/Wavelet/test/otbWaveletOperatorNew.cxx
deleted file mode 100644
index 136d605eb80776960dab523133dbb8c42562d1d8..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Wavelet/test/otbWaveletOperatorNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- * Copyright (C) 2007-2012 Institut Mines Telecom / Telecom Bretagne
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbWaveletOperator.h"
-
-int otbWaveletOperatorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const otb::Wavelet::WaveletDirection directionID = otb::Wavelet::INVERSE;
- const otb::Wavelet::Wavelet wvltID = otb::Wavelet::SPLINE_BIORTHOGONAL_4_4;
-
- const int Dimension = 2;
- typedef double PixelType;
-
- typedef otb::WaveletOperator<wvltID, directionID, PixelType, Dimension>
- WaveletOperator;
-
- typedef WaveletOperator::LowPassOperator LowPassOperatorType;
- LowPassOperatorType h_filter;
-
- typedef WaveletOperator::HighPassOperator HighPassOperatorType;
- HighPassOperatorType g_filter;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Wavelet/test/otbWaveletPacketInverseTransformNew.cxx b/Modules/Filtering/Wavelet/test/otbWaveletPacketInverseTransformNew.cxx
deleted file mode 100644
index 043b491b416ee33902ba409427ffd7d60aaa74d8..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Wavelet/test/otbWaveletPacketInverseTransformNew.cxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- * Copyright (C) 2007-2012 Institut Mines Telecom / Telecom Bretagne
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbImage.h"
-#include "otbWaveletOperator.h"
-#include "otbWaveletFilterBank.h"
-#include "otbWaveletPacketTransform.h"
-
-int otbWaveletPacketInverseTransformNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
-
- /* Wavelet choice */
- //const otb::Wavelet::Wavelet wvltID = otb::Wavelet::HAAR;
- const otb::Wavelet::Wavelet wvltID = otb::Wavelet::DB8;
-
- /* Inverse Transformation */
- typedef otb::WaveletOperator<wvltID, otb::Wavelet::INVERSE, PixelType, Dimension>
- InverseWaveletOperator;
- typedef otb::WaveletFilterBank<ImageType, ImageType, InverseWaveletOperator, otb::Wavelet::INVERSE>
- InverseFilterBank;
- typedef otb::WaveletPacketTransform<ImageType, ImageType, InverseFilterBank, otb::Wavelet::INVERSE>
- InvFilterType;
-
- InvFilterType::Pointer invFilter = InvFilterType::New();
-
- std::cout << invFilter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Wavelet/test/otbWaveletPacketTransformNew.cxx b/Modules/Filtering/Wavelet/test/otbWaveletPacketTransformNew.cxx
deleted file mode 100644
index bd029d65786017f9cbbce9ad95037f5011a3aefe..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Wavelet/test/otbWaveletPacketTransformNew.cxx
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbImage.h"
-#include "otbWaveletOperator.h"
-#include "otbWaveletFilterBank.h"
-#include "otbWaveletPacketTransform.h"
-
-int otbWaveletPacketTransformNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
-
- /* Wavelet choice */
- const otb::Wavelet::Wavelet wvltID = otb::Wavelet::HAAR;
- // const otb::Wavelet::Wavelet wvltID = otb::Wavelet::SYMLET8;
-
- /* Wavelet packet configuration */
- typedef otb::FullyDecomposedWaveletPacketCost<ImageType> CostType;
- CostType::NumberOfAllowedDecompositions = 1;
-
- /* Forward Transformation */
- typedef otb::WaveletOperator<wvltID, otb::Wavelet::FORWARD, PixelType, Dimension>
- WaveletOperator;
- typedef otb::WaveletFilterBank<ImageType, ImageType, WaveletOperator, otb::Wavelet::FORWARD>
- ForwardFilterBank;
- typedef otb::WaveletPacketTransform<ImageType, ImageType, ForwardFilterBank, otb::Wavelet::FORWARD, CostType>
- FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Filtering/Wavelet/test/otbWaveletTestDriver.cxx b/Modules/Filtering/Wavelet/test/otbWaveletTestDriver.cxx
index cb0f7c0cb6070bbee7895106d7255e58dfc79f9b..38eae3feb2d42d4f50060a1cf1757ca966b86939 100644
--- a/Modules/Filtering/Wavelet/test/otbWaveletTestDriver.cxx
+++ b/Modules/Filtering/Wavelet/test/otbWaveletTestDriver.cxx
@@ -26,14 +26,6 @@ void RegisterTests()
REGISTER_TEST(otbWaveletPacketTransform);
REGISTER_TEST(otbWaveletTransform);
REGISTER_TEST(otbSubsampleImageFilter);
- REGISTER_TEST(otbSubsampleImageFilterNew);
- REGISTER_TEST(otbWaveletInverseFilterBankNew);
- REGISTER_TEST(otbWaveletInverseTransformNew);
- REGISTER_TEST(otbWaveletTransformNew);
- REGISTER_TEST(otbWaveletPacketInverseTransformNew);
REGISTER_TEST(otbWaveletFilterBank);
- REGISTER_TEST(otbWaveletPacketTransformNew);
- REGISTER_TEST(otbWaveletFilterBankNew);
- REGISTER_TEST(otbWaveletOperatorNew);
REGISTER_TEST(otbWaveletImageToImageFilter);
}
diff --git a/Modules/Filtering/Wavelet/test/otbWaveletTransformNew.cxx b/Modules/Filtering/Wavelet/test/otbWaveletTransformNew.cxx
deleted file mode 100644
index 0c6e84782290013df460afcc1c4b70e313a18d32..0000000000000000000000000000000000000000
--- a/Modules/Filtering/Wavelet/test/otbWaveletTransformNew.cxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbImage.h"
-#include "otbWaveletOperator.h"
-#include "otbWaveletFilterBank.h"
-#include "otbWaveletTransform.h"
-
-int otbWaveletTransformNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
-
- /* Wavelet choice */
- const otb::Wavelet::Wavelet wvltID = otb::Wavelet::SYMLET8;
-
- /* Forward Transformation */
- typedef otb::WaveletOperator<wvltID, otb::Wavelet::FORWARD, PixelType, Dimension> WaveletOperator;
- typedef otb::WaveletFilterBank<ImageType, ImageType, WaveletOperator, otb::Wavelet::FORWARD>
- ForwardFilterBank;
- typedef otb::WaveletTransform<ImageType, ImageType, ForwardFilterBank, otb::Wavelet::FORWARD>
- FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Fusion/Fuzzy/test/CMakeLists.txt b/Modules/Fusion/Fuzzy/test/CMakeLists.txt
index a7050ff8eea80be0dbe1fca98fb969771bda659c..f6e1654f70dd622dafdf5fd158e359eb8249267c 100644
--- a/Modules/Fusion/Fuzzy/test/CMakeLists.txt
+++ b/Modules/Fusion/Fuzzy/test/CMakeLists.txt
@@ -24,7 +24,6 @@ set(OTBFuzzyTests
otbFuzzyTestDriver.cxx
otbFuzzyVariableSetValue.cxx
otbFuzzyVariable2Values.cxx
-otbFuzzyVariableNew.cxx
otbFuzzyVariableDSApplied.cxx
otbFuzzyVariableGetMaxVar.cxx
otbFuzzyDescriptorsModelManager.cxx
@@ -42,9 +41,6 @@ otb_add_test(NAME fzTvFuzzyVariableSetValue COMMAND otbFuzzyTestDriver
otb_add_test(NAME fzTvFuzzyVariable2Values COMMAND otbFuzzyTestDriver
otbFuzzyVariable2Values)
-otb_add_test(NAME fzTuFuzzyVariableNew COMMAND otbFuzzyTestDriver
- otbFuzzyVariableNew)
-
otb_add_test(NAME fzTvFuzzyVariableDSApplied COMMAND otbFuzzyTestDriver
otbFuzzyVariableDSApplied)
@@ -56,6 +52,3 @@ otb_add_test(NAME fzTvFuzzyDescriptorsModelManagerTest COMMAND otbFuzzyTestDrive
${TEMP}/fzTvFuzzyDescriptorsModelManager.xml
)
-otb_add_test(NAME fzTuFuzzyDescriptorsModelManagerNew COMMAND otbFuzzyTestDriver
- otbFuzzyDescriptorsModelManagerNew)
-
diff --git a/Modules/Fusion/Fuzzy/test/otbFuzzyDescriptorsModelManager.cxx b/Modules/Fusion/Fuzzy/test/otbFuzzyDescriptorsModelManager.cxx
index 315fc10fc47b578365b2d80f04464924a6976625..f24ac62631cfa810636f12d6943a4d16caa0ddca 100644
--- a/Modules/Fusion/Fuzzy/test/otbFuzzyDescriptorsModelManager.cxx
+++ b/Modules/Fusion/Fuzzy/test/otbFuzzyDescriptorsModelManager.cxx
@@ -25,11 +25,6 @@
#include <stdlib.h>
#include "itkMacro.h"
-int otbFuzzyDescriptorsModelManagerNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- otb::FuzzyDescriptorsModelManager mng;
- return EXIT_SUCCESS;
-}
int otbFuzzyDescriptorsModelManagerTest(int itkNotUsed(argc), char* argv[])
diff --git a/Modules/Fusion/Fuzzy/test/otbFuzzyTestDriver.cxx b/Modules/Fusion/Fuzzy/test/otbFuzzyTestDriver.cxx
index 752a0397cb53f21a1602e4a34026a228a06d7a29..714ab2c61825f6a6b2696357d6ebdd293becafcb 100644
--- a/Modules/Fusion/Fuzzy/test/otbFuzzyTestDriver.cxx
+++ b/Modules/Fusion/Fuzzy/test/otbFuzzyTestDriver.cxx
@@ -24,9 +24,7 @@ void RegisterTests()
{
REGISTER_TEST(otbFuzzyVariableSetValue);
REGISTER_TEST(otbFuzzyVariable2Values);
- REGISTER_TEST(otbFuzzyVariableNew);
REGISTER_TEST(otbFuzzyVariableDSApplied);
REGISTER_TEST(otbFuzzyVariableGetMaxVar);
- REGISTER_TEST(otbFuzzyDescriptorsModelManagerNew);
REGISTER_TEST(otbFuzzyDescriptorsModelManagerTest);
}
diff --git a/Modules/Fusion/Fuzzy/test/otbFuzzyVariableNew.cxx b/Modules/Fusion/Fuzzy/test/otbFuzzyVariableNew.cxx
deleted file mode 100644
index e6077d03ded8a390c43e558e7440bc0e440491c5..0000000000000000000000000000000000000000
--- a/Modules/Fusion/Fuzzy/test/otbFuzzyVariableNew.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbFuzzyVariable.h"
-
-int otbFuzzyVariableNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef float PrecisionType;
- typedef unsigned short LabelType;
- typedef otb::FuzzyVariable<LabelType, PrecisionType> FuzzyVarType;
-
- FuzzyVarType::Pointer fv = FuzzyVarType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Fusion/MajorityVoting/test/CMakeLists.txt b/Modules/Fusion/MajorityVoting/test/CMakeLists.txt
index 4449e5daa9c02e455dc2b8d3b50e3c650789e569..16f78c7cc64c95421ebf03ff4f44249a6d0655ed 100644
--- a/Modules/Fusion/MajorityVoting/test/CMakeLists.txt
+++ b/Modules/Fusion/MajorityVoting/test/CMakeLists.txt
@@ -22,7 +22,6 @@ otb_module_test()
set(OTBMajorityVotingTests
otbMajorityVotingTestDriver.cxx
-otbNeighborhoodMajorityVotingImageFilterNew.cxx
otbNeighborhoodMajorityVotingImageFilterTest.cxx
)
@@ -32,9 +31,6 @@ otb_module_target_label(otbMajorityVotingTestDriver)
# Tests Declaration
-otb_add_test(NAME leTuNeighborhoodMajorityVotingImageFilterNew COMMAND otbMajorityVotingTestDriver
- otbNeighborhoodMajorityVotingImageFilterNew)
-
otb_add_test(NAME leTvNeighborhoodMajorityVotingImageFilterTest COMMAND otbMajorityVotingTestDriver
--compare-image ${NOTOL}
${BASELINE}/QB_1_ortho_4Cls_N_Classified_OTB_NMV_x2_y5_nodv10_undv7.tif
diff --git a/Modules/Fusion/MajorityVoting/test/otbMajorityVotingTestDriver.cxx b/Modules/Fusion/MajorityVoting/test/otbMajorityVotingTestDriver.cxx
index 5df4c02f023859f3ef6f72db722615c3c54aba36..9e099e2555d4122eebf2ae8c4e599f8e5155e380 100644
--- a/Modules/Fusion/MajorityVoting/test/otbMajorityVotingTestDriver.cxx
+++ b/Modules/Fusion/MajorityVoting/test/otbMajorityVotingTestDriver.cxx
@@ -22,7 +22,6 @@
void RegisterTests()
{
- REGISTER_TEST(otbNeighborhoodMajorityVotingImageFilterNew);
REGISTER_TEST(otbNeighborhoodMajorityVotingImageFilterTest);
REGISTER_TEST(otbNeighborhoodMajorityVotingImageFilterIsolatedTest);
}
diff --git a/Modules/Fusion/MajorityVoting/test/otbNeighborhoodMajorityVotingImageFilterNew.cxx b/Modules/Fusion/MajorityVoting/test/otbNeighborhoodMajorityVotingImageFilterNew.cxx
deleted file mode 100644
index 9d3ef5386cb2a243383ffa2083c910d051f3c5c0..0000000000000000000000000000000000000000
--- a/Modules/Fusion/MajorityVoting/test/otbNeighborhoodMajorityVotingImageFilterNew.cxx
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbImage.h"
-#include <iostream>
-
-#include "otbNeighborhoodMajorityVotingImageFilter.h"
-
-int otbNeighborhoodMajorityVotingImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned char InputLabelPixelType; // 8 bits
- typedef unsigned short OutputLabelPixelType; // 16 bits
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputLabelPixelType, Dimension> InputLabelImageType;
- typedef otb::Image<OutputLabelPixelType, Dimension> OutputLabelImageType;
-
- // Binary ball Structuring Element type
- typedef itk::BinaryBallStructuringElement<InputLabelPixelType, Dimension> BallStructuringType;
-
- // Neighborhood majority voting filter types
- typedef otb::NeighborhoodMajorityVotingImageFilter<InputLabelImageType, OutputLabelImageType, BallStructuringType> NeighborhoodMajorityVotingFilter3ArgsType;
- typedef otb::NeighborhoodMajorityVotingImageFilter<InputLabelImageType, OutputLabelImageType> NeighborhoodMajorityVotingFilter2ArgsType;
- typedef otb::NeighborhoodMajorityVotingImageFilter<InputLabelImageType> NeighborhoodMajorityVotingFilter1ArgType;
-
- // Neighborhood majority voting filters
- NeighborhoodMajorityVotingFilter3ArgsType::Pointer NeighMajVotingFilter3Args = NeighborhoodMajorityVotingFilter3ArgsType::New();
- NeighborhoodMajorityVotingFilter2ArgsType::Pointer NeighMajVotingFilter2Args = NeighborhoodMajorityVotingFilter2ArgsType::New();
- NeighborhoodMajorityVotingFilter1ArgType::Pointer NeighMajVotingFilter1Arg = NeighborhoodMajorityVotingFilter1ArgType::New();
-
- std::cout << NeighMajVotingFilter3Args << std::endl;
- std::cout << std::endl;
- std::cout << NeighMajVotingFilter2Args << std::endl;
- std::cout << std::endl;
- std::cout << NeighMajVotingFilter1Arg << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Fusion/PanSharpening/test/CMakeLists.txt b/Modules/Fusion/PanSharpening/test/CMakeLists.txt
index 656a69bc52f077b7c3a5702f3842e880bb4e479d..2c9f6b28b7fa01114929488ea94c27845a46acdc 100644
--- a/Modules/Fusion/PanSharpening/test/CMakeLists.txt
+++ b/Modules/Fusion/PanSharpening/test/CMakeLists.txt
@@ -23,11 +23,7 @@ otb_module_test()
set(OTBPanSharpeningTests
otbPanSharpeningTestDriver.cxx
otbSimpleRcsPanSharpeningFusionImageFilter.cxx
-otbLmvmPanSharpeningFusionImageFilterNew.cxx
-otbBayesianFusionFilterNew.cxx
otbBayesianFusionFilter.cxx
-otbFusionImageBaseNew.cxx
-otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx
otbLmvmPanSharpeningFusionImageFilter.cxx
)
@@ -46,13 +42,7 @@ otb_add_test(NAME fuTvSimpleRcsPanSharpeningFusionImageFilter COMMAND otbPanShar
${TEMP}/fuTvRcsPanSharpeningFusion.tif
)
-otb_add_test(NAME fuTuLmvmPanSharpeningFusionImageFilterNew COMMAND otbPanSharpeningTestDriver
- otbLmvmPanSharpeningFusionImageFilterNew
- )
-otb_add_test(NAME fuTuBayesianFusionFilterNew COMMAND otbPanSharpeningTestDriver
- otbBayesianFusionFilterNew
- )
otb_add_test(NAME fuTvBayesianFusionFilter COMMAND otbPanSharpeningTestDriver
--compare-image ${NOTOL} ${BASELINE}/fuTvBayesianFusion.tif
@@ -64,13 +54,7 @@ otb_add_test(NAME fuTvBayesianFusionFilter COMMAND otbPanSharpeningTestDriver
${TEMP}/fuTvBayesianFusion.tif
)
-otb_add_test(NAME fuTuFusionImageBaseNew COMMAND otbPanSharpeningTestDriver
- otbFusionImageBaseNew
- )
-otb_add_test(NAME fuTuSimpleRcsPanSharpeningFusionImageFilterNew COMMAND otbPanSharpeningTestDriver
- otbSimpleRcsPanSharpeningFusionImageFilterNew
- )
otb_add_test(NAME fuTvLmvmPanSharpeningFusionImageFilter COMMAND otbPanSharpeningTestDriver
--compare-image ${EPSILON_8} ${BASELINE}/fuTvLmvmPanSharpeningFusion.tif
diff --git a/Modules/Fusion/PanSharpening/test/otbBayesianFusionFilterNew.cxx b/Modules/Fusion/PanSharpening/test/otbBayesianFusionFilterNew.cxx
deleted file mode 100644
index 1da8ed3f2ac9511a847046f6e74c6d8513e4fbab..0000000000000000000000000000000000000000
--- a/Modules/Fusion/PanSharpening/test/otbBayesianFusionFilterNew.cxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "itkMacro.h"
-#include "otbImageFileReader.h"
-#include "otbImageFileWriter.h"
-#include "otbImage.h"
-
-#include "otbBayesianFusionFilter.h"
-
-int otbBayesianFusionFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
-
- typedef otb::VectorImage<PixelType,
- Dimension>
- VectorImageType;
- typedef otb::Image<PixelType,
- Dimension>
- PanchroImageType;
- typedef otb::BayesianFusionFilter<VectorImageType, VectorImageType, PanchroImageType, VectorImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Fusion/PanSharpening/test/otbFusionImageBaseNew.cxx b/Modules/Fusion/PanSharpening/test/otbFusionImageBaseNew.cxx
deleted file mode 100644
index 8c48fb913e0f6ab259a8eec0e79f5e0884f87b34..0000000000000000000000000000000000000000
--- a/Modules/Fusion/PanSharpening/test/otbFusionImageBaseNew.cxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "itkMacro.h"
-#include "otbImage.h"
-#include "otbVectorImage.h"
-#include "otbFusionImageBase.h"
-
-namespace Functor
-{
-template <class TInputMultiSpectral, class TInputMultiSpectralInterp, class TInputPanchro, class TOutput>
-class NewFunctorTest
-{
-public:
- NewFunctorTest() {}
- ~NewFunctorTest() {}
-
- inline TOutput operator ()(const TInputMultiSpectral& A, const TInputMultiSpectralInterp& B, const TInputPanchro& C)
- {
- return (static_cast<TOutput>(A[0]) + static_cast<TOutput>(B[0]) + static_cast<TOutput>(C));
-
- }
-};
-}
-
-int otbFusionImageBaseNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char InputPixelType;
- typedef unsigned char OutputPixelType;
-
- typedef otb::Image<InputPixelType, Dimension> InputPanchroImageType;
- typedef otb::VectorImage<InputPixelType, Dimension> InputMultiSpectralImageType;
- typedef otb::VectorImage<InputPixelType, Dimension> InputMultiSpectralInterpImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
-
- typedef otb::FusionImageBase<InputMultiSpectralImageType,
- InputMultiSpectralInterpImageType,
- InputPanchroImageType,
- OutputImageType,
- Functor::NewFunctorTest<InputMultiSpectralImageType::PixelType,
- InputMultiSpectralInterpImageType::PixelType,
- InputPanchroImageType::PixelType,
- OutputImageType::PixelType>
- > FusionImageBaseType;
-
- // Instantiation
- FusionImageBaseType::Pointer base = FusionImageBaseType::New();
-
- std::cout << base << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Fusion/PanSharpening/test/otbLmvmPanSharpeningFusionImageFilterNew.cxx b/Modules/Fusion/PanSharpening/test/otbLmvmPanSharpeningFusionImageFilterNew.cxx
deleted file mode 100644
index e369d823cbf11624e42624c94f86ac4749f73ed9..0000000000000000000000000000000000000000
--- a/Modules/Fusion/PanSharpening/test/otbLmvmPanSharpeningFusionImageFilterNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "itkMacro.h"
-#include "otbImageFileReader.h"
-#include "otbImageFileWriter.h"
-#include "otbImage.h"
-
-#include "otbLmvmPanSharpeningFusionImageFilter.h"
-
-int otbLmvmPanSharpeningFusionImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
-
- typedef otb::VectorImage<PixelType, Dimension> VectorImageType;
- typedef otb::Image<PixelType, Dimension> PanchroImageType;
- typedef otb::LmvmPanSharpeningFusionImageFilter
- <PanchroImageType, VectorImageType, VectorImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Fusion/PanSharpening/test/otbPanSharpeningTestDriver.cxx b/Modules/Fusion/PanSharpening/test/otbPanSharpeningTestDriver.cxx
index 4e3f0bb672d9500ef7e2569f32ea9a6568f8d5bb..e1e57cddf4fbe6167f8b7a92824a468dabade35a 100644
--- a/Modules/Fusion/PanSharpening/test/otbPanSharpeningTestDriver.cxx
+++ b/Modules/Fusion/PanSharpening/test/otbPanSharpeningTestDriver.cxx
@@ -23,10 +23,6 @@
void RegisterTests()
{
REGISTER_TEST(otbSimpleRcsPanSharpeningFusionImageFilter);
- REGISTER_TEST(otbLmvmPanSharpeningFusionImageFilterNew);
- REGISTER_TEST(otbBayesianFusionFilterNew);
REGISTER_TEST(otbBayesianFusionFilter);
- REGISTER_TEST(otbFusionImageBaseNew);
- REGISTER_TEST(otbSimpleRcsPanSharpeningFusionImageFilterNew);
REGISTER_TEST(otbLmvmPanSharpeningFusionImageFilter);
}
diff --git a/Modules/Fusion/PanSharpening/test/otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx b/Modules/Fusion/PanSharpening/test/otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx
deleted file mode 100644
index 26e6c832b78166c8509f8473682c304ccc9d5704..0000000000000000000000000000000000000000
--- a/Modules/Fusion/PanSharpening/test/otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "itkMacro.h"
-#include "otbImageFileReader.h"
-#include "otbImageFileWriter.h"
-#include "otbVectorImage.h"
-
-#include "otbSimpleRcsPanSharpeningFusionImageFilter.h"
-
-int otbSimpleRcsPanSharpeningFusionImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
-
- typedef otb::VectorImage<PixelType, Dimension> VectorImageType;
- typedef otb::Image<PixelType, Dimension> PanchroImageType;
- typedef otb::SimpleRcsPanSharpeningFusionImageFilter
- <PanchroImageType, VectorImageType, VectorImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Hyperspectral/AnomalyDetection/test/otbAnomalyDetectionTestDriver.cxx b/Modules/Hyperspectral/AnomalyDetection/test/otbAnomalyDetectionTestDriver.cxx
index c27104a3c7000c68f2a2f3c1024bf43b6d56a0e0..f3ccd10b8e82a24d10d817719be0e1aad42a5165 100644
--- a/Modules/Hyperspectral/AnomalyDetection/test/otbAnomalyDetectionTestDriver.cxx
+++ b/Modules/Hyperspectral/AnomalyDetection/test/otbAnomalyDetectionTestDriver.cxx
@@ -23,6 +23,5 @@
void RegisterTests()
{
REGISTER_TEST(LocalRXDetectorROITest);
- REGISTER_TEST(LocalRXDetectorNewTest);
REGISTER_TEST(LocalRXDetectorTest);
}
diff --git a/Modules/Hyperspectral/AnomalyDetection/test/otbLocalRxDetectorTest.cxx b/Modules/Hyperspectral/AnomalyDetection/test/otbLocalRxDetectorTest.cxx
index a2a7502efe6b8fbb42b0aff0f32e9fe66102bbc3..b8f6226e7cd37415dcea8e96e149ec28de638873 100644
--- a/Modules/Hyperspectral/AnomalyDetection/test/otbLocalRxDetectorTest.cxx
+++ b/Modules/Hyperspectral/AnomalyDetection/test/otbLocalRxDetectorTest.cxx
@@ -26,17 +26,6 @@
#include "itkUnaryFunctorImageFilter.h"
#include "itkRescaleIntensityImageFilter.h"
-int LocalRXDetectorNewTest(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, 2> VectorImageType;
- typedef otb::Image<PixelType, 2> ImageType;
- typedef otb::LocalRxDetectorFilter<VectorImageType, ImageType> LocalRxDetectorFilterType;
-
- LocalRxDetectorFilterType::Pointer rxDetector = LocalRxDetectorFilterType::New();
- return EXIT_SUCCESS;
-}
-
int LocalRXDetectorTest(int itkNotUsed(argc), char * argv[])
{
typedef double PixelType;
diff --git a/Modules/Hyperspectral/EndmembersExtraction/test/CMakeLists.txt b/Modules/Hyperspectral/EndmembersExtraction/test/CMakeLists.txt
index 7f536090540945f2869f5cde413e99098e3ef4c4..071ab1afe9420ca1e9ad485c128d6a8dc6da48d7 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/test/CMakeLists.txt
+++ b/Modules/Hyperspectral/EndmembersExtraction/test/CMakeLists.txt
@@ -41,12 +41,6 @@ otb_add_test(NAME hyTvEigenvalueLikelihoodMaximizationTest COMMAND otbEndmembers
${INPUTDATA}/Hyperspectral/synthetic/hsi_cube.tif
${TEMP}/hyTvEigenvalueLikelihoodMaximizationTest.txt)
-otb_add_test(NAME hyTuEigenvalueLikelihoodMaximizationNew COMMAND otbEndmembersExtractionTestDriver
- otbEigenvalueLikelihoodMaximizationNewTest)
-
-otb_add_test(NAME hyTuVirtualDimensionalityNew COMMAND otbEndmembersExtractionTestDriver
- otbVirtualDimensionalityNewTest)
-
otb_add_test(NAME hyTvVirtualDimensionalityTest COMMAND otbEndmembersExtractionTestDriver
--compare-ascii ${EPSILON_9}
${BASELINE_FILES}/hyTvVirtualDimensionalityTest.txt
@@ -64,10 +58,3 @@ otb_add_test(NAME hyTvVCAImageFilterTest1 COMMAND otbEndmembersExtractionTestDri
${INPUTDATA}/Hyperspectral/synthetic/hsi_cube.tif
${TEMP}/hyTvVCAImageFilterTest.tif
5 )
-
-otb_add_test(NAME hyTuVCAImageFilterNew COMMAND otbEndmembersExtractionTestDriver
- otbVCAImageFilterNew
- ${INPUTDATA}/Hyperspectral/synthetic/hsi_cube.tif
- ${TEMP}/synthetic_vca_5.hdr
- 5 )
-
diff --git a/Modules/Hyperspectral/EndmembersExtraction/test/otbEigenvalueLikelihoodMaximization.cxx b/Modules/Hyperspectral/EndmembersExtraction/test/otbEigenvalueLikelihoodMaximization.cxx
index 7f7ce6f68dd0b93f1a2adc7d6f413a64ffb1049e..7e759a6086d97bde0611a9e2416524ed78122c06 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/test/otbEigenvalueLikelihoodMaximization.cxx
+++ b/Modules/Hyperspectral/EndmembersExtraction/test/otbEigenvalueLikelihoodMaximization.cxx
@@ -33,14 +33,6 @@ typedef otb::StreamingStatisticsVectorImageFilter<ImageType> StreamingStatistics
typedef otb::EigenvalueLikelihoodMaximisation<double> ELMType;
-int otbEigenvalueLikelihoodMaximizationNewTest(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- ELMType::Pointer elm = ELMType::New();
- std::cout << elm << std::endl;
- return EXIT_SUCCESS;
-}
-
-
int otbEigenvalueLikelihoodMaximizationTest(int itkNotUsed(argc), char * argv[])
{
const char * infname = argv[1];
diff --git a/Modules/Hyperspectral/EndmembersExtraction/test/otbEndmembersExtractionTestDriver.cxx b/Modules/Hyperspectral/EndmembersExtraction/test/otbEndmembersExtractionTestDriver.cxx
index 3a2b62690971155077c057476789d641e2cea0d0..eaaca2c9ea40b597b5c03c3564cde809cb3a6c22 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/test/otbEndmembersExtractionTestDriver.cxx
+++ b/Modules/Hyperspectral/EndmembersExtraction/test/otbEndmembersExtractionTestDriver.cxx
@@ -22,10 +22,7 @@
void RegisterTests()
{
- REGISTER_TEST(otbEigenvalueLikelihoodMaximizationNewTest);
REGISTER_TEST(otbEigenvalueLikelihoodMaximizationTest);
- REGISTER_TEST(otbVirtualDimensionalityNewTest);
REGISTER_TEST(otbVirtualDimensionalityTest);
- REGISTER_TEST(otbVCAImageFilterNew);
REGISTER_TEST(otbVCAImageFilterTestHighSNR);
}
diff --git a/Modules/Hyperspectral/EndmembersExtraction/test/otbVCAImageFilter.cxx b/Modules/Hyperspectral/EndmembersExtraction/test/otbVCAImageFilter.cxx
index 369d74ecc952e64227ece32d6c455b15b8d8644e..83b97642869b3934469dd550d75e8f3fffbdbce1 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/test/otbVCAImageFilter.cxx
+++ b/Modules/Hyperspectral/EndmembersExtraction/test/otbVCAImageFilter.cxx
@@ -35,12 +35,6 @@ typedef otb::VCAImageFilter<VectorImageType> VCAFilterType;
typedef otb::ImageFileReader<VectorImageType> ReaderType;
typedef otb::ImageFileWriter<VectorImageType> WriterType;
-int otbVCAImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- VCAFilterType::Pointer vca = VCAFilterType::New();
- std::cout << vca << std::endl;
- return EXIT_SUCCESS;
-}
int otbVCAImageFilterTestHighSNR(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Hyperspectral/EndmembersExtraction/test/otbVirtualDimensionality.cxx b/Modules/Hyperspectral/EndmembersExtraction/test/otbVirtualDimensionality.cxx
index ae09d913bb5c597f3600084327b75366911dc903..5dbb0401ee778c85e94492bc35d916f277379b78 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/test/otbVirtualDimensionality.cxx
+++ b/Modules/Hyperspectral/EndmembersExtraction/test/otbVirtualDimensionality.cxx
@@ -33,14 +33,6 @@ typedef otb::StreamingStatisticsVectorImageFilter<ImageType> StreamingStatistics
typedef otb::VirtualDimensionality<double> VDType;
-int otbVirtualDimensionalityNewTest(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- VDType::Pointer vd = VDType::New();
- std::cout << vd << std::endl;
- return EXIT_SUCCESS;
-}
-
-
int otbVirtualDimensionalityTest(int itkNotUsed(argc), char * argv[])
{
const char * infname = argv[1];
diff --git a/Modules/Hyperspectral/Unmixing/test/CMakeLists.txt b/Modules/Hyperspectral/Unmixing/test/CMakeLists.txt
index f7570bdb787c8b4044833d9d81ea16e1ba2a5498..67d13199f5ab957bf3731a920e98694ae470768d 100644
--- a/Modules/Hyperspectral/Unmixing/test/CMakeLists.txt
+++ b/Modules/Hyperspectral/Unmixing/test/CMakeLists.txt
@@ -26,7 +26,6 @@ otbMDMDNMFImageFilter.cxx
otbNCLSUnmixingImageFilter.cxx
otbISRAUnmixingImageFilter.cxx
otbUnConstrainedLeastSquareImageFilter.cxx
-otbSparseUnmixingImageFilterNew.cxx
otbSparseUnmixingImageFilter.cxx
)
@@ -52,9 +51,6 @@ otb_add_test(NAME hyTvMDMDNMFImageFilterTest COMMAND otbUnmixingTestDriver
${TEMP}/hyTvMDMDNMFImageFilterTest.tif
100)
-otb_add_test(NAME hyTuMDMDNMFImageFilterNew COMMAND otbUnmixingTestDriver
- otbMDMDNMFImageFilterNewTest)
-
otb_add_test(NAME hyTvNCLSUnmixingImageFilterTest COMMAND otbUnmixingTestDriver
--compare-image ${EPSILON_9}
${BASELINE_FILES}/hyTvNCLSImageFilterTest.tif
@@ -65,9 +61,6 @@ otb_add_test(NAME hyTvNCLSUnmixingImageFilterTest COMMAND otbUnmixingTestDriver
${TEMP}/hyTvNCLSImageFilterTest.tif
10)
-otb_add_test(NAME hyTuNCLSUnmixingImageFilterNew COMMAND otbUnmixingTestDriver
- otbNCLSUnmixingImageFilterNewTest)
-
otb_add_test(NAME hyTvISRAUnmixingImageFilterTest COMMAND otbUnmixingTestDriver
--compare-image ${EPSILON_9}
${BASELINE_FILES}/hyTvISRAUnmixingImageFilterTest.tif
@@ -78,12 +71,6 @@ otb_add_test(NAME hyTvISRAUnmixingImageFilterTest COMMAND otbUnmixingTestDriver
${TEMP}/hyTvISRAUnmixingImageFilterTest.tif
10)
-otb_add_test(NAME hyTuISRAUnmixingImageFilterNew COMMAND otbUnmixingTestDriver
- otbISRAUnmixingImageFilterNewTest)
-
-otb_add_test(NAME hyTuUnConstrainedLeastSquareImageFilterNew COMMAND otbUnmixingTestDriver
- otbUnConstrainedLeastSquareImageFilterNewTest)
-
otb_add_test(NAME hyTvUnConstrainedLeastSquareImageFilterTest COMMAND otbUnmixingTestDriver
--compare-image ${EPSILON_9}
${BASELINE_FILES}/hyTvUnConstrainedLeastSquareImageFilterTest.tif
@@ -93,6 +80,3 @@ otb_add_test(NAME hyTvUnConstrainedLeastSquareImageFilterTest COMMAND otbUnmixin
${INPUTDATA}/Hyperspectral/synthetic/endmembers.tif
${TEMP}/hyTvUnConstrainedLeastSquareImageFilterTest.tif)
-otb_add_test(NAME hyTuSparseUnmixingImageFilterNew COMMAND otbUnmixingTestDriver
- otbSparseUnmixingImageFilterNew)
-
diff --git a/Modules/Hyperspectral/Unmixing/test/otbISRAUnmixingImageFilter.cxx b/Modules/Hyperspectral/Unmixing/test/otbISRAUnmixingImageFilter.cxx
index 9512917843e18d10d685a21cae1ad4b6d59af9e1..6df54a59d0903350f0f82cd2af4b3844d861e07c 100644
--- a/Modules/Hyperspectral/Unmixing/test/otbISRAUnmixingImageFilter.cxx
+++ b/Modules/Hyperspectral/Unmixing/test/otbISRAUnmixingImageFilter.cxx
@@ -35,13 +35,6 @@ typedef otb::ISRAUnmixingImageFilter<ImageType, ImageType, PixelType> UnmixingIm
typedef otb::VectorImageToMatrixImageFilter<ImageType> VectorImageToMatrixImageFilterType;
typedef otb::ImageFileWriter<ImageType> WriterType;
-int otbISRAUnmixingImageFilterNewTest(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- UnmixingImageFilterType::Pointer filter = UnmixingImageFilterType::New();
- std::cout << filter << std::endl;
- return EXIT_SUCCESS;
-}
-
int otbISRAUnmixingImageFilterTest(int itkNotUsed(argc), char * argv[])
{
const char * inputImage = argv[1];
diff --git a/Modules/Hyperspectral/Unmixing/test/otbMDMDNMFImageFilter.cxx b/Modules/Hyperspectral/Unmixing/test/otbMDMDNMFImageFilter.cxx
index 1c55dd7ee9881b54e928bf13faf1c9b5594ffb2b..4af5769e4f79532468a1df872dca70a39fccd2cc 100644
--- a/Modules/Hyperspectral/Unmixing/test/otbMDMDNMFImageFilter.cxx
+++ b/Modules/Hyperspectral/Unmixing/test/otbMDMDNMFImageFilter.cxx
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
+
* This file is part of Orfeo Toolbox
*
* https://www.orfeo-toolbox.org/
@@ -24,16 +24,6 @@
#include "otbMDMDNMFImageFilter.h"
#include "otbStandardWriterWatcher.h"
-int otbMDMDNMFImageFilterNewTest(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, 2> VectorImageType;
- typedef otb::MDMDNMFImageFilter<VectorImageType, VectorImageType> MDMDNMFImageFilterType;
-
- MDMDNMFImageFilterType::Pointer mdmd = MDMDNMFImageFilterType::New();
- return EXIT_SUCCESS;
-}
-
int otbMDMDNMFImageFilterTest(int itkNotUsed(argc), char * argv[])
{
typedef double PixelType;
diff --git a/Modules/Hyperspectral/Unmixing/test/otbNCLSUnmixingImageFilter.cxx b/Modules/Hyperspectral/Unmixing/test/otbNCLSUnmixingImageFilter.cxx
index b47d2651dd5505a62b8866adda4e436013db00d5..b91d78fc716e0cce8710c11469814612560a5da7 100644
--- a/Modules/Hyperspectral/Unmixing/test/otbNCLSUnmixingImageFilter.cxx
+++ b/Modules/Hyperspectral/Unmixing/test/otbNCLSUnmixingImageFilter.cxx
@@ -35,13 +35,6 @@ typedef otb::NCLSUnmixingImageFilter<ImageType, ImageType, PixelType> UnmixingIm
typedef otb::VectorImageToMatrixImageFilter<ImageType> VectorImageToMatrixImageFilterType;
typedef otb::ImageFileWriter<ImageType> WriterType;
-int otbNCLSUnmixingImageFilterNewTest(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- UnmixingImageFilterType::Pointer filter = UnmixingImageFilterType::New();
- std::cout << filter << std::endl;
- return EXIT_SUCCESS;
-}
-
int otbNCLSUnmixingImageFilterTest(int itkNotUsed(argc), char * argv[])
{
const char * inputImage = argv[1];
diff --git a/Modules/Hyperspectral/Unmixing/test/otbSparseUnmixingImageFilter.cxx b/Modules/Hyperspectral/Unmixing/test/otbSparseUnmixingImageFilter.cxx
index 2167136bbbe0b7309735a093dfe1ad356b9e9c7a..0bfe3376a2d24162495f11080e674658f7259990 100644
--- a/Modules/Hyperspectral/Unmixing/test/otbSparseUnmixingImageFilter.cxx
+++ b/Modules/Hyperspectral/Unmixing/test/otbSparseUnmixingImageFilter.cxx
@@ -79,7 +79,7 @@ int otbSparseUnmixingImageFilterTest ( int argc, char * argv[] )
for ( unsigned int i = 0; i < nbInputImages; i++ )
{
reader->SetNthElement(i, ReaderType::New());
- reader->GetNthElement(i)->SetFileName( inputImageName[i].c_str() );
+ reader->GetNthElement(i)->SetFileName( inputImageName[i] );
reader->GetNthElement(i)->Update();
}
@@ -110,7 +110,7 @@ int otbSparseUnmixingImageFilterTest ( int argc, char * argv[] )
WriterType::Pointer writer = writers->GetNthElement(i);
std::string stitle = title.str();
- writer->SetFileName( stitle.c_str() );
+ writer->SetFileName( stitle );
writer->SetInput( filter->GetOutput()->GetNthElement(i) );
writer->Update();
}
diff --git a/Modules/Hyperspectral/Unmixing/test/otbSparseUnmixingImageFilterNew.cxx b/Modules/Hyperspectral/Unmixing/test/otbSparseUnmixingImageFilterNew.cxx
deleted file mode 100644
index 51d03301a539f238d7750972777289ccc8340252..0000000000000000000000000000000000000000
--- a/Modules/Hyperspectral/Unmixing/test/otbSparseUnmixingImageFilterNew.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbImage.h"
-#include "otbImageFileReader.h"
-#include "otbImageFileWriter.h"
-#include "otbCommandProgressUpdate.h"
-#include "otbCommandLineArgumentParser.h"
-
-#include "otbSparseUnmixingImageFilter.h"
-
-int otbSparseUnmixingImageFilterNew ( int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- // number of images to consider
- const unsigned int nbInputImages = 2;
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::Image< PixelType, Dimension > ImageType;
-
- typedef otb::SparseUnmixingImageFilter< ImageType, ImageType, nbInputImages > FilterType;
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Hyperspectral/Unmixing/test/otbUnConstrainedLeastSquareImageFilter.cxx b/Modules/Hyperspectral/Unmixing/test/otbUnConstrainedLeastSquareImageFilter.cxx
index 4522cd455421c7a6b5bdd677e64ae85a087a1894..7266bf60bfb042086081d8eeed45e35d05fd903b 100644
--- a/Modules/Hyperspectral/Unmixing/test/otbUnConstrainedLeastSquareImageFilter.cxx
+++ b/Modules/Hyperspectral/Unmixing/test/otbUnConstrainedLeastSquareImageFilter.cxx
@@ -34,13 +34,6 @@ typedef otb::UnConstrainedLeastSquareImageFilter<ImageType, ImageType, PixelType
typedef otb::VectorImageToMatrixImageFilter<ImageType> VectorImageToMatrixImageFilterType;
typedef otb::ImageFileWriter<ImageType> WriterType;
-int otbUnConstrainedLeastSquareImageFilterNewTest(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- UnConstrainedLeastSquareSolverType::Pointer filter = UnConstrainedLeastSquareSolverType::New();
- std::cout << filter << std::endl;
- return EXIT_SUCCESS;
-}
-
int otbUnConstrainedLeastSquareImageFilterTest(int itkNotUsed(argc), char * argv[])
{
const char * inputImage = argv[1];
diff --git a/Modules/Hyperspectral/Unmixing/test/otbUnmixingTestDriver.cxx b/Modules/Hyperspectral/Unmixing/test/otbUnmixingTestDriver.cxx
index 74f2ba49044f72468b1a51df2a67c8a8f7cadfbe..edb6a648a7dabd771f1558e2261c9a506314e506 100644
--- a/Modules/Hyperspectral/Unmixing/test/otbUnmixingTestDriver.cxx
+++ b/Modules/Hyperspectral/Unmixing/test/otbUnmixingTestDriver.cxx
@@ -22,15 +22,10 @@
void RegisterTests()
{
- REGISTER_TEST(otbMDMDNMFImageFilterNewTest);
REGISTER_TEST(otbMDMDNMFImageFilterTest);
REGISTER_TEST(otbMDMDNMFImageFilterTest2);
- REGISTER_TEST(otbNCLSUnmixingImageFilterNewTest);
REGISTER_TEST(otbNCLSUnmixingImageFilterTest);
- REGISTER_TEST(otbISRAUnmixingImageFilterNewTest);
REGISTER_TEST(otbISRAUnmixingImageFilterTest);
- REGISTER_TEST(otbUnConstrainedLeastSquareImageFilterNewTest);
REGISTER_TEST(otbUnConstrainedLeastSquareImageFilterTest);
- REGISTER_TEST(otbSparseUnmixingImageFilterNew);
REGISTER_TEST(otbSparseUnmixingImageFilterTest);
}
diff --git a/Modules/IO/Carto/include/otbMapFileProductWriter.hxx b/Modules/IO/Carto/include/otbMapFileProductWriter.hxx
index 87e71e7f0aaead67b1653b86433ab093286dac84..3a736c64399276d5da5294ccfe68881e26d6be6f 100644
--- a/Modules/IO/Carto/include/otbMapFileProductWriter.hxx
+++ b/Modules/IO/Carto/include/otbMapFileProductWriter.hxx
@@ -354,7 +354,7 @@ MapFileProductWriter<TInputImage>
// Configure writer
m_VectorWriter = VectorWriterType::New();
- m_VectorWriter->SetFileName(ossFileName.str().c_str());
+ m_VectorWriter->SetFileName(ossFileName.str());
m_VectorWriter->SetInput(m_VectorImageExtractROIFilter->GetOutput());
m_VectorWriter->Update();
diff --git a/Modules/IO/Carto/test/CMakeLists.txt b/Modules/IO/Carto/test/CMakeLists.txt
index ad401fd73c7221c09863d7cab04194ae914611d5..ea700f6a84eba4de9e48a60d02805f2f552863aa 100644
--- a/Modules/IO/Carto/test/CMakeLists.txt
+++ b/Modules/IO/Carto/test/CMakeLists.txt
@@ -22,7 +22,6 @@ otb_module_test()
set(OTBCartoTests
otbCartoTestDriver.cxx
-otbMapFileProductWriterNew.cxx
otbImageToOSMVectorDataGenerator.cxx
otbMapFileProductWriter.cxx
otbOSMDataToVectorDataTests.cxx
@@ -35,13 +34,7 @@ otb_module_target_label(otbCartoTestDriver)
# Tests Declaration
-otb_add_test(NAME ioTuMapFileProductWriterNew COMMAND otbCartoTestDriver
- otbMapFileProductWriterNew
- )
-otb_add_test(NAME ioTuImageToOSMVectorDataGeneratorNew COMMAND otbCartoTestDriver
- otbImageToOSMVectorDataGeneratorNew
- )
otb_add_test(NAME ioTvImageToOSMVectorDataGenerator COMMAND otbCartoTestDriver
--compare-ogr ${EPSILON_9}
@@ -65,10 +58,6 @@ otb_add_test(NAME ioTvMapFileProductWriter COMMAND otbCartoTestDriver
)
set_property(TEST ioTvMapFileProductWriter PROPERTY RESOURCE_LOCK web_access)
-otb_add_test(NAME ioTuOSMToVectorDataGenerator COMMAND otbCartoTestDriver
- otbOSMToVectorDataGeneratorNew
- )
-
otb_add_test(NAME ioTvOSMToVectorDataGeneratorByName COMMAND otbCartoTestDriver
--compare-ogr ${EPSILON_9}
${BASELINE_FILES}/ioTvOSMToVectorDataFilterByName_highway.shp
diff --git a/Modules/IO/Carto/test/otbCartoTestDriver.cxx b/Modules/IO/Carto/test/otbCartoTestDriver.cxx
index 0b94a11fa4cf4e69043209913dac3d1e69599330..4632e81b92db655d0fdd2d6df9ab05c17620d999 100644
--- a/Modules/IO/Carto/test/otbCartoTestDriver.cxx
+++ b/Modules/IO/Carto/test/otbCartoTestDriver.cxx
@@ -22,11 +22,8 @@
void RegisterTests()
{
- REGISTER_TEST(otbMapFileProductWriterNew);
- REGISTER_TEST(otbImageToOSMVectorDataGeneratorNew);
REGISTER_TEST(otbImageToOSMVectorDataGenerator);
REGISTER_TEST(otbMapFileProductWriter);
- REGISTER_TEST(otbOSMToVectorDataGeneratorNew);
REGISTER_TEST(otbOSMToVectorDataGeneratorTest);
REGISTER_TEST(otbOSMToVectorDataGeneratorByName);
REGISTER_TEST(otbCoordinateToNameTest);
diff --git a/Modules/IO/Carto/test/otbImageToOSMVectorDataGenerator.cxx b/Modules/IO/Carto/test/otbImageToOSMVectorDataGenerator.cxx
index 7fc5f9991e4373da6ca1b9c0b13b1acfe5a45b5d..2f1291139c4bf28b3a8c36f320439f3608dfce6f 100644
--- a/Modules/IO/Carto/test/otbImageToOSMVectorDataGenerator.cxx
+++ b/Modules/IO/Carto/test/otbImageToOSMVectorDataGenerator.cxx
@@ -38,13 +38,6 @@ typedef otb::ImageFileReader<ImageType> ReaderType;
typedef otb::VectorDataFileWriter<VectorDataType> VectorDataFileWriterType;
-int otbImageToOSMVectorDataGeneratorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- FilterType::Pointer vdgenerator = FilterType::New();
-
-
- return EXIT_SUCCESS;
-}
int otbImageToOSMVectorDataGenerator(int argc, char * argv[])
diff --git a/Modules/IO/Carto/test/otbMapFileProductWriterNew.cxx b/Modules/IO/Carto/test/otbMapFileProductWriterNew.cxx
deleted file mode 100644
index 6f19351e264bc82e35f432070348dafbd442b5b0..0000000000000000000000000000000000000000
--- a/Modules/IO/Carto/test/otbMapFileProductWriterNew.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbMapFileProductWriter.h"
-#include "otbVectorImage.h"
-
-int otbMapFileProductWriterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- typedef otb::VectorImage<double> ImageType;
- typedef otb::MapFileProductWriter<ImageType> MapFileProductWriterType;
-
- MapFileProductWriterType::Pointer object = MapFileProductWriterType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/IO/Carto/test/otbOSMDataToVectorDataTests.cxx b/Modules/IO/Carto/test/otbOSMDataToVectorDataTests.cxx
index 580bfee58f0925ac0e54f36437b6a5d6cbc662da..8e646f60c6e5c48b3e4cdfb9fc8c0caf30eb9eaf 100644
--- a/Modules/IO/Carto/test/otbOSMDataToVectorDataTests.cxx
+++ b/Modules/IO/Carto/test/otbOSMDataToVectorDataTests.cxx
@@ -27,13 +27,6 @@ typedef otb::OSMDataToVectorDataGenerator FilterType;
typedef otb::VectorDataFileWriter<FilterType::VectorDataType> VectorDataFileWriterType;
-int otbOSMToVectorDataGeneratorNew (int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
-
int otbOSMToVectorDataGeneratorTest (int itkNotUsed(argc), char * argv[])
{
FilterType::Pointer filter = FilterType::New();
diff --git a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h
index 6753c31479137856325f69fd9fb11c13809238f5..94211cd1382e169f941a9f45e3d31d8b3bbefeb8 100644
--- a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h
+++ b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h
@@ -79,8 +79,11 @@ public:
std::vector<std::string> optionList;
};
- /* Set Methods */
- void SetExtendedFileName(const char * extFname) override;
+ /** \deprecated const char* overload of SetExtendedFileName is deprecated, use std::string instead */
+ void SetExtendedFileName(const char* extFname) override;
+
+ void SetExtendedFileName(const std::string& extFname) override;
+
/* Get Methods */
bool SimpleFileNameIsSet () const;
bool ExtGEOMFileNameIsSet () const;
diff --git a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToWriterOptions.h b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToWriterOptions.h
index 88f789482c56f831f163bab9f3f8889e2dd56241..3102cdf675ea6f1dc870b62b3ae1b7a904d326f4 100644
--- a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToWriterOptions.h
+++ b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToWriterOptions.h
@@ -83,8 +83,11 @@ public:
NoDataListType m_NoDataList;
bool has_noDataValue;
- /* Set Methods */
- void SetExtendedFileName(const char * extFname) override;
+ /** \deprecated const char* overload of SetExtendedFileName is deprecated, use std::string instead */
+ void SetExtendedFileName(const char* extFname) override;
+
+ void SetExtendedFileName(const std::string& extFname) override;
+
/* Get Methods */
bool SimpleFileNameIsSet () const;
bool NoDataValueIsSet () const;
diff --git a/Modules/IO/ExtendedFilename/src/otbExtendedFilenameToReaderOptions.cxx b/Modules/IO/ExtendedFilename/src/otbExtendedFilenameToReaderOptions.cxx
index 308f5239c1e9aeb4aaccd7066e08cfaca1e605bc..6a383635910773ffd2715f61194ca3d3167809fd 100644
--- a/Modules/IO/ExtendedFilename/src/otbExtendedFilenameToReaderOptions.cxx
+++ b/Modules/IO/ExtendedFilename/src/otbExtendedFilenameToReaderOptions.cxx
@@ -63,7 +63,17 @@ ExtendedFilenameToReaderOptions
void
ExtendedFilenameToReaderOptions
-::SetExtendedFileName(const char *extFname)
+::SetExtendedFileName(const char* extFname)
+{
+ if (extFname)
+ {
+ this->SetExtendedFileName(std::string(extFname));
+ }
+}
+
+void
+ExtendedFilenameToReaderOptions
+::SetExtendedFileName(const std::string& extFname)
{
Superclass::SetExtendedFileName(extFname);
MapType map = GetOptionMap();
diff --git a/Modules/IO/ExtendedFilename/src/otbExtendedFilenameToWriterOptions.cxx b/Modules/IO/ExtendedFilename/src/otbExtendedFilenameToWriterOptions.cxx
index e63a83ea55741233c7d56b9f262b12b1554675c7..49bc7c861f30bb5cfe6f9e76e4716d126605047a 100644
--- a/Modules/IO/ExtendedFilename/src/otbExtendedFilenameToWriterOptions.cxx
+++ b/Modules/IO/ExtendedFilename/src/otbExtendedFilenameToWriterOptions.cxx
@@ -61,7 +61,19 @@ ExtendedFilenameToWriterOptions
void
ExtendedFilenameToWriterOptions
-::SetExtendedFileName(const char *extFname)
+::SetExtendedFileName(const char* extFname)
+{
+ if (extFname == nullptr)
+ {
+ itkGenericExceptionMacro( << "Filename is NULL" );
+ }
+
+ this->SetExtendedFileName(std::string(extFname));
+}
+
+void
+ExtendedFilenameToWriterOptions
+::SetExtendedFileName(const std::string& extFname)
{
this->Superclass::SetExtendedFileName(extFname);
// TODO: Rename map to a less confusing (with std::map) name
diff --git a/Modules/IO/IOGDAL/test/CMakeLists.txt b/Modules/IO/IOGDAL/test/CMakeLists.txt
index 31ed84ace4f4710b219036cb835d15c3f5c25811..ae64936b83e11f8e29bdb5fe2926c32ad8fec4f0 100644
--- a/Modules/IO/IOGDAL/test/CMakeLists.txt
+++ b/Modules/IO/IOGDAL/test/CMakeLists.txt
@@ -25,7 +25,6 @@ otbIOGDALTestDriver.cxx
otbGDALImageIOTest.cxx
otbGDALImageIOTestWriteMetadata.cxx
otbGDALOverviewsBuilder.cxx
-otbOGRVectorDataIONew.cxx
otbGDALImageIOTestCanWrite.cxx
otbOGRVectorDataIOCanWrite.cxx
otbGDALReadPxlComplex.cxx
@@ -130,9 +129,6 @@ otb_add_test(NAME ioTvGDALImageIOWriteMetadata COMMAND otbIOGDALTestDriver
${TEMP}/ioTvGDALImageIOWriteMetadata_Report.txt
)
-otb_add_test(NAME ioTuGDALOverviewsBuilder COMMAND otbIOGDALTestDriver
- otbGDALOverviewsBuilderNew)
-
otb_add_test(NAME ioTvGDALOverviewsBuilder_TIFF COMMAND otbIOGDALTestDriver
otbGDALOverviewsBuilder
${TEMP}/ioTvGDALImageIO_Tiff_NoOption.tif
@@ -140,9 +136,6 @@ otb_add_test(NAME ioTvGDALOverviewsBuilder_TIFF COMMAND otbIOGDALTestDriver
)
set_property(TEST ioTvGDALOverviewsBuilder_TIFF PROPERTY DEPENDS ioTvGDALImageIO_Tiff_NoOption)
-otb_add_test(NAME ioTuOGRVectorDataIO COMMAND otbIOGDALTestDriver
- otbOGRVectorDataIONew )
-
otb_add_test(NAME ioTuGDALImageIOCanWrite_HFA COMMAND otbIOGDALTestDriver otbGDALImageIOTestCanWrite
${INPUTDATA}/HFAGeoreferenced.img)
diff --git a/Modules/IO/IOGDAL/test/otbGDALOverviewsBuilder.cxx b/Modules/IO/IOGDAL/test/otbGDALOverviewsBuilder.cxx
index f2dd4836ec8182649bde46b23061d53d763f9a54..0209a1aa8ff00abfdef7e0580093f9d53e09eef1 100644
--- a/Modules/IO/IOGDAL/test/otbGDALOverviewsBuilder.cxx
+++ b/Modules/IO/IOGDAL/test/otbGDALOverviewsBuilder.cxx
@@ -25,15 +25,6 @@
using namespace otb;
-int otbGDALOverviewsBuilderNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
- typedef otb::GDALOverviewsBuilder GDALOverviewsBuilderType;
- GDALOverviewsBuilderType::Pointer object = GDALOverviewsBuilderType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbGDALOverviewsBuilder(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/IO/IOGDAL/test/otbIOGDALTestDriver.cxx b/Modules/IO/IOGDAL/test/otbIOGDALTestDriver.cxx
index b9354ae50936e6c46bd6418f295747da8270265d..d4b56757279f36f5f2a19731e011f73d57063e87 100644
--- a/Modules/IO/IOGDAL/test/otbIOGDALTestDriver.cxx
+++ b/Modules/IO/IOGDAL/test/otbIOGDALTestDriver.cxx
@@ -25,9 +25,7 @@ void RegisterTests()
REGISTER_TEST(otbGDALImageIOTest_uint8);
REGISTER_TEST(otbGDALImageIOTest_uint16);
REGISTER_TEST(otbGDALImageIOTestWriteMetadata);
- REGISTER_TEST(otbGDALOverviewsBuilderNew);
REGISTER_TEST(otbGDALOverviewsBuilder);
- REGISTER_TEST(otbOGRVectorDataIONew);
REGISTER_TEST(otbGDALImageIOTestCanWrite);
REGISTER_TEST(otbOGRVectorDataIOCanWrite);
REGISTER_TEST(otbGDALReadPxlComplexFloat);
diff --git a/Modules/IO/IOGDAL/test/otbOGRVectorDataIONew.cxx b/Modules/IO/IOGDAL/test/otbOGRVectorDataIONew.cxx
deleted file mode 100644
index 2028e624909632a002d274ff26c4feafe01a6e1b..0000000000000000000000000000000000000000
--- a/Modules/IO/IOGDAL/test/otbOGRVectorDataIONew.cxx
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbOGRVectorDataIO.h"
-
-int otbOGRVectorDataIONew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::OGRVectorDataIO OGRVectorDataIOType;
- OGRVectorDataIOType::Pointer object = OGRVectorDataIOType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/IO/IOKML/test/CMakeLists.txt b/Modules/IO/IOKML/test/CMakeLists.txt
index a14a00225a886dbcd76e919965d054430e80ceab..7dc8234f435af40d0b0a58a50314c5cce57ad00b 100644
--- a/Modules/IO/IOKML/test/CMakeLists.txt
+++ b/Modules/IO/IOKML/test/CMakeLists.txt
@@ -22,7 +22,6 @@ otb_module_test()
set(OTBIOKMLTests
otbIOKMLTestDriver.cxx
-otbKMLVectorDataIONew.cxx
otbKMLVectorDataIOTestFileReader.cxx
otbKMLVectorDataIOTestCanWrite.cxx
otbKMLVectorDataIOTestCanRead.cxx
@@ -34,9 +33,6 @@ otb_module_target_label(otbIOKMLTestDriver)
# Tests Declaration
-otb_add_test(NAME ioTuKMLVectorDataIO COMMAND otbIOKMLTestDriver
- otbKMLVectorDataIONew )
-
otb_add_test(NAME ioTvKMLVectorDataIOFileReaderExample COMMAND otbIOKMLTestDriver
otbKMLVectorDataIOTestFileReader
${INPUTDATA}/MODIS20040214212340.kml
@@ -59,4 +55,3 @@ otb_add_test(NAME ioTuKMLVectorDataIOCanWrite COMMAND otbIOKMLTestDriver
otb_add_test(NAME ioTuKMLVectorDataIOCanRead COMMAND otbIOKMLTestDriver
otbKMLVectorDataIOTestCanRead
${INPUTDATA}/MODIS20040214212340.kml)
-
diff --git a/Modules/IO/IOKML/test/otbIOKMLTestDriver.cxx b/Modules/IO/IOKML/test/otbIOKMLTestDriver.cxx
index 1169a600794eb326abe129259632ef77c32152f9..3129b743ac2f65035bc95cfcf2d8365576c3bbcf 100644
--- a/Modules/IO/IOKML/test/otbIOKMLTestDriver.cxx
+++ b/Modules/IO/IOKML/test/otbIOKMLTestDriver.cxx
@@ -22,7 +22,6 @@
void RegisterTests()
{
- REGISTER_TEST(otbKMLVectorDataIONew);
REGISTER_TEST(otbKMLVectorDataIOTestFileReader);
REGISTER_TEST(otbKMLVectorDataIOTestCanWrite);
REGISTER_TEST(otbKMLVectorDataIOTestCanRead);
diff --git a/Modules/IO/IOKML/test/otbKMLVectorDataIONew.cxx b/Modules/IO/IOKML/test/otbKMLVectorDataIONew.cxx
deleted file mode 100644
index 8237b5ee7d3710706728aa015c44fcf8d24dfa84..0000000000000000000000000000000000000000
--- a/Modules/IO/IOKML/test/otbKMLVectorDataIONew.cxx
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbKMLVectorDataIO.h"
-
-int otbKMLVectorDataIONew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::KMLVectorDataIO KMLVectorDataIOType;
- KMLVectorDataIOType::Pointer object = KMLVectorDataIOType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/IO/IOTileMap/src/otbTileMapImageIO.cxx b/Modules/IO/IOTileMap/src/otbTileMapImageIO.cxx
index 8d51a6876ed81a9af03b6ba65e1cbc0f6a2d0290..cbb4019c6183e839e1c72865cd44805023f67f95 100644
--- a/Modules/IO/IOTileMap/src/otbTileMapImageIO.cxx
+++ b/Modules/IO/IOTileMap/src/otbTileMapImageIO.cxx
@@ -364,7 +364,7 @@ void TileMapImageIO::ReadTile(const std::string& filename, void * buffer)
if (lCanRead == true)
{
- imageIO->SetFileName(filename.c_str());
+ imageIO->SetFileName(filename);
imageIO->ReadImageInformation();
itk::ImageIORegion ioRegion(2);
ioRegion.SetIndex(0, 0);
@@ -695,7 +695,7 @@ void TileMapImageIO::InternalWrite(double x, double y, const void* buffer)
imageIO->SetUseCompression(1);
- imageIO->SetFileName(filename.str().c_str());
+ imageIO->SetFileName(filename.str());
imageIO->WriteImageInformation();
itk::ImageIORegion ioRegion(2);
diff --git a/Modules/IO/IOTileMap/test/CMakeLists.txt b/Modules/IO/IOTileMap/test/CMakeLists.txt
index 7ebc74f6c4e1ffd992272fbbce9d755ed8828ec9..29afb4c7c6b8541f99461ce3397ac0bf975351d1 100644
--- a/Modules/IO/IOTileMap/test/CMakeLists.txt
+++ b/Modules/IO/IOTileMap/test/CMakeLists.txt
@@ -33,9 +33,6 @@ otb_module_target_label(otbIOTileMapTestDriver)
# Tests Declaration
-otb_add_test(NAME ioTuTileMapImageIOHelperNew COMMAND otbIOTileMapTestDriver
- otbTileMapImageIOHelperNew
- )
otb_add_test(NAME ioTvTileMapImageIOHelperTest COMMAND otbIOTileMapTestDriver
--compare-ascii ${EPSILON_9} ${BASELINE_FILES}/ioTvTileMapImageIOHelperTest.txt
diff --git a/Modules/IO/IOTileMap/test/otbIOTileMapTestDriver.cxx b/Modules/IO/IOTileMap/test/otbIOTileMapTestDriver.cxx
index bf2839e516dcdf8b55ace22a778dc42c4b792f8c..04b39a1ad887d188ba7418cc526694ec1cbafc58 100644
--- a/Modules/IO/IOTileMap/test/otbIOTileMapTestDriver.cxx
+++ b/Modules/IO/IOTileMap/test/otbIOTileMapTestDriver.cxx
@@ -22,7 +22,6 @@
void RegisterTests()
{
- REGISTER_TEST(otbTileMapImageIOHelperNew);
REGISTER_TEST(otbTileMapImageIOHelperTest);
REGISTER_TEST(otbTileMapImageIOTest);
REGISTER_TEST(otbTileMapWriter);
diff --git a/Modules/IO/IOTileMap/test/otbTileMapImageIOHelperTest.cxx b/Modules/IO/IOTileMap/test/otbTileMapImageIOHelperTest.cxx
index 10589a0a54739414cfae1fcf10947e5c104fe584..e6ca622d96906418b0910ab2b0606ba5f9ecf519 100644
--- a/Modules/IO/IOTileMap/test/otbTileMapImageIOHelperTest.cxx
+++ b/Modules/IO/IOTileMap/test/otbTileMapImageIOHelperTest.cxx
@@ -22,13 +22,6 @@
#include <fstream>
#include "otbTileMapImageIOHelper.h"
-int otbTileMapImageIOHelperNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- otb::TileMapImageIOHelper::Pointer myTileMapImageIOHelper;
- myTileMapImageIOHelper = otb::TileMapImageIOHelper::New();
- return EXIT_SUCCESS;
-}
int otbTileMapImageIOHelperTest(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/IO/ImageIO/include/otbImageFileReader.h b/Modules/IO/ImageIO/include/otbImageFileReader.h
index 92b98e099eb7d47e35f131857a2acb5207b74b76..9b6bfcf8f9368a8ea559b54014bbd00961bbc8ff 100644
--- a/Modules/IO/ImageIO/include/otbImageFileReader.h
+++ b/Modules/IO/ImageIO/include/otbImageFileReader.h
@@ -140,8 +140,11 @@ public:
void SetImageIO( otb::ImageIOBase * imageIO );
itkGetObjectMacro(ImageIO,otb::ImageIOBase);
+ /** \deprecated const char* overload of SetFileName is deprecated, use std::string instead */
virtual void SetFileName(const char* extendedFileName);
- virtual void SetFileName(std::string extendedFileName);
+
+ virtual void SetFileName(const std::string& extendedFileName);
+
virtual const char* GetFileName () const;
/** Get the resolution information from the file */
diff --git a/Modules/IO/ImageIO/include/otbImageFileReader.hxx b/Modules/IO/ImageIO/include/otbImageFileReader.hxx
index b1a752a7df12b6627661ef94c50a61d8f7f06d0e..c26730b0058a322f728ad905c540c7e571796b5b 100644
--- a/Modules/IO/ImageIO/include/otbImageFileReader.hxx
+++ b/Modules/IO/ImageIO/include/otbImageFileReader.hxx
@@ -134,7 +134,7 @@ ImageFileReader<TOutputImage, ConvertPixelTraits>
// Tell the ImageIO to read the file
OutputImagePixelType *buffer =
output->GetPixelContainer()->GetBufferPointer();
- this->m_ImageIO->SetFileName(this->m_FileName.c_str());
+ this->m_ImageIO->SetFileName(this->m_FileName);
itk::ImageIORegion ioRegion(TOutputImage::ImageDimension);
@@ -305,7 +305,7 @@ ImageFileReader<TOutputImage, ConvertPixelTraits>
// Got to allocate space for the image. Determine the characteristics of
// the image.
//
- this->m_ImageIO->SetFileName(this->m_FileName.c_str());
+ this->m_ImageIO->SetFileName(this->m_FileName);
this->m_ImageIO->ReadImageInformation();
// Initialize the number of component per pixel
// THOMAS: This is not in ITK!
@@ -658,64 +658,64 @@ ImageFileReader<TOutputImage, ConvertPixelTraits>
template <class TOutputImage, class ConvertPixelTraits>
void
ImageFileReader<TOutputImage, ConvertPixelTraits>
-::SetFileName(std::string extendedFileName)
+::SetFileName(const char* in)
{
- this->SetFileName(extendedFileName.c_str());
+ if (in)
+ {
+ this->SetFileName(std::string(in));
+ }
}
template <class TOutputImage, class ConvertPixelTraits>
void
ImageFileReader<TOutputImage, ConvertPixelTraits>
-::SetFileName(const char* in)
+::SetFileName(const std::string& extendedFileName)
{
const std::string skip_geom_key = "skipgeom";
const std::string geom_key = "geom";
- if (in)
- {
- // First, see if the simple filename has changed
- typename FNameHelperType::Pointer helper = FNameHelperType::New();
+ // First, see if the simple filename has changed
+ typename FNameHelperType::Pointer helper = FNameHelperType::New();
+
+ helper->SetExtendedFileName(extendedFileName);
+ std::string simpleFileName = helper->GetSimpleFileName();
- helper->SetExtendedFileName(in);
- std::string simpleFileName = helper->GetSimpleFileName();
+ if(simpleFileName == this->m_FileName)
+ {
+ // Then, see if the option map changed
+ const typename ExtendedFilenameHelper::OptionMapType & newMap = helper->GetOptionMap();
+ const typename ExtendedFilenameHelper::OptionMapType & oldMap = m_FilenameHelper->GetOptionMap();
- if(simpleFileName == this->m_FileName)
+ // Both maps are not completely the same
+ if(oldMap.size() != newMap.size() || !std::equal(oldMap.begin(),oldMap.end(),newMap.begin()))
{
- // Then, see if the option map changed
- const typename ExtendedFilenameHelper::OptionMapType & newMap = helper->GetOptionMap();
- const typename ExtendedFilenameHelper::OptionMapType & oldMap = m_FilenameHelper->GetOptionMap();
+ this->Modified();
- // Both maps are not completely the same
- if(oldMap.size() != newMap.size() || !std::equal(oldMap.begin(),oldMap.end(),newMap.begin()))
+ // Now check if keywordlist needs to be generated again
+ // Condition is: one of the old or new map has the skip_geom
+ // key and the other does not
+ // OR
+ // one of the old or new map has the geom key and the other
+ // does not
+ // OR
+ // both have the geom key but the geom value is different
+ if((oldMap.count(skip_geom_key) != newMap.count(skip_geom_key))
+ || (oldMap.count(geom_key) != newMap.count(geom_key))
+ || ((oldMap.count(geom_key) && newMap.count(geom_key))
+ && oldMap.find(geom_key)->second != newMap.find(geom_key)->second))
{
- this->Modified();
-
- // Now check if keywordlist needs to be generated again
- // Condition is: one of the old or new map has the skip_geom
- // key and the other does not
- // OR
- // one of the old or new map has the geom key and the other
- // does not
- // OR
- // both have the geom key but the geom value is different
- if((oldMap.count(skip_geom_key) != newMap.count(skip_geom_key))
- || (oldMap.count(geom_key) != newMap.count(geom_key))
- || ((oldMap.count(geom_key) && newMap.count(geom_key))
- && oldMap.find(geom_key)->second != newMap.find(geom_key)->second))
- {
- m_KeywordListUpToDate = false;
- }
+ m_KeywordListUpToDate = false;
}
}
- else
- {
- this->m_FileName = simpleFileName;
- m_KeywordListUpToDate = false;
- this->Modified();
- }
-
- m_FilenameHelper = helper;
}
+ else
+ {
+ this->m_FileName = simpleFileName;
+ m_KeywordListUpToDate = false;
+ this->Modified();
+ }
+
+ m_FilenameHelper = helper;
}
template <class TOutputImage, class ConvertPixelTraits>
diff --git a/Modules/IO/ImageIO/include/otbImageFileWriter.h b/Modules/IO/ImageIO/include/otbImageFileWriter.h
index f59c57075f746f9ab164d7b8e2a72999d33c40ab..237d2c637a193cfbd2a40e38a1a142514e3279df 100644
--- a/Modules/IO/ImageIO/include/otbImageFileWriter.h
+++ b/Modules/IO/ImageIO/include/otbImageFileWriter.h
@@ -172,9 +172,11 @@ public:
* has no output. */
void Update() override;
- /** ImageFileWriter Methods */
+ /** \deprecated const char* overload of SetFileName is deprecated, use std::string instead */
virtual void SetFileName(const char* extendedFileName);
- virtual void SetFileName(std::string extendedFileName);
+
+ virtual void SetFileName(const std::string& extendedFileName);
+
virtual const char* GetFileName () const;
/** Specify the region to write. If left NULL, then the whole image
diff --git a/Modules/IO/ImageIO/include/otbImageFileWriter.hxx b/Modules/IO/ImageIO/include/otbImageFileWriter.hxx
index d10dddeb7711053b366542d5b4592c06e99c401a..56a226626a43d223f8f4656f54cd4e07d83eed0b 100644
--- a/Modules/IO/ImageIO/include/otbImageFileWriter.hxx
+++ b/Modules/IO/ImageIO/include/otbImageFileWriter.hxx
@@ -571,7 +571,7 @@ ImageFileWriter<TInputImage>
/** Create Image file */
// Setup the image IO for writing.
//
- m_ImageIO->SetFileName(m_FileName.c_str());
+ m_ImageIO->SetFileName(m_FileName);
m_ImageIO->WriteImageInformation();
}
@@ -832,9 +832,12 @@ ImageFileWriter<TInputImage>
template <class TInputImage>
void
ImageFileWriter<TInputImage>
-::SetFileName(std::string extendedFileName)
+::SetFileName(const std::string& extendedFileName)
{
- this->SetFileName(extendedFileName.c_str());
+ this->m_FilenameHelper->SetExtendedFileName(extendedFileName);
+ m_FileName = this->m_FilenameHelper->GetSimpleFileName();
+ m_ImageIO = nullptr;
+ this->Modified();
}
template <class TInputImage>
@@ -842,10 +845,12 @@ void
ImageFileWriter<TInputImage>
::SetFileName(const char* extendedFileName)
{
- this->m_FilenameHelper->SetExtendedFileName(extendedFileName);
- m_FileName = this->m_FilenameHelper->GetSimpleFileName();
- m_ImageIO = nullptr;
- this->Modified();
+ if (extendedFileName == nullptr)
+ {
+ itkGenericExceptionMacro( << "Filename is NULL" );
+ }
+
+ this->SetFileName(std::string(extendedFileName));
}
template <class TInputImage>
diff --git a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
index 70f2e8167c45e714567907d3a6281c7ab112a8b4..2a7fadfbdbb61f7da614c3e5eb0b9db99ec05748 100644
--- a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
+++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
@@ -111,6 +111,13 @@ public:
* selection
*/
virtual void SetFileName(const std::string& file);
+
+ /**
+ * Set the file to be read. Once the Filename is set, ReadMeatFile is called in order to get
+ * the number of image files to be read, the images file names, the band and region
+ * selection
+ * \deprecated const char* overload of SetFileName is deprecated, use std::string instead
+ */
virtual void SetFileName(const char * file);
/** get the Filenames */
diff --git a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.hxx b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.hxx
index 655f19b9251d60bfb3c0125c3be11316eb7e7cba..037a4e054eea364a885bd5e374ce8cb5df8efa67 100644
--- a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.hxx
+++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.hxx
@@ -43,7 +43,13 @@ void
ImageSeriesFileReaderBase<TImage, TInternalImage>
::SetFileName(const std::string& file)
{
- return SetFileName(file.c_str());
+ if (file == m_FileName) return;
+
+ this->m_FileName = file;
+ ReadMetaFile();
+ AllocateListOfComponents();
+
+ this->Modified();
}
template <class TImage, class TInternalImage>
@@ -51,17 +57,10 @@ void
ImageSeriesFileReaderBase<TImage, TInternalImage>
::SetFileName(const char * file)
{
- if (file && (file == m_FileName)) return;
-
if (file)
- {
- this->m_FileName = file;
- ReadMetaFile();
- AllocateListOfComponents();
- }
- else this->m_FileName = "";
-
- this->Modified();
+ {
+ this->SetFileName(std::string(file));
+ }
}
template <class TImage, class TInternalImage>
diff --git a/Modules/IO/ImageIO/test/CMakeLists.txt b/Modules/IO/ImageIO/test/CMakeLists.txt
index 110b25410e8bfd8f663a505fa202b4399d213609..59b02a6d60000b595ee5f3bbb6bf94356f40541c 100644
--- a/Modules/IO/ImageIO/test/CMakeLists.txt
+++ b/Modules/IO/ImageIO/test/CMakeLists.txt
@@ -50,7 +50,6 @@ otbMultiResolutionReadingInfo.cxx
otbImageFileReaderTestFloat.cxx
otbComplexImageTests.cxx
otbImageFileReaderRADChar.cxx
-otbScalarBufferToImageFileWriterNew.cxx
otbShortImageIOTest.cxx
otbImageSeriesFileReader.cxx
otbStreamingShortImageFileWriterTest.cxx
@@ -72,7 +71,6 @@ otbStreamingImageFilterTest.cxx
otbImageFileWriterRGBTest.cxx
otbComplexImageManipulationTest.cxx
otbImageFileWriterTest.cxx
-otbImageIOFactoryNew.cxx
otbCompareWritingComplexImage.cxx
otbImageFileReaderOptBandTest.cxx
otbImageFileWriterOptBandTest.cxx
@@ -603,17 +601,11 @@ otb_add_test(NAME ioTvImageComplexFloatTest COMMAND otbImageIOTestDriver
${INPUTDATA}/multibandComplexFloat_2bands.hdr
)
-otb_add_test(NAME ioTuVectorImageComplexNew COMMAND otbImageIOTestDriver
- otbVectorImageComplexNew)
-
otb_add_test(NAME ioTvImageComplexDoubleTest COMMAND otbImageIOTestDriver
otbImageComplexDoubleTest
${INPUTDATA}/multibandComplexDouble_2bands.hdr
)
-otb_add_test(NAME ioTuScalarBufferToImageFileWriter COMMAND otbImageIOTestDriver
- otbScalarBufferToImageFileWriterNew )
-
otb_add_test(NAME ioTvImageFileReaderShortLUM2LUM COMMAND otbImageIOTestDriver
--compare-image ${EPSILON_9} ${INPUTDATA}/poupees_I2.lum
${TEMP}/ioImageFileReaderI2_LUM2LUM.lum
@@ -930,9 +922,6 @@ otb_add_test(NAME ioTvImageFileWriterPNG2BSQ COMMAND otbImageIOTestDriver
${INPUTDATA}/cthead1.png
${TEMP}/ioImageFileWriterPNG2BSQ_cthead1.hdr )
-otb_add_test(NAME ioTuImageIOFactoryNew COMMAND otbImageIOTestDriver
- otbImageIOFactoryNew )
-
otb_add_test(NAME ioTvCompareWritingComplexImage_TIF COMMAND otbImageIOTestDriver
otbCompareWritingComplexImageTest
LARGEINPUT{PALSAR/200801280007/l1data/VOL-ALPSRP037120700-H1.1__A}
diff --git a/Modules/IO/ImageIO/test/otbComplexImageTests.cxx b/Modules/IO/ImageIO/test/otbComplexImageTests.cxx
index 78042bd620eac33b9306222e1b8dc4ed64705f18..9822b0444da5327c1a59a1e41ac06e256b003c33 100644
--- a/Modules/IO/ImageIO/test/otbComplexImageTests.cxx
+++ b/Modules/IO/ImageIO/test/otbComplexImageTests.cxx
@@ -30,15 +30,6 @@
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
-int otbVectorImageComplexNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
- typedef std::complex<float> PixelType;
- typedef otb::VectorImage<PixelType, 2> ImageType;
- ImageType::Pointer image = ImageType::New();
- image->Initialize();
-
- return EXIT_SUCCESS;
-}
template<class InternalType>
diff --git a/Modules/IO/ImageIO/test/otbImageIOFactoryNew.cxx b/Modules/IO/ImageIO/test/otbImageIOFactoryNew.cxx
deleted file mode 100644
index 8acb329a32df424b9065b46015550e28a294cdf7..0000000000000000000000000000000000000000
--- a/Modules/IO/ImageIO/test/otbImageIOFactoryNew.cxx
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "otbImageIOFactory.h"
-#include "itkMacro.h"
-#include <iostream>
-
-int otbImageIOFactoryNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- otb::ImageIOFactory *lImageIOFactory;
- lImageIOFactory = nullptr;
- return lImageIOFactory != nullptr; //to avoid unused variable warning
-}
diff --git a/Modules/IO/ImageIO/test/otbImageIOTestDriver.cxx b/Modules/IO/ImageIO/test/otbImageIOTestDriver.cxx
index 4a7ff9409a53d34ec7d404c6f6d56cc57c8917bf..0dab5832434baab0f12df11545fcd93e348858ac 100644
--- a/Modules/IO/ImageIO/test/otbImageIOTestDriver.cxx
+++ b/Modules/IO/ImageIO/test/otbImageIOTestDriver.cxx
@@ -68,7 +68,6 @@ void RegisterTests()
REGISTER_TEST(otbPipelineMetadataHandlingTest);
REGISTER_TEST(otbMultiResolutionReadingInfo);
REGISTER_TEST(otbImageFileReaderTestFloat);
- REGISTER_TEST(otbVectorImageComplexNew);
REGISTER_TEST(otbVectorImageComplexFloatTest);
REGISTER_TEST(otbVectorImageComplexDoubleTest);
REGISTER_TEST(otbImageComplexFloatTest);
@@ -76,7 +75,6 @@ void RegisterTests()
REGISTER_TEST(otbVectorImageComplexIntoRealFloatTest);
REGISTER_TEST(otbVectorImageComplexIntoRealDoubleTest);
REGISTER_TEST(otbImageFileReaderRADChar);
- REGISTER_TEST(otbScalarBufferToImageFileWriterNew);
REGISTER_TEST(otbShortImageIOTest);
REGISTER_TEST(otbImageSeriesFileReader);
REGISTER_TEST(otbStreamingShortImageFileWriterTest);
@@ -150,7 +148,6 @@ void RegisterTests()
REGISTER_TEST(otbMultibandComplexToImageScalarShort);
REGISTER_TEST(otbMultibandComplexToImageScalarInt);
REGISTER_TEST(otbImageFileWriterTest);
- REGISTER_TEST(otbImageIOFactoryNew);
REGISTER_TEST(otbCompareWritingComplexImageTest);
REGISTER_TEST(otbImageFileReaderOptBandTest);
REGISTER_TEST(otbImageFileWriterOptBandTest);
diff --git a/Modules/IO/ImageIO/test/otbScalarBufferToImageFileWriterNew.cxx b/Modules/IO/ImageIO/test/otbScalarBufferToImageFileWriterNew.cxx
deleted file mode 100644
index 40954e3febfc4cd409057b866959ad4236a4b9c7..0000000000000000000000000000000000000000
--- a/Modules/IO/ImageIO/test/otbScalarBufferToImageFileWriterNew.cxx
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "otbScalarBufferToImageFileWriter.h"
-
-
-int otbScalarBufferToImageFileWriterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::ScalarBufferToImageFileWriter<int, double> FilterType;
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/IO/KMZWriter/include/otbKmzProductWriter.hxx b/Modules/IO/KMZWriter/include/otbKmzProductWriter.hxx
index ae48567e508099cf9dfdbbcb7c8d6ab6d366568e..56dda0ebb7b0f214ff419da15dc5e5f00a5d0169 100644
--- a/Modules/IO/KMZWriter/include/otbKmzProductWriter.hxx
+++ b/Modules/IO/KMZWriter/include/otbKmzProductWriter.hxx
@@ -235,7 +235,7 @@ KmzProductWriter<TInputImage>
castFiler->SetInput(legend);
m_VectorWriter = VectorWriterType::New();
- m_VectorWriter->SetFileName(legendName.str().c_str());
+ m_VectorWriter->SetFileName(legendName.str());
m_VectorWriter->SetInput(castFiler->GetOutput());
m_VectorWriter->Update();
@@ -439,7 +439,7 @@ KmzProductWriter<TInputImage>
// Configure writer
m_VectorWriter = VectorWriterType::New();
- m_VectorWriter->SetFileName(ossFileName.str().c_str());
+ m_VectorWriter->SetFileName(ossFileName.str());
m_VectorWriter->SetInput(m_VectorImageExtractROIFilter->GetOutput());
m_VectorWriter->Update();
diff --git a/Modules/IO/KMZWriter/test/CMakeLists.txt b/Modules/IO/KMZWriter/test/CMakeLists.txt
index 020ba9b62abf7f4df6bdb1bd275c2086eb6c6995..155bd8193cd1df2ab7297e5deaf19e97ffbfdaf3 100644
--- a/Modules/IO/KMZWriter/test/CMakeLists.txt
+++ b/Modules/IO/KMZWriter/test/CMakeLists.txt
@@ -63,9 +63,6 @@ otb_add_test(NAME ioTvKmzProductWriterWithGCP COMMAND otbKMZWriterTestDriver
417.000000 2317.000000 -72.426552 18.540876 0.000000
)
-otb_add_test(NAME ioTuKmzProductWriterNew COMMAND otbKMZWriterTestDriver
- otbKmzProductWriterNew
- )
otb_add_test(NAME ioTvKmzProductWriterWithGCP_Logo_Legend COMMAND otbKMZWriterTestDriver
otbKmzProductWriterWithLogoAndLegend
diff --git a/Modules/IO/KMZWriter/test/otbKMZWriterTestDriver.cxx b/Modules/IO/KMZWriter/test/otbKMZWriterTestDriver.cxx
index 5588665d929b4ee41b15d8c0636bbfe737e0f2d8..2675909d90063dd48d0e902aa809be5aac2b1994 100644
--- a/Modules/IO/KMZWriter/test/otbKMZWriterTestDriver.cxx
+++ b/Modules/IO/KMZWriter/test/otbKMZWriterTestDriver.cxx
@@ -22,7 +22,6 @@
void RegisterTests()
{
- REGISTER_TEST(otbKmzProductWriterNew);
REGISTER_TEST(otbKmzProductWriter);
REGISTER_TEST(otbKmzProductWriterWithLogoAndLegend);
}
diff --git a/Modules/IO/KMZWriter/test/otbKmzProductWriter.cxx b/Modules/IO/KMZWriter/test/otbKmzProductWriter.cxx
index 01dfac92d2fe0ae12cce6c4dae78e867aecc26e7..6ebc4c8872c9b608a1415f4b4855a13cfcc32a3e 100644
--- a/Modules/IO/KMZWriter/test/otbKmzProductWriter.cxx
+++ b/Modules/IO/KMZWriter/test/otbKmzProductWriter.cxx
@@ -33,11 +33,6 @@ typedef GCPsToSensorModelFilterType::Point2DType Point2DType;
typedef GCPsToSensorModelFilterType::Point3DType Point3DType;
-int otbKmzProductWriterNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
- KmzProductWriterType::Pointer kmzWriter = KmzProductWriterType::New();
- return EXIT_SUCCESS;
-}
int otbKmzProductWriter(int argc, char* argv[])
{
diff --git a/Modules/IO/TestKernel/src/otbTestHelper.cxx b/Modules/IO/TestKernel/src/otbTestHelper.cxx
index 045e7008bcf069accc84b3e2e747ebcd13b4ba31..2599f7ea278e374e5b0eec8dbdac24ffc4199972 100644
--- a/Modules/IO/TestKernel/src/otbTestHelper.cxx
+++ b/Modules/IO/TestKernel/src/otbTestHelper.cxx
@@ -1365,7 +1365,7 @@ int TestHelper::RegressionTestImage(int cpt, const char *testImageFilename, cons
{
itkGenericExceptionMacro(<< "Error during rescale of " << diffName.str());
}
- writer->SetFileName(diffName.str().c_str());
+ writer->SetFileName(diffName.str());
try
{
writer->Update();
@@ -1406,7 +1406,7 @@ int TestHelper::RegressionTestImage(int cpt, const char *testImageFilename, cons
}
try
{
- writer->SetFileName(baseName.str().c_str());
+ writer->SetFileName(baseName.str());
writer->Update();
}
catch (...)
@@ -1445,7 +1445,7 @@ int TestHelper::RegressionTestImage(int cpt, const char *testImageFilename, cons
}
try
{
- writer->SetFileName(testName.str().c_str());
+ writer->SetFileName(testName.str());
writer->Update();
}
catch (...)
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.hxx b/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.hxx
index f9ae2517b871318879e3eb6637075c037fa29ea3..275539f86baf7b6b806e5a71469c1a10e17e576b 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.hxx
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.hxx
@@ -179,7 +179,7 @@ VectorDataFileReader<TOutputVectorData>
return;
}
- m_VectorDataIO->SetFileName(m_FileName.c_str());
+ m_VectorDataIO->SetFileName(m_FileName);
//Copy MetaDataDictionary from instantiated reader to output VectorData.
output->SetMetaDataDictionary(m_VectorDataIO->GetMetaDataDictionary());
@@ -208,7 +208,7 @@ VectorDataFileReader<TOutputVectorData>
m_ExceptionMessage = err.GetDescription();
}
- m_VectorDataIO->SetFileName(m_FileName.c_str());
+ m_VectorDataIO->SetFileName(m_FileName);
// Tell the VectorDataIO to read the file
//
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.hxx b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.hxx
index 34b003e6520e3cd51782f0ba8365d933a70e7441..e0ab173f164d5d55cdd8e69b2c147395ada7e245 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.hxx
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.hxx
@@ -194,7 +194,7 @@ VectorDataFileWriter<TInputVectorData>
// Setup the vector data IO for writing.
//
- m_VectorDataIO->SetFileName(m_FileName.c_str());
+ m_VectorDataIO->SetFileName(m_FileName);
typedef VectorDataAdapter<TInputVectorData, VectorData<double, 2> > AdapterType;
typename AdapterType::Pointer adapter = AdapterType::New();
diff --git a/Modules/IO/VectorDataIO/test/CMakeLists.txt b/Modules/IO/VectorDataIO/test/CMakeLists.txt
index b337070d03278ffc5fe248c6c417b59f73280968..f4f21b7e999db09d2d553dd138de8dbbcddebee9 100644
--- a/Modules/IO/VectorDataIO/test/CMakeLists.txt
+++ b/Modules/IO/VectorDataIO/test/CMakeLists.txt
@@ -24,12 +24,10 @@ set(OTBVectorDataIOTests
otbVectorDataIOTestDriver.cxx
otbVectorDataFileReaderWriter.cxx
otbVectorDataFileWriterPolygons.cxx
-otbVectorDataFileReaderNew.cxx
otbVectorDataIOFactory.cxx
otbVectorDataFileWriterMultiPolygons.cxx
otbVectorDataFileReader.cxx
otbVectorDataFileGeoReaderWriter.cxx
-otbVectorDataFileWriterNew.cxx
otbVectorDataFileWriter.cxx
)
@@ -56,9 +54,6 @@ otb_add_test(NAME ioTvVectorDataFileWriterPolygons COMMAND otbVectorDataIOTestDr
${TEMP}/ioTvVectorDataFileWriterPolygonsOutput.shp
)
-otb_add_test(NAME ioTuVectorDataFileReaderNew COMMAND otbVectorDataIOTestDriver
- otbVectorDataFileReaderNew )
-
otb_add_test(NAME ioTuVectorDataIOFactory COMMAND otbVectorDataIOTestDriver
otbVectorDataIOFactory
${INPUTDATA}/ToulouseRoad-examples.shp )
@@ -147,9 +142,6 @@ otb_add_test(NAME ioTvVectorDataFileGeoReaderWriter COMMAND otbVectorDataIOTestD
${TEMP}/ioTvVectorDataFileGeoReaderWriterOutput.shp
)
-otb_add_test(NAME ioTuVectorDataFileWriterNew COMMAND otbVectorDataIOTestDriver
- otbVectorDataFileWriterNew )
-
otb_add_test(NAME ioTvVectorDataFileWriter COMMAND otbVectorDataIOTestDriver
--compare-ogr ${EPSILON_9}
${BASELINE_FILES}/ioTvVectorDataFileWriterOutput.shp
diff --git a/Modules/IO/VectorDataIO/test/otbVectorDataFileReaderNew.cxx b/Modules/IO/VectorDataIO/test/otbVectorDataFileReaderNew.cxx
deleted file mode 100644
index 18127c5ace51dbaa2fc159c3335c859eda6c9cd6..0000000000000000000000000000000000000000
--- a/Modules/IO/VectorDataIO/test/otbVectorDataFileReaderNew.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbVectorDataFileReader.h"
-#include "otbVectorData.h"
-
-int otbVectorDataFileReaderNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::VectorData<> VectorDataType;
- typedef otb::VectorDataFileReader<VectorDataType> VectorDataFileReaderType;
- VectorDataFileReaderType::Pointer object = VectorDataFileReaderType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/IO/VectorDataIO/test/otbVectorDataFileWriterNew.cxx b/Modules/IO/VectorDataIO/test/otbVectorDataFileWriterNew.cxx
deleted file mode 100644
index 995a3965bb4586fb242652251f0a274aa1dc6f89..0000000000000000000000000000000000000000
--- a/Modules/IO/VectorDataIO/test/otbVectorDataFileWriterNew.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbVectorDataFileWriter.h"
-#include "otbVectorData.h"
-
-int otbVectorDataFileWriterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::VectorData<double, 2> VectorDataType;
- typedef otb::VectorDataFileWriter<VectorDataType> WriterType;
-
- //Instantiation
- WriterType::Pointer writer = WriterType::New();
-
- std::cout << writer << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/IO/VectorDataIO/test/otbVectorDataIOTestDriver.cxx b/Modules/IO/VectorDataIO/test/otbVectorDataIOTestDriver.cxx
index f4c6369178f3c4451f964186a8a6b84696d88605..f499bf1cea3977bf4da8fbba92fe9323f7144fb7 100644
--- a/Modules/IO/VectorDataIO/test/otbVectorDataIOTestDriver.cxx
+++ b/Modules/IO/VectorDataIO/test/otbVectorDataIOTestDriver.cxx
@@ -24,11 +24,9 @@ void RegisterTests()
{
REGISTER_TEST(otbVectorDataFileReaderWriter);
REGISTER_TEST(otbVectorDataFileWriterPolygons);
- REGISTER_TEST(otbVectorDataFileReaderNew);
REGISTER_TEST(otbVectorDataIOFactory);
REGISTER_TEST(otbVectorDataFileWriterMultiPolygons);
REGISTER_TEST(otbVectorDataFileReader);
REGISTER_TEST(otbVectorDataFileGeoReaderWriter);
- REGISTER_TEST(otbVectorDataFileWriterNew);
REGISTER_TEST(otbVectorDataFileWriter);
}
diff --git a/Modules/Learning/DempsterShafer/test/CMakeLists.txt b/Modules/Learning/DempsterShafer/test/CMakeLists.txt
index ff755d4a94cbd881280f5dfe97558e342e0eefbe..64d4f9fdc33be9e55f0499821deb0e16c4e4c66d 100644
--- a/Modules/Learning/DempsterShafer/test/CMakeLists.txt
+++ b/Modules/Learning/DempsterShafer/test/CMakeLists.txt
@@ -29,7 +29,6 @@ otbDempsterShaferFusionTests.cxx
otbDSFusionOfClassifiersImageFilterTest.cxx
otbJointMassOfBeliefFilter.cxx
otbMassOfBelief.cxx
-otbStandardDSCostFunction.cxx
)
add_executable(otbDempsterShaferTestDriver ${OTBDempsterShaferTests})
@@ -74,9 +73,6 @@ otb_add_test(NAME fzTvConfusionMatrixToMassOfBeliefTestAccuracy COMMAND otbDemps
otbConfusionMatrixToMassOfBeliefTest
ACCURACY)
-otb_add_test(NAME fzTuConfusionMatrixToMassOfBeliefNew COMMAND otbDempsterShaferTestDriver
- otbConfusionMatrixToMassOfBeliefNew)
-
otb_add_test(NAME fzTvConfusionMatrixToMassOfBeliefTestPrecision COMMAND otbDempsterShaferTestDriver
otbConfusionMatrixToMassOfBeliefTest
PRECISION)
@@ -99,9 +95,6 @@ otb_add_test(NAME fzTvVectorDataToDSValidatedVectorDataFilter COMMAND otbDempste
)
set_property(TEST fzTvVectorDataToDSValidatedVectorDataFilter PROPERTY DEPENDS fzTvVectorDataToRoadDescriptionFilter)
-otb_add_test(NAME fzTuVectorDataToDSValidatedVectorDataFilterNew COMMAND otbDempsterShaferTestDriver
- otbVectorDataToDSValidatedVectorDataFilterNew)
-
otb_add_test(NAME fzDSFusionTestConfMatFileVCMTestPrecision COMMAND otbDempsterShaferTestDriver
otbDempsterShaferFusionConfMatFileTest
${INPUTDATA}/Classification/QB_1_ortho_C1_V.csv
@@ -335,9 +328,6 @@ otb_add_test(NAME fzTvDSFusionOfClassifiersImageFilterRecall COMMAND otbDempster
${TEMP}/QB_1_ortho_DS_FUSED_RECALL.tif
)
-otb_add_test(NAME fzTuDSFusionOfClassifiersImageFilterNew COMMAND otbDempsterShaferTestDriver
- otbDSFusionOfClassifiersImageFilterNew)
-
otb_add_test(NAME fzTvDSFusionOfClassifiersImageFilterAccuracy COMMAND otbDempsterShaferTestDriver
--compare-image ${NOTOL}
${BASELINE}/QB_1_ortho_DS_FUSED_ACCURACY.tif
@@ -370,6 +360,3 @@ otb_add_test(NAME fzTvJointMassOfBeliefFilter COMMAND otbDempsterShaferTestDrive
otb_add_test(NAME fzTvMassOfBelief COMMAND otbDempsterShaferTestDriver
otbMassOfBelief)
-otb_add_test(NAME fzTuStandardDSCostFunctionNew COMMAND otbDempsterShaferTestDriver
- otbStandardDSCostFunctionNew)
-
diff --git a/Modules/Learning/DempsterShafer/test/otbConfusionMatrixToMassOfBeliefTest.cxx b/Modules/Learning/DempsterShafer/test/otbConfusionMatrixToMassOfBeliefTest.cxx
index 09e6c90d5025bbcc36b8640a87d12e3dbe46a044..01d64a9b2286618fc22dc63f830b1e51308a9cbd 100644
--- a/Modules/Learning/DempsterShafer/test/otbConfusionMatrixToMassOfBeliefTest.cxx
+++ b/Modules/Learning/DempsterShafer/test/otbConfusionMatrixToMassOfBeliefTest.cxx
@@ -23,35 +23,6 @@
#include "otbConfusionMatrixToMassOfBelief.h"
-int otbConfusionMatrixToMassOfBeliefNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef unsigned long ConfusionMatrixEltType;
- typedef itk::VariableSizeMatrix<ConfusionMatrixEltType> ConfusionMatrixType;
- typedef int LabelType;
-
- // filter types
- typedef otb::ConfusionMatrixToMassOfBelief<ConfusionMatrixType, LabelType>
- ConfusionMatrixToMassOfBelief2TemplatesType;
- typedef otb::ConfusionMatrixToMassOfBelief<ConfusionMatrixType> ConfusionMatrixToMassOfBelief1TemplateType;
- typedef otb::ConfusionMatrixToMassOfBelief<> ConfusionMatrixToMassOfBelief0TemplateType;
-
- // filters
- ConfusionMatrixToMassOfBelief2TemplatesType::Pointer
- confusionMatrixToMassOfBelief2Templates = ConfusionMatrixToMassOfBelief2TemplatesType::New();
- ConfusionMatrixToMassOfBelief1TemplateType::Pointer
- confusionMatrixToMassOfBelief1Template = ConfusionMatrixToMassOfBelief1TemplateType::New();
- ConfusionMatrixToMassOfBelief0TemplateType::Pointer
- confusionMatrixToMassOfBelief0Template = ConfusionMatrixToMassOfBelief0TemplateType::New();
-
- std::cout << confusionMatrixToMassOfBelief2Templates << std::endl;
- std::cout << std::endl;
- std::cout << confusionMatrixToMassOfBelief1Template << std::endl;
- std::cout << std::endl;
- std::cout << confusionMatrixToMassOfBelief0Template << std::endl;
- std::cout << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbConfusionMatrixToMassOfBeliefTest(int itkNotUsed(argc), char* argv[])
diff --git a/Modules/Learning/DempsterShafer/test/otbDSFusionOfClassifiersImageFilterTest.cxx b/Modules/Learning/DempsterShafer/test/otbDSFusionOfClassifiersImageFilterTest.cxx
index 8c6ca0c77ffcfcffc0ebfc9a570ceb71f2a97a91..7bbc4b57bb5044293313f558d5a3411d2d5b4d72 100644
--- a/Modules/Learning/DempsterShafer/test/otbDSFusionOfClassifiersImageFilterTest.cxx
+++ b/Modules/Learning/DempsterShafer/test/otbDSFusionOfClassifiersImageFilterTest.cxx
@@ -158,33 +158,6 @@ int CSVConfusionMatrixFileReader(const std::string fileName, MapOfClassesType &m
-int otbDSFusionOfClassifiersImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
-
- typedef otb::VectorImage<PixelType, Dimension> VectorImageType;
- typedef otb::Image<PixelType, Dimension> OutputImageType;
- typedef otb::Image<unsigned int, Dimension> MaskType;
-
- // filter types
- typedef otb::DSFusionOfClassifiersImageFilter<VectorImageType, OutputImageType, MaskType>
- DSFusionOfClassifiersImageFilter3TemplatesType;
- typedef otb::DSFusionOfClassifiersImageFilter<VectorImageType, OutputImageType>
- DSFusionOfClassifiersImageFilter2TemplatesType;
-
- // filters
- DSFusionOfClassifiersImageFilter3TemplatesType::Pointer
- dsFusionOfClassifiersImageFilter3Templates = DSFusionOfClassifiersImageFilter3TemplatesType::New();
- DSFusionOfClassifiersImageFilter2TemplatesType::Pointer
- dsFusionOfClassifiersImageFilter2Templates = DSFusionOfClassifiersImageFilter2TemplatesType::New();
-
- std::cout << dsFusionOfClassifiersImageFilter3Templates << std::endl;
- std::cout << std::endl;
- std::cout << dsFusionOfClassifiersImageFilter2Templates << std::endl;
- std::cout << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/DempsterShafer/test/otbDempsterShaferTestDriver.cxx b/Modules/Learning/DempsterShafer/test/otbDempsterShaferTestDriver.cxx
index fb1963e48425b0b8fbf51943211a0efa6309bea3..cc85263816aaca20532a4b7a67dd6767b26f909f 100644
--- a/Modules/Learning/DempsterShafer/test/otbDempsterShaferTestDriver.cxx
+++ b/Modules/Learning/DempsterShafer/test/otbDempsterShaferTestDriver.cxx
@@ -23,9 +23,7 @@
void RegisterTests()
{
REGISTER_TEST(otbMassOfBeliefDSApplied);
- REGISTER_TEST(otbConfusionMatrixToMassOfBeliefNew);
REGISTER_TEST(otbConfusionMatrixToMassOfBeliefTest);
- REGISTER_TEST(otbVectorDataToDSValidatedVectorDataFilterNew);
REGISTER_TEST(otbVectorDataToDSValidatedVectorDataFilter);
REGISTER_TEST(otbDempsterShaferFusionOptRecConfMatTest);
REGISTER_TEST(otbDempsterShaferFusionOptRecTest);
@@ -33,10 +31,8 @@ void RegisterTests()
REGISTER_TEST(otbDempsterShaferFusionTest);
REGISTER_TEST(otbDempsterShaferFusionOptRecConfMatFileTest);
REGISTER_TEST(otbDempsterShaferFusionConfMatFileTest);
- REGISTER_TEST(otbDSFusionOfClassifiersImageFilterNew);
REGISTER_TEST(otbDSFusionOfClassifiersImageFilterTest);
REGISTER_TEST(otbJointMassOfBeliefFilter);
REGISTER_TEST(otbJointMassOfBeliefFilterLimit);
REGISTER_TEST(otbMassOfBelief);
- REGISTER_TEST(otbStandardDSCostFunctionNew);
}
diff --git a/Modules/Learning/DempsterShafer/test/otbStandardDSCostFunction.cxx b/Modules/Learning/DempsterShafer/test/otbStandardDSCostFunction.cxx
deleted file mode 100644
index bdcd2e85ed05b1918b18ffd12e6aea84e0c77d11..0000000000000000000000000000000000000000
--- a/Modules/Learning/DempsterShafer/test/otbStandardDSCostFunction.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbStandardDSCostFunction.h"
-
-
-int otbStandardDSCostFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef double PrecisionType;
- typedef otb::VectorData<PrecisionType> VectorDataType;
- typedef otb::VectorDataToDSValidatedVectorDataFilter<VectorDataType, PrecisionType>
- VectorDataValidationFilterType;
- typedef otb::StandardDSCostFunction<VectorDataValidationFilterType>
- CostFunctionType;
-
- CostFunctionType::Pointer costFunction = CostFunctionType::New();
-
- std::cout<<costFunction<<std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/DempsterShafer/test/otbVectorDataToDSValidatedVectorDataFilter.cxx b/Modules/Learning/DempsterShafer/test/otbVectorDataToDSValidatedVectorDataFilter.cxx
index 27e6ab3c54e08f677d679582e314b1b9a9023e73..a4f1e3b131476132a4d7b4d046e1b0f068dbcdbf 100644
--- a/Modules/Learning/DempsterShafer/test/otbVectorDataToDSValidatedVectorDataFilter.cxx
+++ b/Modules/Learning/DempsterShafer/test/otbVectorDataToDSValidatedVectorDataFilter.cxx
@@ -25,21 +25,6 @@
#include "otbVectorDataFileReader.h"
#include "otbVectorDataFileWriter.h"
-int otbVectorDataToDSValidatedVectorDataFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef float PrecisionType;
- typedef otb::VectorData<PrecisionType> VectorDataType;
-
- typedef otb::VectorDataToDSValidatedVectorDataFilter<VectorDataType, PrecisionType>
- VectorDataValidationFilterType;
-
- VectorDataValidationFilterType::Pointer filter =
- VectorDataValidationFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbVectorDataToDSValidatedVectorDataFilter(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/Learning/DimensionalityReductionLearning/test/CMakeLists.txt b/Modules/Learning/DimensionalityReductionLearning/test/CMakeLists.txt
index e51906297744b458c625bcc8b0d78f65a67a529a..145c552688a76c41911728091d2367a1ba91c63e 100644
--- a/Modules/Learning/DimensionalityReductionLearning/test/CMakeLists.txt
+++ b/Modules/Learning/DimensionalityReductionLearning/test/CMakeLists.txt
@@ -33,10 +33,6 @@ otb_module_target_label(otbDimensionalityReductionLearningTestDriver)
# Tests Declaration
# --------------- Autoencoder --------------------------------
-otb_add_test(NAME leTuAutoencoderModelNew COMMAND
- otbDimensionalityReductionLearningTestDriver
- otbAutoencoderModelNew
- )
otb_add_test(NAME leTvAutoencoderModelTrain COMMAND
otbDimensionalityReductionLearningTestDriver
@@ -54,10 +50,6 @@ otb_add_test(NAME leTvAutoencoderModelCanRead COMMAND
set_property(TEST leTvAutoencoderModelCanRead APPEND PROPERTY DEPENDS leTvAutoencoderModelTrain)
# --------------- PCA --------------------------------
-otb_add_test(NAME leTuPCAModelNew COMMAND
- otbDimensionalityReductionLearningTestDriver
- otbPCAModelNew
- )
otb_add_test(NAME leTvPCAModelTrain COMMAND
otbDimensionalityReductionLearningTestDriver
@@ -75,10 +67,6 @@ otb_add_test(NAME leTvPCAModelCanRead COMMAND
set_property(TEST leTvPCAModelCanRead APPEND PROPERTY DEPENDS leTvPCAModelTrain)
# --------------- SOM --------------------------------
-otb_add_test(NAME leTuSOMModelNew COMMAND
- otbDimensionalityReductionLearningTestDriver
- otbSOMModelNew
- )
otb_add_test(NAME leTvSOMModelTrain COMMAND
otbDimensionalityReductionLearningTestDriver
diff --git a/Modules/Learning/DimensionalityReductionLearning/test/otbAutoencoderModelTest.cxx b/Modules/Learning/DimensionalityReductionLearning/test/otbAutoencoderModelTest.cxx
index ad3880f6f54b9e4fb234d4d3a9297a2918c02d27..0dddc42111214b3ed13bb1d1cb41aee0e8d7d52a 100644
--- a/Modules/Learning/DimensionalityReductionLearning/test/otbAutoencoderModelTest.cxx
+++ b/Modules/Learning/DimensionalityReductionLearning/test/otbAutoencoderModelTest.cxx
@@ -26,12 +26,6 @@ typedef otb::AutoencoderModel<double, shark::LogisticNeuron> LogAutoencoderModel
typedef LogAutoencoderModel::InputListSampleType InputListSampleType;
typedef LogAutoencoderModel::TargetListSampleType TargetListSampleType;
-int otbAutoencoderModelNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- LogAutoencoderModel::Pointer model = LogAutoencoderModel::New();
-
- return EXIT_SUCCESS;
-}
int otbAutoencoderModelCanRead(int argc, char * argv [])
{
diff --git a/Modules/Learning/DimensionalityReductionLearning/test/otbDimensionalityReductionLearningTestDriver.cxx b/Modules/Learning/DimensionalityReductionLearning/test/otbDimensionalityReductionLearningTestDriver.cxx
index 6e0c644798e2501bbc77a3c7dc3a28c55b87f5d8..402b12f3e6189d648961ddae98a64847a5d0d3d7 100644
--- a/Modules/Learning/DimensionalityReductionLearning/test/otbDimensionalityReductionLearningTestDriver.cxx
+++ b/Modules/Learning/DimensionalityReductionLearning/test/otbDimensionalityReductionLearningTestDriver.cxx
@@ -22,13 +22,10 @@
void RegisterTests()
{
- REGISTER_TEST(otbAutoencoderModelNew);
REGISTER_TEST(otbAutoencoderModelCanRead);
REGISTER_TEST(otbAutoencoderModeTrain);
- REGISTER_TEST(otbPCAModelNew);
REGISTER_TEST(otbPCAModelCanRead);
REGISTER_TEST(otbPCAModeTrain);
- REGISTER_TEST(otbSOMModelNew);
REGISTER_TEST(otbSOMModelCanRead);
REGISTER_TEST(otbSOMModeTrain);
}
diff --git a/Modules/Learning/DimensionalityReductionLearning/test/otbImageDimensionalityReductionFilterTest.cxx b/Modules/Learning/DimensionalityReductionLearning/test/otbImageDimensionalityReductionFilterTest.cxx
deleted file mode 100644
index a2b8da9d9a15553f2681fa732d90711d1b24306f..0000000000000000000000000000000000000000
--- a/Modules/Learning/DimensionalityReductionLearning/test/otbImageDimensionalityReductionFilterTest.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
diff --git a/Modules/Learning/DimensionalityReductionLearning/test/otbPCAModelTest.cxx b/Modules/Learning/DimensionalityReductionLearning/test/otbPCAModelTest.cxx
index 6fe3945e43729e464de4f264025dd78fb8610e16..6c0ff3dbf03b6457d5a2d2fa14e04316e104dc95 100644
--- a/Modules/Learning/DimensionalityReductionLearning/test/otbPCAModelTest.cxx
+++ b/Modules/Learning/DimensionalityReductionLearning/test/otbPCAModelTest.cxx
@@ -25,12 +25,6 @@ typedef otb::PCAModel<double> PCAModelType;
typedef PCAModelType::InputListSampleType InputListSampleType;
typedef PCAModelType::TargetListSampleType TargetListSampleType;
-int otbPCAModelNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- PCAModelType::Pointer model = PCAModelType::New();
-
- return EXIT_SUCCESS;
-}
int otbPCAModelCanRead(int argc, char * argv [])
{
diff --git a/Modules/Learning/DimensionalityReductionLearning/test/otbSOMModelTest.cxx b/Modules/Learning/DimensionalityReductionLearning/test/otbSOMModelTest.cxx
index 092cac8404ced25b8a106e5ac5037bbaa06ced71..819a3e1e755ae1d85b12a4c581d22cb38b0a6208 100644
--- a/Modules/Learning/DimensionalityReductionLearning/test/otbSOMModelTest.cxx
+++ b/Modules/Learning/DimensionalityReductionLearning/test/otbSOMModelTest.cxx
@@ -29,15 +29,6 @@ typedef otb::SOMModel<double,5> SOMModel5D;
typedef SOMModel2D::InputListSampleType InputListSampleType;
typedef SOMModel2D::TargetListSampleType TargetListSampleType;
-int otbSOMModelNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- SOMModel2D::Pointer model2D = SOMModel2D::New();
- SOMModel3D::Pointer model3D = SOMModel3D::New();
- SOMModel4D::Pointer model4D = SOMModel4D::New();
- SOMModel5D::Pointer model5D = SOMModel5D::New();
-
- return EXIT_SUCCESS;
-}
int otbSOMModelCanRead(int argc, char * argv [])
{
diff --git a/Modules/Learning/LearningBase/test/CMakeLists.txt b/Modules/Learning/LearningBase/test/CMakeLists.txt
index 48e28cc5cad320ffa41eee0659ff6979d0bf4457..9956d7dbae16f4669ac5b03dab78355c28dadfe6 100644
--- a/Modules/Learning/LearningBase/test/CMakeLists.txt
+++ b/Modules/Learning/LearningBase/test/CMakeLists.txt
@@ -23,13 +23,8 @@ otb_module_test()
set(OTBLearningBaseTests
otbLearningBaseTestDriver.cxx
otbDecisionTreeBuild.cxx
-otbGaussianModelComponent.cxx
otbKMeansImageClassificationFilter.cxx
otbDecisionTreeWithRealValues.cxx
-otbSEMClassifierNew.cxx
-otbDecisionTreeNew.cxx
-otbKMeansImageClassificationFilterNew.cxx
-otbMachineLearningModelTemplates.cxx
)
if(OTB_USE_SHARK)
@@ -45,9 +40,6 @@ otb_module_target_label(otbLearningBaseTestDriver)
otb_add_test(NAME leTvDecisionTreeBuild COMMAND otbLearningBaseTestDriver
otbDecisionTreeBuild)
-otb_add_test(NAME leTuGaussianModelComponentNew COMMAND otbLearningBaseTestDriver
- otbGaussianModelComponentNew)
-
otb_add_test(NAME leTvDecisionTreeWithRealValues COMMAND otbLearningBaseTestDriver
otbDecisionTreeWithRealValues)
@@ -63,15 +55,6 @@ otb_add_test(NAME leTvKMeansImageClassificationFilter COMMAND otbLearningBaseTes
255 255 255 255
)
-otb_add_test(NAME leTuSEMClassifierNew COMMAND otbLearningBaseTestDriver
- otbSEMClassifierNew)
-
-otb_add_test(NAME leTuDecisionTreeNew COMMAND otbLearningBaseTestDriver
- otbDecisionTreeNew)
-
-otb_add_test(NAME leTuKMeansImageClassificationFilterNew COMMAND otbLearningBaseTestDriver
- otbKMeansImageClassificationFilterNew)
-
if(OTB_USE_SHARK)
otb_add_test(NAME leTuSharkNormalizeLabels COMMAND otbLearningBaseTestDriver
otbSharkNormalizeLabels)
diff --git a/Modules/Learning/LearningBase/test/otbDecisionTreeNew.cxx b/Modules/Learning/LearningBase/test/otbDecisionTreeNew.cxx
deleted file mode 100644
index ad245e45e27e6567f7dfe518bf72e121e8a35253..0000000000000000000000000000000000000000
--- a/Modules/Learning/LearningBase/test/otbDecisionTreeNew.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbDecisionTree.h"
-
-enum WheatTypes { WinterWheat, SummerWheat };
-
-int otbDecisionTreeNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- typedef bool AttributeValueType;
-
- typedef otb::DecisionTree< AttributeValueType, WheatTypes > DecisionTreeType;
-
- DecisionTreeType::Pointer decisionTree = DecisionTreeType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/LearningBase/test/otbGaussianModelComponent.cxx b/Modules/Learning/LearningBase/test/otbGaussianModelComponent.cxx
deleted file mode 100644
index 1ce190b800c546c5320d88fc482f1c3b5d40368a..0000000000000000000000000000000000000000
--- a/Modules/Learning/LearningBase/test/otbGaussianModelComponent.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "itkListSample.h"
-#include "itkSubsample.h"
-#include "otbGaussianModelComponent.h"
-#include "itkVariableLengthVector.h"
-
-int otbGaussianModelComponentNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- typedef itk::Statistics::ListSample<itk::VariableLengthVector<double> > SampleType;
- typedef itk::Statistics::Subsample< SampleType > ClassSampleType;
- typedef otb::Statistics::GaussianModelComponent<ClassSampleType> GaussianModelType;
-
- GaussianModelType::Pointer filter = GaussianModelType::New();
-
- return EXIT_SUCCESS;
-
-}
diff --git a/Modules/Learning/LearningBase/test/otbKMeansImageClassificationFilterNew.cxx b/Modules/Learning/LearningBase/test/otbKMeansImageClassificationFilterNew.cxx
deleted file mode 100644
index efdef29df139def8b3263799217bbf0802dd1c24..0000000000000000000000000000000000000000
--- a/Modules/Learning/LearningBase/test/otbKMeansImageClassificationFilterNew.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbKMeansImageClassificationFilter.h"
-#include "otbVectorImage.h"
-#include "otbImage.h"
-
-int otbKMeansImageClassificationFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef unsigned short LabeledPixelType;
-
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef otb::Image<LabeledPixelType, Dimension> LabeledImageType;
-
- typedef otb::KMeansImageClassificationFilter<ImageType, LabeledImageType> ClassificationFilterType;
-
- // Instantiating object
- ClassificationFilterType::Pointer filter = ClassificationFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/LearningBase/test/otbLearningBaseTestDriver.cxx b/Modules/Learning/LearningBase/test/otbLearningBaseTestDriver.cxx
index dc2d36b7943129ec6519ebbc4f194d1dd6078800..d86949ac60969e837c34593ff0f7abf65f764134 100644
--- a/Modules/Learning/LearningBase/test/otbLearningBaseTestDriver.cxx
+++ b/Modules/Learning/LearningBase/test/otbLearningBaseTestDriver.cxx
@@ -23,12 +23,8 @@
void RegisterTests()
{
REGISTER_TEST(otbDecisionTreeBuild);
- REGISTER_TEST(otbGaussianModelComponentNew);
REGISTER_TEST(otbKMeansImageClassificationFilter);
REGISTER_TEST(otbDecisionTreeWithRealValues);
- REGISTER_TEST(otbSEMClassifierNew);
- REGISTER_TEST(otbDecisionTreeNew);
- REGISTER_TEST(otbKMeansImageClassificationFilterNew);
#ifdef OTB_USE_SHARK
REGISTER_TEST(otbSharkNormalizeLabels);
#endif
diff --git a/Modules/Learning/LearningBase/test/otbMachineLearningModelTemplates.cxx b/Modules/Learning/LearningBase/test/otbMachineLearningModelTemplates.cxx
deleted file mode 100644
index 96d35e014394d6b0d6836a90ddcbf3a2303db4bf..0000000000000000000000000000000000000000
--- a/Modules/Learning/LearningBase/test/otbMachineLearningModelTemplates.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <otbMachineLearningModel.h>
-
-typedef otb::MachineLearningModel<float,short> MachineLearningModelType1;
-typedef MachineLearningModelType1::InputValueType InputValueType1;
-typedef MachineLearningModelType1::InputSampleType InputSampleType1;
-typedef MachineLearningModelType1::InputListSampleType InputListSampleType1;
-typedef MachineLearningModelType1::TargetValueType TargetValueType1;
-typedef MachineLearningModelType1::TargetSampleType TargetSampleType1;
-typedef MachineLearningModelType1::TargetListSampleType TargetListSampleType1;
-
-typedef otb::MachineLearningModel<float,itk::VariableLengthVector<double> > MachineLearningModelType2;
-typedef MachineLearningModelType2::InputValueType InputValueType2;
-typedef MachineLearningModelType2::InputSampleType InputSampleType2;
-typedef MachineLearningModelType2::InputListSampleType InputListSampleType2;
-typedef MachineLearningModelType2::TargetValueType TargetValueType2;
-typedef MachineLearningModelType2::TargetSampleType TargetSampleType2;
-typedef MachineLearningModelType2::TargetListSampleType TargetListSampleType2;
-
-
-
diff --git a/Modules/Learning/LearningBase/test/otbSEMClassifierNew.cxx b/Modules/Learning/LearningBase/test/otbSEMClassifierNew.cxx
deleted file mode 100644
index 7f75c28f1bb11816a0d1cf119a25a1823a243659..0000000000000000000000000000000000000000
--- a/Modules/Learning/LearningBase/test/otbSEMClassifierNew.cxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-#include "otbImage.h"
-#include "otbVectorImage.h"
-#include "otbSEMClassifier.h"
-
-#include <iostream>
-
-int otbSEMClassifierNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, 2> ImageType;
- typedef otb::Image<unsigned char, 2> OutputImageType;
- typedef otb::SEMClassifier<ImageType, OutputImageType> ClassifType;
- typedef itk::Statistics::ListSample<ImageType::PixelType> SampleType;
- typedef itk::Statistics::Subsample<SampleType> ClassSampleType;
-
- typedef otb::Statistics::ModelComponentBase<ClassSampleType> ComponentType;
-
- ClassifType::Pointer classifier = ClassifType::New();
- ComponentType::Pointer component = ComponentType::New();
-
- std::cout << classifier << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/Markov/test/CMakeLists.txt b/Modules/Learning/Markov/test/CMakeLists.txt
index da17095168859815c63e1686f413fe4c7a41f550..5aab6e04ef445b78c117b2ee55da984d15d2acb9 100644
--- a/Modules/Learning/Markov/test/CMakeLists.txt
+++ b/Modules/Learning/Markov/test/CMakeLists.txt
@@ -24,25 +24,15 @@ set(OTBMarkovTests
otbMarkovTestDriver.cxx
otbMRFEnergyFisherClassification.cxx
otbMRFSamplerRandom.cxx
-otbMRFEnergyPottsNew.cxx
-otbMRFSamplerMAPNew.cxx
otbMarkovRandomFieldFilter.cxx
-otbMRFSamplerRandomMAPNew.cxx
-otbMRFSamplerRandomNew.cxx
-otbMRFEnergyGaussianNew.cxx
-otbMRFOptimizerMetropolisNew.cxx
otbMRFSamplerMAP.cxx
otbMRFEnergyGaussian.cxx
-otbMarkovRandomFieldFilterNew.cxx
otbMRFOptimizerMetropolis.cxx
otbMRFEnergyPotts.cxx
otbMRFEnergyEdgeFidelity.cxx
otbMRFSamplerRandomMAP.cxx
-otbMRFEnergyEdgeFidelityNew.cxx
otbMRFOptimizerICM.cxx
otbMRFEnergyGaussianClassification.cxx
-otbMRFOptimizerICMNew.cxx
-otbMRFEnergyGaussianClassificationNew.cxx
)
add_executable(otbMarkovTestDriver ${OTBMarkovTests})
@@ -58,9 +48,6 @@ otb_add_test(NAME maTvMRFEnergyFisherClassification COMMAND otbMarkovTestDriver
${TEMP}/maTvMRFEnergyFisherClassification.txt
)
-otb_add_test(NAME maTuMRFEnergyFisherClassificationNew COMMAND otbMarkovTestDriver
- otbMRFEnergyFisherClassificationNew )
-
otb_add_test(NAME maTvMRFSamplerRandom COMMAND otbMarkovTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/maTvMRFSamplerRandom.txt
@@ -71,12 +58,6 @@ otb_add_test(NAME maTvMRFSamplerRandom COMMAND otbMarkovTestDriver
${TEMP}/maTvMRFSamplerRandom.txt
)
-otb_add_test(NAME maTuMRFEnergyPottsNew COMMAND otbMarkovTestDriver
- otbMRFEnergyPottsNew )
-
-otb_add_test(NAME maTuMRFSamplerMAPNew COMMAND otbMarkovTestDriver
- otbMRFSamplerMAPNew )
-
otb_add_test(NAME maTvMarkovRandomFieldFilter COMMAND otbMarkovTestDriver
--compare-image ${NOTOL} ${BASELINE}/maTvMarkovRandomField.png
${TEMP}/maTvMarkovRandomField.png
@@ -88,18 +69,6 @@ otb_add_test(NAME maTvMarkovRandomFieldFilter COMMAND otbMarkovTestDriver
1.0
)
-otb_add_test(NAME maTuMRFSamplerRandomMAPNew COMMAND otbMarkovTestDriver
- otbMRFSamplerRandomMAPNew )
-
-otb_add_test(NAME maTuMRFSamplerRandomNew COMMAND otbMarkovTestDriver
- otbMRFSamplerRandomNew )
-
-otb_add_test(NAME maTuMRFEnergyGaussianNew COMMAND otbMarkovTestDriver
- otbMRFEnergyGaussianNew )
-
-otb_add_test(NAME maTuMRFOptimizerMetropolisNew COMMAND otbMarkovTestDriver
- otbMRFOptimizerMetropolisNew )
-
otb_add_test(NAME maTvMRFSamplerMAP COMMAND otbMarkovTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/maTvMRFSamplerMAP.txt
@@ -114,9 +83,6 @@ otb_add_test(NAME maTvMRFEnergyGaussian COMMAND otbMarkovTestDriver
otbMRFEnergyGaussian
)
-otb_add_test(NAME maTuMarkovRandomFieldFilterNew COMMAND otbMarkovTestDriver
- otbMarkovRandomFieldFilterNew )
-
otb_add_test(NAME maTvMRFOptimizerMetropolis COMMAND otbMarkovTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/maTvMRFOptimizerMetropolis.txt
@@ -150,9 +116,6 @@ otb_add_test(NAME maTvMRFSamplerRandomMAP COMMAND otbMarkovTestDriver
${TEMP}/maTvMRFSamplerRandomMAP.txt
)
-otb_add_test(NAME maTuMRFEnergyEdgeFidelityNew COMMAND otbMarkovTestDriver
- otbMRFEnergyEdgeFidelityNew )
-
otb_add_test(NAME maTuMRFOptimizerICM COMMAND otbMarkovTestDriver
otbMRFOptimizerICM
${TEMP}/maTuMRFOptimizerICM.txt
@@ -165,9 +128,3 @@ otb_add_test(NAME maTvMRFEnergyGaussianClassification COMMAND otbMarkovTestDrive
${TEMP}/maTvMRFEnergyGaussianClassification.txt
)
-otb_add_test(NAME maTuMRFOptimizerICMNew COMMAND otbMarkovTestDriver
- otbMRFOptimizerICMNew )
-
-otb_add_test(NAME maTuMRFEnergyGaussianClassificationNew COMMAND otbMarkovTestDriver
- otbMRFEnergyGaussianClassificationNew )
-
diff --git a/Modules/Learning/Markov/test/otbMRFEnergyEdgeFidelityNew.cxx b/Modules/Learning/Markov/test/otbMRFEnergyEdgeFidelityNew.cxx
deleted file mode 100644
index 7db21383d5697db95b212c1bd319fbb5c0e1d282..0000000000000000000000000000000000000000
--- a/Modules/Learning/Markov/test/otbMRFEnergyEdgeFidelityNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbMRFEnergyEdgeFidelity.h"
-#include "otbImage.h"
-
-int otbMRFEnergyEdgeFidelityNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef double PixelType;
- typedef otb::Image<PixelType, 2> ImageType;
- typedef otb::MRFEnergyEdgeFidelity<ImageType, ImageType> MRFEnergyType;
-
- MRFEnergyType::Pointer object = MRFEnergyType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/Markov/test/otbMRFEnergyFisherClassification.cxx b/Modules/Learning/Markov/test/otbMRFEnergyFisherClassification.cxx
index d79ebe4ccd0f03312cadbad2675330c4b85a3030..0b346a3f0ce72c63534413fa1a7f6caf1dbee4a1 100644
--- a/Modules/Learning/Markov/test/otbMRFEnergyFisherClassification.cxx
+++ b/Modules/Learning/Markov/test/otbMRFEnergyFisherClassification.cxx
@@ -24,21 +24,6 @@
#include "otbImage.h"
#include <fstream>
-int otbMRFEnergyFisherClassificationNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef double PixelTypeInput;
- typedef int PixelTypeLabel;
- typedef otb::Image<PixelTypeInput, 2> ImageType;
- typedef otb::Image<PixelTypeLabel, 2> LabelType;
-
- typedef otb::MRFEnergyFisherClassification<ImageType, LabelType> MRFFisherType;
-
- MRFFisherType::Pointer classif = MRFFisherType::New();
-
- std::cout << classif << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbMRFEnergyFisherClassification(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Learning/Markov/test/otbMRFEnergyGaussianClassificationNew.cxx b/Modules/Learning/Markov/test/otbMRFEnergyGaussianClassificationNew.cxx
deleted file mode 100644
index 9e3a5d75c421aefdb0ba2f0ed543605a3e3910db..0000000000000000000000000000000000000000
--- a/Modules/Learning/Markov/test/otbMRFEnergyGaussianClassificationNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbMRFEnergyGaussianClassification.h"
-#include "otbImage.h"
-
-int otbMRFEnergyGaussianClassificationNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef double PixelType;
- typedef otb::Image<PixelType, 2> ImageType;
- typedef otb::MRFEnergyGaussianClassification<ImageType, ImageType> MRFGaussianType;
-
- MRFGaussianType::Pointer object = MRFGaussianType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/Markov/test/otbMRFEnergyGaussianNew.cxx b/Modules/Learning/Markov/test/otbMRFEnergyGaussianNew.cxx
deleted file mode 100644
index 10466eeaa40534aa2d43ebfe4a6615ae3c14d5e2..0000000000000000000000000000000000000000
--- a/Modules/Learning/Markov/test/otbMRFEnergyGaussianNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbMRFEnergyGaussian.h"
-#include "otbImage.h"
-
-int otbMRFEnergyGaussianNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef double PixelType;
- typedef otb::Image<PixelType, 2> ImageType;
- typedef otb::MRFEnergyGaussian<ImageType, ImageType> MRFEnergyGaussianType;
-
- MRFEnergyGaussianType::Pointer object = MRFEnergyGaussianType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/Markov/test/otbMRFEnergyPottsNew.cxx b/Modules/Learning/Markov/test/otbMRFEnergyPottsNew.cxx
deleted file mode 100644
index 2b2a28044297604f5e8aa8aff286f133077cb0af..0000000000000000000000000000000000000000
--- a/Modules/Learning/Markov/test/otbMRFEnergyPottsNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbMRFEnergyPotts.h"
-#include "otbImage.h"
-
-int otbMRFEnergyPottsNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef double PixelType;
- typedef otb::Image<PixelType, 2> ImageType;
- typedef otb::MRFEnergyPotts<ImageType, ImageType> MRFEnergyPottsType;
-
- MRFEnergyPottsType::Pointer object = MRFEnergyPottsType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/Markov/test/otbMRFOptimizerICMNew.cxx b/Modules/Learning/Markov/test/otbMRFOptimizerICMNew.cxx
deleted file mode 100644
index c85bccf280e53c117978aac6ce5a6d674da85f9a..0000000000000000000000000000000000000000
--- a/Modules/Learning/Markov/test/otbMRFOptimizerICMNew.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbMRFOptimizerICM.h"
-#include <cstdlib>
-
-int otbMRFOptimizerICMNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::MRFOptimizerICM MRFOptimizerType;
-
- MRFOptimizerType::Pointer object = MRFOptimizerType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/Markov/test/otbMRFOptimizerMetropolisNew.cxx b/Modules/Learning/Markov/test/otbMRFOptimizerMetropolisNew.cxx
deleted file mode 100644
index 41fe27c1249318b2f3b0a1632b2498241f7c63e7..0000000000000000000000000000000000000000
--- a/Modules/Learning/Markov/test/otbMRFOptimizerMetropolisNew.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbMRFOptimizerMetropolis.h"
-#include <cstdlib>
-
-int otbMRFOptimizerMetropolisNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::MRFOptimizerMetropolis MRFOptimizerType;
-
- MRFOptimizerType::Pointer object = MRFOptimizerType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/Markov/test/otbMRFSamplerMAPNew.cxx b/Modules/Learning/Markov/test/otbMRFSamplerMAPNew.cxx
deleted file mode 100644
index e7ae603ea3a80920f84221facb3bc551fad55fe6..0000000000000000000000000000000000000000
--- a/Modules/Learning/Markov/test/otbMRFSamplerMAPNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "itkMacro.h"
-
-#include "otbMRFSamplerMAP.h"
-#include "otbImage.h"
-
-int otbMRFSamplerMAPNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef double PixelType;
- typedef otb::Image<PixelType, 2> ImageType;
- typedef otb::MRFSamplerMAP<ImageType, ImageType> MRFSamplerType;
-
- MRFSamplerType::Pointer object = MRFSamplerType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/Markov/test/otbMRFSamplerRandomMAPNew.cxx b/Modules/Learning/Markov/test/otbMRFSamplerRandomMAPNew.cxx
deleted file mode 100644
index 0839549f89d3ac0a0d8bd624f6357fbc77ee5c17..0000000000000000000000000000000000000000
--- a/Modules/Learning/Markov/test/otbMRFSamplerRandomMAPNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbMRFSamplerRandomMAP.h"
-#include "otbImage.h"
-
-int otbMRFSamplerRandomMAPNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef double PixelType;
- typedef otb::Image<PixelType, 2> ImageType;
- typedef otb::MRFSamplerRandomMAP<ImageType, ImageType> MRFSamplerRandomType;
-
- MRFSamplerRandomType::Pointer object = MRFSamplerRandomType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/Markov/test/otbMRFSamplerRandomNew.cxx b/Modules/Learning/Markov/test/otbMRFSamplerRandomNew.cxx
deleted file mode 100644
index 8e884d08cc2c0534955dcb23e2a49aaba81dd019..0000000000000000000000000000000000000000
--- a/Modules/Learning/Markov/test/otbMRFSamplerRandomNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbMRFSamplerRandom.h"
-#include "otbImage.h"
-
-int otbMRFSamplerRandomNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef double PixelType;
- typedef otb::Image<PixelType, 2> ImageType;
- typedef otb::MRFSamplerRandom<ImageType, ImageType> MRFSamplerRandomType;
-
- MRFSamplerRandomType::Pointer object = MRFSamplerRandomType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/Markov/test/otbMarkovRandomFieldFilterNew.cxx b/Modules/Learning/Markov/test/otbMarkovRandomFieldFilterNew.cxx
deleted file mode 100644
index 1f35b8090760a700e0b60c9299731ad9398286b8..0000000000000000000000000000000000000000
--- a/Modules/Learning/Markov/test/otbMarkovRandomFieldFilterNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbMarkovRandomFieldFilter.h"
-#include "otbImage.h"
-
-int otbMarkovRandomFieldFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef double PixelType;
- typedef otb::Image<PixelType, 2> ImageType;
- typedef otb::MarkovRandomFieldFilter<ImageType, ImageType> MarkovRandomFieldFilterType;
-
- MarkovRandomFieldFilterType::Pointer object = MarkovRandomFieldFilterType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/Markov/test/otbMarkovTestDriver.cxx b/Modules/Learning/Markov/test/otbMarkovTestDriver.cxx
index 0b26a59593e313266822ce72c40fc51c4bc95a3d..a571c6e3367e21d7013b57bbe30695cc6e73d539 100644
--- a/Modules/Learning/Markov/test/otbMarkovTestDriver.cxx
+++ b/Modules/Learning/Markov/test/otbMarkovTestDriver.cxx
@@ -22,26 +22,15 @@
void RegisterTests()
{
- REGISTER_TEST(otbMRFEnergyFisherClassificationNew);
REGISTER_TEST(otbMRFEnergyFisherClassification);
REGISTER_TEST(otbMRFSamplerRandom);
- REGISTER_TEST(otbMRFEnergyPottsNew);
- REGISTER_TEST(otbMRFSamplerMAPNew);
REGISTER_TEST(otbMarkovRandomFieldFilter);
- REGISTER_TEST(otbMRFSamplerRandomMAPNew);
- REGISTER_TEST(otbMRFSamplerRandomNew);
- REGISTER_TEST(otbMRFEnergyGaussianNew);
- REGISTER_TEST(otbMRFOptimizerMetropolisNew);
REGISTER_TEST(otbMRFSamplerMAP);
REGISTER_TEST(otbMRFEnergyGaussian);
- REGISTER_TEST(otbMarkovRandomFieldFilterNew);
REGISTER_TEST(otbMRFOptimizerMetropolis);
REGISTER_TEST(otbMRFEnergyPotts);
REGISTER_TEST(otbMRFEnergyEdgeFidelity);
REGISTER_TEST(otbMRFSamplerRandomMAP);
- REGISTER_TEST(otbMRFEnergyEdgeFidelityNew);
REGISTER_TEST(otbMRFOptimizerICM);
REGISTER_TEST(otbMRFEnergyGaussianClassification);
- REGISTER_TEST(otbMRFOptimizerICMNew);
- REGISTER_TEST(otbMRFEnergyGaussianClassificationNew);
}
diff --git a/Modules/Learning/SOM/test/CMakeLists.txt b/Modules/Learning/SOM/test/CMakeLists.txt
index 21ca3aa31cfdd3228ab4e0e54565b53b1006d51f..11a22c788e2f76e21b05e975aecc66f3d27a285e 100644
--- a/Modules/Learning/SOM/test/CMakeLists.txt
+++ b/Modules/Learning/SOM/test/CMakeLists.txt
@@ -22,20 +22,12 @@ otb_module_test()
set(OTBSOMTests
otbSOMTestDriver.cxx
-otbSOMbasedImageFilterNew.cxx
otbSOM.cxx
otbSOMImageClassificationFilter.cxx
otbSOMActivationBuilder.cxx
-otbSOMActivationBuilderNew.cxx
-otbSOMClassifierNew.cxx
-otbSOMImageClassificationFilterNew.cxx
otbSOMWithMissingValue.cxx
-otbSOMNew.cxx
otbSOMMap.cxx
-otbSOMWithMissingValueNew.cxx
-otbSOMMapNew.cxx
otbPeriodicSOM.cxx
-otbPeriodicSOMNew.cxx
otbSOMClassifier.cxx
otbSOMbasedImageFilter.cxx
)
@@ -46,9 +38,6 @@ otb_module_target_label(otbSOMTestDriver)
# Tests Declaration
-otb_add_test(NAME leTuSOMbasedImageFilterNew COMMAND otbSOMTestDriver
- otbSOMbasedImageFilterNew )
-
otb_add_test(NAME leTvSOM COMMAND otbSOMTestDriver
--compare-image ${EPSILON_10}
${BASELINE}/leSOMPoupeesSubOutputMap1.hdr
@@ -78,15 +67,6 @@ otb_add_test(NAME leTvSOMActivationBuilder COMMAND otbSOMTestDriver
${TEMP}/leSOMPoupeesSubActivationMap1.tif
32 32 10 10 5 1.0 0.1 128)
-otb_add_test(NAME leTuSOMActivationBuilderNew COMMAND otbSOMTestDriver
- otbSOMActivationBuilderNew)
-
-otb_add_test(NAME leTuSOMClassifierNew COMMAND otbSOMTestDriver
- otbSOMClassifierNew)
-
-otb_add_test(NAME leTuSOMImageClassificationFilterNew COMMAND otbSOMTestDriver
- otbSOMImageClassificationFilterNew)
-
otb_add_test(NAME leTvSOMWithMissingValue COMMAND otbSOMTestDriver
--compare-image ${EPSILON_10}
${BASELINE}/leSOMWithMissingValue.hdr
@@ -96,18 +76,9 @@ otb_add_test(NAME leTvSOMWithMissingValue COMMAND otbSOMTestDriver
${TEMP}/leSOMWithMissingValue.hdr
32 32 10 10 5 1.0 0.1 0)
-otb_add_test(NAME leTuSOMNew COMMAND otbSOMTestDriver
- otbSOMNew)
-
otb_add_test(NAME leTvSOMMap COMMAND otbSOMTestDriver
otbSOMMap)
-otb_add_test(NAME leTuSOMWithMissingValueNew COMMAND otbSOMTestDriver
- otbSOMWithMissingValueNew )
-
-otb_add_test(NAME leTuSOMMapNew COMMAND otbSOMTestDriver
- otbSOMMapNew)
-
otb_add_test(NAME leTvPeriodicSOM COMMAND otbSOMTestDriver
--compare-image ${EPSILON_10}
${BASELINE}/lePeriodicSOMPoupeesSubOutputMap1.hdr
@@ -117,9 +88,6 @@ otb_add_test(NAME leTvPeriodicSOM COMMAND otbSOMTestDriver
${TEMP}/lePeriodicSOMPoupeesSubOutputMap1.hdr
32 32 10 10 5 1.0 0.1 0)
-otb_add_test(NAME leTuPeriodicSOMNew COMMAND otbSOMTestDriver
- otbPeriodicSOMNew)
-
otb_add_test(NAME leTvSOMClassifier COMMAND otbSOMTestDriver
--compare-image ${NOTOL}
${BASELINE}/leSOMPoupeesClassified.hdr
diff --git a/Modules/Learning/SOM/test/otbPeriodicSOMNew.cxx b/Modules/Learning/SOM/test/otbPeriodicSOMNew.cxx
deleted file mode 100644
index 08e02a2f4c8baf5bfbab76fc8324795216ad502c..0000000000000000000000000000000000000000
--- a/Modules/Learning/SOM/test/otbPeriodicSOMNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbSOMMap.h"
-#include "otbPeriodicSOM.h"
-#include "itkRGBPixel.h"
-#include "itkListSample.h"
-
-int otbPeriodicSOMNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef float ComponentType;
- typedef itk::VariableLengthVector<ComponentType> PixelType;
- typedef itk::Statistics::EuclideanDistanceMetric<PixelType> DistanceType;
- typedef otb::SOMMap<PixelType, DistanceType, Dimension> SOMMapType;
- // typedef itk::Statistics::ImageToListAdaptor<SOMMapType> AdaptorType;
- typedef itk::Statistics::ListSample<PixelType> ListSampleType;
- typedef otb::PeriodicSOM<ListSampleType, SOMMapType> SOMType;
-
- // Instantiation
- SOMType::Pointer som = SOMType::New();
-
- std::cout << som << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/SOM/test/otbSOMActivationBuilderNew.cxx b/Modules/Learning/SOM/test/otbSOMActivationBuilderNew.cxx
deleted file mode 100644
index 44b734e3686bfdd9fe93d213a33752fd78757431..0000000000000000000000000000000000000000
--- a/Modules/Learning/SOM/test/otbSOMActivationBuilderNew.cxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbSOMMap.h"
-#include "otbSOM.h"
-#include "otbSOMActivationBuilder.h"
-#include "itkListSample.h"
-#include "otbImage.h"
-
-int otbSOMActivationBuilderNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef float ComponentType;
- typedef unsigned char OutputPixelType;
- typedef itk::VariableLengthVector<ComponentType> PixelType;
- typedef itk::Statistics::EuclideanDistanceMetric<PixelType> DistanceType;
-
- typedef otb::SOMMap<PixelType, DistanceType, Dimension> MapType;
-
- typedef itk::Statistics::ListSample<PixelType> ListSampleType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
- typedef otb::SOMActivationBuilder<ListSampleType, MapType, OutputImageType> SOMActivationBuilderType;
-
- // Instantiation
- SOMActivationBuilderType::Pointer somAct = SOMActivationBuilderType::New();
-
- std::cout << somAct << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/SOM/test/otbSOMClassifierNew.cxx b/Modules/Learning/SOM/test/otbSOMClassifierNew.cxx
deleted file mode 100644
index dd77bde7f27ba36a13f4fe1f7a5555fedb13f7f3..0000000000000000000000000000000000000000
--- a/Modules/Learning/SOM/test/otbSOMClassifierNew.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include <fstream>
-#include "otbSOMMap.h"
-#include "otbSOMClassifier.h"
-#include "itkListSample.h"
-
-int otbSOMClassifierNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double InputPixelType;
- typedef int LabelPixelType;
- const unsigned int Dimension = 2;
-
- typedef itk::VariableLengthVector<InputPixelType> PixelType;
- typedef itk::Statistics::EuclideanDistanceMetric<PixelType> DistanceType;
- typedef otb::SOMMap<PixelType, DistanceType, Dimension> SOMMapType;
- typedef itk::Statistics::ListSample<PixelType> SampleType;
- typedef otb::SOMClassifier<SampleType, SOMMapType, LabelPixelType> ClassifierType;
-
- ClassifierType::Pointer classifier = ClassifierType::New();
-
- std::cout << classifier << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/SOM/test/otbSOMImageClassificationFilterNew.cxx b/Modules/Learning/SOM/test/otbSOMImageClassificationFilterNew.cxx
deleted file mode 100644
index 3a868381fd80b2ab4ffb9be940cdfd852102b260..0000000000000000000000000000000000000000
--- a/Modules/Learning/SOM/test/otbSOMImageClassificationFilterNew.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbSOMImageClassificationFilter.h"
-#include "otbImage.h"
-#include "otbSOMMap.h"
-
-int otbSOMImageClassificationFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef unsigned short LabeledPixelType;
-
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef otb::Image<LabeledPixelType, Dimension> LabeledImageType;
- typedef otb::SOMMap<ImageType::PixelType> SOMMapType;
- typedef otb::SOMImageClassificationFilter<ImageType, LabeledImageType, SOMMapType> ClassificationFilterType;
-
- // Instantiating object
- ClassificationFilterType::Pointer filter = ClassificationFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/SOM/test/otbSOMMapNew.cxx b/Modules/Learning/SOM/test/otbSOMMapNew.cxx
deleted file mode 100644
index ed223aeb7cfe0855c459fe681ca395ac5387ffb3..0000000000000000000000000000000000000000
--- a/Modules/Learning/SOM/test/otbSOMMapNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbSOMMap.h"
-#include "itkRGBPixel.h"
-
-int otbSOMMapNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef float ComponentType;
- typedef itk::RGBPixel<ComponentType> PixelType;
- typedef itk::Statistics::EuclideanDistanceMetric<PixelType> DistanceType;
- typedef otb::SOMMap<PixelType, DistanceType, Dimension> SOMMapType;
-
- // Instantiation
- SOMMapType::Pointer somMap = SOMMapType::New();
-
- std::cout << somMap << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/SOM/test/otbSOMNew.cxx b/Modules/Learning/SOM/test/otbSOMNew.cxx
deleted file mode 100644
index d85cbb5dcbb9138715d23ea46cbb53e4c365a03d..0000000000000000000000000000000000000000
--- a/Modules/Learning/SOM/test/otbSOMNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbSOMMap.h"
-#include "otbSOM.h"
-#include "itkRGBPixel.h"
-#include "itkListSample.h"
-
-int otbSOMNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef float ComponentType;
- typedef itk::VariableLengthVector<ComponentType> PixelType;
- typedef itk::Statistics::EuclideanDistanceMetric<PixelType> DistanceType;
- typedef otb::SOMMap<PixelType, DistanceType, Dimension> SOMMapType;
- // typedef itk::Statistics::ImageToListAdaptor<SOMMapType> AdaptorType;
- typedef itk::Statistics::ListSample<PixelType> ListSampleType;
- typedef otb::SOM<ListSampleType, SOMMapType> SOMType;
-
- // Instantiation
- SOMType::Pointer som = SOMType::New();
-
- std::cout << som << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/SOM/test/otbSOMTestDriver.cxx b/Modules/Learning/SOM/test/otbSOMTestDriver.cxx
index 2368df5ff7c7d6990d6e80630127fd310f0d7785..e06752876b6071141cb7ffc8ca7662cdce41c562 100644
--- a/Modules/Learning/SOM/test/otbSOMTestDriver.cxx
+++ b/Modules/Learning/SOM/test/otbSOMTestDriver.cxx
@@ -22,20 +22,12 @@
void RegisterTests()
{
- REGISTER_TEST(otbSOMbasedImageFilterNew);
REGISTER_TEST(otbSOM);
REGISTER_TEST(otbSOMImageClassificationFilter);
REGISTER_TEST(otbSOMActivationBuilder);
- REGISTER_TEST(otbSOMActivationBuilderNew);
- REGISTER_TEST(otbSOMClassifierNew);
- REGISTER_TEST(otbSOMImageClassificationFilterNew);
REGISTER_TEST(otbSOMWithMissingValueTest);
- REGISTER_TEST(otbSOMNew);
REGISTER_TEST(otbSOMMap);
- REGISTER_TEST(otbSOMWithMissingValueNew);
- REGISTER_TEST(otbSOMMapNew);
REGISTER_TEST(otbPeriodicSOMTest);
- REGISTER_TEST(otbPeriodicSOMNew);
REGISTER_TEST(otbSOMClassifier);
REGISTER_TEST(otbSOMbasedImageFilterTest);
}
diff --git a/Modules/Learning/SOM/test/otbSOMWithMissingValueNew.cxx b/Modules/Learning/SOM/test/otbSOMWithMissingValueNew.cxx
deleted file mode 100644
index 4a3bbb67cb07111c33f44d0884ceda76e555fb6d..0000000000000000000000000000000000000000
--- a/Modules/Learning/SOM/test/otbSOMWithMissingValueNew.cxx
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- * Copyright (C) 2007-2012 Institut Mines Telecom / Telecom Bretagne
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "itkListSample.h"
-
-#include "otbSOMMap.h"
-//#include "otbPeriodicSOM.h"
-#include "otbSOMWithMissingValue.h"
-
-#include "otbFlexibleDistanceWithMissingValue.h"
-
-int otbSOMWithMissingValueNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef ImageType::PixelType VectorType;
-
- typedef otb::Statistics::FlexibleDistanceWithMissingValue<VectorType> DistanceType;
-
- typedef otb::SOMMap<VectorType, DistanceType, Dimension> MapType;
- typedef itk::Statistics::ListSample<VectorType> SampleListType;
- typedef otb::Functor::CzihoSOMLearningBehaviorFunctor LearningBehaviorFunctorType;
- typedef otb::Functor::CzihoSOMNeighborhoodBehaviorFunctor NeighborhoodBehaviorFunctorType;
- typedef otb::SOMWithMissingValue<SampleListType, MapType,
- LearningBehaviorFunctorType, NeighborhoodBehaviorFunctorType> SOMType;
-
- SOMType::Pointer som = SOMType::New();
-
- std::cout << som << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/SOM/test/otbSOMbasedImageFilterNew.cxx b/Modules/Learning/SOM/test/otbSOMbasedImageFilterNew.cxx
deleted file mode 100644
index 3a5625e65e69b54013ccbf479404c666d11a42c0..0000000000000000000000000000000000000000
--- a/Modules/Learning/SOM/test/otbSOMbasedImageFilterNew.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- * Copyright (C) 2007-2012 Institut Mines Telecom / Telecom Bretagne
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbVectorImage.h"
-#include "itkVariableLengthVector.h"
-
-#include "otbFlexibleDistanceWithMissingValue.h"
-#include "otbSOMbasedImageFilter.h"
-
-int otbSOMbasedImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef ImageType::PixelType VectorType;
-
- typedef otb::Statistics::FlexibleDistanceWithMissingValue<VectorType> DistanceType;
-
- typedef otb::SOMbasedImageFilter<ImageType, ImageType, DistanceType, ImageType>
- FilterType;
- FilterType::Pointer somFilter = FilterType::New();
-
- std::cout << somFilter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/Sampling/test/CMakeLists.txt b/Modules/Learning/Sampling/test/CMakeLists.txt
index e0b71037c23dc841fa41ab58d3bcbc22665d708d..fe8e118954de6d6153929ec9db7605c3c95d2f7a 100644
--- a/Modules/Learning/Sampling/test/CMakeLists.txt
+++ b/Modules/Learning/Sampling/test/CMakeLists.txt
@@ -35,10 +35,6 @@ otb_module_target_label(otbSamplingTestDriver)
# Tests Declaration
# ---------------- SamplingRateCalculator ------------------------------------
-otb_add_test(NAME leTuSamplingRateCalculatorNew COMMAND otbSamplingTestDriver
- otbSamplingRateCalculatorNew
-
- )
otb_add_test(NAME leTvSamplingRateCalculator COMMAND otbSamplingTestDriver
--compare-ascii ${NOTOL}
@@ -48,9 +44,6 @@ otb_add_test(NAME leTvSamplingRateCalculator COMMAND otbSamplingTestDriver
${TEMP}/leTvSamplingRateCalculator.txt)
# ----------------- OGRDataToSamplePositionFilter ----------------------------
-otb_add_test(NAME leTuOGRDataToSamplePositionFilterNew COMMAND otbSamplingTestDriver
- otbOGRDataToSamplePositionFilterNew )
-
otb_add_test(NAME leTvOGRDataToSamplePositionFilterPoly COMMAND otbSamplingTestDriver
otbOGRDataToSamplePositionFilter
${INPUTDATA}/variousVectors.sqlite
@@ -83,9 +76,6 @@ otb_add_test(NAME leTvOGRDataToSamplePositionFilterPoints COMMAND otbSamplingTes
)
# --------------- OGRDataToClassStatisticsFilter -----------------------------
-otb_add_test(NAME leTuOGRDataToClassStatisticsFilterNew COMMAND otbSamplingTestDriver
- otbOGRDataToClassStatisticsFilterNew )
-
otb_add_test(NAME leTvOGRDataToClassStatisticsFilter COMMAND otbSamplingTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/leTvOGRDataToClassStatisticsFilterOutput.txt
@@ -95,9 +85,6 @@ otb_add_test(NAME leTvOGRDataToClassStatisticsFilter COMMAND otbSamplingTestDriv
${TEMP}/leTvOGRDataToClassStatisticsFilterOutput.txt)
# --------------- ImageSampleExtractorFilter -----------------------------
-otb_add_test(NAME leTuImageSampleExtractorFilterNew COMMAND otbSamplingTestDriver
- otbImageSampleExtractorFilterNew )
-
otb_add_test(NAME leTvImageSampleExtractorFilter COMMAND otbSamplingTestDriver
--compare-ogr ${EPSILON_6}
${BASELINE_FILES}/leTvImageSampleExtractorFilterTest.sqlite
@@ -115,10 +102,6 @@ otb_add_test(NAME leTvImageSampleExtractorFilterUpdate COMMAND otbSamplingTestDr
${TEMP}/leTvImageSampleExtractorFilterUpdateTest.shp)
# ---------------- SamplingRateCalculatorList ---------------------------------
-otb_add_test(NAME leTuSamplingRateCalculatorListNew COMMAND otbSamplingTestDriver
- otbSamplingRateCalculatorListNew
-
- )
otb_add_test(NAME leTvSamplingRateCalculatorList COMMAND otbSamplingTestDriver
--compare-ascii ${NOTOL}
diff --git a/Modules/Learning/Sampling/test/otbImageSampleExtractorFilterTest.cxx b/Modules/Learning/Sampling/test/otbImageSampleExtractorFilterTest.cxx
index 414a7730276e95d4f41392d04c458d9f3af80035..a9c1d2a00ea9defd1a200c210e2c7979260f33f1 100644
--- a/Modules/Learning/Sampling/test/otbImageSampleExtractorFilterTest.cxx
+++ b/Modules/Learning/Sampling/test/otbImageSampleExtractorFilterTest.cxx
@@ -26,15 +26,6 @@
#include "itkPhysicalPointImageSource.h"
#include <fstream>
-int otbImageSampleExtractorFilterNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
- typedef otb::VectorImage<float> InputImageType;
- typedef otb::ImageSampleExtractorFilter<InputImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
- std::cout << filter << std::endl;
- return EXIT_SUCCESS;
-}
int otbImageSampleExtractorFilter(int argc, char* argv[])
{
diff --git a/Modules/Learning/Sampling/test/otbOGRDataToClassStatisticsFilterTest.cxx b/Modules/Learning/Sampling/test/otbOGRDataToClassStatisticsFilterTest.cxx
index d005b54aa9bc10898a58a09ac4dee61d5d0dfbda..3dad4c3eb0871651b6198a8462670c1ad1753d1b 100644
--- a/Modules/Learning/Sampling/test/otbOGRDataToClassStatisticsFilterTest.cxx
+++ b/Modules/Learning/Sampling/test/otbOGRDataToClassStatisticsFilterTest.cxx
@@ -24,16 +24,6 @@
#include "otbImage.h"
#include <fstream>
-int otbOGRDataToClassStatisticsFilterNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
- typedef otb::VectorImage<float> InputImageType;
- typedef otb::Image<unsigned char> MaskImageType;
- typedef otb::OGRDataToClassStatisticsFilter<InputImageType,MaskImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
- std::cout << filter << std::endl;
- return EXIT_SUCCESS;
-}
int otbOGRDataToClassStatisticsFilter(int argc, char* argv[])
{
diff --git a/Modules/Learning/Sampling/test/otbOGRDataToSamplePositionFilterTest.cxx b/Modules/Learning/Sampling/test/otbOGRDataToSamplePositionFilterTest.cxx
index 91994335eacc01e13db9269632815a368b59ffe7..c3fcad89a5afab1121751c26f46077b1ab29c964 100644
--- a/Modules/Learning/Sampling/test/otbOGRDataToSamplePositionFilterTest.cxx
+++ b/Modules/Learning/Sampling/test/otbOGRDataToSamplePositionFilterTest.cxx
@@ -132,16 +132,6 @@ int TestPositionContainers(otb::ogr::DataSource *output, otb::ogr::DataSource *b
return EXIT_SUCCESS;
}
-int otbOGRDataToSamplePositionFilterNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
- typedef otb::VectorImage<float> InputImageType;
- typedef otb::Image<unsigned char> MaskImageType;
- typedef otb::OGRDataToSamplePositionFilter<InputImageType , MaskImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
- std::cout << filter << std::endl;
- return EXIT_SUCCESS;
-}
int otbOGRDataToSamplePositionFilter(int argc, char* argv[])
{
diff --git a/Modules/Learning/Sampling/test/otbSamplingRateCalculatorListTest.cxx b/Modules/Learning/Sampling/test/otbSamplingRateCalculatorListTest.cxx
index e3e2a32239864dfd096792f3c0e59eb79f418d72..3db59b25374251b57b4ed39f2fe1ee563a928321 100644
--- a/Modules/Learning/Sampling/test/otbSamplingRateCalculatorListTest.cxx
+++ b/Modules/Learning/Sampling/test/otbSamplingRateCalculatorListTest.cxx
@@ -25,14 +25,6 @@
#include "itkVariableLengthVector.h"
#include <fstream>
-int otbSamplingRateCalculatorListNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
- typedef otb::SamplingRateCalculatorList RateCalculatorListType;
-
- RateCalculatorListType::Pointer rateCalculator = RateCalculatorListType::New();
- std::cout << rateCalculator << std::endl;
- return EXIT_SUCCESS;
-}
int otbSamplingRateCalculatorList(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/Learning/Sampling/test/otbSamplingRateCalculatorTest.cxx b/Modules/Learning/Sampling/test/otbSamplingRateCalculatorTest.cxx
index 9ad4ffb586bb6d1ea2b458f8b6e21b6b2406bb63..24dc6e655eb1a90e96e3ea429c7aa8d4a09ff1f5 100644
--- a/Modules/Learning/Sampling/test/otbSamplingRateCalculatorTest.cxx
+++ b/Modules/Learning/Sampling/test/otbSamplingRateCalculatorTest.cxx
@@ -24,14 +24,6 @@
#include "otbStatisticsXMLFileReader.h"
#include "itkVariableLengthVector.h"
-int otbSamplingRateCalculatorNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
- typedef otb::SamplingRateCalculator RateCalculatorype;
-
- RateCalculatorype::Pointer rateCalculator = RateCalculatorype::New();
- std::cout << rateCalculator << std::endl;
- return EXIT_SUCCESS;
-}
int otbSamplingRateCalculator(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/Learning/Sampling/test/otbSamplingTestDriver.cxx b/Modules/Learning/Sampling/test/otbSamplingTestDriver.cxx
index dd056bb512d7e26720fcf66de432256911909633..1a9a17bef755f0492d613b9e9270bae5dc1dcc5d 100644
--- a/Modules/Learning/Sampling/test/otbSamplingTestDriver.cxx
+++ b/Modules/Learning/Sampling/test/otbSamplingTestDriver.cxx
@@ -22,16 +22,11 @@
void RegisterTests()
{
- REGISTER_TEST(otbSamplingRateCalculatorNew);
REGISTER_TEST(otbSamplingRateCalculator);
- REGISTER_TEST(otbOGRDataToSamplePositionFilterNew);
REGISTER_TEST(otbOGRDataToSamplePositionFilter);
REGISTER_TEST(otbOGRDataToSamplePositionFilterPattern);
- REGISTER_TEST(otbOGRDataToClassStatisticsFilterNew);
REGISTER_TEST(otbOGRDataToClassStatisticsFilter);
- REGISTER_TEST(otbImageSampleExtractorFilterNew);
REGISTER_TEST(otbImageSampleExtractorFilter);
REGISTER_TEST(otbImageSampleExtractorFilterUpdate);
- REGISTER_TEST(otbSamplingRateCalculatorListNew);
REGISTER_TEST(otbSamplingRateCalculatorList);
}
diff --git a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
index 4fe28c42136975575a0877d298564b3f990a353a..0606b5b150a401c7432e8eda1192ae88694cff3a 100644
--- a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
@@ -33,8 +33,10 @@
#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wcast-align"
#pragma GCC diagnostic ignored "-Wunknown-pragmas"
-#pragma GCC diagnostic ignored "-Wheader-guard"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wheader-guard"
+#endif
#endif
#include <shark/Models/Classifier.h>
#include "otb_shark.h"
diff --git a/Modules/Learning/Supervised/test/CMakeLists.txt b/Modules/Learning/Supervised/test/CMakeLists.txt
index 858f9f84ea9592a96da94b17d6c9cf4074fc6994..7417ce0d2b7a8c071d888d502231d1ca7a465bd3 100644
--- a/Modules/Learning/Supervised/test/CMakeLists.txt
+++ b/Modules/Learning/Supervised/test/CMakeLists.txt
@@ -27,10 +27,8 @@ otbMachineLearningModelCanRead.cxx
otbTrainMachineLearningModel.cxx
otbImageClassificationFilter.cxx
otbMachineLearningRegressionTests.cxx
-otbExhaustiveExponentialOptimizerNew.cxx
otbExhaustiveExponentialOptimizerTest.cxx
otbLabelMapClassifier.cxx
-otbSVMCrossValidationCostFunctionNew.cxx
otbSVMMarginSampler.cxx
)
@@ -57,15 +55,9 @@ otb_add_test(NAME leTvConfusionMatrixCalculatorUpdateWithBaseline COMMAND otbSup
otb_add_test(NAME leTvConfusionMatrixCalculatorSetListSamples COMMAND otbSupervisedTestDriver
otbConfusionMatrixCalculatorSetListSamples 1000 4)
-otb_add_test(NAME leTuConfusionMatrixCalculatorNew COMMAND otbSupervisedTestDriver
- otbConfusionMatrixCalculatorNew)
-
otb_add_test(NAME leTvConfusionMatrixMeasurementsTest COMMAND otbSupervisedTestDriver
otbConfusionMatrixMeasurementsTest)
-otb_add_test(NAME leTuConfusionMatrixMeasurementsNew COMMAND otbSupervisedTestDriver
- otbConfusionMatrixMeasurementsNew)
-
otb_add_test(NAME leTvConfusionMatrixConcatenateTest COMMAND otbSupervisedTestDriver
otbConfusionMatrixConcatenateTest
${INPUTDATA}/Classification/QB_1_ortho_C1.csv
@@ -75,9 +67,6 @@ otb_add_test(NAME leTvConfusionMatrixConcatenateTest COMMAND otbSupervisedTestDr
${INPUTDATA}/Classification/QB_1_ortho_C5.csv
${INPUTDATA}/Classification/QB_1_ortho_C6.csv)
-otb_add_test(NAME leTuExhaustiveExponentialOptimizerNew COMMAND otbSupervisedTestDriver
- otbExhaustiveExponentialOptimizerNew)
-
otb_add_test(NAME leTvExhaustiveExponentialOptimizerTest COMMAND otbSupervisedTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/leTvExhaustiveExponentialOptimizerOutput.txt
diff --git a/Modules/Learning/Supervised/test/otbConfusionMatrixCalculatorTest.cxx b/Modules/Learning/Supervised/test/otbConfusionMatrixCalculatorTest.cxx
index 3c1102d8bffe4ec042085107763adb45aaa2c843..ec824bc45e7eaa3c2a00876546b493590f9658ef 100644
--- a/Modules/Learning/Supervised/test/otbConfusionMatrixCalculatorTest.cxx
+++ b/Modules/Learning/Supervised/test/otbConfusionMatrixCalculatorTest.cxx
@@ -22,22 +22,6 @@
#include "itkListSample.h"
#include "otbConfusionMatrixCalculator.h"
-int otbConfusionMatrixCalculatorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- typedef itk::VariableLengthVector<int> PLabelType;
- typedef itk::Statistics::ListSample<PLabelType> PListLabelType;
- typedef itk::FixedArray<int, 1> RLabelType;
- typedef itk::Statistics::ListSample<RLabelType> RListLabelType;
- typedef otb::ConfusionMatrixCalculator<RListLabelType,
- PListLabelType> CalculatorType;
-
- CalculatorType::Pointer calculator = CalculatorType::New();
-
- std::cout << calculator << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbConfusionMatrixCalculatorSetListSamples(int argc, char* argv[])
{
diff --git a/Modules/Learning/Supervised/test/otbConfusionMatrixMeasurementsTest.cxx b/Modules/Learning/Supervised/test/otbConfusionMatrixMeasurementsTest.cxx
index 63e88ea0055a93bb080f73181348f3176d8ece50..a6e9cf6cef86335cf5433527d81be954411971cb 100644
--- a/Modules/Learning/Supervised/test/otbConfusionMatrixMeasurementsTest.cxx
+++ b/Modules/Learning/Supervised/test/otbConfusionMatrixMeasurementsTest.cxx
@@ -145,34 +145,6 @@ int CSVConfusionMatrixFileReader(const std::string fileName, MapOfClassesType &m
-int otbConfusionMatrixMeasurementsNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- /*typedef unsigned long ConfusionMatrixEltType;
- typedef itk::VariableSizeMatrix<ConfusionMatrixEltType> ConfusionMatrixType;
- typedef unsigned char LabelType; */
-
- // filter types
- typedef otb::ConfusionMatrixMeasurements<ConfusionMatrixType, ClassLabelType> ConfusionMatrixMeasurements2TemplatesType;
- typedef otb::ConfusionMatrixMeasurements<ConfusionMatrixType> ConfusionMatrixMeasurements1TemplateType;
- typedef otb::ConfusionMatrixMeasurements<> ConfusionMatrixMeasurements0TemplateType;
-
- // filters
- ConfusionMatrixMeasurements2TemplatesType::Pointer
- confusionMatrixMeasurements2Templates = ConfusionMatrixMeasurements2TemplatesType::New();
- ConfusionMatrixMeasurements1TemplateType::Pointer
- confusionMatrixMeasurements1Template = ConfusionMatrixMeasurements1TemplateType::New();
- ConfusionMatrixMeasurements0TemplateType::Pointer
- confusionMatrixMeasurements0Template = ConfusionMatrixMeasurements0TemplateType::New();
-
- std::cout << confusionMatrixMeasurements2Templates << std::endl;
- std::cout << std::endl;
- std::cout << confusionMatrixMeasurements1Template << std::endl;
- std::cout << std::endl;
- std::cout << confusionMatrixMeasurements0Template << std::endl;
- std::cout << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbConfusionMatrixMeasurementsTest(int itkNotUsed(argc), char* itkNotUsed(argv) [])
diff --git a/Modules/Learning/Supervised/test/otbExhaustiveExponentialOptimizerNew.cxx b/Modules/Learning/Supervised/test/otbExhaustiveExponentialOptimizerNew.cxx
deleted file mode 100644
index 814ee882773ae6c5c4dd1c4c707b7593f84ef557..0000000000000000000000000000000000000000
--- a/Modules/Learning/Supervised/test/otbExhaustiveExponentialOptimizerNew.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include <iostream>
-
-#include "otbExhaustiveExponentialOptimizer.h"
-
-int otbExhaustiveExponentialOptimizerNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- otb::ExhaustiveExponentialOptimizer::Pointer opt = otb::ExhaustiveExponentialOptimizer::New();
-
- std::cout << opt << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/Supervised/test/otbImageClassificationFilter.cxx b/Modules/Learning/Supervised/test/otbImageClassificationFilter.cxx
index 7f7ad85ad9b0c5d370fcd45ab3323c60b15caa9e..76a31e2e9f262b0cce77044aebd359f5d7b5de18 100644
--- a/Modules/Learning/Supervised/test/otbImageClassificationFilter.cxx
+++ b/Modules/Learning/Supervised/test/otbImageClassificationFilter.cxx
@@ -39,11 +39,6 @@ typedef otb::MachineLearningModelFactory<ValueType, LabelType> MachineLearningMo
typedef otb::ImageFileReader<ImageType> ReaderType;
typedef otb::ImageFileWriter<LabeledImageType> WriterType;
-int otbImageClassificationFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- ClassificationFilterType::Pointer filter = ClassificationFilterType::New();
- return EXIT_SUCCESS;
-}
int otbImageClassificationFilterLoadModel(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Learning/Supervised/test/otbLabelMapClassifier.cxx b/Modules/Learning/Supervised/test/otbLabelMapClassifier.cxx
index 094e3e3a23256ad05a6708ccd234469eae5dbeba..e41355b23582af87cfafb6b8df7091b76f228763 100644
--- a/Modules/Learning/Supervised/test/otbLabelMapClassifier.cxx
+++ b/Modules/Learning/Supervised/test/otbLabelMapClassifier.cxx
@@ -75,11 +75,6 @@ LabelObjectType::Pointer makeTrainingSample(LabelMapType* labelMap, LabelType la
return newLabelObject;
}
-int otbLabelMapClassifierNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- ClassifierType::Pointer classifier = ClassifierType::New();
- return EXIT_SUCCESS;
-}
int otbLabelMapClassifier(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Learning/Supervised/test/otbSVMCrossValidationCostFunctionNew.cxx b/Modules/Learning/Supervised/test/otbSVMCrossValidationCostFunctionNew.cxx
deleted file mode 100644
index 06ec8c1b6a3bc53bb4c7c5f7095042c0ecd273ed..0000000000000000000000000000000000000000
--- a/Modules/Learning/Supervised/test/otbSVMCrossValidationCostFunctionNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#include "itkMacro.h"
-#include "otbImage.h"
-#include <iostream>
-
-#include "otbLibSVMMachineLearningModel.h"
-#include "otbSVMCrossValidationCostFunction.h"
-
-int otbSVMCrossValidationCostFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned char InputPixelType;
- typedef unsigned char LabelPixelType;
-
- typedef otb::LibSVMMachineLearningModel<InputPixelType,LabelPixelType> ModelType;
- typedef otb::SVMCrossValidationCostFunction<ModelType> FunctionType;
-
- FunctionType::Pointer function = FunctionType::New();
-
- std::cout << function << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/Supervised/test/otbSVMMarginSampler.cxx b/Modules/Learning/Supervised/test/otbSVMMarginSampler.cxx
index f70bb88332dcd2adbf04ddb7140c63094fb2e916..e004ca02291ca73a142ea617cd88a3739272b106 100644
--- a/Modules/Learning/Supervised/test/otbSVMMarginSampler.cxx
+++ b/Modules/Learning/Supervised/test/otbSVMMarginSampler.cxx
@@ -27,16 +27,3 @@
#include "otbSVMMarginSampler.h"
#include "otbLibSVMMachineLearningModel.h"
-int otbSVMMarginSamplerNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef itk::VariableLengthVector<double> SampleType;
- typedef itk::Statistics::ListSample<SampleType> SampleListType;
- typedef otb::LibSVMMachineLearningModel<double,unsigned int> SVMModelType;
- typedef otb::SVMMarginSampler<SampleListType,SVMModelType> MarginSamplerType;
-
- MarginSamplerType::Pointer marginSampler = MarginSamplerType::New();
-
- std::cout << marginSampler << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/Supervised/test/otbSupervisedTestDriver.cxx b/Modules/Learning/Supervised/test/otbSupervisedTestDriver.cxx
index 73b5d464039957b8fb9eefb9be82db3a66d58e9a..4da6076e28bfe881776659b3d8c0b6a3b2a15409 100644
--- a/Modules/Learning/Supervised/test/otbSupervisedTestDriver.cxx
+++ b/Modules/Learning/Supervised/test/otbSupervisedTestDriver.cxx
@@ -26,26 +26,19 @@
void RegisterTests()
{
- REGISTER_TEST(otbConfusionMatrixCalculatorNew);
REGISTER_TEST(otbConfusionMatrixCalculatorSetListSamples);
REGISTER_TEST(otbConfusionMatrixCalculatorWrongSize);
REGISTER_TEST(otbConfusionMatrixCalculatorCompute);
REGISTER_TEST(otbConfusionMatrixCalculatorComputeWithBaseline);
- REGISTER_TEST(otbConfusionMatrixMeasurementsNew);
REGISTER_TEST(otbConfusionMatrixMeasurementsTest);
REGISTER_TEST(otbConfusionMatrixConcatenateTest);
- REGISTER_TEST(otbExhaustiveExponentialOptimizerNew);
REGISTER_TEST(otbExhaustiveExponentialOptimizerTest);
#ifdef OTB_USE_LIBSVM
REGISTER_TEST(otbLibSVMMachineLearningModelCanRead);
- REGISTER_TEST(otbLibSVMMachineLearningModelNew);
REGISTER_TEST(otbLibSVMMachineLearningModel);
REGISTER_TEST(otbLibSVMRegressionTests);
- REGISTER_TEST(otbLabelMapClassifierNew);
REGISTER_TEST(otbLabelMapClassifier);
- REGISTER_TEST(otbSVMCrossValidationCostFunctionNew);
- REGISTER_TEST(otbSVMMarginSamplerNew);
#endif
#ifdef OTB_USE_OPENCV
@@ -58,19 +51,12 @@ void RegisterTests()
REGISTER_TEST(otbDecisionTreeMachineLearningModelCanRead);
REGISTER_TEST(otbKNNMachineLearningModelCanRead);
// training tests
- REGISTER_TEST(otbSVMMachineLearningModelNew);
REGISTER_TEST(otbSVMMachineLearningModel);
- REGISTER_TEST(otbKNearestNeighborsMachineLearningModelNew);
REGISTER_TEST(otbKNearestNeighborsMachineLearningModel);
- REGISTER_TEST(otbRandomForestsMachineLearningModelNew);
REGISTER_TEST(otbRandomForestsMachineLearningModel);
- REGISTER_TEST(otbBoostMachineLearningModelNew);
REGISTER_TEST(otbBoostMachineLearningModel);
- REGISTER_TEST(otbANNMachineLearningModelNew);
REGISTER_TEST(otbANNMachineLearningModel);
- REGISTER_TEST(otbNormalBayesMachineLearningModelNew);
REGISTER_TEST(otbNormalBayesMachineLearningModel);
- REGISTER_TEST(otbDecisionTreeMachineLearningModelNew);
REGISTER_TEST(otbDecisionTreeMachineLearningModel);
// regression tests
REGISTER_TEST(otbNeuralNetworkRegressionTests);
@@ -81,19 +67,16 @@ void RegisterTests()
REGISTER_TEST(otbRandomForestsRegressionTests);
#ifndef OTB_OPENCV_3
REGISTER_TEST(otbGradientBoostedTreeMachineLearningModelCanRead);
- REGISTER_TEST(otbGradientBoostedTreeMachineLearningModelNew);
REGISTER_TEST(otbGradientBoostedTreeMachineLearningModel);
REGISTER_TEST(otbGradientBoostedTreeRegressionTests);
#endif
#endif
#ifdef OTB_USE_SHARK
- REGISTER_TEST(otbSharkRFMachineLearningModelNew);
REGISTER_TEST(otbSharkRFMachineLearningModel);
REGISTER_TEST(otbSharkRFMachineLearningModelCanRead);
REGISTER_TEST(otbSharkImageClassificationFilter);
#endif
- REGISTER_TEST(otbImageClassificationFilterNew);
REGISTER_TEST(otbImageClassificationFilter);
}
diff --git a/Modules/Learning/Supervised/test/otbTrainMachineLearningModel.cxx b/Modules/Learning/Supervised/test/otbTrainMachineLearningModel.cxx
index 319169c79e0df7439712bf8c591d68a74e94f601..f6d6061df9716031651b781e3d77192822ddbeef 100644
--- a/Modules/Learning/Supervised/test/otbTrainMachineLearningModel.cxx
+++ b/Modules/Learning/Supervised/test/otbTrainMachineLearningModel.cxx
@@ -50,12 +50,6 @@ typedef otb::ConfusionMatrixCalculator<TargetListSampleType, TargetListSampleTyp
#ifdef OTB_USE_LIBSVM
#include "otbLibSVMMachineLearningModel.h"
-int otbLibSVMMachineLearningModelNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::LibSVMMachineLearningModel<InputValueType, TargetValueType> SVMType;
- SVMType::Pointer svmclassifier = SVMType::New();
- return EXIT_SUCCESS;
-}
int otbLibSVMMachineLearningModel(int argc, char * argv[])
{
@@ -139,12 +133,6 @@ int otbLibSVMMachineLearningModel(int argc, char * argv[])
#include "otbGradientBoostedTreeMachineLearningModel.h"
#include "otbKNearestNeighborsMachineLearningModel.h"
-int otbSVMMachineLearningModelNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::SVMMachineLearningModel<InputValueType,TargetValueType> SVMType;
- SVMType::Pointer svmclassifier = SVMType::New();
- return EXIT_SUCCESS;
-}
int otbSVMMachineLearningModel(int argc, char * argv[])
{
@@ -285,12 +273,6 @@ int otbSVMMachineLearningRegressionModel(int argc, char * argv[])
}
}
-int otbKNearestNeighborsMachineLearningModelNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::KNearestNeighborsMachineLearningModel<InputValueType,TargetValueType> KNearestNeighborsType;
- KNearestNeighborsType::Pointer knnclassifier = KNearestNeighborsType::New();
- return EXIT_SUCCESS;
-}
int otbKNearestNeighborsMachineLearningModel(int argc, char * argv[])
{
@@ -362,12 +344,6 @@ int otbKNearestNeighborsMachineLearningModel(int argc, char * argv[])
}
}
-int otbRandomForestsMachineLearningModelNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::RandomForestsMachineLearningModel<InputValueType,TargetValueType> RandomForestType;
- RandomForestType::Pointer rfclassifier = RandomForestType::New();
- return EXIT_SUCCESS;
-}
int otbRandomForestsMachineLearningModel(int argc, char * argv[])
{
@@ -448,12 +424,6 @@ int otbRandomForestsMachineLearningModel(int argc, char * argv[])
}
}
-int otbBoostMachineLearningModelNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::BoostMachineLearningModel<InputValueType,TargetValueType> BoostType;
- BoostType::Pointer classifier = BoostType::New();
- return EXIT_SUCCESS;
-}
int otbBoostMachineLearningModel(int argc, char * argv[])
{
@@ -534,12 +504,6 @@ int otbBoostMachineLearningModel(int argc, char * argv[])
}
}
-int otbANNMachineLearningModelNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::NeuralNetworkMachineLearningModel<InputValueType, TargetValueType> ANNType;
- ANNType::Pointer classifier = ANNType::New();
- return EXIT_SUCCESS;
-}
int otbANNMachineLearningModel(int argc, char * argv[])
{
@@ -624,12 +588,6 @@ int otbANNMachineLearningModel(int argc, char * argv[])
}
}
-int otbNormalBayesMachineLearningModelNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::NormalBayesMachineLearningModel<InputValueType,TargetValueType> NormalBayesType;
- NormalBayesType::Pointer classifier = NormalBayesType::New();
- return EXIT_SUCCESS;
-}
int otbNormalBayesMachineLearningModel(int argc, char * argv[])
{
@@ -701,12 +659,6 @@ int otbNormalBayesMachineLearningModel(int argc, char * argv[])
}
}
-int otbDecisionTreeMachineLearningModelNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::DecisionTreeMachineLearningModel<InputValueType,TargetValueType> DecisionTreeType;
- DecisionTreeType::Pointer classifier = DecisionTreeType::New();
- return EXIT_SUCCESS;
-}
int otbDecisionTreeMachineLearningModel(int argc, char * argv[])
{
@@ -779,12 +731,6 @@ int otbDecisionTreeMachineLearningModel(int argc, char * argv[])
}
#ifndef OTB_OPENCV_3
-int otbGradientBoostedTreeMachineLearningModelNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::GradientBoostedTreeMachineLearningModel<InputValueType,TargetValueType> GBTreeType;
- GBTreeType::Pointer classifier = GBTreeType::New();
- return EXIT_SUCCESS;
-}
int otbGradientBoostedTreeMachineLearningModel(int argc, char * argv[])
{
@@ -862,12 +808,6 @@ int otbGradientBoostedTreeMachineLearningModel(int argc, char * argv[])
#include <chrono> // If shark is on, then we are using c++11
#include "otbSharkRandomForestsMachineLearningModel.h"
-int otbSharkRFMachineLearningModelNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::SharkRandomForestsMachineLearningModel<InputValueType,TargetValueType> SharkRFType;
- SharkRFType::Pointer classifier = SharkRFType::New();
- return EXIT_SUCCESS;
-}
int otbSharkRFMachineLearningModel(int argc, char * argv[])
{
diff --git a/Modules/Learning/Supervised/test/tests-libsvm.cmake b/Modules/Learning/Supervised/test/tests-libsvm.cmake
index 03b5118cd9ffb9eb538df0efe8452ccd0fff30cc..27bdb0791bee0453d7f9696c1771e9b0d781a610 100644
--- a/Modules/Learning/Supervised/test/tests-libsvm.cmake
+++ b/Modules/Learning/Supervised/test/tests-libsvm.cmake
@@ -23,9 +23,6 @@ otb_add_test(NAME leTvLibSVMMachineLearningModel COMMAND otbSupervisedTestDriver
${INPUTDATA}/letter_light.scale
${TEMP}/libsvm_model.txt
)
-otb_add_test(NAME leTuLibSVMMachineLearningModelNew COMMAND otbSupervisedTestDriver
- otbLibSVMMachineLearningModelNew)
-
otb_add_test(NAME leTvImageClassificationFilterLibSVM COMMAND otbSupervisedTestDriver
--compare-image ${NOTOL}
${BASELINE}/leSVMImageClassificationFilterOutput.tif
@@ -52,11 +49,3 @@ otb_add_test(NAME leTvLibSVMMachineLearningModelReg COMMAND otbSupervisedTestDri
#${INPUTDATA}/maur_labelled.tif
#${TEMP}/obTvLabelMapSVMClassifierLabeledOutput.tif)
-otb_add_test(NAME obTuLabelMapSVMClassifierNew COMMAND otbSupervisedTestDriver
- otbLabelMapClassifierNew)
-
-otb_add_test(NAME leTuSVMCrossValidationCostFunctionNew COMMAND otbSupervisedTestDriver
- otbSVMCrossValidationCostFunctionNew)
-
-otb_add_test(NAME leTuSVMMarginSamplerNew COMMAND otbSupervisedTestDriver
- otbSVMMarginSamplerNew)
diff --git a/Modules/Learning/Supervised/test/tests-opencv.cmake b/Modules/Learning/Supervised/test/tests-opencv.cmake
index f898971f56ffc964adf8f1a352a3628fc7ba6990..76a125460f59846ddfc0156baf8c11c0acfc2212 100644
--- a/Modules/Learning/Supervised/test/tests-opencv.cmake
+++ b/Modules/Learning/Supervised/test/tests-opencv.cmake
@@ -18,12 +18,6 @@
# limitations under the License.
#
-otb_add_test(NAME leTuNormalBayesMachineLearningModelNew COMMAND otbSupervisedTestDriver
- otbNormalBayesMachineLearningModelNew)
-
-otb_add_test(NAME leTuRandomForestsMachineLearningModelNew COMMAND otbSupervisedTestDriver
- otbRandomForestsMachineLearningModelNew)
-
otb_add_test(NAME leTvANNMachineLearningModel COMMAND otbSupervisedTestDriver
otbANNMachineLearningModel
${INPUTDATA}/letter_light.scale
@@ -57,15 +51,6 @@ otb_add_test(NAME leTvRandomForestsMachineLearningModelReg COMMAND otbSupervised
)
# --------------------------------------------------------------
-otb_add_test(NAME leTuSVMMachineLearningModelNew COMMAND otbSupervisedTestDriver
- otbSVMMachineLearningModelNew)
-
-otb_add_test(NAME leTuDecisionTreeMachineLearningModelNew COMMAND otbSupervisedTestDriver
- otbDecisionTreeMachineLearningModelNew)
-
-otb_add_test(NAME leTuKNearestNeighborsMachineLearningModelNew COMMAND otbSupervisedTestDriver
- otbKNearestNeighborsMachineLearningModelNew)
-
otb_add_test(NAME leTvSVMMachineLearningRegressionModel COMMAND otbSupervisedTestDriver
otbSVMMachineLearningRegressionModel
${INPUTDATA}/abalone.scale
@@ -78,9 +63,6 @@ otb_add_test(NAME leTvSVMMachineLearningModel COMMAND otbSupervisedTestDriver
${TEMP}/svm_model.txt
)
-otb_add_test(NAME leTuBoostMachineLearningModelNew COMMAND otbSupervisedTestDriver
- otbBoostMachineLearningModelNew)
-
otb_add_test(NAME leTvNormalBayesMachineLearningModel COMMAND otbSupervisedTestDriver
otbNormalBayesMachineLearningModel
${INPUTDATA}/letter_light.scale
@@ -88,13 +70,11 @@ otb_add_test(NAME leTvNormalBayesMachineLearningModel COMMAND otbSupervisedTestD
)
if(NOT OTB_OPENCV_3)
-otb_add_test(NAME leTvGradientBoostedTreeMachineLearningModel COMMAND otbSupervisedTestDriver
- otbGradientBoostedTreeMachineLearningModel
- ${INPUTDATA}/letter_light.scale
- ${TEMP}/gbt_model.txt
- )
-otb_add_test(NAME leTuGradientBoostedTreeMachineLearningModelNew COMMAND otbSupervisedTestDriver
- otbGradientBoostedTreeMachineLearningModelNew)
+ otb_add_test(NAME leTvGradientBoostedTreeMachineLearningModel COMMAND otbSupervisedTestDriver
+ otbGradientBoostedTreeMachineLearningModel
+ ${INPUTDATA}/letter_light.scale
+ ${TEMP}/gbt_model.txt
+ )
endif()
otb_add_test(NAME leTvRandomForestsMachineLearningModel COMMAND otbSupervisedTestDriver
@@ -103,9 +83,6 @@ otb_add_test(NAME leTvRandomForestsMachineLearningModel COMMAND otbSupervisedTes
${TEMP}/rf_model.txt
)
-otb_add_test(NAME leTuANNMachineLearningModelNew COMMAND otbSupervisedTestDriver
- otbANNMachineLearningModelNew)
-
otb_add_test(NAME leTvKNearestNeighborsMachineLearningModel COMMAND otbSupervisedTestDriver
otbKNearestNeighborsMachineLearningModel
${INPUTDATA}/letter_light.scale
@@ -124,9 +101,6 @@ otb_add_test(NAME leTvBoostMachineLearningModel COMMAND otbSupervisedTestDriver
${TEMP}/boost_model.txt
)
-otb_add_test(NAME leTuImageClassificationFilterNew COMMAND otbSupervisedTestDriver
- otbImageClassificationFilterNew)
-
otb_add_test(NAME leTvImageClassificationFilterSVM COMMAND otbSupervisedTestDriver
--compare-image ${NOTOL}
${BASELINE}/leImageClassificationFilterSVMOutput.tif
@@ -144,11 +118,11 @@ otb_add_test(NAME leTvDecisionTreeMachineLearningModelCanRead COMMAND otbSupervi
set_property(TEST leTvDecisionTreeMachineLearningModelCanRead APPEND PROPERTY DEPENDS leTvDecisionTreeMachineLearningModel)
if(NOT OTB_OPENCV_3)
-otb_add_test(NAME leTvGradientBoostedTreeMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
- otbGradientBoostedTreeMachineLearningModelCanRead
- ${TEMP}/gbt_model.txt
- )
-set_property(TEST leTvGradientBoostedTreeMachineLearningModelCanRead PROPERTY DEPENDS leTvGradientBoostedTreeMachineLearningModel)
+ otb_add_test(NAME leTvGradientBoostedTreeMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
+ otbGradientBoostedTreeMachineLearningModelCanRead
+ ${TEMP}/gbt_model.txt
+ )
+ set_property(TEST leTvGradientBoostedTreeMachineLearningModelCanRead PROPERTY DEPENDS leTvGradientBoostedTreeMachineLearningModel)
endif()
otb_add_test(NAME leTvNormalBayesMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
diff --git a/Modules/Learning/Supervised/test/tests-shark.cmake b/Modules/Learning/Supervised/test/tests-shark.cmake
index 546e826043b31d284840fc3bed69250b82ad6dfb..87fbcbfc48077ea8fcbf0f07a6ea25b9da195e81 100644
--- a/Modules/Learning/Supervised/test/tests-shark.cmake
+++ b/Modules/Learning/Supervised/test/tests-shark.cmake
@@ -18,9 +18,6 @@
# limitations under the License.
#
-otb_add_test(NAME leTuSharkRFMachineLearningModelNew COMMAND otbSupervisedTestDriver
- otbSharkRFMachineLearningModelNew)
-
otb_add_test(NAME leTvSharkRFMachineLearningModel COMMAND otbSupervisedTestDriver
otbSharkRFMachineLearningModel
${INPUTDATA}/letter_light.scale
diff --git a/Modules/Learning/Unsupervised/test/CMakeLists.txt b/Modules/Learning/Unsupervised/test/CMakeLists.txt
index 8407413cd8020676daea852688a42273077e9f33..b13df48917c7210178e85e13144705d16d39a1a6 100644
--- a/Modules/Learning/Unsupervised/test/CMakeLists.txt
+++ b/Modules/Learning/Unsupervised/test/CMakeLists.txt
@@ -8,9 +8,6 @@ set(OTBUnsupervisedTests
# Tests Declaration
-otb_add_test(NAME leTuContingencyTableCalculatorNew COMMAND otbUnsupervisedTestDriver
- otbContingencyTableCalculatorNew)
-
otb_add_test(NAME leTvContingencyTableCalculatorSetListSamples COMMAND otbUnsupervisedTestDriver
otbContingencyTableCalculatorSetListSamples 1000 4)
diff --git a/Modules/Learning/Unsupervised/test/otbContingencyTableCalculatorTest.cxx b/Modules/Learning/Unsupervised/test/otbContingencyTableCalculatorTest.cxx
index 1660c17574e143ef4bd2e0e4101d8992ecb5f52a..25f6e11373df5302404a86c77d49641a1b2976ef 100644
--- a/Modules/Learning/Unsupervised/test/otbContingencyTableCalculatorTest.cxx
+++ b/Modules/Learning/Unsupervised/test/otbContingencyTableCalculatorTest.cxx
@@ -21,16 +21,6 @@
#include "itkListSample.h"
#include "otbContingencyTableCalculator.h"
-int otbContingencyTableCalculatorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- typedef int ClassLabelType;
- typedef otb::ContingencyTableCalculator<ClassLabelType> CalculatorType;
-
- CalculatorType::Pointer calculator = CalculatorType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Learning/Unsupervised/test/otbTrainMachineLearningUnsupervisedModel.cxx b/Modules/Learning/Unsupervised/test/otbTrainMachineLearningUnsupervisedModel.cxx
index 70320bbe9b28e27f92ad073944c860b79ad542ab..af05be57baa91d369e6cea736b3e8f0ba90a4b5a 100644
--- a/Modules/Learning/Unsupervised/test/otbTrainMachineLearningUnsupervisedModel.cxx
+++ b/Modules/Learning/Unsupervised/test/otbTrainMachineLearningUnsupervisedModel.cxx
@@ -111,12 +111,6 @@ bool SharkReadDataFile(const std::string & infname, InputListSampleType * sample
}
-int otbSharkKMeansMachineLearningModelNew(int itkNotUsed( argc ), char *itkNotUsed( argv )[])
-{
- typedef otb::SharkKMeansMachineLearningModel<InputValueType, TargetValueType> SharkRFType;
- SharkRFType::Pointer classifier = SharkRFType::New();
- return EXIT_SUCCESS;
-}
int otbSharkKMeansMachineLearningModelTrain(int argc, char *argv[])
{
diff --git a/Modules/Learning/Unsupervised/test/otbUnsupervisedTestDriver.cxx b/Modules/Learning/Unsupervised/test/otbUnsupervisedTestDriver.cxx
index 876f613508404c96aaa4027978d1e8a7baabc11c..9cecb4c358c1225e9fd000c35715f1e2c13f4c56 100644
--- a/Modules/Learning/Unsupervised/test/otbUnsupervisedTestDriver.cxx
+++ b/Modules/Learning/Unsupervised/test/otbUnsupervisedTestDriver.cxx
@@ -21,14 +21,12 @@
void RegisterTests()
{
- REGISTER_TEST(otbContingencyTableCalculatorNew);
REGISTER_TEST(otbContingencyTableCalculatorSetListSamples);
REGISTER_TEST(otbContingencyTableCalculatorCompute);
REGISTER_TEST(otbContingencyTableCalculatorComputeWithBaseline);
#ifdef OTB_USE_SHARK
REGISTER_TEST(otbSharkKMeansMachineLearningModelCanRead);
- REGISTER_TEST(otbSharkKMeansMachineLearningModelNew);
REGISTER_TEST(otbSharkKMeansMachineLearningModelTrain);
REGISTER_TEST(otbSharkKMeansMachineLearningModelPredict);
REGISTER_TEST(otbSharkUnsupervisedImageClassificationFilter);
diff --git a/Modules/Learning/Unsupervised/test/tests-shark.cmake b/Modules/Learning/Unsupervised/test/tests-shark.cmake
index df61cb46479f9922e3355441458a1e261879c40c..c817a318b0ab97049baee27313f545a23328c516 100644
--- a/Modules/Learning/Unsupervised/test/tests-shark.cmake
+++ b/Modules/Learning/Unsupervised/test/tests-shark.cmake
@@ -1,8 +1,5 @@
# kMeans Shark related tests
-otb_add_test(NAME leTvSharkKMeansMachineLearningModelNew COMMAND otbUnsupervisedTestDriver
- otbSharkKMeansMachineLearningModelNew
- )
otb_add_test(NAME leTvSharkKMeansMachineLearningModel COMMAND otbUnsupervisedTestDriver
diff --git a/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h b/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h
index d68643c8b87f4a927048650ee5badc5df6ad37a6..85c3f46c8141d2492d22c00f6e3541c393cdcf13 100644
--- a/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h
+++ b/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h
@@ -218,9 +218,11 @@ public:
/** Does the real work. */
virtual void Update() override;
- /** SimpleParallelTiffWriter Methods */
+ /** \deprecated const char* overload of SetFileName is deprecated, use std::string instead */
virtual void SetFileName(const char* extendedFileName);
- virtual void SetFileName(std::string extendedFileName);
+
+ virtual void SetFileName(const std::string& extendedFileName);
+
virtual const char* GetFileName () const;
/** Specify the region to write. If left NULL, then the whole image
diff --git a/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.hxx b/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.hxx
index 1c6aa5033f186e1fb252ab2bdeff46da8cd35082..47ba2bbe19305bb035705daea6382b6d11bcd353 100644
--- a/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.hxx
+++ b/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.hxx
@@ -824,21 +824,26 @@ SimpleParallelTiffWriter<TInputImage>
template <class TInputImage>
void
SimpleParallelTiffWriter<TInputImage>
-::SetFileName(std::string extendedFileName)
- {
- this->SetFileName(extendedFileName.c_str());
- }
+::SetFileName(const std::string& extendedFileName)
+{
+ this->m_FilenameHelper->SetExtendedFileName(extendedFileName);
+ m_FileName = this->m_FilenameHelper->GetSimpleFileName();
+ m_ImageIO = NULL;
+ this->Modified();
+}
template <class TInputImage>
void
SimpleParallelTiffWriter<TInputImage>
::SetFileName(const char* extendedFileName)
- {
- this->m_FilenameHelper->SetExtendedFileName(extendedFileName);
- m_FileName = this->m_FilenameHelper->GetSimpleFileName();
- m_ImageIO = NULL;
- this->Modified();
- }
+{
+ if (extendedFileName == nullptr)
+ {
+ itkGenericExceptionMacro( << "Filename is NULL" );
+ }
+
+ this->SetFileName(std::string(extendedFileName));
+}
template <class TInputImage>
const char*
diff --git a/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.h b/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.h
index c6126e924f55cf523cd229717cb97a82d6a10344..2cf0e03b4db6ba7b65d7e6e39f3a8a71ac74f34a 100644
--- a/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.h
+++ b/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.h
@@ -80,9 +80,11 @@ public:
/** Does the real work. */
virtual void Update() override;
- /** SimpleParallelTiffWriter Methods */
+ /** \deprecated const char* overload of SetFileName is deprecated, use std::string instead */
virtual void SetFileName(const char* extendedFileName);
- virtual void SetFileName(std::string extendedFileName);
+
+ virtual void SetFileName(const std::string& extendedFileName);
+
virtual const char* GetFileName () const;
/** Specify the region to write. If left NULL, then the whole image
diff --git a/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.hxx b/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.hxx
index 33e8253c0ab4b0bc5f1b7196c47674b7775a1dc8..96004162c40352d89341768e7122ac38f7a9cab9 100644
--- a/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.hxx
+++ b/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.hxx
@@ -65,16 +65,19 @@ MPIVrtWriter<TImage>::SetFileName(const char* extendedFileName)
{
if (m_Filename.compare(extendedFileName) != 0 )
{
- m_Filename = std::string(extendedFileName);
- this->Modified();
+ this->SetFileName(std::string(extendedFileName));
}
}
template <typename TImage>
void
-MPIVrtWriter<TImage>::SetFileName(std::string extendedFileName)
+MPIVrtWriter<TImage>::SetFileName(const std::string& extendedFileName)
{
- this->SetFileName(extendedFileName.c_str());
+ if (m_Filename.compare(extendedFileName) != 0 )
+ {
+ m_Filename = extendedFileName;
+ this->Modified();
+ }
}
template <typename TImage>
diff --git a/Modules/OBIA/RCC8/test/CMakeLists.txt b/Modules/OBIA/RCC8/test/CMakeLists.txt
index f6a75cc2b05010e94c49b90bd5f1df276bbc3781..f3196766b26de9e0b8aa6a763134e1b693bef6d3 100644
--- a/Modules/OBIA/RCC8/test/CMakeLists.txt
+++ b/Modules/OBIA/RCC8/test/CMakeLists.txt
@@ -22,29 +22,17 @@ otb_module_test()
set(OTBRCC8Tests
otbRCC8TestDriver.cxx
-otbRCC8GraphNew.cxx
otbRCC8GraphFileReader.cxx
otbRCC8GraphIOEndToEnd.cxx
otbPolygonListToRCC8GraphFilter.cxx
otbRCC8VertexBase.cxx
-otbRCC8GraphFileReaderNew.cxx
-otbRCC8VertexWithCompacityNew.cxx
-otbImageMultiSegmentationToRCC8GraphFilterNew.cxx
-otbRCC8GraphFileWriterNew.cxx
otbPolygonToPolygonRCC8Calculator.cxx
-otbImageListToRCC8GraphFilterNew.cxx
otbImageToImageRCC8Calculator.cxx
otbRCC8Edge.cxx
-otbPolygonListToRCC8GraphFilterNew.cxx
otbRCC8VertexWithCompacity.cxx
-otbRCC8EdgeNew.cxx
-otbPolygonToPolygonRCC8CalculatorNew.cxx
-otbRCC8VertexBaseNew.cxx
otbRCC8Graph.cxx
-otbRCC8GraphSourceNew.cxx
otbRCC8GraphFileWriter.cxx
otbImageMultiSegmentationToRCC8GraphFilter.cxx
-otbImageToImageRCC8CalculatorNew.cxx
)
add_executable(otbRCC8TestDriver ${OTBRCC8Tests})
@@ -53,9 +41,6 @@ otb_module_target_label(otbRCC8TestDriver)
# Tests Declaration
-otb_add_test(NAME srTuRCC8GraphNew COMMAND otbRCC8TestDriver
- otbRCC8GraphNew)
-
otb_add_test(NAME srTvRCC8GraphFileReader COMMAND otbRCC8TestDriver
otbRCC8GraphFileReader
${TEMP}/srRCC8GraphWriterOutput1.dot
@@ -84,18 +69,6 @@ otb_add_test(NAME srTvRCC8VertexBase COMMAND otbRCC8TestDriver
5
)
-otb_add_test(NAME srTuRCC8GraphFileReaderNew COMMAND otbRCC8TestDriver
- otbRCC8GraphFileReaderNew)
-
-otb_add_test(NAME srTuRCC8VertexWithCompacityNew COMMAND otbRCC8TestDriver
- otbRCC8VertexWithCompacityNew)
-
-otb_add_test(NAME srTuMultiSegToRCC8GraphFilterNew COMMAND otbRCC8TestDriver
- otbImageMultiSegmentationToRCC8GraphFilterNew)
-
-otb_add_test(NAME srTuRCC8GraphFileWriterNew COMMAND otbRCC8TestDriver
- otbRCC8GraphFileWriterNew)
-
otb_add_test(NAME srTvPolygonRCC8Calculator COMMAND otbRCC8TestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/srRCC8PolygonToPolygonCalculatorOutput.txt
@@ -109,9 +82,6 @@ otb_add_test(NAME srTvPolygonRCC8Calculator COMMAND otbRCC8TestDriver
${INPUTDATA}/rcc8_mire4.png
)
-otb_add_test(NAME srTuImageListToRCC8GraphFilterNew COMMAND otbRCC8TestDriver
- otbImageListToRCC8GraphFilterNew)
-
otb_add_test(NAME srTvRCC8Calculator COMMAND otbRCC8TestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/srRCC8CalculatorOutput.txt
@@ -129,9 +99,6 @@ otb_add_test(NAME srTvRCC8Edge COMMAND otbRCC8TestDriver
otbRCC8Edge
)
-otb_add_test(NAME srTuPolygonListToRCC8GraphFilterNew COMMAND otbRCC8TestDriver
- otbPolygonListToRCC8GraphFilterNew)
-
otb_add_test(NAME srTvRCC8VertexWithCompacity COMMAND otbRCC8TestDriver
otbRCC8VertexWithCompacity
5
@@ -139,22 +106,10 @@ otb_add_test(NAME srTvRCC8VertexWithCompacity COMMAND otbRCC8TestDriver
0.125354
)
-otb_add_test(NAME srTuRCC8EdgeNew COMMAND otbRCC8TestDriver
- otbRCC8EdgeNew)
-
-otb_add_test(NAME srTuPolygonRCC8CalculatorNew COMMAND otbRCC8TestDriver
- otbPolygonToPolygonRCC8CalculatorNew)
-
-otb_add_test(NAME srTuRCC8VertexBaseNew COMMAND otbRCC8TestDriver
- otbRCC8VertexBaseNew)
-
otb_add_test(NAME srTvRCC8Graph COMMAND otbRCC8TestDriver
otbRCC8Graph
)
-otb_add_test(NAME srTuRCC8GraphSourceNew COMMAND otbRCC8TestDriver
- otbRCC8GraphSourceNew)
-
otb_add_test(NAME srTvRCC8GraphFileWriter COMMAND otbRCC8TestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/srRCC8GraphWriterOutput1.dot
@@ -213,6 +168,3 @@ otb_add_test(NAME srTvMultiSegToRCC8GraphFilter1WithOpti COMMAND otbRCC8TestDriv
${INPUTDATA}/Seg2InputForRCC8Graph.tif
)
-otb_add_test(NAME srTuRCC8CalculatorNew COMMAND otbRCC8TestDriver
- otbImageToImageRCC8CalculatorNew)
-
diff --git a/Modules/OBIA/RCC8/test/otbImageListToRCC8GraphFilterNew.cxx b/Modules/OBIA/RCC8/test/otbImageListToRCC8GraphFilterNew.cxx
deleted file mode 100644
index 8a7d5170c44a0df1002ced8d0f97a79bc44e1e88..0000000000000000000000000000000000000000
--- a/Modules/OBIA/RCC8/test/otbImageListToRCC8GraphFilterNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbRCC8Graph.h"
-#include "otbRCC8VertexBase.h"
-#include "otbImageListToRCC8GraphFilter.h"
-#include "otbPolygon.h"
-
-int otbImageListToRCC8GraphFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned short LabelPixelType;
- typedef otb::Polygon<> PathType;
- typedef otb::Image<LabelPixelType, Dimension> LabelImageType;
- typedef otb::RCC8VertexBase<PathType> VertexType;
- typedef otb::RCC8Graph<VertexType> RCC8GraphType;
- typedef otb::ImageListToRCC8GraphFilter<LabelImageType, RCC8GraphType>
- ImageListToRCC8GraphFilterType;
-
- // Instantiation
- ImageListToRCC8GraphFilterType::Pointer filter = ImageListToRCC8GraphFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/OBIA/RCC8/test/otbImageMultiSegmentationToRCC8GraphFilterNew.cxx b/Modules/OBIA/RCC8/test/otbImageMultiSegmentationToRCC8GraphFilterNew.cxx
deleted file mode 100644
index 4234789358e145819481a6c913efb9573a11d9de..0000000000000000000000000000000000000000
--- a/Modules/OBIA/RCC8/test/otbImageMultiSegmentationToRCC8GraphFilterNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbRCC8Graph.h"
-#include "otbRCC8VertexBase.h"
-#include "otbPolygon.h"
-#include "otbImageMultiSegmentationToRCC8GraphFilter.h"
-
-int otbImageMultiSegmentationToRCC8GraphFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned short LabelPixelType;
- typedef otb::Polygon<> PolygonType;
- typedef otb::Image<LabelPixelType, Dimension> LabelImageType;
- typedef otb::RCC8VertexBase<PolygonType> VertexType;
- typedef otb::RCC8Graph<VertexType> RCC8GraphType;
- typedef otb::ImageMultiSegmentationToRCC8GraphFilter<LabelImageType, RCC8GraphType>
- RCC8GraphFilterType;
-
- // Instantiation
- RCC8GraphFilterType::Pointer filter = RCC8GraphFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/OBIA/RCC8/test/otbImageToImageRCC8CalculatorNew.cxx b/Modules/OBIA/RCC8/test/otbImageToImageRCC8CalculatorNew.cxx
deleted file mode 100644
index bfcb4cdfd3eebc59f4d956e615be6474633b2d35..0000000000000000000000000000000000000000
--- a/Modules/OBIA/RCC8/test/otbImageToImageRCC8CalculatorNew.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbImageToImageRCC8Calculator.h"
-
-int otbImageToImageRCC8CalculatorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- // const unsigned int Dimension = 2;
- // typedef unsigned char PixelType;
- // typedef otb::Image<PixelType, Dimension> ImageType;
- // typedef otb::ImageToImageRCC8Calculator<ImageType> CalculatorType;
-
- // //Instantiation
- // CalculatorType::Pointer calc = CalculatorType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/OBIA/RCC8/test/otbPolygonListToRCC8GraphFilterNew.cxx b/Modules/OBIA/RCC8/test/otbPolygonListToRCC8GraphFilterNew.cxx
deleted file mode 100644
index 9032836588d9efe761123a7f2941224463c934b1..0000000000000000000000000000000000000000
--- a/Modules/OBIA/RCC8/test/otbPolygonListToRCC8GraphFilterNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbRCC8Graph.h"
-#include "otbPolygon.h"
-#include "otbObjectList.h"
-#include "otbRCC8VertexBase.h"
-#include "otbPolygonListToRCC8GraphFilter.h"
-
-int otbPolygonListToRCC8GraphFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- // typedefs
- typedef otb::Polygon<> PolygonType;
- typedef otb::ObjectList<PolygonType> PolygonListType;
- typedef otb::RCC8VertexBase<PolygonType> VertexType;
- typedef otb::RCC8Graph<VertexType> RCC8GraphType;
- typedef otb::PolygonListToRCC8GraphFilter<PolygonListType, RCC8GraphType>
- RCC8GraphFilterType;
-
- // Instantiation
- RCC8GraphFilterType::Pointer filter = RCC8GraphFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/OBIA/RCC8/test/otbPolygonToPolygonRCC8CalculatorNew.cxx b/Modules/OBIA/RCC8/test/otbPolygonToPolygonRCC8CalculatorNew.cxx
deleted file mode 100644
index 745f6056b6fcba898f78db5a16b06385438043f0..0000000000000000000000000000000000000000
--- a/Modules/OBIA/RCC8/test/otbPolygonToPolygonRCC8CalculatorNew.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbPolygonToPolygonRCC8Calculator.h"
-#include "otbPolygon.h"
-
-int otbPolygonToPolygonRCC8CalculatorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Polygon<> PolygonType;
- typedef otb::PolygonToPolygonRCC8Calculator<PolygonType> CalculatorType;
-
- //Instantiation
- CalculatorType::Pointer calc = CalculatorType::New();
-
- std::cout << calc << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/OBIA/RCC8/test/otbRCC8EdgeNew.cxx b/Modules/OBIA/RCC8/test/otbRCC8EdgeNew.cxx
deleted file mode 100644
index 9e21c5bcbedd76adef871cb25fe5fa67d031404a..0000000000000000000000000000000000000000
--- a/Modules/OBIA/RCC8/test/otbRCC8EdgeNew.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbRCC8Edge.h"
-#include <cstdlib>
-
-int otbRCC8EdgeNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::RCC8Edge RCC8EdgeType;
-
- // Instantiation
- RCC8EdgeType::Pointer rcc8 = RCC8EdgeType::New();
-
- std::cout << rcc8 << std::endl;
- return EXIT_SUCCESS;
-}
diff --git a/Modules/OBIA/RCC8/test/otbRCC8GraphFileReaderNew.cxx b/Modules/OBIA/RCC8/test/otbRCC8GraphFileReaderNew.cxx
deleted file mode 100644
index 8355109a0b90cec44714214d13dffb222ebbb149..0000000000000000000000000000000000000000
--- a/Modules/OBIA/RCC8/test/otbRCC8GraphFileReaderNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbRCC8Graph.h"
-#include "otbRCC8VertexBase.h"
-#include "otbRCC8GraphFileReader.h"
-#include "otbPolygon.h"
-
-int otbRCC8GraphFileReaderNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Polygon<> PathType;
- typedef otb::RCC8VertexBase<PathType> VertexType;
- typedef otb::RCC8Graph<VertexType> RCC8GraphType;
- typedef otb::RCC8GraphFileReader<RCC8GraphType> RCC8GraphFileReaderType;
-
- // Instantiation
- RCC8GraphFileReaderType::Pointer rcc8GraphReader = RCC8GraphFileReaderType::New();
-
- std::cout << rcc8GraphReader << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/OBIA/RCC8/test/otbRCC8GraphFileWriterNew.cxx b/Modules/OBIA/RCC8/test/otbRCC8GraphFileWriterNew.cxx
deleted file mode 100644
index d7b174674285958137dc1a27d6df929c0556dd75..0000000000000000000000000000000000000000
--- a/Modules/OBIA/RCC8/test/otbRCC8GraphFileWriterNew.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbRCC8VertexBase.h"
-#include "otbRCC8GraphFileWriter.h"
-#include "otbPolygon.h"
-
-int otbRCC8GraphFileWriterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Polygon<> PathType;
- typedef otb::RCC8VertexBase<PathType> VertexType;
- typedef otb::RCC8Graph<VertexType> RCC8GraphType;
- typedef otb::RCC8GraphFileWriter<RCC8GraphType> RCC8GraphFileWriterType;
-
- // Instantiation
- RCC8GraphFileWriterType::Pointer rcc8GraphWriter = RCC8GraphFileWriterType::New();
-
- std::cout << rcc8GraphWriter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/OBIA/RCC8/test/otbRCC8GraphNew.cxx b/Modules/OBIA/RCC8/test/otbRCC8GraphNew.cxx
deleted file mode 100644
index 451b2251c0c81dcead6b070802f3652576994c6e..0000000000000000000000000000000000000000
--- a/Modules/OBIA/RCC8/test/otbRCC8GraphNew.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbRCC8Graph.h"
-#include "otbRCC8VertexBase.h"
-#include "otbPolygon.h"
-
-int otbRCC8GraphNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Polygon<> PathType;
- typedef otb::RCC8VertexBase<PathType> VertexType;
- typedef otb::RCC8Graph<VertexType> RCC8GraphType;
-
- // Instantiation
- RCC8GraphType::Pointer rcc8Graph = RCC8GraphType::New();
-
- std::cout << rcc8Graph << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/OBIA/RCC8/test/otbRCC8GraphSourceNew.cxx b/Modules/OBIA/RCC8/test/otbRCC8GraphSourceNew.cxx
deleted file mode 100644
index ad0a367c00522e5153dcec7a3e19229673e65006..0000000000000000000000000000000000000000
--- a/Modules/OBIA/RCC8/test/otbRCC8GraphSourceNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbRCC8Graph.h"
-#include "otbRCC8GraphSource.h"
-#include "otbRCC8VertexBase.h"
-#include "otbPolygon.h"
-
-int otbRCC8GraphSourceNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Polygon<> PathType;
- typedef otb::RCC8VertexBase<PathType> VertexType;
- typedef otb::RCC8Graph<VertexType> RCC8GraphType;
- typedef otb::RCC8GraphSource<RCC8GraphType> RCC8GraphSourceType;
-
- // Instantiation
- RCC8GraphSourceType::Pointer rcc8GraphSource = RCC8GraphSourceType::New();
-
- std::cout << rcc8GraphSource << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/OBIA/RCC8/test/otbRCC8TestDriver.cxx b/Modules/OBIA/RCC8/test/otbRCC8TestDriver.cxx
index 1c5b0f7cfc7f4ba01593d904dc7e6572ab0be757..7f92b7fc8c5896bcb8448ff281b517f9c954e96e 100644
--- a/Modules/OBIA/RCC8/test/otbRCC8TestDriver.cxx
+++ b/Modules/OBIA/RCC8/test/otbRCC8TestDriver.cxx
@@ -22,27 +22,15 @@
void RegisterTests()
{
- REGISTER_TEST(otbRCC8GraphNew);
REGISTER_TEST(otbRCC8GraphFileReader);
REGISTER_TEST(otbRCC8GraphIOEndToEnd);
REGISTER_TEST(otbPolygonListToRCC8GraphFilter);
REGISTER_TEST(otbRCC8VertexBase);
- REGISTER_TEST(otbRCC8GraphFileReaderNew);
- REGISTER_TEST(otbRCC8VertexWithCompacityNew);
- REGISTER_TEST(otbImageMultiSegmentationToRCC8GraphFilterNew);
- REGISTER_TEST(otbRCC8GraphFileWriterNew);
REGISTER_TEST(otbPolygonToPolygonRCC8Calculator);
- REGISTER_TEST(otbImageListToRCC8GraphFilterNew);
REGISTER_TEST(otbImageToImageRCC8Calculator);
REGISTER_TEST(otbRCC8Edge);
- REGISTER_TEST(otbPolygonListToRCC8GraphFilterNew);
REGISTER_TEST(otbRCC8VertexWithCompacity);
- REGISTER_TEST(otbRCC8EdgeNew);
- REGISTER_TEST(otbPolygonToPolygonRCC8CalculatorNew);
- REGISTER_TEST(otbRCC8VertexBaseNew);
REGISTER_TEST(otbRCC8Graph);
- REGISTER_TEST(otbRCC8GraphSourceNew);
REGISTER_TEST(otbRCC8GraphFileWriter);
REGISTER_TEST(otbImageMultiSegmentationToRCC8GraphFilter);
- REGISTER_TEST(otbImageToImageRCC8CalculatorNew);
}
diff --git a/Modules/OBIA/RCC8/test/otbRCC8VertexBaseNew.cxx b/Modules/OBIA/RCC8/test/otbRCC8VertexBaseNew.cxx
deleted file mode 100644
index 4e237b4f397280b222490a049920766cd35864bc..0000000000000000000000000000000000000000
--- a/Modules/OBIA/RCC8/test/otbRCC8VertexBaseNew.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbRCC8VertexBase.h"
-#include "otbPolygon.h"
-
-int otbRCC8VertexBaseNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Polygon<> PathType;
- typedef otb::RCC8VertexBase<PathType> RCC8VertexType;
-
- // Instantiation
- RCC8VertexType::Pointer rcc8Vertex = RCC8VertexType::New();
-
- std::cout << rcc8Vertex << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/OBIA/RCC8/test/otbRCC8VertexWithCompacityNew.cxx b/Modules/OBIA/RCC8/test/otbRCC8VertexWithCompacityNew.cxx
deleted file mode 100644
index 6f1fc9da1fe3f1dfb08e0ad55ccee909a84e8195..0000000000000000000000000000000000000000
--- a/Modules/OBIA/RCC8/test/otbRCC8VertexWithCompacityNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "otbRCC8VertexWithCompacity.h"
-#include "otbPolygon.h"
-
-int otbRCC8VertexWithCompacityNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Polygon<> PathType;
- typedef float PrecisionType;
- typedef otb::RCC8VertexWithCompacity<PathType, PrecisionType> RCC8VertexType;
-
- // Instantiation
- RCC8VertexType::Pointer rcc8Vertex = RCC8VertexType::New();
-
- std::cout << rcc8Vertex << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/Indices/test/CMakeLists.txt b/Modules/Radiometry/Indices/test/CMakeLists.txt
index 004e368c9b36194d654d5cc804345d1e130cf802..bd0647a6b0643439cab058144c5b71b8213b4f32 100644
--- a/Modules/Radiometry/Indices/test/CMakeLists.txt
+++ b/Modules/Radiometry/Indices/test/CMakeLists.txt
@@ -22,11 +22,8 @@ otb_module_test()
set(OTBIndicesTests
otbIndicesTestDriver.cxx
-otbRAndGAndNIRVegetationIndexImageFilterNew.cxx
otbAVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx
otbNDVIDataNodeFeatureFunction.cxx
-otbRAndNIRVegetationIndexImageFilterNew.cxx
-otbMultiChannelRAndBAndNIRVegetationIndexImageFilterNew.cxx
otbLandsatTMIndexNDSITest.cxx
otbLandsatTMIndexBIOTest.cxx
otbLAIFromReflectancesLinearFunctorTest.cxx
@@ -42,10 +39,8 @@ otbLAIFromNDVILogarithmicFunctorTest.cxx
otbMultiChannelRAndNIRVegetationIndexImageFilter.cxx
otbLandsatTMIndexVisTest.cxx
otbWaterSqrtSpectralAngleImageFilter.cxx
-otbMultiChannelRAndGAndNIRIndexImageFilterNew.cxx
otbLandsatTMIndexBrightTest.cxx
otbMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
-otbMultiChannelRAndNIRVegetationIndexImageFilterNew.cxx
otbLandsatTMBrightTest.cxx
otbLandsatTMThinCloudTest.cxx
otbISUMultiChannelRAndNIRIndexImageFilter.cxx
@@ -59,10 +54,8 @@ otbEVIRAndBAndNIRVegetationIndexImageFilter.cxx
otbNDBITM4AndTM5IndexImageFilter.cxx
otbLandsatTMIndexNDBBBITest.cxx
otbIBGAndRAndNIRIndexImageFilter.cxx
-otbGAndRIndexImageFilterNew.cxx
otbEVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
otbNDBIMultiChannelTM4AndTM5IndexImageFilter.cxx
-otbMultiChannelGAndRIndexImageFilterNew.cxx
otbNDWIWaterIndexImageFilter.cxx
otbLandsatTMIndexTIRTest.cxx
otbTSARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
@@ -70,7 +63,6 @@ otbLandsatTMLinguisticLabelsTest.cxx
otbNDWIMultiChannelWaterIndexImageFilter.cxx
otbWDVIMultiChannelRAndNIRVegetationIndexImageFilter.cxx
otbLandsatTMIndexNDSIVisTest.cxx
-otbRAndBAndNIRVegetationIndexImageFilterNew.cxx
otbLandsatTMIndexNIRTest.cxx
otbSetASetBRAndNIRVegetationIndexImageFilter.cxx
otbLandsatTMKernelSpectralRules.cxx
@@ -85,9 +77,6 @@ otb_module_target_label(otbIndicesTestDriver)
# Tests Declaration
-otb_add_test(NAME raTuRAndGAndNIRVegetationIndexImageFilterNew COMMAND otbIndicesTestDriver
- otbRAndGAndNIRVegetationIndexImageFilterNew )
-
otb_add_test(NAME raTvAVI_MultiChannelRAndGAndNIRVegetationIndexImageFilter COMMAND otbIndicesTestDriver
--compare-image ${EPSILON_12} ${BASELINE}/raMultiChannelRAndGAndNIRVegetationIndex_AVI_qb_RoadExtract.tif
${TEMP}/raMultiChannelRAndGAndNIRVegetationIndex_AVI_qb_RoadExtract.tif
@@ -126,15 +115,6 @@ otb_add_test(NAME bfTvNDVIDataNodeFeatureFunction_Line COMMAND otbIndicesTestDri
0
)
-otb_add_test(NAME bfTuNDVIDataNodeFeatureFunctionNew COMMAND otbIndicesTestDriver
- otbNDVIDataNodeFeatureFunctionNew
- )
-
-otb_add_test(NAME raTuRAndNIRVegetationIndexImageFilterNew COMMAND otbIndicesTestDriver
- otbRAndNIRVegetationIndexImageFilterNew )
-
-otb_add_test(NAME raTuMultiChannelRAndBAndNIRVegetationIndexImageFilterNew COMMAND otbIndicesTestDriver
- otbMultiChannelRAndBAndNIRVegetationIndexImageFilterNew )
otb_add_test(NAME raTvLandsatTMIndexNDSITest COMMAND otbIndicesTestDriver
otbLandsatTMIndexNDSI
@@ -317,9 +297,6 @@ otb_add_test(NAME raTvWaterSqrtSpectralAngleImageFilter COMMAND otbIndicesTestDr
0 1 2 3
)
-otb_add_test(NAME raTuMultiChannelRAndGAndNIRIndexImageFilterNew COMMAND otbIndicesTestDriver
- otbMultiChannelRAndGAndNIRIndexImageFilterNew )
-
otb_add_test(NAME raTvLandsatTMIndexBrightTest COMMAND otbIndicesTestDriver
otbLandsatTMIndexBright
3 #TM1
@@ -585,9 +562,6 @@ otb_add_test(NAME raTvIB2_GAndRAndNIRIndexImageFilter COMMAND otbIndicesTestDriv
${TEMP}/raGAndRAndNIRIndexImageFilter_IB2_verySmallFSATSW.tif
)
-otb_add_test(NAME raTuGAndRIndexImageFilterNew COMMAND otbIndicesTestDriver
- otbGAndRIndexImageFilterNew )
-
otb_add_test(NAME raTvEVI_MultiChannelRAndBAndNIRVegetationIndexImageFilter COMMAND otbIndicesTestDriver
--compare-image ${EPSILON_12} ${BASELINE}/raRAndBAndNIRVegetationIndex_EVI_qb_RoadExtract.tif
${TEMP}/raRAndBAndNIRVegetationIndex_EVI_qb_RoadExtract.tif
@@ -614,9 +588,6 @@ otb_add_test(NAME raTvNDBI_MultiChannelTM4AndTM5BuiltUpIndexImageFilter COMMAND
4 # nir
)
-otb_add_test(NAME raTuMultiChannelGAndRIndexImageFilterNew COMMAND otbIndicesTestDriver
- otbMultiChannelGAndRIndexImageFilterNew )
-
otb_add_test(NAME raTvNDWI_WaterIndexImageFilter COMMAND otbIndicesTestDriver
--compare-image ${EPSILON_12} ${BASELINE}/raWaterIndex_NDWI_verySmallFSATSW.tif
${TEMP}/raWaterIndex_NDWI_verySmallFSATSW.tif
@@ -709,9 +680,6 @@ otb_add_test(NAME raTvLandsatTMIndexNDSIVisTest COMMAND otbIndicesTestDriver
21 #TM7
)
-otb_add_test(NAME raTuRAndBAndNIRVegetationIndexImageFilterNew COMMAND otbIndicesTestDriver
- otbRAndBAndNIRVegetationIndexImageFilterNew )
-
otb_add_test(NAME raTvLandsatTMIndexNIRTest COMMAND otbIndicesTestDriver
otbLandsatTMIndexNIR
3 #TM1
diff --git a/Modules/Radiometry/Indices/test/otbGAndRIndexImageFilterNew.cxx b/Modules/Radiometry/Indices/test/otbGAndRIndexImageFilterNew.cxx
deleted file mode 100644
index 5715971ddfd1636f08d8467d2efc7d1b60d1ca41..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/Indices/test/otbGAndRIndexImageFilterNew.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "itkMacro.h"
-
-#include "otbGAndRIndexImageFilter.h"
-#include "otbImage.h"
-#include "otbImage.h"
-
-int otbGAndRIndexImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
- typedef otb::Image<PixelType, Dimension> InputGImageType;
- typedef otb::Image<PixelType, Dimension> InputRImageType;
- typedef otb::Image<PixelType, Dimension> OutputImageType;
-
- typedef otb::GAndRIndexImageFilter<InputGImageType, InputRImageType, OutputImageType> GAndRIndexImageFilterType;
-
- // Instantiating object
- GAndRIndexImageFilterType::Pointer filter = GAndRIndexImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/Indices/test/otbIndicesTestDriver.cxx b/Modules/Radiometry/Indices/test/otbIndicesTestDriver.cxx
index 4bcd12bee68fdf5e3668abed72bcf14a27107b0c..6acf5afc3eca347c07aba2efc2937566c0e81dfe 100644
--- a/Modules/Radiometry/Indices/test/otbIndicesTestDriver.cxx
+++ b/Modules/Radiometry/Indices/test/otbIndicesTestDriver.cxx
@@ -22,12 +22,8 @@
void RegisterTests()
{
- REGISTER_TEST(otbRAndGAndNIRVegetationIndexImageFilterNew);
REGISTER_TEST(otbAVIMultiChannelRAndGAndNIRVegetationIndexImageFilter);
- REGISTER_TEST(otbNDVIDataNodeFeatureFunctionNew);
REGISTER_TEST(otbNDVIDataNodeFeatureFunction);
- REGISTER_TEST(otbRAndNIRVegetationIndexImageFilterNew);
- REGISTER_TEST(otbMultiChannelRAndBAndNIRVegetationIndexImageFilterNew);
REGISTER_TEST(otbLandsatTMIndexNDSI);
REGISTER_TEST(otbLandsatTMIndexBIO);
REGISTER_TEST(otbLAIFromReflectancesLinear);
@@ -43,10 +39,8 @@ void RegisterTests()
REGISTER_TEST(otbMultiChannelRAndNIRVegetationIndexImageFilter);
REGISTER_TEST(otbLandsatTMIndexVis);
REGISTER_TEST(otbWaterSqrtSpectralAngleImageFilter);
- REGISTER_TEST(otbMultiChannelRAndGAndNIRIndexImageFilterNew);
REGISTER_TEST(otbLandsatTMIndexBright);
REGISTER_TEST(otbMultiChannelRAndBAndNIRVegetationIndexImageFilter);
- REGISTER_TEST(otbMultiChannelRAndNIRVegetationIndexImageFilterNew);
REGISTER_TEST(otbLandsatTMBrightTest);
REGISTER_TEST(otbLandsatTMThinCloudTest);
REGISTER_TEST(otbISUMultiChannelRAndNIRIndexImageFilter);
@@ -60,10 +54,8 @@ void RegisterTests()
REGISTER_TEST(otbNDBITM4AndTM5IndexImageFilter);
REGISTER_TEST(otbLandsatTMIndexNDBBBI);
REGISTER_TEST(otbIBGAndRAndNIRIndexImageFilter);
- REGISTER_TEST(otbGAndRIndexImageFilterNew);
REGISTER_TEST(otbEVIMultiChannelRAndBAndNIRVegetationIndexImageFilter);
REGISTER_TEST(otbNDBIMultiChannelTM4AndTM5IndexImageFilter);
- REGISTER_TEST(otbMultiChannelGAndRIndexImageFilterNew);
REGISTER_TEST(otbNDWIWaterIndexImageFilter);
REGISTER_TEST(otbLandsatTMIndexTIR);
REGISTER_TEST(otbTSARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter);
@@ -71,7 +63,6 @@ void RegisterTests()
REGISTER_TEST(otbNDWIMultiChannelWaterIndexImageFilter);
REGISTER_TEST(otbWDVIMultiChannelRAndNIRVegetationIndexImageFilter);
REGISTER_TEST(otbLandsatTMIndexNDSIVis);
- REGISTER_TEST(otbRAndBAndNIRVegetationIndexImageFilterNew);
REGISTER_TEST(otbLandsatTMIndexNIR);
REGISTER_TEST(otbSetASetBRAndNIRVegetationIndexImageFilter);
REGISTER_TEST(otbLandsatTMKernelSpectralRules);
diff --git a/Modules/Radiometry/Indices/test/otbMultiChannelGAndRIndexImageFilterNew.cxx b/Modules/Radiometry/Indices/test/otbMultiChannelGAndRIndexImageFilterNew.cxx
deleted file mode 100644
index 1a2d63e7503721ee9da7ffbcf59548dd15773c7c..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/Indices/test/otbMultiChannelGAndRIndexImageFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbMultiChannelGAndRIndexImageFilter.h"
-#include "otbImage.h"
-#include "otbVectorImage.h"
-
-int otbMultiChannelGAndRIndexImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef otb::VectorImage<unsigned char, Dimension> InputImageType;
- typedef otb::Image<float, Dimension> OutputImageType;
- typedef otb::MultiChannelGAndRIndexImageFilter<InputImageType, OutputImageType> MultiChannelGAndRIndexImageFilterType;
-
- // Instantiating object
- MultiChannelGAndRIndexImageFilterType::Pointer filter = MultiChannelGAndRIndexImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/Indices/test/otbMultiChannelRAndBAndNIRVegetationIndexImageFilterNew.cxx b/Modules/Radiometry/Indices/test/otbMultiChannelRAndBAndNIRVegetationIndexImageFilterNew.cxx
deleted file mode 100644
index a7cd686f236182655eb8f74551f60b52b41acf7a..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/Indices/test/otbMultiChannelRAndBAndNIRVegetationIndexImageFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbMultiChannelRAndBAndNIRIndexImageFilter.h"
-#include "otbImage.h"
-#include "otbVectorImage.h"
-
-int otbMultiChannelRAndBAndNIRVegetationIndexImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef otb::VectorImage<unsigned char, Dimension> InputImageType;
- typedef otb::Image<float, Dimension> OutputImageType;
- typedef otb::MultiChannelRAndBAndNIRIndexImageFilter<InputImageType,
- OutputImageType> MultiChannelRAndBAndNIRIndexImageFilterType;
-
- // Instantiating object
- MultiChannelRAndBAndNIRIndexImageFilterType::Pointer filter = MultiChannelRAndBAndNIRIndexImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/Indices/test/otbMultiChannelRAndGAndNIRIndexImageFilterNew.cxx b/Modules/Radiometry/Indices/test/otbMultiChannelRAndGAndNIRIndexImageFilterNew.cxx
deleted file mode 100644
index 4894caf68193a1506e35131f277338c67f7be176..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/Indices/test/otbMultiChannelRAndGAndNIRIndexImageFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbMultiChannelRAndGAndNIRIndexImageFilter.h"
-#include "otbImage.h"
-#include "otbVectorImage.h"
-
-int otbMultiChannelRAndGAndNIRIndexImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef otb::VectorImage<unsigned char, Dimension> InputImageType;
- typedef otb::Image<float, Dimension> OutputImageType;
- typedef otb::MultiChannelRAndGAndNIRIndexImageFilter<InputImageType,
- OutputImageType> MultiChannelRAndGAndNIRIndexImageFilterType;
-
- // Instantiating object
- MultiChannelRAndGAndNIRIndexImageFilterType::Pointer filter = MultiChannelRAndGAndNIRIndexImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/Indices/test/otbMultiChannelRAndNIRVegetationIndexImageFilterNew.cxx b/Modules/Radiometry/Indices/test/otbMultiChannelRAndNIRVegetationIndexImageFilterNew.cxx
deleted file mode 100644
index 4f2522eba862c129ec2e785ea7cf3207ae5ba6e0..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/Indices/test/otbMultiChannelRAndNIRVegetationIndexImageFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbMultiChannelRAndNIRIndexImageFilter.h"
-#include "otbImage.h"
-#include "otbVectorImage.h"
-
-int otbMultiChannelRAndNIRVegetationIndexImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef otb::VectorImage<unsigned char, Dimension> InputImageType;
- typedef otb::Image<float, Dimension> OutputImageType;
- typedef otb::MultiChannelRAndNIRIndexImageFilter<InputImageType,
- OutputImageType> MultiChannelRAndNIRIndexImageFilterType;
-
- // Instantiating object
- MultiChannelRAndNIRIndexImageFilterType::Pointer filter = MultiChannelRAndNIRIndexImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/Indices/test/otbNDVIDataNodeFeatureFunction.cxx b/Modules/Radiometry/Indices/test/otbNDVIDataNodeFeatureFunction.cxx
index 545827b1b8d70600c44b7e71b745b502cd1b0351..fcf9e38db78b80acb545e9e1adc9b84321892411 100644
--- a/Modules/Radiometry/Indices/test/otbNDVIDataNodeFeatureFunction.cxx
+++ b/Modules/Radiometry/Indices/test/otbNDVIDataNodeFeatureFunction.cxx
@@ -30,20 +30,6 @@
#include "otbVectorDataFileWriter.h"
#include "itkPreOrderTreeIterator.h"
-int otbNDVIDataNodeFeatureFunctionNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
- typedef double CoordRepType;
- typedef double PrecisionType;
- typedef otb::VectorImage<double, 2> ImageType;
- typedef otb::NDVIDataNodeFeatureFunction<ImageType, CoordRepType, PrecisionType>
- NDVIDataNodeFeaturefunctionType;
-
- NDVIDataNodeFeaturefunctionType::Pointer NDVIFeature = NDVIDataNodeFeaturefunctionType::New();
-
- std::cout << NDVIFeature << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbNDVIDataNodeFeatureFunction(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/Radiometry/Indices/test/otbRAndBAndNIRVegetationIndexImageFilterNew.cxx b/Modules/Radiometry/Indices/test/otbRAndBAndNIRVegetationIndexImageFilterNew.cxx
deleted file mode 100644
index 2ccfc44039db4b9f3a249e2c5af9523502ba9874..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/Indices/test/otbRAndBAndNIRVegetationIndexImageFilterNew.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "itkMacro.h"
-
-#include "otbRAndBAndNIRIndexImageFilter.h"
-#include "otbImage.h"
-
-int otbRAndBAndNIRVegetationIndexImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
- typedef otb::Image<PixelType, Dimension> InputRImageType;
- typedef otb::Image<PixelType, Dimension> InputBImageType;
- typedef otb::Image<PixelType, Dimension> InputNIRImageType;
- typedef otb::Image<PixelType, Dimension> OutputImageType;
-
- typedef otb::RAndBAndNIRIndexImageFilter<InputRImageType, InputBImageType, InputNIRImageType,
- OutputImageType> RAndBAndNIRIndexImageFilterType;
-
- // Instantiating object
- RAndBAndNIRIndexImageFilterType::Pointer filter = RAndBAndNIRIndexImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/Indices/test/otbRAndGAndNIRVegetationIndexImageFilterNew.cxx b/Modules/Radiometry/Indices/test/otbRAndGAndNIRVegetationIndexImageFilterNew.cxx
deleted file mode 100644
index eb83caa75b637e70787a7b4eaf248fb33bc1c0b3..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/Indices/test/otbRAndGAndNIRVegetationIndexImageFilterNew.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "itkMacro.h"
-
-#include "otbRAndGAndNIRIndexImageFilter.h"
-#include "otbImage.h"
-
-int otbRAndGAndNIRVegetationIndexImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
- typedef otb::Image<PixelType, Dimension> InputRImageType;
- typedef otb::Image<PixelType, Dimension> InputGImageType;
- typedef otb::Image<PixelType, Dimension> InputNIRImageType;
- typedef otb::Image<PixelType, Dimension> OutputImageType;
-
- typedef otb::RAndGAndNIRIndexImageFilter<InputRImageType, InputGImageType, InputNIRImageType,
- OutputImageType> RAndGAndNIRIndexImageFilterType;
-
- // Instantiating object
- RAndGAndNIRIndexImageFilterType::Pointer filter = RAndGAndNIRIndexImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/Indices/test/otbRAndNIRVegetationIndexImageFilterNew.cxx b/Modules/Radiometry/Indices/test/otbRAndNIRVegetationIndexImageFilterNew.cxx
deleted file mode 100644
index 35fdc00d7bf5ac3ce11f95d877ceadddb8c70577..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/Indices/test/otbRAndNIRVegetationIndexImageFilterNew.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "itkMacro.h"
-
-#include "otbRAndNIRIndexImageFilter.h"
-#include "otbImage.h"
-#include "otbImage.h"
-
-int otbRAndNIRVegetationIndexImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
- typedef otb::Image<PixelType, Dimension> InputRImageType;
- typedef otb::Image<PixelType, Dimension> InputNIRImageType;
- typedef otb::Image<PixelType, Dimension> OutputImageType;
-
- typedef otb::RAndNIRIndexImageFilter<InputRImageType, InputNIRImageType, OutputImageType> RAndNIRIndexImageFilterType;
-
- // Instantiating object
- RAndNIRIndexImageFilterType::Pointer filter = RAndNIRIndexImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/OpticalCalibration/test/CMakeLists.txt b/Modules/Radiometry/OpticalCalibration/test/CMakeLists.txt
index a835c8048cd531fa177fcb8b85743a1580e2bd1b..f5e71af76d8b53a0143c32f9abd367dec07ffe00 100644
--- a/Modules/Radiometry/OpticalCalibration/test/CMakeLists.txt
+++ b/Modules/Radiometry/OpticalCalibration/test/CMakeLists.txt
@@ -24,35 +24,23 @@ set(OTBOpticalCalibrationTests
otbOpticalCalibrationTestDriver.cxx
otbSpectralSensitivityReaderTest.cxx
otbReflectanceToImageImageFilter.cxx
-otbReflectanceToRadianceImageFilterNew.cxx
-otbRadianceToReflectanceImageFilterNew.cxx
otbRadianceToReflectanceImageFilterAuto.cxx
-otbImageToRadianceImageFilterNew.cxx
-otbRadiometryCorrectionParametersToAtmosphericRadiativeTermsNew.cxx
otbRadianceToImageImageFilterAuto.cxx
-otbRadianceToImageImageFilterNew.cxx
otbReflectanceToRadianceImageFilterAuto.cxx
otbAeronetExtractDataBadData.cxx
otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx
-otbSurfaceAdjacencyEffectCorrectionSchemeFilterNew.cxx
otbImageToReflectanceImageFilterAuto.cxx
-otbAtmosphericCorrectionParametersNew.cxx
-otbImageToReflectanceImageFilterNew.cxx
-otbWavelengthSpectralBandsTest.cxx
otbAtmosphericRadiativeTermsTest.cxx
otbImageToReflectanceImageFilter.cxx
otbRadianceToReflectanceImageFilter.cxx
otbReflectanceToImageImageFilterAuto.cxx
-otbAeronetNew.cxx
otbAeronetExtractData.cxx
otbReflectanceToSurfaceReflectanceImageFilterTest.cxx
-otbImageMetadataCorrectionParametersNew.cxx
otbImageToRadianceImageFilterAuto.cxx
otbAtmosphericCorrectionSequencement.cxx
otbSIXSTraitsTest.cxx
otbSIXSTraitsComputeAtmosphericParameters.cxx
-otbReflectanceToImageImageFilterNew.cxx
otbSurfaceAdjacencyEffectCorrectionSchemeFilter.cxx
otbRadianceToImageImageFilter.cxx
otbReflectanceToRadianceImageFilter.cxx
@@ -65,9 +53,6 @@ otb_module_target_label(otbOpticalCalibrationTestDriver)
set_linker_stack_size_flag(otbOpticalCalibrationTestDriver 10000000)
# Tests Declaration
-otb_add_test(NAME raTuSpectralSensitivityReaderNew COMMAND otbOpticalCalibrationTestDriver
- otbSpectralSensitivityReaderNew
- )
otb_add_test(NAME raTvSpectralSensitivityReaderSpot4Test COMMAND otbOpticalCalibrationTestDriver
--compare-ascii ${EPSILON_5}
@@ -170,13 +155,7 @@ otb_add_test(NAME raTvRomaniaReflectanceToImage COMMAND otbOpticalCalibrationTes
0.9889145564708814 #= sqrt(0.977952) d/d0 corresponding to the date 03/05
)
-otb_add_test(NAME raTuReflectanceToRadianceImageFilterNew COMMAND otbOpticalCalibrationTestDriver
- otbReflectanceToRadianceImageFilterNew
- )
-otb_add_test(NAME raTuRadianceToReflectanceImageFilterNew COMMAND otbOpticalCalibrationTestDriver
- otbRadianceToReflectanceImageFilterNew
- )
otb_add_test(NAME raTvRadianceToReflectanceImageFilterAutoQuickbirdPAN COMMAND otbOpticalCalibrationTestDriver
--compare-image ${EPSILON_12} ${BASELINE}/raTvRadianceToReflectanceImageFilterAutoQuickbirdPAN.tif
@@ -234,17 +213,8 @@ otb_add_test(NAME raTvRadianceToReflectanceImageFilterAutoFORMOSAT COMMAND otbOp
${TEMP}/raTvRadianceToReflectanceImageFilterAutoFormosat.img
)
-otb_add_test(NAME raTuImageToRadianceImageFilterNew COMMAND otbOpticalCalibrationTestDriver
- otbImageToRadianceImageFilterNew
- )
-otb_add_test(NAME raTuRadiometryCorrectionParametersToAtmosphericRadiativeTermsNew COMMAND otbOpticalCalibrationTestDriver
- otbRadiometryCorrectionParametersToAtmosphericRadiativeTermsNew)
-
-otb_add_test(NAME raTuRadianceToImageImageFilterNew COMMAND otbOpticalCalibrationTestDriver
- otbRadianceToImageImageFilterNew
- )
#FIXME Those tests have performing local copies of header, baselines...They were migrate "as it" for now in version 5.0 but
# something cleaner could be done in the future.
@@ -504,9 +474,6 @@ otb_add_test(NAME raTvRadiometryCorrectionParametersToAtmosphericRadiativeTerms
${TEMP}/raTvCorrectionTo6SRadiative.txt
)
-otb_add_test(NAME raTuSurfaceAdjacencyEffectCorrectionSchemeFilterNew COMMAND otbOpticalCalibrationTestDriver
- otbSurfaceAdjacencyEffectCorrectionSchemeFilterNew
- )
otb_add_test(NAME raTvImageToReflectanceImageFilterAuto COMMAND otbOpticalCalibrationTestDriver
--compare-image ${EPSILON_12} ${BASELINE}/raTvImageToReflectanceImageFilterAuto.tif
@@ -522,21 +489,9 @@ otb_add_test(NAME raTuImageToReflectanceImageFilterAutoFORMOSAT2 COMMAND otbOpti
${TEMP}/raTvImageToReflectanceImageFilterAutoFORMOSAT2.tif
)
-otb_add_test(NAME raTuAtmosphericCorrectionParametersNew COMMAND otbOpticalCalibrationTestDriver
- otbAtmosphericCorrectionParametersNew
- )
-otb_add_test(NAME raTuImageToReflectanceImageFilterNew COMMAND otbOpticalCalibrationTestDriver
- otbImageToReflectanceImageFilterNew
- )
-otb_add_test(NAME raTuWavelengthSpectralBandsNew COMMAND otbOpticalCalibrationTestDriver
- otbWavelengthSpectralBandsNew
- )
-otb_add_test(NAME raTuFilterFunctionValuesNew COMMAND otbOpticalCalibrationTestDriver
- otbFilterFunctionValuesNew
- )
otb_add_test(NAME raTvAtmosphericRadiativeTermsTest COMMAND otbOpticalCalibrationTestDriver
--compare-ascii ${NOTOL} ${BASELINE_FILES}/raTvAtmosphericRadiativeTermsTest.txt
@@ -545,13 +500,7 @@ otb_add_test(NAME raTvAtmosphericRadiativeTermsTest COMMAND otbOpticalCalibratio
${TEMP}/raTvAtmosphericRadiativeTermsTest.txt
)
-otb_add_test(NAME raTuAtmosphericRadiativeTermsNew COMMAND otbOpticalCalibrationTestDriver
- otbAtmosphericRadiativeTermsNew
- )
-otb_add_test(NAME raTuAtmosphericRadiativeTermsSingleChannelNew COMMAND otbOpticalCalibrationTestDriver
- otbAtmosphericRadiativeTermsSingleChannelNew
- )
otb_add_test(NAME raTvImageToReflectanceImageFilterDayMonth COMMAND otbOpticalCalibrationTestDriver
--compare-image ${EPSILON_12} ${BASELINE}/raTvImageToReflectanceImageFilter.tif
@@ -668,9 +617,6 @@ otb_add_test(NAME raTvReflectanceToImageImageFilterAutoSpot5 COMMAND otbOpticalC
${TEHERANSPOT5DIR}/raTvSMALLTEHERANReflectanceToImageImageFilterAutoSpot5.img
)
-otb_add_test(NAME raTuAeronetNew COMMAND otbOpticalCalibrationTestDriver
- otbAeronetNew
- )
otb_add_test(NAME raTvAeronet_ToulouseLevel20_ExtractData COMMAND otbOpticalCalibrationTestDriver
--compare-ascii ${EPSILON_6} ${BASELINE_FILES}/raAeronetExtractData_ToulouseLevel20_31_08_1999_16_30_epsilon_2.txt
@@ -714,9 +660,6 @@ otb_add_test(NAME raTvAeronet_SeyssesLevel15_ExtractData COMMAND otbOpticalCalib
${TEMP}/raAeronetExtractData_SeyssesLevel15_23_03_2009_11_00_00_epsilon_0dot4.txt
)
-otb_add_test(NAME raTuReflectanceToSurfaceReflectanceImageFilterNew COMMAND otbOpticalCalibrationTestDriver
- otbReflectanceToSurfaceReflectanceImageFilterNew
- )
otb_add_test(NAME raTvReflectanceToSurfaceReflectanceImageFilter2 COMMAND otbOpticalCalibrationTestDriver
--compare-image ${EPSILON_12} ${BASELINE}/raTvReflectanceToSurfaceReflectanceImageFilter2.tif
@@ -744,9 +687,6 @@ otb_add_test(NAME raTvReflectanceToSurfaceReflectanceImageFilter COMMAND otbOpti
3 3 3 3 # upward transmittance
)
-otb_add_test(NAME raTuImageMetadataCorrectionParametersNew COMMAND otbOpticalCalibrationTestDriver
- otbImageMetadataCorrectionParametersNew
- )
otb_add_test(NAME raTvImageToRadianceImageFilterAutoFORMOSAT COMMAND otbOpticalCalibrationTestDriver
--compare-image ${EPSILON_12} ${BASELINE}/raTvImageToRadianceImageFilterAutoFormosat.tif
@@ -840,9 +780,6 @@ otb_add_test(NAME raTvSIXSTraitsComputeAtmosphericParametersTest COMMAND otbOpti
${TEMP}/raTvSIXSTraitsComputeAtmosphericParametersTest.txt
)
-otb_add_test(NAME raTuReflectanceToImageImageFilterNew COMMAND otbOpticalCalibrationTestDriver
- otbReflectanceToImageImageFilterNew
- )
otb_add_test(NAME raTvSurfaceAdjacencyEffectCorrectionSchemeFilter COMMAND otbOpticalCalibrationTestDriver
--compare-image ${EPSILON_12} ${BASELINE}/raTvSurfaceAdjacencyEffect6SCorrectionSchemeFilter.tif
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbAeronetNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbAeronetNew.cxx
deleted file mode 100644
index 3e070d2c9c5ed866d304afa6cc65f17a7b6a0305..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/OpticalCalibration/test/otbAeronetNew.cxx
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbAeronetData.h"
-#include "otbAeronetFileReader.h"
-
-int otbAeronetNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- otb::AeronetData::Pointer data = otb::AeronetData::New();
- otb::AeronetFileReader::Pointer reader = otb::AeronetFileReader::New();
-
- std::cout << data << std::endl;
- std::cout << reader << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbAtmosphericCorrectionParametersNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbAtmosphericCorrectionParametersNew.cxx
deleted file mode 100644
index e6a42140ac020e4ddeab2df12cb34efa2fc23658..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/OpticalCalibration/test/otbAtmosphericCorrectionParametersNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbAtmosphericCorrectionParameters.h"
-
-#include <cstdlib>
-
-int otbAtmosphericCorrectionParametersNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::AtmosphericCorrectionParameters AtmosphericCorrectionParametersType;
- typedef otb::FilterFunctionValues FilterFunctionValuesType;
- // Instantiating object
- AtmosphericCorrectionParametersType::Pointer objectAtmo = AtmosphericCorrectionParametersType::New();
- FilterFunctionValuesType::Pointer objectFilter = FilterFunctionValuesType::New();
-
- std::cout << objectAtmo << std::endl;
- std::cout << objectFilter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbAtmosphericRadiativeTermsTest.cxx b/Modules/Radiometry/OpticalCalibration/test/otbAtmosphericRadiativeTermsTest.cxx
index 128050a03f77572b188cf65c10cb98c8808f88da..5b1a06e74de31831b5856f762d206da315e26e63 100644
--- a/Modules/Radiometry/OpticalCalibration/test/otbAtmosphericRadiativeTermsTest.cxx
+++ b/Modules/Radiometry/OpticalCalibration/test/otbAtmosphericRadiativeTermsTest.cxx
@@ -25,26 +25,7 @@
#include "otbAtmosphericRadiativeTerms.h"
#include <cstdlib>
-int otbAtmosphericRadiativeTermsNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::AtmosphericRadiativeTerms AtmosphericRadiativeTermsType;
-
- // Instantiating object
- AtmosphericRadiativeTermsType::Pointer object = AtmosphericRadiativeTermsType::New();
-
- return EXIT_SUCCESS;
-}
-int otbAtmosphericRadiativeTermsSingleChannelNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::AtmosphericRadiativeTermsSingleChannel AtmosphericRadiativeTermsType;
-
- // Instantiating object
- AtmosphericRadiativeTermsType::Pointer object = AtmosphericRadiativeTermsType::New();
-
- std::cout << object << std::endl;
- return EXIT_SUCCESS;
-}
std::ostream& operator<<(std::ostream& os, const otb::AtmosphericRadiativeTerms::DataVectorType& values)
{
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbImageMetadataCorrectionParametersNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbImageMetadataCorrectionParametersNew.cxx
deleted file mode 100644
index bf58bcf81f526da6d70c72bb93ff8969501ba348..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/OpticalCalibration/test/otbImageMetadataCorrectionParametersNew.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbImageMetadataCorrectionParameters.h"
-
-int otbImageMetadataCorrectionParametersNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::ImageMetadataCorrectionParameters CorrectionParametersType;
-
- // Instantiating object
- CorrectionParametersType::Pointer objectAtmo = CorrectionParametersType::New();
-
- std::cout << objectAtmo << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbImageToRadianceImageFilterNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbImageToRadianceImageFilterNew.cxx
deleted file mode 100644
index 83086a2c3c69fcb25c04d367a35208cd0c810035..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/OpticalCalibration/test/otbImageToRadianceImageFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbImageToRadianceImageFilter.h"
-
-int otbImageToRadianceImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> InputImageType;
-
- typedef otb::ImageToRadianceImageFilter<InputImageType, InputImageType> ImageToRadianceImageFilterType;
-
- // Instantiating object
- ImageToRadianceImageFilterType::Pointer filter = ImageToRadianceImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbImageToReflectanceImageFilterNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbImageToReflectanceImageFilterNew.cxx
deleted file mode 100644
index 851bbdce8cafc45320161dc1eb932e28180ecaff..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/OpticalCalibration/test/otbImageToReflectanceImageFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbImageToReflectanceImageFilter.h"
-
-int otbImageToReflectanceImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> InputImageType;
-
- typedef otb::ImageToReflectanceImageFilter<InputImageType, InputImageType> ImageToReflectanceImageFilterType;
-
- // Instantiating object
- ImageToReflectanceImageFilterType::Pointer filter = ImageToReflectanceImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbOpticalCalibrationTestDriver.cxx b/Modules/Radiometry/OpticalCalibration/test/otbOpticalCalibrationTestDriver.cxx
index d9d6d93a700f8d18e3bc0393602c9bac1432f456..085f0673bfa2d6911bf7a5cc031b74e4a7cdefa3 100644
--- a/Modules/Radiometry/OpticalCalibration/test/otbOpticalCalibrationTestDriver.cxx
+++ b/Modules/Radiometry/OpticalCalibration/test/otbOpticalCalibrationTestDriver.cxx
@@ -22,44 +22,27 @@
void RegisterTests()
{
- REGISTER_TEST(otbSpectralSensitivityReaderNew);
REGISTER_TEST(otbSpectralSensitivityReaderTest);
REGISTER_TEST(otbSpectralSensitivityReaderGenericTest);
REGISTER_TEST(otbReflectanceToImageImageFilter);
- REGISTER_TEST(otbReflectanceToRadianceImageFilterNew);
- REGISTER_TEST(otbRadianceToReflectanceImageFilterNew);
REGISTER_TEST(otbRadianceToReflectanceImageFilterAuto);
- REGISTER_TEST(otbImageToRadianceImageFilterNew);
- REGISTER_TEST(otbRadiometryCorrectionParametersToAtmosphericRadiativeTermsNew);
REGISTER_TEST(otbRadianceToImageImageFilterAuto);
- REGISTER_TEST(otbRadianceToImageImageFilterNew);
REGISTER_TEST(otbReflectanceToRadianceImageFilterAuto);
REGISTER_TEST(otbAeronetExtractDataBadData);
REGISTER_TEST(otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter);
REGISTER_TEST(otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms);
- REGISTER_TEST(otbSurfaceAdjacencyEffectCorrectionSchemeFilterNew);
REGISTER_TEST(otbImageToReflectanceImageFilterAuto);
- REGISTER_TEST(otbAtmosphericCorrectionParametersNew);
- REGISTER_TEST(otbImageToReflectanceImageFilterNew);
- REGISTER_TEST(otbFilterFunctionValuesNew);
- REGISTER_TEST(otbWavelengthSpectralBandsNew);
- REGISTER_TEST(otbAtmosphericRadiativeTermsNew);
- REGISTER_TEST(otbAtmosphericRadiativeTermsSingleChannelNew);
REGISTER_TEST(otbAtmosphericRadiativeTermsTest);
REGISTER_TEST(otbImageToReflectanceImageFilter);
REGISTER_TEST(otbRadianceToReflectanceImageFilter);
REGISTER_TEST(otbReflectanceToImageImageFilterAuto);
- REGISTER_TEST(otbAeronetNew);
REGISTER_TEST(otbAeronetExtractData);
- REGISTER_TEST(otbReflectanceToSurfaceReflectanceImageFilterNew);
REGISTER_TEST(otbReflectanceToSurfaceReflectanceImageFilterTest);
REGISTER_TEST(otbReflectanceToSurfaceReflectanceImageFilterTest2);
- REGISTER_TEST(otbImageMetadataCorrectionParametersNew);
REGISTER_TEST(otbImageToRadianceImageFilterAuto);
REGISTER_TEST(otbAtmosphericCorrectionSequencementTest);
REGISTER_TEST(otbSIXSTraitsTest);
REGISTER_TEST(otbSIXSTraitsComputeAtmosphericParametersTest);
- REGISTER_TEST(otbReflectanceToImageImageFilterNew);
REGISTER_TEST(otbSurfaceAdjacencyEffectCorrectionSchemeFilter);
REGISTER_TEST(otbRadianceToImageImageFilter);
REGISTER_TEST(otbReflectanceToRadianceImageFilter);
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbRadianceToImageImageFilterNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbRadianceToImageImageFilterNew.cxx
deleted file mode 100644
index ca4a7be9fa5fb7865a0f1d56f671b0025b6b1e98..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/OpticalCalibration/test/otbRadianceToImageImageFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbRadianceToImageImageFilter.h"
-#include "otbVectorImage.h"
-
-int otbRadianceToImageImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> InputImageType;
-
- typedef otb::RadianceToImageImageFilter<InputImageType, InputImageType> RadianceToImageImageFilterType;
-
- // Instantiating object
- RadianceToImageImageFilterType::Pointer filter = RadianceToImageImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbRadianceToReflectanceImageFilterNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbRadianceToReflectanceImageFilterNew.cxx
deleted file mode 100644
index 2d208d12717ff0ebdd74bd903b28e1247552b95d..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/OpticalCalibration/test/otbRadianceToReflectanceImageFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbRadianceToReflectanceImageFilter.h"
-#include "otbVectorImage.h"
-
-int otbRadianceToReflectanceImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> InputImageType;
-
- typedef otb::RadianceToReflectanceImageFilter<InputImageType, InputImageType> RadianceToReflectanceImageFilterType;
-
- // Instantiating object
- RadianceToReflectanceImageFilterType::Pointer filter = RadianceToReflectanceImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbRadiometryCorrectionParametersToAtmosphericRadiativeTermsNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbRadiometryCorrectionParametersToAtmosphericRadiativeTermsNew.cxx
deleted file mode 100644
index d56939da373734fee70f89cab4d34879c8a6e201..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/OpticalCalibration/test/otbRadiometryCorrectionParametersToAtmosphericRadiativeTermsNew.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h"
-#include <cstdlib>
-
-int otbRadiometryCorrectionParametersToAtmosphericRadiativeTermsNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::RadiometryCorrectionParametersToAtmosphericRadiativeTerms
- RadiometryCorrectionParametersToAtmosphericRadiativeTermsType;
- // Instantiating object
- //RadiometryCorrectionParametersToAtmosphericRadiativeTermsType::Pointer object =
- // RadiometryCorrectionParametersToAtmosphericRadiativeTermsType::New();
-
- RadiometryCorrectionParametersToAtmosphericRadiativeTermsType* object = new RadiometryCorrectionParametersToAtmosphericRadiativeTermsType;
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToImageImageFilterNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToImageImageFilterNew.cxx
deleted file mode 100644
index a1e221d46a92694cdcce3ae9affd0dc30630e8de..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToImageImageFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbReflectanceToImageImageFilter.h"
-
-int otbReflectanceToImageImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> InputImageType;
-
- typedef otb::ReflectanceToImageImageFilter<InputImageType, InputImageType> ReflectanceToImageImageFilterType;
-
- // Instantiating object
- ReflectanceToImageImageFilterType::Pointer filter = ReflectanceToImageImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToRadianceImageFilterNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToRadianceImageFilterNew.cxx
deleted file mode 100644
index c6eb5895ad04fd0de8749e454180a21e294f4841..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToRadianceImageFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbReflectanceToRadianceImageFilter.h"
-
-int otbReflectanceToRadianceImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> InputImageType;
-
- typedef otb::ReflectanceToRadianceImageFilter<InputImageType, InputImageType> ReflectanceToRadianceImageFilterType;
-
- // Instantiating object
- ReflectanceToRadianceImageFilterType::Pointer filter = ReflectanceToRadianceImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx b/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx
index f2e265b66c35ef179041584b641b8cb6498ab2bb..3d5ca13a7888649f56efdd7a63ba57d3914f3682 100644
--- a/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx
+++ b/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx
@@ -29,22 +29,6 @@
#include "otbOpticalImageMetadataInterfaceFactory.h"
-int otbReflectanceToSurfaceReflectanceImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> InputImageType;
-
- typedef otb::ReflectanceToSurfaceReflectanceImageFilter<InputImageType,
- InputImageType>
- ReflectanceToSurfaceReflectanceImageFilterType;
-
- // Instantiating object
- ReflectanceToSurfaceReflectanceImageFilterType::Pointer filter
- = ReflectanceToSurfaceReflectanceImageFilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbReflectanceToSurfaceReflectanceImageFilterTest(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbSpectralSensitivityReaderNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbSpectralSensitivityReaderNew.cxx
deleted file mode 100644
index 583f5cdd58029dfce01fa4f240b73038213726da..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/OpticalCalibration/test/otbSpectralSensitivityReaderNew.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbSpectralSensitivityReader.h"
-
-using namespace otb;
-
-int otbSpectralSensitivityReaderNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- SpectralSensitivityReader::Pointer spectSen = SpectralSensitivityReader::New();
-
- std::cout << spectSen << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbSpectralSensitivityReaderTest.cxx b/Modules/Radiometry/OpticalCalibration/test/otbSpectralSensitivityReaderTest.cxx
index 1cc824d85c70b8e35e695548be51fd9d85722470..c9cad25d26bbac29023f57bcea67d077289fa2d6 100644
--- a/Modules/Radiometry/OpticalCalibration/test/otbSpectralSensitivityReaderTest.cxx
+++ b/Modules/Radiometry/OpticalCalibration/test/otbSpectralSensitivityReaderTest.cxx
@@ -26,15 +26,6 @@
using namespace otb;
-int otbSpectralSensitivityReaderNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
-
- SpectralSensitivityReader::Pointer spectSen = SpectralSensitivityReader::New();
-
- std::cout << spectSen << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbSpectralSensitivityReaderTest(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbSurfaceAdjacencyEffectCorrectionSchemeFilterNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbSurfaceAdjacencyEffectCorrectionSchemeFilterNew.cxx
deleted file mode 100644
index 95e3ab5957a98497eedf778c484cf9bf6f014d3d..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/OpticalCalibration/test/otbSurfaceAdjacencyEffectCorrectionSchemeFilterNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h"
-#include "otbVectorImage.h"
-#include "otbImage.h"
-
-int otbSurfaceAdjacencyEffectCorrectionSchemeFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> InputImageType;
- typedef otb::SurfaceAdjacencyEffectCorrectionSchemeFilter<InputImageType,
- InputImageType>
- SurfaceAdjacencyEffectCorrectionSchemeFilterType;
-
- // Instantiating object
- SurfaceAdjacencyEffectCorrectionSchemeFilterType::Pointer filter =
- SurfaceAdjacencyEffectCorrectionSchemeFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbWavelengthSpectralBandsTest.cxx b/Modules/Radiometry/OpticalCalibration/test/otbWavelengthSpectralBandsTest.cxx
deleted file mode 100644
index 72854252ef909d413b4a15b77c6dd1c492b86f97..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/OpticalCalibration/test/otbWavelengthSpectralBandsTest.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbWavelengthSpectralBands.h"
-
-using namespace otb;
-
-int otbFilterFunctionValuesNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
-
- FilterFunctionValues::Pointer spectSen = FilterFunctionValues::New();
-
- return EXIT_SUCCESS;
-}
-
-int otbWavelengthSpectralBandsNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
-
- WavelengthSpectralBands::Pointer spectSen = WavelengthSpectralBands::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/SARCalibration/test/CMakeLists.txt b/Modules/Radiometry/SARCalibration/test/CMakeLists.txt
index b62c7863c56d659d127dd5f2a10ae1bd9512fee6..1c8f86f42639f2b3ffb247677b0ac42ad914323e 100644
--- a/Modules/Radiometry/SARCalibration/test/CMakeLists.txt
+++ b/Modules/Radiometry/SARCalibration/test/CMakeLists.txt
@@ -26,7 +26,6 @@ otbSarBrightnessFunction.cxx
otbSarBrightnessToImageFilterTestWithoutNoise.cxx
otbTerraSarBrightnessImageFilterTest.cxx
otbSarRadiometricCalibrationToImageFilterWithRealPixelTest.cxx
-otbTerraSarBrightnessImageFilterNew.cxx
otbSarParametricMapFunctionToImageFilter.cxx
otbSarRadiometricCalibrationToImageFilterWithExtractROIBeforeTest.cxx
otbSarRadiometricCalibrationToImageFilterWithComplexPixelTestWithoutNoise.cxx
@@ -113,9 +112,6 @@ otb_add_test(NAME raTvSarRadiometricCalibrationToImageWithRealPixelFilter_TSX_PA
#2000 2000 250 250 # Extract
#)
-otb_add_test(NAME raTuTerraSarBrightnessImageFilterNew COMMAND otbSARCalibrationTestDriver
- otbTerraSarBrightnessImageFilterNew
- )
otb_add_test(NAME raTvSarParametricMapFunctionToImageFilter COMMAND otbSARCalibrationTestDriver
--compare-image ${EPSILON_12}
diff --git a/Modules/Radiometry/SARCalibration/test/otbSARCalibrationTestDriver.cxx b/Modules/Radiometry/SARCalibration/test/otbSARCalibrationTestDriver.cxx
index 9b44b98210bae16f819b011d8ef7b00e072ebdc2..35733b76f1852d7435fcdf2c9f8d4a09dc7a4361 100644
--- a/Modules/Radiometry/SARCalibration/test/otbSARCalibrationTestDriver.cxx
+++ b/Modules/Radiometry/SARCalibration/test/otbSARCalibrationTestDriver.cxx
@@ -26,7 +26,6 @@ void RegisterTests()
REGISTER_TEST(otbSarBrightnessToImageFilterTestWithoutNoise);
REGISTER_TEST(otbTerraSarBrightnessImageFilterTest);
REGISTER_TEST(otbSarRadiometricCalibrationToImageFilterWithRealPixelTest);
- REGISTER_TEST(otbTerraSarBrightnessImageFilterNew);
REGISTER_TEST(otbSarParametricMapFunctionToImageFilter);
REGISTER_TEST(otbSarRadiometricCalibrationToImageFilterWithExtractROIBeforeTest);
REGISTER_TEST(otbSarRadiometricCalibrationToImageFilterWithComplexPixelTestWithoutNoise);
diff --git a/Modules/Radiometry/SARCalibration/test/otbTerraSarBrightnessImageFilterNew.cxx b/Modules/Radiometry/SARCalibration/test/otbTerraSarBrightnessImageFilterNew.cxx
deleted file mode 100644
index 093b8c43d115964aaecd78876db862d2fabd0c68..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/SARCalibration/test/otbTerraSarBrightnessImageFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbTerraSarBrightnessImageFilter.h"
-#include "otbImage.h"
-
-int otbTerraSarBrightnessImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::Image<double, 2> ImageType;
- typedef otb::Image<std::complex<double>, 2> ComplexImageType;
-
- typedef otb::TerraSarBrightnessImageFilter<ImageType, ImageType> FilterType;
- typedef otb::TerraSarBrightnessImageFilter<ComplexImageType, ComplexImageType> ComplexFilterType;
-
- FilterType::Pointer filter = FilterType::New();
- ComplexFilterType::Pointer complexFilter = ComplexFilterType::New();
-
- std::cout << filter << std::endl;
- std::cout << complexFilter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/Simulation/test/CMakeLists.txt b/Modules/Radiometry/Simulation/test/CMakeLists.txt
index bcb073372891b6d7cba40aa8aaa8c7db4536a9ea..52d57c982a70f4377e5375f01d90e670dcaa482b 100644
--- a/Modules/Radiometry/Simulation/test/CMakeLists.txt
+++ b/Modules/Radiometry/Simulation/test/CMakeLists.txt
@@ -33,16 +33,13 @@ otbSimulationTestDriver.cxx
otbReduceSpectralResponseSVMClassifier.cxx
otbProspectTransTest.cxx
otbReduceSpectralResponseClassifierRAndNIR.cxx
-otbSpectralResponseNew.cxx
otbSatelliteRSR.cxx
-otbSurfaceReflectanceToReflectanceFilterNew.cxx
+otbSurfaceReflectanceToReflectanceFilter.cxx
otbImageSimulationMethodWithSpatialisationTest.cxx
otbImageSimulationMethodSVMClassif.cxx
-otbReduceSpectralResponseNew.cxx
otbReduceSpectralResponse.cxx
otbAtmosphericEffects.cxx
otbProspectReflTest.cxx
-otbSpatialisationTestNew.cxx
otbLabelMapToSimulatedImageFilterTest.cxx
otbImageSimulationMethodKMeansClassif.cxx
otbSpectralResponse.cxx
@@ -50,7 +47,6 @@ otbAtmosphericCorrectionsRSRSVMClassifier.cxx
otbSpatialisationTest.cxx
otbImageSimulationMethodWithVectorDataTest.cxx
otbSailReflVTest.cxx
-otbSatelliteRSRNew.cxx
otbSailReflHTest.cxx
otbFilterFunctionValues.cxx
otbSoilDBTest.cxx
@@ -96,10 +92,6 @@ otb_add_test(NAME siTuReduceSpectralResponseClassifierRAndNIR COMMAND otbSimulat
2 #NIR index
)
-otb_add_test(NAME siTuSpectralResponseNew COMMAND otbSimulationTestDriver
- otbSpectralResponseNew
- )
-
otb_add_test(NAME siTuSatelliteRSRCheckValue COMMAND otbSimulationTestDriver
otbSatelliteRSRCheckValue
${INPUTDATA}/Radiometry/SPOT5/HRG2/rep6S.dat
@@ -115,7 +107,7 @@ otb_add_test(NAME siTuSatelliteRSRSolarIrradianceCheckValue2 COMMAND otbSimulati
4 #nb band
1.7525000e+00 #lambda
1.8526000e+02 #expected
- )
+ )
otb_add_test(NAME siTuSatelliteRSRSolarIrradianceCheckValue COMMAND otbSimulationTestDriver
otbSatelliteRSRSolarIrradianceCheckValue
@@ -123,7 +115,7 @@ otb_add_test(NAME siTuSatelliteRSRSolarIrradianceCheckValue COMMAND otbSimulatio
4 #nb band
0.45 #lambda
2.0573899e3 #expected
- )
+ )
otb_add_test(NAME siTuSatelliteRSR COMMAND otbSimulationTestDriver
otbSatelliteRSR
@@ -140,10 +132,7 @@ otb_add_test(NAME siTuSatelliteRSRCheckValue2 COMMAND otbSimulationTestDriver
0.68 #lambda
1 #num band
0.717 #expected
- )
-
-otb_add_test(NAME siTuReflectanceToSurfaceReflectanceFilterNew COMMAND otbSimulationTestDriver
- otbSurfaceReflectanceToReflectanceFilterNew )
+ )
otb_add_test(NAME siTuImageSimulationMethodWithSpatialisationTest COMMAND otbSimulationTestDriver
otbImageSimulationMethodWithSpatialisationTest
@@ -155,10 +144,6 @@ otb_add_test(NAME siTuImageSimulationMethodWithSpatialisationTest COMMAND otbSim
${TEMP}/LabelImageSimulationMethodWithSpatialisationTest.tif
)
-otb_add_test(NAME siTuReduceSpectralResponseNew COMMAND otbSimulationTestDriver
- otbReduceSpectralResponseNew
- )
-
otb_add_test(NAME siTuReduceSpectralResponseReflectanceMode COMMAND otbSimulationTestDriver
otbReduceSpectralResponse
${SPECTRUM_DB}/jpl/beckman/minerals/Arsenate/txt/A01Ac.txt
@@ -194,7 +179,7 @@ otb_add_test(NAME siTvReduceSpectralResponseReflectanceMode COMMAND otbSimulatio
4 #nb band
1 #reflectance mode
${TEMP}/siTvReduceSpectralResponseReflectanceMode.txt
- )
+ )
otb_add_test(NAME siTvProspectReflTest COMMAND otbSimulationTestDriver
--compare-ascii ${EPSILON_3} ${BASELINE_FILES}/Simulation/siTvProspectReflTest.txt
@@ -209,10 +194,6 @@ otb_add_test(NAME siTvProspectReflTest COMMAND otbSimulationTestDriver
${TEMP}/siTvProspectReflTest.txt
)
-otb_add_test(NAME siTuSpatialisationTestNew COMMAND otbSimulationTestDriver
- otbSpatialisationTestNew
- )
-
otb_add_test(NAME siTuLabelMapToSimulatedImageFilterTest COMMAND otbSimulationTestDriver
otbLabelMapToSimulatedImageFilterTest
${INPUTDATA}/Simulation/Shapefile/culturesWithAndWithoutPath.shp
@@ -277,10 +258,6 @@ otb_add_test(NAME siTvSailReflVTest COMMAND otbSimulationTestDriver
${TEMP}/siTvSailReflVTest.txt
)
-otb_add_test(NAME siTuSatelliteRSRNew COMMAND otbSimulationTestDriver
- otbSatelliteRSRNew
- )
-
otb_add_test(NAME siTvSailReflHTest COMMAND otbSimulationTestDriver
--compare-ascii ${EPSILON_3} ${BASELINE_FILES}/Simulation/siTvSailReflHTest.txt
${TEMP}/siTvSailReflHTest.txt
diff --git a/Modules/Radiometry/Simulation/test/otbReduceSpectralResponseNew.cxx b/Modules/Radiometry/Simulation/test/otbReduceSpectralResponseNew.cxx
deleted file mode 100644
index e60e6e0ad4dd8ef2f88a51516382e0451613bbd9..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/Simulation/test/otbReduceSpectralResponseNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbMacro.h"
-
-#include "otbSatelliteRSR.h"
-#include "otbReduceSpectralResponse.h"
-
-int otbReduceSpectralResponseNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::SpectralResponse< double, double> ResponseType;
- //typedef ResponseType::Pointer ResponsePointerType;
-
- typedef otb::SatelliteRSR< double, double> SatRSRType;
- //typedef SatRSRType::Pointer SatRSRPointerType;
-
- typedef otb::ReduceSpectralResponse < ResponseType, SatRSRType> ReduceResponseType;
- typedef ReduceResponseType::Pointer ReduceResponseTypePointerType;
- //Instantiation
- ReduceResponseTypePointerType myResponse=ReduceResponseType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/Simulation/test/otbSatelliteRSRNew.cxx b/Modules/Radiometry/Simulation/test/otbSatelliteRSRNew.cxx
deleted file mode 100644
index 713d03941cd03c889a9cdabc6aecde73a11fc835..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/Simulation/test/otbSatelliteRSRNew.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbMacro.h"
-
-#include "otbSatelliteRSR.h"
-
-int otbSatelliteRSRNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::SatelliteRSR< double, double> ResponseType;
- typedef ResponseType::Pointer ResponsePointerType;
-
-
- //Instantiation
- ResponsePointerType myResponse=ResponseType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/Simulation/test/otbSimulationTestDriver.cxx b/Modules/Radiometry/Simulation/test/otbSimulationTestDriver.cxx
index 8ae63e04d0381f176bda436767d79e7b74c4f49d..9c9712757f10c1f7bffcd372e00340c94b5899dd 100644
--- a/Modules/Radiometry/Simulation/test/otbSimulationTestDriver.cxx
+++ b/Modules/Radiometry/Simulation/test/otbSimulationTestDriver.cxx
@@ -25,20 +25,16 @@ void RegisterTests()
REGISTER_TEST(otbReduceSpectralResponseSVMClassifier);
REGISTER_TEST(otbProspectTransTest);
REGISTER_TEST(otbReduceSpectralResponseClassifierRAndNIR);
- REGISTER_TEST(otbSpectralResponseNew);
REGISTER_TEST(otbSatelliteRSR);
REGISTER_TEST(otbSatelliteRSRCheckValue);
REGISTER_TEST(otbSatelliteRSRSolarIrradianceCheckValue);
- REGISTER_TEST(otbSurfaceReflectanceToReflectanceFilterNew);
REGISTER_TEST(otbSurfaceReflectanceToReflectanceFilterTest);
REGISTER_TEST(otbImageSimulationMethodWithSpatialisationTest);
REGISTER_TEST(otbImageSimulationMethodSVMClassif);
- REGISTER_TEST(otbReduceSpectralResponseNew);
REGISTER_TEST(otbReduceSpectralResponse);
REGISTER_TEST(otbReduceSpectralResponseSimpleValues);
REGISTER_TEST(otbAtmosphericEffects);
REGISTER_TEST(otbProspectReflTest);
- REGISTER_TEST(otbSpatialisationTestNew);
REGISTER_TEST(otbLabelMapToSimulatedImageFilterTest);
REGISTER_TEST(otbImageSimulationMethodKMeansClassif);
REGISTER_TEST(otbSpectralResponse);
@@ -46,7 +42,6 @@ void RegisterTests()
REGISTER_TEST(otbSpatialisationTest);
REGISTER_TEST(otbImageSimulationMethodWithVectorDataTest);
REGISTER_TEST(otbSailReflVTest);
- REGISTER_TEST(otbSatelliteRSRNew);
REGISTER_TEST(otbSailReflHTest);
REGISTER_TEST(otbFilterFunctionValuesSpectralResponseTest);
REGISTER_TEST(otbFilterFunctionValuesTest);
diff --git a/Modules/Radiometry/Simulation/test/otbSpatialisationTestNew.cxx b/Modules/Radiometry/Simulation/test/otbSpatialisationTestNew.cxx
deleted file mode 100644
index 7a66b3565bd1fda780296aa3841b8468ca6ab3f0..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/Simulation/test/otbSpatialisationTestNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbMacro.h"
-
-
-#include "otbSpatialisationFilter.h"
-#include "otbAttributesMapLabelObject.h"
-
-int otbSpatialisationTestNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef unsigned short LabelType;
- const unsigned int Dimension = 2;
- typedef otb::AttributesMapLabelObject<LabelType, Dimension, std::string> LabelObjectType;
- typedef itk::LabelMap<LabelObjectType> LabelMapType;
- typedef otb::SpatialisationFilter<LabelMapType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/Simulation/test/otbSpectralResponseNew.cxx b/Modules/Radiometry/Simulation/test/otbSpectralResponseNew.cxx
deleted file mode 100644
index 347dc94571cf751e5bc9ad9e0c1f86cab0ab6bb6..0000000000000000000000000000000000000000
--- a/Modules/Radiometry/Simulation/test/otbSpectralResponseNew.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbMacro.h"
-
-#include "otbSpectralResponse.h"
-
-int otbSpectralResponseNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::SpectralResponse< double, double> ResponseType;
- typedef ResponseType::Pointer ResponsePointerType;
-
-
- //Instantiation
- ResponsePointerType myResponse=ResponseType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Radiometry/Simulation/test/otbSurfaceReflectanceToReflectanceFilterNew.cxx b/Modules/Radiometry/Simulation/test/otbSurfaceReflectanceToReflectanceFilter.cxx
similarity index 86%
rename from Modules/Radiometry/Simulation/test/otbSurfaceReflectanceToReflectanceFilterNew.cxx
rename to Modules/Radiometry/Simulation/test/otbSurfaceReflectanceToReflectanceFilter.cxx
index 022298a36baf0fe8ebd68b2e41cda5f2b79aa0fe..9fb778abdd9493899f236dc26a045740e7afbe76 100644
--- a/Modules/Radiometry/Simulation/test/otbSurfaceReflectanceToReflectanceFilterNew.cxx
+++ b/Modules/Radiometry/Simulation/test/otbSurfaceReflectanceToReflectanceFilter.cxx
@@ -24,21 +24,6 @@
#include "otbSurfaceReflectanceToReflectanceFilter.h"
-int otbSurfaceReflectanceToReflectanceFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef otb::SurfaceReflectanceToReflectanceFilter< ImageType, ImageType> SurfaceReflectanceToReflectanceFilterType;
- typedef SurfaceReflectanceToReflectanceFilterType::Pointer SurfaceReflectanceToReflectanceFilterPointerType;
-
- //Instantiation
- SurfaceReflectanceToReflectanceFilterPointerType object=SurfaceReflectanceToReflectanceFilterType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbSurfaceReflectanceToReflectanceFilterTest(int argc, char * argv[])
{
if ( argc != 7 )
diff --git a/Modules/Registration/DisparityMap/test/CMakeLists.txt b/Modules/Registration/DisparityMap/test/CMakeLists.txt
index 46f14ce4432768dd9eca9918164a91a929288bda..0374cb6afc608314bb9fcb5e6067d03514416af6 100644
--- a/Modules/Registration/DisparityMap/test/CMakeLists.txt
+++ b/Modules/Registration/DisparityMap/test/CMakeLists.txt
@@ -27,13 +27,10 @@ otbDisparityMapToDEMFilter.cxx
otbDisparityMapMedianFilter.cxx
otbDisparityTranslateFilter.cxx
otbSubPixelDisparityImageFilter.cxx
-otbDisparityMapEstimationMethodNew.cxx
otbDisparityMapTo3DFilter.cxx
otbMultiDisparityMapTo3DFilter.cxx
-otbFineRegistrationImageFilterNew.cxx
otbFineRegistrationImageFilterTest.cxx
otbNCCRegistrationFilter.cxx
-otbNCCRegistrationFilterNew.cxx
otbPixelWiseBlockMatchingImageFilter.cxx
)
@@ -73,12 +70,6 @@ otb_add_test(NAME dmTvDisparityMapEstimationMethod COMMAND otbDisparityMapTestDr
#${INPUTDATA}/sensor_stereo_dmap_mask.tif
#)
-otb_add_test(NAME dmTuDisparityMapToDEMFilterNew COMMAND otbDisparityMapTestDriver
- otbDisparityMapToDEMFilterNew)
-
-otb_add_test(NAME dmTuDisparityMapMedianFilterNew COMMAND otbDisparityMapTestDriver
- otbDisparityMapMedianFilterNew)
-
otb_add_test(NAME dmTvDisparityMapMedianFilter COMMAND otbDisparityMapTestDriver
--compare-image ${NOTOL}
${BASELINE}/dmTvDisparityMapMedianFilterOutput.tif
@@ -102,9 +93,6 @@ otb_add_test(NAME dmTvDisparityTranslateFilter COMMAND otbDisparityMapTestDriver
${TEMP}/dmTvDisparityTranslateFilterOutput.tif
)
-otb_add_test(NAME dmTuDisparityTranslateFilterNew COMMAND otbDisparityMapTestDriver
- otbDisparityTranslateFilterNew)
-
otb_add_test(NAME dmTvSubPixelDisparityImageFilterNCC COMMAND otbDisparityMapTestDriver
--compare-n-images ${NOTOL} 3
${BASELINE}/dmTvSubPixelWiseBlockMatchingImageFilterNCCOutputHDisparity.tif
@@ -128,12 +116,6 @@ otb_add_test(NAME dmTvSubPixelDisparityImageFilterNCC COMMAND otbDisparityMapTes
-2 2 # vdisp threshold
)
-otb_add_test(NAME dmTuSubPixelDisparityImageFilterNew COMMAND otbDisparityMapTestDriver
- otbSubPixelDisparityImageFilterNew)
-
-otb_add_test(NAME dmTuDisparityMapEstimationMethodNew COMMAND otbDisparityMapTestDriver
- otbDisparityMapEstimationMethodNew)
-
#otb_add_test(NAME dmTvDisparityMapTo3DFilter COMMAND otbDisparityMapTestDriver
#--compare-image ${EPSILON_6}
#${BASELINE}/dmTvDisparityMapTo3DFilterOutput.tif
@@ -148,12 +130,6 @@ otb_add_test(NAME dmTuDisparityMapEstimationMethodNew COMMAND otbDisparityMapTes
#${INPUTDATA}/sensor_stereo_dmap_mask.tif
#)
-otb_add_test(NAME dmTuDisparityMapTo3DFilterNew COMMAND otbDisparityMapTestDriver
- otbDisparityMapTo3DFilterNew)
-
-otb_add_test(NAME dmTuMultiDisparityMapTo3DFilterNew COMMAND otbDisparityMapTestDriver
- otbMultiDisparityMapTo3DFilterNew)
-
otb_add_test(NAME dmTvMultiDisparityMapTo3DFilter COMMAND otbDisparityMapTestDriver
--compare-n-images ${EPSILON_6} 2
${BASELINE}/dmTvMultiDisparityMapTo3DFilterOutput.tif
@@ -172,9 +148,6 @@ otb_add_test(NAME dmTvMultiDisparityMapTo3DFilter COMMAND otbDisparityMapTestDri
${TEMP}/dmTvMultiDisparityMapTo3DFilterResidue.tif
)
-otb_add_test(NAME dmTuFineRegistrationImageFilterNew COMMAND otbDisparityMapTestDriver
- otbFineRegistrationImageFilterNew
- )
otb_add_test(NAME dmTvFineRegistrationImageFilterTestWithMeanSquare COMMAND otbDisparityMapTestDriver
--compare-n-images ${EPSILON_10} 2
${BASELINE}/feTvFineRegistrationImageFilterTestWithMeanSquareMetric.tif
@@ -264,10 +237,7 @@ otb_add_test(NAME dmTvNCCRegistrationFilter COMMAND otbDisparityMapTestDriver
${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub_warped_sinus.tif
${TEMP}/dmNCCRegistrationFilterOutput.tif
5 1.0 2)
-otb_add_test(NAME dmTuNCCRegistrationFilterNew COMMAND otbDisparityMapTestDriver
- otbNCCRegistrationFilterNew)
-otb_add_test(NAME dmTuPixelWiseBlockMatchingImageFilterNew COMMAND otbDisparityMapTestDriver
- otbPixelWiseBlockMatchingImageFilterNew)
+
otb_add_test(NAME dmTvPixelWiseBlockMatchingImageFilterNCC COMMAND otbDisparityMapTestDriver
--compare-n-images ${NOTOL} 2
${BASELINE}/dmTvPixelWiseBlockMatchingImageFilterNCCOutputDisparity.tif
diff --git a/Modules/Registration/DisparityMap/test/otbDisparityMapEstimationMethodNew.cxx b/Modules/Registration/DisparityMap/test/otbDisparityMapEstimationMethodNew.cxx
deleted file mode 100644
index 0cf77a437dc941ad3f3365b5018aa4478628ee19..0000000000000000000000000000000000000000
--- a/Modules/Registration/DisparityMap/test/otbDisparityMapEstimationMethodNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbDisparityMapEstimationMethod.h"
-#include "otbImage.h"
-#include "itkTranslationTransform.h"
-
-int otbDisparityMapEstimationMethodNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char PixelType;
- typedef otb::Image<PixelType, Dimension> ImageType;
- typedef itk::TranslationTransform<double, Dimension> TransformType;
- typedef TransformType::ParametersType ParametersType;
- typedef itk::PointSet<ParametersType, Dimension> PointSetType;
- typedef otb::DisparityMapEstimationMethod<ImageType, ImageType, PointSetType> DMEstimationType;
-
- // Instantiation
- DMEstimationType::Pointer dmestimator = DMEstimationType::New();
-
- std::cout << dmestimator << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Registration/DisparityMap/test/otbDisparityMapMedianFilter.cxx b/Modules/Registration/DisparityMap/test/otbDisparityMapMedianFilter.cxx
index a120fdf41b52ee8b96e657a7f0c65a3c222a45fc..d7475ed3c8e28391fe32155718aabd153c676990 100644
--- a/Modules/Registration/DisparityMap/test/otbDisparityMapMedianFilter.cxx
+++ b/Modules/Registration/DisparityMap/test/otbDisparityMapMedianFilter.cxx
@@ -32,13 +32,6 @@
typedef otb::DisparityMapMedianFilter<FloatImageType,FloatImageType,FloatImageType> DisparityMapMedianFilterType;
-int otbDisparityMapMedianFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- // Instantiation
- DisparityMapMedianFilterType::Pointer filter = DisparityMapMedianFilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbDisparityMapMedianFilter(int argc, char* argv[])
{
diff --git a/Modules/Registration/DisparityMap/test/otbDisparityMapTestDriver.cxx b/Modules/Registration/DisparityMap/test/otbDisparityMapTestDriver.cxx
index 2278117f771aa9e6b4f78f1fbd7262b2de14a13b..f8d080255172fb5aeb8acd20f227b134db5145a0 100644
--- a/Modules/Registration/DisparityMap/test/otbDisparityMapTestDriver.cxx
+++ b/Modules/Registration/DisparityMap/test/otbDisparityMapTestDriver.cxx
@@ -23,24 +23,14 @@
void RegisterTests()
{
REGISTER_TEST(otbDisparityMapEstimationMethod);
- REGISTER_TEST(otbDisparityMapToDEMFilterNew);
REGISTER_TEST(otbDisparityMapToDEMFilter);
- REGISTER_TEST(otbDisparityMapMedianFilterNew);
REGISTER_TEST(otbDisparityMapMedianFilter);
- REGISTER_TEST(otbDisparityTranslateFilterNew);
REGISTER_TEST(otbDisparityTranslateFilter);
- REGISTER_TEST(otbSubPixelDisparityImageFilterNew);
REGISTER_TEST(otbSubPixelDisparityImageFilter);
- REGISTER_TEST(otbDisparityMapEstimationMethodNew);
- REGISTER_TEST(otbDisparityMapTo3DFilterNew);
REGISTER_TEST(otbDisparityMapTo3DFilter);
- REGISTER_TEST(otbMultiDisparityMapTo3DFilterNew);
REGISTER_TEST(otbMultiDisparityMapTo3DFilter);
- REGISTER_TEST(otbFineRegistrationImageFilterNew);
REGISTER_TEST(otbFineRegistrationImageFilterTest);
REGISTER_TEST(otbNCCRegistrationFilter);
- REGISTER_TEST(otbNCCRegistrationFilterNew);
REGISTER_TEST(otbPixelWiseBlockMatchingImageFilter);
- REGISTER_TEST(otbPixelWiseBlockMatchingImageFilterNew);
REGISTER_TEST(otbPixelWiseBlockMatchingImageFilterNCC);
}
diff --git a/Modules/Registration/DisparityMap/test/otbDisparityMapTo3DFilter.cxx b/Modules/Registration/DisparityMap/test/otbDisparityMapTo3DFilter.cxx
index 61db008a6eefa8f8a6c0b2e95c79b79198fd24ad..ba832e83dbb253d8622fc8f0971bd500cddcd5e6 100644
--- a/Modules/Registration/DisparityMap/test/otbDisparityMapTo3DFilter.cxx
+++ b/Modules/Registration/DisparityMap/test/otbDisparityMapTo3DFilter.cxx
@@ -34,13 +34,6 @@ typedef otb::DisparityMapTo3DFilter
FloatVectorImageType,
FloatImageType> StereoFilterType;
-int otbDisparityMapTo3DFilterNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
-{
- // Instantiation
- StereoFilterType::Pointer filter = StereoFilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbDisparityMapTo3DFilter(int argc, char* argv[])
{
diff --git a/Modules/Registration/DisparityMap/test/otbDisparityMapToDEMFilter.cxx b/Modules/Registration/DisparityMap/test/otbDisparityMapToDEMFilter.cxx
index d39dd47643f38f9cda3da552a820d285ca1a03d4..2a076a2041ec302d7304e5a881cf269293ff5bba 100644
--- a/Modules/Registration/DisparityMap/test/otbDisparityMapToDEMFilter.cxx
+++ b/Modules/Registration/DisparityMap/test/otbDisparityMapToDEMFilter.cxx
@@ -47,14 +47,6 @@
typedef otb::DisparityMapToDEMFilter <FloatImageType, FloatVectorImageType> DisparityToElevationFilterType;
-int otbDisparityMapToDEMFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- // Instantiation
- DisparityToElevationFilterType::Pointer filter = DisparityToElevationFilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbDisparityMapToDEMFilter(int argc, char* argv[])
{
diff --git a/Modules/Registration/DisparityMap/test/otbDisparityTranslateFilter.cxx b/Modules/Registration/DisparityMap/test/otbDisparityTranslateFilter.cxx
index b7122751645810448b7878437e4a51c8edb700b7..8240a89954c71ab1a62ef5433d25f11f90165b4e 100644
--- a/Modules/Registration/DisparityMap/test/otbDisparityTranslateFilter.cxx
+++ b/Modules/Registration/DisparityMap/test/otbDisparityTranslateFilter.cxx
@@ -56,12 +56,6 @@ typedef otb::DisparityTranslateFilter
FloatImageType> TranslateFilter;
-int otbDisparityTranslateFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- // Instantiation
- TranslateFilter::Pointer filter = TranslateFilter::New();
- return EXIT_SUCCESS;
-}
int otbDisparityTranslateFilter(int argc, char* argv[])
{
diff --git a/Modules/Registration/DisparityMap/test/otbFineRegistrationImageFilterNew.cxx b/Modules/Registration/DisparityMap/test/otbFineRegistrationImageFilterNew.cxx
deleted file mode 100644
index cf0e59ff6fb60c3eb9e65f5499ac491074f5c7ec..0000000000000000000000000000000000000000
--- a/Modules/Registration/DisparityMap/test/otbFineRegistrationImageFilterNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbImage.h"
-#include "itkFixedArray.h"
-#include "otbFineRegistrationImageFilter.h"
-
-
-int otbFineRegistrationImageFilterNew( int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef double PixelType;
- const unsigned int Dimension = 2;
-
- typedef itk::FixedArray<PixelType, Dimension> DisplacementValueType;
- typedef otb::Image< PixelType> ImageType;
- typedef otb::Image<DisplacementValueType, 2> FieldImageType;
- typedef otb::FineRegistrationImageFilter<ImageType, ImageType, FieldImageType> RegistrationFilterType;
-
- RegistrationFilterType::Pointer filter = RegistrationFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Registration/DisparityMap/test/otbMultiDisparityMapTo3DFilter.cxx b/Modules/Registration/DisparityMap/test/otbMultiDisparityMapTo3DFilter.cxx
index aac35191433418cb5082ad854a7ccd0352aa526d..455c2e7a0a1511ef1c4e2f9c4395c3b95df14cd7 100644
--- a/Modules/Registration/DisparityMap/test/otbMultiDisparityMapTo3DFilter.cxx
+++ b/Modules/Registration/DisparityMap/test/otbMultiDisparityMapTo3DFilter.cxx
@@ -34,13 +34,6 @@ typedef otb::MultiDisparityMapTo3DFilter
FloatImageType> Multi3DFilterType;
-int otbMultiDisparityMapTo3DFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- // Instantiation
- Multi3DFilterType::Pointer multiFilter = Multi3DFilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbMultiDisparityMapTo3DFilter(int argc, char* argv[])
{
diff --git a/Modules/Registration/DisparityMap/test/otbNCCRegistrationFilterNew.cxx b/Modules/Registration/DisparityMap/test/otbNCCRegistrationFilterNew.cxx
deleted file mode 100644
index d723db37a371419d0b780430f4589b6e340b8818..0000000000000000000000000000000000000000
--- a/Modules/Registration/DisparityMap/test/otbNCCRegistrationFilterNew.cxx
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbNCCRegistrationFilter.h"
-#include "otbImage.h"
-
-int otbNCCRegistrationFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int ImageDimension = 2;
-
- typedef double PixelType;
- typedef itk::Vector<double, ImageDimension> DisplacementPixelType;
-
- //Allocate Images
- typedef otb::Image<PixelType, ImageDimension> MovingImageType;
- typedef otb::Image<PixelType, ImageDimension> FixedImageType;
- typedef otb::Image<DisplacementPixelType,
- ImageDimension> DisplacementFieldType;
-
- //Create the filter
- typedef otb::NCCRegistrationFilter<FixedImageType,
- MovingImageType,
- DisplacementFieldType>
- RegistrationFilterType;
-
- // Instantiation
- RegistrationFilterType::Pointer filter = RegistrationFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Registration/DisparityMap/test/otbPixelWiseBlockMatchingImageFilter.cxx b/Modules/Registration/DisparityMap/test/otbPixelWiseBlockMatchingImageFilter.cxx
index 076cffe720468b0d21d5835d883e292d24703d76..7493bd2d84ecd87b602084be8f46ef37b8b61171 100644
--- a/Modules/Registration/DisparityMap/test/otbPixelWiseBlockMatchingImageFilter.cxx
+++ b/Modules/Registration/DisparityMap/test/otbPixelWiseBlockMatchingImageFilter.cxx
@@ -35,13 +35,6 @@ typedef otb::Functor::NCCBlockMatching<ImageType,FloatImageType> NCCBlockMatchin
typedef otb::PixelWiseBlockMatchingImageFilter<ImageType,FloatImageType,FloatImageType,ImageType, NCCBlockMatchingFunctorType> PixelWiseNCCBlockMatchingImageFilterType;
-int otbPixelWiseBlockMatchingImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- // Instantiation
- PixelWiseBlockMatchingImageFilterType::Pointer bmFilter = PixelWiseBlockMatchingImageFilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbPixelWiseBlockMatchingImageFilter(int argc, char * argv[])
{
diff --git a/Modules/Registration/DisparityMap/test/otbSubPixelDisparityImageFilter.cxx b/Modules/Registration/DisparityMap/test/otbSubPixelDisparityImageFilter.cxx
index aac2587c1b603c9dc8b6d1aefa595e02f629472a..cf911f4645b84b95d733f9a685ba088c2d5e5606 100644
--- a/Modules/Registration/DisparityMap/test/otbSubPixelDisparityImageFilter.cxx
+++ b/Modules/Registration/DisparityMap/test/otbSubPixelDisparityImageFilter.cxx
@@ -58,14 +58,6 @@
typedef otb::ImageFileReader<FloatImageType> ReaderType;
typedef otb::ImageFileWriter<FloatImageType> WriterType;
-int otbSubPixelDisparityImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- // Instantiation
- SSDSubPixelDisparityFilterType::Pointer filter = SSDSubPixelDisparityFilterType::New();
-
- return EXIT_SUCCESS;
-}
template<class TImage,class TFunctorType> int ProcessAndWriteOutput(otb::SubPixelDisparityImageFilter<TImage,
TImage,TImage,TImage,TFunctorType> * subPixFilter,int argc,char* argv[])
diff --git a/Modules/Registration/DisplacementField/test/CMakeLists.txt b/Modules/Registration/DisplacementField/test/CMakeLists.txt
index 5eb7205b206e05d737247ebff34a3a791d8a7328..284c22e5571c64d3215cf7652395fccfbbfdd637 100644
--- a/Modules/Registration/DisplacementField/test/CMakeLists.txt
+++ b/Modules/Registration/DisplacementField/test/CMakeLists.txt
@@ -22,20 +22,12 @@ otb_module_test()
set(OTBDisplacementFieldTests
otbDisplacementFieldTestDriver.cxx
-otbNearestTransformDisplacementFieldGeneratorNew.cxx
otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.cxx
otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.cxx
-otbNearestPointDisplacementFieldGeneratorNew.cxx
-otbPointSetToDisplacementFieldGeneratorNew.cxx
-otbPointSetWithTransformToDisplacementFieldGeneratorNew.cxx
-otbBSplinesInterpolateDisplacementFieldGeneratorNew.cxx
-otbNNearestTransformsLinearInterpolateDisplacementFieldGeneratorNew.cxx
-otbNNearestPointsLinearInterpolateDisplacementFieldGeneratorNew.cxx
otbNearestTransformDisplacementFieldGenerator.cxx
otbNearestPointDisplacementFieldGenerator.cxx
otbBSplinesInterpolateTransformDisplacementFieldGenerator.cxx
otbBSplinesInterpolateDisplacementFieldGenerator.cxx
-otbBSplinesInterpolateTransformDisplacementFieldGeneratorNew.cxx
)
add_executable(otbDisplacementFieldTestDriver ${OTBDisplacementFieldTests})
@@ -44,9 +36,6 @@ otb_module_target_label(otbDisplacementFieldTestDriver)
# Tests Declaration
-otb_add_test(NAME dmTuNearestTransformDisplacementFieldGeneratorNew COMMAND otbDisplacementFieldTestDriver
- otbNearestTransformDisplacementFieldGeneratorNew)
-
otb_add_test(NAME dmTvNNearestTransformsLinearInterpolateDisplacementFieldGenerator COMMAND otbDisplacementFieldTestDriver
--compare-image ${EPSILON_10}
${BASELINE}/dmTvNNearestTransformsLinearInterpolateDeformationField.hdr
@@ -63,24 +52,6 @@ otb_add_test(NAME dmTvNNearestPointsLinearInterpolateDisplacementFieldGenerator
${TEMP}/dmTvNNearestPointsLinearInterpolateDisplacementField.hdr
)
-otb_add_test(NAME dmTuNearestPointDisplacementFieldGeneratorNew COMMAND otbDisplacementFieldTestDriver
- otbNearestPointDisplacementFieldGeneratorNew)
-
-otb_add_test(NAME dmTuPointSetToDisplacementFieldGeneratorNew COMMAND otbDisplacementFieldTestDriver
- otbPointSetToDisplacementFieldGeneratorNew)
-
-otb_add_test(NAME dmTuPointSetWithTransformToDisplacementFieldGeneratorNew COMMAND otbDisplacementFieldTestDriver
- otbPointSetWithTransformToDisplacementFieldGeneratorNew)
-
-otb_add_test(NAME dmTuNNearestTransformsLinearInterpolateDisplacementFieldGeneratorNew COMMAND otbDisplacementFieldTestDriver
- otbNNearestTransformsLinearInterpolateDisplacementFieldGeneratorNew)
-
-otb_add_test(NAME dmTuBSplinesInterpolateDisplacementFieldGeneratorNew COMMAND otbDisplacementFieldTestDriver
- otbNNearestPointsLinearInterpolateDisplacementFieldGeneratorNew)
-
-otb_add_test(NAME dmTuNNearestPointsLinearInterpolateDisplacementFieldGeneratorNew COMMAND otbDisplacementFieldTestDriver
- otbNNearestPointsLinearInterpolateDisplacementFieldGeneratorNew)
-
otb_add_test(NAME dmTvNearestTransformDisplacementFieldGenerator COMMAND otbDisplacementFieldTestDriver
@@ -115,6 +86,3 @@ otb_add_test(NAME dmTvBSplinesInterpolateDisplacementFieldGenerator COMMAND otbD
${TEMP}/dmTvBSplinesInterpolateDisplacementField.hdr
)
-otb_add_test(NAME dmTuBSplinesInterpolateTransformDisplacementFieldGeneratorNew COMMAND otbDisplacementFieldTestDriver
- otbBSplinesInterpolateTransformDisplacementFieldGeneratorNew)
-
diff --git a/Modules/Registration/DisplacementField/test/otbBSplinesInterpolateDisplacementFieldGeneratorNew.cxx b/Modules/Registration/DisplacementField/test/otbBSplinesInterpolateDisplacementFieldGeneratorNew.cxx
deleted file mode 100644
index 6325bf8faa25c81b28e46150a8267fa3b4bc7ebf..0000000000000000000000000000000000000000
--- a/Modules/Registration/DisplacementField/test/otbBSplinesInterpolateDisplacementFieldGeneratorNew.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "itkPointSet.h"
-#include "otbVectorImage.h"
-#include "otbBSplinesInterpolateDisplacementFieldGenerator.h"
-
-int otbBSplinesInterpolateDisplacementFieldGeneratorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 3;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, 2> ImageType;
- typedef itk::FixedArray<double, Dimension> PointType;
- typedef itk::PointSet<PointType, Dimension> PointSetType;
-
- typedef otb::BSplinesInterpolateDisplacementFieldGenerator<PointSetType, ImageType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Registration/DisplacementField/test/otbBSplinesInterpolateTransformDisplacementFieldGeneratorNew.cxx b/Modules/Registration/DisplacementField/test/otbBSplinesInterpolateTransformDisplacementFieldGeneratorNew.cxx
deleted file mode 100644
index 6997388caa0f71d160005c3e6113b8d127878a38..0000000000000000000000000000000000000000
--- a/Modules/Registration/DisplacementField/test/otbBSplinesInterpolateTransformDisplacementFieldGeneratorNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "itkPointSet.h"
-#include "otbVectorImage.h"
-#include "otbBSplinesInterpolateTransformDisplacementFieldGenerator.h"
-
-int otbBSplinesInterpolateTransformDisplacementFieldGeneratorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef itk::Array<double> ParametersType;
- typedef itk::PointSet<ParametersType, Dimension> PointSetType;
- typedef otb::BSplinesInterpolateTransformDisplacementFieldGenerator<PointSetType, ImageType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Registration/DisplacementField/test/otbDisplacementFieldTestDriver.cxx b/Modules/Registration/DisplacementField/test/otbDisplacementFieldTestDriver.cxx
index 5091e1ca36092ac4096d4c5cddc027e2d1ba4c85..67f9c61190b8bfc60f2b8aff353b066fc0fe57cb 100644
--- a/Modules/Registration/DisplacementField/test/otbDisplacementFieldTestDriver.cxx
+++ b/Modules/Registration/DisplacementField/test/otbDisplacementFieldTestDriver.cxx
@@ -22,18 +22,10 @@
void RegisterTests()
{
- REGISTER_TEST(otbNearestTransformDisplacementFieldGeneratorNew);
REGISTER_TEST(otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator);
REGISTER_TEST(otbNNearestPointsLinearInterpolateDisplacementFieldGenerator);
- REGISTER_TEST(otbNearestPointDisplacementFieldGeneratorNew);
- REGISTER_TEST(otbPointSetToDisplacementFieldGeneratorNew);
- REGISTER_TEST(otbPointSetWithTransformToDisplacementFieldGeneratorNew);
- REGISTER_TEST(otbBSplinesInterpolateDisplacementFieldGeneratorNew);
- REGISTER_TEST(otbNNearestTransformsLinearInterpolateDisplacementFieldGeneratorNew);
- REGISTER_TEST(otbNNearestPointsLinearInterpolateDisplacementFieldGeneratorNew);
REGISTER_TEST(otbNearestTransformDisplacementFieldGenerator);
REGISTER_TEST(otbNearestPointDisplacementFieldGenerator);
REGISTER_TEST(otbBSplinesInterpolateTransformDisplacementFieldGenerator);
REGISTER_TEST(otbBSplinesInterpolateDisplacementFieldGenerator);
- REGISTER_TEST(otbBSplinesInterpolateTransformDisplacementFieldGeneratorNew);
}
diff --git a/Modules/Registration/DisplacementField/test/otbNNearestPointsLinearInterpolateDisplacementFieldGeneratorNew.cxx b/Modules/Registration/DisplacementField/test/otbNNearestPointsLinearInterpolateDisplacementFieldGeneratorNew.cxx
deleted file mode 100644
index ebb9423bbaedd40a0da9bfb74c6d9b9beb6fa48f..0000000000000000000000000000000000000000
--- a/Modules/Registration/DisplacementField/test/otbNNearestPointsLinearInterpolateDisplacementFieldGeneratorNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "itkPointSet.h"
-#include "otbVectorImage.h"
-#include "otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h"
-
-int otbNNearestPointsLinearInterpolateDisplacementFieldGeneratorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef ImageType::PointType PointType;
- typedef itk::PointSet<PointType, Dimension> PointSetType;
- typedef otb::NNearestPointsLinearInterpolateDisplacementFieldGenerator<PointSetType, ImageType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Registration/DisplacementField/test/otbNNearestTransformsLinearInterpolateDisplacementFieldGeneratorNew.cxx b/Modules/Registration/DisplacementField/test/otbNNearestTransformsLinearInterpolateDisplacementFieldGeneratorNew.cxx
deleted file mode 100644
index 7c8f410b2ef89a108a328ad4971a61312d83fe92..0000000000000000000000000000000000000000
--- a/Modules/Registration/DisplacementField/test/otbNNearestTransformsLinearInterpolateDisplacementFieldGeneratorNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "itkPointSet.h"
-#include "otbVectorImage.h"
-#include "otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h"
-
-int otbNNearestTransformsLinearInterpolateDisplacementFieldGeneratorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef ImageType::PointType PointType;
- typedef itk::PointSet<PointType, Dimension> PointSetType;
- typedef otb::NNearestTransformsLinearInterpolateDisplacementFieldGenerator<PointSetType, ImageType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Registration/DisplacementField/test/otbNearestPointDisplacementFieldGeneratorNew.cxx b/Modules/Registration/DisplacementField/test/otbNearestPointDisplacementFieldGeneratorNew.cxx
deleted file mode 100644
index 443629db1f659ef240a3d02039a919c86799f2f8..0000000000000000000000000000000000000000
--- a/Modules/Registration/DisplacementField/test/otbNearestPointDisplacementFieldGeneratorNew.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "itkPointSet.h"
-#include "otbVectorImage.h"
-#include "otbNearestPointDisplacementFieldGenerator.h"
-
-int otbNearestPointDisplacementFieldGeneratorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef itk::FixedArray<double,3> PointDataType;
- typedef itk::PointSet<PointDataType, Dimension> PointSetType;
- typedef otb::NearestPointDisplacementFieldGenerator
- <PointSetType, ImageType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Registration/DisplacementField/test/otbNearestTransformDisplacementFieldGeneratorNew.cxx b/Modules/Registration/DisplacementField/test/otbNearestTransformDisplacementFieldGeneratorNew.cxx
deleted file mode 100644
index 405acbabecb50aa091f3a2ee855832b82974355d..0000000000000000000000000000000000000000
--- a/Modules/Registration/DisplacementField/test/otbNearestTransformDisplacementFieldGeneratorNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "itkPointSet.h"
-#include "otbVectorImage.h"
-#include "otbNearestTransformDisplacementFieldGenerator.h"
-
-int otbNearestTransformDisplacementFieldGeneratorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef ImageType::PointType PointType;
- typedef itk::PointSet<PointType, Dimension> PointSetType;
- typedef otb::NearestTransformDisplacementFieldGenerator<PointSetType, ImageType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Registration/DisplacementField/test/otbPointSetToDisplacementFieldGeneratorNew.cxx b/Modules/Registration/DisplacementField/test/otbPointSetToDisplacementFieldGeneratorNew.cxx
deleted file mode 100644
index 17b121ce80b710e03275736d10a814f5694f00f7..0000000000000000000000000000000000000000
--- a/Modules/Registration/DisplacementField/test/otbPointSetToDisplacementFieldGeneratorNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "itkPointSet.h"
-#include "otbVectorImage.h"
-#include "otbPointSetToDisplacementFieldGenerator.h"
-
-int otbPointSetToDisplacementFieldGeneratorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef ImageType::PointType PointType;
- typedef itk::PointSet<PointType, Dimension> PointSetType;
- typedef otb::PointSetToDisplacementFieldGenerator<PointSetType, ImageType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Registration/DisplacementField/test/otbPointSetWithTransformToDisplacementFieldGeneratorNew.cxx b/Modules/Registration/DisplacementField/test/otbPointSetWithTransformToDisplacementFieldGeneratorNew.cxx
deleted file mode 100644
index 93e65fe8af07b9a680b156a2ae99fa3d8b914b1c..0000000000000000000000000000000000000000
--- a/Modules/Registration/DisplacementField/test/otbPointSetWithTransformToDisplacementFieldGeneratorNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-#include "itkPointSet.h"
-#include "otbVectorImage.h"
-#include "otbPointSetWithTransformToDisplacementFieldGenerator.h"
-
-int otbPointSetWithTransformToDisplacementFieldGeneratorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef ImageType::PointType PointType;
- typedef itk::PointSet<PointType, Dimension> PointSetType;
- typedef otb::PointSetWithTransformToDisplacementFieldGenerator<PointSetType, ImageType> FilterType;
-
- // Instantiating object
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Registration/Stereo/test/CMakeLists.txt b/Modules/Registration/Stereo/test/CMakeLists.txt
index 819830d0891278215d9710f4f6cc2b4b62635efe..88e60766746563434b592f27b4878309f0c468b8 100644
--- a/Modules/Registration/Stereo/test/CMakeLists.txt
+++ b/Modules/Registration/Stereo/test/CMakeLists.txt
@@ -36,9 +36,6 @@ otb_module_target_label(otbStereoTestDriver)
# Tests Declaration
-otb_add_test(NAME dmTuBijectionCoherencyFilterNew COMMAND otbStereoTestDriver
- otbBijectionCoherencyFilterNew)
-
otb_add_test(NAME dmTvBijectionCoherencyFilter COMMAND otbStereoTestDriver
--compare-image ${EPSILON_6}
${BASELINE}/dmTvBijectionCoherencyFilterOutput.tif
@@ -179,9 +176,6 @@ otb_add_test(NAME dmTuMulti3DMapToDEMFilterMeanMultiThreadMultiStream COMMAND ot
8
4)
-otb_add_test(NAME dmTuMulti3DMapTo3DEMFilterNew COMMAND otbStereoTestDriver
- otbMulti3DMapToDEMFilterNew)
-
otb_add_test(NAME dmTvMulti3DMapToDEMFilterStadiumMeanNoData COMMAND otbStereoTestDriver
--compare-image ${EPSILON_6}
${BASELINE}/dmTvMulti3DMapToDEMFilterOutputStadiumMeanNoData.tif
@@ -286,12 +280,6 @@ otb_add_test(NAME dmTvAdhesionCorrectionFilter COMMAND otbStereoTestDriver
${TEMP}/dmTuAdhesionCorrectionMethod_RiskEdges.tif
)
-otb_add_test(NAME dmTuAdhesionCorrectionFilterNew COMMAND otbStereoTestDriver
- otbAdhesionCorrectionFilterNew)
-
-otb_add_test(NAME dmTuStereoSensorModelToElevationFilterNew COMMAND otbStereoTestDriver
- otbStereoSensorModelToElevationMapFilterNew)
-
#otb_add_test(NAME dmTvStereoSensorModelToElevationFilter COMMAND otbStereoTestDriver
#--compare-image ${EPSILON_10}
#${BASELINE}/feTvStereoSensorModelToElevationFilterOutput.tif
@@ -323,5 +311,3 @@ otb_add_test(NAME dmTvStereorectificationDisplacementFieldSource COMMAND otbSter
0.5
5
)
-otb_add_test(NAME dmTuStereorectificationDisplacementFieldSourceNew COMMAND otbStereoTestDriver
- otbStereorectificationDisplacementFieldSourceNew)
diff --git a/Modules/Registration/Stereo/test/otbAdhesionCorrectionFilter.cxx b/Modules/Registration/Stereo/test/otbAdhesionCorrectionFilter.cxx
index 074221855c2717e717762cafcc9091fb036a2070..e7cd788db950cf6215f6d456df3a7bb02e73b956 100644
--- a/Modules/Registration/Stereo/test/otbAdhesionCorrectionFilter.cxx
+++ b/Modules/Registration/Stereo/test/otbAdhesionCorrectionFilter.cxx
@@ -38,14 +38,6 @@ typedef otb::ImageFileWriter<MaskImageType> MaskWriterType;
typedef otb::AdhesionCorrectionFilter<ImageType, MaskImageType> AdhesionCorrectionFilterType;
-int otbAdhesionCorrectionFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- // Instantiation
- AdhesionCorrectionFilterType::Pointer filter = AdhesionCorrectionFilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbAdhesionCorrectionFilter(int argc, char* argv[])
{
diff --git a/Modules/Registration/Stereo/test/otbBijectionCoherencyFilter.cxx b/Modules/Registration/Stereo/test/otbBijectionCoherencyFilter.cxx
index 00556a446bdb572562ce6add4f9b3ba130180a64..1ec245c232a5f20fa8b11f437ed4c782f84eaecc 100644
--- a/Modules/Registration/Stereo/test/otbBijectionCoherencyFilter.cxx
+++ b/Modules/Registration/Stereo/test/otbBijectionCoherencyFilter.cxx
@@ -34,13 +34,6 @@ typedef otb::BijectionCoherencyFilter
FloatImageType> BijectionFilterType;
-int otbBijectionCoherencyFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- // Instantiation
- BijectionFilterType::Pointer bijectFilter = BijectionFilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbBijectionCoherencyFilter(int argc, char* argv[])
{
diff --git a/Modules/Registration/Stereo/test/otbMulti3DMapToDEMFilter.cxx b/Modules/Registration/Stereo/test/otbMulti3DMapToDEMFilter.cxx
index 0480556ffd1d99d6f0ae93ebdf3fecff29f37f03..d9ac47d00d01e1dad751c62453f565a72e5b3e9d 100644
--- a/Modules/Registration/Stereo/test/otbMulti3DMapToDEMFilter.cxx
+++ b/Modules/Registration/Stereo/test/otbMulti3DMapToDEMFilter.cxx
@@ -36,13 +36,6 @@ typedef otb::Multi3DMapToDEMFilter
ImageType> Multi3DFilterType;
-int otbMulti3DMapToDEMFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- // Instantiation
- Multi3DFilterType::Pointer multiFilter = Multi3DFilterType::New();
-
- return EXIT_SUCCESS;
-}
int otbMulti3DMapToDEMFilterEPSG(int argc, char* argv[])
{
diff --git a/Modules/Registration/Stereo/test/otbStereoSensorModelToElevationMapFilter.cxx b/Modules/Registration/Stereo/test/otbStereoSensorModelToElevationMapFilter.cxx
index 5b712b557cd6c4a38afac84694472ec05eb024ae..6ac2cae87cba7ee51fe4441d99fbc0157c9e7b4a 100644
--- a/Modules/Registration/Stereo/test/otbStereoSensorModelToElevationMapFilter.cxx
+++ b/Modules/Registration/Stereo/test/otbStereoSensorModelToElevationMapFilter.cxx
@@ -47,14 +47,6 @@ typedef itk::MedianImageFilter<HeightImageType, HeightImageType> MedianFilterTyp
typedef otb::ImageFileWriter<HeightImageType> WriterType;
-int otbStereoSensorModelToElevationMapFilterNew( int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- // Instantiation
- StereoFilterType::Pointer stereoFilter = StereoFilterType::New();
-
-
- return EXIT_SUCCESS;
-}
int otbStereoSensorModelToElevationMapFilter( int itkNotUsed(argc), char * argv[] )
diff --git a/Modules/Registration/Stereo/test/otbStereoTestDriver.cxx b/Modules/Registration/Stereo/test/otbStereoTestDriver.cxx
index bfabe47641b980b5c582590e473f2a7b47008272..d766773992b9f9145204b0c0af1aac54216666be 100644
--- a/Modules/Registration/Stereo/test/otbStereoTestDriver.cxx
+++ b/Modules/Registration/Stereo/test/otbStereoTestDriver.cxx
@@ -22,16 +22,11 @@
void RegisterTests()
{
- REGISTER_TEST(otbBijectionCoherencyFilterNew);
REGISTER_TEST(otbBijectionCoherencyFilter);
- REGISTER_TEST(otbMulti3DMapToDEMFilterNew);
REGISTER_TEST(otbMulti3DMapToDEMFilterEPSG);
REGISTER_TEST(otbMulti3DMapToDEMFilterManual);
REGISTER_TEST(otbMulti3DMapToDEMFilter);
- REGISTER_TEST(otbAdhesionCorrectionFilterNew);
REGISTER_TEST(otbAdhesionCorrectionFilter);
- REGISTER_TEST(otbStereoSensorModelToElevationMapFilterNew);
REGISTER_TEST(otbStereoSensorModelToElevationMapFilter);
REGISTER_TEST(otbStereorectificationDisplacementFieldSource);
- REGISTER_TEST(otbStereorectificationDisplacementFieldSourceNew);
}
diff --git a/Modules/Registration/Stereo/test/otbStereorectificationDisplacementFieldSource.cxx b/Modules/Registration/Stereo/test/otbStereorectificationDisplacementFieldSource.cxx
index ab75dce14670e47c03ad05e0b38c90abcdb57966..65a17072606bba1473f7b1fcb77da3d1414bc1ab 100644
--- a/Modules/Registration/Stereo/test/otbStereorectificationDisplacementFieldSource.cxx
+++ b/Modules/Registration/Stereo/test/otbStereorectificationDisplacementFieldSource.cxx
@@ -31,13 +31,6 @@ typedef otb::StereorectificationDisplacementFieldSource
typedef otb::ImageFileReader<ImageType> ReaderType;
typedef otb::ImageFileWriter<DisplacementFieldType> WriterType;
-int otbStereorectificationDisplacementFieldSourceNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- // Instantiation
- DisplacementFieldSourceType::Pointer dfSource = DisplacementFieldSourceType::New();
-
- return EXIT_SUCCESS;
-}
int otbStereorectificationDisplacementFieldSource(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Segmentation/CCOBIA/test/CMakeLists.txt b/Modules/Segmentation/CCOBIA/test/CMakeLists.txt
index 8f44da8b0f9ab17162f23d8a0838909d0191e75d..188266eccf113ba53dcf56191df533cc8f4379ae 100644
--- a/Modules/Segmentation/CCOBIA/test/CMakeLists.txt
+++ b/Modules/Segmentation/CCOBIA/test/CMakeLists.txt
@@ -25,7 +25,6 @@ otbCCOBIATestDriver.cxx
otbStreamingConnectedComponentOBIATest.cxx
otbConnectedComponentMuParserFunctorTest.cxx
otbMeanShiftStreamingConnectedComponentOBIATest.cxx
-otbLabelObjectOpeningMuParserFilterNew.cxx
otbLabelObjectOpeningMuParserFilterTest.cxx
)
@@ -35,9 +34,6 @@ otb_module_target_label(otbCCOBIATestDriver)
# Tests Declaration
-otb_add_test(NAME obTuStreamingConnectedComponentSegmentationOBIAToVectorDataFilterNew COMMAND otbCCOBIATestDriver
- otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilterNew)
-
otb_add_test(NAME obTvStreamingConnectedComponentSegmentationOBIAToVectorDataFilter COMMAND otbCCOBIATestDriver
--compare-ogr ${NOTOL}
${BASELINE_FILES}/obTvStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.shp
@@ -84,9 +80,6 @@ otb_add_test(NAME obTuMeanShiftStreamingConnectedComponentSegmentationOBIAToVect
"SHAPE_Elongation>10"
5)
-otb_add_test(NAME bfTuLabelObjectOpeningMuParserFilterNew COMMAND otbCCOBIATestDriver
- otbLabelObjectOpeningMuParserFilterNew
- )
otb_add_test(NAME bfTvLabelObjectOpeningMuParserFilterTest COMMAND otbCCOBIATestDriver
--compare-image ${NOTOL}
diff --git a/Modules/Segmentation/CCOBIA/test/otbCCOBIATestDriver.cxx b/Modules/Segmentation/CCOBIA/test/otbCCOBIATestDriver.cxx
index 1d1ea1485b2d9ed79cd139b17a03d0028cc15c74..1a766662d3b6d03d7170f56038014752395ba9c7 100644
--- a/Modules/Segmentation/CCOBIA/test/otbCCOBIATestDriver.cxx
+++ b/Modules/Segmentation/CCOBIA/test/otbCCOBIATestDriver.cxx
@@ -22,10 +22,8 @@
void RegisterTests()
{
- REGISTER_TEST(otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilterNew);
REGISTER_TEST(otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter);
REGISTER_TEST(otbConnectedComponentMuParserFunctorTest);
REGISTER_TEST(otbMeanShiftStreamingConnectedComponentSegmentationOBIAToVectorDataFilter);
- REGISTER_TEST(otbLabelObjectOpeningMuParserFilterNew);
REGISTER_TEST(otbLabelObjectOpeningMuParserFilterTest);
}
diff --git a/Modules/Segmentation/CCOBIA/test/otbLabelObjectOpeningMuParserFilterNew.cxx b/Modules/Segmentation/CCOBIA/test/otbLabelObjectOpeningMuParserFilterNew.cxx
deleted file mode 100644
index affb5f5a7151f5718d7932bbf899cfccfb56cab2..0000000000000000000000000000000000000000
--- a/Modules/Segmentation/CCOBIA/test/otbLabelObjectOpeningMuParserFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "itkLabelMap.h"
-#include "otbAttributesMapLabelObject.h"
-#include "otbLabelObjectOpeningMuParserFilter.h"
-
-int otbLabelObjectOpeningMuParserFilterNew( int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
-
- const unsigned int Dimension = 2;
-
- typedef otb::AttributesMapLabelObject<unsigned int, Dimension, double> AttributesMapLabelObjectType;
- typedef itk::LabelMap<AttributesMapLabelObjectType> AttributesLabelMapType;
- typedef otb::LabelObjectOpeningMuParserFilter<AttributesLabelMapType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- return EXIT_SUCCESS;
-
-}
diff --git a/Modules/Segmentation/CCOBIA/test/otbStreamingConnectedComponentOBIATest.cxx b/Modules/Segmentation/CCOBIA/test/otbStreamingConnectedComponentOBIATest.cxx
index 874fe9f9987c969b0eed38a47f2155b7f738c47a..c48597c40e593d8cc3837c05c449454de7e03740 100644
--- a/Modules/Segmentation/CCOBIA/test/otbStreamingConnectedComponentOBIATest.cxx
+++ b/Modules/Segmentation/CCOBIA/test/otbStreamingConnectedComponentOBIATest.cxx
@@ -43,14 +43,6 @@ typedef otb::StreamingConnectedComponentSegmentationOBIAToVectorDataFilter
MaskImageType,
VectorDataType > ConnectedComponentSegmentationOBIAToVectorDataFilterType;
-int otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- ConnectedComponentSegmentationOBIAToVectorDataFilterType::FilterType::Pointer connected
- = ConnectedComponentSegmentationOBIAToVectorDataFilterType::FilterType::New();
- std::cout << connected << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Segmentation/Conversion/test/CMakeLists.txt b/Modules/Segmentation/Conversion/test/CMakeLists.txt
index 6cbb528c50a0520ca4f52fa3c9190873a763fa28..0c4244e578a1f32b4895076f218d0b21152392e1 100644
--- a/Modules/Segmentation/Conversion/test/CMakeLists.txt
+++ b/Modules/Segmentation/Conversion/test/CMakeLists.txt
@@ -24,8 +24,6 @@ set(OTBConversionTests
otbConversionTestDriver.cxx
otbVectorDataToLabelMapFilter.cxx
otbOGRDataSourceToLabelImageFilter.cxx
-otbVectorDataToLabelMapFilterNew.cxx
-otbLabelImageToVectorDataFilterNew.cxx
otbLabelImageToVectorDataFilter.cxx
otbLabelImageToOGRDataSourceFilter.cxx
otbVectorDataToLabelImageFilter.cxx
@@ -34,7 +32,6 @@ otbVectorDataRasterizeFilter.cxx
otbLabelImageRegionPruningFilter.cxx
otbLabelImageRegionMergingFilter.cxx
otbLabelMapToVectorDataFilter.cxx
-otbLabelMapToVectorDataFilterNew.cxx
)
add_executable(otbConversionTestDriver ${OTBConversionTests})
@@ -48,9 +45,6 @@ otb_add_test(NAME obTvVectorDataToLabelMapFilter COMMAND otbConversionTestDriver
${INPUTDATA}/vectorIOexample_gis_to_vec.shp
${TEMP}/vectordataToLabelMap.png)
-otb_add_test(NAME coTuOGRDataSourceToLabelImageFilterNew COMMAND otbConversionTestDriver
- otbOGRDataSourceToLabelImageFilterNew
- )
otb_add_test(NAME coTvOGRDataSourceToLabelImageFilterSHP COMMAND otbConversionTestDriver
--compare-image 0.0
@@ -74,12 +68,6 @@ otb_add_test(NAME bfTvOGRDataSourceToLabelImageFilterSHPForegroundMode COMMAND o
0 0 255
)
-otb_add_test(NAME obTuVectorDataToLabelMapFilterNew COMMAND otbConversionTestDriver
- otbVectorDataToLabelMapFilterNew)
-
-otb_add_test(NAME obTuLabelImageToVectorDataFilterNew COMMAND otbConversionTestDriver
- otbLabelImageToVectorDataFilterNew)
-
otb_add_test(NAME obTvLabelImageToVectorDataFilter COMMAND otbConversionTestDriver
--compare-ogr ${NOTOL}
${BASELINE_FILES}/obTuLabelImageToVectorDataFilter.shp
@@ -89,17 +77,11 @@ otb_add_test(NAME obTvLabelImageToVectorDataFilter COMMAND otbConversionTestDriv
${TEMP}/obTuLabelImageToVectorDataFilter.shp
)
-otb_add_test(NAME obTuLabelImageToOGRDataSourceFilterNew COMMAND otbConversionTestDriver
- otbLabelImageToOGRDataSourceFilterNew)
-
otb_add_test(NAME obTvLabelImageToOGRDataSourceFilter COMMAND otbConversionTestDriver
otbLabelImageToOGRDataSourceFilter
${INPUTDATA}/labelImage_UnsignedChar.tif
)
-otb_add_test(NAME bfTuVectorDataToLabelImageFilterNew COMMAND otbConversionTestDriver
- otbVectorDataToLabelImageFilterNew
- )
otb_add_test(NAME bfTvVectorDataToLabelImageFilterSHP COMMAND otbConversionTestDriver
--compare-image 0.0
@@ -141,9 +123,6 @@ otb_add_test(NAME bfTvVectorDataRasterizeFilterKML COMMAND otbConversionTestDriv
${TEMP}/bfTvVectorDataRasterizeFilter_OutputKML.tif
)
-otb_add_test(NAME bfTuVectorDataRasterizeFilterNew COMMAND otbConversionTestDriver
- otbVectorDataRasterizeFilterNew
- )
otb_add_test(NAME bfTvVectorDataRasterizeFilterSHP COMMAND otbConversionTestDriver
--compare-image 0.0001
@@ -231,6 +210,3 @@ otb_add_test(NAME obTvLabelMapToVectorDataFilter COMMAND otbConversionTestDriver
${INPUTDATA}/rcc8_mire1.png
${TEMP}/obTvLabelMapToVectorDataFilter.shp)
-otb_add_test(NAME obTuLabelMapToVectorDataFilterNew COMMAND otbConversionTestDriver
- otbLabelMapToVectorDataFilterNew)
-
diff --git a/Modules/Segmentation/Conversion/test/otbConversionTestDriver.cxx b/Modules/Segmentation/Conversion/test/otbConversionTestDriver.cxx
index c8fe382300ca6ca463e0d198e3f38c94d1a5da6a..585781cca082a11553a2a5bf095eeed3c1ae4fce 100644
--- a/Modules/Segmentation/Conversion/test/otbConversionTestDriver.cxx
+++ b/Modules/Segmentation/Conversion/test/otbConversionTestDriver.cxx
@@ -23,20 +23,13 @@
void RegisterTests()
{
REGISTER_TEST(otbVectorDataToLabelMapFilter);
- REGISTER_TEST(otbOGRDataSourceToLabelImageFilterNew);
REGISTER_TEST(otbOGRDataSourceToLabelImageFilter);
- REGISTER_TEST(otbVectorDataToLabelMapFilterNew);
- REGISTER_TEST(otbLabelImageToVectorDataFilterNew);
REGISTER_TEST(otbLabelImageToVectorDataFilter);
- REGISTER_TEST(otbLabelImageToOGRDataSourceFilterNew);
REGISTER_TEST(otbLabelImageToOGRDataSourceFilter);
- REGISTER_TEST(otbVectorDataToLabelImageFilterNew);
REGISTER_TEST(otbVectorDataToLabelImageFilter);
REGISTER_TEST(otbPolygonizationRasterizationTest);
- REGISTER_TEST(otbVectorDataRasterizeFilterNew);
REGISTER_TEST(otbVectorDataRasterizeFilter);
REGISTER_TEST(otbLabelImageRegionPruningFilter);
REGISTER_TEST(otbLabelImageRegionMergingFilter);
REGISTER_TEST(otbLabelMapToVectorDataFilter);
- REGISTER_TEST(otbLabelMapToVectorDataFilterNew);
}
diff --git a/Modules/Segmentation/Conversion/test/otbLabelImageToOGRDataSourceFilter.cxx b/Modules/Segmentation/Conversion/test/otbLabelImageToOGRDataSourceFilter.cxx
index a9fa92cd720d919475539135fc26fd84592c7c0d..2da8b6a795a771c8293b6e2df6b403cae440a926 100644
--- a/Modules/Segmentation/Conversion/test/otbLabelImageToOGRDataSourceFilter.cxx
+++ b/Modules/Segmentation/Conversion/test/otbLabelImageToOGRDataSourceFilter.cxx
@@ -25,19 +25,6 @@
#include "otbImageFileReader.h"
#include "otbVectorDataFileWriter.h"
-int otbLabelImageToOGRDataSourceFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned short LabelType;
- typedef otb::Image<LabelType, Dimension> InputLabelImageType;
-
- typedef otb::LabelImageToOGRDataSourceFilter<InputLabelImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
-
- return EXIT_SUCCESS;
-}
int otbLabelImageToOGRDataSourceFilter(int argc, char * argv[])
diff --git a/Modules/Segmentation/Conversion/test/otbLabelImageToVectorDataFilterNew.cxx b/Modules/Segmentation/Conversion/test/otbLabelImageToVectorDataFilterNew.cxx
deleted file mode 100644
index cc2de658209ff68313a4088b671307d542d690b8..0000000000000000000000000000000000000000
--- a/Modules/Segmentation/Conversion/test/otbLabelImageToVectorDataFilterNew.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbLabelImageToVectorDataFilter.h"
-#include "otbImage.h"
-
-int otbLabelImageToVectorDataFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned short LabelType;
- typedef otb::Image<LabelType, Dimension> InputLabelImageType;
-
- typedef otb::LabelImageToVectorDataFilter<InputLabelImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Segmentation/Conversion/test/otbLabelMapToVectorDataFilterNew.cxx b/Modules/Segmentation/Conversion/test/otbLabelMapToVectorDataFilterNew.cxx
deleted file mode 100644
index 75b4981af8eae9be2dfc0a6c8796729e524501af..0000000000000000000000000000000000000000
--- a/Modules/Segmentation/Conversion/test/otbLabelMapToVectorDataFilterNew.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbLabelMapToVectorDataFilter.h"
-#include "otbVectorData.h"
-#include "itkAttributeLabelObject.h"
-
-int otbLabelMapToVectorDataFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- const int dim = 2;
- typedef otb::VectorData<> VectorDataType;
-
- typedef itk::AttributeLabelObject<unsigned long, dim, double> LabelObjectType;
-
- typedef itk::LabelMap<LabelObjectType> LabelMapType;
-
- typedef otb::LabelMapToVectorDataFilter<LabelMapType, VectorDataType> LabelMapToVectorDataFilterType;
-
- LabelMapToVectorDataFilterType::Pointer filter = LabelMapToVectorDataFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Segmentation/Conversion/test/otbOGRDataSourceToLabelImageFilter.cxx b/Modules/Segmentation/Conversion/test/otbOGRDataSourceToLabelImageFilter.cxx
index 28e1a800a7088252df0a686b286e7bb2488b608c..efc70f79c26686b6dfffcc6d48c4d79739d5389f 100644
--- a/Modules/Segmentation/Conversion/test/otbOGRDataSourceToLabelImageFilter.cxx
+++ b/Modules/Segmentation/Conversion/test/otbOGRDataSourceToLabelImageFilter.cxx
@@ -32,11 +32,6 @@ typedef otb::ImageFileReader<ImageType> ReaderType;
typedef otb::ImageFileWriter<ImageType> WriterType;
typedef otb::OGRDataSourceToLabelImageFilter<ImageType> RasterizationFilterType;
-int otbOGRDataSourceToLabelImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- RasterizationFilterType::Pointer rasterization = RasterizationFilterType::New();
- return EXIT_SUCCESS;
-}
int otbOGRDataSourceToLabelImageFilter(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Segmentation/Conversion/test/otbVectorDataRasterizeFilter.cxx b/Modules/Segmentation/Conversion/test/otbVectorDataRasterizeFilter.cxx
index f94e14981ae9af608f24fec9ac4bc14b4d5ab0f2..b6728b40b7429d0a8fde60c93776e68fb49ccc25 100644
--- a/Modules/Segmentation/Conversion/test/otbVectorDataRasterizeFilter.cxx
+++ b/Modules/Segmentation/Conversion/test/otbVectorDataRasterizeFilter.cxx
@@ -39,11 +39,6 @@ typedef otb::RasterizeVectorDataFilter<VectorDataType,
ImageType,
ImageType> RasterizationFilterType;
-int otbVectorDataRasterizeFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- RasterizationFilterType::Pointer rasterization = RasterizationFilterType::New();
- return EXIT_SUCCESS;
-}
int otbVectorDataRasterizeFilter(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Segmentation/Conversion/test/otbVectorDataToLabelImageFilter.cxx b/Modules/Segmentation/Conversion/test/otbVectorDataToLabelImageFilter.cxx
index f9462f22dc01404487e04cd7d1b7007a238b1c7b..466be1580c834a36c73e52025f7ad8dd91aebf70 100644
--- a/Modules/Segmentation/Conversion/test/otbVectorDataToLabelImageFilter.cxx
+++ b/Modules/Segmentation/Conversion/test/otbVectorDataToLabelImageFilter.cxx
@@ -38,11 +38,6 @@ typedef otb::ImageFileWriter<ImageType> WriterType;
typedef otb::VectorDataToLabelImageFilter<VectorDataType,
ImageType> RasterizationFilterType;
-int otbVectorDataToLabelImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- RasterizationFilterType::Pointer rasterization = RasterizationFilterType::New();
- return EXIT_SUCCESS;
-}
int otbVectorDataToLabelImageFilter(int itkNotUsed(argc), char * argv[])
{
diff --git a/Modules/Segmentation/Conversion/test/otbVectorDataToLabelMapFilterNew.cxx b/Modules/Segmentation/Conversion/test/otbVectorDataToLabelMapFilterNew.cxx
deleted file mode 100644
index eac3bb87369979b8ccd18c4c6e27d943070420cc..0000000000000000000000000000000000000000
--- a/Modules/Segmentation/Conversion/test/otbVectorDataToLabelMapFilterNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbMacro.h"
-
-#include "otbVectorDataToLabelMapFilter.h"
-#include "otbAttributesMapLabelObject.h"
-
-int otbVectorDataToLabelMapFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef unsigned short LabelType;
- const unsigned int Dimension = 2;
- typedef otb::VectorData<double, Dimension> VectorDataType;
- typedef otb::AttributesMapLabelObject<LabelType, Dimension, double> LabelObjectType;
- typedef itk::LabelMap<LabelObjectType> OutputLabelMapType;
-
- typedef otb::VectorDataToLabelMapFilter<VectorDataType, OutputLabelMapType> VectorDataToLabelMapFilterType;
-
- //Instantiation
- VectorDataToLabelMapFilterType::Pointer filter = VectorDataToLabelMapFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Segmentation/Labelling/test/CMakeLists.txt b/Modules/Segmentation/Labelling/test/CMakeLists.txt
index b56ecb727fe190abd0df01a075e2507fa21a373e..9b3b21b8917be3a003016e9b4a76fd7faa68c81c 100644
--- a/Modules/Segmentation/Labelling/test/CMakeLists.txt
+++ b/Modules/Segmentation/Labelling/test/CMakeLists.txt
@@ -24,11 +24,7 @@ set(OTBLabellingTests
otbLabellingTestDriver.cxx
otbLabelizeConfidenceConnectedImageFilter.cxx
otbLabelizeConnectedThresholdImageFilter.cxx
-otbLabelizeConnectedThresholdImageFilterNew.cxx
-otbLabelizeNeighborhoodConnectedImageFilterNew.cxx
otbLabelizeNeighborhoodConnectedImageFilter.cxx
-otbLabelizeConfidenceConnectedImageFilterNew.cxx
-otbLabelToBoundaryImageFilterNew.cxx
otbLabelToBoundaryImageFilter.cxx
)
@@ -59,12 +55,6 @@ otb_add_test(NAME bfTvLabelizeConnectedThresholdImageFilter COMMAND otbLabelling
80 80
)
-otb_add_test(NAME bfTuLabelizeConnectedThresholdImageFilterNew COMMAND otbLabellingTestDriver
- otbLabelizeConnectedThresholdImageFilterNew)
-
-otb_add_test(NAME bfTuLabelizeNeighborhoodConnectedImageFilterNew COMMAND otbLabellingTestDriver
- otbLabelizeNeighborhoodConnectedImageFilterNew)
-
otb_add_test(NAME bfTvLabelizeNeighborhoodConnectedImageFilter COMMAND otbLabellingTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfTvLabelizeNeighborhoodConnectedImageFilterOutput.png
@@ -76,12 +66,6 @@ otb_add_test(NAME bfTvLabelizeNeighborhoodConnectedImageFilter COMMAND otbLabell
80 80
)
-otb_add_test(NAME bfTuLabelizeConfidenceConnectedImageFilterNew COMMAND otbLabellingTestDriver
- otbLabelizeConfidenceConnectedImageFilterNew)
-
-otb_add_test(NAME bfTuLabelToBoundaryImageFilterNew COMMAND otbLabellingTestDriver
- otbLabelToBoundaryImageFilterNew)
-
otb_add_test(NAME bfTvLabelToBoundaryImageFilter COMMAND otbLabellingTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfTvLabelToBoundaryImageFilterOutput.tif
diff --git a/Modules/Segmentation/Labelling/test/otbLabelToBoundaryImageFilterNew.cxx b/Modules/Segmentation/Labelling/test/otbLabelToBoundaryImageFilterNew.cxx
deleted file mode 100644
index 06b5f07666cf401f8df65dea6bf9d88c91d307b5..0000000000000000000000000000000000000000
--- a/Modules/Segmentation/Labelling/test/otbLabelToBoundaryImageFilterNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbLabelToBoundaryImageFilter.h"
-#include "otbImage.h"
-
-int otbLabelToBoundaryImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned int InputPixelType;
- typedef unsigned char OutputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
-
- typedef otb::LabelToBoundaryImageFilter
- <InputImageType, OutputImageType> BoundaryFilterType;
- typedef BoundaryFilterType::Pointer BoundaryFilterPointerType;
-
- BoundaryFilterPointerType filter = BoundaryFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Segmentation/Labelling/test/otbLabelizeConfidenceConnectedImageFilterNew.cxx b/Modules/Segmentation/Labelling/test/otbLabelizeConfidenceConnectedImageFilterNew.cxx
deleted file mode 100644
index 77f46b49e385e33cab6347a0d67c665f376945e0..0000000000000000000000000000000000000000
--- a/Modules/Segmentation/Labelling/test/otbLabelizeConfidenceConnectedImageFilterNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbLabelizeConfidenceConnectedImageFilter.h"
-#include "otbImage.h"
-
-int otbLabelizeConfidenceConnectedImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned char InputPixelType;
- typedef unsigned char OutputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
-
- typedef otb::LabelizeConfidenceConnectedImageFilter
- <InputImageType, OutputImageType> LabelizeFilterType;
- typedef LabelizeFilterType::Pointer LabelizeFilterPointerType;
-
- LabelizeFilterPointerType filter = LabelizeFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Segmentation/Labelling/test/otbLabelizeConnectedThresholdImageFilterNew.cxx b/Modules/Segmentation/Labelling/test/otbLabelizeConnectedThresholdImageFilterNew.cxx
deleted file mode 100644
index 23aff183101a5537b202b555825c4a7f98c0b4e8..0000000000000000000000000000000000000000
--- a/Modules/Segmentation/Labelling/test/otbLabelizeConnectedThresholdImageFilterNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbLabelizeConnectedThresholdImageFilter.h"
-#include "otbImage.h"
-
-int otbLabelizeConnectedThresholdImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned char InputPixelType;
- typedef unsigned char OutputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
-
- typedef otb::LabelizeConnectedThresholdImageFilter
- <InputImageType, OutputImageType> LabelizeFilterType;
- typedef LabelizeFilterType::Pointer LabelizeFilterPointerType;
-
- LabelizeFilterPointerType filter = LabelizeFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Segmentation/Labelling/test/otbLabelizeNeighborhoodConnectedImageFilterNew.cxx b/Modules/Segmentation/Labelling/test/otbLabelizeNeighborhoodConnectedImageFilterNew.cxx
deleted file mode 100644
index db1da3bf1e4cfc7adb1fb78e6fa84ed33f17ccc1..0000000000000000000000000000000000000000
--- a/Modules/Segmentation/Labelling/test/otbLabelizeNeighborhoodConnectedImageFilterNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "otbLabelizeNeighborhoodConnectedImageFilter.h"
-#include "otbImage.h"
-
-int otbLabelizeNeighborhoodConnectedImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef unsigned char InputPixelType;
- typedef unsigned char OutputPixelType;
- const unsigned int Dimension = 2;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
-
- typedef otb::LabelizeNeighborhoodConnectedImageFilter
- <InputImageType, OutputImageType> LabelizeFilterType;
- typedef LabelizeFilterType::Pointer LabelizeFilterPointerType;
-
- LabelizeFilterPointerType filter = LabelizeFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Segmentation/Labelling/test/otbLabellingTestDriver.cxx b/Modules/Segmentation/Labelling/test/otbLabellingTestDriver.cxx
index a5c17ec3e03b7e60b00e02fad8efaed6c14cacea..0726bcc14a0f3d7b02be720da57fba3151181ea5 100644
--- a/Modules/Segmentation/Labelling/test/otbLabellingTestDriver.cxx
+++ b/Modules/Segmentation/Labelling/test/otbLabellingTestDriver.cxx
@@ -24,10 +24,6 @@ void RegisterTests()
{
REGISTER_TEST(otbLabelizeConfidenceConnectedImageFilter);
REGISTER_TEST(otbLabelizeConnectedThresholdImageFilter);
- REGISTER_TEST(otbLabelizeConnectedThresholdImageFilterNew);
- REGISTER_TEST(otbLabelizeNeighborhoodConnectedImageFilterNew);
REGISTER_TEST(otbLabelizeNeighborhoodConnectedImageFilter);
- REGISTER_TEST(otbLabelizeConfidenceConnectedImageFilterNew);
REGISTER_TEST(otbLabelToBoundaryImageFilter);
- REGISTER_TEST(otbLabelToBoundaryImageFilterNew);
}
diff --git a/Modules/Segmentation/Metrics/test/CMakeLists.txt b/Modules/Segmentation/Metrics/test/CMakeLists.txt
index 17579f848888a2c8f210f593c9a30451f163b9ac..b61ebeee945e127907d15561e94805a16c013d88 100644
--- a/Modules/Segmentation/Metrics/test/CMakeLists.txt
+++ b/Modules/Segmentation/Metrics/test/CMakeLists.txt
@@ -22,8 +22,6 @@ otb_module_test()
set(OTBMetricsTests
otbMetricsTestDriver.cxx
-otbHooverMatrixFilterNew.cxx
-otbHooverInstanceFilterNew.cxx
otbHooverInstanceFilterToAttributeImage.cxx
otbHooverMatrixFilter.cxx
)
@@ -34,12 +32,6 @@ otb_module_target_label(otbMetricsTestDriver)
# Tests Declaration
-otb_add_test(NAME obTuHooverMatrixFilterNew COMMAND otbMetricsTestDriver
- otbHooverMatrixFilterNew)
-
-otb_add_test(NAME obTuHooverInstanceFilterNew COMMAND otbMetricsTestDriver
- otbHooverInstanceFilterNew)
-
otb_add_test(NAME obTvHooverInstanceFilterToAttributeImage COMMAND otbMetricsTestDriver
--compare-image ${EPSILON_9}
${BASELINE}/obTvHooverInstanceFilterToAttributeImage.tif
diff --git a/Modules/Segmentation/Metrics/test/otbHooverInstanceFilterNew.cxx b/Modules/Segmentation/Metrics/test/otbHooverInstanceFilterNew.cxx
deleted file mode 100644
index 8ff6f8cab9bdd3f2e68242ce4263f3e8355c29a5..0000000000000000000000000000000000000000
--- a/Modules/Segmentation/Metrics/test/otbHooverInstanceFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbHooverInstanceFilter.h"
-
-#include "itkLabelMap.h"
-#include "otbAttributesMapLabelObject.h"
-
-int otbHooverInstanceFilterNew(int itkNotUsed(argc), char* itkNotUsed(argv)[])
-{
- typedef otb::AttributesMapLabelObject<unsigned int, 2, float> LabelObjectType;
- typedef itk::LabelMap<LabelObjectType> LabelMapType;
- typedef otb::HooverInstanceFilter<LabelMapType> HooverInstanceFilterType;
-
- // instantiation
- HooverInstanceFilterType::Pointer object = HooverInstanceFilterType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Segmentation/Metrics/test/otbHooverMatrixFilterNew.cxx b/Modules/Segmentation/Metrics/test/otbHooverMatrixFilterNew.cxx
deleted file mode 100644
index e9c2336a988503a53a6a2a2ad7c7f8dde4fbefe8..0000000000000000000000000000000000000000
--- a/Modules/Segmentation/Metrics/test/otbHooverMatrixFilterNew.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "otbHooverMatrixFilter.h"
-
-#include "itkLabelMap.h"
-#include "itkLabelObject.h"
-
-int otbHooverMatrixFilterNew(int itkNotUsed(argc), char* itkNotUsed(argv)[])
-{
- typedef itk::LabelObject<unsigned int, 2> LabelObjectType;
- typedef itk::LabelMap<LabelObjectType> LabelMapType;
- typedef otb::HooverMatrixFilter<LabelMapType> HooverMatrixFilterType;
-
- // instantiation
- HooverMatrixFilterType::Pointer object = HooverMatrixFilterType::New();
-
- std::cout << object << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Segmentation/Metrics/test/otbMetricsTestDriver.cxx b/Modules/Segmentation/Metrics/test/otbMetricsTestDriver.cxx
index d0ee80da1462acff88d28aba0b96214fc50baf9d..0e24b2d60a0a6e5353ce4d2a735966ebf3abf68d 100644
--- a/Modules/Segmentation/Metrics/test/otbMetricsTestDriver.cxx
+++ b/Modules/Segmentation/Metrics/test/otbMetricsTestDriver.cxx
@@ -22,8 +22,6 @@
void RegisterTests()
{
- REGISTER_TEST(otbHooverMatrixFilterNew);
- REGISTER_TEST(otbHooverInstanceFilterNew);
REGISTER_TEST(otbHooverInstanceFilterToAttributeImage);
REGISTER_TEST(otbHooverMatrixFilter);
}
diff --git a/Modules/Segmentation/MorphologicalProfiles/test/CMakeLists.txt b/Modules/Segmentation/MorphologicalProfiles/test/CMakeLists.txt
index ca15ae150fd62776f1c95256d7d59bb1dbcc7187..4a800172d7bc9ba175d2d4d30c05c9cebd67135a 100644
--- a/Modules/Segmentation/MorphologicalProfiles/test/CMakeLists.txt
+++ b/Modules/Segmentation/MorphologicalProfiles/test/CMakeLists.txt
@@ -23,26 +23,15 @@ otb_module_test()
set(OTBMorphologicalProfilesTests
otbMorphologicalProfilesTestDriver.cxx
otbMorphologicalProfilesSegmentationFilter.cxx
-otbProfileToProfileDerivativeFilterNew.cxx
otbGeodesicMorphologyDecompositionImageFilter.cxx
-otbMorphologicalClosingProfileFilterNew.cxx
otbConvexOrConcaveClassificationFilter.cxx
otbGeodesicMorphologyLevelingFilter.cxx
-otbConvexOrConcaveClassificationFilterNew.cxx
otbMultiScaleConvexOrConcaveClassificationFilter.cxx
otbMorphologicalOpeningProfileFilter.cxx
otbGeodesicMorphologyIterativeDecompositionImageFilter.cxx
-otbGeodesicMorphologyIterativeDecompositionImageFilterNew.cxx
-otbGeodesicMorphologyLevelingFilterNew.cxx
otbClosingOpeningMorphologicalFilter.cxx
-otbProfileDerivativeToMultiScaleCharacteristicsFilterNew.cxx
otbProfileToProfileDerivativeFilter.cxx
-otbOpeningClosingMorphologicalFilterNew.cxx
-otbGeodesicMorphologyDecompositionImageFilterNew.cxx
-otbMorphologicalOpeningProfileFilterNew.cxx
otbProfileDerivativeToMultiScaleCharacteristicsFilter.cxx
-otbMultiScaleConvexOrConcaveClassificationFilterNew.cxx
-otbClosingOpeningMorphologicalFilterNew.cxx
otbOpeningClosingMorphologicalFilter.cxx
otbMorphologicalClosingProfileFilter.cxx
)
@@ -65,9 +54,6 @@ otb_add_test(NAME obTvMorphologicalProfilesSegmentationFilter COMMAND otbMorphol
5
)
-otb_add_test(NAME msTuProfileToProfileDerivativeFilterNew COMMAND otbMorphologicalProfilesTestDriver
- otbProfileToProfileDerivativeFilterNew)
-
otb_add_test(NAME msTvGeodesicMorphologyDecompositionImageFilter COMMAND otbMorphologicalProfilesTestDriver
--compare-n-images ${NOTOL} 3
${BASELINE}/msGeodesicMorphologyDecompositionImageFilterConvexOutput.tif
@@ -84,9 +70,6 @@ otb_add_test(NAME msTvGeodesicMorphologyDecompositionImageFilter COMMAND otbMorp
4
)
-otb_add_test(NAME msTuMorphologicalClosingProfileFilterNew COMMAND otbMorphologicalProfilesTestDriver
- otbMorphologicalClosingProfileFilterNew)
-
otb_add_test(NAME msTvConvexOrConcaveClassificationFilter COMMAND otbMorphologicalProfilesTestDriver
--compare-image ${NOTOL}
${BASELINE}/msConvexOrConcaveClassificationFilterOutput.png
@@ -109,9 +92,6 @@ otb_add_test(NAME msTvGeodesicMorphologyLevelingFilter COMMAND otbMorphologicalP
${TEMP}/msGeodesicMorphologyLevelingFilterOutput.tif
)
-otb_add_test(NAME msTuConvexOrConcaveClassificationFilterNew COMMAND otbMorphologicalProfilesTestDriver
- otbConvexOrConcaveClassificationFilterNew)
-
otb_add_test(NAME msTvMultiScaleConvexOrConcaveClassificationFilter COMMAND otbMorphologicalProfilesTestDriver
--compare-image ${NOTOL}
${BASELINE}/msMultiScaleConvexOrConcaveClassificationFilterOutput.tif
@@ -167,12 +147,6 @@ otb_add_test(NAME msTvGeodesicMorphologyIterativeDecompositionImageFilter COMMAN
2
)
-otb_add_test(NAME msTuGeodesicMorphologyIterativeDecompositionImageFilterNew COMMAND otbMorphologicalProfilesTestDriver
- otbGeodesicMorphologyIterativeDecompositionImageFilterNew)
-
-otb_add_test(NAME msTuGeodesicMorphologyLevelingFilterNew COMMAND otbMorphologicalProfilesTestDriver
- otbGeodesicMorphologyLevelingFilterNew)
-
otb_add_test(NAME bfTvClosingOpeningFilter COMMAND otbMorphologicalProfilesTestDriver
--compare-image ${NOTOL} ${BASELINE}/bfFiltreClosingOpening_1.tif
${TEMP}/bfFiltreClosingOpening_1.tif
@@ -181,9 +155,6 @@ otb_add_test(NAME bfTvClosingOpeningFilter COMMAND otbMorphologicalProfilesTestD
${TEMP}/bfFiltreClosingOpening_1.tif
1)
-otb_add_test(NAME msTuProfileDerivativeToMultiScaleCharacteristicsFilterNew COMMAND otbMorphologicalProfilesTestDriver
- otbProfileDerivativeToMultiScaleCharacteristicsFilterNew)
-
otb_add_test(NAME msTvProfileToProfileDerivativeFilter COMMAND otbMorphologicalProfilesTestDriver
--compare-n-images ${NOTOL} 4
${BASELINE}/msProfileToProfileDerivativeFilterOutput1.tif
@@ -203,15 +174,6 @@ otb_add_test(NAME msTvProfileToProfileDerivativeFilter COMMAND otbMorphologicalP
1
)
-otb_add_test(NAME bfTuOpeningClosingFilterNew COMMAND otbMorphologicalProfilesTestDriver
- otbOpeningClosingMorphologicalFilterNew )
-
-otb_add_test(NAME msTuGeodesicMorphologyDecompositionImageFilterNew COMMAND otbMorphologicalProfilesTestDriver
- otbGeodesicMorphologyDecompositionImageFilterNew)
-
-otb_add_test(NAME msTuMorphologicalOpeningProfileFilterNew COMMAND otbMorphologicalProfilesTestDriver
- otbMorphologicalOpeningProfileFilterNew)
-
otb_add_test(NAME msTvProfileDerivativeToMultiScaleCharacteristicsFilter COMMAND otbMorphologicalProfilesTestDriver
--compare-n-images ${NOTOL} 2
${BASELINE}/msProfileDerivativeToMultiScaleCharacteristicsFilterOutput.tif
@@ -227,12 +189,6 @@ otb_add_test(NAME msTvProfileDerivativeToMultiScaleCharacteristicsFilter COMMAND
1
)
-otb_add_test(NAME msTuMultiScaleConvexOrConcaveClassificationFilterNew COMMAND otbMorphologicalProfilesTestDriver
- otbMultiScaleConvexOrConcaveClassificationFilterNew)
-
-otb_add_test(NAME bfTuClosingOpeningFilterNew COMMAND otbMorphologicalProfilesTestDriver
- otbClosingOpeningMorphologicalFilterNew )
-
otb_add_test(NAME bfTvOpeningClosingFilter COMMAND otbMorphologicalProfilesTestDriver
--compare-image ${NOTOL} ${BASELINE}/bfFiltreOpeningClosing_1.tif
${TEMP}/bfFiltreOpeningClosing_1.tif
diff --git a/Modules/Segmentation/MorphologicalProfiles/test/otbClosingOpeningMorphologicalFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbClosingOpeningMorphologicalFilterNew.cxx
deleted file mode 100644
index 3a984f20a761471d035aa4d334f45ceda8f7a027..0000000000000000000000000000000000000000
--- a/Modules/Segmentation/MorphologicalProfiles/test/otbClosingOpeningMorphologicalFilterNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbClosingOpeningMorphologicalFilter.h"
-#include "itkBinaryBallStructuringElement.h"
-#include "otbImage.h"
-
-int otbClosingOpeningMorphologicalFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char InputPixelType;
- typedef unsigned char OutputPixelType;
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
- typedef itk::BinaryBallStructuringElement<InputPixelType, Dimension> StructuringElementType;
- typedef otb::ClosingOpeningMorphologicalFilter<InputImageType, OutputImageType,
- StructuringElementType> ClosingOpeningFilterType;
-
- // instantiating the opening closing filter
- ClosingOpeningFilterType::Pointer openingClosing = ClosingOpeningFilterType::New();
-
- std::cout << openingClosing << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Segmentation/MorphologicalProfiles/test/otbConvexOrConcaveClassificationFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbConvexOrConcaveClassificationFilterNew.cxx
deleted file mode 100644
index 0764f9c8ccad4ad9c0b19bf6d4445d7a04c2d1bb..0000000000000000000000000000000000000000
--- a/Modules/Segmentation/MorphologicalProfiles/test/otbConvexOrConcaveClassificationFilterNew.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbConvexOrConcaveClassificationFilter.h"
-#include "otbImage.h"
-
-int otbConvexOrConcaveClassificationFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Image<double, 2> InputImageType;
- typedef otb::Image<unsigned char, 2> OutputImageType;
-
- typedef otb::ConvexOrConcaveClassificationFilter<InputImageType, OutputImageType> ClassificationFilterType;
-
- // Instantiating object
- ClassificationFilterType::Pointer filter = ClassificationFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyDecompositionImageFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyDecompositionImageFilterNew.cxx
deleted file mode 100644
index bea71ca208f3e166768a5f32fe59ace7afaf69f6..0000000000000000000000000000000000000000
--- a/Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyDecompositionImageFilterNew.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbGeodesicMorphologyDecompositionImageFilter.h"
-#include "otbImage.h"
-#include "itkBinaryBallStructuringElement.h"
-
-int otbGeodesicMorphologyDecompositionImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Image<double, 2> ImageType;
- typedef itk::BinaryBallStructuringElement<double,
- 2> StructuringElementType;
- typedef otb::GeodesicMorphologyDecompositionImageFilter<ImageType, ImageType,
- StructuringElementType>
- GeodesicMorphologyDecompositionImageFilterType;
-
- // Instantiating object
- GeodesicMorphologyDecompositionImageFilterType::Pointer filter = GeodesicMorphologyDecompositionImageFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyIterativeDecompositionImageFilter.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyIterativeDecompositionImageFilter.cxx
index 419c3c98231316351ba41b2a02b68847a60d14b9..ec7c3d5934fa8dc0275a5c5cc374008d2644f433 100644
--- a/Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyIterativeDecompositionImageFilter.cxx
+++ b/Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyIterativeDecompositionImageFilter.cxx
@@ -78,19 +78,19 @@ int otbGeodesicMorphologyIterativeDecompositionImageFilter(int itkNotUsed(argc),
oss << outputFilenamePrefix << "_leveling_" << i << "." << outputFilenameSuffix;
writer = WriterType::New();
writer->SetInput(itAnalyse.Get());
- writer->SetFileName(oss.str().c_str());
+ writer->SetFileName(oss.str());
writer->Update();
oss.str("");
oss << outputFilenamePrefix << "_convMap_" << i << "." << outputFilenameSuffix;
writer = WriterType::New();
writer->SetInput(itConvexMap.Get());
- writer->SetFileName(oss.str().c_str());
+ writer->SetFileName(oss.str());
writer->Update();
oss.str("");
oss << outputFilenamePrefix << "_concMap_" << i << "." << outputFilenameSuffix;
writer = WriterType::New();
writer->SetInput(itConcaveMap.Get());
- writer->SetFileName(oss.str().c_str());
+ writer->SetFileName(oss.str());
writer->Update();
oss.str("");
++itAnalyse;
diff --git a/Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyIterativeDecompositionImageFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyIterativeDecompositionImageFilterNew.cxx
deleted file mode 100644
index 9a46c070a67211936f799d53faabdb63804a9f64..0000000000000000000000000000000000000000
--- a/Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyIterativeDecompositionImageFilterNew.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbGeodesicMorphologyIterativeDecompositionImageFilter.h"
-#include "itkBinaryBallStructuringElement.h"
-#include "otbImage.h"
-
-#include "itkMacro.h"
-
-int otbGeodesicMorphologyIterativeDecompositionImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double InputPixelType;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
-
- typedef itk::BinaryBallStructuringElement<InputPixelType,
- Dimension> StructuringElementType;
- typedef otb::GeodesicMorphologyIterativeDecompositionImageFilter<InputImageType,
- StructuringElementType> DecompositionFilterType;
-
- // Instantiation
- DecompositionFilterType::Pointer decomposition = DecompositionFilterType::New();
-
- std::cout << decomposition << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyLevelingFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyLevelingFilterNew.cxx
deleted file mode 100644
index 2c8d0138f2aac352a9114b6d6d5b5ddf6f59514f..0000000000000000000000000000000000000000
--- a/Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyLevelingFilterNew.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbGeodesicMorphologyLevelingFilter.h"
-#include "otbImage.h"
-
-int otbGeodesicMorphologyLevelingFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- typedef otb::Image<double, 2> ImageType;
- typedef otb::GeodesicMorphologyLevelingFilter<ImageType, ImageType, ImageType> FilterType;
-
- FilterType::Pointer filter = FilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalClosingProfileFilter.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalClosingProfileFilter.cxx
index 7e67ef56ff8e30f5ac8741e4293c46098bce4a42..08010ba48163cd476bfef5bc1f77f11b6554227e 100644
--- a/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalClosingProfileFilter.cxx
+++ b/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalClosingProfileFilter.cxx
@@ -71,7 +71,7 @@ int otbMorphologicalClosingProfileFilter(int itkNotUsed(argc), char * argv[])
writer = WriterType::New();
oss << outputFilenamePrefix << i << "." << outputFilenameSuffix;
writer->SetInput(profileFilter->GetOutput()->GetNthElement(i - 1));
- writer->SetFileName(oss.str().c_str());
+ writer->SetFileName(oss.str());
writer->Update();
oss.str("");
}
diff --git a/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalClosingProfileFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalClosingProfileFilterNew.cxx
deleted file mode 100644
index ba2cc795b4d01c7df9dda2e5f51ea47fd443983e..0000000000000000000000000000000000000000
--- a/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalClosingProfileFilterNew.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbMorphologicalClosingProfileFilter.h"
-#include "itkBinaryBallStructuringElement.h"
-#include "otbImage.h"
-
-#include "itkMacro.h"
-
-int otbMorphologicalClosingProfileFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double InputPixelType;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef itk::BinaryBallStructuringElement<InputPixelType, Dimension> StructuringElementType;
- typedef otb::MorphologicalClosingProfileFilter<InputImageType, InputImageType, StructuringElementType>
- ClosingProfileFilterType;
-
- // Instantiation
- ClosingProfileFilterType::Pointer filter = ClosingProfileFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalOpeningProfileFilter.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalOpeningProfileFilter.cxx
index a8aba87553699299e125f3da04224474c0a1367f..6543740379cfb640a907854d2924aa4f7f81c86a 100644
--- a/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalOpeningProfileFilter.cxx
+++ b/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalOpeningProfileFilter.cxx
@@ -71,7 +71,7 @@ int otbMorphologicalOpeningProfileFilter(int itkNotUsed(argc), char * argv[])
writer = WriterType::New();
oss << outputFilenamePrefix << i << "." << outputFilenameSuffix;
writer->SetInput(profileFilter->GetOutput()->GetNthElement(i - 1));
- writer->SetFileName(oss.str().c_str());
+ writer->SetFileName(oss.str());
writer->Update();
oss.str("");
}
diff --git a/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalOpeningProfileFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalOpeningProfileFilterNew.cxx
deleted file mode 100644
index cb3ea1cc514fb55adfbec2a9707c9b5ef5b99cd2..0000000000000000000000000000000000000000
--- a/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalOpeningProfileFilterNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbMorphologicalOpeningProfileFilter.h"
-#include "itkBinaryBallStructuringElement.h"
-#include "otbImage.h"
-
-#include "itkMacro.h"
-
-int otbMorphologicalOpeningProfileFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double InputPixelType;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
-
- typedef itk::BinaryBallStructuringElement<InputPixelType, Dimension> StructuringElementType;
- typedef otb::MorphologicalOpeningProfileFilter<InputImageType, InputImageType, StructuringElementType>
- OpeningProfileFilterType;
-
- // Instantiation
- OpeningProfileFilterType::Pointer filter = OpeningProfileFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalProfilesTestDriver.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalProfilesTestDriver.cxx
index 9f421862ae2cd008f8f40ce6c101ceb9817fafab..d96dc8f22488686a645919fa5720ed8949589eb2 100644
--- a/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalProfilesTestDriver.cxx
+++ b/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalProfilesTestDriver.cxx
@@ -23,26 +23,15 @@
void RegisterTests()
{
REGISTER_TEST(otbMorphologicalProfilesSegmentationFilter);
- REGISTER_TEST(otbProfileToProfileDerivativeFilterNew);
REGISTER_TEST(otbGeodesicMorphologyDecompositionImageFilter);
- REGISTER_TEST(otbMorphologicalClosingProfileFilterNew);
REGISTER_TEST(otbConvexOrConcaveClassificationFilter);
REGISTER_TEST(otbGeodesicMorphologyLevelingFilter);
- REGISTER_TEST(otbConvexOrConcaveClassificationFilterNew);
REGISTER_TEST(otbMultiScaleConvexOrConcaveClassificationFilter);
REGISTER_TEST(otbMorphologicalOpeningProfileFilter);
REGISTER_TEST(otbGeodesicMorphologyIterativeDecompositionImageFilter);
- REGISTER_TEST(otbGeodesicMorphologyIterativeDecompositionImageFilterNew);
- REGISTER_TEST(otbGeodesicMorphologyLevelingFilterNew);
REGISTER_TEST(otbClosingOpeningMorphologicalFilter);
- REGISTER_TEST(otbProfileDerivativeToMultiScaleCharacteristicsFilterNew);
REGISTER_TEST(otbProfileToProfileDerivativeFilter);
- REGISTER_TEST(otbOpeningClosingMorphologicalFilterNew);
- REGISTER_TEST(otbGeodesicMorphologyDecompositionImageFilterNew);
- REGISTER_TEST(otbMorphologicalOpeningProfileFilterNew);
REGISTER_TEST(otbProfileDerivativeToMultiScaleCharacteristicsFilter);
- REGISTER_TEST(otbMultiScaleConvexOrConcaveClassificationFilterNew);
- REGISTER_TEST(otbClosingOpeningMorphologicalFilterNew);
REGISTER_TEST(otbOpeningClosingMorphologicalFilter);
REGISTER_TEST(otbMorphologicalClosingProfileFilter);
}
diff --git a/Modules/Segmentation/MorphologicalProfiles/test/otbMultiScaleConvexOrConcaveClassificationFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbMultiScaleConvexOrConcaveClassificationFilterNew.cxx
deleted file mode 100644
index 697f34dece66e89e4da07943e874f2bd108df45c..0000000000000000000000000000000000000000
--- a/Modules/Segmentation/MorphologicalProfiles/test/otbMultiScaleConvexOrConcaveClassificationFilterNew.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkUnaryFunctorImageFilter.h"
-#include "itkBinaryBallStructuringElement.h"
-#include "otbMultiScaleConvexOrConcaveClassificationFilter.h"
-#include "otbImage.h"
-#include "itkMacro.h"
-
-int otbMultiScaleConvexOrConcaveClassificationFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double InputPixelType;
- typedef unsigned short LabeledPixelType;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<LabeledPixelType, 2> LabeledImageType;
-
- typedef otb::MultiScaleConvexOrConcaveClassificationFilter<InputImageType,
- LabeledImageType> MultiScaleClassificationFilterType;
-
- // Instantiation
- MultiScaleClassificationFilterType::Pointer filter = MultiScaleClassificationFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Segmentation/MorphologicalProfiles/test/otbOpeningClosingMorphologicalFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbOpeningClosingMorphologicalFilterNew.cxx
deleted file mode 100644
index e9b81b6079c125ba456eab3e16cb0756f8e3a189..0000000000000000000000000000000000000000
--- a/Modules/Segmentation/MorphologicalProfiles/test/otbOpeningClosingMorphologicalFilterNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "itkMacro.h"
-
-#include "otbOpeningClosingMorphologicalFilter.h"
-#include "itkBinaryBallStructuringElement.h"
-#include "otbImage.h"
-
-int otbOpeningClosingMorphologicalFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef unsigned char InputPixelType;
- typedef unsigned char OutputPixelType;
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
- typedef itk::BinaryBallStructuringElement<InputPixelType, Dimension> StructuringElementType;
- typedef otb::OpeningClosingMorphologicalFilter<InputImageType, OutputImageType,
- StructuringElementType> OpeningClosingFilterType;
-
- // instantiating the opening closing filter
- OpeningClosingFilterType::Pointer openingClosing = OpeningClosingFilterType::New();
-
- std::cout << openingClosing << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Segmentation/MorphologicalProfiles/test/otbProfileDerivativeToMultiScaleCharacteristicsFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbProfileDerivativeToMultiScaleCharacteristicsFilterNew.cxx
deleted file mode 100644
index da63f37cc7dbdfff36f207124f9803c4e462ad72..0000000000000000000000000000000000000000
--- a/Modules/Segmentation/MorphologicalProfiles/test/otbProfileDerivativeToMultiScaleCharacteristicsFilterNew.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbProfileDerivativeToMultiScaleCharacteristicsFilter.h"
-#include "otbImage.h"
-#include "itkMacro.h"
-
-int otbProfileDerivativeToMultiScaleCharacteristicsFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double InputPixelType;
- typedef double OutputPixelType;
- typedef unsigned short LabeledPixelType;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
- typedef otb::Image<LabeledPixelType, 2> LabeledImageType;
-
- typedef otb::ProfileDerivativeToMultiScaleCharacteristicsFilter<InputImageType, OutputImageType, LabeledImageType>
- MultiScaleCharacteristicsFilterType;
-
- MultiScaleCharacteristicsFilterType::Pointer filter = MultiScaleCharacteristicsFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Segmentation/MorphologicalProfiles/test/otbProfileToProfileDerivativeFilter.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbProfileToProfileDerivativeFilter.cxx
index e0c09aabc6753c41507136fa46fba6d8b9e6dca3..8d8f609dc042d8c2571f9505ef0b0d5de559bf17 100644
--- a/Modules/Segmentation/MorphologicalProfiles/test/otbProfileToProfileDerivativeFilter.cxx
+++ b/Modules/Segmentation/MorphologicalProfiles/test/otbProfileToProfileDerivativeFilter.cxx
@@ -76,7 +76,7 @@ int otbProfileToProfileDerivativeFilter(int itkNotUsed(argc), char * argv[])
writer = WriterType::New();
oss << outputFilenamePrefix << i << "." << outputFilenameSuffix;
writer->SetInput(derivativeFilter->GetOutput()->GetNthElement(i - 1));
- writer->SetFileName(oss.str().c_str());
+ writer->SetFileName(oss.str());
writer->Update();
oss.str("");
}
diff --git a/Modules/Segmentation/MorphologicalProfiles/test/otbProfileToProfileDerivativeFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbProfileToProfileDerivativeFilterNew.cxx
deleted file mode 100644
index 9dd84d6aef782466da931ae2ada70edf043e72dc..0000000000000000000000000000000000000000
--- a/Modules/Segmentation/MorphologicalProfiles/test/otbProfileToProfileDerivativeFilterNew.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "otbProfileToProfileDerivativeFilter.h"
-#include "otbImage.h"
-
-#include "itkMacro.h"
-
-int otbProfileToProfileDerivativeFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
-{
- const unsigned int Dimension = 2;
- typedef double InputPixelType;
- typedef double OutputPixelType;
-
- typedef otb::Image<InputPixelType, Dimension> InputImageType;
- typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
- typedef otb::ProfileToProfileDerivativeFilter<InputImageType, OutputImageType> DerivativeFilterType;
-
- DerivativeFilterType::Pointer filter = DerivativeFilterType::New();
-
- std::cout << filter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/ThirdParty/Shark/include/otbSharkUtils.h b/Modules/ThirdParty/Shark/include/otbSharkUtils.h
index 04c57b6d4e7f5a022b0c4fafa86ac41b134f690c..01d935b21eb1e46c588f8cf9d6eb490e2d143657 100644
--- a/Modules/ThirdParty/Shark/include/otbSharkUtils.h
+++ b/Modules/ThirdParty/Shark/include/otbSharkUtils.h
@@ -30,6 +30,9 @@
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wsign-compare"
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wheader-guard"
+#endif
#endif
#include "otb_shark.h"
#include "shark/Data/Dataset.h"
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexOutputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexOutputImageParameter.h
index 9e635d0e6583711afc7b9d859feba085ea9afd0e..f15541e6d5fe042f60b83463417fdf99e48e9f4d 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexOutputImageParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexOutputImageParameter.h
@@ -91,15 +91,8 @@ public:
/** Return true if a filename is set */
bool HasValue() const override;
- void SetFileName (const char* filename)
- {
- m_FileName = filename;
- SetActive(true);
- }
- void SetFileName (const std::string& filename)
- {
- this->SetFileName(filename.c_str());
- }
+ void SetFileName (const char* filename);
+ void SetFileName (const std::string& filename);
itkGetStringMacro(FileName);
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h
index e7c41235d84c27d526c2a235db7e105b56c5608a..c54bb98a0dd6f35d6694f12668fb2efc7d0e0501 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h
@@ -68,7 +68,7 @@ public:
}
// Reimplement the SetActive method
- void SetActive( const bool value ) override
+ void SetActive( bool value ) override
{
Superclass::SetActive( value );
m_StringParam->SetActive( value );
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputImageParameter.h
index 5bef6a16c33282178bf930b9ca451d2d93231547..e5262b0f3ec04300136ad2352902d8ff3192e00f 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputImageParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputImageParameter.h
@@ -92,15 +92,8 @@ public:
/** Return true if a filename is set */
bool HasValue() const override;
- void SetFileName (const char* filename)
- {
- m_FileName = filename;
- SetActive(true);
- }
- void SetFileName (const std::string& filename)
- {
- this->SetFileName(filename.c_str());
- }
+ void SetFileName (const char* filename);
+ void SetFileName (const std::string& filename);
itkGetStringMacro(FileName);
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputVectorDataParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputVectorDataParameter.h
index da659ee83d92e68c5b4061ab0f280fc86177e872..e0062909174dcb8c6743764af34ba43ac4dbddad 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputVectorDataParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputVectorDataParameter.h
@@ -60,61 +60,26 @@ public:
itkGetObjectMacro(VectorData, VectorDataType);
/** Return true if a filename is set */
- bool HasValue() const override
- {
- std::string filename(this->GetFileName());
- return !filename.empty();
- }
+ bool HasValue() const override;
/** Return any value */
- void SetValue(VectorDataType* vd)
- {
- m_VectorData = vd;
- SetActive(true);
- }
+ void SetValue(VectorDataType* vd);
/** Return any value */
- VectorDataType* GetValue( void )
- {
- return m_VectorData;
- }
-
- void SetFileName (const char* filename)
- {
- m_FileName = filename;
- SetActive(true);
- }
- void SetFileName (const std::string& filename)
- {
- this->SetFileName(filename.c_str());
- }
+ VectorDataType* GetValue( void );
- itkGetStringMacro(FileName);
-
- void Write()
- {
- m_Writer->SetFileName(m_FileName);
- m_Writer->SetInput(m_VectorData);
- m_Writer->Update();
- }
+ void SetFileName (const char* filename);
+ void SetFileName (const std::string& filename);
- itk::ProcessObject* GetWriter()
- {
- return m_Writer;
- }
+ itkGetStringMacro(FileName);
- void InitializeWriters()
- {
- m_Writer = otb::VectorDataFileWriter<VectorDataType>::New();
- }
+ void Write();
+ itk::ProcessObject* GetWriter();
+ void InitializeWriters();
protected:
/** Constructor */
- OutputVectorDataParameter()
- {
- this->SetName("Output Vector Data");
- this->SetKey("outvd");
- }
+ OutputVectorDataParameter();
/** Destructor */
~OutputVectorDataParameter() override
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h
index 72f9393ea95e1d10c94ecc255d02e1b0b70f9431..2f2efc8a8f1f436571f5721b048968beb58b53fb 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h
@@ -83,7 +83,7 @@ public:
}
// Reimplement the SetActive method
- void SetActive( const bool value ) override
+ void SetActive( bool value ) override
{
Superclass::SetActive( value );
m_UnsignedIntParam->SetActive( value );
diff --git a/Modules/Wrappers/ApplicationEngine/src/CMakeLists.txt b/Modules/Wrappers/ApplicationEngine/src/CMakeLists.txt
index 4ba19c8e8ba810eb63234c4a94d184487d5d4323..bf4dd419ecc1659cdd7d55553acaeec3623ad572 100644
--- a/Modules/Wrappers/ApplicationEngine/src/CMakeLists.txt
+++ b/Modules/Wrappers/ApplicationEngine/src/CMakeLists.txt
@@ -45,6 +45,7 @@ set( OTBApplicationEngine_SRC
otbWrapperParameterKey.cxx
otbWrapperDocExampleStructure.cxx
otbWrapperInputVectorDataParameter.cxx
+ otbWrapperOutputVectorDataParameter.cxx
otbWrapperInputProcessXMLParameter.cxx
otbWrapperMapProjectionParametersHandler.cxx
otbWrapperApplication.cxx
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperComplexOutputImageParameter.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperComplexOutputImageParameter.cxx
index 59e438ca2b9eb5c2fb3a88b9fa50a49d97bd3683..1b6f4657e9c9ac86126a8174bc2cabfd3f633761 100644
--- a/Modules/Wrappers/ApplicationEngine/src/otbWrapperComplexOutputImageParameter.cxx
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperComplexOutputImageParameter.cxx
@@ -300,5 +300,16 @@ ComplexOutputImageParameter::HasValue() const
return !filename.empty();
}
+void ComplexOutputImageParameter::SetFileName (const char* filename)
+{
+ this->SetFileName(std::string(filename));
+}
+
+void ComplexOutputImageParameter::SetFileName (const std::string& filename)
+{
+ m_FileName = filename;
+ SetActive(true);
+}
+
}
}
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperOutputImageParameter.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperOutputImageParameter.cxx
index 9e6e33efdac2c1223830dad9db754e7110777817..380c1eb435f06a16f7b6e743dbf47dd602e9701f 100644
--- a/Modules/Wrappers/ApplicationEngine/src/otbWrapperOutputImageParameter.cxx
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperOutputImageParameter.cxx
@@ -532,5 +532,16 @@ OutputImageParameter::SwitchInput(UInt8RGBImageType *img)
return 1;
}
+void OutputImageParameter::SetFileName (const char* filename)
+{
+ this->SetFileName(std::string(filename));
+}
+
+void OutputImageParameter::SetFileName (const std::string& filename)
+{
+ m_FileName = filename;
+ SetActive(true);
+}
+
}
}
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperOutputVectorDataParameter.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperOutputVectorDataParameter.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..b89c9d1f4f14274bfe22e94fbff58026d38f9a49
--- /dev/null
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperOutputVectorDataParameter.cxx
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ * https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "otbWrapperOutputVectorDataParameter.h"
+
+#include <string>
+
+namespace otb
+{
+namespace Wrapper
+{
+
+bool OutputVectorDataParameter::HasValue() const
+{
+ std::string filename(this->GetFileName());
+ return !filename.empty();
+}
+
+/** Return any value */
+void OutputVectorDataParameter::SetValue(VectorDataType* vd)
+{
+ m_VectorData = vd;
+ SetActive(true);
+}
+
+/** Return any value */
+VectorDataType* OutputVectorDataParameter::GetValue( void )
+{
+ return m_VectorData;
+}
+
+void OutputVectorDataParameter::SetFileName (const char* filename)
+{
+ this->SetFileName(std::string(filename));
+}
+
+void OutputVectorDataParameter::SetFileName (const std::string& filename)
+{
+ m_FileName = filename;
+ SetActive(true);
+}
+
+void OutputVectorDataParameter::Write()
+{
+ m_Writer->SetFileName(m_FileName);
+ m_Writer->SetInput(m_VectorData);
+ m_Writer->Update();
+}
+
+itk::ProcessObject* OutputVectorDataParameter::GetWriter()
+{
+ return m_Writer;
+}
+
+void OutputVectorDataParameter::InitializeWriters()
+{
+ m_Writer = otb::VectorDataFileWriter<VectorDataType>::New();
+}
+
+OutputVectorDataParameter::OutputVectorDataParameter()
+{
+ this->SetName("Output Vector Data");
+ this->SetKey("outvd");
+}
+
+}
+}
diff --git a/Modules/Wrappers/ApplicationEngine/test/CMakeLists.txt b/Modules/Wrappers/ApplicationEngine/test/CMakeLists.txt
index e92b69dc0324ee9debb1e80104b846a545fa3c4d..c16a09a396e48d626dc65f3b10cb8a15afb0ef83 100644
--- a/Modules/Wrappers/ApplicationEngine/test/CMakeLists.txt
+++ b/Modules/Wrappers/ApplicationEngine/test/CMakeLists.txt
@@ -22,7 +22,6 @@ otb_module_test()
set(OTBApplicationEngineTests
otbApplicationEngineTestDriver.cxx
-otbWrapperApplicationTest.cxx
otbWrapperInputImageParameterTest.cxx
otbWrapperNumericalParameterTest.cxx
otbWrapperStringParameterTest.cxx
@@ -33,12 +32,10 @@ otbWrapperRAMParameterTest.cxx
otbWrapperDocExampleStructureTest.cxx
otbWrapperParameterKeyTest.cxx
otbWrapperParameterListTest.cxx
-otbWrapperEmptyParameterTest.cxx
otbWrapperInputImageListParameterTest.cxx
otbWrapperInputVectorDataListParameterTest.cxx
otbWrapperApplicationDocTests.cxx
otbWrapperApplicationHtmlDocGeneratorTest.cxx
-otbWrapperInputVectorDataParameterTest.cxx
otbWrapperOutputImageParameterTest.cxx
otbApplicationMemoryConnectTest.cxx
otbWrapperImageInterface.cxx
@@ -50,10 +47,6 @@ otb_module_target_label(otbApplicationEngineTestDriver)
# Tests Declaration
-otb_add_test(NAME owTuApplication COMMAND otbApplicationEngineTestDriver
- otbWrapperApplicationNew
- )
-
otb_add_test(NAME owTvInputImageParameter COMMAND otbApplicationEngineTestDriver
otbWrapperInputImageParameterTest1
${INPUTDATA}/poupees.tif
@@ -61,14 +54,6 @@ otb_add_test(NAME owTvInputImageParameter COMMAND otbApplicationEngineTestDriver
"my description"
)
-otb_add_test(NAME owTuInputImageParameter COMMAND otbApplicationEngineTestDriver
- otbWrapperInputImageParameterNew
- )
-
-otb_add_test(NAME owTuNumericalParameter COMMAND otbApplicationEngineTestDriver
- otbWrapperNumericalParameterNew
- )
-
otb_add_test(NAME owTvNumericalParameter COMMAND otbApplicationEngineTestDriver
otbWrapperNumericalParameterTest1
42.42
@@ -76,10 +61,6 @@ otb_add_test(NAME owTvNumericalParameter COMMAND otbApplicationEngineTestDriver
"my description"
)
-otb_add_test(NAME owTuStringParameter COMMAND otbApplicationEngineTestDriver
- otbWrapperStringParameterNew
- )
-
otb_add_test(NAME owTvStringParameter COMMAND otbApplicationEngineTestDriver
otbWrapperStringParameterTest1
"value1"
@@ -91,10 +72,6 @@ otb_add_test(NAME owTvApplicationRegistry COMMAND otbApplicationEngineTestDriver
otbWrapperApplicationRegistry
)
-otb_add_test(NAME owTuStringListParameter COMMAND otbApplicationEngineTestDriver
- otbWrapperStringListParameterNew
- )
-
otb_add_test(NAME owTvStringListParameter COMMAND otbApplicationEngineTestDriver
otbWrapperStringListParameterTest1
"value1"
@@ -104,22 +81,10 @@ otb_add_test(NAME owTvStringListParameter COMMAND otbApplicationEngineTestDriver
"my description"
)
-otb_add_test(NAME owTvParameterRAM COMMAND otbApplicationEngineTestDriver
- otbWrapperRAMParameterNew
- )
-
otb_add_test(NAME owTvParameterKey COMMAND otbApplicationEngineTestDriver
otbWrapperParameterKey
)
-otb_add_test(NAME owTuEmptyParameter COMMAND otbApplicationEngineTestDriver
- otbWrapperEmptyParameterNew
- )
-
-otb_add_test(NAME owTuInputImageListParameter COMMAND otbApplicationEngineTestDriver
- otbWrapperInputImageListParameterNew
- )
-
otb_add_test(NAME owTvInputImageListParameter COMMAND otbApplicationEngineTestDriver
otbWrapperInputImageListParameterTest1
${INPUTDATA}/poupees_c1.hdr
@@ -128,10 +93,6 @@ otb_add_test(NAME owTvInputImageListParameter COMMAND otbApplicationEngineTestDr
"my description"
)
-otb_add_test(NAME owTuInputVectorDataListParameter COMMAND otbApplicationEngineTestDriver
- otbWrapperInputVectorDataListParameterNew
- )
-
otb_add_test(NAME owTvInputVectorDataListParameter COMMAND otbApplicationEngineTestDriver
otbWrapperInputVectorDataListParameterTest1
${INPUTDATA}/ToulousePoints-examples.shp
@@ -152,18 +113,6 @@ otb_add_test(NAME owTvApplicationHtmlDocGeneratorTest
0 # don't show key in the parameterdescription
)
-otb_add_test(NAME owTvApplicationHtmlDocGeneratorNew COMMAND otbApplicationEngineTestDriver
- otbWrapperApplicationHtmlDocGeneratorNew
- )
-
-otb_add_test(NAME owTuInputVectorDataParameter COMMAND otbApplicationEngineTestDriver
- otbWrapperInputVectorDataParameterNew
- )
-
-otb_add_test(NAME owTuOutputImageParameter COMMAND otbApplicationEngineTestDriver
- otbWrapperOutputImageParameterNew
- )
-
otb_add_test(NAME owTvOutputImageParameter COMMAND otbApplicationEngineTestDriver
otbWrapperOutputImageParameterTest1
${INPUTDATA}/poupees.tif
@@ -186,9 +135,6 @@ otb_add_test(NAME owTvDocExampleStructureTest COMMAND otbApplicationEngineTestDr
${TEMP}/owTuDocExampleStructureTest.txt
)
-otb_add_test(NAME owTuDocExampleStructureNew COMMAND otbApplicationEngineTestDriver
- otbWrapperDocExampleStructureNew
- )
# Warning this test require otbapp_Smoothing and otbapp_ConcatenateImages to be built
otb_add_test(NAME owTvApplicationMemoryConnectTest COMMAND otbApplicationEngineTestDriver otbApplicationMemoryConnectTest
diff --git a/Modules/Wrappers/ApplicationEngine/test/otbApplicationEngineTestDriver.cxx b/Modules/Wrappers/ApplicationEngine/test/otbApplicationEngineTestDriver.cxx
index 7413baadc59f2332227a41603d3018f474a85f0f..b07268ade6d01ffac75321006b99bf86cd674f81 100644
--- a/Modules/Wrappers/ApplicationEngine/test/otbApplicationEngineTestDriver.cxx
+++ b/Modules/Wrappers/ApplicationEngine/test/otbApplicationEngineTestDriver.cxx
@@ -22,34 +22,19 @@
void RegisterTests()
{
- REGISTER_TEST(otbWrapperApplicationNew);
- REGISTER_TEST(otbWrapperInputImageParameterNew);
REGISTER_TEST(otbWrapperInputImageParameterTest1);
- REGISTER_TEST(otbWrapperNumericalParameterNew);
REGISTER_TEST(otbWrapperNumericalParameterTest1);
- REGISTER_TEST(otbWrapperStringParameterNew);
REGISTER_TEST(otbWrapperStringParameterTest1);
- REGISTER_TEST(otbWrapperChoiceParameterNew);
REGISTER_TEST(otbWrapperChoiceParameterTest1);
REGISTER_TEST(otbWrapperApplicationRegistry);
- REGISTER_TEST(otbWrapperStringListParameterNew);
REGISTER_TEST(otbWrapperStringListParameterTest1);
- REGISTER_TEST(otbWrapperRAMParameterNew);
- REGISTER_TEST(otbWrapperDocExampleStructureNew);
REGISTER_TEST(otbWrapperDocExampleStructureTest);
REGISTER_TEST(otbWrapperParameterKey);
- REGISTER_TEST(otbWrapperParameterListNew);
REGISTER_TEST(otbWrapperParameterList);
- REGISTER_TEST(otbWrapperEmptyParameterNew);
- REGISTER_TEST(otbWrapperInputImageListParameterNew);
REGISTER_TEST(otbWrapperInputImageListParameterTest1);
- REGISTER_TEST(otbWrapperInputVectorDataListParameterNew);
REGISTER_TEST(otbWrapperInputVectorDataListParameterTest1);
REGISTER_TEST(otbWrapperApplicationDocTest);
- REGISTER_TEST(otbWrapperApplicationHtmlDocGeneratorNew);
REGISTER_TEST(otbWrapperApplicationHtmlDocGeneratorTest1);
- REGISTER_TEST(otbWrapperInputVectorDataParameterNew);
- REGISTER_TEST(otbWrapperOutputImageParameterNew);
REGISTER_TEST(otbWrapperOutputImageParameterTest1);
//~ REGISTER_TEST(otbWrapperOutputImageParameterConversionTest);
REGISTER_TEST(otbApplicationMemoryConnectTest);
diff --git a/Modules/Wrappers/ApplicationEngine/test/otbWrapperApplicationHtmlDocGeneratorTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperApplicationHtmlDocGeneratorTest.cxx
index 6a5a6a346c333774559dd836d995ae661816ea2f..e562c6acbb50201532595809a0aff99f3077ffa4 100644
--- a/Modules/Wrappers/ApplicationEngine/test/otbWrapperApplicationHtmlDocGeneratorTest.cxx
+++ b/Modules/Wrappers/ApplicationEngine/test/otbWrapperApplicationHtmlDocGeneratorTest.cxx
@@ -25,13 +25,6 @@
#include "otbWrapperApplicationHtmlDocGenerator.h"
#include "otbWrapperApplicationRegistry.h"
-int otbWrapperApplicationHtmlDocGeneratorNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::Wrapper::ApplicationHtmlDocGenerator DocGeneratorType;
- DocGeneratorType generator;
-
- return EXIT_SUCCESS;
-}
int otbWrapperApplicationHtmlDocGeneratorTest1(int argc, char * argv[])
{
diff --git a/Modules/Wrappers/ApplicationEngine/test/otbWrapperApplicationTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperApplicationTest.cxx
deleted file mode 100644
index f338e58f5f3b8d8c82802629bc9b54c1cb215a96..0000000000000000000000000000000000000000
--- a/Modules/Wrappers/ApplicationEngine/test/otbWrapperApplicationTest.cxx
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#if defined(_MSC_VER)
-#pragma warning ( disable : 4786 )
-#endif
-
-#include "otbWrapperApplication.h"
-
-int otbWrapperApplicationNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
-// typedef otb::Wrapper::Application ApplicationType;
-// ApplicationType application = ApplicationType::New();
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Wrappers/ApplicationEngine/test/otbWrapperChoiceParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperChoiceParameterTest.cxx
index 2a44eade12b3d2d7d1e3ed23ebf6a3335c4b5b5a..9dd36fb158d9a01ff895a00945f2aaf9c90dd4ec 100644
--- a/Modules/Wrappers/ApplicationEngine/test/otbWrapperChoiceParameterTest.cxx
+++ b/Modules/Wrappers/ApplicationEngine/test/otbWrapperChoiceParameterTest.cxx
@@ -24,13 +24,6 @@
#include "otbWrapperChoiceParameter.h"
-int otbWrapperChoiceParameterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::Wrapper::ChoiceParameter ChoiceParameterType;
- ChoiceParameterType::Pointer parameter = ChoiceParameterType::New();
-
- return EXIT_SUCCESS;
-}
int otbWrapperChoiceParameterTest1(int itkNotUsed(argc), char * itkNotUsed(argv)[])
{
diff --git a/Modules/Wrappers/ApplicationEngine/test/otbWrapperDocExampleStructureTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperDocExampleStructureTest.cxx
index bf69b0281367949be88313daabc07b13ad837fc2..e95afe08724d8713d968fce71b0398a68e440cc4 100644
--- a/Modules/Wrappers/ApplicationEngine/test/otbWrapperDocExampleStructureTest.cxx
+++ b/Modules/Wrappers/ApplicationEngine/test/otbWrapperDocExampleStructureTest.cxx
@@ -26,13 +26,6 @@
#include "itksys/SystemTools.hxx"
#include <fstream>
-int otbWrapperDocExampleStructureNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::Wrapper::DocExampleStructure DocExampleStructureType;
- DocExampleStructureType::Pointer docStruct = DocExampleStructureType::New();
-
- return EXIT_SUCCESS;
-}
int otbWrapperDocExampleStructureTest(int itkNotUsed(argc), char* argv[])
diff --git a/Modules/Wrappers/ApplicationEngine/test/otbWrapperEmptyParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperEmptyParameterTest.cxx
deleted file mode 100644
index 466062356ba119109fafe5668d149f7ed2709848..0000000000000000000000000000000000000000
--- a/Modules/Wrappers/ApplicationEngine/test/otbWrapperEmptyParameterTest.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#if defined(_MSC_VER)
-#pragma warning ( disable : 4786 )
-#endif
-
-#include "otbWrapperEmptyParameter.h"
-
-int otbWrapperEmptyParameterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::Wrapper::EmptyParameter EmptyParameterType;
- EmptyParameterType::Pointer parameter = EmptyParameterType::New();
-
- //std::cout << parameter << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Wrappers/ApplicationEngine/test/otbWrapperInputImageListParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperInputImageListParameterTest.cxx
index f2a4b2930f084592f8198c234afefa2747f630f9..00b6d9fe09e0885651c6addafa07e5cfbd94b67c 100644
--- a/Modules/Wrappers/ApplicationEngine/test/otbWrapperInputImageListParameterTest.cxx
+++ b/Modules/Wrappers/ApplicationEngine/test/otbWrapperInputImageListParameterTest.cxx
@@ -24,13 +24,6 @@
#include "otbWrapperInputImageListParameter.h"
-int otbWrapperInputImageListParameterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::Wrapper::InputImageListParameter ParameterType;
- ParameterType::Pointer parameter = ParameterType::New();
-
- return EXIT_SUCCESS;
-}
int otbWrapperInputImageListParameterTest1(int itkNotUsed(argc), char* argv[])
diff --git a/Modules/Wrappers/ApplicationEngine/test/otbWrapperInputImageParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperInputImageParameterTest.cxx
index 01718d15c60c9ae1ba404de84b7dda1865165d8e..eab4996459d1b559351be745861473fdd4c6fcb8 100644
--- a/Modules/Wrappers/ApplicationEngine/test/otbWrapperInputImageParameterTest.cxx
+++ b/Modules/Wrappers/ApplicationEngine/test/otbWrapperInputImageParameterTest.cxx
@@ -24,13 +24,6 @@
#include "otbWrapperInputImageParameter.h"
-int otbWrapperInputImageParameterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::Wrapper::InputImageParameter InputImageParameterType;
- InputImageParameterType::Pointer parameter = InputImageParameterType::New();
-
- return EXIT_SUCCESS;
-}
int otbWrapperInputImageParameterTest1(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/Wrappers/ApplicationEngine/test/otbWrapperInputVectorDataListParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperInputVectorDataListParameterTest.cxx
index 6a9087d3b2a481161c8899ef8f3bfb008477caf9..4ef4d131790819730a4ad4ae76d47fcacf6e9872 100644
--- a/Modules/Wrappers/ApplicationEngine/test/otbWrapperInputVectorDataListParameterTest.cxx
+++ b/Modules/Wrappers/ApplicationEngine/test/otbWrapperInputVectorDataListParameterTest.cxx
@@ -24,13 +24,6 @@
#include "otbWrapperInputVectorDataListParameter.h"
-int otbWrapperInputVectorDataListParameterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::Wrapper::InputVectorDataListParameter ParameterType;
- ParameterType::Pointer parameter = ParameterType::New();
-
- return EXIT_SUCCESS;
-}
int otbWrapperInputVectorDataListParameterTest1(int itkNotUsed(argc), char* argv[])
diff --git a/Modules/Wrappers/ApplicationEngine/test/otbWrapperInputVectorDataParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperInputVectorDataParameterTest.cxx
deleted file mode 100644
index b1029dd068895d100f0f229919a0929237433c1f..0000000000000000000000000000000000000000
--- a/Modules/Wrappers/ApplicationEngine/test/otbWrapperInputVectorDataParameterTest.cxx
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#if defined(_MSC_VER)
-#pragma warning ( disable : 4786 )
-#endif
-
-#include "otbWrapperInputVectorDataParameter.h"
-
-int otbWrapperInputVectorDataParameterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::Wrapper::InputVectorDataParameter InputVectorDataParameterType;
- InputVectorDataParameterType::Pointer parameter = InputVectorDataParameterType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Wrappers/ApplicationEngine/test/otbWrapperNumericalParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperNumericalParameterTest.cxx
index c68994333676fa9f0fddf3d3eece89ddb20fbe81..f7358b5fdf45ecade1c56649204063dd96edde03 100644
--- a/Modules/Wrappers/ApplicationEngine/test/otbWrapperNumericalParameterTest.cxx
+++ b/Modules/Wrappers/ApplicationEngine/test/otbWrapperNumericalParameterTest.cxx
@@ -24,13 +24,6 @@
#include "otbWrapperNumericalParameter.h"
-int otbWrapperNumericalParameterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::Wrapper::NumericalParameter <int> NumericalParameterType;
- NumericalParameterType::Pointer parameter = NumericalParameterType::New();
-
- return EXIT_SUCCESS;
-}
int otbWrapperNumericalParameterTest1(int itkNotUsed(argc), char* argv[])
diff --git a/Modules/Wrappers/ApplicationEngine/test/otbWrapperOutputImageParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperOutputImageParameterTest.cxx
index ea8899b8e0d50685f8e0973f17e1a50081dde7f5..238a8f982d3b3023d2b129102a29c62ea5076ae5 100644
--- a/Modules/Wrappers/ApplicationEngine/test/otbWrapperOutputImageParameterTest.cxx
+++ b/Modules/Wrappers/ApplicationEngine/test/otbWrapperOutputImageParameterTest.cxx
@@ -28,13 +28,6 @@
#include "otbWrapperTypes.h"
#include <vector>
-int otbWrapperOutputImageParameterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::Wrapper::OutputImageParameter OutputImageParameterType;
- OutputImageParameterType::Pointer parameter = OutputImageParameterType::New();
-
- return EXIT_SUCCESS;
-}
int otbWrapperOutputImageParameterTest1(int itkNotUsed(argc), char* argv[])
{
diff --git a/Modules/Wrappers/ApplicationEngine/test/otbWrapperParameterListTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperParameterListTest.cxx
index 238903ad3500157c0e29631267ea81e65d1c2ada..8d2c39363ea70a026b04bafb6566cd71bd250da5 100644
--- a/Modules/Wrappers/ApplicationEngine/test/otbWrapperParameterListTest.cxx
+++ b/Modules/Wrappers/ApplicationEngine/test/otbWrapperParameterListTest.cxx
@@ -27,15 +27,6 @@
#include "otbWrapperNumericalParameter.h"
#include "otbWrapperProxyParameter.h"
-int otbWrapperParameterListNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- using otb::Wrapper::ParameterGroup;
- ParameterGroup::Pointer parameters = ParameterGroup::New();
-
- //std::cout << parameter << std::endl;
-
- return EXIT_SUCCESS;
-}
int otbWrapperParameterList(int itkNotUsed(argc), char * itkNotUsed(argv)[])
{
diff --git a/Modules/Wrappers/ApplicationEngine/test/otbWrapperStringListParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperStringListParameterTest.cxx
index 9810c0e32a1d3ec10c6271fc8e988102fdb56d12..a9162f7f3b2c3c8985d9b676a1f2ec6c36408884 100644
--- a/Modules/Wrappers/ApplicationEngine/test/otbWrapperStringListParameterTest.cxx
+++ b/Modules/Wrappers/ApplicationEngine/test/otbWrapperStringListParameterTest.cxx
@@ -24,13 +24,6 @@
#include "otbWrapperStringListParameter.h"
-int otbWrapperStringListParameterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::Wrapper::StringListParameter StringListParameterType;
- StringListParameterType::Pointer parameter = StringListParameterType::New();
-
- return EXIT_SUCCESS;
-}
int otbWrapperStringListParameterTest1(int itkNotUsed(argc), char* argv[])
diff --git a/Modules/Wrappers/ApplicationEngine/test/otbWrapperStringParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperStringParameterTest.cxx
index b0acdba0ef871739f608791ba1a1325151edc672..e56e6a8c3bbea326ad8f9a1ca39f9e86189a72c7 100644
--- a/Modules/Wrappers/ApplicationEngine/test/otbWrapperStringParameterTest.cxx
+++ b/Modules/Wrappers/ApplicationEngine/test/otbWrapperStringParameterTest.cxx
@@ -24,13 +24,6 @@
#include "otbWrapperStringParameter.h"
-int otbWrapperStringParameterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
-{
- typedef otb::Wrapper::StringParameter StringParameterType;
- StringParameterType::Pointer parameter = StringParameterType::New();
-
- return EXIT_SUCCESS;
-}
int otbWrapperStringParameterTest1(int itkNotUsed(argc), char* argv[])
diff --git a/Modules/Wrappers/CommandLine/test/CMakeLists.txt b/Modules/Wrappers/CommandLine/test/CMakeLists.txt
index 2ab3bf07bcee1e7b035ad01aea789ca83f073f23..d5801eff5e2df4e400269ecfc0b45580a195c515 100644
--- a/Modules/Wrappers/CommandLine/test/CMakeLists.txt
+++ b/Modules/Wrappers/CommandLine/test/CMakeLists.txt
@@ -32,9 +32,6 @@ otb_module_target_label(otbCommandLineTestDriver)
# Tests Declaration
-otb_add_test(NAME clTuWrapperCommandLineLauncherNew
- COMMAND otbCommandLineTestDriver otbWrapperCommandLineLauncherNew )
-
otb_add_test(NAME clTvWrapperCommandLineLauncherTest_WrongParam
COMMAND otbCommandLineTestDriver otbWrapperCommandLineLauncherTest
"Rescale" $<TARGET_FILE_DIR:otbapp_Rescale> -inn image)
@@ -97,9 +94,6 @@ otb_add_test(NAME clTvWrapperCommandLineParserTest_IsAttExistsEndNoParam
"-m"
"TrainImagesClassifier" "test" "-il" "QB_1_ortho.tif" "-vd" "vd" ".shape" "test" "-m")
-otb_add_test(NAME clTuWrapperCommandLineParserNew
- COMMAND otbCommandLineTestDriver otbWrapperCommandLineParserNew )
-
otb_add_test(NAME clTvWrapperCommandLineParserTest_MultiplePathOneWrong
COMMAND otbCommandLineTestDriver otbWrapperCommandLineParserTest2
"Rescale" $<TARGET_FILE_DIR:otbapp_Rescale> "FakePath")
diff --git a/Modules/Wrappers/CommandLine/test/otbCommandLineTestDriver.cxx b/Modules/Wrappers/CommandLine/test/otbCommandLineTestDriver.cxx
index 77558ca66b82a3216798137b7aa899b2408fafcf..5863c415fbab7b09043ea147d2c85c455ae91e4d 100644
--- a/Modules/Wrappers/CommandLine/test/otbCommandLineTestDriver.cxx
+++ b/Modules/Wrappers/CommandLine/test/otbCommandLineTestDriver.cxx
@@ -22,9 +22,7 @@
void RegisterTests()
{
- REGISTER_TEST(otbWrapperCommandLineLauncherNew);
REGISTER_TEST(otbWrapperCommandLineLauncherTest);
- REGISTER_TEST(otbWrapperCommandLineParserNew);
REGISTER_TEST(otbWrapperCommandLineParserTest1);
REGISTER_TEST(otbWrapperCommandLineParserTest2);
REGISTER_TEST(otbWrapperCommandLineParserTest3);
diff --git a/Modules/Wrappers/CommandLine/test/otbWrapperCommandLineLauncherTests.cxx b/Modules/Wrappers/CommandLine/test/otbWrapperCommandLineLauncherTests.cxx
index f8ff6bff622a1ade3677064b99e5250bfdaefe16..5338976b3f6529c9aacb5b8ff85730b3f0764623 100644
--- a/Modules/Wrappers/CommandLine/test/otbWrapperCommandLineLauncherTests.cxx
+++ b/Modules/Wrappers/CommandLine/test/otbWrapperCommandLineLauncherTests.cxx
@@ -25,13 +25,6 @@
#include "otbWrapperCommandLineLauncher.h"
-int otbWrapperCommandLineLauncherNew(int itkNotUsed(argc), char* itkNotUsed(argv)[])
-{
- typedef otb::Wrapper::CommandLineLauncher LauncherType;
- LauncherType::Pointer launcher = LauncherType::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Wrappers/CommandLine/test/otbWrapperCommandLineParserTests.cxx b/Modules/Wrappers/CommandLine/test/otbWrapperCommandLineParserTests.cxx
index 784d77f341514b496a5b1fee41555f1e300f9a8e..a409b167986108266116338b67d262d819d5dd64 100644
--- a/Modules/Wrappers/CommandLine/test/otbWrapperCommandLineParserTests.cxx
+++ b/Modules/Wrappers/CommandLine/test/otbWrapperCommandLineParserTests.cxx
@@ -26,12 +26,6 @@
typedef otb::Wrapper::CommandLineParser ParserType;
-int otbWrapperCommandLineParserNew(int itkNotUsed(argc), char* itkNotUsed(argv)[])
-{
- ParserType::Pointer parser = ParserType::New();
-
- return EXIT_SUCCESS;
-}
int CheckReturn(ParserType::ParseResultType res)
{
diff --git a/Modules/Wrappers/QtWidget/test/CMakeLists.txt b/Modules/Wrappers/QtWidget/test/CMakeLists.txt
index 7684b4eb6e0cc04a5e317c75bea0f0aa508a20ba..f3738aab64b71e15547fd7fa6121969e8f8d3db4 100644
--- a/Modules/Wrappers/QtWidget/test/CMakeLists.txt
+++ b/Modules/Wrappers/QtWidget/test/CMakeLists.txt
@@ -23,7 +23,6 @@ otb_module_test()
set(OTBQtWidgetTests
otbQtWidgetTestDriver.cxx
otbWrapperQtWidgetShowWidget.cxx
-otbQtLogOutputTests.cxx
otbWrapperQtWidgetParameterFactory.cxx
)
@@ -33,9 +32,6 @@ otb_module_target_label(otbQtWidgetTestDriver)
# Tests Declaration
-otb_add_test(NAME owTvQtLogOutputNew COMMAND otbQtWidgetTestDriver
- otbQtLogOutputNew)
-
otb_add_test(NAME owTvQtWidgetParameterGroup COMMAND otbQtWidgetTestDriver
otbWrapperQtWidgetParameterGroup)
diff --git a/Modules/Wrappers/QtWidget/test/otbQtLogOutputTests.cxx b/Modules/Wrappers/QtWidget/test/otbQtLogOutputTests.cxx
deleted file mode 100644
index 24eb5eccd25e791e3e5e718b648d008e13ef70c8..0000000000000000000000000000000000000000
--- a/Modules/Wrappers/QtWidget/test/otbQtLogOutputTests.cxx
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
- *
- * This file is part of Orfeo Toolbox
- *
- * https://www.orfeo-toolbox.org/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#if defined(_MSC_VER)
-#pragma warning ( disable : 4786 )
-#endif
-
-#include "otbQtLogOutput.h"
-
-
-int otbQtLogOutputNew(int /*argc*/, char* /*argv*/ [])
-{
- otb::QtLogOutput::Pointer log = otb::QtLogOutput::New();
- return EXIT_SUCCESS;
-}
diff --git a/Modules/Wrappers/QtWidget/test/otbQtWidgetTestDriver.cxx b/Modules/Wrappers/QtWidget/test/otbQtWidgetTestDriver.cxx
index a3ac8bd9a1ee9e1f2c3520b1e78ccc1bda1f463e..e9d0d4421786630a2c5e82039cb9db243f63fb3b 100644
--- a/Modules/Wrappers/QtWidget/test/otbQtWidgetTestDriver.cxx
+++ b/Modules/Wrappers/QtWidget/test/otbQtWidgetTestDriver.cxx
@@ -23,7 +23,6 @@
void RegisterTests()
{
REGISTER_TEST(otbWrapperQtWidgetShowWidget);
- REGISTER_TEST(otbQtLogOutputNew);
REGISTER_TEST(otbWrapperQtWidgetParameterFactory);
REGISTER_TEST(otbWrapperQtWidgetParameterGroup);
}
diff --git a/Packaging/Files/linux_pkgsetup.in b/Packaging/Files/linux_pkgsetup.in
index a7843133d9821082302474c21c471394970be57d..cfddf78a8ab09fac621aca6e350ef6a0e3c28f79 100644
--- a/Packaging/Files/linux_pkgsetup.in
+++ b/Packaging/Files/linux_pkgsetup.in
@@ -39,8 +39,6 @@ cd "$DIRNAME_0"
OUT_DIR=$(pwd)
-PATCH_ELF_EXE="$OUT_DIR/patchelf"
-
#do not move below block. it must be before "unset LD_LIBRARY_PATH" code
#check if we have any python bindings
if [ -f "$OUT_DIR/lib/python/_otbApplication.so" ] ; then
@@ -52,13 +50,11 @@ fi
unset LD_LIBRARY_PATH
# we remove files in $OUT_DIR/lib/gtk which we CANNOT add new rpath
-BINARY_FILES=$(find "$OUT_DIR/lib" "$OUT_DIR/bin" "$OUT_DIR/plugins" -type f -exec file {} \; | grep -v '/lib/gtk/' | grep -i elf|cut -f1 -d':')
+BINARY_FILES=$(find "./lib" "./bin" "./plugins" -type f -exec file {} \; | grep -v '/lib/gtk/' | grep -i ': elf ' | cut -f1 -d':')
# run patchelf
for bin_file in $BINARY_FILES; do
#echo "adding rpath to $bin_file"
- if [ -f "$bin_file" ]; then
- "$PATCH_ELF_EXE" "--set-rpath" "$OUT_DIR/lib" "$bin_file"
- fi
+ ./patchelf "--set-rpath" "$OUT_DIR/lib" "$bin_file"
done
#install uninstall_otb script
diff --git a/Packaging/Files/macx_pkgsetup.in b/Packaging/Files/macx_pkgsetup.in
index 242b74fe680a71abb3a2a0bc40fd82c8db7dc10a..4a6f28f3e1be2bad9a368e1fca5715799c40c162 100755
--- a/Packaging/Files/macx_pkgsetup.in
+++ b/Packaging/Files/macx_pkgsetup.in
@@ -51,18 +51,16 @@ unset DYLD_FALLBACK_LIBRARY_PATH
echo "Configuring..."
-LIB_FILES=$(find "$OUT_DIR/lib" "$OUT_DIR/plugins" -type f -exec file {} \; | grep -i "Mach-O"|cut -d ':' -f1)
-BIN_FILES=$(find "$OUT_DIR/bin" -type f -exec file {} \; | grep -i "Mach-O*.*executable"|cut -d ':' -f1)
+LIB_FILES=$(find "./lib" "./plugins" -type f -exec file {} \; | grep -i ": Mach-O "|cut -d ':' -f1)
+BIN_FILES=$(find "./bin" -type f -exec file {} \; | grep -i ": Mach-O .*executable"|cut -d ':' -f1)
# run install_name_tool
for input_file in $LIB_FILES $BIN_FILES; do
#echo "adding rpath to $OUT_DIR/$lib_file"
- if [ -f "$input_file" ]; then
- input_file_old_rpaths=$(otool -l "$input_file" | grep -A 3 "LC_RPATH" | grep -oE 'path .* \(offset' | cut -d ' ' -f 2)
- for rpath_old in $input_file_old_rpaths; do
- install_name_tool "-delete_rpath" "$rpath_old" "$input_file"
- done
- install_name_tool "-add_rpath" "$OUT_DIR/lib" "$input_file"
- fi
+ input_file_old_rpaths=$(otool -l "$input_file" | grep -A 3 "LC_RPATH" | grep -oE 'path .* \(offset' | cut -d ' ' -f 2)
+ for rpath_old in $input_file_old_rpaths; do
+ install_name_tool "-delete_rpath" "$rpath_old" "$input_file"
+ done
+ install_name_tool "-add_rpath" "$OUT_DIR/lib" "$input_file"
done
#install uninstall_otb script