* milena/Makefile.am: re-enable tools subdir. * milena/tests/Makefile.am: re-enable display subdir. * milena/tools/Makefile.am: disable area_flooding. * milena/tools/seed2tiling.cc: make it compile. --- milena/ChangeLog | 12 ++++++++++++ milena/Makefile.am | 9 +++++---- milena/tests/Makefile.am | 3 +-- milena/tools/Makefile.am | 4 ++-- milena/tools/seed2tiling.cc | 18 +++++++++--------- 5 files changed, 29 insertions(+), 17 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index bc666e4..4bfc986 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2008-12-05 Guillaume Lazzara <z@lrde.epita.fr> + Make milena/tools compile. + + * milena/Makefile.am: re-enable tools subdir. + + * milena/tests/Makefile.am: re-enable display subdir. + + * milena/tools/Makefile.am: disable area_flooding. + + * milena/tools/seed2tiling.cc: make it compile. + +2008-12-05 Guillaume Lazzara <z@lrde.epita.fr> + Fix bugs in graph. * mln/core/internal/site_relative_iterator_base.hh, diff --git a/milena/Makefile.am b/milena/Makefile.am index 90cc910..fa1d994 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -2,12 +2,13 @@ ##FIXME SUBDIRS = \ - mesh \ doc \ - tests - tools \ - apps + mesh \ + tests \ + tools +# apps .PHONY: doc doc: $(MAKE) -C doc doc + diff --git a/milena/tests/Makefile.am b/milena/tests/Makefile.am index 1213699..55f6959 100644 --- a/milena/tests/Makefile.am +++ b/milena/tests/Makefile.am @@ -2,7 +2,6 @@ include $(top_srcdir)/milena/tests/tests.mk -##FIXME: re-enable all tests SUBDIRS = \ accu \ algebra \ @@ -13,7 +12,7 @@ SUBDIRS = \ convert \ core \ debug \ -## display \ + display \ draw \ estim \ extension \ diff --git a/milena/tools/Makefile.am b/milena/tools/Makefile.am index e5ec273..1d6347c 100644 --- a/milena/tools/Makefile.am +++ b/milena/tools/Makefile.am @@ -3,10 +3,10 @@ include $(top_srcdir)/milena/tools/tools.mk bin_PROGRAMS = \ - area_flooding \ seed2tiling +#area_flooding -area_flooding_SOURCES = area_flooding.cc +#area_flooding_SOURCES = area_flooding.cc seed2tiling_SOURCES = seed2tiling.cc # FIXME: Add some tests for these tools. diff --git a/milena/tools/seed2tiling.cc b/milena/tools/seed2tiling.cc index bbac710..4ebda1b 100644 --- a/milena/tools/seed2tiling.cc +++ b/milena/tools/seed2tiling.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,10 +26,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tools/seed2tiling.cc - * - * \brief Tool using mln::geom::seed2tiling. - */ +/// \file tools/seed2tiling.cc +/// +/// Tool using mln::geom::seed2tiling. + # include <mln/core/image/image2d.hh> @@ -48,7 +49,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/sub_image.hh> -#include <mln/core/image_if_value.hh> +#include <mln/core/image/image_if.hh> #include <mln/core/alias/w_window2d_int.hh> @@ -80,8 +81,7 @@ int main(int argc, char* argv[]) image2d<unsigned> inte = geom::seeds2tiling(lab, c4 ()); border::fill (inte, 0); - image2d<int_u8> inte2(input.domain()); - level::stretch(inte, inte2); + image2d<int_u8> inte2 = level::stretch(int_u8(), inte); io::pgm::save(inte2, "ima1.pgm"); std::cout << "ima1 generate with seeds2tiling" @@ -89,7 +89,7 @@ int main(int argc, char* argv[]) inte = geom::seeds2tiling_roundness(lab, w_win, max, c4 ()); border::fill(inte, 0); - level::stretch(inte, inte2); + inte2 = level::stretch(int_u8(), inte); io::pgm::save(inte2, "ima2.pgm"); std::cout << "ima2 generate with seeds2tiling_roundness" -- 1.5.6.5