diff --git a/src/grmBaatzSegmenter.txx b/src/grmBaatzSegmenter.txx index 9fb6c3c5fc5aaaf2641c8c027dcbf59702665dd8..2aadaf8930bdb8248747f362be87302599477b56 100644 --- a/src/grmBaatzSegmenter.txx +++ b/src/grmBaatzSegmenter.txx @@ -24,6 +24,14 @@ namespace grm { template<class TImage> +<<<<<<< HEAD:src/grmBaatzSegmenter.txx +======= + BaatzSegmenter<TImage>::BaatzSegmenter() : Superclass() + { + } + + template<class TImage> +>>>>>>> 46b42b66e5053b4108f0c7d195ca8c2fec976f9a:Code/lsrmBaatzSegmenter.txx void BaatzSegmenter<TImage>::InitFromImage() { diff --git a/src/grmSegmenter.h b/src/grmSegmenter.h index 088584ee07393e66ce3fe402f08e2260a1231af0..72dd2ed0b5219844f6cf3882a994b12b3fceda98 100644 --- a/src/grmSegmenter.h +++ b/src/grmSegmenter.h @@ -45,9 +45,14 @@ namespace grm /* Default constructor and destructor */ Segmenter(){ +<<<<<<< HEAD:src/grmSegmenter.h this->m_DoFastSegmentation = false; this->m_NumberOfIterations = 0; this->m_Complete = false; +======= + this->m_DoBFSegmentation = true; + this->m_NumberOfIterations = 75; +>>>>>>> 46b42b66e5053b4108f0c7d195ca8c2fec976f9a:Code/lsrmSegmenter.h }; ~Segmenter(){};