Commit 58d90445 authored by Julien Michel's avatar Julien Michel

Merge branch 'release-6.0' into develop

parents e7fbfb5a 7d8e959c
......@@ -210,7 +210,7 @@ private:
const int nbFeatures = GetSelectedItems("feat").size();
input->SetMeasurementVectorSize(nbFeatures);
otb::ogr::Layer::const_iterator it = layer.cbegin();
otb::ogr::Layer::const_iterator itEnd = layer.cend();
for( ; it!=itEnd ; ++it)
......@@ -219,7 +219,11 @@ private:
mv.SetSize(nbFeatures);
for(int idx=0; idx < nbFeatures; ++idx)
{
mv[idx] = (*it)[GetSelectedItems("feat")[idx]].GetValue<double>();
// Beware that itemIndex differs from ogr layer field index
unsigned int itemIndex = GetSelectedItems("feat")[idx];
std::string fieldName = GetChoiceNames( "feat" )[itemIndex];
mv[idx] = (*it)[fieldName].GetValue<double>();
}
input->PushBack(mv);
}
......
......@@ -51,8 +51,6 @@ if( CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX )
message(FATAL_ERROR "Impossible to compile libsiftfast. Contact OTB development team")
endif()
set(OTB_DISABLE_FAST_FUNCTIONS_VALUE 1)
else()
message(STATUS "Try to compile libsiftfast.cpp done.")
endif()
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment