diff --git a/Modules/Applications/AppFiltering/app/otbContrastEnhancement.cxx b/Modules/Applications/AppFiltering/app/otbContrastEnhancement.cxx index 75c3a93165fb0ad7c3986a276585bc4cbd682a49..293eceb9ce3443f107cef992db1f0a84a36bcce8 100644 --- a/Modules/Applications/AppFiltering/app/otbContrastEnhancement.cxx +++ b/Modules/Applications/AppFiltering/app/otbContrastEnhancement.cxx @@ -446,7 +446,7 @@ private: oss << "- spatial parameters : " << m_SpatialMode ; if ( m_SpatialMode == "local" ) { - oss<< " with a thumbnail of " <<m_ThumbSize[0]<<"X"<<m_ThumbSize[1]; + oss<< " with a thumbnail of " <<m_ThumbSize[0]<<" X "<<m_ThumbSize[1]; } oss << std::endl << "- equalisation of "; if ( m_EqMode == "each" ) diff --git a/Modules/Applications/AppFiltering/test/CMakeLists.txt b/Modules/Applications/AppFiltering/test/CMakeLists.txt index bdf1671b8c64e6f37d9c77feb749be0a15bc5401..f8195d22ce294a43281177f623e47c534de4927a 100644 --- a/Modules/Applications/AppFiltering/test/CMakeLists.txt +++ b/Modules/Applications/AppFiltering/test/CMakeLists.txt @@ -51,6 +51,56 @@ otb_test_application(NAME apTvUtSmoothingTest_OutXML #----------- Contrast TESTS ---------------- +otb_test_application(NAME apTvUtContrastTest_base + APP ContrastEnhancement + OPTIONS -in ${INPUTDATA}/QB_Suburb.png + -out ${TEMP}/apTvUtContrastTest_base.tif int16 + -bins 256 + -spatial.local.h 51 + -spatial.local.w 67 + VALID --compare-image ${NOTOL} + ${BASELINE}/apTvUtContrastTest_base.tif + ${TEMP}/apTvUtContrastTest_base.tif) + +otb_test_application(NAME apTvUtContrastTest_base_glob + APP ContrastEnhancement + OPTIONS -in ${INPUTDATA}/QB_Suburb.png + -out ${TEMP}/apTvUtContrastTest_base_glob.tif int16 + -bins 256 + -spatial global + -minmax manuel + -minmax.manuel.min 0 + -minmax.manuel.max 255 + VALID --compare-image ${NOTOL} + ${BASELINE}/apTvUtContrastTest_base_glob.tif + ${TEMP}/apTvUtContrastTest_base_glob.tif) + +otb_test_application(NAME apTvUtContrastTest_lum_glob + APP ContrastEnhancement + OPTIONS -in ${INPUTDATA}/anaglyphInput1.tif + -out ${TEMP}/apTvUtContrastTest_lum_glob.tif int16 + -bins 256 + -spatial global + -hfact 2.7 + -nodata 0 + -mode lum + VALID --compare-image ${NOTOL} + ${BASELINE}/apTvUtContrastTest_lum_glob.tif + ${TEMP}/apTvUtContrastTest_lum_glob.tif) + +otb_test_application(NAME apTvUtContrastTest_lum + APP ContrastEnhancement + OPTIONS -in ${INPUTDATA}/anaglyphInput1.tif + -out ${TEMP}/apTvUtContrastTest_lum.tif int16 + -bins 256 + -spatial.local.h 33 + -spatial.local.w 47 + -hfact 2.1 + -nodata 0 + -mode lum + VALID --compare-image ${NOTOL} + ${BASELINE}/apTvUtContrastTest_lum.tif + ${TEMP}/apTvUtContrastTest_lum.tif) diff --git a/Modules/Filtering/Contrast/test/otbCLHistogramEqualizationFilter.cxx b/Modules/Filtering/Contrast/test/otbCLHistogramEqualizationFilter.cxx index 403fa06d79e22765a7f219901e85e7275da58a2f..7ddbe3e6fad80870d50a1f1fdf9edc3f63976e4f 100644 --- a/Modules/Filtering/Contrast/test/otbCLHistogramEqualizationFilter.cxx +++ b/Modules/Filtering/Contrast/test/otbCLHistogramEqualizationFilter.cxx @@ -41,7 +41,7 @@ int otbCLHistogramEqualizationFilter(int itkNotUsed(argc), char * argv []) reader->UpdateOutputInformation(); FilterType::Pointer histoEqualize ( FilterType::New() ); - + histoEqualize->SetInput( reader->GetOutput() ); histoEqualize->SetMin(0); histoEqualize->SetMax(255);