Commit db61c5fc authored by Manuel Grizonnet's avatar Manuel Grizonnet

STYLE: more spelling errors and deprecated methods or classes with typos

parent 91aea1b7
......@@ -166,7 +166,7 @@ function(configure_app_package app with_otb_apps)
# I guess it's because cpack already handles installing the runtime,
# but here we build with a particular version of Visual, but
# some OSGeo4W dependencies are built upon other runtimes
set(MVD2_ADDITIONNAL_DLLS
set(MVD2_ADDITIONAL_DLLS
${OSGEO4W_ROOT}/bin/msvcp60.dll
${OSGEO4W_ROOT}/bin/msvcp70.dll
${OSGEO4W_ROOT}/bin/msvcp71.dll
......@@ -179,12 +179,12 @@ function(configure_app_package app with_otb_apps)
# I really don't understand why.
# Let's add them manually
set(MVD2_ADDITIONNAL_DLLS
${MVD2_ADDITIONNAL_DLLS}
set(MVD2_ADDITIONAL_DLLS
${MVD2_ADDITIONAL_DLLS}
${OSGEO4W_ROOT}/bin/libgcc_s_dw2-1.dll
${OSGEO4W_ROOT}/bin/libiconv-2.dll)
foreach(dll ${MVD2_ADDITIONNAL_DLLS})
foreach(dll ${MVD2_ADDITIONAL_DLLS})
if (EXISTS ${dll})
install( FILES ${dll} DESTINATION bin COMPONENT Runtime )
endif()
......
......@@ -112,7 +112,7 @@
# [VERSION TRUE|FALSE]
# )
#
# Create jave documentation based on files or packages. For more
# Create java documentation based on files or packages. For more
# details please read the javadoc manpage.
#
# There are two main signatures for create_javadoc. The first
......
......@@ -165,9 +165,9 @@ int main(int argc, char * argv[])
// Software Guide : BeginLatex
//
// The image obtained with the reader is passed as input to the
// \doxygen{otb}{AssymetricFusionOfDetectorImageFilter}. The pipeline is built as follows.
// \doxygen{otb}{AsymmetricFusionOfDetectorImageFilter}. The pipeline is built as follows.
//
// \index{otb::AssymetricFusionOfDetectorImageFilter!SetInput()}
// \index{otb::AsymmetricFusionOfDetectorImageFilter!SetInput()}
//
// Software Guide : EndLatex
......@@ -183,8 +183,8 @@ int main(int argc, char * argv[])
// allow setting the minimum length and the typical witdh of the
// lines which are to be detected.
//
// \index{otb::AssymetricFusionOfDetector!SetWidthLine()}
// \index{otb::AssymetricFusionOfDetector!SetLengthLine()}
// \index{otb::AsymmetricFusionOfDetector!SetWidthLine()}
// \index{otb::AsymmetricFusionOfDetector!SetLengthLine()}
//
// Software Guide : EndLatex
......@@ -211,12 +211,12 @@ int main(int argc, char * argv[])
// Software Guide : BeginLatex
// Figure~\ref{fig:LINEFUSION_FILTER}
// shows the result of applying the AssymetricFusionOf edge detector filter
// shows the result of applying the AsymmetricFusionOf edge detector filter
// to a SAR image. \begin{figure} \center
// \includegraphics[width=0.25\textwidth]{amst.eps}
// \includegraphics[width=0.25\textwidth]{amstLineFusion.eps}
// \itkcaption[Line Correlation Detector Application]{Result of applying
// the \doxygen{otb}{AssymetricFusionOfDetectorImageFilter} to a SAR
// the \doxygen{otb}{AsymmetricFusionOfDetectorImageFilter} to a SAR
// image. From left to right : original image, line intensity.} \label{fig:LINEFUSION_FILTER} \end{figure}
//
// Software Guide : EndLatex
......
project(FeatureExtractionExamples)
add_executable(AssymmetricFusionOfLineDetectorExample AssymmetricFusionOfLineDetectorExample.cxx)
target_link_libraries(AssymmetricFusionOfLineDetectorExample ${OTB_LIBRARIES})
add_executable(AsymmetricFusionOfLineDetectorExample AsymmetricFusionOfLineDetectorExample.cxx)
target_link_libraries(AsymmetricFusionOfLineDetectorExample ${OTB_LIBRARIES})
add_executable(CloudDetectionExample CloudDetectionExample.cxx)
target_link_libraries(CloudDetectionExample ${OTB_LIBRARIES})
......
......@@ -234,8 +234,8 @@ int main(int argc, char * argv[])
// Software Guide : BeginLatex
// \textbf{FIXME: set the methods}
// \index{otb::AssymetricFusionOfDetector!SetWidthLine()}
// \index{otb::AssymetricFusionOfDetector!SetLengthLine()}
// \index{otb::AsymmetricFusionOfDetector!SetWidthLine()}
// \index{otb::AsymmetricFusionOfDetector!SetLengthLine()}
// The filter is executed by invoking the \code{Update()} method. If the
// filter is part of a larger image processing pipeline, calling
......@@ -254,18 +254,18 @@ int main(int argc, char * argv[])
// Software Guide : EndLatex
// Software Guide : BeginLatex Figure~\ref{fig:LINECORRELATION_FILTER}
// shows the result of applying the AssymetricFusionOf edge detector filter
// shows the result of applying the AsymmetricFusionOf edge detector filter
// to a SAR image. \begin{figure} \center
// \includegraphics[width=0.25\textwidth]{amst.eps}
// \includegraphics[width=0.25\textwidth]{amstSegmentExtractionBySteps.eps}
// \itkcaption[Line Correlation Detector Application]{Result of applying
// the \doxygen{otb}{AssymetricFusionOfDetectorImageFilter} to a SAR
// the \doxygen{otb}{AsymmetricFusionOfDetectorImageFilter} to a SAR
// image. From left to right : original image, line intensity and
// edge orientation.} \label{fig:LINECORRELATION_FILTER} \end{figure}
//
// \relatedClasses
// \begin{itemize}
// \item \doxygen{otb}{AssymetricFusionOfDetectorImageFilter}
// \item \doxygen{otb}{AsymmetricFusionOfDetectorImageFilter}
// \end{itemize}
// Software Guide : EndLatex
......
......@@ -231,8 +231,8 @@ int main(int argc, char * argv[])
// Software Guide : BeginLatex
// \textbf{FIXME: set the methods}
// \index{otb::AssymetricFusionOfDetector!SetWidthLine()}
// \index{otb::AssymetricFusionOfDetector!SetLengthLine()}
// \index{otb::AsymmetricFusionOfDetector!SetWidthLine()}
// \index{otb::AsymmetricFusionOfDetector!SetLengthLine()}
// The filter is executed by invoking the \code{Update()} method. If the
// filter is part of a larger image processing pipeline, calling
......@@ -249,18 +249,18 @@ int main(int argc, char * argv[])
writer->Update();
// Software Guide : BeginLatex Figure~\ref{fig:LINECORRELATION_FILTER}
// shows the result of applying the AssymetricFusionOf edge detector filter
// shows the result of applying the AsymmetricFusionOf edge detector filter
// to a SAR image. \begin{figure} \center
// \includegraphics[width=0.25\textwidth]{amst.eps}
// \includegraphics[width=0.25\textwidth]{amstSegmentExtraction.eps}
// \itkcaption[Line Correlation Detector Application]{Result of applying
// the \doxygen{otb}{AssymetricFusionOfDetectorImageFilter} to a SAR
// the \doxygen{otb}{AsymmetricFusionOfDetectorImageFilter} to a SAR
// image. From left to right : original image, line intensity and
// edge orientation.} \label{fig:LINECORRELATION_FILTER} \end{figure}
//
// \relatedClasses
// \begin{itemize}
// \item \doxygen{otb}{AssymetricFusionOfDetectorImageFilter}
// \item \doxygen{otb}{AsymmetricFusionOfDetectorImageFilter}
// \end{itemize}
// Software Guide : EndLatex
......
......@@ -67,13 +67,13 @@ otb_add_test(NAME feTeExtractSegmentsByStepsExampleTest COMMAND ${OTB_TEST_DRIVE
10 3 10 0.5 10 10 3 10 0.5
)
# ------- AssymmetricFusionOfLineDetectorExampleTest----------
# ------- AsymmetricFusionOfLineDetectorExampleTest----------
otb_add_test(NAME feTeAssymmetricFusionOfLineDetectorExampleTest COMMAND ${OTB_TEST_DRIVER}
otb_add_test(NAME feTeAsymmetricFusionOfLineDetectorExampleTest COMMAND ${OTB_TEST_DRIVER}
--compare-n-images ${NOTOL} 1
${BASELINE}/amstLineFusion.png
${TEMP}/amstLineFusion.png
Execute $<TARGET_FILE:AssymmetricFusionOfLineDetectorExample>
Execute $<TARGET_FILE:AsymmetricFusionOfLineDetectorExample>
${INPUTDATA}/amst.png
${TEMP}/amstLineFusion.png
5 1
......
......@@ -12,8 +12,8 @@ target_link_libraries(MarkovClassification3Example ${OTB_LIBRARIES})
add_executable(MarkovRegularizationExample MarkovRegularizationExample.cxx)
target_link_libraries(MarkovRegularizationExample ${OTB_LIBRARIES})
add_executable(MarkovRestaurationExample MarkovRestaurationExample.cxx)
target_link_libraries(MarkovRestaurationExample ${OTB_LIBRARIES})
add_executable(MarkovRestorationExample MarkovRestorationExample.cxx)
target_link_libraries(MarkovRestorationExample ${OTB_LIBRARIES})
if(BUILD_TESTING)
......
......@@ -19,7 +19,7 @@
// Software Guide : BeginCommandLineArgs
// INPUTS: {QB_Suburb.png}, {QB_Suburb.png}
// OUTPUTS: {MarkovRestauration.png}
// OUTPUTS: {MarkovRestoration.png}
// 10.0 30 1.0 1
// Software Guide : EndCommandLineArgs
......@@ -228,18 +228,18 @@ int main(int argc, char* argv[])
// Software Guide : BeginLatex
//
// Figure~\ref{fig:MRF_RESTAURATION} shows the output of the Markov Random
// Figure~\ref{fig:MRF_RESTORATION} shows the output of the Markov Random
// Field restoration.
//
// \begin{figure}
// \center
// \includegraphics[width=0.44\textwidth]{QB_Suburb.eps}
// \includegraphics[width=0.44\textwidth]{MarkovRestauration.eps}
// \includegraphics[width=0.44\textwidth]{MarkovRestoration.eps}
// \itkcaption[MRF restoration]{Result of applying
// the \doxygen{otb}{MarkovRandomFieldFilter} to an extract from a PAN Quickbird
// image for restoration. From left to right : original image, restaured image
// with edge preservation.}
// \label{fig:MRF_RESTAURATION}
// \label{fig:MRF_RESTORATION}
// \end{figure}
//
// Software Guide : EndLatex
......
......@@ -37,14 +37,14 @@ otb_add_test(NAME maTeMarkovClassification3ExampleTest COMMAND ${OTB_TEST_DRIVER
1.0 20 1.0 1
)
otb_add_test(NAME maTeMarkovRestaurationExampleTest COMMAND ${OTB_TEST_DRIVER}
otb_add_test(NAME maTeMarkovRestorationExampleTest COMMAND ${OTB_TEST_DRIVER}
--compare-image ${EPSILON_8}
${BASELINE}/MarkovRestauration.png
${TEMP}/MarkovRestauration.png
Execute $<TARGET_FILE:MarkovRestaurationExample>
${BASELINE}/MarkovRestoration.png
${TEMP}/MarkovRestoration.png
Execute $<TARGET_FILE:MarkovRestorationExample>
${INPUTDATA}/QB_Suburb.png
${INPUTDATA}/QB_Suburb.png
${TEMP}/MarkovRestauration.png
${TEMP}/MarkovRestoration.png
10.0
30.0
1.
......
......@@ -19,7 +19,7 @@
// Software Guide : BeginCommandLineArgs
//
// INPUTS: {verySmallFSATSW.tif}
// OUTPUTS: {siTvLAIFromNDVIImageTransfromExampleTest_verySmallFSATSW.tif}, {verySmallFSATSW_visu.png}, {siTvLAIFromNDVIImageTransfromExampleTest_verySmallFSATSW_visu.png}
// OUTPUTS: {siTvLAIFromNDVIImageTransformExampleTest_verySmallFSATSW.tif}, {verySmallFSATSW_visu.png}, {siTvLAIFromNDVIImageTransformExampleTest_verySmallFSATSW_visu.png}
// 1 4
// Software Guide : EndCommandLineArgs
//
......@@ -175,7 +175,7 @@ int main(int argc, char *argv[])
// \begin{figure}
// \center
// \includegraphics[width=0.44\textwidth]{verySmallFSATSW_visu.eps}
// \includegraphics[width=0.44\textwidth]{siTvLAIFromNDVIImageTransfromExampleTest_verySmallFSATSW_visu.eps}
// \includegraphics[width=0.44\textwidth]{siTvLAIFromNDVIImageTransformExampleTest_verySmallFSATSW_visu.eps}
// \itkcaption[LAIFromNDVIImageTransform Filter]{LAI generation \emph{(right)} from NDVI applied on Formosat 2 Image \emph{(left)} .}
// \label{fig:LAIFromNDVIImageTransform}
// \end{figure}
......
......@@ -45,15 +45,15 @@ Execute $<TARGET_FILE:LAIAndPROSAILToSensorResponse>
endif()
otb_add_test(NAME siTvLAIFromNDVIImageTransfromExampleTest COMMAND ${OTB_TEST_DRIVER}
otb_add_test(NAME siTvLAIFromNDVIImageTransformExampleTest COMMAND ${OTB_TEST_DRIVER}
--compare-image ${EPSILON_8}
${OTB_DATA_ROOT}/Baseline/OTB/Images/raRAndNIRVegetationIndex_LAIFromNDVIFormosat2_verySmallFSATSWcRcNir.tif
${TEMP}/siTvLAIFromNDVIImageTransfromExampleTest_verySmallFSATSW.tif
${TEMP}/siTvLAIFromNDVIImageTransformExampleTest_verySmallFSATSW.tif
Execute $<TARGET_FILE:LAIFromNDVIImageTransform>
${INPUTDATA}/verySmallFSATSW.tif
${TEMP}/siTvLAIFromNDVIImageTransfromExampleTest_verySmallFSATSW.tif
${TEMP}/siTvLAIFromNDVIImageTransformExampleTest_verySmallFSATSW.tif
${TEMP}/verySmallFSATSW_visu.png
${TEMP}/siTvLAIFromNDVIImageTransfromExampleTest_verySmallFSATSW_visu.png
${TEMP}/siTvLAIFromNDVIImageTransformExampleTest_verySmallFSATSW_visu.png
1 # red
4 # nir
)
......@@ -32,6 +32,8 @@
#include <boost/type_traits/is_same.hpp>
#include "otbOGRLayerWrapper.h"
#include "otbMacro.h"
// forward declarations
namespace otb { namespace internal {
struct ProcessVisitor;
......@@ -163,8 +165,17 @@ private:
*
* The default implementation does nothing.
*/
virtual void DoFinalizeInitialisation() {}
virtual void DoFinalizeInitialization() {}
//@}
/** THIS METHOD IS DEPRECATED AND SHOULD NOT BE USED. */
void DoFinalizeInitialisation()
{
otbWarningMacro(
<< "DoFinalizeInitialisation has been deprecated. Please use DoFinalizeInitialization() instead");
this->DoFinalizeInitialization();
}
friend struct otb::internal::ProcessVisitor;
};
......
......@@ -189,7 +189,7 @@ otb::GeometriesToGeometriesFilter::GetInput(void )
void otb::GeometriesToGeometriesFilter::GenerateData(void )
{
this->DoAllocateOutputs();
this->DoFinalizeInitialisation();
this->DoFinalizeInitialization();
InputGeometriesType::ConstPointer input = this->GetInput();
// assert(input && "Cann't filter to a nil geometries set");
......
......@@ -26,6 +26,8 @@
#include "OTBOSSIMAdaptersExport.h"
#include "otbMacro.h"
class ossimProjection;
namespace otb
......@@ -35,7 +37,7 @@ namespace otb
* \class MapProjectionAdapter
* \brief Wrapper class to group all dependencies to ossim for map projection
*
* This class is NOT intented to be used outside of OTB. Use the
* This class is NOT intended to be used outside of OTB. Use the
* GenericMapProjection. If you feel that you need to use it directly,
* think again!
*
......@@ -73,7 +75,15 @@ public:
void SetParameter(const std::string& key, const std::string& value);
std::string GetParameter(const std::string& key) const;
bool InstanciateProjection();
bool InstantiateProjection();
/** THIS METHOD IS DEPRECATED AND SHOULD NOT BE USED. */
bool InstanciateProjection()
{
otbWarningMacro(
<< "InstanciateProjection has been deprecated. Please use InstanciateProjection() instead");
return this->InstantiateProjection();
}
void InverseTransform(double x, double y, double z,
double& lon, double& lat, double& h);
......
......@@ -32,7 +32,7 @@ class ImageKeywordlist;
* \class SensorModelAdapter
* \brief Wrapper class to group all dependencies to ossim for sensor models
*
* This class is NOT intented to be used outside of OTB. Use the
* This class is NOT intended to be used outside of OTB. Use the
* InverseSensorModel and ForwardSensorModel. If you feel that you need to use
* it directly, think again!
*
......
......@@ -90,7 +90,7 @@ MapProjectionAdapter::InternalMapProjectionPointer MapProjectionAdapter::GetMapP
itkDebugMacro("returning MapProjection address " << this->m_MapProjection);
if ((m_ReinstanciateProjection) || (m_MapProjection == ITK_NULLPTR))
{
this->InstanciateProjection();
this->InstantiateProjection();
}
return this->m_MapProjection;
......@@ -101,7 +101,7 @@ MapProjectionAdapter::InternalMapProjectionConstPointer MapProjectionAdapter::Ge
itkDebugMacro("returning MapProjection address " << this->m_MapProjection);
if ((m_ReinstanciateProjection) || (m_MapProjection == ITK_NULLPTR))
{
itkExceptionMacro(<< "m_MapProjection not up-to-date, call InstanciateProjection() first");
itkExceptionMacro(<< "m_MapProjection not up-to-date, call InstantiateProjection() first");
}
return this->m_MapProjection;
......@@ -126,7 +126,7 @@ void MapProjectionAdapter::SetWkt(const std::string& projectionRefWkt)
{
this->m_ProjectionRefWkt = projectionRefWkt;
m_ReinstanciateProjection = true;
this->InstanciateProjection(); //Should not be needed, but it is...
this->InstantiateProjection(); //Should not be needed, but it is...
this->Modified();
}
......@@ -134,7 +134,7 @@ void MapProjectionAdapter::SetParameter(const std::string& key, const std::strin
{
m_ParameterStore[key] = value;
m_ReinstanciateProjection = true;
this->InstanciateProjection(); //Should not be needed, but it is...
this->InstantiateProjection(); //Should not be needed, but it is...
this->Modified();
}
......@@ -215,7 +215,7 @@ std::string MapProjectionAdapter::GetParameter(const std::string& key) const
return "";
}
bool MapProjectionAdapter::InstanciateProjection()
bool MapProjectionAdapter::InstantiateProjection()
{
if ((this->m_ReinstanciateProjection) || (m_MapProjection == ITK_NULLPTR))
{
......
......@@ -3,7 +3,7 @@ otb_module_test()
set(OTBOSSIMAdaptersTests
otbOSSIMAdaptersTestDriver.cxx
otbTestImageKeywordlist.cxx
otbOssimJpegFileRessourceLeakTest.cxx
otbOssimJpegFileResourceLeakTest.cxx
otbMapProjectionAdapterTest.cxx
otbOssimElevManagerTest2.cxx
otbOssimElevManagerTest4.cxx
......@@ -120,8 +120,8 @@ foreach( file ${NAME_TESTS} )
endforeach()
otb_add_test(NAME ioTvOssimJpegFileRessourceLeak COMMAND otbOSSIMAdaptersTestDriver
otbOssimJpegFileRessourceLeakTest
otb_add_test(NAME ioTvOssimJpegFileResourceLeak COMMAND otbOSSIMAdaptersTestDriver
otbOssimJpegFileResourceLeakTest
${INPUTDATA}/poupees.jpg
1200
)
......
......@@ -2,7 +2,7 @@
void RegisterTests()
{
REGISTER_TEST(otbTestImageKeywordlist);
REGISTER_TEST(otbOssimJpegFileRessourceLeakTest);
REGISTER_TEST(otbOssimJpegFileResourceLeakTest);
REGISTER_TEST(otbMapProjectionAdapterTest);
REGISTER_TEST(otbOssimElevManagerTest2);
REGISTER_TEST(otbOssimElevManagerTest4);
......
......@@ -36,7 +36,7 @@
// This test demonstrate that handler->close() does not release the file descriptor for jpeg files.
int otbOssimJpegFileRessourceLeakTest(int argc, char * argv[])
int otbOssimJpegFileResourceLeakTest(int argc, char * argv[])
{
if (argc != 3)
{
......
......@@ -72,7 +72,7 @@ int otbRPCSolverAdapterTest(int argc, char* argv[])
RSTranformType::Pointer fwd2dTransform = RSTranformType::New();
fwd2dTransform->SetInputKeywordList(reader->GetOutput()->GetImageKeywordlist());
fwd2dTransform->InstanciateTransform();
fwd2dTransform->InstantiateTransform();
ImageType::SizeType size = reader->GetOutput()->GetLargestPossibleRegion().GetSize();
......@@ -130,10 +130,10 @@ int otbRPCSolverAdapterTest(int argc, char* argv[])
// Build forward and inverse rpc transform
RSTranform3dType::Pointer rpcFwdTransform = RSTranform3dType::New();
rpcFwdTransform->SetInputKeywordList(rpcKwl);
rpcFwdTransform->InstanciateTransform();
rpcFwdTransform->InstantiateTransform();
RSTranformType::Pointer rpcInvTransform = RSTranformType::New();
rpcInvTransform->SetOutputKeywordList(rpcKwl);
rpcInvTransform->InstanciateTransform();
rpcInvTransform->InstantiateTransform();
EuclideanDistanceMetricType::Pointer euclideanDistanceMetric = EuclideanDistanceMetricType::New();
GeoDistanceType::Pointer geoDistance = GeoDistanceType::New();
......
......@@ -361,9 +361,9 @@ private:
// Setup the DEM Handler
otb::Wrapper::ElevationParametersHandler::SetupDEMHandlerFromElevationParameters(this,"elev");
rsTransform->InstanciateTransform();
rsTransform1ToWGS84->InstanciateTransform();
rsTransform2ToWGS84->InstanciateTransform();
rsTransform->InstantiateTransform();
rsTransform1ToWGS84->InstantiateTransform();
rsTransform2ToWGS84->InstantiateTransform();
if(GetParameterString("mode")=="full")
......
......@@ -167,7 +167,7 @@ private:
rsTransformToWGS84->SetInputProjectionRef(inImage->GetProjectionRef());
rsTransformToWGS84->SetOutputProjectionRef(static_cast<std::string> (otb::GeoInformationConversion::ToWKT(4326)));
rsTransformToWGS84->InstanciateTransform();
rsTransformToWGS84->InstantiateTransform();
const SizeType size = inImage->GetLargestPossibleRegion().GetSize();
const PointType origin=inImage->GetOrigin();
......
......@@ -238,7 +238,7 @@ private:
rsTransform->SetInputProjectionRef(referencePtr->GetProjectionRef());
rsTransform->SetOutputKeywordList(inImage->GetImageKeywordlist());
rsTransform->SetOutputProjectionRef(inImage->GetProjectionRef());
rsTransform->InstanciateTransform();
rsTransform->InstantiateTransform();
FloatVectorImageType::IndexType uli_ref,uri_ref,lli_ref,lri_ref;
......
......@@ -70,7 +70,7 @@ private:
// Doc example parameter settings
SetDocExampleParameterValue("in", "VegetationIndex.hd");
SetDocExampleParameterValue("out", "splittedImage.tif");
SetDocExampleParameterValue("out", "splitImage.tif");
}
void DoUpdateParameters() ITK_OVERRIDE
......
......@@ -97,13 +97,13 @@ private:
// Get the projectionRef
std::string inputProjRef = MapProjectionParametersHandler::GetProjectionRefFromChoice(this, "mapproj");
// Instantiate a GenericRSTranform
// Instantiate a GenericRSTransform
// Input : coordiante system picked up by the user
// Output : WGS84 corresponding to epsg code 4326
TransformType::Pointer transform = TransformType::New();
transform->SetInputProjectionRef(inputProjRef);
transform->SetOutputProjectionRef(otb::GeoInformationConversion::ToWKT(4326));
transform->InstanciateTransform();
transform->InstantiateTransform();
TransformType::InputPointType cartoPoint;
TransformType::OutputPointType geoPoint;
......
......@@ -179,7 +179,7 @@ private:
RSTransformType::Pointer rsTransform = RSTransformType::New();
rsTransform->SetOutputProjectionRef(MapProjectionParametersHandler::GetProjectionRefFromChoice(this, "map"));
rsTransform->InstanciateTransform();
rsTransform->InstantiateTransform();
std::ofstream ofs;
ofs<<std::fixed;
......
......@@ -194,7 +194,7 @@ private:
RSTransformType::Pointer rsTransform = RSTransformType::New();
rsTransform->SetOutputProjectionRef(MapProjectionParametersHandler::GetProjectionRefFromChoice(this, "map"));
rsTransform->InstanciateTransform();
rsTransform->InstantiateTransform();
std::ofstream ofs;
ofs<<std::fixed;
......
......@@ -23,14 +23,14 @@ set(raster_comparison --compare-image ${NOTOL})
set(vector_ref_path ${BASELINE_FILES})
set(raster_ref_path ${BASELINE})
set(fitlerList "Meanshift" "CC" "Watershed")
set(filterList "Meanshift" "CC" "Watershed")
# Loop on modes
foreach(mode "Raster" "Vector")
string(TOLOWER ${mode} lmode)
# Loop on filters
foreach(filter ${fitlerList})
foreach(filter ${filterList})
string(TOLOWER ${filter} lfilter)
# Derive output file name
......
......@@ -129,8 +129,8 @@ private:
rsTransform->SetOutputProjectionRef(colorPtr->GetProjectionRef());
rsTransform->SetOutputKeywordList(colorPtr->GetImageKeywordlist());
rsTransform->InstanciateTransform();
toMap->InstanciateTransform();
rsTransform->InstantiateTransform();
toMap->InstantiateTransform();
unsigned long nbValidPoints = 0;
......
......@@ -263,7 +263,7 @@ private:
RSTransformType::Pointer rsTransform = RSTransformType::New();
rsTransform->SetInputProjectionRef(inputProjectionRef);
rsTransform->SetOutputProjectionRef(outputProjectionRef);
rsTransform->InstanciateTransform();
rsTransform->InstantiateTransform();
corner = rsTransform->TransformPoint(corner);
}
......@@ -293,7 +293,7 @@ private:
RSTransformType::Pointer rsTransform = RSTransformType::New();
rsTransform->SetInputProjectionRef(inputProjectionRef);
rsTransform->SetOutputProjectionRef(outputProjectionRef);
rsTransform->InstanciateTransform();
rsTransform->InstantiateTransform();
lrout = rsTransform->TransformPoint(lrout);
}
......
......@@ -25,6 +25,8 @@
#include "itkBinaryFunctorImageFilter.h"
#include "itkImageToImageFilter.h"
#include "otbMacro.h"
namespace otb
{
namespace Functor
......@@ -171,14 +173,22 @@ public:
itkGetMacro(UseAddition, bool);
itkGetMacro(UseMultiplication, bool);
itkGetMacro(UseDivision, bool);
itkGetMacro(UseSubstraction, bool);
itkGetMacro(UseSubtraction, bool);
/** THIS METHOD IS DEPRECATED AND SHOULD NOT BE USED. */
virtual bool GetUseSubstraction()
{
otbWarningMacro(
<< "GetUseSubstraction has been deprecated. Please use GetUseSubtraction() instead");
return GetUseSubtraction();
}
void UseAddition()
{
m_UseAddition = true;
m_UseMultiplication = false;
m_UseDivision = false;
m_UseSubstraction = false;
m_UseSubtraction = false;
this->GetFunctor().SetOperator(static_cast<OperatorType>(1));
this->Modified();
}
......@@ -187,7 +197,7 @@ public:
m_UseAddition = false;
m_UseMultiplication = true;
m_UseDivision = false;
m_UseSubstraction = false;
m_UseSubtraction = false;
this->GetFunctor().SetOperator(static_cast<OperatorType>(0));
this->Modified();
}
......@@ -196,16 +206,16 @@ public:
m_UseAddition = false;
m_UseMultiplication = false;
m_UseDivision = true;
m_UseSubstraction = false;
m_UseSubtraction = false;
this->GetFunctor().SetOperator(static_cast<OperatorType>(2));
this->Modified();
}
void UseSubstraction()
void UseSubtraction()
{
m_UseAddition = false;
m_UseMultiplication = false;
m_UseDivision = false;
m_UseSubstraction = true;
m_UseSubtraction = true;
this->GetFunctor().SetOperator(static_cast<OperatorType>(3));
this->Modified();
}
......@@ -226,7 +236,7 @@ private:
bool m_UseAddition;
bool m_UseMultiplication;
bool m_UseDivision;
bool m_UseSubstraction;
bool m_UseSubtraction;
};
} // end namespace otb
......