Commit cfaed02a1e7fba23c4f85b81d8bd330288feecf7

Authored by Pierre Lassalle
2 parents 49366a84 46b42b66
Exists in master

Add the GRM Remote Module

Showing 2 changed files with 13 additions and 0 deletions   Show diff stats
src/grmBaatzSegmenter.txx
... ... @@ -24,6 +24,14 @@ namespace grm
24 24 {
25 25  
26 26 template<class TImage>
  27 +<<<<<<< HEAD:src/grmBaatzSegmenter.txx
  28 +=======
  29 + BaatzSegmenter<TImage>::BaatzSegmenter() : Superclass()
  30 + {
  31 + }
  32 +
  33 + template<class TImage>
  34 +>>>>>>> 46b42b66e5053b4108f0c7d195ca8c2fec976f9a:Code/lsrmBaatzSegmenter.txx
27 35 void
28 36 BaatzSegmenter<TImage>::InitFromImage()
29 37 {
... ...
src/grmSegmenter.h
... ... @@ -45,9 +45,14 @@ namespace grm
45 45 /* Default constructor and destructor */
46 46  
47 47 Segmenter(){
  48 +<<<<<<< HEAD:src/grmSegmenter.h
48 49 this->m_DoFastSegmentation = false;
49 50 this->m_NumberOfIterations = 0;
50 51 this->m_Complete = false;
  52 +=======
  53 + this->m_DoBFSegmentation = true;
  54 + this->m_NumberOfIterations = 75;
  55 +>>>>>>> 46b42b66e5053b4108f0c7d195ca8c2fec976f9a:Code/lsrmSegmenter.h
51 56 };
52 57 ~Segmenter(){};
53 58  
... ...