From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Tue, 2 Oct 2012 06:55:06 +0000 (+0000)
Subject: Bug #1611
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ec11a783e7b5477f1d93886a6336255cd7cbecf3;p=creaContours.git

Bug #1611
Conflict with ITK 3.20.1 GeodesicActiveContourLevelSetImageFilter
---

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index ab009b9..a45ddd8 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -1518,7 +1518,7 @@ void wxContourMainFrame::SegmentationOneSliceITK(int x, int y, int z, wxString d
 	
 printf("EED wxContourMainFrame::SegmentationOneSliceITK  Skypping this code.  Not compiling   GeodesicActiveContourLevelSetImageFilter     in fedora 17 with ITK 3.20.1 \n ");
 /*EED 17 sept 2010
- >>>>>>>>>>>  Not compiling   GeodesicActiveContourLevelSetImageFilter     in fedora 17 with ITK 3.20.1
+ > - > - > - > - > - > - > - > - > - > - > - > - > - > - > - > -   Not compiling   GeodesicActiveContourLevelSetImageFilter     in fedora 17 with ITK 3.20.1
  
  
 	typedef  itk::GeodesicActiveContourLevelSetImageFilter< InternalImageType,
@@ -1554,7 +1554,7 @@ printf("EED wxContourMainFrame::SegmentationOneSliceITK  Skypping this code.  No
 	thresholder->SetInput( geodesicActiveContour->GetOutput() );
 	connector2->SetInput( thresholder->GetOutput()  );
  
-<<<<<<<<<<<<<<<<<<<
+< - < - < - < - < - < - < - < - < - < - < - < - < - < - < - < - < - < - < - < - 
 */