https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet@lrde.epita.fr> Fix registration genericity. * mln/registration/multiscale.hh: Replace point2d by I::psite. * mln/registration/registration.hh: Replace point2d by I::psite. multiscale.hh | 8 ++++---- registration.hh | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) Index: mln/registration/multiscale.hh --- mln/registration/multiscale.hh (revision 2538) +++ mln/registration/multiscale.hh (working copy) @@ -54,8 +54,8 @@ template <typename I, typename J> inline composed< rotation<I::site::dim, float>, translation<I::site::dim, float> > - multiscale_(const Image<I>& cloud, - const Image<J>& surface, + multiscale_(const I& cloud, + const J& surface, const float q, const unsigned nb_it) { @@ -66,7 +66,7 @@ shuffle(c); //working box - const box<point2d> working_box = + const box<mln_psite(I)> working_box = enlarge(bigger(geom::bbox(c), geom::bbox(x)), 100); //make a lazy_image map via function closest_point @@ -102,7 +102,7 @@ mln_precondition(I::site::dim == 3 || I::site::dim == 2); composed< rotation<I::site::dim, float>, translation<I::site::dim, float> > - qk = impl::multiscale_(cloud, surface, q, nb_it); + qk = impl::multiscale_(exact(cloud), exact(surface), q, nb_it); trace::exiting("registration::registration"); Index: mln/registration/registration.hh --- mln/registration/registration.hh (revision 2538) +++ mln/registration/registration.hh (working copy) @@ -63,8 +63,8 @@ template <typename I, typename J> inline composed< rotation<I::psite::dim, float>, translation<I::psite::dim, float> > - registration_(const Image<I>& cloud, - const Image<J>& surface) + registration_(const I& cloud, + const J& surface) { p_array<mln_psite(I)> c = convert::to< p_array<mln_psite(I)> >(cloud); p_array<mln_psite(J)> x = convert::to< p_array<mln_psite(I)> >(surface); @@ -73,7 +73,7 @@ composed< rotation<I::P::dim, float>, translation<I::P::dim, float> > qk; //working box - const box<point2d> working_box = + const box<mln_psite(I)> working_box = enlarge(bigger(geom::bbox(c), geom::bbox(x)), 100); //make a lazy_image map via function closest_point @@ -101,7 +101,7 @@ mln_precondition(I::psite::dim == 3 || J::psite::dim == 2); composed< rotation<I::psite::dim, float>, translation<I::psite::dim, float> > - qk = impl::registration_(cloud, surface); + qk = impl::registration_(exact(cloud), exact(surface)); trace::exiting("registration::registration");