diff --git a/Code/Common/otbParserX.cxx b/Code/Common/otbParserX.cxx index afe23f7ca3698463b732758540a42394f994ac95..4727693b4b8b6b65dd1e1a871f4401a4cbadf635 100644 --- a/Code/Common/otbParserX.cxx +++ b/Code/Common/otbParserX.cxx @@ -204,7 +204,6 @@ private: - void ParserX::PrintSelf(std::ostream& os, itk::Indent indent) const { Superclass::PrintSelf(os, indent); diff --git a/Code/Common/otbParserXPlugins.h b/Code/Common/otbParserXPlugins.h index 3bca87d6d11b6a12c5addf60212eab3de779e8a4..a237db5396ab5272be99021f2bbe9a7c49a84201 100644 --- a/Code/Common/otbParserXPlugins.h +++ b/Code/Common/otbParserXPlugins.h @@ -309,7 +309,6 @@ public: }; - }//end namespace otb #endif diff --git a/Testing/Code/BasicFilters/otbBandMathImageFilterX.cxx b/Testing/Code/BasicFilters/otbBandMathImageFilterX.cxx index 398599225deb11fa27e588a162fea562e2f7cf4f..17d2347674239480792658c849d49e51d84e72ca 100644 --- a/Testing/Code/BasicFilters/otbBandMathImageFilterX.cxx +++ b/Testing/Code/BasicFilters/otbBandMathImageFilterX.cxx @@ -139,10 +139,10 @@ int otbBandMathImageFilterX( int itkNotUsed(argc), char* itkNotUsed(argv) []) double expected1 = vcl_cos( 2 * otb::CONST_PI * px1[0] ) / ( 2 * otb::CONST_PI * px2[0] ) * vcl_sin( otb::CONST_PI * px3[0] ); double expected2 = vcl_cos( 2 * otb::CONST_PI * px1[1] ) / ( 2 * otb::CONST_PI * px2[0] ) * vcl_sin( otb::CONST_PI * px3[0] ); - double expected3 = vcl_cos( 2 * otb::CONST_PI * px1[2] ) / ( 2 * otb::CONST_PI * px2[0] ) * vcl_sin( otb::CONST_PI * px3[0] ); + double expected3 = vcl_cos( 2 * otb::CONST_PI * px1[2] ) / ( 2 * otb::CONST_PI * px2[0] ) * vcl_sin( otb::CONST_PI * px3[0] ); /*std::cout << "Pixel_1 = " << it1.Get()[0] << " Pixel_2 = " << it2.Get()[0] << " Pixel_3 = " << it3.Get()[0] - << " Result = " << itoutput1.Get()[0] << " Expected = " << expected1 << std::endl;*/ + << " Result = " << itoutput1.Get()[0] << " Expected = " << expected1 << std::endl; */ error1 = (result1 - expected1) * (result1 - expected1) / (result1 + expected1); @@ -157,7 +157,7 @@ int otbBandMathImageFilterX( int itkNotUsed(argc), char* itkNotUsed(argv) []) << " Pixel_2 = " << it2.Get()[0] << " Pixel_3 = " << it3.Get()[0] << " Result = " << result1 - << " Expected = " << expected1 << std::endl + << " Expected = " << expected1 << std::endl << "Error = " << error2 << " > 1E-9 -> TEST FAILLED" << std::endl << "Pixel_1 = " << it1.Get()[1] << " Pixel_2 = " << it2.Get()[0] @@ -190,7 +190,7 @@ int otbBandMathImageFilterX( int itkNotUsed(argc), char* itkNotUsed(argv) []) << "\nError > Bad Edge Effect Handling -> Test Failled\n" << "Pixel_1 = " << it1.Get() << " Pixel_2 = " << it2.Get() << " Result = " << itoutput2.Get() << " Expected = nan\n" ); - std::cout << std::endl; + std::cout << std::endl; return EXIT_SUCCESS; @@ -267,8 +267,8 @@ int otbBandMathImageFilterXConv( int itkNotUsed(argc), char* itkNotUsed(argv) [] filter->SetNthInput(0, image1,"imageA"); filter->SetNthInput(1, image2); filter->SetNthInput(2, image3, "canal3"); - filter->SetMatrix("kernel1","{ 0.1 , 0.2 , 0.3 ; 0.4 , 0.5 , 0.6 ; 0.7 , 0.8 , 0.9 ; 1.0 , 1.1 , 1.2 ; 1.3 , 1.4 , 1.5 }"); - filter->SetExpression("conv(kernel1,imageAb1N3x5,imageAb2N3x5)"); + filter->SetMatrix("kernel1","{ 0.1 , 0.2 , 0.3; 0.4 , 0.5 , 0.6; 0.7 , 0.8 , 0.9; 1.0 , 1.1 , 1.2; 1.3 , 1.4 , 1.5 }"); + filter->SetExpression("conv(kernel1,imageAb1N3x5,imageAb2N3x5)"); filter->Update(); if (filter->GetNumberOfOutputs() != 1) @@ -297,19 +297,19 @@ int otbBandMathImageFilterXConv( int itkNotUsed(argc), char* itkNotUsed(argv) [] float coefs[15] = { 0.1 , 0.2 , 0.3 , 0.4 , 0.5 , 0.6 , 0.7 , 0.8 , 0.9 , 1.0 , 1.1 , 1.2 , 1.3 , 1.4 , 1.5}; - px1[0]=0; + px1[0]=0; for(int i=0; i<it1.Size(); ++i) - px1[0] += coefs[i]*it1.GetPixel(i)[0]; + px1[0] += coefs[i]*it1.GetPixel(i)[0]; - px1[1]=0; + px1[1]=0; for(int i=0; i<it1.Size(); ++i) - px1[1] += coefs[i]*it1.GetPixel(i)[1]; + px1[1] += coefs[i]*it1.GetPixel(i)[1]; double result1 = itoutput1.GetCenterPixel()[0], result2 = itoutput1.GetCenterPixel()[1]; - double error1,error2; + double error1,error2; double expected1 = px1[0], expected2 = px1[1]; @@ -317,14 +317,14 @@ int otbBandMathImageFilterXConv( int itkNotUsed(argc), char* itkNotUsed(argv) [] error2 = (result2 - expected2) * (result2 - expected2) / (result2 + expected2); if ( ( error1 > 1E-9 ) || ( error2 > 1E-9 ) ) - { - itkGenericExceptionMacro( + { + itkGenericExceptionMacro( << "Error1 = " << error1 << " > 1E-9 -> TEST FAILLED" << std::endl << " Result1 = " << result1 << " Expected1 = " << expected1 << std::endl << "Error2 = " << error2 << " > 1E-9 -> TEST FAILLED" << std::endl << " Result2 = " << result2 - << " Expected2 = " << expected2 << std::endl); + << " Expected2 = " << expected2 << std::endl); } }