Skip to content
Snippets Groups Projects
Commit c9568cde authored by Julien Michel's avatar Julien Michel
Browse files

MRG

parents a04e67c1 5727b174
No related branches found
No related tags found
No related merge requests found
......@@ -70,6 +70,7 @@ WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, FORWARD >
if ( GetSubsampleImageFactor() == 1 )
return;
#if __myDebug__
otbGenericMsgDebugMacro( << " down sampling output regions by a factor of " << GetSubsampleImageFactor() );
otbGenericMsgDebugMacro( << "initial region " << this->GetInput()->GetLargestPossibleRegion().GetSize()[0]
......@@ -639,8 +640,6 @@ WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, INVERSE >
}
}
if ( GetSubsampleImageFactor() == 1 )
return;
#if __myDebug__
otbGenericMsgDebugMacro( << " up sampling output regions by a factor of " << GetSubsampleImageFactor() );
......
......@@ -132,9 +132,6 @@ void
WaveletPacketTransform< TInputImage, TOutputImage, TFilter, INVERSE, FullyDecomposedWaveletPacketCost< TInputImage > >
::GenerateOutputInformation ()
{
if ( GetSubsampleImageFactor() == 1 )
Superclass::GenerateOutputInformation();
if ( m_NumberOfFilters == 0 )
InterpretRule();
......
......@@ -9,7 +9,7 @@ The OTB Development Team.
***Notes for those who do not read the doc***
**Notes for those who do not read the doc***
We assume that you will install everything on a directory called
INSTALL_DIR, which usually is /usr/local, /home/jordi/local or
......
......@@ -800,7 +800,7 @@ BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
w *= (weights)[n][indx];
coefficientIndex[n] = (evaluateIndex)[n][indx];
}
interpolated += w * m_Coefficients->GetPixel(coefficientIndex);
interpolated += w * static_cast<TCoefficientType>(m_Coefficients->GetPixel(coefficientIndex));
}
return(interpolated);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment