From: David Sarrut <david.sarrut@gmail.com>
Date: Mon, 5 Dec 2011 09:14:45 +0000 (+0100)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.3.0~104^2~21
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=7bf9a4e01ea80f06257ece374f291abb513c09fc;p=clitk.git

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

7bf9a4e01ea80f06257ece374f291abb513c09fc
diff --cc itk/clitkRelativePositionAnalyzerFilter.txx
index 54ed932,df12ea3..63af119
--- a/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 segmentation/clitkExtractLymphStation_Supports.txx
index 952c08e,a022392..f480d84
--- a/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]);