Work around the regional labeling chain and experiment it on the annoting database. * green/exp/labeling/regional_maxima/Makefile.am: Add boost library. * green/exp/labeling/regional_maxima/regional_maxima.cc: Count colors. --- .../green/exp/labeling/regional_maxima/Makefile.am | 1 + .../labeling/regional_maxima/regional_maxima.cc | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/milena/sandbox/green/exp/labeling/regional_maxima/Makefile.am b/milena/sandbox/green/exp/labeling/regional_maxima/Makefile.am index ab76e18..8e204c6 100644 --- a/milena/sandbox/green/exp/labeling/regional_maxima/Makefile.am +++ b/milena/sandbox/green/exp/labeling/regional_maxima/Makefile.am @@ -6,6 +6,7 @@ # TOOLS # ######### +LOADLIBES= -lboost_filesystem INCLUDES= -I$(HOME)/svn/oln/trunk/milena/sandbox/green #CXXFLAGS= -ggdb -O0 -Wall -W -pedantic -ansi -pipe $(INCLUDES) #CXXFLAGS= -DNDEBUG -O1 -Wall -W -pedantic -ansi -pipe $(INCLUDES) diff --git a/milena/sandbox/green/exp/labeling/regional_maxima/regional_maxima.cc b/milena/sandbox/green/exp/labeling/regional_maxima/regional_maxima.cc index 28b6b88..a66c1b7 100644 --- a/milena/sandbox/green/exp/labeling/regional_maxima/regional_maxima.cc +++ b/milena/sandbox/green/exp/labeling/regional_maxima/regional_maxima.cc @@ -98,10 +98,10 @@ unsigned count_image_color(const std::string& image) input_rgbn = mln::data::transform(input_rgb8, t_rgb8_to_rgbn()); // FIXME UTILISER UN PREDICAT COMME FUN::CHESS - histo = mln::data::compute(t_histo3d_fun(), input_rgbn | mln::pw::value(0)); -// return mln::data::compute(t_count_fun(), input_rgbn); + histo = mln::data::compute(t_histo3d_fun(), input_rgbn); + return mln::data::compute(t_count_fun(), histo); // FIXME REALISER UN COUNT AVEC UN PREDICA SUR L'IMAGE - return nb_pixel; + //return nb_pixel; // opened = mln::morpho::opening::volume(histo, mln::c6(), min_volume); // label = mln::labeling::regional_maxima(opened, mln::c6(), n_labels); -- 1.5.6.5