[Olena-patches] 4636: Some fixes.

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud &lt;thierry.geraud(a)lrde.epita.fr&gt; Some fixes. * mln/data/transform.spe.hh: Layout. * mln/data/transform_inplace.hh (transform_tests): Rename as... (transform_inplace_tests): ...this; it is a naming bug fix. * mln/convert/to.hh: Remove trace and add a tech note about it. convert/to.hh | 6 ++++-- data/transform.spe.hh | 1 - data/transform_inplace.hh | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 13 deletions(-) Index: mln/data/transform.spe.hh --- mln/data/transform.spe.hh (revision 4635) +++ mln/data/transform.spe.hh (working copy) @@ -233,7 +233,6 @@ { trace::entering("data::impl::transform_fast"); - const I& input = exact(input_); const F& f = exact(f_); data::internal::transform_tests(input, f); Index: mln/data/transform_inplace.hh --- mln/data/transform_inplace.hh (revision 4635) +++ mln/data/transform_inplace.hh (working copy) @@ -106,9 +106,9 @@ template <typename I1, typename I2, typename F> inline - void transform_tests(const Image<I1>& ima, + void transform_inplace_tests(Image<I1>& ima, const Image<I2>& aux, - const Function_v2v<F>& f) + const Function_vv2v<F>& f) { // Properties checks. mlc_or(mlc_is(mln_trait_image_pw_io(I1), @@ -156,7 +156,7 @@ I& ima = exact(ima_); const F& f = exact(f_); - data::internal::transform_inplace_tests(ima, f); + internal::transform_inplace_tests(ima, f); mln_piter(I) p(ima.domain()); for_all(p) @@ -185,7 +185,7 @@ const I2& aux = exact(aux_); const F& f = exact(f_); - data::internal::transform_inplace_tests(ima, aux, f); + internal::transform_inplace_tests(ima, aux, f); mln_piter(I1) p(ima.domain()); for_all(p) @@ -211,7 +211,7 @@ I& input = exact(input_); const F& f = exact(f_); - data::internal::transform_inplace_tests(input, f); + internal::transform_inplace_tests(input, f); value::lut_vec<mln_vset(I), mln_result(F)> lut(input.values_eligible(), f); @@ -236,7 +236,7 @@ I& input = exact(input_); const F& f = exact(f_); - data::internal::transform_inplace_tests(input, f); + internal::transform_inplace_tests(input, f); value::lut_vec<mln_vset(I), mln_result(F)> lut(input.taken_values(), f); @@ -259,7 +259,7 @@ I& input = exact(input_); const F& f = exact(f_); - data::internal::transform_inplace_tests(input, f); + internal::transform_inplace_tests(input, f); opt::value(input) = f(opt::value(input)); @@ -275,7 +275,7 @@ I& ima = exact(ima_); const F& f = exact(f_); - data::internal::transform_inplace_tests(ima, f); + internal::transform_inplace_tests(ima, f); mln_pixter(I) p(ima); for_all(p) @@ -295,7 +295,7 @@ I& input = exact(input_); const F& f = exact(f_); - data::internal::transform_inplace_tests(input, f); + internal::transform_inplace_tests(input, f); value::lut_vec<mln_vset(I), mln_result(F)> lut(input.values_eligible(), f); @@ -322,7 +322,7 @@ const I2& aux = exact(aux_); const F& f = exact(f_); - data::internal::transform_inplace_tests(ima, aux, f); + internal::transform_inplace_tests(ima, aux, f); mln_pixter(I1) pi(ima); mln_pixter(const I2) pa(aux); Index: mln/convert/to.hh --- mln/convert/to.hh (revision 4635) +++ mln/convert/to.hh (working copy) @@ -62,14 +62,16 @@ T to(const O& from) { + // Technical note: + // No trace should be produced by this routine since it can be + // applied on large sets of data. + mlc_equal(T, mln_exact(T))::check(); mlc_equal(O, mln_exact(O))::check(); - trace::entering("convert::to"); T tmp; from_to(from, tmp); - trace::exiting("convert::to"); return tmp; }