https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet@lrde.epita.fr> Update INIM. * jardonnet/virtual/access.cc: Update. * inim/classif/src/iccvg04.cc: Fix signature. * inim/classif/src/proj.hh: Fix include. * inim/classif/src/v2.cc: Fix include. * inim/classif/Makefile: Make all. inim/classif/Makefile | 1 + inim/classif/src/iccvg04.cc | 5 ++--- inim/classif/src/proj.hh | 2 +- inim/classif/src/v2.cc | 3 +-- jardonnet/virtual/access.cc | 6 +----- 5 files changed, 6 insertions(+), 11 deletions(-) Index: jardonnet/virtual/access.cc --- jardonnet/virtual/access.cc (revision 3176) +++ jardonnet/virtual/access.cc (working copy) @@ -84,13 +84,9 @@ mln_VAR(rt, compose(r,t)); mln_VAR(tr_ima, transposed_image(interp.domain(), interp, rt)); - // data::fill(output, tr_ima); - - - //border::adjust(interp, 20); - //test1<interpolation::bilinear>(input, output, compose(r,t)); test2(interp, output, compose(r,t)); //test3(tr_ima, output); + mln::io::ppm::save(output,"./out.ppm"); } Index: inim/classif/src/iccvg04.cc --- inim/classif/src/iccvg04.cc (revision 3176) +++ inim/classif/src/iccvg04.cc (working copy) @@ -2,7 +2,6 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/histo/data.hh> #include <mln/value/all.hh> #include <mln/data/fill.hh> @@ -158,8 +157,8 @@ image3d<unsigned> histo = fill_histo(ima,div_factor); //compute opening_volume of histo - image3d<unsigned> histo_filtered(histo.domain()); - morpho::opening_volume(histo, c6(), lambda, histo_filtered); + image3d<unsigned> histo_filtered; + histo_filtered = morpho::opening_volume(histo, c6(), lambda); //watershed over histo_closure unsigned nbasins = 0; Index: inim/classif/src/proj.hh --- inim/classif/src/proj.hh (revision 3176) +++ inim/classif/src/proj.hh (working copy) @@ -35,7 +35,7 @@ #include <mln/accu/maj_h.hh> #include <mln/literal/white.hh> #include <mln/literal/colors.hh> -#include <mln/make/vec.hh +#include <mln/make/vec.hh> #include <mln/opt/at.hh> namespace mln Index: inim/classif/src/v2.cc --- inim/classif/src/v2.cc (revision 3176) +++ inim/classif/src/v2.cc (working copy) @@ -1,6 +1,5 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/histo/data.hh> #include <mln/value/all.hh> @@ -65,7 +64,7 @@ // FIXME: write a compute() method with functor argument image3d<unsigned> nb_represent = run.compute_nb_represent(); - image3d<unsigned> volume = run.compute_volume(); + image3d<unsigned> volume = run.compute_volume(); // surface (area) image3d< algebra::vec<3, double> > mean_color = run.compute_mean_color(); image3d<double> density = compute_density(nb_represent, volume); Index: inim/classif/Makefile --- inim/classif/Makefile (revision 3176) +++ inim/classif/Makefile (working copy) @@ -19,6 +19,7 @@ LOG=> stdout.log 2> stderr.log +all: $(ICCVG) $(V2) $(ICCVG): $(ICCVG_SRC) g++ $(ICCVG_INCLUDES) -O1 -DNDEBUG $(ICCVG_SRC) -o $(ICCVG) Index: theo/tufa_2008/filter_n.cc