Skip to content
Snippets Groups Projects
Commit 07c54f85 authored by Julien Malik's avatar Julien Malik
Browse files

MRG

parents 7d1aea34 619f7e9d
No related branches found
No related tags found
No related merge requests found
......@@ -165,7 +165,6 @@ PersistentMinMaxVectorImageFilter<TInputImage>
::Synthetize()
{
int i;
long count;
int numberOfThreads = this->GetNumberOfThreads();
unsigned int numberOfComponent = this->GetInput()->GetNumberOfComponentsPerPixel();
......
......@@ -90,7 +90,7 @@ public:
/** Set/Get the grid size*/
itkSetMacro(GridSize, SizeType);
itkGetMacro(GridSize, SizeType);
itkGetConstReferenceMacro(GridSize, SizeType);
/** Set/Get the DEM directory*/
itkSetStringMacro(DEMDirectory);
......
......@@ -91,7 +91,7 @@ SIXSTraits::ComputeAtmosphericParameters(
{
// 6S official tab size Wavelength Spectral
const unsigned int S_6S_SIZE = 1501;
const otb_6s_integer S_6S_SIZE = 1501;
// Generate WavelengthSpectralBand in 6S compatible buffer s[1501]
wlinf = static_cast<otb_6s_doublereal>(WavelengthSpectralBand->GetMinSpectralValue());
wlsup = static_cast<otb_6s_doublereal>(WavelengthSpectralBand->GetMaxSpectralValue());
......
......@@ -183,7 +183,7 @@ SarParametricMapFunction<TInputImage, TCoordRep>
if (m_IsInitialize == false )
{
itkExceptionMacro(<< "must estimate parameters before evaluating ");
itkExceptionMacro(<< "must estimate parameters before evaluating ");
}
if(m_UsingClosestPointMethod == false )
......@@ -199,16 +199,6 @@ SarParametricMapFunction<TInputImage, TCoordRep>
result += pointValue * vcl_pow(index[0],powerCoef[0]) * vcl_pow(index[1],powerCoef[1]);
}
}
else
{
bool isFound;
typename PointSetType::CoordRepType coord;
//isFound = this->GetPointSet()->FindClosestPoint(&coord, &pointId);
//this->GetPointSet()->GetPointData(pointId, &pointValue);
//result = pointValue;
}
return result;
}
......
......@@ -76,7 +76,7 @@ int otbOrthoRectificationFilter(int argc, char* argv[])
ImageType::SizeType size;
size[0] = atoi(argv[5]); // X size
size[1] = atoi(argv[6]); //Y size
orthoRectifFilter->SetSize(size);
orthoRectifFilter->SetOutputSize(size);
ImageType::SpacingType spacing;
spacing[0] = atof(argv[7]);
......
......@@ -51,9 +51,7 @@ int otbSarParametricMapFunctionToImageFilter(int argc, char * argv[])
function->SetInputImage(reader->GetOutput());
/** Test on some indexes and some physical coordinates*/
InputImageType::SizeType size;
FunctionType::PointType p0;
IndexType index;
PixelType value;
p0[0] = static_cast<unsigned int>(0);
......
......@@ -101,8 +101,6 @@ int getFloatString(int numFloats, const char *flts, float *tgts)
}
int classifyKNN2( int argc, char *argv[] ){
struct timeval start;
struct timeval end;
if( argc!= 6 ){
std::cerr << "Usage: " << std::endl;
std::cerr << argv[0] << " Prototypes Ch1ImageFile Ch2ImageFile OutputFile K" << std::endl;
......@@ -124,6 +122,8 @@ int classifyKNN2( int argc, char *argv[] ){
#ifdef WIN32
double startWin = GetTickCount()/1000.0f;
#else
struct timeval start;
struct timeval end;
gettimeofday(&start,NULL);
#endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment