diff --git a/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx b/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx index 2a6e93538856c736fa7bf68fdd14989bb0fb2a2d..210b7bd0e0e2104843c0739b1c92769060f5e271 100755 --- a/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx +++ b/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx @@ -81,7 +81,7 @@ void LineDetectorImageFilterBase<TInputImage, TOutputImage, InterpolatorType>::G otbMsgDevMacro( << m_Radius[0] << " " << m_Radius[1] ); // Define the size of the facelist by taking into account the rotation of the region - m_FaceList[0] = static_cast<unsigned int>( sqrt( static_cast<double>((m_Radius[0]*m_Radius[0]) + (m_Radius[1]*m_Radius[1]) ) + 1) ); + m_FaceList[0] = static_cast<unsigned int>( sqrt( static_cast<double>((m_Radius[0]*m_Radius[0]) + (m_Radius[1]*m_Radius[1]) ) ) + 1 ); m_FaceList[1] = m_FaceList[0]; // pad the input requested region by the operator radius @@ -277,9 +277,6 @@ void LineDetectorImageFilterBase< TInputImage, TOutputImage, InterpolatorType> PixelValues[i] = new std::vector<double>[NB_ZONE]; // Loop on the region - //for (i = 0; i < neighborhoodSize; ++i) -// for (int i = 0; i < m_Radius[0]; ++i) -// for (int j = 0; j < m_Radius[1]; ++j) for (int i = 0; i < m_Radius[0]; i++) for (int j = 0; j < m_Radius[1]; j++) { @@ -316,10 +313,7 @@ void LineDetectorImageFilterBase< TInputImage, TOutputImage, InterpolatorType> Index[0] = static_cast<CoordRepType>(xout + Xc); Index[1] = static_cast<CoordRepType>(yout + Yc); -//THOMAS -// PixelValues[dir][zone].push_back(static_cast<double>(interpolator->EvaluateAtContinuousIndex( Index ))); - double result = static_cast<double>(interpolator->EvaluateAtContinuousIndex( Index )); - PixelValues[dir][zone].push_back(result ); + PixelValues[dir][zone].push_back(static_cast<double>(interpolator->EvaluateAtContinuousIndex( Index ))); } diff --git a/Code/IO/otbGDALImageIO.cxx b/Code/IO/otbGDALImageIO.cxx index a24739689694c2638264d6ca0fbc1738ccfd1023..2251401dca1aad32f97687c8e10416f297174312 100755 --- a/Code/IO/otbGDALImageIO.cxx +++ b/Code/IO/otbGDALImageIO.cxx @@ -1030,6 +1030,7 @@ void GDALImageIO::InternalWriteImageInformation() otbMsgDebugMacro( <<"Driver to write: GDAL - "<<extGDAL); otbMsgDebugMacro( <<" Write file : "<< m_FileName); +otbMsgDebugMacro( <<" GDAL file name : "<< realFileName); otbMsgDebugMacro( <<" Size : "<<m_Dimensions[0]<<","<<m_Dimensions[1]); otbMsgDebugMacro( <<" ComponentType : "<<this->GetComponentType() ); otbMsgDebugMacro( <<" NumberOfComponents : "<<this->GetNumberOfComponents()); diff --git a/Testing/Code/FeatureExtraction/CMakeLists.txt b/Testing/Code/FeatureExtraction/CMakeLists.txt index ff18ab61c4dc2de718d1e2947cd190c95339d0fc..12826b427b8893162fd97bf45f16b7a6fc785273 100755 --- a/Testing/Code/FeatureExtraction/CMakeLists.txt +++ b/Testing/Code/FeatureExtraction/CMakeLists.txt @@ -147,10 +147,12 @@ ADD_TEST(feTuLineRatioLinearDir ${FEATUREEXTRACTION_TESTS} ${TEMP}/feFiltreLineRatioLinear_amst_dir_2_3.hdr 2 3) -ADD_TEST(feTuLineRatioLinearAmsters1 ${FEATUREEXTRACTION_TESTS} +ADD_TEST(feTvLineRatioLinearAmsters1 ${FEATUREEXTRACTION_TESTS} + --compare-image ${TOL} ${BASELINE}/feFiltreLineRatioLinear_amst_ers1_ima_extrait.hdr + ${TEMP}/feFiltreLineRatioLinear_amst_ers1_ima_extrait.hdr otbLineRatioDetectorLinear - ${INPUTDATA}/amst_ers1.ima - ${TEMP}/feFiltreLineRatioLinear_amst_ers1_1_2.hdr + ${INPUTDATA}/amst_ers1.ima.extrait.419_187_70_66.hdr + ${TEMP}/feFiltreLineRatioLinear_amst_ers1_ima_extrait.hdr 1 2) ADD_TEST(feTuLineRatio ${FEATUREEXTRACTION_TESTS}