[Olena-patches] olena: olena-2.0-763-gd05185f Catch up with the current interface of mln::image3d.

* apps/generic-skel/image3d-skel-unconstrained.cc, * apps/generic-skel/image3d-skel.hh: Here. --- milena/ChangeLog | 8 ++++++++ milena/apps/generic-skel/image3d-skel-unconstrained.cc | 7 ++++--- milena/apps/generic-skel/image3d-skel.hh | 8 ++++---- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8f33654..ba5cf63 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2013-08-29 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Catch up with the current interface of mln::image3d. + + * apps/generic-skel/image3d-skel-unconstrained.cc, + * apps/generic-skel/image3d-skel.hh: + Here. + +2013-08-29 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Replace meyer_wst with watershed::flooding. * apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc: Here. diff --git a/milena/apps/generic-skel/image3d-skel-unconstrained.cc b/milena/apps/generic-skel/image3d-skel-unconstrained.cc index 986782f..1f94e9f 100644 --- a/milena/apps/generic-skel/image3d-skel-unconstrained.cc +++ b/milena/apps/generic-skel/image3d-skel-unconstrained.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2011-2012 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2012, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -75,8 +76,8 @@ int main() // criterion. I input = make_triple_torus(20); std::cout - << input.nslices() << " x " << input.nrows() << " x " << input.ncols() - << " = " << input.nslices() * input.nrows() * input.ncols() << " voxels" + << input.nslis() << " x " << input.nrows() << " x " << input.ncols() + << " = " << input.nslis() * input.nrows() * input.ncols() << " voxels" << std::endl; std::cerr << input.domain() << std::endl; diff --git a/milena/apps/generic-skel/image3d-skel.hh b/milena/apps/generic-skel/image3d-skel.hh index 2db9a5a..7b40833 100644 --- a/milena/apps/generic-skel/image3d-skel.hh +++ b/milena/apps/generic-skel/image3d-skel.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -286,9 +286,9 @@ subsampling_3d(const mln::image3d<bool>& input, unsigned factor) /* This subsampling procedure may not take into account pixels at the end of each sloce/row/column if the corresponding dimension is not a multiple of FACTOR. */ - I output(input.nslices() / factor, - input.nrows() / factor, - input.ncols() / factor); + I output(input.nslis() / factor, + input.nrows() / factor, + input.ncols() / factor); mln_piter_(I) po(output.domain()); for_all(po) { -- 1.7.10.4