[Olena-patches] 3151: Uses opt::value instead .val() method in low level routines.

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Nicolas Ballas &lt;ballas(a)lrde.epita.fr&gt; Uses opt::value instead .val() method in low level routines. * mln/level/transform.spe.hh, * mln/level/transform_inplace.hh, * mln/data/paste.spe.hh, * mln/data/fill_with_value.spe.hh, * mln/data/fill_with_image.spe.hh: Update. data/fill_with_image.spe.hh | 3 ++- data/fill_with_value.spe.hh | 3 ++- data/paste.spe.hh | 4 +++- level/transform.spe.hh | 3 ++- level/transform_inplace.hh | 3 ++- 5 files changed, 11 insertions(+), 5 deletions(-) Index: mln/level/transform.spe.hh --- mln/level/transform.spe.hh (revision 3150) +++ mln/level/transform.spe.hh (working copy) @@ -44,6 +44,7 @@ # include <mln/value/set.hh> # include <mln/value/lut_vec.hh> +# include <mln/opt/value.hh> @@ -214,7 +215,7 @@ mln_ch_value(I, mln_result(F)) output; initialize(output, input); - mln_result(F) val = f(input.val()); + mln_result(F) val = f(opt::value(input)); data::fill_with_value(output, val); trace::exiting("level::impl::transform_singleton"); Index: mln/level/transform_inplace.hh --- mln/level/transform_inplace.hh (revision 3150) +++ mln/level/transform_inplace.hh (working copy) @@ -38,6 +38,7 @@ # include <mln/core/concept/function.hh> # include <mln/value/set.hh> # include <mln/value/lut_vec.hh> +# include <mln/opt/value.hh> namespace mln @@ -251,7 +252,7 @@ level::internal::transform_inplace_tests(input, f); - input.val() = f(input.val()); + opt::value(input) = f(opt::value(input)); trace::exiting("level::impl::transform_inplace_singleton"); } Index: mln/data/paste.spe.hh --- mln/data/paste.spe.hh (revision 3150) +++ mln/data/paste.spe.hh (working copy) @@ -42,6 +42,7 @@ # include <mln/data/memcpy_.hh> # include <mln/core/box_runstart_piter.hh> # include <mln/border/get.hh> +# include <mln/opt/value.hh> @@ -143,7 +144,8 @@ const I& input = exact(input_); - data::fill_with_value((output_ | input.domain()).rw(), input.val()); + data::fill_with_value((output_ | input.domain()).rw(), + opt::value(input)); trace::exiting("data::impl::paste_singleton"); } Index: mln/data/fill_with_value.spe.hh --- mln/data/fill_with_value.spe.hh (revision 3150) +++ mln/data/fill_with_value.spe.hh (working copy) @@ -37,6 +37,7 @@ # endif // ! MLN_DATA_FILL_WITH_VALUE_HH # include <mln/data/memset_.hh> +# include <mln/opt/value.hh> # ifndef MLN_INCLUDE_ONLY @@ -124,7 +125,7 @@ mlc_is(mln_trait_image_vw_io(I), trait::image::vw_io::read_write))::check(); - ima.val() = static_cast<mln_value(I)>(val); + opt::value(ima) = static_cast<mln_value(I)>(val); trace::exiting("data::impl::fill_with_value_singleton"); } Index: mln/data/fill_with_image.spe.hh --- mln/data/fill_with_image.spe.hh (revision 3150) +++ mln/data/fill_with_image.spe.hh (working copy) @@ -43,6 +43,7 @@ # include <mln/core/pixel.hh> # include <mln/core/box_runstart_piter.hh> # include <mln/border/get.hh> +# include <mln/opt/value.hh> # ifndef MLN_INCLUDE_ONLY @@ -145,7 +146,7 @@ const J& data = exact(data_); data::internal::fill_with_image_tests(ima_, data); - data::fill_with_value(ima_, data.val()); + data::fill_with_value(ima_, opt::value(data)); trace::exiting("data::impl::fill_with_image_singleton"); }