June 2009 - Olena-patches

4143: Make labeling::colorize deterministic.
by Guillaume Lazzara 15 Jun '09

15 Jun '09

* mln/labeling/colorize.hh: use our own random generator. * tests/labeling/colorize.cc: add an assertion. --- milena/ChangeLog | 8 +++++++ milena/mln/labeling/colorize.hh | 40 +++++++++++++++++++++++++++++++++--- milena/tests/labeling/colorize.cc | 5 ++- 3 files changed, 47 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 384b9ac..9acd79e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2009-06-15 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + + Make labeling::colorize deterministic. + + * mln/labeling/colorize.hh: use our own random generator. + + * tests/labeling/colorize.cc: add an assertion. + 2009-06-14 Roland Levillain <roland(a)lrde.epita.fr> Aesthetic changes. diff --git a/milena/mln/labeling/colorize.hh b/milena/mln/labeling/colorize.hh index 3f8b6c4..19d00af 100644 --- a/milena/mln/labeling/colorize.hh +++ b/milena/mln/labeling/colorize.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -71,12 +72,23 @@ namespace mln const mln_value(L)& nlabels); + /// \overload + // template <typename V, typename L> mln_ch_value(L, V) colorize(const V& value, const Image<L>& labeled_image); + /// \overload + // + template <typename L> + inline + mln_ch_value(L, value::rgb8) + colorize(const Image<L>& input, + const mln_value(L)& nlabels); + + # ifndef MLN_INCLUDE_ONLY namespace colorize_ @@ -89,6 +101,15 @@ namespace mln namespace internal { + unsigned random_number() + { + static unsigned last = 1; + + last = (323 * last + 6603) % 1025; + + return colorize_::min_value + last % colorize_::max_value; + } + template <typename V> V random_color(const V&); @@ -96,9 +117,9 @@ namespace mln mln::value::rgb<n> random_color(const mln::value::rgb<n>&) { - return mln::value::rgb<n>(colorize_::min_value + (rand() % colorize_::max_value), - colorize_::min_value + (rand() % colorize_::max_value), - colorize_::min_value + (rand() % colorize_::max_value)); + return mln::value::rgb<n>(random_number(), + random_number(), + random_number()); } } @@ -159,6 +180,17 @@ namespace mln return output; } + + template <typename L> + inline + mln_ch_value(L, value::rgb8) + colorize(const Image<L>& input, + const mln_value(L)& nlabels) + { + return colorize(value::rgb8(), input, nlabels); + } + + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::labeling diff --git a/milena/tests/labeling/colorize.cc b/milena/tests/labeling/colorize.cc index 18ae5ae..c0bba3c 100644 --- a/milena/tests/labeling/colorize.cc +++ b/milena/tests/labeling/colorize.cc @@ -29,7 +29,6 @@ # include <mln/labeling/colorize.hh> # include <mln/data/compare.hh> - int main() { using namespace mln; @@ -38,11 +37,13 @@ int main() { 0, 0 } }; typedef value::rgb8 rgb_t; - value::rgb8 ref_data[][2] = { { rgb_t(89,92,86), rgb_t(89,92,86) }, + value::rgb8 ref_data[][2] = { { rgb_t(231,46,171), rgb_t(231,46,171) }, { rgb_t(0,0,0), rgb_t(0,0,0) } }; image2d<value::int_u8> ima = make::image(values); image2d<rgb_t> ref = make::image(ref_data); image2d<value::rgb8> ima_color = labeling::colorize(value::rgb8(), ima); + + mln_assertion(ima_color == ref); } -- 1.5.6.5

1 0

[PATCH 5/5] Strip more files from the distribution of Milena.
by Roland Levillain 15 Jun '09

15 Jun '09

* configure.ac: Tag parts to be prune with `dnl<<lrde' and `dnl>>' instead of `#<<lrde' and `#>>'. Strip more files. --- ChangeLog | 8 ++++++++ configure.ac | 22 ++++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b371ef..cd74141 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2009-06-14 Roland Levillain <roland(a)lrde.epita.fr> + Strip more files from the distribution of Milena. + + * configure.ac: Tag parts to be prune with `dnl<<lrde' and `dnl>>' + instead of `#<<lrde' and `#>>'. + Strip more files. + +2009-06-14 Roland Levillain <roland(a)lrde.epita.fr> + Strip newly files containing `<<lrde' and `>>' tags. * Makefile.am (LRDE_STRIPPED_DIST_FILES): Add diff --git a/configure.ac b/configure.ac index 8c2da33..00ba605 100644 --- a/configure.ac +++ b/configure.ac @@ -107,9 +107,9 @@ AC_ARG_ENABLE([all], enable_trimesh=yes with_swig=yes enable_swilena=yes -#<<lrde +dnl<<lrde enable_scribo=yes -#>> +dnl>> enable_apps=yes enable_tools=yes ]) @@ -183,7 +183,7 @@ AC_CONFIG_FILES(m4_do([swilena/python/sps-local], [:swilena/python/sps-local.in]), [chmod +x swilena/python/sps-local]) -#<<lrde +dnl<<lrde ## -------- ## ## Scribo. ## ## -------- ## @@ -212,7 +212,7 @@ AC_CONFIG_FILES([ scribo/tests/text/Makefile scribo/tests/unit_test/Makefile ]) -#>> +dnl>> ## --------------- ## ## Configuration. ## @@ -244,7 +244,6 @@ AC_CONFIG_FILES([ AC_CONFIG_FILES([milena/tests/data.hh]) # Ask for the creation of tests' Makefiles. -# FIXME: Should it be achieved through oln.m4 macros, as we did in Olena 0.11? AC_CONFIG_FILES([ milena/tests/Makefile milena/tests/accu/Makefile @@ -282,7 +281,6 @@ AC_CONFIG_FILES([ milena/tests/extract/Makefile milena/tests/fun/Makefile milena/tests/fun/i2v/Makefile -# milena/tests/fun/meta/Makefile De-activated for 1.0 milena/tests/fun/p2b/Makefile milena/tests/fun/p2p/Makefile milena/tests/fun/p2v/Makefile @@ -311,7 +309,6 @@ AC_CONFIG_FILES([ milena/tests/io/tiff/Makefile milena/tests/labeling/Makefile milena/tests/linear/Makefile -# milena/tests/linear/gaussian/Makefile De-activated for 1.0 milena/tests/linear/local/Makefile milena/tests/literal/Makefile milena/tests/logical/Makefile @@ -337,9 +334,7 @@ AC_CONFIG_FILES([ milena/tests/norm/Makefile milena/tests/opt/Makefile milena/tests/pw/Makefile -# milena/tests/registration/Makefile De-activated for 1.0 milena/tests/set/Makefile -# milena/tests/subsampling/Makefile De-activated for 1.0 milena/tests/tag/Makefile milena/tests/test/Makefile milena/tests/topo/Makefile @@ -348,7 +343,6 @@ AC_CONFIG_FILES([ milena/tests/trait/Makefile milena/tests/trait/image/Makefile milena/tests/trait/op/Makefile -# milena/tests/trait/next/Makefile De-activated for 1.0 milena/tests/trait/value/Makefile milena/tests/transform/Makefile milena/tests/transformation/Makefile @@ -364,6 +358,14 @@ AC_CONFIG_FILES([ milena/tests/world/inter_pixel/dim2/Makefile ]) +dnl<<lrde +AC_CONFIG_FILES([ + milena/tests/linear/gaussian/Makefile + milena/tests/registration/Makefile + milena/tests/subsampling/Makefile +]) +dnl>> + ## -------------- ## ## Applications. ## -- 1.6.1.2

1 0

[PATCH 4/5] Aesthetic changes.
by Roland Levillain 15 Jun '09

15 Jun '09

* mln/core/image/vmorph/thru_image.hh, * mln/trait/essential.hh: Here. --- milena/ChangeLog | 8 ++++++++ milena/mln/core/image/vmorph/thru_image.hh | 3 ++- milena/mln/trait/essential.hh | 1 - 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9c95a7e..384b9ac 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-06-14 Roland Levillain <roland(a)lrde.epita.fr> + Aesthetic changes. + + * mln/core/image/vmorph/thru_image.hh, + * mln/trait/essential.hh: + Here. + +2009-06-14 Roland Levillain <roland(a)lrde.epita.fr> + Tag some more parts as ``not distributed''. * mln/all.hh, diff --git a/milena/mln/core/image/vmorph/thru_image.hh b/milena/mln/core/image/vmorph/thru_image.hh index 17c5b19..2691d38 100644 --- a/milena/mln/core/image/vmorph/thru_image.hh +++ b/milena/mln/core/image/vmorph/thru_image.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // diff --git a/milena/mln/trait/essential.hh b/milena/mln/trait/essential.hh index 91a25f0..86c570c 100644 --- a/milena/mln/trait/essential.hh +++ b/milena/mln/trait/essential.hh @@ -27,7 +27,6 @@ #ifndef MLN_TRAIT_ESSENTIAL_HH # define MLN_TRAIT_ESSENTIAL_HH -/// /// \file /// /// \brief Definition of essential traits. -- 1.6.1.2

1 0

[PATCH 3/5] Strip newly files containing `<<lrde' and `>>' tags.
by Roland Levillain 15 Jun '09

15 Jun '09

* Makefile.am (LRDE_STRIPPED_DIST_FILES): Add $(distdir)/milena/mln/all.hh, $(distdir)/milena/mln/core/image/vmorph/all.hh, $(distdir)/milena/mln/core/image/vmorph/fun_image.hh, $(distdir)/milena/mln/data/all.hh, $(distdir)/milena/mln/essential/routine.hh, $(distdir)/milena/mln/fun/all.hh, $(distdir)/milena/mln/fun/essential.hh, $(distdir)/milena/mln/fun/v2v/all.hh, $(distdir)/milena/mln/fun/v2v/essential.hh, $(distdir)/milena/mln/linear/all.hh, $(distdir)/milena/mln/trait/all.hh, $(distdir)/milena/mln/trait/ch_value.hh, $(distdir)/milena/mln/value/all.hh, $(distdir)/milena/mln/value/essential.hh, $(distdir)/milena/tests/Makefile.am and $(distdir)/milena/tests/trait/ch_value.cc. --- ChangeLog | 22 ++++++++++++++++++++++ Makefile.am | 18 +++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c4dad8..2b371ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,27 @@ 2009-06-14 Roland Levillain <roland(a)lrde.epita.fr> + Strip newly files containing `<<lrde' and `>>' tags. + + * Makefile.am (LRDE_STRIPPED_DIST_FILES): Add + $(distdir)/milena/mln/all.hh, + $(distdir)/milena/mln/core/image/vmorph/all.hh, + $(distdir)/milena/mln/core/image/vmorph/fun_image.hh, + $(distdir)/milena/mln/data/all.hh, + $(distdir)/milena/mln/essential/routine.hh, + $(distdir)/milena/mln/fun/all.hh, + $(distdir)/milena/mln/fun/essential.hh, + $(distdir)/milena/mln/fun/v2v/all.hh, + $(distdir)/milena/mln/fun/v2v/essential.hh, + $(distdir)/milena/mln/linear/all.hh, + $(distdir)/milena/mln/trait/all.hh, + $(distdir)/milena/mln/trait/ch_value.hh, + $(distdir)/milena/mln/value/all.hh, + $(distdir)/milena/mln/value/essential.hh, + $(distdir)/milena/tests/Makefile.am and + $(distdir)/milena/tests/trait/ch_value.cc. + +2009-06-14 Roland Levillain <roland(a)lrde.epita.fr> + Handle comments starting with `//' and `dnl' in strip-lrde. * build-aux/strip-lrde: Here. diff --git a/Makefile.am b/Makefile.am index ef0e5c9..000fd42 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,14 +48,30 @@ REGEN_SUBDIRS += milena scribo ## conversion of the repository. LRDE_STRIPPED_DIST_FILES = \ - $(distdir)/configure.ac \ $(distdir)/Makefile.am \ + $(distdir)/configure.ac \ + $(distdir)/milena/mln/all.hh \ + $(distdir)/milena/mln/core/image/vmorph/all.hh \ + $(distdir)/milena/mln/core/image/vmorph/fun_image.hh \ + $(distdir)/milena/mln/data/all.hh \ + $(distdir)/milena/mln/essential/routine.hh \ + $(distdir)/milena/mln/fun/all.hh \ + $(distdir)/milena/mln/fun/essential.hh \ + $(distdir)/milena/mln/fun/v2v/all.hh \ + $(distdir)/milena/mln/fun/v2v/essential.hh \ + $(distdir)/milena/mln/linear/all.hh \ + $(distdir)/milena/mln/trait/all.hh \ + $(distdir)/milena/mln/trait/ch_value.hh \ + $(distdir)/milena/mln/value/all.hh \ + $(distdir)/milena/mln/value/essential.hh \ + $(distdir)/milena/tests/Makefile.am \ $(distdir)/milena/tests/convert/Makefile.am \ $(distdir)/milena/tests/extract/Makefile.am \ $(distdir)/milena/tests/fun/v2v/Makefile.am \ $(distdir)/milena/tests/linear/Makefile.am \ $(distdir)/milena/tests/linear/gaussian/Makefile.am \ $(distdir)/milena/tests/registration/Makefile.am \ + $(distdir)/milena/tests/trait/ch_value.cc \ $(distdir)/milena/tests/value/Makefile.am LRDE_NODIST_FILES = \ -- 1.6.1.2

1 0

[PATCH 2/5] Tag some more parts as ``not distributed''.
by Roland Levillain 15 Jun '09

15 Jun '09

* mln/all.hh, * mln/core/image/vmorph/all.hh, * mln/core/image/vmorph/fun_image.hh, * mln/data/all.hh, * mln/essential/routine.hh, * mln/fun/all.hh, * mln/fun/essential.hh, * mln/fun/v2v/all.hh, * mln/fun/v2v/essential.hh, * mln/linear/all.hh, * mln/trait/all.hh, * mln/trait/ch_value.hh, * mln/value/all.hh, * mln/value/essential.hh, * tests/Makefile.am, * tests/linear/Makefile.am, * tests/trait/ch_value.cc: Here. --- milena/ChangeLog | 23 +++++++++++++++++++ milena/mln/all.hh | 15 +++++++----- milena/mln/core/image/vmorph/all.hh | 7 +++-- milena/mln/core/image/vmorph/fun_image.hh | 4 ++- milena/mln/data/all.hh | 8 ++++-- milena/mln/essential/routine.hh | 19 ++++++++------- milena/mln/fun/all.hh | 9 +++++-- milena/mln/fun/essential.hh | 7 +++-- milena/mln/fun/v2v/all.hh | 13 ++++++---- milena/mln/fun/v2v/essential.hh | 8 +++--- milena/mln/linear/all.hh | 16 +++++++++---- milena/mln/trait/all.hh | 8 +++--- milena/mln/trait/ch_value.hh | 35 ++++++++++++++--------------- milena/mln/value/all.hh | 8 ++++-- milena/mln/value/essential.hh | 9 ++++--- milena/tests/Makefile.am | 10 +++++--- milena/tests/linear/Makefile.am | 5 ++++ milena/tests/trait/ch_value.cc | 18 ++++++++------ 18 files changed, 139 insertions(+), 83 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d0e6146..9c95a7e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,26 @@ +2009-06-14 Roland Levillain <roland(a)lrde.epita.fr> + + Tag some more parts as ``not distributed''. + + * mln/all.hh, + * mln/core/image/vmorph/all.hh, + * mln/core/image/vmorph/fun_image.hh, + * mln/data/all.hh, + * mln/essential/routine.hh, + * mln/fun/all.hh, + * mln/fun/essential.hh, + * mln/fun/v2v/all.hh, + * mln/fun/v2v/essential.hh, + * mln/linear/all.hh, + * mln/trait/all.hh, + * mln/trait/ch_value.hh, + * mln/value/all.hh, + * mln/value/essential.hh, + * tests/Makefile.am, + * tests/linear/Makefile.am, + * tests/trait/ch_value.cc: + Here. + 2009-06-12 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> De-activate dependencies to files kept out of release 1.0. diff --git a/milena/mln/all.hh b/milena/mln/all.hh index 630f263..fb34399 100644 --- a/milena/mln/all.hh +++ b/milena/mln/all.hh @@ -45,6 +45,9 @@ #include <mln/draw/all.hh> #include <mln/estim/all.hh> #include <mln/extension/all.hh> +//<<lrde +#include <mln/extract/all.hh> +//>> #include <mln/fun/all.hh> #include <mln/geom/all.hh> #include <mln/graph/all.hh> @@ -61,7 +64,13 @@ #include <mln/norm/all.hh> #include <mln/opt/all.hh> #include <mln/pw/all.hh> +//<<lrde +#include <mln/registration/all.hh> +//>> #include <mln/set/all.hh> +//<<lrde +#include <mln/subsampling/all.hh> +//>> #include <mln/tag/all.hh> #include <mln/test/all.hh> #include <mln/trace/all.hh> @@ -75,10 +84,4 @@ #include <mln/essential/2d.hh> #include <mln/essential/3d.hh> - -// #include <mln/extract/all.hh> De-activated in 1.0 -// #include <mln/registration/all.hh> De-activated in 1.0 -// #include <mln/subsampling/all.hh> De-activated in 1.0 - - #endif // ! MLN_ALL_HH diff --git a/milena/mln/core/image/vmorph/all.hh b/milena/mln/core/image/vmorph/all.hh index a025a14..1b14677 100644 --- a/milena/mln/core/image/vmorph/all.hh +++ b/milena/mln/core/image/vmorph/all.hh @@ -33,10 +33,11 @@ # include <mln/core/image/vmorph/cast_image.hh> # include <mln/core/image/vmorph/fun_image.hh> +//<<lrde +# include <mln/core/image/vmorph/thrubin_image.hh> +# include <mln/core/image/vmorph/thru_image.hh> +//>> # include <mln/core/image/vmorph/violent_cast_image.hh> -// # include <mln/core/image/vmorph/thrubin_image.hh> De-activated in 1.0 -// # include <mln/core/image/vmorph/thru_image.hh> De-activated in 1.0 - #endif // ! MLN_CORE_IMAGE_VMORPH_ALL_HH diff --git a/milena/mln/core/image/vmorph/fun_image.hh b/milena/mln/core/image/vmorph/fun_image.hh index 571a56f..d903ae5 100644 --- a/milena/mln/core/image/vmorph/fun_image.hh +++ b/milena/mln/core/image/vmorph/fun_image.hh @@ -35,7 +35,9 @@ # include <mln/core/internal/image_value_morpher.hh> # include <mln/trait/images.hh> # include <mln/value/set.hh> -// # include <mln/value/shell.hh> De-activated for 1.0 +//<<lrde +# include <mln/value/shell.hh> +//>> # include <mln/metal/if.hh> # include <mln/metal/equal.hh> diff --git a/milena/mln/data/all.hh b/milena/mln/data/all.hh index 2a6fea2..bc77272 100644 --- a/milena/mln/data/all.hh +++ b/milena/mln/data/all.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -68,8 +69,9 @@ namespace mln # include <mln/data/to_enc.hh> # include <mln/data/transform.hh> # include <mln/data/update.hh> - -// # include <mln/data/was.median.hh> De-activated in 1.0 +//<<lrde +# include <mln/data/was.median.hh> +//>> diff --git a/milena/mln/essential/routine.hh b/milena/mln/essential/routine.hh index c999b5a..d2f57f1 100644 --- a/milena/mln/essential/routine.hh +++ b/milena/mln/essential/routine.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -27,7 +26,6 @@ #ifndef MLN_ESSENTIAL_ROUTINE_HH # define MLN_ESSENTIAL_ROUTINE_HH - # include <mln/topo/essential.hh> # include <mln/accu/essential.hh> # include <mln/algebra/essential.hh> @@ -42,6 +40,9 @@ # include <mln/draw/essential.hh> # include <mln/estim/essential.hh> # include <mln/extension/essential.hh> +//<<lrde +# include <mln/extract/essential.hh> +//>> # include <mln/fun/essential.hh> # include <mln/geom/essential.hh> # include <mln/graph/essential.hh> @@ -59,7 +60,13 @@ # include <mln/norm/essential.hh> # include <mln/opt/essential.hh> # include <mln/pw/essential.hh> +//<<lrde +# include <mln/registration/essential.hh> +//>> # include <mln/set/essential.hh> +//<<lrde +# include <mln/subsampling/essential.hh> +//>> # include <mln/tag/essential.hh> # include <mln/test/essential.hh> # include <mln/trace/essential.hh> @@ -69,10 +76,4 @@ # include <mln/value/essential.hh> # include <mln/win/essential.hh> - -// # include <mln/extract/essential.hh> De-activated in 1.0 -// # include <mln/registration/essential.hh> De-activated in 1.0 -// # include <mln/subsampling/essential.hh> De-activated in 1.0 - - #endif // ! MLN_ESSENTIAL_ROUTINE_HH diff --git a/milena/mln/fun/all.hh b/milena/mln/fun/all.hh index e6bf6d4..b353f38 100644 --- a/milena/mln/fun/all.hh +++ b/milena/mln/fun/all.hh @@ -58,8 +58,14 @@ namespace mln // Sub-directories. # include <mln/fun/i2v/all.hh> +//<<lrde +# include <mln/fun/meta/all.hh> +//>> # include <mln/fun/p2b/all.hh> # include <mln/fun/p2v/all.hh> +//<<lrde +// # include <mln/fun/spe/all.hh> +//>> # include <mln/fun/stat/all.hh> # include <mln/fun/v2b/all.hh> # include <mln/fun/v2i/all.hh> @@ -69,8 +75,5 @@ namespace mln # include <mln/fun/x2v/all.hh> # include <mln/fun/x2x/all.hh> -// # include <mln/fun/meta/all.hh> De-activated in 1.0 -// # include <mln/fun/spe/all.hh> De-activated in 1.0 - #endif // ! MLN_FUN_ALL_HH diff --git a/milena/mln/fun/essential.hh b/milena/mln/fun/essential.hh index 75e4030..7bd51f5 100644 --- a/milena/mln/fun/essential.hh +++ b/milena/mln/fun/essential.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -35,7 +34,9 @@ # include <mln/fun/c.hh> # include <mln/fun/ops.hh> # include <mln/fun/i2v/essential.hh> -// # include <mln/fun/meta/essential.hh> +//<<lrde +# include <mln/fun/meta/essential.hh> +//>> # include <mln/fun/p2b/essential.hh> # include <mln/fun/p2v/essential.hh> # include <mln/fun/v2b/essential.hh> diff --git a/milena/mln/fun/v2v/all.hh b/milena/mln/fun/v2v/all.hh index dbbeac3..425d24e 100644 --- a/milena/mln/fun/v2v/all.hh +++ b/milena/mln/fun/v2v/all.hh @@ -52,17 +52,20 @@ namespace mln # include <mln/fun/v2v/convert.hh> # include <mln/fun/v2v/dec.hh> # include <mln/fun/v2v/enc.hh> +//<<lrde +# include <mln/fun/v2v/hsi_to_rgb.hh> +# include <mln/fun/v2v/hsl_to_rgb.hh> +//>> # include <mln/fun/v2v/id.hh> # include <mln/fun/v2v/linear.hh> # include <mln/fun/v2v/norm.hh> # include <mln/fun/v2v/projection.hh> +//<<lrde +# include <mln/fun/v2v/rgb_to_hsi.hh> +# include <mln/fun/v2v/rgb_to_hsl.hh> +//>> # include <mln/fun/v2v/saturate.hh> # include <mln/fun/v2v/wrap.hh> -// # include <mln/fun/v2v/hsi_to_rgb.hh> De-activated in 1.0 -// # include <mln/fun/v2v/hsl_to_rgb.hh> De-activated in 1.0 -// # include <mln/fun/v2v/rgb_to_hsi.hh> De-activated in 1.0 -// # include <mln/fun/v2v/rgb_to_hsl.hh> De-activated in 1.0 - #endif // ! MLN_FUN_V2V_ALL_HH diff --git a/milena/mln/fun/v2v/essential.hh b/milena/mln/fun/v2v/essential.hh index 1285fab..79fda4e 100644 --- a/milena/mln/fun/v2v/essential.hh +++ b/milena/mln/fun/v2v/essential.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -35,9 +34,10 @@ # include <mln/fun/v2v/abs.hh> # include <mln/fun/v2v/cast.hh> # include <mln/fun/v2v/convert.hh> +//<<lrde +# include <mln/fun/v2v/rgb_to_hsi.hh> +//>> # include <mln/fun/v2v/saturate.hh> -// # include <mln/fun/v2v/rgb_to_hsi.hh> De-activated in 1.0 - #endif // ! MLN_FUN_V2V_ESSENTIAL_HH diff --git a/milena/mln/linear/all.hh b/milena/mln/linear/all.hh index ac53a98..c7e70e4 100644 --- a/milena/mln/linear/all.hh +++ b/milena/mln/linear/all.hh @@ -59,14 +59,20 @@ namespace mln # include <mln/linear/convolve.hh> # include <mln/linear/convolve_2x1d.hh> # include <mln/linear/convolve_directional.hh> + +//<<lrde +# include <mln/linear/gaussian.hh> +# include <mln/linear/gaussian_directional_2d.hh> +# include <mln/linear/gaussian_1d.hh> +//>> + # include <mln/linear/lap.hh> # include <mln/linear/log.hh> -// # include <mln/linear/sobel.hh> De-activated in 1.0 -// # include <mln/linear/local/convolve.hh> De-activated in 1.0 -// # include <mln/linear/gaussian.hh> De-activated in 1.0 -// # include <mln/linear/gaussian_directional_2d.hh> De-activated in 1.0 -// # include <mln/linear/gaussian_1d.hh> De-activated in 1.0 +//<<lrde +# include <mln/linear/sobel_2d.hh> +# include <mln/linear/local/convolve.hh> +//>> #endif // ! MLN_LINEAR_ALL_HH diff --git a/milena/mln/trait/all.hh b/milena/mln/trait/all.hh index d867a93..08f0494 100644 --- a/milena/mln/trait/all.hh +++ b/milena/mln/trait/all.hh @@ -27,7 +27,6 @@ #ifndef MLN_TRAIT_ALL_HH # define MLN_TRAIT_ALL_HH -/// /// \file /// /// \brief Definition of all traits. @@ -58,9 +57,10 @@ namespace mln # include <mln/trait/promote.hh> # include <mln/trait/op/all.hh> -// # include <mln/trait/next/all.hh> De-activated in 1.0 -// # include <mln/trait/functions.hh> De-activated in 1.0 - +//<<lrde +// # include <mln/trait/next/all.hh> +# include <mln/trait/functions.hh> +//>> #endif // ! MLN_TRAIT_ALL_HH diff --git a/milena/mln/trait/ch_value.hh b/milena/mln/trait/ch_value.hh index c6a5258..ae6e1d2 100644 --- a/milena/mln/trait/ch_value.hh +++ b/milena/mln/trait/ch_value.hh @@ -116,25 +116,24 @@ namespace mln typedef M< mln_ch_value(I, V), E > ret; }; +//<<lrde + // For mln::value::stack_image<n,I>. + template < template <unsigned, class> class M, unsigned n, typename I, + typename V > + struct ch_value_< M< n, tag::image_<I> >, V > + { + /* FIXME: The code used to read + + typedef algebra::vec<n, V> value; + typedef mln_ch_value(I, value) ret; - // De-activated for 1.0 - // -// // For mln::value::stack_image<n,I>. -// template < template <unsigned, class> class M, unsigned n, typename I, -// typename V > -// struct ch_value_< M< n, tag::image_<I> >, V > -// { -// // FIXME: The code used to read - -// // typedef algebra::vec<n, V> value; -// // typedef mln_ch_value(I, value) ret; - -// // here. But this is wrong IMHO (Roland). Changing the value -// // type of a stack image (in fact, a vectorial image) shall -// // alter the *value type* of the image, not the type of the -// // *components* of the vector. Hence the current definition. -// typedef mln_ch_value(I, V) ret; -// }; + here. But this is wrong IMHO (Roland). Changing the value + type of a stack image (in fact, a vectorial image) shall + alter the *value type* of the image, not the type of the + *components* of the vector. Hence the current definition. */ + typedef mln_ch_value(I, V) ret; + }; +//>> // For mln::complex_image<D, G, T>. template < template <unsigned, class, class> class M, diff --git a/milena/mln/value/all.hh b/milena/mln/value/all.hh index 427ad08..060afcc 100644 --- a/milena/mln/value/all.hh +++ b/milena/mln/value/all.hh @@ -57,9 +57,11 @@ namespace mln // FIXME: that includes concept/image.hh! -// # include <mln/value/cast.hh> De-activated in 1.0 -// # include <mln/value/shell.hh> De-activated in 1.0 -// # include <mln/value/stack.hh> De-activated in 1.0 +//<<lrde +# include <mln/value/cast.hh> +# include <mln/value/shell.hh> +# include <mln/value/stack.hh> +//>> diff --git a/milena/mln/value/essential.hh b/milena/mln/value/essential.hh index 5b0dd7b..55177af 100644 --- a/milena/mln/value/essential.hh +++ b/milena/mln/value/essential.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -38,8 +37,10 @@ # include <mln/value/float01_8.hh> # include <mln/value/float01_16.hh> -// # include <mln/value/gl8.hh> De-activated in 1.0 -// # include <mln/value/gl16.hh> De-activated in 1.0 +//<<lrde +# include <mln/value/gl8.hh> +# include <mln/value/gl16.hh> +//>> # include <mln/value/int_s8.hh> # include <mln/value/int_s16.hh> diff --git a/milena/tests/Makefile.am b/milena/tests/Makefile.am index b0b952e..b8a0752 100644 --- a/milena/tests/Makefile.am +++ b/milena/tests/Makefile.am @@ -64,10 +64,12 @@ SUBDIRS = \ win \ world -# extract De-activated for 1.0 -# registration De-activated for 1.0 -# subsampling De-activated for 1.0 - +#<<lrde +SUBDIRS += \ + extract \ + registration \ + subsampling +#>> check_PROGRAMS = \ all_headers \ diff --git a/milena/tests/linear/Makefile.am b/milena/tests/linear/Makefile.am index 070415f..67d21fc 100644 --- a/milena/tests/linear/Makefile.am +++ b/milena/tests/linear/Makefile.am @@ -23,6 +23,11 @@ include $(top_srcdir)/milena/tests/tests.mk SUBDIRS = \ local +#<<lrde +SUBDIRS += \ + gaussian +#>> + check_PROGRAMS = \ convolve \ convolve_directional \ diff --git a/milena/tests/trait/ch_value.cc b/milena/tests/trait/ch_value.cc index e69a69c..d20428a 100644 --- a/milena/tests/trait/ch_value.cc +++ b/milena/tests/trait/ch_value.cc @@ -27,7 +27,9 @@ #include <mln/trait/ch_value.hh> #include <mln/core/image/image2d.hh> -// #include <mln/value/stack.hh> De-activated for 1.0 +//<<lrde +#include <mln/value/stack.hh> +//>> int main() @@ -38,13 +40,13 @@ int main() typedef trait::ch_value<I, bool>::ret J; J ima1; - // De-activated for 1.0 - // -// // Stack image. -// typedef value::stack_image<3, I> K; -// typedef trait::ch_value<K, float>::ret L; -// L ima2; -// mlc_equal(L, image2d<float>)::check(); +//<<lrde + // Stack image. + typedef value::stack_image<3, I> K; + typedef trait::ch_value<K, float>::ret L; + L ima2; + mlc_equal(L, image2d<float>)::check(); +//>> // FIXME: Exercise more image types. // ... -- 1.6.1.2

1 0

[PATCH 1/5] Handle comments starting with `//' and `dnl' in strip-lrde.
by Roland Levillain 15 Jun '09

15 Jun '09

* build-aux/strip-lrde: Here. Fix copyright header. --- ChangeLog | 7 +++++++ build-aux/strip-lrde | 35 ++++++++++++----------------------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76051a2..0c4dad8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-06-14 Roland Levillain <roland(a)lrde.epita.fr> + + Handle comments starting with `//' and `dnl' in strip-lrde. + + * build-aux/strip-lrde: Here. + Fix copyright header. + 2009-06-12 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> De-activate Makefiles kept out of release 1.0. diff --git a/build-aux/strip-lrde b/build-aux/strip-lrde index f1c6077..b8d009a 100755 --- a/build-aux/strip-lrde +++ b/build-aux/strip-lrde @@ -1,34 +1,23 @@ #! /bin/sh -# Copyright (C) 2007 EPITA Research and Development Laboratory + +# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE) +# +# This file is part of Olena. # -# This file is part of the Olena Library. This library is free -# software; you can redistribute it and/or modify it under the terms -# of the GNU General Public License version 2 as published by the -# Free Software Foundation. +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. # -# This library is distributed in the hope that it will be useful, +# Olena is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this library; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# As a special exception, you may use this file as part of a free -# software library without restriction. Specifically, if other files -# instantiate templates or use macros or inline functions from this -# file, or you compile this file and link it with other files to -# produce an executable, this file does not by itself cause the -# resulting executable to be covered by the GNU General Public -# License. This exception does not however invalidate any other -# reasons why the executable file might be covered by the GNU General -# Public License. - +# along with Olena. If not, see <http://www.gnu.org/licenses/>. -# Remove everything between `<<lrde' and `>>'. -# This is awful, but it's working. +# Remove everything between `<<lrde' and `>>' (these tags being at the +# beginning of comment line starting with `#', `//' or `dnl'). exec perl -0777 -pi -e \ - 's/\n\s*#\s*<<lrde(.|\n)+?\n\s*#\s*>>\s*\n/\n\n/g' \ + 's,\n\s*(#|//|dnl)\s*<<lrde(.|\n)+?\n\s*(#|//|dnl)\s*>>\s*\n,\n\n,g' \ "$@" -- 1.6.1.2

1 0

[PATCH 5/5] headers.mk: Regen.
by Roland Levillain 12 Jun '09

12 Jun '09

--- milena/ChangeLog | 4 ++++ milena/headers.mk | 8 +------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 85a1eb6..d0e6146 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -36,6 +36,10 @@ 2009-06-12 Roland Levillain <roland(a)lrde.epita.fr> + * headers.mk: Regen. + +2009-06-12 Roland Levillain <roland(a)lrde.epita.fr> + Help doc/Makefile resolve dependencies across directories. * doc/Makefile.am (tutorial/tutorial.hh, ref_guide/ref_guide.hh): diff --git a/milena/headers.mk b/milena/headers.mk index 0294aa6..3300d71 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -300,8 +300,7 @@ mln/core/image/imorph/tr_image.hh \ mln/core/image/vertex_image.hh \ mln/core/image/vmorph/all.hh \ mln/core/image/vmorph/cast_image.hh \ -mln/core/image/vmorph/thru_image.hh \ -mln/core/image/vmorph/thrubin_image.hh \ +mln/core/image/vmorph/fun_image.hh \ mln/core/image/vmorph/violent_cast_image.hh \ mln/core/internal/box_impl.hh \ mln/core/internal/check/image_all.hh \ @@ -958,10 +957,6 @@ mln/set/inter.hh \ mln/set/sym_diff.hh \ mln/set/uni.hh \ mln/set/unique.hh \ -mln/subsampling/all.hh \ -mln/subsampling/essential.hh \ -mln/subsampling/gaussian_subsampling.hh \ -mln/subsampling/subsampling.hh \ mln/tag/all.hh \ mln/tag/essential.hh \ mln/tag/init.hh \ @@ -1020,7 +1015,6 @@ mln/trait/ch_function_value.hh \ mln/trait/ch_value.hh \ mln/trait/concrete.hh \ mln/trait/essential.hh \ -mln/trait/functions.hh \ mln/trait/image/print.hh \ mln/trait/image/props.hh \ mln/trait/image_from_grid.hh \ -- 1.6.2.4

1 0

[PATCH 4/5] Help doc/Makefile resolve dependencies across directories.
by Roland Levillain 12 Jun '09

12 Jun '09

* doc/Makefile.am (tutorial/tutorial.hh, ref_guide/ref_guide.hh): New target, bouncing to subdirectories. --- milena/ChangeLog | 7 +++++++ milena/doc/Makefile.am | 6 ++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8c22c9a..85a1eb6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -36,6 +36,13 @@ 2009-06-12 Roland Levillain <roland(a)lrde.epita.fr> + Help doc/Makefile resolve dependencies across directories. + + * doc/Makefile.am (tutorial/tutorial.hh, ref_guide/ref_guide.hh): + New target, bouncing to subdirectories. + +2009-06-12 Roland Levillain <roland(a)lrde.epita.fr> + Tag some some tests as ``not distributed''. * tests/convert/Makefile.am, diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 2f256f9..7d20939 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -55,8 +55,14 @@ doc-devel-pdf: tutorial-pdf ref-guide-pdf white-paper-pdf ref-doc-devel-pdf doc-devel-html: tutorial-html ref-guide-html white-paper-html ref-doc-devel-html +# FIXME: Maintaining dependencies across directories is too +# complicated. Simplify. # Shared dependencies on the products of tutorial/ and ref_guide/. EXTRA_DEPS = tutorial/tutorial.hh ref_guide/ref_guide.hh +tutorial/tutorial.hh: + cd tutorial && $(MAKE) $(AM_MAKEFLAGS) tutorial.hh +ref_guide/ref_guide.hh: + cd ref_guide && $(MAKE) $(AM_MAKEFLAGS) ref_guide.hh # Doxygen PDF documentation outputs. USER_REFMAN_PDF = user/latex/refman.pdf -- 1.6.2.4

1 0

[PATCH 3/5] Prune the distribution a bit more.
by Roland Levillain 12 Jun '09

12 Jun '09

* Makefile.am (LRDE_STRIPPED_DIST_FILES): New. (LRDE_NODIST_FILES): New. (dist-hook): Strip distributed files listed in $(LRDE_STRIPPED_DIST_FILES) using build-aux/strip-lrde, and remove files in $(LRDE_NODIST_FILES) from the distribution. --- ChangeLog | 10 +++++++++ Makefile.am | 60 ++++++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 53 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 884aad3..76051a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,16 @@ 2009-06-12 Roland Levillain <roland(a)lrde.epita.fr> + Prune the distribution a bit more. + + * Makefile.am (LRDE_STRIPPED_DIST_FILES): New. + (LRDE_NODIST_FILES): New. + (dist-hook): Strip distributed files listed in + $(LRDE_STRIPPED_DIST_FILES) using build-aux/strip-lrde, and remove + files in $(LRDE_NODIST_FILES) from the distribution. + +2009-06-12 Roland Levillain <roland(a)lrde.epita.fr> + Fix Autoconf macro OLN_WITH_LIB. * m4/oln-with-lib.m4: Add other libraries (dependencies) to diff --git a/Makefile.am b/Makefile.am index b812d95..ef0e5c9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,22 +43,48 @@ REGEN_SUBDIRS += milena scribo #<<lrde -# Unless Make variable MAINTAINER is set to `true' (e.g. by calling -# `make dist MAINTAINER=true'), do not distribute parts tagged `lrde' -# (see build-aux/strip-lrde). -# -# Remove any trace of olena/oln/lrde from the distribution and reset -# the GNU build system for the distdir layout. +## FIXME: All of this it too much ad hoc. Use Git branches to +## distinguish distributed files from non distributed ones after the +## conversion of the repository. + +LRDE_STRIPPED_DIST_FILES = \ + $(distdir)/configure.ac \ + $(distdir)/Makefile.am \ + $(distdir)/milena/tests/convert/Makefile.am \ + $(distdir)/milena/tests/extract/Makefile.am \ + $(distdir)/milena/tests/fun/v2v/Makefile.am \ + $(distdir)/milena/tests/linear/Makefile.am \ + $(distdir)/milena/tests/linear/gaussian/Makefile.am \ + $(distdir)/milena/tests/registration/Makefile.am \ + $(distdir)/milena/tests/value/Makefile.am + +LRDE_NODIST_FILES = \ + $(distdir)/milena/tests/convert/to_hsl.cc \ + $(distdir)/milena/tests/extract/blue.cc \ + $(distdir)/milena/tests/extract/green.cc \ + $(distdir)/milena/tests/extract/hue.cc \ + $(distdir)/milena/tests/extract/lum.cc \ + $(distdir)/milena/tests/extract/red.cc \ + $(distdir)/milena/tests/extract/sat.cc \ + $(distdir)/milena/tests/fun/v2v/component.cc \ + $(distdir)/milena/tests/fun/v2v/hsl_to_rgb.cc \ + $(distdir)/milena/tests/fun/v2v/rgb_to_hsl.cc \ + $(distdir)/milena/tests/linear/gaussian.cc \ + $(distdir)/milena/tests/linear/gaussian/filter.cc \ + $(distdir)/milena/tests/registration/registration.cc \ + $(distdir)/milena/tests/value/stack.cc \ + $(distdir)/scribo + +# Do not distribute parts tagged `lrde' (see build-aux/strip-lrde). dist-hook: - if test x$(MAINTAINER) != xtrue; then \ - $(top_srcdir)/build-aux/strip-lrde $(distdir)/configure.ac && \ - $(top_srcdir)/build-aux/strip-lrde $(distdir)/Makefile.am && \ - rm -rf $(distdir)/scribo && \ - ( \ - cd $(distdir); \ - set -evx; \ - autoreconf -f -v -i \ - find . -name autom4te.cache | xargs rm -rf \ - ) \ - fi + for f in $(LRDE_STRIPPED_DIST_FILES); do \ + $(top_srcdir)/build-aux/strip-lrde $$f; \ + done; \ + rm -rf $(LRDE_NODIST_FILES) && \ + ( \ + cd $(distdir); \ + set -evx; \ + autoreconf -f -v -i; \ + find . -name autom4te.cache | xargs rm -rf \ + ) #>> -- 1.6.2.4

1 0

[PATCH 2/5] Tag some some tests as ``not distributed''.
by Roland Levillain 12 Jun '09

12 Jun '09

* tests/convert/Makefile.am, * tests/extract/Makefile.am, * tests/fun/v2v/Makefile.am, * tests/linear/Makefile.am, * tests/linear/gaussian/Makefile.am, * tests/registration/Makefile.am: Here. * tests/value/Makefile.am: Likewise. (full-check): Remove target. Aesthetic changes. --- milena/ChangeLog | 15 +++++++++++++++ milena/tests/convert/Makefile.am | 11 ++++++++--- milena/tests/extract/Makefile.am | 13 ++++++++----- milena/tests/fun/v2v/Makefile.am | 20 ++++++++++++++------ milena/tests/linear/Makefile.am | 9 +++++---- milena/tests/linear/gaussian/Makefile.am | 3 +++ milena/tests/registration/Makefile.am | 9 +++++---- milena/tests/value/Makefile.am | 30 ++++++++++++++---------------- 8 files changed, 72 insertions(+), 38 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 016599c..8c22c9a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -36,6 +36,21 @@ 2009-06-12 Roland Levillain <roland(a)lrde.epita.fr> + Tag some some tests as ``not distributed''. + + * tests/convert/Makefile.am, + * tests/extract/Makefile.am, + * tests/fun/v2v/Makefile.am, + * tests/linear/Makefile.am, + * tests/linear/gaussian/Makefile.am, + * tests/registration/Makefile.am: + Here. + * tests/value/Makefile.am: Likewise. + (full-check): Remove target. + Aesthetic changes. + +2009-06-12 Roland Levillain <roland(a)lrde.epita.fr> + Update the list of non distributed headers. * nodist-headers: Here. diff --git a/milena/tests/convert/Makefile.am b/milena/tests/convert/Makefile.am index 5ada92b..ab369d9 100644 --- a/milena/tests/convert/Makefile.am +++ b/milena/tests/convert/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -21,7 +22,6 @@ include $(top_srcdir)/milena/tests/tests.mk SUBDIRS = impl -##FIXME: re-enable all tests check_PROGRAMS = \ to_image \ to_p_array \ @@ -29,11 +29,16 @@ check_PROGRAMS = \ to_rgb \ to_window -# to_hsl_SOURCES = to_hsl.cc De-activated for 1.0 to_image_SOURCES = to_image.cc to_p_array_SOURCES = to_p_array.cc to_p_set_SOURCES = to_p_set.cc to_rgb_SOURCES = to_rgb.cc to_window_SOURCES = to_window.cc +#<<lrde +# FIXME: Not distributed (yet). +check_PROGRAMS += to_hsl +to_hsl_SOURCES = to_hsl.cc +#>> + TESTS = $(check_PROGRAMS) diff --git a/milena/tests/extract/Makefile.am b/milena/tests/extract/Makefile.am index 54d2768..f7b0c1c 100644 --- a/milena/tests/extract/Makefile.am +++ b/milena/tests/extract/Makefile.am @@ -19,12 +19,14 @@ include $(top_srcdir)/milena/tests/tests.mk +#<<lrde +# FIXME: Not distributed (yet). check_PROGRAMS = \ - blue \ - green \ - hue \ - lum \ - red \ + blue \ + green \ + hue \ + lum \ + red \ sat blue_SOURCES = blue.cc @@ -33,5 +35,6 @@ hue_SOURCES = hue.cc lum_SOURCES = lum.cc red_SOURCES = red.cc sat_SOURCES = sat.cc +#>> TESTS = $(check_PROGRAMS) diff --git a/milena/tests/fun/v2v/Makefile.am b/milena/tests/fun/v2v/Makefile.am index fbe268c..872c7a5 100644 --- a/milena/tests/fun/v2v/Makefile.am +++ b/milena/tests/fun/v2v/Makefile.am @@ -21,16 +21,24 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - norm \ - projection \ - wrap + norm \ + projection \ + wrap norm_SOURCES = norm.cc projection_SOURCES = projection.cc wrap_SOURCES = wrap.cc -# rgb_to_hsl_SOURCES = rgb_to_hsl.cc De-activated for 1.0 -# hsl_to_rgb_SOURCES = hsl_to_rgb.cc De-activated for 1.0 -# component_SOURCES = component.cc De-activated for 1.0 +#<<lrde +# FIXME: Not distributed (yet). +check_PROGRAMS += \ + component \ + hsl_to_rgb \ + rgb_to_hsl + +component_SOURCES = component.cc +hsl_to_rgb_SOURCES = hsl_to_rgb.cc +rgb_to_hsl_SOURCES = rgb_to_hsl.cc +#>> TESTS = $(check_PROGRAMS) diff --git a/milena/tests/linear/Makefile.am b/milena/tests/linear/Makefile.am index a8e2c08..070415f 100644 --- a/milena/tests/linear/Makefile.am +++ b/milena/tests/linear/Makefile.am @@ -23,8 +23,6 @@ include $(top_srcdir)/milena/tests/tests.mk SUBDIRS = \ local -# gaussian De-activated for 1.0 - check_PROGRAMS = \ convolve \ convolve_directional \ @@ -40,7 +38,10 @@ convolve_2x1d_SOURCES = convolve_2x1d.cc log_SOURCES = log.cc sobel_2d_SOURCES = sobel_2d.cc -# gaussian__SOURCES = gaussian.cc De-activated for 1.0 - +#<<lrde +# FIXME: Not distributed (yet). +check_PROGRAMS += gaussian_ +gaussian__SOURCES = gaussian.cc +#>> TESTS = $(check_PROGRAMS) diff --git a/milena/tests/linear/gaussian/Makefile.am b/milena/tests/linear/gaussian/Makefile.am index 176971f..a3000c3 100644 --- a/milena/tests/linear/gaussian/Makefile.am +++ b/milena/tests/linear/gaussian/Makefile.am @@ -19,9 +19,12 @@ include $(top_srcdir)/milena/tests/tests.mk +#<<lrde +# FIXME: Not distributed (yet). check_PROGRAMS = \ filter filter_SOURCES = filter.cc +#>> TESTS = $(check_PROGRAMS) diff --git a/milena/tests/registration/Makefile.am b/milena/tests/registration/Makefile.am index 4aa4314..f2a953c 100644 --- a/milena/tests/registration/Makefile.am +++ b/milena/tests/registration/Makefile.am @@ -19,9 +19,10 @@ include $(top_srcdir)/milena/tests/tests.mk -check_PROGRAMS = -# registration - -#registration_SOURCES = registration.cc +#<<lrde +# FIXME: Not distributed (yet). +check_PROGRAMS = registration +registration_SOURCES = registration.cc +#>> TESTS = $(check_PROGRAMS) diff --git a/milena/tests/value/Makefile.am b/milena/tests/value/Makefile.am index 59c3314..8650dd3 100644 --- a/milena/tests/value/Makefile.am +++ b/milena/tests/value/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -19,15 +20,11 @@ include $(top_srcdir)/milena/tests/tests.mk -## FIXME: To be added to milena/tests/tests.mk. -full-check: check -## ... - SUBDIRS = \ builtin \ concept -#FIXME: re-enable all the tests. +# FIXME: Re-enable all the tests. check_PROGRAMS = \ bool \ equiv \ @@ -40,20 +37,12 @@ check_PROGRAMS = \ scalar \ set \ sign - -# stack De-activated for 1.0 # float01 # float01_bis # float01_f # graylevel # graylevel_f -# FIXME: Enable when make check_full works. -# check_full_PROGRAMS = \ -# graylevel_full \ -# graylevel_f_full \ -# rgb_full - bool_SOURCES = bool.cc equiv_SOURCES = equiv.cc #float01_SOURCES = float01.cc @@ -61,19 +50,28 @@ equiv_SOURCES = equiv.cc #float01_f_SOURCES = float01_f.cc #graylevel_SOURCES = graylevel.cc #graylevel_f_SOURCES = graylevel_f.cc -interop_SOURCES = interop.cc int_s_SOURCES = int_s.cc int_s16_SOURCES = int_s16.cc int_u8_SOURCES = int_u8.cc +interop_SOURCES = interop.cc label_SOURCES = label.cc rgb8_SOURCES = rgb8.cc scalar_SOURCES = scalar.cc set_SOURCES = set.cc sign_SOURCES = sign.cc -# stack_SOURCES = stack.cc De-activated for 1.0 +#<<lrde +# FIXME: Not distributed (yet). +check_PROGRAMS += stack +stack_SOURCES = stack.cc +#>> # FIXME: Enable when make check_full works. +# check_full_PROGRAMS = \ +# graylevel_full \ +# graylevel_f_full \ +# rgb_full +# # graylevel_f_full_SOURCES = graylevel_f_full.cc # graylevel_full_SOURCES = graylevel_full.cc # rgb_full_SOURCES = rgb_full.cc -- 1.6.2.4

1 0