- Olena-patches

Re: [Olena-patches] [Olena] #7: Miscellaneous tasks related to the Olena 1.0 release process
by Olena Trac 12 Jun '09

12 Jun '09

#7: Miscellaneous tasks related to the Olena 1.0 release process -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Olena | Version: 1.0 Resolution: | Keywords: release NEWS dates copyright headers sandbox -----------------------+---------------------------------------------------- Old description: > To do before the release: > * use Benoît Sigoure's set of Autoconf macros to check for some Boost > libraries (e.g., the BGL). See also #138; > * ~~move away any information about sandboxes (as they won't be > distributed):~~ > * ~~create a !ChangeLog in source:trunk/milena/sandbox, or several > !ChangeLogs in subdirectories~~ (done in r1923); > * ~~move information from source:trunk/milena/ChangeLog to this > (these) file(s)~~ (done in r1923); > * ~~warn the Olena Team about these changes, and have them document > changes in the right place~~; > * update `NEWS` (see the similar task for Olena 0.10a/0.11: #8); > * update `AUTHORS`; > * ensure all copyright headers are sound (using Benoît Sigoure's > `gplize.sh` script, or a variant of it); > * use Vaucanson' `reheader` script to fix broken headers. > > Split this ticket in several parts if the tasks are either too big or too > numerous. New description: To do before the release: * use Benoît Sigoure's set of Autoconf macros to check for some Boost libraries (e.g., the BGL). See also #138; * ~~move away any information about sandboxes (as they won't be distributed):~~ * ~~create a !ChangeLog in source:trunk/milena/sandbox, or several !ChangeLogs in subdirectories~~ (done in r1923); * ~~move information from source:trunk/milena/ChangeLog to this (these) file(s)~~ (done in r1923); * ~~warn the Olena Team about these changes, and have them document changes in the right place~~; * update `NEWS` (see the similar task for Olena 0.10a/0.11: #8); * ~~update `AUTHORS`~~; (done in r4053) * ~~ensure all copyright headers are sound (using Benoît Sigoure's `gplize.sh` script, or a variant of it)~~ (mostly complete, except problems with the license of the documentation); * use Vaucanson' `reheader` script to fix broken headers. Split this ticket in several parts if the tasks are either too big or too numerous. -- Comment(by levill_r): Update status (AUTHORS and copyright headers). -- Ticket URL: <https://trac.lrde.org/olena/ticket/7#comment:14> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

4132: De-activate Makefiles kept out of release 1.0.
by Thierry Geraud 12 Jun '09

12 Jun '09

https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> De-activate Makefiles kept out of release 1.0. * configure.ac (AC_CONFIG_FILES): De-activate Makefiles kept out of release 1.0. configure.ac | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) Index: configure.ac --- configure.ac (revision 4131) +++ configure.ac (working copy) @@ -282,6 +282,7 @@ 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 @@ -310,7 +311,7 @@ milena/tests/io/tiff/Makefile milena/tests/labeling/Makefile milena/tests/linear/Makefile - milena/tests/linear/gaussian/Makefile +# milena/tests/linear/gaussian/Makefile De-activated for 1.0 milena/tests/linear/local/Makefile milena/tests/literal/Makefile milena/tests/logical/Makefile @@ -336,9 +337,9 @@ milena/tests/norm/Makefile milena/tests/opt/Makefile milena/tests/pw/Makefile - milena/tests/registration/Makefile +# milena/tests/registration/Makefile De-activated for 1.0 milena/tests/set/Makefile - milena/tests/subsampling/Makefile +# milena/tests/subsampling/Makefile De-activated for 1.0 milena/tests/tag/Makefile milena/tests/test/Makefile milena/tests/topo/Makefile @@ -347,6 +348,7 @@ 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

1 0

4131: De-activate dependencies to files kept out of release 1.0.
by Thierry Geraud 12 Jun '09

12 Jun '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> De-activate dependencies to files kept out of release 1.0. * mln/trait/ch_value.hh, * mln/trait/essential.hh, * mln/trait/all.hh, * mln/core/image/vmorph/thru_image.hh, * mln/core/image/vmorph/all.hh, * mln/core/image/vmorph/thrubin_image.hh, * mln/all.hh, * mln/data/all.hh, * mln/linear/all.hh, * mln/value/all.hh, * mln/value/essential.hh, * mln/convert/all.hh, * mln/essential/routine.hh, * mln/fun/all.hh, * mln/fun/v2v/essential.hh, * mln/fun/v2v/all.hh, * mln/fun/essential.hh, * tests/trait/ch_value.cc, * tests/core/image/vmorph/Makefile.am, * tests/linear/Makefile.am, * tests/value/Makefile.am, * tests/convert/Makefile.am, * tests/fun/Makefile.am, * tests/fun/v2v/Makefile.am, * tests/Makefile.am: De-activate dependencies to files kept out of release 1.0. Misc. * mln/core/image/vmorph/fun_image.hh: Re-vamp. * tests/core/image/vmorph/fun_image.cc: New. * mln/accu/shape/bbox.hh: Fix namespace balancing. mln/accu/shape/bbox.hh | 8 ++- mln/all.hh | 9 +++- mln/convert/all.hh | 3 - mln/core/image/vmorph/all.hh | 5 +- mln/core/image/vmorph/fun_image.hh | 67 ++++++++++++++++++++++----------- mln/core/image/vmorph/thru_image.hh | 11 ++--- mln/core/image/vmorph/thrubin_image.hh | 12 +++-- mln/data/all.hh | 3 - mln/essential/routine.hh | 13 ++++-- mln/fun/all.hh | 15 ++++++- mln/fun/essential.hh | 7 ++- mln/fun/v2v/all.hh | 12 +++-- mln/fun/v2v/essential.hh | 8 ++- mln/linear/all.hh | 16 +++---- mln/trait/all.hh | 22 ++++------ mln/trait/ch_value.hh | 37 +++++++++--------- mln/trait/essential.hh | 19 +++------ mln/value/all.hh | 16 ++++--- mln/value/essential.hh | 9 ++-- tests/Makefile.am | 7 +-- tests/convert/Makefile.am | 4 - tests/core/image/vmorph/Makefile.am | 4 + tests/core/image/vmorph/fun_image.cc | 47 +++++++++++++++++++++++ tests/fun/Makefile.am | 3 - tests/fun/v2v/Makefile.am | 11 ++--- tests/linear/Makefile.am | 11 +++-- tests/trait/ch_value.cc | 17 ++++---- tests/value/Makefile.am | 8 ++- 28 files changed, 265 insertions(+), 139 deletions(-) Index: mln/trait/ch_value.hh --- mln/trait/ch_value.hh (revision 4130) +++ mln/trait/ch_value.hh (working copy) @@ -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. // @@ -115,23 +116,25 @@ typedef M< mln_ch_value(I, V), E > ret; }; - // 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_ >, 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; - }; + // 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_ >, 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; +// }; // For mln::complex_image<D, G, T>. template < template <unsigned, class, class> class M, Index: mln/trait/essential.hh --- mln/trait/essential.hh (revision 4130) +++ mln/trait/essential.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2006, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2006, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -26,20 +27,14 @@ #ifndef MLN_TRAIT_ESSENTIAL_HH # define MLN_TRAIT_ESSENTIAL_HH -/*! - * \file - * - * \brief Definition of essential traits. - * - */ +/// +/// \file +/// +/// \brief Definition of essential traits. -// meta-program to solve a trait cessential -# include <mln/trait/solve.hh> -// promote +# include <mln/trait/solve.hh> # include <mln/trait/promote.hh> - -// ops # include <mln/trait/op/essential.hh> Index: mln/trait/all.hh --- mln/trait/all.hh (revision 4130) +++ mln/trait/all.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -26,12 +27,10 @@ #ifndef MLN_TRAIT_ALL_HH # define MLN_TRAIT_ALL_HH -/*! - * \file - * - * \brief Definition of all traits. - * - */ +/// +/// \file +/// +/// \brief Definition of all traits. namespace mln @@ -55,14 +54,13 @@ } // end of namespace mln -// meta-program to solve a trait call # include <mln/trait/solve.hh> - -// promote # include <mln/trait/promote.hh> - -// ops # 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 + + #endif // ! MLN_TRAIT_ALL_HH Index: mln/core/image/vmorph/thru_image.hh --- mln/core/image/vmorph/thru_image.hh (revision 4130) +++ mln/core/image/vmorph/thru_image.hh (working copy) @@ -26,17 +26,18 @@ #ifndef MLN_CORE_IMAGE_VMORPH_THRU_IMAGE_HH # define MLN_CORE_IMAGE_VMORPH_THRU_IMAGE_HH -# include <mln/core/internal/image_value_morpher.hh> -# include <mln/core/concept/meta_function.hh> -# include <mln/metal/bexpr.hh> -# include <mln/trait/functions.hh> - /// \file /// /// \brief Definition of a morpher that morph image values through a function. /// /// \todo Debug constness of thru_image +# include <mln/core/internal/image_value_morpher.hh> +# include <mln/core/concept/meta_function.hh> +# include <mln/metal/bexpr.hh> +# include <mln/trait/functions.hh> + + namespace mln { Index: mln/core/image/vmorph/all.hh --- mln/core/image/vmorph/all.hh (revision 4130) +++ mln/core/image/vmorph/all.hh (working copy) @@ -33,9 +33,10 @@ # include <mln/core/image/vmorph/cast_image.hh> # include <mln/core/image/vmorph/fun_image.hh> -# 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 Index: mln/core/image/vmorph/fun_image.hh --- mln/core/image/vmorph/fun_image.hh (revision 4130) +++ mln/core/image/vmorph/fun_image.hh (working copy) @@ -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. // @@ -28,16 +29,17 @@ /// \file /// -/// Definition of an image morpher that make the user see the -/// image through a function +/// Definition of an image morpher that returns image data through a +/// function. # include <mln/core/internal/image_value_morpher.hh> # include <mln/trait/images.hh> # include <mln/value/set.hh> -# include <mln/value/shell.hh> +// # include <mln/value/shell.hh> De-activated for 1.0 # include <mln/metal/if.hh> # include <mln/metal/equal.hh> + namespace mln { @@ -50,8 +52,9 @@ template <typename F, typename I> struct data< fun_image<F,I> > { - data(I& ima); - I& ima_; + data(const F& f, const I& ima); + F f_; + const I ima_; }; } // end of namespace mln::internal @@ -66,7 +69,7 @@ { // typedef trait::image::category::value_morpher category; typedef trait::image::category::primary category; // does not work either - typedef trait::image::value_io::read_write value_io; + typedef trait::image::value_io::read_only value_io; typedef trait::image::value_access::computed value_access; typedef trait::image::value_storage::disrupted value_storage; typedef @@ -88,7 +91,6 @@ - /// Image read through a function. /// /// \ingroup modimagevaluemorpher @@ -104,7 +106,8 @@ typedef mln_result(F) rvalue; /// Return type of read-write access. - typedef mln::value::shell<F,I> lvalue; + typedef mln_result(F) lvalue; + // typedef mln::value::shell<F,I> lvalue; De-activated for 1.0 /// Skeleton. typedef fun_image< tag::value_<mln_result(F)>, tag::image_ > skeleton; @@ -113,23 +116,42 @@ fun_image(); /// Constructor. - fun_image(Image& ima); + fun_image(const Function_v2v<F>& f, const Image& ima); /// Initialize an empty image. - void init_(Image& ima); + void init_(const Function_v2v<F>& f, const Image& ima); /// Read-only access of pixel value at point site \p p. mln_result(F) operator()(const mln_psite(I)& p) const; - /// Mutable access is for reading and writing. - lvalue operator()(const mln_psite(I)& p); + /// Mutable access is for reading only. + mln_result(F) operator()(const mln_psite(I)& p); + // lvalue operator()(const mln_psite(I)& p); De-activated for 1.0 F f; }; + + + template <typename F, typename I> + fun_image<F, I> + operator << (const Function_v2v<F>& f, const Image& ima); + + + # ifndef MLN_INCLUDE_ONLY + template <typename F, typename I> + fun_image<F, I> + inline + operator << (const Function_v2v<F>& f, const Image& ima) + { + fun_image<F, I> tmp(exact(f), exact(ima)); + return tmp; + } + + // internal::data< fun_image<T,I> > namespace internal @@ -137,8 +159,9 @@ template <typename F, typename I> inline - data< fun_image<F,I> >::data(I& ima) - : ima_(ima) + data< fun_image<F,I> >::data(const F& f, const I& ima) + : f_(f), + ima_(ima) { } @@ -156,19 +179,19 @@ template <typename F, typename I> inline - fun_image<F,I>::fun_image(Image& ima) + fun_image<F,I>::fun_image(const Function_v2v<F>& f, const Image& ima) { - init_(ima); + init_(f, ima); } template <typename F, typename I> inline void - fun_image<F,I>::init_(Image& ima) + fun_image<F,I>::init_(const Function_v2v<F>& f, const Image& ima) { mln_precondition(exact(ima).is_valid()); - this->data_ = new internal::data<fun_image<F,I> >(exact(ima)); + this->data_ = new internal::data<fun_image<F,I> >(exact(f), exact(ima)); } @@ -183,10 +206,12 @@ template <typename F, typename I> inline - value::shell<F, I> + mln_result(F) fun_image<F,I>::operator()(const mln_psite(I)& p) { - return mln::value::shell<F, I>( this->data_->ima_, p ); + mln_precondition(this->data_->ima_.has(p)); + return f( this->data_->ima_(p) ); +// return mln::value::shell<F, I>( this->data_->ima_, p ); De-activated for 1.0 } Index: mln/core/image/vmorph/thrubin_image.hh --- mln/core/image/vmorph/thrubin_image.hh (revision 4130) +++ mln/core/image/vmorph/thrubin_image.hh (working copy) @@ -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. // @@ -26,15 +27,16 @@ #ifndef MLN_CORE_IMAGE_VMORPH_THRUBIN_IMAGE_HH # define MLN_CORE_IMAGE_VMORPH_THRUBIN_IMAGE_HH +/// \file +/// +/// \brief Definition of a morpher that morph values from two images +/// through a binary function. + # include <mln/core/internal/image_value_morpher.hh> # include <mln/core/concept/meta_function.hh> # include <mln/metal/bexpr.hh> # include <mln/trait/functions.hh> -/// \file -/// -/// \brief Definition of a morpher that morph values from two images -/// through a binary function. namespace mln { Index: mln/all.hh --- mln/all.hh (revision 4130) +++ mln/all.hh (working copy) @@ -29,6 +29,8 @@ /// \file /// /// File that includes all the headers. +/// +/// \todo Do not include essentials. #include <mln/accu/all.hh> @@ -43,7 +45,6 @@ #include <mln/draw/all.hh> #include <mln/estim/all.hh> #include <mln/extension/all.hh> -#include <mln/extract/all.hh> #include <mln/fun/all.hh> #include <mln/geom/all.hh> #include <mln/graph/all.hh> @@ -74,4 +75,10 @@ #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 Index: mln/data/all.hh --- mln/data/all.hh (revision 4130) +++ mln/data/all.hh (working copy) @@ -68,7 +68,8 @@ # include <mln/data/to_enc.hh> # include <mln/data/transform.hh> # include <mln/data/update.hh> -//<< # include <mln/data/was.median.hh> >> + +// # include <mln/data/was.median.hh> De-activated in 1.0 Index: mln/linear/all.hh --- mln/linear/all.hh (revision 4130) +++ mln/linear/all.hh (working copy) @@ -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. // @@ -58,15 +59,14 @@ # include <mln/linear/convolve.hh> # include <mln/linear/convolve_2x1d.hh> # include <mln/linear/convolve_directional.hh> - -# 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> -//# include <mln/linear/local/convolve.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 #endif // ! MLN_LINEAR_ALL_HH Index: mln/accu/shape/bbox.hh --- mln/accu/shape/bbox.hh (revision 4130) +++ mln/accu/shape/bbox.hh (working copy) @@ -81,7 +81,7 @@ }; - } // end of mln::accu::shape + } // end of namespace mln::accu::shape namespace meta @@ -104,6 +104,8 @@ } // end of namespace mln::accu::meta + + # ifndef MLN_INCLUDE_ONLY namespace shape @@ -224,10 +226,10 @@ return is_valid_; } -# endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::accu::shape +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::accu } // end of namespace mln Index: mln/value/all.hh --- mln/value/all.hh (revision 4130) +++ mln/value/all.hh (working copy) @@ -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. // @@ -29,6 +30,8 @@ /// \file /// /// File that includes all "value types"-related materials. +/// +/// \todo Incomplete list of files. namespace mln @@ -44,18 +47,19 @@ } -# include <mln/value/aliases.hh> -# include <mln/value/label.hh> # include <mln/trait/value_.hh> -# include <mln/value/proxy.hh> +# include <mln/value/aliases.hh> # include <mln/value/interval.hh> +# include <mln/value/label.hh> +# include <mln/value/proxy.hh> // FIXME: that includes concept/image.hh! -// # include <mln/value/cast.hh> -// # include <mln/value/stack.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 Index: mln/value/essential.hh --- mln/value/essential.hh (revision 4130) +++ mln/value/essential.hh (working copy) @@ -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. // @@ -30,14 +31,15 @@ /// /// File that includes essential "value types"-related materials. + # include <mln/value/concept/essential.hh> # include <mln/value/builtin/essential.hh> # include <mln/value/float01_8.hh> # include <mln/value/float01_16.hh> -//# include <mln/value/gl8.hh> -//# include <mln/value/gl16.hh> +// # include <mln/value/gl8.hh> De-activated in 1.0 +// # include <mln/value/gl16.hh> De-activated in 1.0 # include <mln/value/int_s8.hh> # include <mln/value/int_s16.hh> @@ -53,4 +55,5 @@ # include <mln/value/rgb8.hh> # include <mln/value/rgb16.hh> + #endif // ! MLN_VALUE_ESSENTIAL_HH Index: mln/convert/all.hh --- mln/convert/all.hh (revision 4130) +++ mln/convert/all.hh (working copy) @@ -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. // Index: mln/essential/routine.hh --- mln/essential/routine.hh (revision 4130) +++ mln/essential/routine.hh (working copy) @@ -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. // @@ -26,6 +27,7 @@ #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> @@ -40,7 +42,6 @@ # include <mln/draw/essential.hh> # include <mln/estim/essential.hh> # include <mln/extension/essential.hh> -# include <mln/extract/essential.hh> # include <mln/fun/essential.hh> # include <mln/geom/essential.hh> # include <mln/graph/essential.hh> @@ -58,9 +59,7 @@ # include <mln/norm/essential.hh> # include <mln/opt/essential.hh> # include <mln/pw/essential.hh> -# include <mln/registration/essential.hh> # include <mln/set/essential.hh> -# include <mln/subsampling/essential.hh> # include <mln/tag/essential.hh> # include <mln/test/essential.hh> # include <mln/trace/essential.hh> @@ -70,4 +69,10 @@ # 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 Index: mln/fun/all.hh --- mln/fun/all.hh (revision 4130) +++ mln/fun/all.hh (working copy) @@ -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. // @@ -29,6 +30,8 @@ /// \file /// /// File that includes all functions. +/// +/// \todo Incomplete list of files. namespace mln @@ -46,10 +49,15 @@ } +// Files. + # include <mln/fun/c.hh> # include <mln/fun/ops.hh> + + +// Sub-directories. + # include <mln/fun/i2v/all.hh> -# include <mln/fun/meta/all.hh> # include <mln/fun/p2b/all.hh> # include <mln/fun/p2v/all.hh> # include <mln/fun/stat/all.hh> @@ -61,5 +69,8 @@ # 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 Index: mln/fun/v2v/essential.hh --- mln/fun/v2v/essential.hh (revision 4130) +++ mln/fun/v2v/essential.hh (working copy) @@ -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. // @@ -30,10 +31,13 @@ /// /// \brief File that includes essential functions from value to value. + # include <mln/fun/v2v/abs.hh> # include <mln/fun/v2v/cast.hh> # include <mln/fun/v2v/convert.hh> -# 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 Index: mln/fun/v2v/all.hh --- mln/fun/v2v/all.hh (revision 4130) +++ mln/fun/v2v/all.hh (working copy) @@ -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. // @@ -51,16 +52,17 @@ # include <mln/fun/v2v/convert.hh> # include <mln/fun/v2v/dec.hh> # include <mln/fun/v2v/enc.hh> -# 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> -# 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 Index: mln/fun/essential.hh --- mln/fun/essential.hh (revision 4130) +++ mln/fun/essential.hh (working copy) @@ -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. // @@ -30,10 +31,11 @@ /// /// File that includes essential fun-related routines. + # include <mln/fun/c.hh> # include <mln/fun/ops.hh> # include <mln/fun/i2v/essential.hh> -# include <mln/fun/meta/essential.hh> +// # include <mln/fun/meta/essential.hh> # include <mln/fun/p2b/essential.hh> # include <mln/fun/p2v/essential.hh> # include <mln/fun/v2b/essential.hh> @@ -43,4 +45,5 @@ # include <mln/fun/x2v/essential.hh> # include <mln/fun/x2x/essential.hh> + #endif // ! MLN_FUN_ESSENTIAL_HH Index: tests/trait/ch_value.cc --- tests/trait/ch_value.cc (revision 4130) +++ tests/trait/ch_value.cc (working copy) @@ -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. // @@ -26,7 +27,7 @@ #include <mln/trait/ch_value.hh> #include <mln/core/image/image2d.hh> -#include <mln/value/stack.hh> +// #include <mln/value/stack.hh> De-activated for 1.0 int main() @@ -37,11 +38,13 @@ typedef trait::ch_value<I, bool>::ret J; J ima1; - // 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(); + // 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(); // FIXME: Exercise more image types. // ... Index: tests/core/image/vmorph/Makefile.am --- tests/core/image/vmorph/Makefile.am (revision 4130) +++ tests/core/image/vmorph/Makefile.am (working copy) @@ -20,8 +20,10 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - cast_image + cast_image \ + fun_image cast_image_SOURCES = cast_image.cc +fun_image_SOURCES = fun_image.cc TESTS = $(check_PROGRAMS) Index: tests/core/image/vmorph/fun_image.cc --- tests/core/image/vmorph/fun_image.cc (revision 0) +++ tests/core/image/vmorph/fun_image.cc (revision 0) @@ -0,0 +1,47 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// 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. +// +// 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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. + +#include <mln/core/image/image2d.hh> +#include <mln/core/image/vmorph/fun_image.hh> +#include <mln/data/compare.hh> +#include <mln/debug/iota.hh> +#include <mln/fun/v2v/inc.hh> + + + +int main() +{ + using namespace mln; + + + image2d<int> ima(2, 2); + debug::iota(ima); + + int vals[] = { 2, 3, + 4, 5 }; + + fun::v2v::inc<int> f; + mln_assertion((f << ima) == make::image2d(vals)); +} Index: tests/linear/Makefile.am --- tests/linear/Makefile.am (revision 4130) +++ tests/linear/Makefile.am (working copy) @@ -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. # @@ -20,24 +21,26 @@ include $(top_srcdir)/milena/tests/tests.mk SUBDIRS = \ - gaussian \ local +# gaussian De-activated for 1.0 + check_PROGRAMS = \ convolve \ convolve_directional \ convolve_2x1d \ - gaussian_ \ lap \ log \ sobel_2d convolve_SOURCES = convolve.cc -gaussian__SOURCES = gaussian.cc lap_SOURCES = lap.cc convolve_directional_SOURCES = convolve_directional.cc 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 + + TESTS = $(check_PROGRAMS) Index: tests/value/Makefile.am --- tests/value/Makefile.am (revision 4130) +++ tests/value/Makefile.am (working copy) @@ -39,8 +39,9 @@ rgb8 \ scalar \ set \ - sign \ - stack + sign + +# stack De-activated for 1.0 # float01 # float01_bis # float01_f @@ -69,7 +70,8 @@ scalar_SOURCES = scalar.cc set_SOURCES = set.cc sign_SOURCES = sign.cc -stack_SOURCES = stack.cc + +# stack_SOURCES = stack.cc De-activated for 1.0 # FIXME: Enable when make check_full works. # graylevel_f_full_SOURCES = graylevel_f_full.cc Index: tests/convert/Makefile.am --- tests/convert/Makefile.am (revision 4130) +++ tests/convert/Makefile.am (working copy) @@ -23,14 +23,13 @@ ##FIXME: re-enable all tests check_PROGRAMS = \ - to_hsl \ to_image \ to_p_array \ to_p_set \ to_rgb \ to_window -to_hsl_SOURCES = to_hsl.cc +# 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 @@ -38,4 +37,3 @@ to_window_SOURCES = to_window.cc TESTS = $(check_PROGRAMS) - Index: tests/fun/Makefile.am --- tests/fun/Makefile.am (revision 4130) +++ tests/fun/Makefile.am (working copy) @@ -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. # Index: tests/fun/v2v/Makefile.am --- tests/fun/v2v/Makefile.am (revision 4130) +++ tests/fun/v2v/Makefile.am (working copy) @@ -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. # @@ -20,16 +21,16 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - hsl_to_rgb \ norm \ projection \ - rgb_to_hsl \ wrap norm_SOURCES = norm.cc projection_SOURCES = projection.cc -rgb_to_hsl_SOURCES = rgb_to_hsl.cc -hsl_to_rgb_SOURCES = hsl_to_rgb.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 + TESTS = $(check_PROGRAMS) Index: tests/Makefile.am --- tests/Makefile.am (revision 4130) +++ tests/Makefile.am (working copy) @@ -34,7 +34,6 @@ draw \ estim \ extension \ - extract \ fun \ geom \ graph \ @@ -51,9 +50,7 @@ norm \ opt \ pw \ - registration \ set \ - subsampling \ tag \ test \ topo \ @@ -67,6 +64,10 @@ win \ world +# extract De-activated for 1.0 +# registration De-activated for 1.0 +# subsampling De-activated for 1.0 + check_PROGRAMS = \ all_headers \

1 0

4130: headers.mk: Regen.
by Roland Levillain 12 Jun '09

12 Jun '09

--- milena/ChangeLog | 4 +++ milena/headers.mk | 69 ++++------------------------------------------------- 2 files changed, 9 insertions(+), 64 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 589c80d..429c2fb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2009-06-12 Roland Levillain <roland(a)lrde.epita.fr> + * headers.mk: Regen. + +2009-06-12 Roland Levillain <roland(a)lrde.epita.fr> + Prevent generate_dist_headers.sh from distributing certain files. * nodist-headers: New. diff --git a/milena/headers.mk b/milena/headers.mk index 76725c1..0294aa6 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -1,7 +1,6 @@ -## Generated by ./generate_dist_headers, do not modify ## +## Generated by `generate_dist_headers.sh', do not edit by hand. nobase_include_HEADERS = \ -mln/version.hh \ mln/accu/all.hh \ mln/accu/center.hh \ mln/accu/compute.hh \ @@ -139,6 +138,7 @@ mln/canvas/morpho/internal/find_root.hh \ mln/convert/all.hh \ mln/convert/essential.hh \ mln/convert/from_to.hh \ +mln/convert/from_to.hxx \ mln/convert/impl/all.hh \ mln/convert/impl/from_double_to_value.hh \ mln/convert/impl/from_float_to_value.hh \ @@ -231,6 +231,7 @@ mln/core/concept/pixel_iterator.hh \ mln/core/concept/point.hh \ mln/core/concept/point_site.hh \ mln/core/concept/proxy.hh \ +mln/core/concept/proxy.hxx \ mln/core/concept/pseudo_site.hh \ mln/core/concept/regular_grid.hh \ mln/core/concept/site.hh \ @@ -299,7 +300,6 @@ 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/fun_image.hh \ mln/core/image/vmorph/thru_image.hh \ mln/core/image/vmorph/thrubin_image.hh \ mln/core/image/vmorph/violent_cast_image.hh \ @@ -356,6 +356,7 @@ mln/core/routine/essential.hh \ mln/core/routine/exact.hh \ mln/core/routine/extend.hh \ mln/core/routine/init.hh \ +mln/core/routine/init.hxx \ mln/core/routine/initialize.hh \ mln/core/routine/ops.hh \ mln/core/routine/primary.hh \ @@ -440,7 +441,6 @@ mln/data/transform.hh \ mln/data/transform.spe.hh \ mln/data/transform_inplace.hh \ mln/data/update.hh \ -mln/data/was.median.hh \ mln/debug/all.hh \ mln/debug/draw_graph.hh \ mln/debug/essential.hh \ @@ -480,34 +480,20 @@ mln/extension/all.hh \ mln/extension/duplicate.hh \ mln/extension/essential.hh \ mln/extension/fill.hh \ -mln/extract/all.hh \ -mln/extract/blue.hh \ -mln/extract/essential.hh \ -mln/extract/green.hh \ -mln/extract/hue.hh \ -mln/extract/lum.hh \ -mln/extract/red.hh \ -mln/extract/sat.hh \ mln/fun/access/all.hh \ mln/fun/access/mean.hh \ mln/fun/accu_result.hh \ mln/fun/all.hh \ -mln/fun/binary.hh \ -mln/fun/binary_param.hh \ mln/fun/c.hh \ mln/fun/cast.hh \ mln/fun/component/blue.hh \ -mln/fun/component/comp.hh \ mln/fun/component/comp_count.hh \ mln/fun/component/green.hh \ mln/fun/component/ithcomp.hh \ mln/fun/component/red.hh \ mln/fun/component/rgb.hh \ mln/fun/component/scomp.hh \ -mln/fun/compose.hh \ -mln/fun/composition.hh \ mln/fun/essential.hh \ -mln/fun/from_accu.hh \ mln/fun/i2v/all.hh \ mln/fun/i2v/all_to.hh \ mln/fun/i2v/array.hh \ @@ -522,18 +508,6 @@ mln/fun/math/cos.hh \ mln/fun/math/inf.hh \ mln/fun/math/norm.hh \ mln/fun/math/sup.hh \ -mln/fun/meta/all.hh \ -mln/fun/meta/blue.hh \ -mln/fun/meta/essential.hh \ -mln/fun/meta/first.hh \ -mln/fun/meta/green.hh \ -mln/fun/meta/hue.hh \ -mln/fun/meta/inty.hh \ -mln/fun/meta/lum.hh \ -mln/fun/meta/red.hh \ -mln/fun/meta/sat.hh \ -mln/fun/meta/second.hh \ -mln/fun/meta/to_enc.hh \ mln/fun/ops.hh \ mln/fun/p2b/all.hh \ mln/fun/p2b/antilogy.hh \ @@ -551,16 +525,11 @@ mln/fun/p2v/elifs.hh \ mln/fun/p2v/essential.hh \ mln/fun/p2v/iota.hh \ mln/fun/p2v/ternary.hh \ -mln/fun/param.hh \ mln/fun/point/col.hh \ mln/fun/point/row.hh \ mln/fun/point/sli.hh \ -mln/fun/spe/binary.hh \ -mln/fun/spe/unary.hh \ mln/fun/stat/all.hh \ mln/fun/stat/mahalanobis.hh \ -mln/fun/unary.hh \ -mln/fun/unary_param.hh \ mln/fun/v2b/all.hh \ mln/fun/v2b/essential.hh \ mln/fun/v2b/lnot.hh \ @@ -576,15 +545,11 @@ mln/fun/v2v/convert.hh \ mln/fun/v2v/dec.hh \ mln/fun/v2v/enc.hh \ mln/fun/v2v/essential.hh \ -mln/fun/v2v/hsi_to_rgb.hh \ -mln/fun/v2v/hsl_to_rgb.hh \ mln/fun/v2v/id.hh \ mln/fun/v2v/inc.hh \ mln/fun/v2v/linear.hh \ mln/fun/v2v/norm.hh \ mln/fun/v2v/projection.hh \ -mln/fun/v2v/rgb_to_hsi.hh \ -mln/fun/v2v/rgb_to_hsl.hh \ mln/fun/v2v/saturate.hh \ mln/fun/v2v/wrap.hh \ mln/fun/v2w2v/all.hh \ @@ -740,12 +705,6 @@ mln/linear/convolve.hh \ mln/linear/convolve_2x1d.hh \ mln/linear/convolve_directional.hh \ mln/linear/essential.hh \ -mln/linear/gaussian.hh \ -mln/linear/gaussian/filter.hh \ -mln/linear/gaussian/impl.hh \ -mln/linear/gaussian/internal/coefficients.hh \ -mln/linear/gaussian_1d.hh \ -mln/linear/gaussian_directional_2d.hh \ mln/linear/lap.hh \ mln/linear/local/convolve.hh \ mln/linear/log.hh \ @@ -987,13 +946,6 @@ mln/pw/image.hh \ mln/pw/internal/image_base.hh \ mln/pw/value.hh \ mln/pw/var.hh \ -mln/registration/all.hh \ -mln/registration/essential.hh \ -mln/registration/get_rot.hh \ -mln/registration/get_rtransf.hh \ -mln/registration/icp.hh \ -mln/registration/internal/rms.hh \ -mln/registration/registration.hh \ mln/set/all.hh \ mln/set/card.hh \ mln/set/compute.hh \ @@ -1074,10 +1026,6 @@ mln/trait/image/props.hh \ mln/trait/image_from_grid.hh \ mln/trait/images.hh \ mln/trait/neighborhood.hh \ -mln/trait/next/solve.hh \ -mln/trait/next/solve_binary.hh \ -mln/trait/next/solve_proxy.hh \ -mln/trait/next/solve_unary.hh \ mln/trait/op/all.hh \ mln/trait/op/and.hh \ mln/trait/op/decl.hh \ @@ -1221,8 +1169,6 @@ mln/value/gl8.hh \ mln/value/glf.hh \ mln/value/graylevel.hh \ mln/value/graylevel_f.hh \ -mln/value/hsi.hh \ -mln/value/hsl.hh \ mln/value/int_s.hh \ mln/value/int_s16.hh \ mln/value/int_s32.hh \ @@ -1257,9 +1203,7 @@ mln/value/rgb16.hh \ mln/value/rgb8.hh \ mln/value/scalar.hh \ mln/value/set.hh \ -mln/value/shell.hh \ mln/value/sign.hh \ -mln/value/stack.hh \ mln/value/super_value.hh \ mln/value/viter.hh \ mln/win/all.hh \ @@ -1302,7 +1246,4 @@ mln/world/inter_pixel/immerse.hh \ mln/world/inter_pixel/is_pixel.hh \ mln/world/inter_pixel/is_separator.hh \ mln/world/inter_pixel/neighb2d.hh \ -mln/world/inter_pixel/separator_to_pixels.hh \ -mln/convert/from_to.hxx \ -mln/core/concept/proxy.hxx \ -mln/core/routine/init.hxx +mln/world/inter_pixel/separator_to_pixels.hh -- 1.6.2.4

1 0

[PATCH 2/2] Prevent generate_dist_headers.sh from distributing certain files.
by Roland Levillain 12 Jun '09

12 Jun '09

* nodist-headers: New. * generate_dist_headers.sh: Prune the list of headers to distribute using file `nodist-headers'. * Makefile.am (EXTRA_DIST): Add nodist-headers. ($(srcdir)/headers.mk): Depend on nodist-headers. --- milena/ChangeLog | 10 +++++ milena/Makefile.am | 4 +- milena/generate_dist_headers.sh | 5 +++ milena/nodist-headers | 71 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 milena/nodist-headers diff --git a/milena/ChangeLog b/milena/ChangeLog index 462287a..589c80d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2009-06-12 Roland Levillain <roland(a)lrde.epita.fr> + Prevent generate_dist_headers.sh from distributing certain files. + + * nodist-headers: New. + * generate_dist_headers.sh: Prune the list of headers to + distribute using file `nodist-headers'. + * Makefile.am (EXTRA_DIST): Add nodist-headers. + ($(srcdir)/headers.mk): Depend on nodist-headers. + +2009-06-12 Roland Levillain <roland(a)lrde.epita.fr> + Simplify generate_dist_headers.sh in Milena. * generate_dist_headers.sh: Use a heredoc instead of multiple diff --git a/milena/Makefile.am b/milena/Makefile.am index 3c7269d..c498a7a 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -72,12 +72,12 @@ REGEN_SUBDIRS += doc tests regen-am: cd $(srcdir) && ./generate_dist_headers.sh -EXTRA_DIST = generate_dist_headers.sh +EXTRA_DIST = generate_dist_headers.sh nodist-headers # FIXME: Change generate_dist_headers.sh so that the action looks like this: # # $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@ # -$(srcdir)/headers.mk: $(srcdir)/generate_dist_headers.sh +$(srcdir)/headers.mk: $(srcdir)/generate_dist_headers.sh nodist-headers cd $(srcdir) && ./generate_dist_headers.sh include $(srcdir)/headers.mk diff --git a/milena/generate_dist_headers.sh b/milena/generate_dist_headers.sh index bf276d7..18ee545 100755 --- a/milena/generate_dist_headers.sh +++ b/milena/generate_dist_headers.sh @@ -8,7 +8,11 @@ export LC_ALL=C me=`basename $0` +# FIXME: OUTPUT and NODIST_HEADERS should be arguments of the script. output=headers.mk +nodist_headers=nodist-headers +test -f "$nodist_headers" \ + || { echo "$me: Cannot find \`$nodist_headers' in `pwd`."; exit 1; } echo "Generating $output..." >&2 rm -f "$output" @@ -20,6 +24,7 @@ EOF find mln -type f -a $ -name '*.hh' -o -name '*.hxx' $ \ | sort \ + | comm -23 - "$nodist_headers" \ | sed -e 's/$/ \\/g' >> headers.mk last_line=`tail -n 1 headers.mk | sed -e 's/\\\//g'` # remove '\' in last line diff --git a/milena/nodist-headers b/milena/nodist-headers new file mode 100644 index 0000000..f0e07b7 --- /dev/null +++ b/milena/nodist-headers @@ -0,0 +1,71 @@ +milena/mln/fun/meta/all.hh +milena/mln/fun/meta/blue.hh +milena/mln/fun/meta/essential.hh +milena/mln/fun/meta/first.hh +milena/mln/fun/meta/green.hh +milena/mln/fun/meta/hue.hh +milena/mln/fun/meta/inty.hh +milena/mln/fun/meta/lum.hh +milena/mln/fun/meta/red.hh +milena/mln/fun/meta/sat.hh +milena/mln/fun/meta/second.hh +milena/mln/fun/meta/to_enc.hh +mln/core/image/vmorph/fun_image.hh +mln/data/was.median.hh +mln/extract/all.hh +mln/extract/blue.hh +mln/extract/essential.hh +mln/extract/green.hh +mln/extract/hue.hh +mln/extract/lum.hh +mln/extract/red.hh +mln/extract/sat.hh +mln/fun/binary.hh +mln/fun/binary_param.hh +mln/fun/component/comp.hh +mln/fun/compose.hh +mln/fun/composition.hh +mln/fun/from_accu.hh +mln/fun/meta/all.hh +mln/fun/meta/blue.hh +mln/fun/meta/essential.hh +mln/fun/meta/first.hh +mln/fun/meta/green.hh +mln/fun/meta/hue.hh +mln/fun/meta/inty.hh +mln/fun/meta/lum.hh +mln/fun/meta/red.hh +mln/fun/meta/sat.hh +mln/fun/meta/second.hh +mln/fun/meta/to_enc.hh +mln/fun/param.hh +mln/fun/spe/binary.hh +mln/fun/spe/unary.hh +mln/fun/unary.hh +mln/fun/unary_param.hh +mln/fun/v2v/hsi_to_rgb.hh +mln/fun/v2v/hsl_to_rgb.hh +mln/fun/v2v/rgb_to_hsi.hh +mln/fun/v2v/rgb_to_hsl.hh +mln/linear/gaussian.hh +mln/linear/gaussian/filter.hh +mln/linear/gaussian/impl.hh +mln/linear/gaussian/internal/coefficients.hh +mln/linear/gaussian_1d.hh +mln/linear/gaussian_directional_2d.hh +mln/registration/all.hh +mln/registration/essential.hh +mln/registration/get_rot.hh +mln/registration/get_rtransf.hh +mln/registration/icp.hh +mln/registration/internal +mln/registration/internal/rms.hh +mln/registration/registration.hh +mln/trait/next/solve.hh +mln/trait/next/solve_binary.hh +mln/trait/next/solve_proxy.hh +mln/trait/next/solve_unary.hh +mln/value/hsi.hh +mln/value/hsl.hh +mln/value/shell.hh +mln/value/stack.hh -- 1.6.2.4

1 0

[PATCH 1/2] Simplify generate_dist_headers.sh in Milena.
by Roland Levillain 12 Jun '09

12 Jun '09

* generate_dist_headers.sh: Use a heredoc instead of multiple echoes. Do not add mln/version.hh (leave it to Makefile.am). Echo status messages on stderr, not stdout. Use a single `find' to search `*.hh' and `*.hxx' files. Remove the useless post-processing pass dropping Subversion's cached copies, as they are not caught by find anyway. Sort results before performing string replacement. * Makefile.am (nobase_include_HEADERS): Add mln/version.hh. --- milena/ChangeLog | 14 ++++++++++++++ milena/Makefile.am | 3 +++ milena/generate_dist_headers.sh | 24 +++++++++++++++--------- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a059a09..462287a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2009-06-12 Roland Levillain <roland(a)lrde.epita.fr> + Simplify generate_dist_headers.sh in Milena. + + * generate_dist_headers.sh: Use a heredoc instead of multiple + echoes. + Do not add mln/version.hh (leave it to Makefile.am). + Echo status messages on stderr, not stdout. + Use a single `find' to search `*.hh' and `*.hxx' files. + Remove the useless post-processing pass dropping Subversion's + cached copies, as they are not caught by find anyway. + Sort results before performing string replacement. + * Makefile.am (nobase_include_HEADERS): Add mln/version.hh. + +2009-06-12 Roland Levillain <roland(a)lrde.epita.fr> + Regen Makefile helpers. * doc/outputs/outputs.mk, diff --git a/milena/Makefile.am b/milena/Makefile.am index a1db868..3c7269d 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -82,6 +82,9 @@ $(srcdir)/headers.mk: $(srcdir)/generate_dist_headers.sh include $(srcdir)/headers.mk +# Generated by configure from mln/version.hh.in. +nobase_include_HEADERS += mln/version.hh + EXTRA_DIST += \ img/README \ img/fly.pbm \ diff --git a/milena/generate_dist_headers.sh b/milena/generate_dist_headers.sh index 6f72a5f..bf276d7 100755 --- a/milena/generate_dist_headers.sh +++ b/milena/generate_dist_headers.sh @@ -1,20 +1,26 @@ #! /bin/sh -# Generate milena/headers.mk -# ------------------------------ +# Generate headers.mk. +# -------------------- # List all the headers in order to make them part of distribution. # Use the C locale to have a deterministic sort. export LC_ALL=C -echo "## Generated by ./generate_dist_headers, do not modify ##" > headers.mk -echo "" >> headers.mk -echo "nobase_include_HEADERS = \\" >> headers.mk -echo "mln/version.hh \\" >> headers.mk -echo "generating headers.mk" +me=`basename $0` +output=headers.mk -find mln -type f -name '*.hh'| grep -v "\.svn" | sed -e 's/$/ \\/g' | sort >> headers.mk -find mln -type f -name '*.hxx'| grep -v "\.svn" | sed -e 's/$/ \\/g'| sort >> headers.mk +echo "Generating $output..." >&2 +rm -f "$output" +cat <<EOF >"$output" +## Generated by \`$me', do not edit by hand. + +nobase_include_HEADERS = \\ +EOF + +find mln -type f -a $ -name '*.hh' -o -name '*.hxx' $ \ + | sort \ + | sed -e 's/$/ \\/g' >> headers.mk last_line=`tail -n 1 headers.mk | sed -e 's/\\\//g'` # remove '\' in last line sed '$d' < headers.mk > headers.mk.tmp # remove last line -- 1.6.2.4

1 0

r4127: Implement visualization routine for regions
by Fabien Freling 12 Jun '09

12 Jun '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-06-12 Fabien Freling <fabien.freling(a)lrde.epita.fr> Implement visualization routine for regions. * fabien/igr/wst_edges.cc: Add call to display_region(). * fabien/mln/world/inter_pixel/display_region.hh: Implement routine for visualization of regions after a watershed call [Draft, non functional]. --- igr/wst_edges.cc | 6 ++ mln/world/inter_pixel/display_region.hh | 84 ++++++++++++++++---------------- 2 files changed, 50 insertions(+), 40 deletions(-) Index: trunk/milena/sandbox/fabien/igr/wst_edges.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/wst_edges.cc (revision 4126) +++ trunk/milena/sandbox/fabien/igr/wst_edges.cc (revision 4127) @@ -34,6 +34,7 @@ #include <mln/data/compute.hh> #include <mln/data/convert.hh> #include <mln/data/stretch.hh> +#include <mln/literal/colors.hh> #include <mln/make/image2d.hh> #include <mln/make/w_window1d.hh> #include <mln/math/diff_abs.hh> @@ -57,11 +58,14 @@ #include "plot_points/int2rgb.hh" +#include <mln/world/inter_pixel/display_region.hh> + using namespace mln; using value::int_u8; using value::int_u12; using value::label_16; +using value::rgb8; const float saturation = 1.0; @@ -138,6 +142,8 @@ io::dump::save(w_all, "watershed.dump"); io::ppm::save(debug::int2rgb(w_all), "watershed.ppm"); + io::ppm::save(world::inter_pixel::display_region(data::stretch(int_u8(), input), w_all, literal::red), "regions.ppm"); + return 0; } Index: trunk/milena/sandbox/fabien/mln/world/inter_pixel/display_region.hh =================================================================== --- trunk/milena/sandbox/fabien/mln/world/inter_pixel/display_region.hh (revision 4126) +++ trunk/milena/sandbox/fabien/mln/world/inter_pixel/display_region.hh (revision 4127) @@ -31,15 +31,18 @@ /// Create an image for visualizing the different regions of a labeled /// inter_pixel image. +# include <mln/core/concept/image.hh> # include <mln/core/image/image2d.hh> # include <mln/core/image/dmorph/image_if.hh> +# include <mln/core/routine/extend.hh> +# include <mln/convert/from_to.hh> # include <mln/data/paste.hh> # include <mln/world/inter_pixel/is_pixel.hh> # include <mln/world/inter_pixel/is_separator.hh> # include <mln/opt/at.hh> # include <mln/value/rgb8.hh> -# include "is_zero_face.hh" +# include <mln/world/inter_pixel/is_zero_face.hh> namespace mln @@ -58,72 +61,73 @@ /// \param[in] edge_color The color (in rgb8) for the watershed line. /// \return FIXME /// + /// \pre \p input has to be an 8 bits image. /// \pre \p wst has to be an unmorphed image. /// \warning This implementation only works for 2D images. /// template <typename I, typename L> inline mln_ch_value(I, value::rgb8) - display_region(const I& input, const mln_ch_value(I, L)& wst, value::rbg8 edge_color); + display_region(const Image& input, const Image<L>& wst, value::rgb8 edge_color); # ifndef MLN_INCLUDE_ONLY - template <typename I> + template <typename I, typename L> inline mln_ch_value(I, value::rgb8) - display_region(const I& input, const mln_ch_value(I, L)& wst, value::rbg8 edge_color) + display_region(const Image& input_, const Image<L>& wst_, value::rgb8 edge_color) { - mln_precondition((2 * input.bbox()) == wst.unmorph_().bbox()); + // TODO: We should check that wst.bbox () == 2 * input.bbox() - 1. + // TODO: We must check that dim(I) == dim(L). + //mln_precondition((2 * input.bbox()) == wst.bbox()); + + const I& input = exact(input_); + const L& wst = exact(wst_); - mln_ch_value(I, value::rgb8) output; + typedef mln_ch_value(I, value::rgb8) output_t; + output_t output; initialize(output, wst); // Pixel. mln_piter(I) p_input(input.domain()); - for_all(p) - opt::at(output, p.to_vec[0] * 2, p.to_vec[1] * 2) = input(p); + for_all(p_input) + convert::from_to(input(p_input), opt::at(output, p_input.row() * 2, p_input.col() * 2)); // Separator. - typedef image_if<const mln_ch_value(I, L)&, is_separator> separator_t; - separator_t edge = wst | is_separator(); - mln_piter(edge_t) p(edge.domain()); + typedef image_if<output_t, is_separator> separator_t; + separator_t sep = output | is_separator(); + mln_piter(separator_t) p(sep.domain()); for_all(p) { - if (p.row() % 2) // horizontal edge - { - unsigned row = (p.row() / 2 + 1) * 2 - 1; - unsigned col = p.col(); - opt::at(output, row, col) = input(p); - } - else // vertical edge - { unsigned row = p.row(); - unsigned col = (p.col() / 2 + 1) * 2 - 1; - opt::at(output, row, col) = input(p); - } - } - - // Point (dimension 0). - typedef image_if<const mln_ch_value(I, L)&, is_zero_face> zero_face_t; - zero_face_t edge = wst | is_zero_face(); - mln_piter(edge_t) p(edge.domain()); - for_all(p) - { - if (p.row() % 2) // horizontal edge - { - unsigned row = (p.row() / 2 + 1) * 2 - 1; unsigned col = p.col(); - opt::at(output, row, col) = input(p); - } + if (p.row() % 2) // horizontal edge + output(p) = (opt::at(output, row + 1, col) + + opt::at(output, row - 1, col)) / 2; else // vertical edge - { - unsigned row = p.row(); - unsigned col = (p.col() / 2 + 1) * 2 - 1; - opt::at(output, row, col) = input(p); - } + output(p) = (opt::at(output, row, col + 1) + + opt::at(output, row, col - 1)) / 2; } + // Zero-face (dimension 0). + typedef image_if<output_t, is_zero_face> zero_face_t; + zero_face_t zero = output | is_zero_face(); + mln_piter(zero_face_t) q(zero.domain()); + for_all(q) + { + unsigned row = q.row(); + unsigned col = q.col(); + output(q) = (opt::at(output, row + 1, col) + + opt::at(output, row, col + 1) + + opt::at(output, row - 1, col) + + opt::at(output, row, col - 1)) / 4; + } + + // Watershed lines. + data::fill((output | pw::value(wst) == pw::cst(0)).rw(), edge_color); + //FIXME: Fill intersections. + return output; # endif // ! MLN_INCLUDE_ONLY

1 0

4126: Fix Autoconf macro OLN_WITH_LIB.
by Roland Levillain 12 Jun '09

12 Jun '09

* m4/oln-with-lib.m4: Add other libraries (dependencies) to *_LDFLAGS. --- ChangeLog | 7 +++++++ m4/oln-with-lib.m4 | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b88687b..dcacc41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 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 + *_LDFLAGS. + +2009-06-12 Roland Levillain <roland(a)lrde.epita.fr> + Handle libgdcmCommon's dependencies. * configure.ac: Pass -lgdcmzlib to OLN_WITH_LIB when searching for diff --git a/m4/oln-with-lib.m4 b/m4/oln-with-lib.m4 index a3cc9e1..4678d8b 100644 --- a/m4/oln-with-lib.m4 +++ b/m4/oln-with-lib.m4 @@ -70,7 +70,7 @@ AC_DEFUN([_OLN_WITH_LIB], [AC_CHECK_LIB([$3], [main], [oln_have_$4=yes - $5_LDFLAGS="$$5_LDFLAGS -l$3" + $5_LDFLAGS="$$5_LDFLAGS -l$3 $6" AC_DEFINE([HAVE_$5], 1, [Define to 1 if we can use $1])], [], [$6] )] -- 1.6.2.4

1 0

[PATCH 3/3] Regen Makefile helpers.
by Roland Levillain 12 Jun '09

12 Jun '09

* doc/outputs/outputs.mk, * headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 9 +++++++++ milena/doc/outputs/outputs.mk | 6 ++++++ milena/headers.mk | 16 ++++++++++------ milena/tests/unit_test/unit-tests.mk | 32 ++++++++++++++++++++------------ 4 files changed, 45 insertions(+), 18 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e9e4656..a059a09 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2009-06-12 Roland Levillain <roland(a)lrde.epita.fr> + + Regen Makefile helpers. + + * doc/outputs/outputs.mk, + * headers.mk, + * tests/unit_test/unit-tests.mk: + Regen. + 2009-06-12 Edwin Carlinet <carlinet(a)lrde.epita.fr> Move height, volume, bbox accus in shape directory. diff --git a/milena/doc/outputs/outputs.mk b/milena/doc/outputs/outputs.mk index 754db84..357d962 100644 --- a/milena/doc/outputs/outputs.mk +++ b/milena/doc/outputs/outputs.mk @@ -47,6 +47,12 @@ outputs/paste-call-1.txt \ outputs/paste.txt \ outputs/point-1.txt \ outputs/predicate-1.txt \ +outputs/split/graph-iter-1.txt \ +outputs/split/graph-iter-2.txt \ +outputs/split/graph-iter-3.txt \ +outputs/split/graph-iter-4.txt \ +outputs/split/tuto3_println-1.txt \ +outputs/split/tuto3_println-2.txt \ outputs/tuto2_first_image.txt \ outputs/tuto3_colorize.txt \ outputs/tuto3_println.txt \ diff --git a/milena/headers.mk b/milena/headers.mk index c9de056..76725c1 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -3,15 +3,12 @@ nobase_include_HEADERS = \ mln/version.hh \ mln/accu/all.hh \ -mln/accu/bbox.hh \ mln/accu/center.hh \ mln/accu/compute.hh \ mln/accu/convolve.hh \ -mln/accu/count.hh \ mln/accu/count_adjacent_vertices.hh \ mln/accu/count_labels.hh \ mln/accu/essential.hh \ -mln/accu/height.hh \ mln/accu/histo.hh \ mln/accu/image/all.hh \ mln/accu/image/essential.hh \ @@ -33,8 +30,11 @@ mln/accu/logic/land_basic.hh \ mln/accu/logic/lor.hh \ mln/accu/logic/lor_basic.hh \ mln/accu/maj_h.hh \ +mln/accu/math/all.hh \ +mln/accu/math/count.hh \ +mln/accu/math/essential.hh \ +mln/accu/math/sum.hh \ mln/accu/max_site.hh \ -mln/accu/median_alt.hh \ mln/accu/nil.hh \ mln/accu/p.hh \ mln/accu/pair.hh \ @@ -42,6 +42,11 @@ mln/accu/rank.hh \ mln/accu/rank_bool.hh \ mln/accu/rank_high_quant.hh \ mln/accu/rms.hh \ +mln/accu/shape/all.hh \ +mln/accu/shape/bbox.hh \ +mln/accu/shape/essential.hh \ +mln/accu/shape/height.hh \ +mln/accu/shape/volume.hh \ mln/accu/site_set/all.hh \ mln/accu/site_set/essential.hh \ mln/accu/site_set/rectangularity.hh \ @@ -51,13 +56,13 @@ mln/accu/stat/essential.hh \ mln/accu/stat/max.hh \ mln/accu/stat/max_h.hh \ mln/accu/stat/mean.hh \ +mln/accu/stat/median_alt.hh \ mln/accu/stat/median_h.hh \ mln/accu/stat/min.hh \ mln/accu/stat/min_h.hh \ mln/accu/stat/min_max.hh \ mln/accu/stat/var.hh \ mln/accu/stat/variance.hh \ -mln/accu/sum.hh \ mln/accu/sup.hh \ mln/accu/take.hh \ mln/accu/transform.hh \ @@ -68,7 +73,6 @@ mln/accu/transform_snake.hh \ mln/accu/transform_stop.hh \ mln/accu/tuple.hh \ mln/accu/v.hh \ -mln/accu/volume.hh \ mln/algebra/all.hh \ mln/algebra/essential.hh \ mln/algebra/h_mat.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index de60cc2..0f4fa00 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -2,15 +2,12 @@ check_PROGRAMS = \ mln_accu_all \ -mln_accu_bbox \ mln_accu_center \ mln_accu_compute \ mln_accu_convolve \ -mln_accu_count \ mln_accu_count_adjacent_vertices \ mln_accu_count_labels \ mln_accu_essential \ -mln_accu_height \ mln_accu_histo \ mln_accu_image_all \ mln_accu_image_essential \ @@ -32,8 +29,11 @@ mln_accu_logic_land_basic \ mln_accu_logic_lor \ mln_accu_logic_lor_basic \ mln_accu_maj_h \ +mln_accu_math_all \ +mln_accu_math_count \ +mln_accu_math_essential \ +mln_accu_math_sum \ mln_accu_max_site \ -mln_accu_median_alt \ mln_accu_nil \ mln_accu_p \ mln_accu_pair \ @@ -41,6 +41,11 @@ mln_accu_rank \ mln_accu_rank_bool \ mln_accu_rank_high_quant \ mln_accu_rms \ +mln_accu_shape_all \ +mln_accu_shape_bbox \ +mln_accu_shape_essential \ +mln_accu_shape_height \ +mln_accu_shape_volume \ mln_accu_site_set_all \ mln_accu_site_set_essential \ mln_accu_site_set_rectangularity \ @@ -50,13 +55,13 @@ mln_accu_stat_essential \ mln_accu_stat_max \ mln_accu_stat_max_h \ mln_accu_stat_mean \ +mln_accu_stat_median_alt \ mln_accu_stat_median_h \ mln_accu_stat_min \ mln_accu_stat_min_h \ mln_accu_stat_min_max \ mln_accu_stat_var \ mln_accu_stat_variance \ -mln_accu_sum \ mln_accu_sup \ mln_accu_take \ mln_accu_transform \ @@ -67,7 +72,6 @@ mln_accu_transform_snake \ mln_accu_transform_stop \ mln_accu_tuple \ mln_accu_v \ -mln_accu_volume \ mln_algebra_all \ mln_algebra_essential \ mln_algebra_h_mat \ @@ -1258,15 +1262,12 @@ mln_world_inter_pixel_neighb2d \ mln_world_inter_pixel_separator_to_pixels mln_accu_all_SOURCES = mln_accu_all.cc -mln_accu_bbox_SOURCES = mln_accu_bbox.cc mln_accu_center_SOURCES = mln_accu_center.cc mln_accu_compute_SOURCES = mln_accu_compute.cc mln_accu_convolve_SOURCES = mln_accu_convolve.cc -mln_accu_count_SOURCES = mln_accu_count.cc mln_accu_count_adjacent_vertices_SOURCES = mln_accu_count_adjacent_vertices.cc mln_accu_count_labels_SOURCES = mln_accu_count_labels.cc mln_accu_essential_SOURCES = mln_accu_essential.cc -mln_accu_height_SOURCES = mln_accu_height.cc mln_accu_histo_SOURCES = mln_accu_histo.cc mln_accu_image_all_SOURCES = mln_accu_image_all.cc mln_accu_image_essential_SOURCES = mln_accu_image_essential.cc @@ -1288,8 +1289,11 @@ mln_accu_logic_land_basic_SOURCES = mln_accu_logic_land_basic.cc mln_accu_logic_lor_SOURCES = mln_accu_logic_lor.cc mln_accu_logic_lor_basic_SOURCES = mln_accu_logic_lor_basic.cc mln_accu_maj_h_SOURCES = mln_accu_maj_h.cc +mln_accu_math_all_SOURCES = mln_accu_math_all.cc +mln_accu_math_count_SOURCES = mln_accu_math_count.cc +mln_accu_math_essential_SOURCES = mln_accu_math_essential.cc +mln_accu_math_sum_SOURCES = mln_accu_math_sum.cc mln_accu_max_site_SOURCES = mln_accu_max_site.cc -mln_accu_median_alt_SOURCES = mln_accu_median_alt.cc mln_accu_nil_SOURCES = mln_accu_nil.cc mln_accu_p_SOURCES = mln_accu_p.cc mln_accu_pair_SOURCES = mln_accu_pair.cc @@ -1297,6 +1301,11 @@ mln_accu_rank_SOURCES = mln_accu_rank.cc mln_accu_rank_bool_SOURCES = mln_accu_rank_bool.cc mln_accu_rank_high_quant_SOURCES = mln_accu_rank_high_quant.cc mln_accu_rms_SOURCES = mln_accu_rms.cc +mln_accu_shape_all_SOURCES = mln_accu_shape_all.cc +mln_accu_shape_bbox_SOURCES = mln_accu_shape_bbox.cc +mln_accu_shape_essential_SOURCES = mln_accu_shape_essential.cc +mln_accu_shape_height_SOURCES = mln_accu_shape_height.cc +mln_accu_shape_volume_SOURCES = mln_accu_shape_volume.cc mln_accu_site_set_all_SOURCES = mln_accu_site_set_all.cc mln_accu_site_set_essential_SOURCES = mln_accu_site_set_essential.cc mln_accu_site_set_rectangularity_SOURCES = mln_accu_site_set_rectangularity.cc @@ -1306,13 +1315,13 @@ mln_accu_stat_essential_SOURCES = mln_accu_stat_essential.cc mln_accu_stat_max_SOURCES = mln_accu_stat_max.cc mln_accu_stat_max_h_SOURCES = mln_accu_stat_max_h.cc mln_accu_stat_mean_SOURCES = mln_accu_stat_mean.cc +mln_accu_stat_median_alt_SOURCES = mln_accu_stat_median_alt.cc mln_accu_stat_median_h_SOURCES = mln_accu_stat_median_h.cc mln_accu_stat_min_SOURCES = mln_accu_stat_min.cc mln_accu_stat_min_h_SOURCES = mln_accu_stat_min_h.cc mln_accu_stat_min_max_SOURCES = mln_accu_stat_min_max.cc mln_accu_stat_var_SOURCES = mln_accu_stat_var.cc mln_accu_stat_variance_SOURCES = mln_accu_stat_variance.cc -mln_accu_sum_SOURCES = mln_accu_sum.cc mln_accu_sup_SOURCES = mln_accu_sup.cc mln_accu_take_SOURCES = mln_accu_take.cc mln_accu_transform_SOURCES = mln_accu_transform.cc @@ -1323,7 +1332,6 @@ mln_accu_transform_snake_SOURCES = mln_accu_transform_snake.cc mln_accu_transform_stop_SOURCES = mln_accu_transform_stop.cc mln_accu_tuple_SOURCES = mln_accu_tuple.cc mln_accu_v_SOURCES = mln_accu_v.cc -mln_accu_volume_SOURCES = mln_accu_volume.cc mln_algebra_all_SOURCES = mln_algebra_all.cc mln_algebra_essential_SOURCES = mln_algebra_essential.cc mln_algebra_h_mat_SOURCES = mln_algebra_h_mat.cc -- 1.6.2.4

1 0

[PATCH 2/3] Handle libgdcmCommon's dependencies.
by Roland Levillain 12 Jun '09

12 Jun '09

* configure.ac: Pass -lgdcmzlib to OLN_WITH_LIB when searching for libgdcmCommon. --- ChangeLog | 7 +++++++ configure.ac | 7 ++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 10f5d0a..b88687b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2009-06-12 Roland Levillain <roland(a)lrde.epita.fr> + Handle libgdcmCommon's dependencies. + + * configure.ac: Pass -lgdcmzlib to OLN_WITH_LIB when searching for + libgdcmCommon. + +2009-06-12 Roland Levillain <roland(a)lrde.epita.fr> + Extend Autoconf macro OLN_WITH_LIB to handle the library's dependencies. * m4/oln-with-lib.m4 (OLN_WITH_LIB): Add a sixth (optional) diff --git a/configure.ac b/configure.ac index 95ea349..f37bbb5 100644 --- a/configure.ac +++ b/configure.ac @@ -148,11 +148,8 @@ OLN_WITH_LIB([Magick++], [Magick++.h], [Magick++], [magickxx], [MAGICKXX]) OLN_WITH_LIB([TIFF], [tiff.h], [tiff]) # Grassroots DiCoM (GDCM). -# FIXME: Linking against the sole libgdcmCommon.{a,so,dylib} is -# probably not enough in many cases (there are other libraries in the -# GDCM package). Write a decent test first (in -# milena/tests/io/dicom/), and improve the configuration. -OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm], [GDCM]) +OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm], [GDCM], + [-lgdcmzlib]) ## ---------------------------- ## -- 1.6.2.4

1 0