diff --git a/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx b/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx index 956bf59a2051f5b36b381979d1ec5d7a894a4ebb..ce442281a87430be60c90ada0389c6509edc22e1 100644 --- a/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx +++ b/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx @@ -123,7 +123,7 @@ class ITK_EXPORT MyChangeDetectorImageFilter : MyChangeDetector< typename itk::ConstNeighborhoodIterator<TInputImage1>, typename itk::ConstNeighborhoodIterator<TInputImage2>, - typename TOutputImage::PixelType> > + typename TOutputImage::PixelType> > { public: /** Standard class typedefs. */ diff --git a/Examples/ChangeDetection/JHMIChDet.cxx b/Examples/ChangeDetection/JHMIChDet.cxx index 35e38467b493b45c24f3f017f209bb3ad97b40f5..0204928487049c8b4508cb7a328c78a924663394 100644 --- a/Examples/ChangeDetection/JHMIChDet.cxx +++ b/Examples/ChangeDetection/JHMIChDet.cxx @@ -79,7 +79,7 @@ int main(int argc, char* argv[] ) float scale = itk::NumericTraits< OutputPixelType >::max()/ 100.0; /*float(itk::NumericTraits< OutputPixelType >::max()+ - itk::NumericTraits< InternalPixelType >::min());*/ + itk::NumericTraits< InternalPixelType >::min());*/ rescaler->SetScale( scale ); diff --git a/Examples/ChangeDetection/KullbackLeiblerDistanceChDet.cxx b/Examples/ChangeDetection/KullbackLeiblerDistanceChDet.cxx index 666050b86af7ae86532114feb63f8b9b2ddc09f6..41d70383ebbebd83b8e8d3ced09851988d7df7b4 100644 --- a/Examples/ChangeDetection/KullbackLeiblerDistanceChDet.cxx +++ b/Examples/ChangeDetection/KullbackLeiblerDistanceChDet.cxx @@ -123,7 +123,7 @@ int main(int argc, char * argv[]) // Software Guide : BeginCodeSnippet typedef otb::KullbackLeiblerDistanceImageFilter<ImageType, - ImageType,ImageType> FilterType; + ImageType,ImageType> FilterType; // Software Guide : EndCodeSnippet // Software Guide : BeginLatex diff --git a/Examples/ChangeDetection/KullbackLeiblerProfileChDet.cxx b/Examples/ChangeDetection/KullbackLeiblerProfileChDet.cxx index 04bdaedf13a78c81e2bfc29490960ef2899f84ed..5864311573e613b6073cfd5843365de149433a19 100644 --- a/Examples/ChangeDetection/KullbackLeiblerProfileChDet.cxx +++ b/Examples/ChangeDetection/KullbackLeiblerProfileChDet.cxx @@ -59,11 +59,11 @@ int main(int argc, char * argv[]) try { if(argc != 9) - { - std::cerr<<"Detection de changements par mesure de Kullback-Leibler, optimisee par un developpement de Edgeworth\n"; - std::cerr << argv[0] << " imgAv imgAp imgResu winSizeMin winSizeMax outRedIndex outGreenIndex outBlueIndex\n"; - return 1; - } + { + std::cerr<<"Detection de changements par mesure de Kullback-Leibler, optimisee par un developpement de Edgeworth\n"; + std::cerr << argv[0] << " imgAv imgAp imgResu winSizeMin winSizeMax outRedIndex outGreenIndex outBlueIndex\n"; + return 1; + } char * fileName1 = argv[1]; char * fileName2 = argv[2]; @@ -91,7 +91,7 @@ int main(int argc, char * argv[]) typedef otb::Image<PixelType,Dimension> ImageType; typedef otb::VectorImage<PixelType,Dimension> VectorImageType; typedef otb::KullbackLeiblerProfileImageFilter<ImageType, - ImageType,VectorImageType> FilterType; + ImageType,VectorImageType> FilterType; // Software Guide : EndCodeSnippet typedef otb::VectorImage<OutPixelType,Dimension> OutVectorImageType; diff --git a/Examples/ChangeDetection/KullbackLeiblerSupervizedDistanceChDet.cxx b/Examples/ChangeDetection/KullbackLeiblerSupervizedDistanceChDet.cxx index a9881229e3c873b3012e44474ebd4dd48c2b4681..2dde2eb2270efa8f4af4823ed18b8f0608c42d0a 100644 --- a/Examples/ChangeDetection/KullbackLeiblerSupervizedDistanceChDet.cxx +++ b/Examples/ChangeDetection/KullbackLeiblerSupervizedDistanceChDet.cxx @@ -31,119 +31,119 @@ int main ( int argc, char * argv[] ) { - try { + try { typedef otb::CommandLineArgumentParser ParserType; ParserType::Pointer parser = ParserType::New(); parser->AddOption( "--InputImage1", "Give Before image", "-1", 1, true ); - parser->AddOption( "--InputImage2", "Give After image", "-2", 1, true ); + parser->AddOption( "--InputImage2", "Give After image", "-2", 1, true ); parser->AddOption( "--Roi", "Give ROI image", "-r", 1, true ); - parser->AddOption( "--winSize", "Sliding window size (def. 35)", "-w", 1, false ); - parser->AddOutputImage(); + parser->AddOption( "--winSize", "Sliding window size (def. 35)", "-w", 1, false ); + parser->AddOutputImage(); - typedef otb::CommandLineArgumentParseResult ParserResultType; - ParserResultType::Pointer parseResult = ParserResultType::New(); + typedef otb::CommandLineArgumentParseResult ParserResultType; + ParserResultType::Pointer parseResult = ParserResultType::New(); - try + try { parser->ParseCommandLine(argc,argv,parseResult); - } - catch( itk::ExceptionObject & err ) - { - std::string descriptionException = err.GetDescription(); - if ( descriptionException.find("ParseCommandLine(): Help Parser") - != std::string::npos ) - return EXIT_SUCCESS; - if(descriptionException.find("ParseCommandLine(): Version Parser") - != std::string::npos ) - return EXIT_SUCCESS; - return EXIT_FAILURE; - } - - /* - * declaration des types - */ - - const unsigned int Dimension = 2; - - typedef double InputPixelType; - typedef unsigned char TrainingPixelType; - - typedef otb::Image< InputPixelType, Dimension > ImageType; - typedef otb::ImageFileReader< ImageType > ReaderType; - - typedef otb::Image< TrainingPixelType, Dimension > TrainingImageType; - typedef otb::ImageFileReader< TrainingImageType > TrainingReaderType; - - /* - * Accès aux paramètres - */ - - const char * inputImageFileName1 = parseResult->GetParameterString("--InputImage1").c_str(); - const char * inputImageFileName2 = parseResult->GetParameterString("--InputImage2").c_str(); - const char * inputTrainingImageFileName = parseResult->GetParameterString("--Roi").c_str(); - const char * outputImageFileName = parseResult->GetOutputImage().c_str(); - - int winSize = 35; - if ( parseResult->IsOptionPresent("--winSize") ) - winSize = parseResult->GetParameterInt("--winSize"); - - /* - * JustDoIt - */ - - - ImageType::Pointer img1 = ImageType::New(); - ReaderType::Pointer reader1 = ReaderType::New(); - reader1->SetFileName( inputImageFileName1 ); - //reader1->Update(); - img1 = reader1->GetOutput(); - - ImageType::Pointer img2 = ImageType::New(); - ReaderType::Pointer reader2 = ReaderType::New(); - reader2->SetFileName( inputImageFileName2 ); - //reader2->Update(); - img2 = reader2->GetOutput(); - - TrainingImageType::Pointer imgRoi = TrainingImageType::New(); - TrainingReaderType::Pointer readerRoi = TrainingReaderType::New(); - readerRoi->SetFileName( inputTrainingImageFileName ); - //readerRoi->Update(); - imgRoi = readerRoi->GetOutput(); - - typedef otb::KullbackLeiblerSupervizedDistanceImageFilter< - ImageType, ImageType, TrainingImageType, ImageType > FilterType; - - FilterType::Pointer changeDetector = FilterType::New(); - changeDetector->SetRadius( (winSize-1)/2 ); - changeDetector->SetInput1( img1 ); - changeDetector->SetInput2( img2 ); - - // Once img1 and img2 are connected, it is time to connect imgRoi - // to perform the parameters estimation of the non-changed area. - - changeDetector->SetTrainingArea( imgRoi ); - - typedef otb::CommandProgressUpdate< FilterType > CommandType; - CommandType::Pointer observer = CommandType::New(); - changeDetector->AddObserver( itk::ProgressEvent(), observer ); - - typedef otb::ImageFileWriter< ImageType > WriterType; - WriterType::Pointer writer = WriterType::New(); - writer->SetFileName( outputImageFileName ); - writer->SetInput( changeDetector->GetOutput() ); - - writer->Update(); - - } - catch( itk::ExceptionObject & err ) - { - std::cerr << "ExceptionObject caught !" << std::endl; - std::cerr << err << std::endl << std::endl; - return EXIT_FAILURE; - } - - return EXIT_SUCCESS; + } + catch( itk::ExceptionObject & err ) + { + std::string descriptionException = err.GetDescription(); + if ( descriptionException.find("ParseCommandLine(): Help Parser") + != std::string::npos ) + return EXIT_SUCCESS; + if(descriptionException.find("ParseCommandLine(): Version Parser") + != std::string::npos ) + return EXIT_SUCCESS; + return EXIT_FAILURE; + } + + /* + * declaration des types + */ + + const unsigned int Dimension = 2; + + typedef double InputPixelType; + typedef unsigned char TrainingPixelType; + + typedef otb::Image< InputPixelType, Dimension > ImageType; + typedef otb::ImageFileReader< ImageType > ReaderType; + + typedef otb::Image< TrainingPixelType, Dimension > TrainingImageType; + typedef otb::ImageFileReader< TrainingImageType > TrainingReaderType; + + /* + * Accès aux paramètres + */ + + const char * inputImageFileName1 = parseResult->GetParameterString("--InputImage1").c_str(); + const char * inputImageFileName2 = parseResult->GetParameterString("--InputImage2").c_str(); + const char * inputTrainingImageFileName = parseResult->GetParameterString("--Roi").c_str(); + const char * outputImageFileName = parseResult->GetOutputImage().c_str(); + + int winSize = 35; + if ( parseResult->IsOptionPresent("--winSize") ) + winSize = parseResult->GetParameterInt("--winSize"); + + /* + * JustDoIt + */ + + + ImageType::Pointer img1 = ImageType::New(); + ReaderType::Pointer reader1 = ReaderType::New(); + reader1->SetFileName( inputImageFileName1 ); + //reader1->Update(); + img1 = reader1->GetOutput(); + + ImageType::Pointer img2 = ImageType::New(); + ReaderType::Pointer reader2 = ReaderType::New(); + reader2->SetFileName( inputImageFileName2 ); + //reader2->Update(); + img2 = reader2->GetOutput(); + + TrainingImageType::Pointer imgRoi = TrainingImageType::New(); + TrainingReaderType::Pointer readerRoi = TrainingReaderType::New(); + readerRoi->SetFileName( inputTrainingImageFileName ); + //readerRoi->Update(); + imgRoi = readerRoi->GetOutput(); + + typedef otb::KullbackLeiblerSupervizedDistanceImageFilter< + ImageType, ImageType, TrainingImageType, ImageType > FilterType; + + FilterType::Pointer changeDetector = FilterType::New(); + changeDetector->SetRadius( (winSize-1)/2 ); + changeDetector->SetInput1( img1 ); + changeDetector->SetInput2( img2 ); + + // Once img1 and img2 are connected, it is time to connect imgRoi + // to perform the parameters estimation of the non-changed area. + + changeDetector->SetTrainingArea( imgRoi ); + + typedef otb::CommandProgressUpdate< FilterType > CommandType; + CommandType::Pointer observer = CommandType::New(); + changeDetector->AddObserver( itk::ProgressEvent(), observer ); + + typedef otb::ImageFileWriter< ImageType > WriterType; + WriterType::Pointer writer = WriterType::New(); + writer->SetFileName( outputImageFileName ); + writer->SetInput( changeDetector->GetOutput() ); + + writer->Update(); + + } + catch( itk::ExceptionObject & err ) + { + std::cerr << "ExceptionObject caught !" << std::endl; + std::cerr << err << std::endl << std::endl; + return EXIT_FAILURE; + } + + return EXIT_SUCCESS; } diff --git a/Examples/Classification/KMeansImageClassificationExample.cxx b/Examples/Classification/KMeansImageClassificationExample.cxx index 5150b4a3247980560229a62702e767884f4f482c..1b9ccb41c742924fcc4a5af1c75c9fdbc67b6373 100644 --- a/Examples/Classification/KMeansImageClassificationExample.cxx +++ b/Examples/Classification/KMeansImageClassificationExample.cxx @@ -134,13 +134,13 @@ int main(int argc, char * argv[]) for(unsigned int i = 0; i<nbClasses;++i) { for(unsigned int j = 0; j < - reader->GetOutput()->GetNumberOfComponentsPerPixel();++j) - { - parameters[i*sampleSize+j]= - atof(argv[4+i* - reader->GetOutput()->GetNumberOfComponentsPerPixel() - +j]); - } + reader->GetOutput()->GetNumberOfComponentsPerPixel();++j) + { + parameters[i*sampleSize+j]= + atof(argv[4+i* + reader->GetOutput()->GetNumberOfComponentsPerPixel() + +j]); + } } std::cout<<"Parameters: "<<parameters<<std::endl; diff --git a/Examples/DataRepresentation/Image/Image5.cxx b/Examples/DataRepresentation/Image/Image5.cxx index 73ee17fd4c56505bba7cc0d368b16d747d9af4b4..e16e3cceb1f710d05daf900eac402193ca78b063 100644 --- a/Examples/DataRepresentation/Image/Image5.cxx +++ b/Examples/DataRepresentation/Image/Image5.cxx @@ -181,7 +181,7 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - // MODIFIED + // MODIFIED const unsigned int numberOfPixels = size[0] * size[1]; PixelType * localBuffer = new PixelType[ numberOfPixels ]; // Software Guide : EndCodeSnippet @@ -270,7 +270,7 @@ int main(int argc, char * argv[]) { std::cerr << "Exception caught !" << std::endl; std::cerr << exp << std::endl; - return -1; + return -1; } diff --git a/Examples/DataRepresentation/Image/Image6.cxx b/Examples/DataRepresentation/Image/Image6.cxx index 5ed21fe1347ee97967ac3d82ad0daae9a4953769..2713731ac3d9b13b1181b793acca4fed20689a3e 100644 --- a/Examples/DataRepresentation/Image/Image6.cxx +++ b/Examples/DataRepresentation/Image/Image6.cxx @@ -76,9 +76,9 @@ int main(int argc, char * argv[]) // Software Guide : BeginCodeSnippet typedef unsigned char PixelType; const unsigned int Dimension = 2; - unsigned int numberOfBands = 5; + unsigned int numberOfBands = 5; - typedef otb::VectorImage<PixelType, Dimension> ImageType; + typedef otb::VectorImage<PixelType, Dimension> ImageType; // Software Guide : EndCodeSnippet @@ -92,7 +92,7 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - typedef otb::ImportVectorImageFilter< ImageType > ImportFilterType; + typedef otb::ImportVectorImageFilter< ImageType > ImportFilterType; // Software Guide : EndCodeSnippet @@ -184,14 +184,14 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - // MODIFIED + // MODIFIED const unsigned int numberOfPixels = size[0] * size[1] * numberOfBands; PixelType * localBuffer = new PixelType[ numberOfPixels ]; - // Software Guide : EndCodeSnippet + // Software Guide : EndCodeSnippet const double radius = 80.0; @@ -210,7 +210,7 @@ int main(int argc, char * argv[]) // Software Guide : BeginCodeSnippet const double radius2 = radius * radius; PixelType * it = localBuffer; - int length = 0; + int length = 0; for(unsigned int y=0; y < size[1]; y++) { const double dy = static_cast<double>( y ) - static_cast<double>(size[1])/2.0; @@ -218,10 +218,10 @@ int main(int argc, char * argv[]) { const double dx = static_cast<double>( x ) - static_cast<double>(size[0])/2.0; const double d2 = dx*dx + dy*dy ; - PixelType pTmp = ( d2 < radius2 ) ? 255 : 0; - for(unsigned int nbBandsTmp=0; nbBandsTmp<numberOfBands; nbBandsTmp++) - *it++ = pTmp; - length++; + PixelType pTmp = ( d2 < radius2 ) ? 255 : 0; + for(unsigned int nbBandsTmp=0; nbBandsTmp<numberOfBands; nbBandsTmp++) + *it++ = pTmp; + length++; } } @@ -267,7 +267,7 @@ int main(int argc, char * argv[]) writer->SetFileName( argv[1] ); - ImageType* imTmp = dynamic_cast<ImageType*>(importFilter->GetOutput()); + ImageType* imTmp = dynamic_cast<ImageType*>(importFilter->GetOutput()); // Software Guide : BeginCodeSnippet writer->SetInput( imTmp ); @@ -282,7 +282,7 @@ int main(int argc, char * argv[]) { std::cerr << "Exception caught !" << std::endl; std::cerr << exp << std::endl; - return -1; + return -1; } diff --git a/Examples/DisparityMap/SimpleDisparityMapEstimationExample.cxx b/Examples/DisparityMap/SimpleDisparityMapEstimationExample.cxx index f5d0e61d7903fe18db17416d27777e8dafd0e760..de28654f2ad5360c5fa3903a4ea11ed4034ec769 100644 --- a/Examples/DisparityMap/SimpleDisparityMapEstimationExample.cxx +++ b/Examples/DisparityMap/SimpleDisparityMapEstimationExample.cxx @@ -254,12 +254,12 @@ int main (int argc, char* argv[]) for(unsigned int x=0; x<NumberOfXNodes; x++) { for(unsigned int y=0; y<NumberOfYNodes; y++) - { - PointType p; - p[0] = firstNodeIndex[0]+x*atoi(argv[5]); - p[1] = firstNodeIndex[1]+y*atoi(argv[6]); - nodes->SetPoint( nodeCounter++,p); - } + { + PointType p; + p[0] = firstNodeIndex[0]+x*atoi(argv[5]); + p[1] = firstNodeIndex[1]+y*atoi(argv[6]); + nodes->SetPoint( nodeCounter++,p); + } } // Software Guide : EndCodeSnippet @@ -422,7 +422,7 @@ int main (int argc, char* argv[]) generator->SetOutputOrigin(fixedReader->GetOutput()->GetOrigin()); generator->SetOutputSpacing(fixedReader->GetOutput()->GetSpacing()); generator->SetOutputSize(fixedReader->GetOutput() - ->GetLargestPossibleRegion().GetSize()); + ->GetLargestPossibleRegion().GetSize()); // Software Guide : EndCodeSnippet diff --git a/Examples/FeatureExtraction/AlignmentsExample.cxx b/Examples/FeatureExtraction/AlignmentsExample.cxx index 02c450279f8b20afced683f95d4b615bba26262c..d8cf5e864ba4bcf84f8c4cd8aeade3c95600b828 100644 --- a/Examples/FeatureExtraction/AlignmentsExample.cxx +++ b/Examples/FeatureExtraction/AlignmentsExample.cxx @@ -89,11 +89,11 @@ int main( int argc, char *argv[] ) typedef unsigned short InputPixelType; - typedef unsigned short OutputPixelType; + typedef unsigned short OutputPixelType; - const unsigned int Dimension = 2; + const unsigned int Dimension = 2; - typedef otb::Image< InputPixelType, Dimension > InputImageType; + typedef otb::Image< InputPixelType, Dimension > InputImageType; typedef otb::Image< OutputPixelType, Dimension > OutputImageType; typedef otb::ImageFileReader< InputImageType > ReaderType; @@ -116,7 +116,7 @@ int main( int argc, char *argv[] ) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - typedef itk::PolyLineParametricPath< Dimension > PathType; + typedef itk::PolyLineParametricPath< Dimension > PathType; typedef otb::ImageToPathListAlignFilter<InputImageType,PathType> ListAlignFilterType; // Software Guide : EndCodeSnippet diff --git a/Examples/FeatureExtraction/ComplexMomentPathExample.cxx b/Examples/FeatureExtraction/ComplexMomentPathExample.cxx index 317514fbce8f2cc53febaee3973016a5f99df601..7f1d177fb64e0dd46e604e1d5aa8c1703e2f8d06 100644 --- a/Examples/FeatureExtraction/ComplexMomentPathExample.cxx +++ b/Examples/FeatureExtraction/ComplexMomentPathExample.cxx @@ -98,7 +98,7 @@ int main(int argc, char ** argv ) // Draw a square: - path->Initialize(); + path->Initialize(); cindex[0]=30; cindex[1]=30; diff --git a/Examples/FeatureExtraction/ExtractRoadByStepsExample.cxx b/Examples/FeatureExtraction/ExtractRoadByStepsExample.cxx index 1dd6e0838f925672d33d110484d874af15d595ad..eb63b12d4f3da1b7a61418d8e7ca1c2f3e1d6f6e 100644 --- a/Examples/FeatureExtraction/ExtractRoadByStepsExample.cxx +++ b/Examples/FeatureExtraction/ExtractRoadByStepsExample.cxx @@ -379,7 +379,7 @@ int main( int argc, char * argv[] ) InternalImageType::Pointer output = InternalImageType::New(); output->SetRegions(multispectralReader->GetOutput() - ->GetLargestPossibleRegion()); + ->GetLargestPossibleRegion()); output->Allocate(); output->FillBuffer(0.0); diff --git a/Examples/FeatureExtraction/ExtractSegmentsByStepsExample.cxx b/Examples/FeatureExtraction/ExtractSegmentsByStepsExample.cxx index 6037f84b11a15fda46e7c9c4aba24600435cb3c8..bbb5a24ddef08f41ca6667f6eaf3a0b05ac65c9e 100644 --- a/Examples/FeatureExtraction/ExtractSegmentsByStepsExample.cxx +++ b/Examples/FeatureExtraction/ExtractSegmentsByStepsExample.cxx @@ -96,7 +96,7 @@ int main( int argc, char * argv[] ) typedef otb::Image< OutputPixelType, 2 > OutputImageType; // Software Guide : EndCodeSnippet - typedef otb::LineSpatialObjectList LinesListType; + typedef otb::LineSpatialObjectList LinesListType; // Software Guide : BeginLatex @@ -109,9 +109,9 @@ int main( int argc, char * argv[] ) typedef otb::LineRatioDetectorImageFilter< InternalImageType, InternalImageType > DetectorType; typedef otb::PixelSuppressionByDirectionImageFilter< InternalImageType, - InternalImageType > PixelSuppressionType; - typedef otb::LocalHoughFilter< InternalImageType > LocalHoughType; - typedef otb::FillGapsFilter FillGapsType; + InternalImageType > PixelSuppressionType; + typedef otb::LocalHoughFilter< InternalImageType > LocalHoughType; + typedef otb::FillGapsFilter FillGapsType; typedef otb::DrawLineSpatialObjectListFilter< InternalImageType, OutputImageType > DrawLineListType; // Software Guide : EndCodeSnippet @@ -154,10 +154,10 @@ int main( int argc, char * argv[] ) ReaderType::Pointer reader = ReaderType::New(); DetectorType::Pointer detector = DetectorType::New(); - PixelSuppressionType::Pointer pixelSuppression= PixelSuppressionType::New(); - LocalHoughType::Pointer localHough= LocalHoughType::New(); - FillGapsType::Pointer fillGaps= FillGapsType::New(); - DrawLineListType::Pointer drawLineList= DrawLineListType::New(); + PixelSuppressionType::Pointer pixelSuppression= PixelSuppressionType::New(); + LocalHoughType::Pointer localHough= LocalHoughType::New(); + FillGapsType::Pointer fillGaps= FillGapsType::New(); + DrawLineListType::Pointer drawLineList= DrawLineListType::New(); // Software Guide : EndCodeSnippet @@ -221,7 +221,7 @@ int main( int argc, char * argv[] ) unsigned int PixelSuppressionRadiusX((unsigned int)::atoi(argv[5])); - float PixelSuppressionAngularBeam((float)::atof(argv[6])); + float PixelSuppressionAngularBeam((float)::atof(argv[6])); unsigned int LocalHoughRadiusX((unsigned int)::atoi(argv[7])); unsigned int LocalHoughRadiusY((unsigned int)::atoi(argv[8])); diff --git a/Examples/FeatureExtraction/ExtractSegmentsExample.cxx b/Examples/FeatureExtraction/ExtractSegmentsExample.cxx index e317f9426a31df0ef483845ea0806a702b22d236..48de5de6ff352cef4d53c0fe2e9c2eb6e59b680a 100644 --- a/Examples/FeatureExtraction/ExtractSegmentsExample.cxx +++ b/Examples/FeatureExtraction/ExtractSegmentsExample.cxx @@ -220,7 +220,7 @@ int main( int argc, char * argv[] ) unsigned int PixelSuppressionRadiusX((unsigned int)::atoi(argv[5])); - float PixelSuppressionAngularBeam((float)::atof(argv[6])); + float PixelSuppressionAngularBeam((float)::atof(argv[6])); unsigned int LocalHoughRadiusX((unsigned int)::atoi(argv[7])); unsigned int LocalHoughRadiusY((unsigned int)::atoi(argv[8])); diff --git a/Examples/FeatureExtraction/HarrisExample.cxx b/Examples/FeatureExtraction/HarrisExample.cxx index f43aee0887a78fb85297fe57fe466228082856b2..3f5231389b9e05914397312e4fdc405d8d6d2942 100644 --- a/Examples/FeatureExtraction/HarrisExample.cxx +++ b/Examples/FeatureExtraction/HarrisExample.cxx @@ -63,8 +63,8 @@ int main(int argc, char *argv[] ) double Alpha((double)::atof(argv[5])); typedef float InputPixelType; - const unsigned int Dimension = 2; - typedef unsigned char OutputPixelType; + const unsigned int Dimension = 2; + typedef unsigned char OutputPixelType; typedef otb::Image< InputPixelType, Dimension > InputImageType; typedef otb::Image< OutputPixelType, Dimension > OutputImageType; diff --git a/Examples/FeatureExtraction/LocalHoughExample.cxx b/Examples/FeatureExtraction/LocalHoughExample.cxx index c2405f2f831878ee58179cea7c9f04f116cc99c2..b1204bd2fb616e462543179b6d76e408c4981f8b 100644 --- a/Examples/FeatureExtraction/LocalHoughExample.cxx +++ b/Examples/FeatureExtraction/LocalHoughExample.cxx @@ -78,7 +78,7 @@ int main( int argc, char * argv[] ) typedef otb::Image< OutputPixelType, 2 > OutputImageType; // Software Guide : EndCodeSnippet - typedef otb::LineSpatialObjectList LinesListType; + typedef otb::LineSpatialObjectList LinesListType; // Software Guide : BeginLatex @@ -89,7 +89,7 @@ int main( int argc, char * argv[] ) // Software Guide : BeginCodeSnippet - typedef otb::LocalHoughFilter< InternalImageType > LocalHoughType; + typedef otb::LocalHoughFilter< InternalImageType > LocalHoughType; typedef otb::DrawLineSpatialObjectListFilter< InternalImageType, OutputImageType > DrawLineListType; // Software Guide : EndCodeSnippet @@ -137,9 +137,9 @@ int main( int argc, char * argv[] ) // Software Guide : BeginCodeSnippet ReaderType::Pointer reader = ReaderType::New(); - LocalHoughType::Pointer localHough= LocalHoughType::New(); + LocalHoughType::Pointer localHough= LocalHoughType::New(); - DrawLineListType::Pointer drawLineList= DrawLineListType::New(); + DrawLineListType::Pointer drawLineList= DrawLineListType::New(); // Software Guide : EndCodeSnippet diff --git a/Examples/FeatureExtraction/SIFTExample.cxx b/Examples/FeatureExtraction/SIFTExample.cxx index c495b42b5b094c98ff47a5e22735f69fe5b6b665..d012904b1536e0c330a0e0963e00aff75b66e0c8 100644 --- a/Examples/FeatureExtraction/SIFTExample.cxx +++ b/Examples/FeatureExtraction/SIFTExample.cxx @@ -219,7 +219,7 @@ int main(int argc, char * argv[]) outputImage->Allocate(); itk::ImageRegionIterator<OutputImageType> iterOutput(outputImage, - reader->GetOutput()->GetLargestPossibleRegion()); + reader->GetOutput()->GetLargestPossibleRegion()); for (iterOutput.GoToBegin(); !iterOutput.IsAtEnd(); ++iterOutput) { @@ -244,12 +244,12 @@ int main(int argc, char * argv[]) ImageType::IndexType index; index[0] = (unsigned int) - (vcl_floor - ((double)((pIt.Value()[0]-origin[0])/spacing[0]+0.5))); + (vcl_floor + ((double)((pIt.Value()[0]-origin[0])/spacing[0]+0.5))); index[1] = (unsigned int) - (vcl_floor - ((double)((pIt.Value()[1]-origin[1])/spacing[1]+0.5))); + (vcl_floor + ((double)((pIt.Value()[1]-origin[1])/spacing[1]+0.5))); OutputImageType::PixelType keyPixel; keyPixel.SetRed(0); @@ -257,29 +257,29 @@ int main(int argc, char * argv[]) keyPixel.SetBlue(0); if ( - static_cast<unsigned int>(index[1]) < - static_cast<unsigned int>(size[1]) - && static_cast<unsigned int>(index[0]) < - static_cast<unsigned int>(size[0]) - && static_cast<unsigned int>(index[1]) >= - static_cast<unsigned int>(0) - && static_cast<unsigned int>(index[0]) >= - static_cast<unsigned int>(0)) - { - outputImage->SetPixel(index,keyPixel); - - if (static_cast<unsigned int>(index[1]) < static_cast<unsigned int>(size[1]-1) ) - outputImage->SetPixel(index+t,keyPixel); - - if (index[1] > 0) - outputImage->SetPixel(index+b,keyPixel); - - if (static_cast<unsigned int>(index[0]) < static_cast<unsigned int>(size[0]-1) ) - outputImage->SetPixel(index+r,keyPixel); - - if (index[0] > 0) - outputImage->SetPixel(index+l,keyPixel); - } + static_cast<unsigned int>(index[1]) < + static_cast<unsigned int>(size[1]) + && static_cast<unsigned int>(index[0]) < + static_cast<unsigned int>(size[0]) + && static_cast<unsigned int>(index[1]) >= + static_cast<unsigned int>(0) + && static_cast<unsigned int>(index[0]) >= + static_cast<unsigned int>(0)) + { + outputImage->SetPixel(index,keyPixel); + + if (static_cast<unsigned int>(index[1]) < static_cast<unsigned int>(size[1]-1) ) + outputImage->SetPixel(index+t,keyPixel); + + if (index[1] > 0) + outputImage->SetPixel(index+b,keyPixel); + + if (static_cast<unsigned int>(index[0]) < static_cast<unsigned int>(size[0]-1) ) + outputImage->SetPixel(index+r,keyPixel); + + if (index[0] > 0) + outputImage->SetPixel(index+l,keyPixel); + } ++pIt; } diff --git a/Examples/FeatureExtraction/ScaleInvariantFeatureImageFilter.cxx b/Examples/FeatureExtraction/ScaleInvariantFeatureImageFilter.cxx index b6d530ca53b5685acd895b4211757766cc4e0cd0..91a9bc2a5a92c0c7cd0e43b508a8436dd0462b9d 100644 --- a/Examples/FeatureExtraction/ScaleInvariantFeatureImageFilter.cxx +++ b/Examples/FeatureExtraction/ScaleInvariantFeatureImageFilter.cxx @@ -63,7 +63,7 @@ int main( int argc, char *argv[]) { std::cerr << "Usage: " << std::endl; std::cerr << argv[0] << " inputImageFile outputImageFile " \ - << "scaleFactor angle cropFactor rotateMiddle" << std::endl; + << "scaleFactor angle cropFactor rotateMiddle" << std::endl; return EXIT_FAILURE; } @@ -177,9 +177,9 @@ int main( int argc, char *argv[]) std::cerr << "Rotation centred at middle of image." << std::endl; /* Cycle through each dimension and shift by half*/ FixedImageType::SizeType size = - fixedImage->GetLargestPossibleRegion().GetSize(); + fixedImage->GetLargestPossibleRegion().GetSize(); for (unsigned int k = 0; k < Dimension; ++k) - translate_vector[k] = size[k]/2.0; + translate_vector[k] = size[k]/2.0; test_transform->SetCenter( translate_vector); } else { std::cerr << "Rotation centred at origin." << std::endl; @@ -189,9 +189,9 @@ int main( int argc, char *argv[]) std::cerr << "Rotation centred at middle of image." << std::endl; /* Cycle through each dimension and shift by half*/ FixedImageType::SizeType size = - fixedImage->GetLargestPossibleRegion().GetSize(); + fixedImage->GetLargestPossibleRegion().GetSize(); for (unsigned int k = 0; k < Dimension; ++k) - translate_vector[k] = size[k]/2.0; + translate_vector[k] = size[k]/2.0; test_transform->Translate( translate_vector); } else { std::cerr << "Rotation centred at origin." << std::endl; @@ -203,7 +203,7 @@ int main( int argc, char *argv[]) if (rotate_middle) { /* Cycle through each dimension and shift back*/ for (unsigned int k = 0; k < Dimension; ++k) - translate_vector[k] = -translate_vector[k]; + translate_vector[k] = -translate_vector[k]; test_transform->Translate( translate_vector); } #endif @@ -216,9 +216,9 @@ int main( int argc, char *argv[]) SiftFilterType::ResampleFilterType::Pointer scaler = SiftFilterType::ResampleFilterType::New(); scaler->SetInput(fixedImage); FixedImageType::SizeType size = - fixedImage->GetLargestPossibleRegion().GetSize(); + fixedImage->GetLargestPossibleRegion().GetSize(); for (unsigned int k = 0; k < Dimension; ++k) - size[k] = (unsigned int) floor(size[k] * test_scale); + size[k] = (unsigned int) floor(size[k] * test_scale); scaler->SetSize( size ); scaler->SetOutputSpacing(fixedImage->GetSpacing()); scaler->SetTransform(test_transform); diff --git a/Examples/FeatureExtraction/SeamCarvingOtherExample.cxx b/Examples/FeatureExtraction/SeamCarvingOtherExample.cxx index 12121ee7ffdfd6710b847cf4594a261366a4e5e7..db11c3d0699861fc91583dd8a645e5ce67638cb6 100644 --- a/Examples/FeatureExtraction/SeamCarvingOtherExample.cxx +++ b/Examples/FeatureExtraction/SeamCarvingOtherExample.cxx @@ -112,7 +112,7 @@ int main(int argc, char * argv[]) CarvingFilterType::Pointer carvingFilter = CarvingFilterType::New(); typedef otb::DrawPathFilter - <ImageType, PathType, ImageType> DrawPathFilterType; + <ImageType, PathType, ImageType> DrawPathFilterType; DrawPathFilterType::Pointer drawPathFilter = DrawPathFilterType::New(); typedef otb::RemoveCarvingPathFilter diff --git a/Examples/Fusion/PanSharpeningExample.cxx b/Examples/Fusion/PanSharpeningExample.cxx index 240ae4c1f25167c5aaa43c7ce255f5156a3be8e5..6bcd80992d24bc30f7b5f0118cf183b4f7eb2287 100644 --- a/Examples/Fusion/PanSharpeningExample.cxx +++ b/Examples/Fusion/PanSharpeningExample.cxx @@ -116,8 +116,8 @@ int main( int argc, char* argv[] ) typedef otb::VectorImage<unsigned short int, 2> VectorIntImageType; - ReaderVectorType::Pointer readerXS=ReaderVectorType::New(); - ReaderType::Pointer readerPAN=ReaderType::New(); + ReaderVectorType::Pointer readerXS=ReaderVectorType::New(); + ReaderType::Pointer readerPAN=ReaderType::New(); // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -154,7 +154,7 @@ int main( int argc, char* argv[] ) // Software Guide : BeginCodeSnippet typedef otb::StreamingImageFileWriter<VectorIntImageType> WriterType; - WriterType::Pointer writer=WriterType::New(); + WriterType::Pointer writer=WriterType::New(); writer->SetFileName(argv[3]); writer->SetInput(fusion->GetOutput()); writer->Update(); diff --git a/Examples/IO/DXFReaderExample.cxx b/Examples/IO/DXFReaderExample.cxx index 493b8db653d35421f5d380b96b7d8fbffcb22030..332a47234eff530b4f72ebcc107b0a201a9e9515 100644 --- a/Examples/IO/DXFReaderExample.cxx +++ b/Examples/IO/DXFReaderExample.cxx @@ -47,8 +47,8 @@ int main(int argc, char * argv[]) { - // Verify the number of parameters in the command line - if( argc < 5 ) + // Verify the number of parameters in the command line + if( argc < 5 ) { std::cerr << "Usage: " << std::endl; std::cerr << argv[0] << " inputFilename LayerName outputSize outputFilename " << std::endl; @@ -62,7 +62,7 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex - char * inputFilename = argv[1]; + char * inputFilename = argv[1]; char * outputFilename = argv[4]; @@ -86,9 +86,9 @@ int main(int argc, char * argv[]) typedef otb::Image<OutputPixelType,Dimension> OutputImageType; typedef otb::ImageFileWriter<OutputImageType> WriterType; typedef otb::SpatialObjectDXFReader<GroupType> - SpatialObjectDXFReaderType; + SpatialObjectDXFReaderType; typedef otb::SpatialObjectToImageDrawingFilter<GroupType,ImageType> - SpatialObjectToImageDrawingFilterType; + SpatialObjectToImageDrawingFilterType; typedef itk::RescaleIntensityImageFilter< ImageType, OutputImageType > CastFilterType; typedef itk::SpatialObject<Dimension> SpatialObjectType; @@ -96,9 +96,9 @@ int main(int argc, char * argv[]) // Instantiating object SpatialObjectDXFReaderType::Pointer reader = - SpatialObjectDXFReaderType::New(); + SpatialObjectDXFReaderType::New(); SpatialObjectToImageDrawingFilterType::Pointer imageGenerator = - SpatialObjectToImageDrawingFilterType::New(); + SpatialObjectToImageDrawingFilterType::New(); WriterType::Pointer writer = WriterType::New(); CastFilterType::Pointer castFilter = CastFilterType::New(); // Software Guide : EndCodeSnippet @@ -134,30 +134,30 @@ int main(int argc, char * argv[]) // Software Guide : BeginCodeSnippet if(group->GetNumberOfChildren() != 0) - { - /** Writing image **/ - SpatialObjectType::ChildrenListType* children=group->GetChildren(0); - SpatialObjectType::ChildrenListType::iterator it = children->begin(); - SpatialObjectType::ChildrenListType::iterator end = children->end(); - double maximum[Dimension],minimum[Dimension]; - (*it)->ComputeBoundingBox(); - minimum[0]=(*it)->GetBoundingBox()->GetMinimum()[0]; - minimum[1]=(*it)->GetBoundingBox()->GetMinimum()[1]; - - while(it != end) - { - (*it)->ComputeBoundingBox(); - - if ((*it)->GetBoundingBox()->GetMinimum()[0] < minimum[0]) - { - minimum[0]=(*it)->GetBoundingBox()->GetMinimum()[0]; - } - if ((*it)->GetBoundingBox()->GetMinimum()[1] < minimum[1]) - { - minimum[1]=(*it)->GetBoundingBox()->GetMinimum()[1]; - } - it++; - } + { + /** Writing image **/ + SpatialObjectType::ChildrenListType* children=group->GetChildren(0); + SpatialObjectType::ChildrenListType::iterator it = children->begin(); + SpatialObjectType::ChildrenListType::iterator end = children->end(); + double maximum[Dimension],minimum[Dimension]; + (*it)->ComputeBoundingBox(); + minimum[0]=(*it)->GetBoundingBox()->GetMinimum()[0]; + minimum[1]=(*it)->GetBoundingBox()->GetMinimum()[1]; + + while(it != end) + { + (*it)->ComputeBoundingBox(); + + if ((*it)->GetBoundingBox()->GetMinimum()[0] < minimum[0]) + { + minimum[0]=(*it)->GetBoundingBox()->GetMinimum()[0]; + } + if ((*it)->GetBoundingBox()->GetMinimum()[1] < minimum[1]) + { + minimum[1]=(*it)->GetBoundingBox()->GetMinimum()[1]; + } + it++; + } // Software Guide : EndCodeSnippet @@ -167,24 +167,24 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex - ImageType::SizeType size; - size[0]=outputSize; - size[1]=outputSize; - imageGenerator->SetSize(size); - ImageType::PointType origin; - origin[0]=(int) minimum[0]; - origin[1]=(int) minimum[1]; - imageGenerator->SetOrigin(origin); + ImageType::SizeType size; + size[0]=outputSize; + size[1]=outputSize; + imageGenerator->SetSize(size); + ImageType::PointType origin; + origin[0]=(int) minimum[0]; + origin[1]=(int) minimum[1]; + imageGenerator->SetOrigin(origin); - group->ComputeBoundingBox(); + group->ComputeBoundingBox(); - maximum[0]=group->GetBoundingBox()->GetMaximum()[0]; - maximum[1]=group->GetBoundingBox()->GetMaximum()[1]; + maximum[0]=group->GetBoundingBox()->GetMaximum()[0]; + maximum[1]=group->GetBoundingBox()->GetMaximum()[1]; // Software Guide : BeginCodeSnippet - ImageType::SpacingType spacing; - spacing[0]=(maximum[0]-origin[0])/size[0]; - spacing[1]=(maximum[1]-origin[1])/size[1]; - imageGenerator->SetSpacing(spacing); + ImageType::SpacingType spacing; + spacing[0]=(maximum[0]-origin[0])/size[0]; + spacing[1]=(maximum[1]-origin[1])/size[1]; + imageGenerator->SetSpacing(spacing); // Software Guide : EndCodeSnippet @@ -193,28 +193,28 @@ int main(int argc, char * argv[]) // The output image is created with previously specified origin, spacing and size. // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - imageGenerator->SetInput(group); - imageGenerator->Update(); + imageGenerator->SetInput(group); + imageGenerator->Update(); // Software Guide : EndCodeSnippet // Software Guide : BeginLatex // The output image is written by calling the Update() method. // Software Guide : EndLatex - castFilter->SetOutputMinimum( 0 ); - castFilter->SetOutputMaximum( 255 ); - castFilter->SetInput( imageGenerator->GetOutput() ); - writer->SetInput(castFilter->GetOutput()); + castFilter->SetOutputMinimum( 0 ); + castFilter->SetOutputMaximum( 255 ); + castFilter->SetInput( imageGenerator->GetOutput() ); + writer->SetInput(castFilter->GetOutput()); // Software Guide : BeginCodeSnippet - writer->Update(); + writer->Update(); // Software Guide : EndCodeSnippet - } + } else - { - std::cout<<"No objects detected."<<std::endl; - return EXIT_FAILURE; + { + std::cout<<"No objects detected."<<std::endl; + return EXIT_FAILURE; - } + } // Software Guide : BeginLatex // // \begin{figure} diff --git a/Examples/IO/LidarToImageExample.cxx b/Examples/IO/LidarToImageExample.cxx index 3f09901df1885af630fc87cec1d38b6deea7abde..d00fd632c9d8c762044413dd3c45b21ad1279eca 100644 --- a/Examples/IO/LidarToImageExample.cxx +++ b/Examples/IO/LidarToImageExample.cxx @@ -77,9 +77,9 @@ int main( int argc, char* argv[] ) { std::cout << argv[0] <<" <input_lidar_filename> <output_image_filename(double)>" << " <output_image_filename(unsigned char)>" - << " <output_resolution> <spline_order>" + << " <output_resolution> <spline_order>" << " <number_of_levels>" - << std::endl; + << std::endl; return EXIT_FAILURE; } diff --git a/Examples/IO/MetadataExample.cxx b/Examples/IO/MetadataExample.cxx index 627a6d64b5ede3a8064fc1aa35a0a8baa6ec1cec..149c41b77636cd039afc4038ab3d2053860f77ac 100644 --- a/Examples/IO/MetadataExample.cxx +++ b/Examples/IO/MetadataExample.cxx @@ -65,8 +65,8 @@ int main(int argc, char* argv[]) // SoftwareGuide: BeginCodeSnippet - typedef unsigned char InputPixelType; - const unsigned int Dimension = 2; + typedef unsigned char InputPixelType; + const unsigned int Dimension = 2; typedef otb::Image< InputPixelType, Dimension > InputImageType; @@ -111,14 +111,14 @@ int main(int argc, char* argv[]) // // We can now call the different available methods for accessing the // metadata. Useful methods are : -// \begin{itemize} +// \begin{itemize} // \item \code{GetSpacing}: the sampling step; // \item \code{GetOrigin}: the coordinates of the origin of the image; // \item \code{GetProjectionRef}: the image projection reference; // \item \code{GetGCPProjection}: the projection for the eventual // ground control points; // \item \code{GetGCPCount}: the number of GCPs available; -// \end{itemize} +// \end{itemize} // // SoftwareGuide: EndLatex diff --git a/Examples/Learning/GenerateTrainingImageExample.cxx b/Examples/Learning/GenerateTrainingImageExample.cxx index 57af971cc148b93cb9f0ce3037b13cba89727d85..db4bd07c29ef4e710e9423cb66df493e78339be1 100644 --- a/Examples/Learning/GenerateTrainingImageExample.cxx +++ b/Examples/Learning/GenerateTrainingImageExample.cxx @@ -62,11 +62,11 @@ int main( int argc, char *argv[] ) typedef unsigned char InputPixelType; - typedef unsigned char OutputPixelType; + typedef unsigned char OutputPixelType; - const unsigned int Dimension = 2; + const unsigned int Dimension = 2; - typedef otb::Image< InputPixelType, Dimension > InputImageType; + typedef otb::Image< InputPixelType, Dimension > InputImageType; typedef otb::Image< OutputPixelType, Dimension > OutputImageType; typedef otb::ImageFileReader< InputImageType > ReaderType; diff --git a/Examples/Learning/SOMClassifierExample.cxx b/Examples/Learning/SOMClassifierExample.cxx index df13eafbab7f67a7efb9101ba104962d69e33e7e..45eb2f045b7b7db683af7ae0e5a8d6038f1e5385 100644 --- a/Examples/Learning/SOMClassifierExample.cxx +++ b/Examples/Learning/SOMClassifierExample.cxx @@ -61,7 +61,7 @@ int main(int argc, char* argv[] ) if (argc != 4) { std::cout << "Usage : " << argv[0] << " inputImage modelFile outputImage" - << std::endl ; + << std::endl ; return EXIT_FAILURE; } @@ -71,7 +71,7 @@ int main(int argc, char* argv[] ) typedef double InputPixelType; typedef unsigned char LabelPixelType; - const unsigned int Dimension = 2; + const unsigned int Dimension = 2; typedef itk::VariableLengthVector<InputPixelType> PixelType; @@ -167,8 +167,8 @@ int main(int argc, char* argv[] ) while(!it.IsAtEnd()) { - sample->PushBack(it.Get()); - ++it; + sample->PushBack(it.Get()); + ++it; } // Software Guide : EndCodeSnippet diff --git a/Examples/Learning/SOMExample.cxx b/Examples/Learning/SOMExample.cxx index f977bd7d46b7767748050687ba5ee1cbb192a1fd..9ee9152ab26568e71f32e019cb74119c1e8539b6 100644 --- a/Examples/Learning/SOMExample.cxx +++ b/Examples/Learning/SOMExample.cxx @@ -213,11 +213,11 @@ int main(int argc, char* argv[]) sampleList->SetMeasurementVectorSize( reader->GetOutput()->GetVectorLength() ); itk::ImageRegionIterator< ImageType > imgIter ( reader->GetOutput(), - reader->GetOutput()->GetBufferedRegion() ); + reader->GetOutput()->GetBufferedRegion() ); imgIter.GoToBegin(); itk::ImageRegionIterator< ImageType > imgIterEnd ( reader->GetOutput(), - reader->GetOutput()->GetBufferedRegion() ); + reader->GetOutput()->GetBufferedRegion() ); imgIterEnd.GoToEnd(); do { diff --git a/Examples/Learning/SVMGenericKernelImageClassificationExample.cxx b/Examples/Learning/SVMGenericKernelImageClassificationExample.cxx index fafbf71a13ce24b9a2f170d36ef9b5770a4e0ecd..ff420733d702d3dc2c7ae8c8bba86d428fb807c0 100644 --- a/Examples/Learning/SVMGenericKernelImageClassificationExample.cxx +++ b/Examples/Learning/SVMGenericKernelImageClassificationExample.cxx @@ -60,7 +60,7 @@ int main(int argc, char* argv[] ) if (argc != 4) { std::cout << "Usage : " << argv[0] - << " inputImage outputImage modelFile " << std::endl ; + << " inputImage outputImage modelFile " << std::endl ; return EXIT_FAILURE; } @@ -72,11 +72,11 @@ int main(int argc, char* argv[] ) typedef std::vector<PixelType> VectorType; typedef int LabelPixelType; - const unsigned int Dimension = 2; + const unsigned int Dimension = 2; typedef otb::Image< itk::FixedArray<PixelType,3>, - Dimension > InputImageType; + Dimension > InputImageType; typedef otb::ImageFileReader< InputImageType > ReaderType; @@ -116,7 +116,7 @@ int main(int argc, char* argv[] ) // Software Guide : BeginCodeSnippet otb::MixturePolyRBFKernelFunctor myKernel; - model->SetKernelFunctor( &myKernel ); + model->SetKernelFunctor( &myKernel ); // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -138,7 +138,7 @@ int main(int argc, char* argv[] ) classifier->SetSample(sample.GetPointer()) ; classifier->Update() ; - typedef ClassifierType::ClassLabelType OutputPixelType; + typedef ClassifierType::ClassLabelType OutputPixelType; typedef otb::Image< OutputPixelType, Dimension > OutputImageType; OutputImageType::Pointer outputImage = OutputImageType::New(); @@ -171,7 +171,7 @@ int main(int argc, char* argv[] ) typedef itk::ImageRegionIterator< OutputImageType> OutputIteratorType; OutputIteratorType outIt( outputImage, - outputImage->GetBufferedRegion() ); + outputImage->GetBufferedRegion() ); outIt.GoToBegin(); diff --git a/Examples/Learning/SVMGenericKernelImageModelEstimatorExample.cxx b/Examples/Learning/SVMGenericKernelImageModelEstimatorExample.cxx index b9253179b7411b6345ad5031a2de54d6fbfbc49e..c526e6e20341cd42360e95963266dc1455dd2e32 100644 --- a/Examples/Learning/SVMGenericKernelImageModelEstimatorExample.cxx +++ b/Examples/Learning/SVMGenericKernelImageModelEstimatorExample.cxx @@ -52,11 +52,11 @@ int main( int argc, char* argv[] ) { - if ( argc != 4 ) - { - std::cerr << "Usage : " << argv[0] << " inputImage mask modelFile\n"; - return EXIT_FAILURE; - } + if ( argc != 4 ) + { + std::cerr << "Usage : " << argv[0] << " inputImage mask modelFile\n"; + return EXIT_FAILURE; + } const char* inputImageFileName = argv[1]; const char* trainingImageFileName = argv[2]; @@ -122,13 +122,13 @@ int main( int argc, char* argv[] ) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - otb::MixturePolyRBFKernelFunctor myKernel; - myKernel.SetValue( "Mixture", 0.5 ); - myKernel.SetValue( "GammaPoly", 1.0 ); - myKernel.SetValue( "CoefPoly", 0.0 ); - myKernel.SetValue( "DegreePoly", 1 ); - myKernel.SetValue( "GammaRBF", 1.5 ); - myKernel.Update(); + otb::MixturePolyRBFKernelFunctor myKernel; + myKernel.SetValue( "Mixture", 0.5 ); + myKernel.SetValue( "GammaPoly", 1.0 ); + myKernel.SetValue( "CoefPoly", 0.0 ); + myKernel.SetValue( "DegreePoly", 1 ); + myKernel.SetValue( "GammaRBF", 1.5 ); + myKernel.Update(); // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -139,8 +139,8 @@ int main( int argc, char* argv[] ) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - svmEstimator->SetKernelFunctor( &myKernel ); - svmEstimator->SetKernelType( GENERIC ); + svmEstimator->SetKernelFunctor( &myKernel ); + svmEstimator->SetKernelType( GENERIC ); // Software Guide : EndCodeSnippet // Software Guide : BeginLatex diff --git a/Examples/Learning/SVMImageClassificationExample.cxx b/Examples/Learning/SVMImageClassificationExample.cxx index 625673c00ccd573c7e5fcd8eed0ffa6b069b19eb..fc6a8c55b0cba0cf276e821646ea4fbcfe31a447 100644 --- a/Examples/Learning/SVMImageClassificationExample.cxx +++ b/Examples/Learning/SVMImageClassificationExample.cxx @@ -101,7 +101,7 @@ int main(int argc, char* argv[] ) typedef int LabelPixelType; // Software Guide : EndCodeSnippet - const unsigned int Dimension = 2; + const unsigned int Dimension = 2; // Software Guide : BeginLatex @@ -113,7 +113,7 @@ int main(int argc, char* argv[] ) // Software Guide : BeginCodeSnippet typedef otb::Image< itk::FixedArray<PixelType,3>, - Dimension > InputImageType; + Dimension > InputImageType; typedef otb::ImageFileReader< InputImageType > ReaderType; @@ -252,7 +252,7 @@ int main(int argc, char* argv[] ) - typedef ClassifierType::ClassLabelType OutputPixelType; + typedef ClassifierType::ClassLabelType OutputPixelType; typedef otb::Image< OutputPixelType, Dimension > OutputImageType; OutputImageType::Pointer outputImage = OutputImageType::New(); @@ -311,7 +311,7 @@ int main(int argc, char* argv[] ) typedef itk::ImageRegionIterator< OutputImageType> OutputIteratorType; OutputIteratorType outIt( outputImage, - outputImage->GetBufferedRegion() ); + outputImage->GetBufferedRegion() ); outIt.GoToBegin(); diff --git a/Examples/Learning/SVMImageEstimatorClassificationMultiExample.cxx b/Examples/Learning/SVMImageEstimatorClassificationMultiExample.cxx index 24993ce1281e62a7d3691cab1749930d1415f8b6..e29759a4c73d213364deea59c8118f08f0075347 100644 --- a/Examples/Learning/SVMImageEstimatorClassificationMultiExample.cxx +++ b/Examples/Learning/SVMImageEstimatorClassificationMultiExample.cxx @@ -190,7 +190,7 @@ int main( int argc, char *argv[]) typedef otb::Image< itk::FixedArray<InputPixelType,3>, - Dimension > ClassifyImageType; + Dimension > ClassifyImageType; typedef otb::ImageFileReader< ClassifyImageType > ClassifyReaderType; @@ -314,7 +314,7 @@ int main( int argc, char *argv[]) - typedef ClassifierType::ClassLabelType OutputPixelType; + typedef ClassifierType::ClassLabelType OutputPixelType; typedef otb::Image< OutputPixelType, Dimension > OutputImageType; OutputImageType::Pointer outputImage = OutputImageType::New(); @@ -372,7 +372,7 @@ int main( int argc, char *argv[]) typedef itk::ImageRegionIterator< OutputImageType> OutputIteratorType; OutputIteratorType outIt( outputImage, - outputImage->GetBufferedRegion() ); + outputImage->GetBufferedRegion() ); outIt.GoToBegin(); diff --git a/Examples/Learning/SVMPointSetClassificationExample.cxx b/Examples/Learning/SVMPointSetClassificationExample.cxx index 2c7fad1e242172de0c044e891c4eb0250b1d3767..fe37ac22feefc60191588c3e245b33e117bd587c 100644 --- a/Examples/Learning/SVMPointSetClassificationExample.cxx +++ b/Examples/Learning/SVMPointSetClassificationExample.cxx @@ -77,7 +77,7 @@ int main( int argc, char* argv[] ) typedef int LabelPixelType; // Software Guide : EndCodeSnippet - const unsigned int Dimension = 2; + const unsigned int Dimension = 2; // Software Guide : BeginLatex // @@ -357,14 +357,14 @@ int main( int argc, char* argv[] ) ClassifierType::ClassLabelType expectedLabel; if(measure[0] < measure[1]) - expectedLabel= -1; + expectedLabel= -1; else - expectedLabel = 1; + expectedLabel = 1; double dist = fabs(measure[0] - measure[1]); if(label != expectedLabel ) - error++; + error++; std::cout << int(label) << "/" << int(expectedLabel) << " --- " << dist << std::endl; diff --git a/Examples/Learning/SVMPointSetExample.cxx b/Examples/Learning/SVMPointSetExample.cxx index 83dd957850969863780ae31ac89de5b03ab7816b..768034f0780c8f567b169c0cb580d9681e369cdf 100644 --- a/Examples/Learning/SVMPointSetExample.cxx +++ b/Examples/Learning/SVMPointSetExample.cxx @@ -40,7 +40,7 @@ int main( int argc, char* argv[] ) typedef std::vector<InputPixelType> InputVectorType; typedef int LabelPixelType; - const unsigned int Dimension = 2; + const unsigned int Dimension = 2; typedef itk::PointSet< InputVectorType, Dimension > MeasurePointSetType; @@ -215,14 +215,14 @@ int main( int argc, char* argv[] ) ClassifierType::ClassLabelType expectedLabel; if(measure[0] < measure[1]) - expectedLabel= 0; + expectedLabel= 0; else - expectedLabel = 1; + expectedLabel = 1; double dist = fabs(measure[0] - measure[1]); if(label != expectedLabel ) - error++; + error++; std::cout << int(label) << "/" << int(expectedLabel) << " --- " << dist << std::endl; diff --git a/Examples/Learning/SVMPointSetModelEstimatorExample.cxx b/Examples/Learning/SVMPointSetModelEstimatorExample.cxx index efae614679e18dd9cab597dfe7dba425616c4e63..ae1f26abc864270aca6ddd94e1f91d19c7afd3a5 100644 --- a/Examples/Learning/SVMPointSetModelEstimatorExample.cxx +++ b/Examples/Learning/SVMPointSetModelEstimatorExample.cxx @@ -60,7 +60,7 @@ int main( int argc, char* argv[] ) typedef std::vector<PixelType> VectorType; typedef int LabelPixelType; // Software Guide : EndCodeSnippet - const unsigned int Dimension = 2; + const unsigned int Dimension = 2; // Software Guide : BeginLatex // diff --git a/Examples/Markov/MarkovClassification1Example.cxx b/Examples/Markov/MarkovClassification1Example.cxx index 2aeec14bb8384e6299d8c03730d07a94d876834a..8b2814ee0628ec0951f24aa777645943abbe4ad0 100644 --- a/Examples/Markov/MarkovClassification1Example.cxx +++ b/Examples/Markov/MarkovClassification1Example.cxx @@ -136,7 +136,7 @@ int main(int argc, char* argv[] ) // Software Guide : BeginCodeSnippet typedef otb::MarkovRandomFieldFilter - <InputImageType,LabelledImageType> MarkovRandomFieldFilterType; + <InputImageType,LabelledImageType> MarkovRandomFieldFilterType; // Software Guide : EndCodeSnippet @@ -187,9 +187,9 @@ int main(int argc, char* argv[] ) // Software Guide : BeginCodeSnippet typedef otb::MRFEnergyPotts - <LabelledImageType, LabelledImageType> EnergyRegularizationType; + <LabelledImageType, LabelledImageType> EnergyRegularizationType; typedef otb::MRFEnergyGaussianClassification - <InputImageType, LabelledImageType> EnergyFidelityType; + <InputImageType, LabelledImageType> EnergyFidelityType; // Software Guide : EndCodeSnippet diff --git a/Examples/Markov/MarkovClassification2Example.cxx b/Examples/Markov/MarkovClassification2Example.cxx index 128ed037b8e54e8067e0ad070dbbfb8c7f4140a1..b6e60995889b1db3357bd4bc9a0d3393c55e052c 100644 --- a/Examples/Markov/MarkovClassification2Example.cxx +++ b/Examples/Markov/MarkovClassification2Example.cxx @@ -96,7 +96,7 @@ int main(int argc, char* argv[] ) writer->SetFileName( outputFilename ); typedef otb::MarkovRandomFieldFilter - <InputImageType,LabelledImageType> MarkovRandomFieldFilterType; + <InputImageType,LabelledImageType> MarkovRandomFieldFilterType; // Software Guide : BeginLatex @@ -120,9 +120,9 @@ int main(int argc, char* argv[] ) // Software Guide : EndCodeSnippet typedef otb::MRFEnergyPotts - <LabelledImageType, LabelledImageType> EnergyRegularizationType; + <LabelledImageType, LabelledImageType> EnergyRegularizationType; typedef otb::MRFEnergyGaussianClassification - <InputImageType, LabelledImageType> EnergyFidelityType; + <InputImageType, LabelledImageType> EnergyFidelityType; MarkovRandomFieldFilterType::Pointer markovFilter = MarkovRandomFieldFilterType::New(); EnergyRegularizationType::Pointer energyRegularization = EnergyRegularizationType::New(); diff --git a/Examples/Markov/MarkovRegularizationExample.cxx b/Examples/Markov/MarkovRegularizationExample.cxx index 4072fb0ce3e5e466ee95fd738290fabc34a83fce..bb8d3fe94bdac5af2c3be11e0c327599747ae902 100644 --- a/Examples/Markov/MarkovRegularizationExample.cxx +++ b/Examples/Markov/MarkovRegularizationExample.cxx @@ -94,16 +94,16 @@ int main(int argc, char* argv[] ) typedef otb::MarkovRandomFieldFilter - <LabelledImageType,LabelledImageType> MarkovRandomFieldFilterType; + <LabelledImageType,LabelledImageType> MarkovRandomFieldFilterType; typedef otb::MRFSamplerRandom< LabelledImageType, LabelledImageType> SamplerType; typedef otb::MRFOptimizerMetropolis OptimizerType; typedef otb::MRFEnergyPotts - <LabelledImageType, LabelledImageType> EnergyRegularizationType; + <LabelledImageType, LabelledImageType> EnergyRegularizationType; typedef otb::MRFEnergyPotts - <LabelledImageType, LabelledImageType> EnergyFidelityType; + <LabelledImageType, LabelledImageType> EnergyFidelityType; MarkovRandomFieldFilterType::Pointer markovFilter diff --git a/Examples/Markov/MarkovRestaurationExample.cxx b/Examples/Markov/MarkovRestaurationExample.cxx index 2de88f139aaa2fffe875f79c2cf7ede14e6ea4fb..145fabf87bcda3c021ec0f6ee0afdab0a42c3bce 100644 --- a/Examples/Markov/MarkovRestaurationExample.cxx +++ b/Examples/Markov/MarkovRestaurationExample.cxx @@ -140,7 +140,7 @@ int main(int argc, char* argv[] ) // Software Guide : BeginCodeSnippet typedef otb::MarkovRandomFieldFilter - <InputImageType,LabelledImageType> MarkovRandomFieldFilterType; + <InputImageType,LabelledImageType> MarkovRandomFieldFilterType; typedef otb::MRFSamplerRandom< InputImageType, LabelledImageType> SamplerType; @@ -157,9 +157,9 @@ int main(int argc, char* argv[] ) // Software Guide : BeginCodeSnippet typedef otb::MRFEnergyEdgeFidelity - <LabelledImageType, LabelledImageType> EnergyRegularizationType; + <LabelledImageType, LabelledImageType> EnergyRegularizationType; typedef otb::MRFEnergyGaussian - <InputImageType, LabelledImageType> EnergyFidelityType; + <InputImageType, LabelledImageType> EnergyFidelityType; // Software Guide : EndCodeSnippet diff --git a/Examples/MultiScale/MorphologicalPyramidAnalysisFilterExample.cxx b/Examples/MultiScale/MorphologicalPyramidAnalysisFilterExample.cxx index 0c73923d921ac8d0fb0de36facd8f18acbf9b50f..ace193396619c723801e56490c853b3e71713889 100644 --- a/Examples/MultiScale/MorphologicalPyramidAnalysisFilterExample.cxx +++ b/Examples/MultiScale/MorphologicalPyramidAnalysisFilterExample.cxx @@ -126,7 +126,7 @@ int main(int argc, char * argv[]) typedef otb::OpeningClosingMorphologicalFilter<InputImageType, InputImageType,StructuringElementType> - OpeningClosingFilterType; + OpeningClosingFilterType; // Software Guide : EndCodeSnippet @@ -143,7 +143,7 @@ int main(int argc, char * argv[]) typedef otb::MorphologicalPyramidAnalysisFilter<InputImageType, OutputImageType,OpeningClosingFilterType> - PyramidFilterType; + PyramidFilterType; // Software Guide : EndCodeSnippet @@ -158,7 +158,7 @@ int main(int argc, char * argv[]) // Software Guide : BeginCodeSnippet typedef PyramidFilterType::OutputImageListType::Iterator - ImageListIterator; + ImageListIterator; // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -247,34 +247,34 @@ int main(int argc, char * argv[]) // Writing the results images std::cout<<(itAnalyse!=(pyramid->GetOutput()->End()))<<std::endl; while(itAnalyse!=pyramid->GetOutput()->End()) - { - writer->SetInput(itAnalyse.Get()); - writer->SetFileName(argv[0*4+i+1]); - writer->Update(); - - writer->SetInput(itSupFilter.Get()); - writer->SetFileName(argv[1*4+i+1]); - writer->Update(); - - writer->SetInput(itInfFilter.Get()); - writer->SetFileName(argv[2*4+i+1]); - writer->Update(); - - writer->SetInput(itInfDeci.Get()); - writer->SetFileName(argv[3*4+i+1]); - writer->Update(); - - writer->SetInput(itSupDeci.Get()); - writer->SetFileName(argv[4*4+i+1]); - writer->Update(); - - ++itAnalyse; - ++itSupFilter; - ++itInfFilter; - ++itInfDeci; - ++itSupDeci; - ++i; - } + { + writer->SetInput(itAnalyse.Get()); + writer->SetFileName(argv[0*4+i+1]); + writer->Update(); + + writer->SetInput(itSupFilter.Get()); + writer->SetFileName(argv[1*4+i+1]); + writer->Update(); + + writer->SetInput(itInfFilter.Get()); + writer->SetFileName(argv[2*4+i+1]); + writer->Update(); + + writer->SetInput(itInfDeci.Get()); + writer->SetFileName(argv[3*4+i+1]); + writer->Update(); + + writer->SetInput(itSupDeci.Get()); + writer->SetFileName(argv[4*4+i+1]); + writer->Update(); + + ++itAnalyse; + ++itSupFilter; + ++itInfFilter; + ++itInfDeci; + ++itSupDeci; + ++i; + } // Software Guide : EndCodeSnippet diff --git a/Examples/MultiScale/MorphologicalPyramidSegmentationExample.cxx b/Examples/MultiScale/MorphologicalPyramidSegmentationExample.cxx index f8becb04d382888c4ffa631c38818f18fc557cae..74dd23cf14030487755277407478a0f60d8b51a0 100644 --- a/Examples/MultiScale/MorphologicalPyramidSegmentationExample.cxx +++ b/Examples/MultiScale/MorphologicalPyramidSegmentationExample.cxx @@ -110,13 +110,13 @@ int main(int argc, char * argv[]) typedef otb::ImageFileWriter<OutputImageType> WriterType; typedef itk::BinaryBallStructuringElement<InputPixelType,Dimension> - StructuringElementType; + StructuringElementType; typedef otb::OpeningClosingMorphologicalFilter<InputImageType, InputImageType,StructuringElementType> - OpeningClosingFilterType; + OpeningClosingFilterType; typedef otb::MorphologicalPyramidAnalysisFilter<InputImageType, InputImageType,OpeningClosingFilterType> - PyramidFilterType; + PyramidFilterType; // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -130,7 +130,7 @@ int main(int argc, char * argv[]) // Software Guide : BeginCodeSnippet typedef otb::MorphologicalPyramidSegmentationFilter<InputImageType, OutputImageType> - SegmentationFilterType; + SegmentationFilterType; // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -143,7 +143,7 @@ int main(int argc, char * argv[]) // Software Guide : BeginCodeSnippet typedef SegmentationFilterType::OutputImageListIteratorType - OutputListIteratorType; + OutputListIteratorType; // Software Guide : EndCodeSnippet // Software Guide : BeginLatex // @@ -215,17 +215,17 @@ int main(int argc, char * argv[]) int index = 1; std::stringstream oss; while(it!=segmentation->GetOutput()->End()) - { - oss<<outputFilenamePrefix<<index<<"."<<outputFilenameSuffix; - writer = WriterType::New(); - writer->SetInput(it.Get()); - writer->SetFileName(oss.str().c_str()); - writer->Update(); - std::cout<<oss.str()<<" file written."<<std::endl; - oss.str(""); - ++index; - ++it; - } + { + oss<<outputFilenamePrefix<<index<<"."<<outputFilenameSuffix; + writer = WriterType::New(); + writer->SetInput(it.Get()); + writer->SetFileName(oss.str().c_str()); + writer->Update(); + std::cout<<oss.str()<<" file written."<<std::endl; + oss.str(""); + ++index; + ++it; + } // Software Guide : EndCodeSnippet // Software Guide : BeginLatex diff --git a/Examples/MultiScale/MorphologicalPyramidSegmenterExample.cxx b/Examples/MultiScale/MorphologicalPyramidSegmenterExample.cxx index 0e67af18ec1b8e5618d2b2fa6abe6389e8c51ff4..2d8038487860b3d58b6f5f5e62b6b66929babe94 100644 --- a/Examples/MultiScale/MorphologicalPyramidSegmenterExample.cxx +++ b/Examples/MultiScale/MorphologicalPyramidSegmenterExample.cxx @@ -98,7 +98,7 @@ int main(int argc, char * argv[]) typedef otb::MorphologicalPyramid::Segmenter<InputImageType, LabelImageType> - SegmenterType; + SegmenterType; // Software Guide : EndCodeSnippet diff --git a/Examples/MultiScale/MorphologicalPyramidSynthesisFilterExample.cxx b/Examples/MultiScale/MorphologicalPyramidSynthesisFilterExample.cxx index 233bf6907996af8edfbd83f0ca4e472676faed8e..3abc9b050a28fcfe332366db5cb3b38aede30cbc 100644 --- a/Examples/MultiScale/MorphologicalPyramidSynthesisFilterExample.cxx +++ b/Examples/MultiScale/MorphologicalPyramidSynthesisFilterExample.cxx @@ -106,7 +106,7 @@ int main(int argc, char * argv[]) // Software Guide : BeginCodeSnippet typedef itk::BinaryBallStructuringElement<InputPixelType,Dimension> - StructuringElementType; + StructuringElementType; // Software Guide : EndCodeSnippet @@ -125,7 +125,7 @@ int main(int argc, char * argv[]) typedef otb::OpeningClosingMorphologicalFilter<InputImageType, InputImageType,StructuringElementType> - OpeningClosingFilterType; + OpeningClosingFilterType; // Software Guide : EndCodeSnippet @@ -142,7 +142,7 @@ int main(int argc, char * argv[]) typedef otb::MorphologicalPyramidAnalysisFilter<InputImageType, OutputImageType,OpeningClosingFilterType> - PyramidAnalysisFilterType; + PyramidAnalysisFilterType; // Software Guide : EndCodeSnippet @@ -159,7 +159,7 @@ int main(int argc, char * argv[]) typedef otb::MorphologicalPyramidSynthesisFilter<InputImageType, OutputImageType> - PyramidSynthesisFilterType; + PyramidSynthesisFilterType; // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -191,7 +191,7 @@ int main(int argc, char * argv[]) // Software Guide : BeginCodeSnippet PyramidAnalysisFilterType::Pointer pyramidAnalysis = - PyramidAnalysisFilterType::New(); + PyramidAnalysisFilterType::New(); pyramidAnalysis->SetNumberOfLevels(numberOfLevels); pyramidAnalysis->SetDecimationRatio(decimationRatio); pyramidAnalysis->SetInput(reader->GetOutput()); diff --git a/Examples/Projections/OrthoRectificationExample.cxx b/Examples/Projections/OrthoRectificationExample.cxx index 04f5e4b3a3b984f37c57c81ffeb00cd2ad41be73..fef88a6ec113e57ab842cff8e162c80e8cdd912a 100644 --- a/Examples/Projections/OrthoRectificationExample.cxx +++ b/Examples/Projections/OrthoRectificationExample.cxx @@ -61,7 +61,7 @@ int main( int argc, char* argv[] ) if(argc!=11) { std::cout << argv[0] <<" <input_filename> <output_filename> <utm zone> <hemisphere N/S> <x_ground_upper_left_corner> <y_ground_upper_left_corner> <x_Size> <y_Size> <x_groundSamplingDistance> <y_groundSamplingDistance> (should be negative since origin is upper left)>" - << std::endl; + << std::endl; return EXIT_FAILURE; } @@ -87,8 +87,8 @@ int main( int argc, char* argv[] ) typedef otb::StreamingImageFileWriter<VectorImageType> WriterType; - ReaderType::Pointer reader=ReaderType::New(); - WriterType::Pointer writer=WriterType::New(); + ReaderType::Pointer reader=ReaderType::New(); + WriterType::Pointer writer=WriterType::New(); reader->SetFileName(argv[1]); writer->SetFileName(argv[2]); diff --git a/Examples/Projections/SensorModelExample.cxx b/Examples/Projections/SensorModelExample.cxx index ee75c1d9d405391e5b89ecd8c5fcda04608660df..74d5b899b74b98c2260ccd465dbeffcd4634ce67 100644 --- a/Examples/Projections/SensorModelExample.cxx +++ b/Examples/Projections/SensorModelExample.cxx @@ -55,9 +55,9 @@ int main( int argc, char* argv[] ) if(argc!=8) { std::cout << argv[0] <<" <input_filename> <output_filename>" - << " <upper_left_corner_longitude> <upper_left_corner_latitude>" + << " <upper_left_corner_longitude> <upper_left_corner_latitude>" << " <size_x> <sizee_y> <number_of_stream_divisions>" - << std::endl; + << std::endl; return EXIT_FAILURE; } @@ -81,10 +81,10 @@ int main( int argc, char* argv[] ) typedef otb::Image<unsigned int, 2> ImageType; typedef otb::ImageFileReader<ImageType> ReaderType; - ReaderType::Pointer reader=ReaderType::New(); + ReaderType::Pointer reader=ReaderType::New(); reader->SetFileName(argv[1]); - ImageType::Pointer inputImage= reader->GetOutput(); + ImageType::Pointer inputImage= reader->GetOutput(); // Software Guide : EndCodeSnippet @@ -171,14 +171,14 @@ int main( int argc, char* argv[] ) ModelType::OutputPointType inputPoint; - typedef itk::Point <double, 2> PointType; - PointType outputPoint; + typedef itk::Point <double, 2> PointType; + PointType outputPoint; - ImageType::IndexType currentIndex; - ImageType::IndexType currentIndexBis; - ImageType::IndexType pixelIndexBis; + ImageType::IndexType currentIndex; + ImageType::IndexType currentIndexBis; + ImageType::IndexType pixelIndexBis; // Software Guide : EndCodeSnippet @@ -194,15 +194,15 @@ int main( int argc, char* argv[] ) // Software Guide : BeginCodeSnippet - ImageType::Pointer outputImage = ImageType::New(); + ImageType::Pointer outputImage = ImageType::New(); - ImageType::PixelType pixelValue; + ImageType::PixelType pixelValue; - ImageType::IndexType start; + ImageType::IndexType start; start[0]=0; start[1]=0; - ImageType::SizeType size; + ImageType::SizeType size; size[0]=atoi(argv[5]); size[1]=atoi(argv[6]); @@ -215,16 +215,16 @@ int main( int argc, char* argv[] ) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - ImageType::SpacingType spacing; + ImageType::SpacingType spacing; spacing[0]=0.00001; spacing[1]=-0.00001; - ImageType::PointType origin; + ImageType::PointType origin; origin[0]=strtod(argv[3], NULL); //longitude origin[1]=strtod(argv[4], NULL); //lattitude - ImageType::RegionType region; + ImageType::RegionType region; region.SetSize(size); region.SetIndex(start); @@ -247,7 +247,7 @@ int main( int argc, char* argv[] ) // Software Guide : BeginCodeSnippet typedef itk::ExtractImageFilter<ImageType,ImageType> ExtractType; - ExtractType::Pointer extract=ExtractType::New(); + ExtractType::Pointer extract=ExtractType::New(); // Software Guide : EndCodeSnippet @@ -264,7 +264,7 @@ int main( int argc, char* argv[] ) typedef itk::LinearInterpolateImageFunction<ImageType, double> InterpolatorType; - InterpolatorType::Pointer interpolator=InterpolatorType::New(); + InterpolatorType::Pointer interpolator=InterpolatorType::New(); // Software Guide : EndCodeSnippet @@ -282,8 +282,8 @@ int main( int argc, char* argv[] ) typedef otb::Image<unsigned char, 2> CharImageType; typedef otb::ImageFileWriter<CharImageType> CharWriterType; typedef otb::ImageFileWriter<ImageType> WriterType; - WriterType::Pointer extractorWriter=WriterType::New(); - CharWriterType::Pointer writer=CharWriterType::New(); + WriterType::Pointer extractorWriter=WriterType::New(); + CharWriterType::Pointer writer=CharWriterType::New(); extractorWriter->SetFileName("image_temp.jpeg"); extractorWriter->SetInput(extract->GetOutput()); @@ -299,7 +299,7 @@ int main( int argc, char* argv[] ) typedef itk::RescaleIntensityImageFilter<ImageType,CharImageType> RescalerType; - RescalerType::Pointer rescaler=RescalerType::New(); + RescalerType::Pointer rescaler=RescalerType::New(); rescaler->SetOutputMinimum(10); rescaler->SetOutputMaximum(255); @@ -321,7 +321,7 @@ int main( int argc, char* argv[] ) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - typedef itk::ImageRegionIteratorWithIndex<ImageType> IteratorType; + typedef itk::ImageRegionIteratorWithIndex<ImageType> IteratorType; unsigned int NumberOfStreamDivisions; if (atoi(argv[7])==0) @@ -337,9 +337,9 @@ int main( int argc, char* argv[] ) unsigned int count=0; unsigned int It, j, k; int max_x, max_y, min_x, min_y; - ImageType::IndexType iterationRegionStart; - ImageType::SizeType iteratorRegionSize; - ImageType::RegionType iteratorRegion; + ImageType::IndexType iterationRegionStart; + ImageType::SizeType iteratorRegionSize; + ImageType::RegionType iteratorRegion; // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -355,13 +355,13 @@ int main( int argc, char* argv[] ) if (count==NumberOfStreamDivisions-1) { iteratorRegionSize[1]=(atoi(argv[6]))-((int)(((atoi(argv[6]))/ - NumberOfStreamDivisions)+0.5))*(count); + NumberOfStreamDivisions)+0.5))*(count); iterationRegionStart[1]=(atoi(argv[5]))-(iteratorRegionSize[1]); } else { iteratorRegionSize[1]=(int)(((atoi(argv[6]))/ - NumberOfStreamDivisions)+0.5); + NumberOfStreamDivisions)+0.5); iterationRegionStart[1]=count*iteratorRegionSize[1]; } iterationRegionStart[0]=0; @@ -472,9 +472,9 @@ int main( int argc, char* argv[] ) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - ImageType::RegionType extractRegion; + ImageType::RegionType extractRegion; - ImageType::IndexType extractStart; + ImageType::IndexType extractStart; if (min_x<10 && min_y<10) { @@ -488,7 +488,7 @@ int main( int argc, char* argv[] ) extractStart[1]=min_y-10; } - ImageType::SizeType extractSize; + ImageType::SizeType extractSize; extractSize[0]=(max_x-min_x)+20; extractSize[1]=(max_y-min_y)+20; @@ -519,13 +519,13 @@ int main( int argc, char* argv[] ) currentIndexBis[1]= currentIndexArray[2*k+1]; if (interpolator->IsInsideBuffer(pixelIndexBis)) - { - pixelValue=int (interpolator->EvaluateAtIndex(pixelIndexBis)); - } + { + pixelValue=int (interpolator->EvaluateAtIndex(pixelIndexBis)); + } else - { - pixelValue=0; - } + { + pixelValue=0; + } outputImage->SetPixel(currentIndexBis,pixelValue); } diff --git a/Examples/Radiometry/ARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx b/Examples/Radiometry/ARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx index 3e2d4f9e6c0fd23d6c16b951c5ec1bb1c7445988..97d138b05eb7ce64024baa9d78d93e836119b718 100644 --- a/Examples/Radiometry/ARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx +++ b/Examples/Radiometry/ARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx @@ -137,8 +137,8 @@ int main( int argc, char *argv[] ) // Software Guide : BeginCodeSnippet typedef otb::Functor::ARVI< InputPixelType, - InputPixelType, - InputPixelType, + InputPixelType, + InputPixelType, OutputPixelType > FunctorType; // Software Guide : EndCodeSnippet @@ -154,9 +154,9 @@ int main( int argc, char *argv[] ) // Software Guide : BeginCodeSnippet typedef otb::MultiChannelRAndBAndNIRVegetationIndexImageFilter - <InputImageType, - OutputImageType, - FunctorType > + <InputImageType, + OutputImageType, + FunctorType > MultiChannelRAndBAndNIRVegetationIndexImageFilterType; MultiChannelRAndBAndNIRVegetationIndexImageFilterType::Pointer diff --git a/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx b/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx index 906e8a197c13971df22111874eebaf0b4f57513a..980a0c8346d701ba1f54364a8f8a577866e53114 100644 --- a/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx +++ b/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx @@ -448,7 +448,7 @@ int main( int argc, char *argv[] ) ReflectanceToSurfaceReflectanceImageFilterType::Pointer filterReflectanceToSurfaceReflectanceImageFilter - = ReflectanceToSurfaceReflectanceImageFilterType::New(); + = ReflectanceToSurfaceReflectanceImageFilterType::New(); // Software Guide : EndCodeSnippet // Software Guide : BeginLatex diff --git a/Examples/Radiometry/NDVIRAndNIRVegetationIndexImageFilter.cxx b/Examples/Radiometry/NDVIRAndNIRVegetationIndexImageFilter.cxx index e759f36fa57fceff775a86d2424f8b35dfd776f7..e0e2a562d37b7e549966cffc98c68313886e18c3 100644 --- a/Examples/Radiometry/NDVIRAndNIRVegetationIndexImageFilter.cxx +++ b/Examples/Radiometry/NDVIRAndNIRVegetationIndexImageFilter.cxx @@ -229,13 +229,13 @@ int main( int argc, char *argv[] ) } catch( itk::ExceptionObject & excep ) { - std::cerr << "Exception caught !" << std::endl; - std::cerr << excep << std::endl; + std::cerr << "Exception caught !" << std::endl; + std::cerr << excep << std::endl; } catch( ... ) { - std::cout << "Unknown exception !" << std::endl; - return EXIT_FAILURE; + std::cout << "Unknown exception !" << std::endl; + return EXIT_FAILURE; } diff --git a/Examples/SARPolarimetry/PiOver4ExamplePolarimetricSynthesisFilter.cxx b/Examples/SARPolarimetry/PiOver4ExamplePolarimetricSynthesisFilter.cxx index 35fe0aebefe49f16048203ad1f5952b5e5e20a7b..dc11ea31467898a17d59ff5d76c88d99d4d86575 100644 --- a/Examples/SARPolarimetry/PiOver4ExamplePolarimetricSynthesisFilter.cxx +++ b/Examples/SARPolarimetry/PiOver4ExamplePolarimetricSynthesisFilter.cxx @@ -49,7 +49,7 @@ int main( int argc, char* argv[] ) <<" <input_filename_VH_channel>" <<" <input_filename_VV_channel>" <<" <output_filename>" - << std::endl; + << std::endl; return EXIT_FAILURE; } @@ -64,7 +64,7 @@ int main( int argc, char* argv[] ) // Software Guide : BeginCodeSnippet typedef std::complex <double> InputPixelType; - typedef double OutputPixelType; + typedef double OutputPixelType; const unsigned int Dimension = 2; typedef otb::Image< InputPixelType, Dimension > InputImageType; diff --git a/Examples/Segmentation/LabelizeNeighborhoodConnectedImageFilter.cxx b/Examples/Segmentation/LabelizeNeighborhoodConnectedImageFilter.cxx index 3c74b4321d92866de8eae121b6d1f448080f4991..191f7cf93db9e1fc03a2833c2e623115ab1f7046 100644 --- a/Examples/Segmentation/LabelizeNeighborhoodConnectedImageFilter.cxx +++ b/Examples/Segmentation/LabelizeNeighborhoodConnectedImageFilter.cxx @@ -50,9 +50,9 @@ int main( int argc, char * argv[] ) { std::cerr << "Usage: " << std::endl; std::cerr << argv[0] \ - << " inputImageFile outputImageFile " \ - << "seedLowerThreshold seedUpperThreshold "\ - << "deltaLower deltaUpper " << std::endl; + << " inputImageFile outputImageFile " \ + << "seedLowerThreshold seedUpperThreshold "\ + << "deltaLower deltaUpper " << std::endl; return EXIT_FAILURE; } diff --git a/Examples/Tutorials/OrthoFusion.cxx b/Examples/Tutorials/OrthoFusion.cxx index 720f122f263f7a08287ab04c42108dc5f17583b3..d0a848818e6d45da29606a96850a02f8b24fe8f5 100644 --- a/Examples/Tutorials/OrthoFusion.cxx +++ b/Examples/Tutorials/OrthoFusion.cxx @@ -99,9 +99,9 @@ int main( int argc, char* argv[] ) typedef otb::StreamingImageFileWriter<VectorImageType> WriterType; - ReaderType::Pointer readerPAN=ReaderType::New(); + ReaderType::Pointer readerPAN=ReaderType::New(); VectorReaderType::Pointer readerXS=VectorReaderType::New(); - WriterType::Pointer writer=WriterType::New(); + WriterType::Pointer writer=WriterType::New(); readerPAN->SetFileName(argv[1]); readerXS->SetFileName(argv[2]); diff --git a/Examples/Tutorials/SmarterFilteringPipeline.cxx b/Examples/Tutorials/SmarterFilteringPipeline.cxx index 297cbec9bd61f2ca93a6dbdc7dad6bf1a6682d63..be25fc8d127a9a059e4a3164796a2f5e062b730c 100644 --- a/Examples/Tutorials/SmarterFilteringPipeline.cxx +++ b/Examples/Tutorials/SmarterFilteringPipeline.cxx @@ -32,18 +32,18 @@ // The derivative computation is performed by a // convolution with the derivative of a Gaussian kernel of // variance $\sigma_D$ (derivation scale) and -// the smoothing of the image is performed by convolving with a -// Gaussian kernel of variance $\sigma_I$ (integration +// the smoothing of the image is performed by convolving with a +// Gaussian kernel of variance $\sigma_I$ (integration // scale). This allows the computation of the following matrix: // -// \[ -// \mu(\mathbf{x},\sigma_I,\sigma_D) = \sigma_D^2 g(\sigma_I)\star -// \left[\begin{array}{cc} L_x^2(\mathbf{x},\sigma_D) & -// L_xL_y^2(\mathbf{x},\sigma_D)\\ L_xL_y^2(\mathbf{x},\sigma_D)& -// L_y^2(\mathbf{x},\sigma_D) \end{array}\right] -// \] +// \[ +// \mu(\mathbf{x},\sigma_I,\sigma_D) = \sigma_D^2 g(\sigma_I)\star +// \left[\begin{array}{cc} L_x^2(\mathbf{x},\sigma_D) & +// L_xL_y^2(\mathbf{x},\sigma_D)\\ L_xL_y^2(\mathbf{x},\sigma_D)& +// L_y^2(\mathbf{x},\sigma_D) \end{array}\right] +// \] // -// The output of the detector is $\mathrm{det}(\mu) - \alpha +// The output of the detector is $\mathrm{det}(\mu) - \alpha // \mathrm{trace}^2(\mu)$. // // We want to set 3 parameters of this filter through the command line: