[Olena-patches] oln-0.10 10.234: Fix geodesic dilation and erosion

2006-07-05 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Catch up with new naming conventions w.r.t. operators in geodesic dilation and erosion. * oln/morpho/geodesic_dilation.hh (oln::morpho::geodesic_dilation) * oln/morpho/geodesic_erosion.hh (oln::morpho::geodesic_erosion): Catch up with the new naming convention w.r.t. operators. Index: 10.233/olena/oln/morpho/geodesic_dilation.hh --- 10.233/olena/oln/morpho/geodesic_dilation.hh Wed, 14 Apr 2004 00:08:50 +0200 thivol_d (oln/37_geodesic_d 1.11.1.13 600) +++ 10.233(w)/olena/oln/morpho/geodesic_dilation.hh Wed, 05 Jul 2006 14:58:21 +0200 levill_r (oln/37_geodesic_d 1.11.1.13 600) @@ -94,9 +94,9 @@ mlc::eq<I1::dim, N::dim>::ensure(); precondition(marker.size() == mask.size()); precondition(level::is_greater_or_equal(mask, marker)); - return arith::min<oln_concrete_type(I1)>(dilation(marker, - convert::ng_to_cse(Ng)), - mask); + return arith::min_with_ret<oln_concrete_type(I1)> + (dilation(marker, convert::ng_to_cse(Ng)), + mask); } namespace sure { Index: 10.233/olena/oln/morpho/geodesic_erosion.hh --- 10.233/olena/oln/morpho/geodesic_erosion.hh Fri, 30 Jun 2006 17:17:34 +0200 levill_r (oln/36_geodesic_e 1.21 600) +++ 10.233(w)/olena/oln/morpho/geodesic_erosion.hh Wed, 05 Jul 2006 14:58:35 +0200 levill_r (oln/36_geodesic_e 1.21 600) @@ -92,7 +92,9 @@ mlc::eq<I1::dim, N::dim>::ensure(); precondition(marker.size() == mask.size()); precondition(level::is_greater_or_equal(marker, mask)); - return arith::max<oln_concrete_type(I1)>(erosion(marker, convert::ng_to_cse(Ng)), mask); + return arith::max_with_ret<oln_concrete_type(I1)> + (erosion(marker, convert::ng_to_cse(Ng)), + mask); } namespace sure {