[Olena-patches] last-svn-commit-870-g2ec107a Fix use of skeleton_constrained.

* scribo/estim/components_features.hh, * scribo/estim/internal/compute_skeleton.hh: Here. --- scribo/ChangeLog | 7 +++++++ scribo/scribo/estim/components_features.hh | 4 ++-- scribo/scribo/estim/internal/compute_skeleton.hh | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index fedc5ec..0b6042c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2011-05-17 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Fix use of skeleton_constrained. + + * scribo/estim/components_features.hh, + * scribo/estim/internal/compute_skeleton.hh: Here. + 2011-05-12 Guillaume Lazzara &lt;lazzara(a)fidji.lrde.epita.fr&gt; Update support for PAGE XML format. diff --git a/scribo/scribo/estim/components_features.hh b/scribo/scribo/estim/components_features.hh index ee34123..2f3b691 100644 --- a/scribo/scribo/estim/components_features.hh +++ b/scribo/scribo/estim/components_features.hh @@ -124,8 +124,8 @@ namespace scribo skel = morpho::skeleton_constrained(bin_input, c8(), - topo::skeleton::is_simple_point<B,neighb2d>, - extend(K, false), dist_map); + topo::skeleton::is_simple_point<neighb2d>(c8()), + K, dist_map); t.stop(); std::cout << "Skeleton constrained " << t << std::endl; diff --git a/scribo/scribo/estim/internal/compute_skeleton.hh b/scribo/scribo/estim/internal/compute_skeleton.hh index 52ecf01..cc2297d 100644 --- a/scribo/scribo/estim/internal/compute_skeleton.hh +++ b/scribo/scribo/estim/internal/compute_skeleton.hh @@ -94,8 +94,8 @@ namespace scribo mln_concrete(I) skel = morpho::skeleton_constrained(input, c8(), - topo::skeleton::is_simple_point<I,neighb2d>, - extend(K, false), dist_map); + topo::skeleton::is_simple_point<neighb2d>(c8()), + K, dist_map); trace::exiting("scribo::estim::internal::compute_skeleton"); return skel; -- 1.5.6.5