* 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 &lt;roland(a)lrde.epita.fr&gt; + + 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 &lt;thierry.geraud(a)lrde.epita.fr&gt; 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