diff --git a/Code/FeatureExtraction/otbScalarImageToAdvancedTexturesFilter.txx b/Code/FeatureExtraction/otbScalarImageToAdvancedTexturesFilter.txx index 0ee25281bb6b7827055a1a322858aa858247b582..6035d734c95ad38f83bd41faea3b9d58b323ebd0 100644 --- a/Code/FeatureExtraction/otbScalarImageToAdvancedTexturesFilter.txx +++ b/Code/FeatureExtraction/otbScalarImageToAdvancedTexturesFilter.txx @@ -33,10 +33,10 @@ ScalarImageToAdvancedTexturesFilter<TInputImage, TOutputImage> ::ScalarImageToAdvancedTexturesFilter() : m_Radius() , m_Offset() -, m_HistSize(2) , m_NumberOfBinsPerAxis(8) , m_InputImageMinimum(0) , m_InputImageMaximum(255) +, m_HistSize(2) { // There are 10 outputs corresponding to the 9 textures indices this->SetNumberOfRequiredOutputs(10); @@ -519,14 +519,14 @@ ScalarImageToAdvancedTexturesFilter<TInputImage, TOutputImage> * to compute hxy1. This need to force an iterator over entire histogram. Processing time is propotional to the histogram bin size */ double hxy2 = 0; - for(int i = 0; i < histSize0; ++i) + for(unsigned int i = 0; i < histSize0; ++i) { - for(int j = 0; j < histSize1; ++j) + for(unsigned int j = 0; j < histSize1; ++j) { double pipj = hx[j] * hy[i]; hxy2 -= (pipj > 0.0001) ? pipj * vcl_log(pipj) : 0.; double frequency = m_GLCIList->GetFrequency(i,j, glcList); - m_Dissimilarity+= ( j - i ) * (frequency * frequency); + m_Dissimilarity+= ( static_cast<double>(j) - static_cast<double>(i) ) * (frequency * frequency); } } diff --git a/Code/FeatureExtraction/otbScalarImageToPanTexTextureFilter.txx b/Code/FeatureExtraction/otbScalarImageToPanTexTextureFilter.txx index b3515e841e2ce86e4e905335e7c236128038425d..42cfa9abf553ec8787fde954e38291b4eb05edcb 100644 --- a/Code/FeatureExtraction/otbScalarImageToPanTexTextureFilter.txx +++ b/Code/FeatureExtraction/otbScalarImageToPanTexTextureFilter.txx @@ -31,9 +31,9 @@ template <class TInputImage, class TOutputImage> ScalarImageToPanTexTextureFilter<TInputImage, TOutputImage> ::ScalarImageToPanTexTextureFilter() : m_Radius(), m_NumberOfBinsPerAxis(8), - m_HistSize(2), m_InputImageMinimum(0), - m_InputImageMaximum(255) + m_InputImageMaximum(255), + m_HistSize(2) { // There are 1 output corresponding to the Pan Tex texture indice this->SetNumberOfRequiredOutputs(1); diff --git a/Code/FeatureExtraction/otbScalarImageToTexturesFilter.txx b/Code/FeatureExtraction/otbScalarImageToTexturesFilter.txx index 77811e6ad84810cbc5600ef8764f44f32e538d4f..b0c4db36462d306041383a5515e6c5399442af2b 100644 --- a/Code/FeatureExtraction/otbScalarImageToTexturesFilter.txx +++ b/Code/FeatureExtraction/otbScalarImageToTexturesFilter.txx @@ -33,10 +33,10 @@ ScalarImageToTexturesFilter<TInputImage, TOutputImage> ::ScalarImageToTexturesFilter() : m_Radius() , m_Offset() -, m_HistSize(2) , m_NumberOfBinsPerAxis(8) , m_InputImageMinimum(0) , m_InputImageMaximum(255) +, m_HistSize(2) { // There are 8 outputs corresponding to the 8 textures indices this->SetNumberOfRequiredOutputs(8);