https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud@lrde.epita.fr> Fix missing update from 'raw' to 'dump'. * theo/igr/raw2pgm.cc: Rename as... * theo/igr/dump2pgm.cc: ...this. (include, usage): Fix missing update. * theo/igr/pgms2raw.cc: Rename as... * theo/igr/pgms2dump.cc: ...this. (usage): Fix missing update. (main): Fix io save. * theo/igr/irm_anat_segm.cc: Update. * theo/igr/irm_anat_segm__2D_ONLY.cc: Update. * theo/irm.cc: Rename as... * theo/igr/irm_seg_with_mm_and_rag.cc: ...this. dump2pgm.cc | 4 ++-- irm_anat_segm.cc | 15 ++++++++++----- irm_anat_segm__2D_ONLY.cc | 2 -- pgms2dump.cc | 6 +++--- 4 files changed, 15 insertions(+), 12 deletions(-) Index: theo/igr/dump2pgm.cc --- theo/igr/dump2pgm.cc (revision 3314) +++ theo/igr/dump2pgm.cc (working copy) @@ -4,14 +4,14 @@ #include <mln/debug/slices_2d.hh> #include <mln/value/int_u8.hh> -#include <mln/io/raw/load.hh> +#include <mln/io/dump/load.hh> #include <mln/io/pgm/save.hh> void usage(char* argv[]) { - std::cerr << "usage: " << argv[0] << " input.raw output.pgm" << std::endl; + std::cerr << "usage: " << argv[0] << " input.dump output.pgm" << std::endl; abort(); } Index: theo/igr/pgms2dump.cc --- theo/igr/pgms2dump.cc (revision 3314) +++ theo/igr/pgms2dump.cc (working copy) @@ -4,13 +4,13 @@ #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> -#include <mln/io/raw/save.hh> +#include <mln/io/dump/save.hh> void usage(char* argv[]) { - std::cerr << "usage: " << argv[0] << " output.raw input1.pgm .. inputn.pgm" << std::endl; + std::cerr << "usage: " << argv[0] << " output.dump input1.pgm .. inputn.pgm" << std::endl; abort(); } @@ -34,5 +34,5 @@ arr.append(ima); } image3d<int_u8> vol = make::image3d(arr); - io::save(vol, argv[1]); + io::dump::save(vol, argv[1]); } Index: theo/igr/irm_anat_segm.cc --- theo/igr/irm_anat_segm.cc (revision 3314) +++ theo/igr/irm_anat_segm.cc (working copy) @@ -3,12 +3,12 @@ #include <mln/core/alias/neighb3d.hh> #include <mln/value/int_u8.hh> -#include <mln/io/raw/load.hh> -#include <mln/io/raw/save.hh> +#include <mln/io/dump/load.hh> +#include <mln/io/dump/save.hh> #include <mln/morpho/elementary/gradient.hh> #include <mln/morpho/closing_volume.hh> -#include <mln/morpho/meyer_wst.hh> +#include <mln/morpho/watershed/flooding.hh> #include <mln/accu/mean.hh> #include <mln/labeling/compute.hh> @@ -19,7 +19,7 @@ void usage(char* argv[]) { - std::cerr << "usage: " << argv[0] << " input.raw output.raw" << std::endl; + std::cerr << "usage: " << argv[0] << " input.dump output.dump" << std::endl; abort(); } @@ -35,6 +35,8 @@ trace::quiet = false; + trace::entering("main"); + image3d<int_u8> vol, grad, clo; io::dump::load(vol, argv[1]); @@ -43,7 +45,7 @@ typedef value::label_16 L; L n_basins; - image3d<L> wst = morpho::meyer_wst(clo, c6(), n_basins); + image3d<L> wst = morpho::watershed::flooding(clo, c6(), n_basins); std::cout << n_basins << std::endl; @@ -59,4 +61,7 @@ image3d<int_u8> out = level::transform(wst, f); io::dump::save(out, argv[2]); + + + trace::exiting("main"); } Index: theo/igr/irm_anat_segm__2D_ONLY.cc --- theo/igr/irm_anat_segm__2D_ONLY.cc (revision 3314) +++ theo/igr/irm_anat_segm__2D_ONLY.cc (working copy) @@ -32,8 +32,6 @@ if (argc != 3) usage(argv); - trace::quiet = false; - image2d<int_u8> vol, grad, clo; io::pgm::load(vol, argv[1]);