https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Ugo Jardonnet <jardonnet@lrde.epita.fr> INIM: Move classif work in the inim directory. * classif: Move ... * inim/classif: ... Here. * inim/classif/Makefile: Update relative include directory. * inim/classif/proj.hh: Trailing update. Makefile | 6 +++--- proj.hh | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) Index: inim/classif/proj.hh --- inim/classif/proj.hh (revision 2777) +++ inim/classif/proj.hh (working copy) @@ -58,11 +58,10 @@ K mean, const char * fn) { - //accu::mean<unsigned, unsigned long, value::int_u8> mean_accu; - accu::maj_h<value::int_u8> max_1; + accu::max<value::int_u8> max_1; image2d<value::int_u8> hproj = proj(histo, max_1); - accu::maj_h<value::int_u8> max_2; + accu::max<value::int_u8> max_2; image2d<value::int_u8> proj_class = proj(ws, max_2); //std::cout << histo; Index: inim/classif/Makefile --- inim/classif/Makefile (revision 2777) +++ inim/classif/Makefile (working copy) @@ -1,18 +1,18 @@ DISP=xv # ICCVG -ICCVG_INCLUDES=-I../.. +ICCVG_INCLUDES=-I../../.. ICCVG_SRC=iccvg04.cc ICCVG=iccvg ICCVG_DBG=iccvg_dbg -IMG?=../../img/lena.ppm +IMG?=..//../img/lena.ppm DIV?=4 LAMBDA?=10 # V2 -V2_INCLUDES=-I../.. +V2_INCLUDES=-I../../.. V2_SRC=v2.cc max_tree.hh V2=v2 V2_DBG=v2_dbg