Commit 889ced06 authored by Daniel McInerney's avatar Daniel McInerney

Merge remote-tracking branch 'upstream/develop' into develop

parents ced7c8fa 14ec6868

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -97,7 +97,7 @@ private:
// \code{DoInit()} method contains class information and description, parameter set up, and example values.
// Software Guide : EndLatex
void DoInit() ITK_OVERRIDE
void DoInit() override
{
// Software Guide : BeginLatex
......
......@@ -141,11 +141,11 @@ public:
protected:
MyChangeDetectorImageFilter() {}
~MyChangeDetectorImageFilter() ITK_OVERRIDE {}
~MyChangeDetectorImageFilter() override {}
private:
MyChangeDetectorImageFilter(const Self &); //purposely not implemented
void operator =(const Self&); //purposely not implemented
MyChangeDetectorImageFilter(const Self &) = delete;
void operator =(const Self&) = delete;
};
// Software Guide : EndCodeSnippet
......
......@@ -96,7 +96,7 @@ public:
itkTypeMacro(CompositeExampleImageFilter, itk::ImageToImageFilter);
/** Display */
void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
void PrintSelf(std::ostream& os, itk::Indent indent) const override;
// Software Guide : BeginLatex
//
......@@ -135,7 +135,7 @@ protected:
RescalerType;
// Software Guide : EndCodeSnippet
void GenerateData() ITK_OVERRIDE;
void GenerateData() override;
private:
......
......@@ -65,7 +65,7 @@ private:
otb::ogr::UniqueGeometryPtr
ReprojectTransformationFunctor::operator()(OGRGeometry const* in) const
{
otb::ogr::UniqueGeometryPtr out(in ? in->clone() : ITK_NULLPTR);
otb::ogr::UniqueGeometryPtr out(in ? in->clone() : nullptr);
if (out)
{
const OGRErr err = out->transform(m_reprojector.get());
......@@ -102,11 +102,11 @@ protected:
/** Default constructor. */
MyReprojectionFilter(){ }
/** Destructor. */
~MyReprojectionFilter() ITK_OVERRIDE{ }
~MyReprojectionFilter() override{ }
private:
OGRSpatialReference* DoDefineNewLayerSpatialReference(otb::ogr::Layer const& itkNotUsed(source)) const ITK_OVERRIDE
OGRSpatialReference* DoDefineNewLayerSpatialReference(otb::ogr::Layer const& itkNotUsed(source)) const override
{
return m_osr.get();
}
......@@ -207,7 +207,7 @@ int main (int argc, char **argv)
otb::ogr::DataSource::Pointer output
= options.workingInplace ? input
: options.outputIsStdout ? ITK_NULLPTR
: options.outputIsStdout ? nullptr
: otb::ogr::DataSource::New( options.outputFile, otb::ogr::DataSource::Modes::Update_LayerCreateOnly);
std::cout << "input: " << otb::ogr::version_proxy::GetFileListAsStringVector(&input->ogr())[0] << " should be: " << options.inputFile << "\n";
if (output)
......@@ -234,7 +234,7 @@ int main (int argc, char **argv)
}
else
{
filter->UpdateOutputData(ITK_NULLPTR);
filter->UpdateOutputData(nullptr);
assert(filter->GetOutput() && "output not set");
filter->GetOutput()->Print(std::cout, 0);
}
......
......@@ -35,7 +35,7 @@ struct SwapXYFunctor
typedef OGRGeometry TransformedElementType;
otb::ogr::UniqueGeometryPtr operator()(OGRGeometry const* in) const
{
otb::ogr::UniqueGeometryPtr out(in ? in->clone() : ITK_NULLPTR);
otb::ogr::UniqueGeometryPtr out(in ? in->clone() : nullptr);
if (out)
{
#if GDAL_VERSION_NUM >= 1900
......@@ -74,7 +74,7 @@ int main (int argc, char **argv)
otb::ogr::DataSource::Pointer output
= workingInplace ? input
: outputIsStdout ? ITK_NULLPTR
: outputIsStdout ? nullptr
: otb::ogr::DataSource::New( outputFile, otb::ogr::DataSource::Modes::Update_LayerCreateOnly);
std::cout << "input: " << otb::ogr::version_proxy::GetFileListAsStringVector(&input->ogr())[0] << " should be: " << inputFile << "\n";
if (output)
......@@ -97,7 +97,7 @@ int main (int argc, char **argv)
}
else
{
filter->UpdateOutputData(ITK_NULLPTR);
filter->UpdateOutputData(nullptr);
assert(filter->GetOutput() && "output not set");
filter->GetOutput()->Print(std::cout, 0);
}
......
......@@ -109,7 +109,7 @@ int main(int argc, char * argv[])
otb::ogr::DataSource::Pointer destination = otb::ogr::DataSource::New(
argv[2], otb::ogr::DataSource::Modes::Update_LayerCreateOnly);
otb::ogr::Layer destLayer = destination->CreateLayer(
argv[2], ITK_NULLPTR, wkbMultiPolygon);
argv[2], nullptr, wkbMultiPolygon);
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
......
......@@ -102,7 +102,7 @@ int main(int argc, char * argv[])
// Software Guide : EndCodeSnippet
char * fileNameIn = argv[1];
char * fileNameImgInit = ITK_NULLPTR;
char * fileNameImgInit = nullptr;
char * fileNameOut = argv[2];
int numberOfClasses = atoi(argv[3]);
int numberOfIteration = atoi(argv[4]);
......@@ -148,7 +148,7 @@ int main(int argc, char * argv[])
// Software Guide : EndLatex
// Software Guide : BeginCodeSnippet
if (fileNameImgInit != ITK_NULLPTR)
if (fileNameImgInit != nullptr)
{
typedef otb::ImageFileReader<OutputImageType> ImgInitReaderType;
ImgInitReaderType::Pointer segReader = ImgInitReaderType::New();
......
......@@ -408,7 +408,7 @@ int main(int itkNotUsed(argc), char* argv[])
// Software Guide : EndLatex
// Software Guide : BeginCodeSnippet
if (actMapFileName != ITK_NULLPTR)
if (actMapFileName != nullptr)
{
ActivationWriterType::Pointer actWriter = ActivationWriterType::New();
actWriter->SetFileName(actMapFileName);
......
......@@ -155,8 +155,8 @@ int main(int argc, char* argv[])
orthoRectifFilter->SetDisplacementFieldSpacing(gridSpacing);
ImageType::PointType origin;
origin[0] = strtod(argv[5], ITK_NULLPTR);
origin[1] = strtod(argv[6], ITK_NULLPTR);
origin[0] = strtod(argv[5], nullptr);
origin[1] = strtod(argv[6], nullptr);
orthoRectifFilter->SetOutputOrigin(origin);
// Software Guide : EndCodeSnippet
......
......@@ -187,8 +187,8 @@ int main(int argc, char* argv[])
spacing[1] = -0.00001;
ImageType::PointType origin;
origin[0] = strtod(argv[3], ITK_NULLPTR); //longitude
origin[1] = strtod(argv[4], ITK_NULLPTR); //latitude
origin[0] = strtod(argv[3], nullptr); //longitude
origin[1] = strtod(argv[4], nullptr); //latitude
ImageType::RegionType region;
......
......@@ -81,12 +81,12 @@ public:
typedef itk::RegularStepGradientDescentOptimizer OptimizerType;
typedef const OptimizerType * OptimizerPointer;
void Execute(itk::Object *caller, const itk::EventObject& event) ITK_OVERRIDE
void Execute(itk::Object *caller, const itk::EventObject& event) override
{
Execute((const itk::Object *) caller, event);
}
void Execute(const itk::Object * object, const itk::EventObject& event) ITK_OVERRIDE
void Execute(const itk::Object * object, const itk::EventObject& event) override
{
OptimizerPointer optimizer =
dynamic_cast<OptimizerPointer>(object);
......
......@@ -100,12 +100,12 @@ public:
typedef itk::GradientDescentOptimizer OptimizerType;
typedef const OptimizerType * OptimizerPointer;
void Execute(itk::Object *caller, const itk::EventObject& event) ITK_OVERRIDE
void Execute(itk::Object *caller, const itk::EventObject& event) override
{
Execute((const itk::Object *) caller, event);
}
void Execute(const itk::Object * object, const itk::EventObject& event) ITK_OVERRIDE
void Execute(const itk::Object * object, const itk::EventObject& event) override
{
OptimizerPointer optimizer =
dynamic_cast<OptimizerPointer>(object);
......