Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

diff --cc itk/clitkRelativePositionAnalyzerFilter.txx
index 54ed9320c4b7eaebeeed4c671a49b66ce7cf7371,df12ea33437c42975282662ad74015745d625041..63af1191987386dfac0b632f0af23559ef967e10
--- 1/itk/clitkRelativePositionAnalyzerFilter.txx
--- 2/itk/clitkRelativePositionAnalyzerFilter.txx
+++ b/itk/clitkRelativePositionAnalyzerFilter.txx
@@@ -101,11 -101,9 +101,9 @@@ voi
  clitk::RelativePositionAnalyzerFilter<ImageType>::
  GenerateData() 
  {
-   static const unsigned int dim = ImageType::ImageDimension;
-   
    ImagePointer temp = dynamic_cast<ImageType*>(itk::ProcessObject::GetInput(0));
    m_Object = dynamic_cast<ImageType*>(itk::ProcessObject::GetInput(1));
 -  m_Target = dynamic_cast<ImageType*>(itk::ProcessObject::GetInput(2));
 +  ImagePointer temp2 = dynamic_cast<ImageType*>(itk::ProcessObject::GetInput(2));
  
    // Remove object from support (keep initial image)
    m_Support = clitk::Clone<ImageType>(temp);

diff --cc itk/clitkSegmentationUtils.txx
Simple merge

diff --cc segmentation/clitkExtractLymphStation_Supports.txx
index 952c08e57a0d21edba5d1caeadf6c1fecefe760a,a022392653df59bb5a3511295067980c43db274c..f480d842b2990cc3c16156b2500b5add84281ed7
--- 1/segmentation/clitkExtractLymphStation_Supports.txx
--- 2/segmentation/clitkExtractLymphStation_Supports.txx
+++ b/segmentation/clitkExtractLymphStation_Supports.txx
@@@ -19,9 -19,21 +19,9 @@@ ExtractStationSupports(
    Support_SI_Limit("inferior", "Sup_to_Carina", "inferior", "Carina", 0); 
    Support_SI_Limit("superior", "Inf_to_Carina", "inferior", "Carina", m_Working_Support->GetSpacing()[2]); 
  
 -  // Initialise all others supports
 -  // m_ListOfSupports["S1R"] = m_ListOfSupports["Sup_to_Carina"];
 -  // m_ListOfSupports["S1L"] = m_ListOfSupports["Sup_to_Carina"];
 -  // m_ListOfSupports["S2R"] = m_ListOfSupports["Sup_to_Carina"];
 -  // m_ListOfSupports["S2L"] = m_ListOfSupports["Sup_to_Carina"];
 -  // m_ListOfSupports["S3A"] = m_ListOfSupports["Sup_to_Carina"];
 -  // m_ListOfSupports["S3P"] = m_ListOfSupports["Sup_to_Carina"];
 -  // m_ListOfSupports["S4R"] = m_ListOfSupports["Sup_to_Carina"];
 -  // m_ListOfSupports["S4L"] = m_ListOfSupports["Sup_to_Carina"];
 -  // m_ListOfSupports["S5"] = m_Mediastinum; // Not above Carina
 -  // m_ListOfSupports["S6"] = m_Mediastinum; // Not above Carina
 -  
    // Read all support limits in a file and apply them
    ReadSupportLimits(GetSupportLimitsFilename());  
-   for(int i=0; i<m_ListOfSupportLimits.size(); i++) {
+   for(unsigned int i=0; i<m_ListOfSupportLimits.size(); i++) {
      SupportLimitsType s = m_ListOfSupportLimits[i];
      Support_SI_Limit(s.station_limit, s.station, s.structure_limit, 
                       s.structure, s.offset*m_Working_Support->GetSpacing()[2]);

diff --cc segmentation/clitkExtractLymphStationsFilter.txx
Simple merge

diff --cc segmentation/clitkRelativePositionList.txx
Simple merge