- Olena-patches

last-svn-commit-271-g494c594 Fix, factor and improve the (exact) simple 3D point criterion.
by Roland Levillain 15 Jun '12

15 Jun '12

* mln/topo/is_simple_point3d.hh (mln::topo::is_simple_point3d<I, N>::operator()): Honor the neighborhoods. Use the new routines to compute the connectivity numbers instead of computing them directly. --- milena/ChangeLog | 10 +++ milena/mln/topo/is_simple_point3d.hh | 125 +++++++--------------------------- 2 files changed, 35 insertions(+), 100 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0ef0cf7..5de8e06 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2011-06-16 Roland Levillain <roland(a)lrde.epita.fr> + Fix, factor and improve the (exact) simple 3D point criterion. + + * mln/topo/is_simple_point3d.hh + (mln::topo::is_simple_point3d<I, N>::operator()): + Honor the neighborhoods. + Use the new routines to compute the connectivity numbers instead + of computing them directly. + +2011-06-16 Roland Levillain <roland(a)lrde.epita.fr> + Add routines to compute 3D connectivity numbers. * mln/topo/connectivity_number_3d.hh: New. diff --git a/milena/mln/topo/is_simple_point3d.hh b/milena/mln/topo/is_simple_point3d.hh index f63ea83..058fd97 100644 --- a/milena/mln/topo/is_simple_point3d.hh +++ b/milena/mln/topo/is_simple_point3d.hh @@ -35,47 +35,8 @@ # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> -# include <mln/core/image/image3d.hh> -# include <mln/core/alias/neighb3d.hh> +# include <mln/topo/connectivity_number_3d.hh> -# include <mln/value/int_u8.hh> -# include <mln/value/int_u32.hh> - -# include <mln/labeling/blobs.hh> -# include <mln/fun/v2b/lnot.hh> -# include <mln/core/image/vmorph/fun_image.hh> -# include <mln/core/image/dmorph/image_if.hh> - - -// FIXME: Temporary. -/* A function stating whether a point of the box (-1,-1-1)-(+1,+1,+1) - is within the 18-c neighborhood of (0, 0, 0). */ -bool -f_within_c18(const mln::point3d& p) -{ - return !(mln::math::abs(p.sli()) == 1 - && mln::math::abs(p.row()) == 1 - && mln::math::abs(p.col()) == 1); -} - -// FIXME: Temporary. -// Associated functor. -struct within_c18 : mln::Function_v2b<within_c18> -{ - typedef bool result; - bool operator()(const mln::point3d& p) const { return f_within_c18(p); } -}; - - -/* FIXME: Factor code with is_simple_point2d. */ - -/* FIXME: BTW, we should implement a version of is_simple_point2d - based on a LUT as well. */ - -/* FIXME: Not that this routine produces false results when a point - has not exactly 26 neighbors (same issue with is_simple_point2d). - This functor should be placed in an `mln::topo::approx' namespace, - and an exact should be provided in addition. */ namespace mln { @@ -83,8 +44,6 @@ namespace mln namespace topo { - // FIXME: Honor the neighborhoods of the fore- and background. - /// \brief A predicate for the simplicity of an mln::point3d based /// on a look-up table. template <typename I, typename N> @@ -158,9 +117,6 @@ namespace mln ima_ = exact(&ima); } - // FIXME: Honor the neighborhoods of the fore- and background. - // FIXME: Move the computation of connectivity numbers out of this - // routine. template <typename I, typename N> inline bool @@ -169,61 +125,30 @@ namespace mln mln_precondition(ima_); const I& ima = *ima_; - /** Type of a connectivity number. - - Note: The maximun number of connected components in the - neighborhood of a point is necessarily lower or equal to - half the number of neighbors. This number fits on an - mln::value::int_u8 when the dimension is lower or equal - to 5. */ - typedef mln::value::int_u8 conn_number_t; - /// Type of a 3D (neighborhood) configuration number (index). - typedef mln::value::int_u32 config_3d_t; - - // Create a two 3x3 image representing foreground and background - // values in IMA around P. The value under P is always set to - // `false'. - box3d b = make::box3d(-1,-1,-1, 1,1,1); - I fg_ima_local(b, 0); - I bg_ima_local(b, 0); - mln::data::fill(fg_ima_local, false); - mln::data::fill(bg_ima_local, false); - point3d center(0, 0, 0); - mln_niter(N) n_ima(c26(), p); - mln_niter(N) n_local(c26(), center); - for_all_2(n_ima, n_local) - if (ima.has(n_ima)) - { - if (ima(n_ima)) - fg_ima_local(n_local) = true; - else - bg_ima_local(n_local) = true; - } - - // Foreground connectivity number. - conn_number_t fg_conn_number; - { - mln::neighb3d nbh = c26(); - labeling::blobs(fg_ima_local, nbh, fg_conn_number); - } - - // Background connectivity number. - conn_number_t bg_conn_number; - { - mln::neighb3d nbh = c6(); - conn_number_t unused_nl; - // Restrict the image to the 18-c neighborhood of P. - image_if<image3d<conn_number_t>, within_c18> lab = - labeling::blobs(bg_ima_local | within_c18(), nbh, unused_nl); - std::set<conn_number_t> s; - mln_niter(N) n(nbh, center); - for_all(n) - if (lab(n) != 0) - s.insert(lab(n)); - bg_conn_number = s.size(); - } - - return fg_conn_number == 1 && bg_conn_number == 1; + /* FIXME: Maybe we can select the connectivity number functions + once and for all when the functor is constructed, instead of + selecting them at each call of operator(). */ + bool result; + if (nbh_fg_ == c6() && nbh_bg_ == c26()) + result = + connectivity_number_3d_c6 (ima, p, true) == 1 && + connectivity_number_3d_c26(ima, p, false) == 1; + else if (nbh_fg_ == c26() && nbh_bg_ == c6()) + result = + connectivity_number_3d_c26(ima, p, true) == 1 && + connectivity_number_3d_c6 (ima, p, false) == 1; + else if (nbh_fg_ == c6() && nbh_bg_ == c18()) + result = + connectivity_number_3d_c6p(ima, p, true) == 1 && + connectivity_number_3d_c18(ima, p, false) == 1; + else if (nbh_fg_ == c18() && nbh_bg_ == c6()) + result = + connectivity_number_3d_c18(ima, p, true) == 1 && + connectivity_number_3d_c6p(ima, p, false) == 1; + else + abort(); + + return result; } # endif // MLN_INCLUDE_ONLY -- 1.7.2.5

1 0

last-svn-commit-272-g7d862f6 Set connectivity number functions when building is_simple_point3d.
by Roland Levillain 15 Jun '12

15 Jun '12

* mln/topo/is_simple_point3d.hh (mln::topo::is_simple_point3d<I, N>::init_): New method. (connectivity_number_fun_t): New (private) typedef. (connectivity_number_fg, connectivity_number_bg): New (private) members. Initialize them... (mln::topo::is_simple_point3d<I, N>::is_simple_point3d): ...from the ctors, using init_(). --- milena/ChangeLog | 13 +++++ milena/mln/topo/is_simple_point3d.hh | 83 +++++++++++++++++++++++----------- 2 files changed, 70 insertions(+), 26 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5de8e06..736d6cf 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,18 @@ 2011-06-16 Roland Levillain <roland(a)lrde.epita.fr> + Set connectivity number functions when building is_simple_point3d. + + * mln/topo/is_simple_point3d.hh + (mln::topo::is_simple_point3d<I, N>::init_): New method. + (connectivity_number_fun_t): New (private) typedef. + (connectivity_number_fg, connectivity_number_bg): + New (private) members. + Initialize them... + (mln::topo::is_simple_point3d<I, N>::is_simple_point3d): + ...from the ctors, using init_(). + +2011-06-16 Roland Levillain <roland(a)lrde.epita.fr> + Fix, factor and improve the (exact) simple 3D point criterion. * mln/topo/is_simple_point3d.hh diff --git a/milena/mln/topo/is_simple_point3d.hh b/milena/mln/topo/is_simple_point3d.hh index 058fd97..d3dac55 100644 --- a/milena/mln/topo/is_simple_point3d.hh +++ b/milena/mln/topo/is_simple_point3d.hh @@ -78,12 +78,29 @@ namespace mln bool operator()(const mln_psite(I)& p) const; private: + /// Initialize the function pointers computing connectivity + /// numbers. + void init_(); + + private: /// The foreground neighborhood. const N& nbh_fg_; /// The background neighborhood. const N& nbh_bg_; /// The image. const I* ima_; + + /// The type of pointer on function computing a 3D connectivity + /// number. + typedef conn_number_t (*connectivity_number_fun_t)(const Image&, + const mln_psite(I)&, + bool); + /// The function (pointer) computing the foreground connectivity + /// number. + connectivity_number_fun_t connectivity_number_fg_; + /// The function (pointer) computing the background connectivity + /// number. + connectivity_number_fun_t connectivity_number_bg_; }; @@ -95,8 +112,10 @@ namespace mln is_simple_point3d<I, N>::is_simple_point3d(const Neighborhood<N>& nbh_fg, const Neighborhood<N>& nbh_bg) : nbh_fg_(exact(nbh_fg)), nbh_bg_(exact(nbh_bg)), - ima_(0) + ima_(0), + connectivity_number_fg_(0), connectivity_number_bg_(0) { + init_(); } template <typename I, typename N> @@ -105,8 +124,41 @@ namespace mln const Neighborhood<N>& nbh_bg, const Image& ima) : nbh_fg_(exact(nbh_fg)), nbh_bg_(exact(nbh_bg)), - ima_(exact(&ima)) + ima_(exact(&ima)), + connectivity_number_fg_(0), connectivity_number_bg_(0) + { + init_(); + } + + template <typename I, typename N> + inline + void + is_simple_point3d<I, N>::init_() { + if (nbh_fg_ == c6() && nbh_bg_ == c26()) + { + // (6, 26) case. + connectivity_number_fg_ = connectivity_number_3d_c6; + connectivity_number_bg_ = connectivity_number_3d_c26; + } + else if (nbh_fg_ == c26() && nbh_bg_ == c6()) + { + // (26, 6) case. + connectivity_number_fg_ = connectivity_number_3d_c26; + connectivity_number_bg_ = connectivity_number_3d_c6; + } + else if (nbh_fg_ == c6() && nbh_bg_ == c18()) + { + // (6+, 18) case. + connectivity_number_fg_ = connectivity_number_3d_c6p; + connectivity_number_bg_ = connectivity_number_3d_c18; + } + else if (nbh_fg_ == c18() && nbh_bg_ == c6()) + { + // (18, 6+) case. + connectivity_number_fg_ = connectivity_number_3d_c18; + connectivity_number_bg_ = connectivity_number_3d_c6p; + } } template <typename I, typename N> @@ -125,30 +177,9 @@ namespace mln mln_precondition(ima_); const I& ima = *ima_; - /* FIXME: Maybe we can select the connectivity number functions - once and for all when the functor is constructed, instead of - selecting them at each call of operator(). */ - bool result; - if (nbh_fg_ == c6() && nbh_bg_ == c26()) - result = - connectivity_number_3d_c6 (ima, p, true) == 1 && - connectivity_number_3d_c26(ima, p, false) == 1; - else if (nbh_fg_ == c26() && nbh_bg_ == c6()) - result = - connectivity_number_3d_c26(ima, p, true) == 1 && - connectivity_number_3d_c6 (ima, p, false) == 1; - else if (nbh_fg_ == c6() && nbh_bg_ == c18()) - result = - connectivity_number_3d_c6p(ima, p, true) == 1 && - connectivity_number_3d_c18(ima, p, false) == 1; - else if (nbh_fg_ == c18() && nbh_bg_ == c6()) - result = - connectivity_number_3d_c18(ima, p, true) == 1 && - connectivity_number_3d_c6p(ima, p, false) == 1; - else - abort(); - - return result; + return + connectivity_number_fg_(ima, p, true) == 1 && + connectivity_number_bg_(ima, p, false) == 1; } # endif // MLN_INCLUDE_ONLY -- 1.7.2.5

1 0

last-svn-commit-273-gffee393 Remove buggy symbol definitions.
by Roland Levillain 15 Jun '12

15 Jun '12

* configure.ac: No longer define OLN_PACKAGE_NAME, OLN_PACKAGE_BUGREPORT, OLN_PACKAGE_STRING and OLN_PACKAGE_VERSION using AC_DEFINE_UNQUOTED. --- ChangeLog | 8 ++++++++ configure.ac | 14 +++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b568b3..f0362e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-07-11 Roland Levillain <roland(a)lrde.epita.fr> + + Remove buggy symbol definitions. + + * configure.ac: No longer define OLN_PACKAGE_NAME, + OLN_PACKAGE_BUGREPORT, OLN_PACKAGE_STRING and OLN_PACKAGE_VERSION + using AC_DEFINE_UNQUOTED. + 2010-08-20 Roland Levillain <roland(a)lrde.epita.fr> * configure.ac: Configure milena/apps/generic-skel/Makefile. diff --git a/configure.ac b/configure.ac index c75afff..8086d4d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2006, 2007, 2008, 2009, 2010 EPITA Research and +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 EPITA Research and # Development Laboratory (LRDE). # # This file is part of Olena. @@ -37,15 +37,11 @@ AC_CONFIG_FILES([build-aux/Makefile]) AM_INIT_AUTOMAKE([1.10 subdir-objects check-news dist-bzip2 nostdinc -Wall]) # Package metadata. +# Contrary to config.h, milena/mln/version.hh is meant to be installed. +## FIXME: Consider generating milena/mln/version.hh with `make' instead +## of `configure'. AC_CONFIG_FILES([milena/mln/version.hh]) -AC_DEFINE_UNQUOTED([OLN_PACKAGE_NAME], ["$PACKAGE_NAME"], - [Package Full name.]) -AC_DEFINE_UNQUOTED([OLN_PACKAGE_BUGREPORT], ["$PACKAGE_BUGREPORT"], - [Bug report address.]) -AC_DEFINE_UNQUOTED([OLN_PACKAGE_STRING], ["$PACKAGE_STRING"], - [Full name and version.]) -AC_DEFINE_UNQUOTED([OLN_PACKAGE_VERSION], ["$PACKAGE_VERSION"], - [Package Version.]) + ## --------------------- ## ## C++ compiler set up. ## -- 1.7.2.5

1 0

last-svn-commit-274-g3f01437 Pass the URL of the project to AC_INIT.
by Roland Levillain 15 Jun '12

15 Jun '12

* configure.ac (AC_INIT): Here, as fifth argument. --- ChangeLog | 6 ++++++ configure.ac | 3 ++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0362e5..cbc6265 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2011-07-11 Roland Levillain <roland(a)lrde.epita.fr> + Pass the URL of the project to AC_INIT. + + * configure.ac (AC_INIT): Here, as fifth argument. + +2011-07-11 Roland Levillain <roland(a)lrde.epita.fr> + Remove buggy symbol definitions. * configure.ac: No longer define OLN_PACKAGE_NAME, diff --git a/configure.ac b/configure.ac index 8086d4d..1854654 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,8 @@ AC_PREREQ([2.61]) ## Package set up. ## ## ---------------- ## -AC_INIT([Olena], [1.0a], [olena(a)lrde.epita.fr] [olena]) +AC_INIT([Olena], [1.0a], [olena(a)lrde.epita.fr] [olena], + [http://olena.lrde.epita.fr] # M4 macros. AC_CONFIG_MACRO_DIR([m4]) -- 1.7.2.5

1 0

last-svn-commit-275-ga56681a No longer consider mln/version.hh.in as handled by autoheader.
by Roland Levillain 15 Jun '12

15 Jun '12

* mln/version.hh.in (OLN_PACKAGE_BUGREPORT, OLN_PACKAGE_NAME) (OLN_PACKAGE_STRING, OLN_PACKAGE_VERSION): Define these macros using "@PACKAGE_BUGREPORT@", "@PACKAGE_NAME@", "@PACKAGE_STRING@" and "@PACKAGE_VERSION@". --- milena/ChangeLog | 9 +++++++++ milena/mln/version.hh.in | 13 ++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 736d6cf..5b3737b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2011-07-11 Roland Levillain <roland(a)lrde.epita.fr> + + No longer consider mln/version.hh.in as handled by autoheader. + + * mln/version.hh.in (OLN_PACKAGE_BUGREPORT, OLN_PACKAGE_NAME) + (OLN_PACKAGE_STRING, OLN_PACKAGE_VERSION): Define these macros + using "@PACKAGE_BUGREPORT@", "@PACKAGE_NAME@", "@PACKAGE_STRING@" + and "@PACKAGE_VERSION@". + 2011-06-16 Roland Levillain <roland(a)lrde.epita.fr> Set connectivity number functions when building is_simple_point3d. diff --git a/milena/mln/version.hh.in b/milena/mln/version.hh.in index ac1d712..1dd45dd 100644 --- a/milena/mln/version.hh.in +++ b/milena/mln/version.hh.in @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -14,19 +14,22 @@ // You should have received a copy of the GNU General Public License // along with Olena. If not, see <http://www.gnu.org/licenses/>. +/// \file +/// \brief Package metadata (name, version, etc.) + #ifndef MLN_VERSION_HH # define MLN_VERSION_HH /// The address where bug reports should be sent. -#undef OLN_PACKAGE_BUGREPORT +#define OLN_PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@" /// The full name of this package. -#undef OLN_PACKAGE_NAME +#define OLN_PACKAGE_NAME "@PACKAGE_NAME@" // The full name and version of this package. -#undef OLN_PACKAGE_STRING +#define OLN_PACKAGE_STRING "@PACKAGE_STRING@" /// The version of this package. -#undef OLN_PACKAGE_VERSION +#define OLN_PACKAGE_VERSION "@PACKAGE_VERSION@" #endif // ! MLN_VERSION_HH -- 1.7.2.5

1 0

branch wip-bench-milena updated: last-svn-commit-561-g26a60a9
by git＠lrde.epita.fr 15 Jun '12

15 Jun '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch wip-bench-milena has been updated via 26a60a9cd36b59e622f746a81b86e083196f0fad (commit) via 5fed9e21bf4346caccb410e2277bda63aca52b0f (commit) from 6f5a4364165165f725601f9b50b5db408095116f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 26a60a9 WIP: Minor changes in apps/bench/dilation-lena.hh. 5fed9e2 WIP: Start a bench using the watershed transform. ----------------------------------------------------------------------- Summary of changes: milena/apps/bench/Makefile.am | 30 +- milena/apps/bench/dilation-lena.hh | 35 +- .../{static_window.hh => static_neighborhood.hh} | 200 +++---- milena/apps/bench/trait.hh | 31 +- milena/apps/bench/watershed-lena.cc | 116 ++++ milena/apps/bench/watershed.hh | 580 ++++++++++++++++++++ 6 files changed, 853 insertions(+), 139 deletions(-) copy milena/apps/bench/{static_window.hh => static_neighborhood.hh} (58%) create mode 100644 milena/apps/bench/watershed-lena.cc create mode 100644 milena/apps/bench/watershed.hh hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch revamp-doc-build updated: last-svn-commit-181-g00f01ac
by git＠lrde.epita.fr 15 Jun '12

15 Jun '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch revamp-doc-build has been updated via 00f01acecbd35fc09adc34ddec06a86affdc8566 (commit) via 7671c7df2acc25243c83131813db612be8a654b2 (commit) via 15a057175710227bdea5a9702dcbf5bd64704a9d (commit) via 71c9c144f233770f1b9652ba98d6137053e8ab47 (commit) via 0d502d0cf9f3571471768db4f3833b0701ef39a0 (commit) via ba369b62ba9d59fb093d4247284f2c437f42754e (commit) via 165770feeac77f1dfab40f3173c3e6e483709df1 (commit) via 4ef67060e4a70bf4af46d54548b4dafdbd04dcf9 (commit) via ace04a4f7d94756ce9a1f128c67b2a8cb840d549 (commit) via 51c347f97f743e56262f65acd5bc6658c2a99439 (commit) via 75c57adc2959683d4549bf36a0a12c08c1266760 (commit) via ceed614319364a103d4c7c15afd2ea2a3b6d2186 (commit) via ccc4a321e56015b6d2824f0f67236bdad14990c4 (commit) via 5758dd72a0d8fe7849e99ad6f5dbf6f0b97c1c6d (commit) via a32f582d8894e37cb18614521c262ab5ae49c1a7 (commit) via 635ff15ca3cc548f282d4bb96587bb6d3b2e8c7f (commit) via 70dedf8ba8537b7d8081641e15553637317f4e03 (commit) via 68624e4c54dd06c46428b7dd914bdbd1e8c06678 (commit) via bfdea8debb5538103da4cc28ca092309850fd597 (commit) via 69ce9faae9f4efb9de5b7f0bb413e467d6b10882 (commit) via 2b5bd163c6290a5e6125b338212ac97bc5963dce (commit) via 94486e40acf3355b24eece538313f3ec9edd5f20 (commit) via 916df4279f248a6fb5c85a129229f57e71f036eb (commit) via 664b361a5b75efba6b472d1028abad8d267c3628 (commit) via 9ced0495ec829f942f3abffe7077d472efff96f6 (commit) via d53b4271ddc93c8fa098f4ef4c2fc7432f808357 (commit) via 17734ea5b269b3a71fc2138a270454a80b0ed6ae (commit) via 4c42b800077d0dda5fde111d0e4761661c9a52c3 (commit) via 68d80d9e1c6f2b66a45e6bb107c7697871386426 (commit) via e30e6d746ca7e83560ad0e2a52324f0af553255d (commit) via d843b6cdad0df4b25e11da900abe87f67153ab65 (commit) via 81ebf3143f310e04f99738afb8b5ad9cbc39eaa7 (commit) via 04e7d8027ac1a88bc151aa0174a3b1ee572c4e4b (commit) via c260d597d0718762ff60972c3a9834f5f1a9db8f (commit) via 7b351ecac19fd1c42ae0382ef7179496a1e565c8 (commit) via ab8bd495b70c9c78f8fc13f1df545d487fc94217 (commit) via 5ba9288148acd3aecef5df8ec260e51887375d87 (commit) via 72a1d9cca4425b195b9132e2bd645274f52c765a (commit) via 62982aae637e6591a4f4ae8f52f04f507691ab80 (commit) via 2891ae779a6ddf363a34ad8188fdda31b8e06849 (commit) via 8d9ad1b2347654f006683e0779bffd5c5fde7734 (commit) via 24633b4c8980ac4c3f2dd7a0befbed515c3c6f48 (commit) via 8c7a1809a808addffc3ae397f0d0f1e21d242fbc (commit) via c8a3721c86de58f063888f0aeedd6197530d1ce0 (commit) via 8e148a2f3b871d60de12d627f02fc01ed7ac4331 (commit) via f1a7757aa73b3bac1c64ecb1e124633a055f4752 (commit) via 153c751d590f7825fb11427de07c890ad3dd95eb (commit) via afefd84215fa6e4c673fd0b1a3a8311ac8ea82ff (commit) via 6dd7d249daae01e8ed82f836aa2f88c4a5833d8e (commit) via 68b860f7623d03ea9815fd652300bee661351bdc (commit) via 1441b0f7b0a2ec10f6009d8ca9e97f2c6c64decd (commit) via 7c82d9a99dfcdb3c3d9a0e4beb9269ec966fa3aa (commit) via d0cba60a39189a796f76cef7ed7e0ae53ce637a8 (commit) via b77547a34bcd0b5c26ff733de1347334d89b2496 (commit) via 25eb4fe6f1b8d6217dcfded1ba138b1abb0e4b07 (commit) via 77c420e02087c7499fa59caaa8c2c6cf8b27e84c (commit) via 103e1e747ab4e16f95f94e3742b3d21b9d637354 (commit) via 5a5ceb89dd3811caae3296fce041a47c5a45564d (commit) via 03908bb38ac692efdb3ce76c8e56bc86a2ee2334 (commit) via a1b86103434c66825a1a089e7bc039f62761b692 (commit) via 10c5d398cd691716db99d2ab6f78d48f7762a75d (commit) from 66a288802969285cb0bdf97c4737c47db786e02c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 00f01ac Improve the generation of Doxyfiles. ----------------------------------------------------------------------- Summary of changes: AUTHORS | 3 + ChangeLog | 155 +++++++ Makefile.am | 7 +- bootstrap | 13 +- build-aux/devtools.sh | 16 + build-aux/devtools_utils.sh | 16 + build-aux/generate_dist_headers.sh | 17 + build-aux/make_report_utils.sh | 18 +- configure.ac | 148 ++++++-- external/Makefile.am | 3 - external/trimesh/ChangeLog | 15 + external/trimesh/Makefile.am | 19 - external/trimesh/configure.ac | 3 - external/trimesh/gluit/Makefile.am | 19 - external/trimesh/include/Makefile.am | 19 - external/trimesh/libsrc/Makefile.am | 19 - external/trimesh/utilsrc/Makefile.am | 19 - lrde-upload.sh | 116 ++++-- m4/with-swilena.m4 | 129 ------ milena/ChangeLog | 429 ++++++++++++++++++++ milena/Makefile.am | 5 +- .../test-constrained-connectivity.in | 16 + milena/apps/graph-morpho/Makefile.am | 4 +- milena/apps/graph-morpho/convert.hh | 7 +- milena/apps/mesh-segm-skel/Makefile.am | 17 +- .../test-mesh-complex-max-curv-segm.in | 16 + .../mesh-segm-skel/test-mesh-complex-max-curv.in | 16 + .../apps/mesh-segm-skel/test-mesh-complex-segm.in | 16 + .../apps/mesh-segm-skel/test-mesh-complex-skel.in | 16 + milena/apps/mesh-segm-skel/test-mesh-max-curv.in | 16 + milena/apps/mesh-segm-skel/test-mesh-segm.in | 16 + milena/apps/papers/levillain.09.ismm/Makefile.am | 5 +- milena/doc/.gitignore | 2 - milena/doc/Makefile.am | 47 +-- milena/doc/graphicx.hva | 16 + milena/doc/tools/clearbanner.sh | 16 + milena/doc/tools/split_sample.sh | 17 + milena/mesh/Makefile.am | 5 +- milena/mln/accu/compute.hh | 6 +- milena/mln/core/image/edge_image.hh | 8 +- milena/mln/core/image/imorph/labeled_image.hh | 4 +- milena/mln/core/image/vertex_image.hh | 8 +- milena/mln/io/fld/save.hh | 10 +- milena/mln/io/fld/write_header.hh | 16 +- milena/mln/io/magick/load.hh | 184 +++++---- milena/mln/io/magick/save.hh | 140 ++++--- milena/mln/make/edge_image.hh | 27 +- .../mln/topo/internal/complex_set_iterator_base.hh | 14 +- milena/mln/util/edge.hh | 30 +- milena/mln/util/graph.hh | 25 +- milena/mln/util/line_graph.hh | 20 +- milena/mln/util/vertex.hh | 26 +- milena/sandbox/ChangeLog | 44 +- milena/tests/Makefile.am | 3 - milena/tests/accu/Makefile.am | 6 +- milena/tests/accu/image/Makefile.am | 3 - milena/tests/accu/math/Makefile.am | 3 - milena/tests/accu/shape/Makefile.am | 3 - milena/tests/accu/site_set/Makefile.am | 3 - milena/tests/accu/stat/Makefile.am | 3 - milena/tests/algebra/Makefile.am | 3 - milena/tests/arith/Makefile.am | 6 +- milena/tests/binarization/Makefile.am | 15 +- milena/tests/binarization/threshold.cc | 7 +- milena/tests/border/Makefile.am | 6 +- milena/tests/canvas/Makefile.am | 7 +- milena/tests/canvas/browsing/Makefile.am | 6 +- milena/tests/canvas/morpho/Makefile.am | 3 - milena/tests/convert/Makefile.am | 3 - milena/tests/convert/impl/Makefile.am | 3 - milena/tests/core/Makefile.am | 6 +- milena/tests/core/alias/Makefile.am | 3 - milena/tests/core/image/Makefile.am | 3 - milena/tests/core/image/dmorph/Makefile.am | 3 - milena/tests/core/image/imorph/Makefile.am | 3 - milena/tests/core/image/vmorph/Makefile.am | 3 - milena/tests/core/other/Makefile.am | 3 - milena/tests/core/other/box_runend_piter.cc | 2 +- milena/tests/core/routine/Makefile.am | 3 - milena/tests/core/site_set/Makefile.am | 3 - milena/tests/data/Makefile.am | 16 +- milena/tests/data/approx/Makefile.am | 12 +- milena/tests/data/approx/median.cc | 7 +- milena/tests/data/median.cc | 7 +- milena/tests/data/median_fast.cc | 5 +- milena/tests/data/naive/Makefile.am | 9 +- milena/tests/data/naive/median.cc | 5 +- milena/tests/debug/Makefile.am | 3 - milena/tests/display/Makefile.am | 6 +- milena/tests/draw/Makefile.am | 6 +- milena/tests/estim/Makefile.am | 6 +- milena/tests/extension/Makefile.am | 3 - milena/tests/extract/Makefile.am | 3 - milena/tests/fun/Makefile.am | 3 - milena/tests/fun/i2v/Makefile.am | 3 - milena/tests/fun/p2b/Makefile.am | 3 - milena/tests/fun/p2p/Makefile.am | 3 - milena/tests/fun/p2v/Makefile.am | 3 - milena/tests/fun/stat/Makefile.am | 3 - milena/tests/fun/v2i/Makefile.am | 3 - milena/tests/fun/v2v/Makefile.am | 3 - milena/tests/fun/vv2v/Makefile.am | 3 - milena/tests/fun/x2x/Makefile.am | 6 +- milena/tests/geom/Makefile.am | 6 +- milena/tests/graph/Makefile.am | 3 - milena/tests/graph/attribute/Makefile.am | 3 - milena/tests/histo/Makefile.am | 6 +- milena/tests/io/Makefile.am | 6 +- milena/tests/io/dicom/Makefile.am | 3 - milena/tests/io/dump/Makefile.am | 15 +- milena/tests/io/dump/dump.cc | 24 +- milena/tests/io/fits/Makefile.am | 16 +- milena/tests/io/fits/fits.cc | 11 +- milena/tests/io/fld/Makefile.am | 5 +- milena/tests/io/magick/Makefile.am | 19 +- milena/tests/io/magick/load.cc | 72 +++- milena/tests/io/magick/save.cc | 87 ++++- milena/tests/io/off/Makefile.am | 13 +- milena/tests/io/off/load_save_bin.cc | 5 +- milena/tests/io/pbm/Makefile.am | 17 +- milena/tests/io/pbm/pbm.cc | 7 +- milena/tests/io/pbm/pbm_ascii.cc | 6 +- milena/tests/io/pbms/Makefile.am | 9 +- milena/tests/io/pbms/load.cc | 6 +- milena/tests/io/pfm/Makefile.am | 3 - milena/tests/io/pgm/Makefile.am | 36 +- milena/tests/io/pgm/pgm.cc | 11 +- milena/tests/io/pgm/pgm16.cc | 13 +- milena/tests/io/pgm/pgm19.cc | 9 +- milena/tests/io/pgm/pgm27.cc | 9 +- milena/tests/io/pgm/pgm_ascii.cc | 10 +- milena/tests/io/pgms/Makefile.am | 10 +- milena/tests/io/pgms/load.cc | 6 +- milena/tests/io/pnm/Makefile.am | 3 - milena/tests/io/ppm/Makefile.am | 27 +- milena/tests/io/ppm/ppm.cc | 7 +- milena/tests/io/ppm/ppm16.cc | 11 +- milena/tests/io/ppm/ppm23.cc | 11 +- milena/tests/io/ppms/Makefile.am | 10 +- milena/tests/io/ppms/load.cc | 8 +- milena/tests/io/tiff/Makefile.am | 3 - milena/tests/labeling/Makefile.am | 6 +- milena/tests/linear/Makefile.am | 16 +- milena/tests/linear/convolve.cc | 5 +- milena/tests/linear/convolve_2x1d.cc | 5 +- milena/tests/linear/convolve_directional.cc | 5 +- milena/tests/linear/gaussian.cc | 5 +- milena/tests/linear/gaussian/Makefile.am | 7 +- milena/tests/linear/gaussian/filter.cc | 5 +- milena/tests/linear/lap.cc | 5 +- milena/tests/linear/local/Makefile.am | 6 +- milena/tests/linear/log.cc | 5 +- milena/tests/linear/sobel_2d.cc | 5 +- milena/tests/literal/Makefile.am | 6 +- milena/tests/logical/Makefile.am | 6 +- milena/tests/make/Makefile.am | 6 +- milena/tests/math/Makefile.am | 3 - milena/tests/metal/Makefile.am | 6 +- milena/tests/metal/make/Makefile.am | 3 - milena/tests/metal/math/Makefile.am | 6 +- milena/tests/morpho/Makefile.am | 36 +- milena/tests/morpho/approx/Makefile.am | 17 +- milena/tests/morpho/approx/dilation.cc | 6 +- milena/tests/morpho/approx/erosion.cc | 6 +- .../morpho/artificial_line_graph_image_wst.cc | 5 +- milena/tests/morpho/attribute/Makefile.am | 3 - milena/tests/morpho/closing/Makefile.am | 41 +- milena/tests/morpho/closing/algebraic.cc | 6 +- milena/tests/morpho/closing/approx/Makefile.am | 14 +- milena/tests/morpho/closing/approx/structural.cc | 6 +- milena/tests/morpho/closing/height.cc | 5 +- milena/tests/morpho/closing/leveling.cc | 6 +- milena/tests/morpho/closing/structural.cc | 4 +- milena/tests/morpho/closing/sum.cc | 5 +- milena/tests/morpho/closing/volume.cc | 7 +- milena/tests/morpho/complex_image_wst.cc | 5 +- milena/tests/morpho/contrast.cc | 5 +- milena/tests/morpho/dilation.cc | 13 +- milena/tests/morpho/elementary/Makefile.am | 3 - milena/tests/morpho/general.cc | 5 +- milena/tests/morpho/gradient.cc | 7 +- milena/tests/morpho/hit_or_miss.cc | 10 +- milena/tests/morpho/laplacian.cc | 7 +- milena/tests/morpho/lena_line_graph_image_wst1.cc | 5 +- milena/tests/morpho/lena_line_graph_image_wst2.cc | 5 +- milena/tests/morpho/line_graph_image_morpho.cc | 4 +- milena/tests/morpho/meyer_wst.cc | 5 +- milena/tests/morpho/meyer_wst_long.cc | 6 +- milena/tests/morpho/opening/Makefile.am | 40 +- milena/tests/morpho/opening/algebraic.cc | 6 +- milena/tests/morpho/opening/approx/Makefile.am | 9 +- milena/tests/morpho/opening/approx/structural.cc | 6 +- milena/tests/morpho/opening/area.cc | 5 +- milena/tests/morpho/opening/height.cc | 5 +- milena/tests/morpho/opening/leveling.cc | 6 +- milena/tests/morpho/opening/structural.cc | 4 +- milena/tests/morpho/opening/sum.cc | 5 +- milena/tests/morpho/opening/volume.cc | 5 +- milena/tests/morpho/rank_filter.cc | 5 +- milena/tests/morpho/reconstruction/Makefile.am | 5 - .../morpho/reconstruction/by_dilation/Makefile.am | 5 - .../morpho/reconstruction/by_erosion/Makefile.am | 5 - milena/tests/morpho/skeleton_constrained.cc | 83 ++-- milena/tests/morpho/thinning.cc | 7 +- milena/tests/morpho/tree/Makefile.am | 5 +- milena/tests/morpho/tree/filter/Makefile.am | 3 - milena/tests/morpho/watershed/Makefile.am | 16 +- milena/tests/morpho/watershed/flooding.cc | 13 +- milena/tests/morpho/watershed/topological.cc | 5 +- milena/tests/norm/Makefile.am | 3 - milena/tests/opt/Makefile.am | 3 - milena/tests/pw/Makefile.am | 6 +- milena/tests/registration/Makefile.am | 3 - milena/tests/set/Makefile.am | 6 +- milena/tests/subsampling/Makefile.am | 3 - milena/tests/tag/Makefile.am | 3 - milena/tests/test/Makefile.am | 3 - milena/tests/topo/Makefile.am | 3 - milena/tests/topo/skeleton/Makefile.am | 3 - milena/tests/trace/Makefile.am | 3 - milena/tests/trait/Makefile.am | 6 +- milena/tests/trait/image/Makefile.am | 6 +- milena/tests/trait/op/Makefile.am | 6 +- milena/tests/trait/value/Makefile.am | 6 +- milena/tests/transform/Makefile.am | 3 - milena/tests/unit_test/Makefile.am | 10 +- milena/tests/upscaling/Makefile.am | 4 - milena/tests/upscaling/art/Makefile.am | 3 - milena/tests/util/Makefile.am | 9 +- scribo/test.cc => milena/tests/util/ord.cc | 4 +- milena/tests/value/Makefile.am | 3 - milena/tests/value/builtin/Makefile.am | 6 +- milena/tests/value/concept/Makefile.am | 3 - milena/tests/win/Makefile.am | 6 +- milena/tests/world/Makefile.am | 3 - milena/tests/world/binary_2d/Makefile.am | 3 - milena/tests/world/inter_pixel/Makefile.am | 3 - milena/tests/world/inter_pixel/dim2/Makefile.am | 3 - milena/tools/Makefile.am | 3 - scribo/ChangeLog | 93 +++++ scribo/Doxyfile | 16 + scribo/Doxyfile_tex | 16 + scribo/Makefile.am | 2 - scribo/demo/Makefile.am | 16 +- scribo/scribo.mk | 5 +- scribo/src/Makefile.am | 3 - scribo/src/binarization/Makefile.am | 4 - scribo/src/binarization/sauvola_ms.cc | 6 +- scribo/src/debug/Makefile.am | 3 - scribo/src/filter/Makefile.am | 3 - scribo/src/misc/Makefile.am | 4 - scribo/src/multi_scale/Makefile.am | 4 - scribo/src/preprocessing/Makefile.am | 3 - scribo/src/primitive/Makefile.am | 3 - scribo/src/primitive/extract/Makefile.am | 4 - scribo/src/primitive/find/Makefile.am | 5 - scribo/src/primitive/group/Makefile.am | 3 - scribo/src/table/Makefile.am | 3 - scribo/src/text/Makefile.am | 3 - scribo/tests/Makefile.am | 2 - scribo/tests/filter/Makefile.am | 3 - scribo/tests/preprocessing/Makefile.am | 7 +- scribo/tests/table/Makefile.am | 3 - scribo/tests/tests.mk | 5 +- scribo/tests/text/Makefile.am | 3 - scribo/tests/unit_test/Makefile.am | 23 +- scribo/tests/unit_test/build_unit_test.sh | 42 ++- scribo/tests/unit_test/disabled_tests | 5 + scribo/tests/unit_test/unit-tests.mk | 8 +- scribo/text/clean.hh | 2 +- swilena/ChangeLog | 18 + swilena/Makefile.am | 3 - swilena/python/Makefile.am | 29 +- swilena/python/morpho-fun.py | 23 +- swilena/python/morpho-segm.py | 7 +- 275 files changed, 2301 insertions(+), 1571 deletions(-) delete mode 100644 m4/with-swilena.m4 rename scribo/test.cc => milena/tests/util/ord.cc (95%) create mode 100644 scribo/tests/unit_test/disabled_tests hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch mesh-segm-skel updated: last-svn-commit-288-g4909e37
by git＠lrde.epita.fr 15 Jun '12

15 Jun '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch mesh-segm-skel has been updated via 4909e378b134c1a6cffad90f43777941db5fbc3a (commit) via 501e7cf32565082333ec78c87741f53aea709ded (commit) via 4f66070f0b86dde2bcf19d147ee7f2e7b460ac22 (commit) via 010c8ad73c83d6ba48444d1ea751edd88595f6c5 (commit) via 7633d6ba650fad3db5abf7093b1aab4b515eabcb (commit) via bced3c0ac330b5bf0a3e84b22d1ffac4bf048063 (commit) via 3351dd9fb898d8e3b67817c4dfc328958ca36b56 (commit) via 03fc6608251a80d512205a227252c5fbf08b4731 (commit) via c3438b91d3bb2d6e28189e1f4e30c55f76598fbc (commit) via 7a9ba190d8d1c953e5a3e01ada05f45f0abe944a (commit) via 2278386bbfd2b6d316da349e545f0cb4eee54aee (commit) via c7ca4dacce9f20a1f444a611d63b1f1af5ce8d6b (commit) via 19e5634ed71a357b381a6a92f35823e6cf9df5f6 (commit) via a56681a0767c94da4752443d0d28076faa98756f (commit) via 3f01437b08ce8f2bba55169bf6a3eabf3e3ef89c (commit) via ffee393b5146379daeb29ab517b0d7edbfaa7001 (commit) via 7d862f687912a9b931eee257e755f2ade37d53a7 (commit) via 494c594fb84fe8072af7a5b1eb7d96150ccc7708 (commit) via 1b53b9052d1bfba1ca67274191ad6dfb93b89ccb (commit) via bd0c64efc3c0b28d4c9cf40133af1adfd2c66597 (commit) via 656d1e5859c4b9289c2a4afaff33f3959839e914 (commit) via 5c00547c2ee3164974be16985a0802d960281d18 (commit) via f4c7fbf885a04dc4d8f0ce78ff734f41ae0e5f82 (commit) via 64de1ca04648befd0345f9682619e01904718d57 (commit) via 3775f010bea392fc633690c9baec398e2e017a42 (commit) via 4d3cc3a35eddb94efad1e350c600ca07097aeec9 (commit) via b5877a380725ed332788c7b0fccb3878699405ba (commit) via 7fbb81ee51035eac926180a96ef912488980762f (commit) via d8cfdb52a546631b5f69eb4e3c73de3d8b633771 (commit) via dc1f49e33071cfc2e09aea3c41f6ee3497782f4a (commit) via 4d52cf76971cb44dd02ba48439b8a56ba53cad59 (commit) via 19d12e86846a6eb9da210e2a97db74bb81b38fe4 (commit) via 6d2f0568bcccf065e4d6657dbdaa0a0d356272ef (commit) via da5b1fe14fc4c6d0152cfa792d54888f04103606 (commit) via 83227d21332fee1be17312d8ff509e188e7a0c39 (commit) via d2cb9c7518737e32753b8592254e48396180afcf (commit) via 56b5137360b54599b6aa56b42847ad4a7f0872be (commit) via 3e9183f01e76c840291d757b3b533d4ebb43d453 (commit) from 5946ef3265c3baaaacf7597068829e139335d5d2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 4909e37 Add tests to generate figures for the WADGMM 2010/LNCS submission. 501e7cf Introduce a no-constraint functor to replace fun::p2b::tautology. 4f66070 Factor code of 2D skeletonizations in apps/generic-skel/. 010c8ad Misc changes in apps/generic-skel/ and tools/. 7633d6b Exercise breadth-first thinning with predicate is_not_1d_isthmus. bced3c0 Add a non 1D isthmus predicate for (2D and 3D) binary images. 3351dd9 Check the consistency of tools/simple_point3d_lut_26_6.hh. 03fc660 Fix and improve the (fast) computation of 2D connectivity numbers. c3438b9 Add more tests. 7a9ba19 apps/generic-skel/image3d-skel.hh: Add `inline' qualifiers. 2278386 Introduce a better VTK output routine in apps/generic-skel. c7ca4da Add a VTK output routine in apps/generic-skel. 19e5634 Use package metadata macros instead of hard-coded strings in I/Os. a56681a No longer consider mln/version.hh.in as handled by autoheader. 3f01437 Pass the URL of the project to AC_INIT. ffee393 Remove buggy symbol definitions. 7d862f6 Set connectivity number functions when building is_simple_point3d. 494c594 Fix, factor and improve the (exact) simple 3D point criterion. 1b53b90 Add routines to compute 3D connectivity numbers. bd0c64e Improve the generation of simple 3D point look-up tables. 656d1e5 tools: s/simple_point_3d/simple_point3d/. 5c00547 New app: apps/generic-skel/image3d-skel-unconstrained. f4c7fbf Isolate reusable code from image3d-skel-with-end-points. 64de1ca Add a 3D volume of the Stanford bunny. 3775f01 New application computing a 3D skeleton preserving end points. 4d3cc3a Regen Milena's Makefile helpers. b5877a3 Add a first version of a simple 3D point predicate. 7fbb81e Generate a simple 3D points look-up table for the (26,6)-adjacency. d8cfdb5 Parallel computation of simple 3D point look-up tables. dc1f49e Sequential computation of simple 3D points look-up tables. 4d52cf7 Improve mln::connectivity_number_2d. 19d12e8 Factor connectivity_numbers_3d and connectivity_numbers_3d_tbb. 6d2f056 Add a parallel version of connectivity_numbers_3d using TBB. da5b1fe Make tools/connectivity_numbers_3d thread-safe. 83227d2 Factor soon-to-be shared components of connectivity_numbers_3d. d2cb9c7 Add a tool to compute 3D connectivity numbers. 56b5137 Have tools/compute_local_configurations compile. 3e9183f Import the computation of (2D) connectivity numbers from sandbox. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 14 + configure.ac | 17 +- milena/ChangeLog | 456 ++++++++++++++++++++ milena/Makefile.am | 1 + milena/apps/generic-skel/Makefile.am | 70 +++- .../generic-skel/image2d-skel-unconstrained.cc | 27 +- .../generic-skel/image2d-skel-with-end-points.cc | 24 +- milena/apps/generic-skel/image2d-skel.hh | 174 -------- .../generic-skel/image3d-skel-unconstrained.cc | 108 +++++ .../generic-skel/image3d-skel-with-1d-isthmuses.cc | 114 +++++ .../generic-skel/image3d-skel-with-end-points.cc | 114 +++++ milena/apps/generic-skel/image3d-skel.hh | 399 +++++++++++++++++ milena/apps/generic-skel/test-mixed.in | 25 ++ milena/apps/mesh-segm-skel/Makefile.am | 31 ++- .../mesh-complex-max-curv-1-collapse.cc | 15 +- .../mesh-complex-max-curv-2-collapse.cc | 15 +- .../mesh-segm-skel/mesh-complex-pinv-curv-skel.cc | 14 +- milena/apps/mesh-segm-skel/test-mixed.in | 25 ++ milena/headers.mk | 8 + milena/img/README | 6 + milena/img/bunny.pgm | Bin 0 -> 27000043 bytes milena/mln/fun/p2b/antilogy.hh | 1 - milena/mln/fun/p2b/tautology.hh | 1 - milena/mln/io/fld/write_header.hh | 9 +- milena/mln/io/off/save.hh | 9 +- milena/mln/io/pnm/save_header.hh | 10 +- milena/mln/io/vtk/save.hh | 3 +- milena/mln/topo/connectivity_number_2d.hh | 130 ++++++ milena/mln/topo/connectivity_number_3d.hh | 308 +++++++++++++ milena/mln/topo/detach_point.hh | 1 + milena/mln/topo/is_not_1d_isthmus.hh | 210 +++++++++ milena/mln/topo/is_not_end_point.hh | 42 ++- milena/mln/topo/is_simple_2d.hh | 42 +- milena/mln/topo/is_simple_point2d.hh | 5 +- milena/mln/topo/is_simple_point3d.hh | 191 ++++++++ milena/mln/topo/no_constraint.hh | 82 ++++ milena/mln/topo/skeleton/breadth_first_thinning.hh | 17 +- .../mln/topo/skeleton/priority_driven_thinning.hh | 17 +- milena/mln/version.hh.in | 19 +- milena/tests/core/alias/Makefile.am | 5 +- milena/tests/core/alias/dpoint2d.cc | 4 +- milena/tests/core/alias/neighb2d.cc | 54 +++ milena/tests/io/dump/Makefile.am | 7 +- milena/tests/io/dump/dump.cc | 35 ++- milena/tests/topo/Makefile.am | 5 + milena/tests/topo/connectivity_numbers_2d.cc | 87 ++++ milena/tests/unit_test/unit-tests.mk | 32 ++- milena/tests/value/Makefile.am | 6 +- milena/tests/value/int_u32.cc | 37 ++ milena/tools/Makefile.am | 63 +++- milena/tools/compute_local_configurations.cc | 109 +++++ milena/tools/connectivity_numbers_3d.cc | 46 ++ milena/tools/connectivity_numbers_3d.hh | 407 +++++++++++++++++ milena/tools/connectivity_numbers_3d_tbb.cc | 47 ++ milena/tools/connectivity_numbers_3d_tbb.hh | 167 +++++++ milena/tools/gen_cxx_lut | 103 +++++ milena/tools/simple_point3d_lut.cc | 48 ++ milena/tools/simple_point3d_lut.hh | 190 ++++++++ milena/tools/simple_point3d_lut_26_6.cc | 30 ++ milena/tools/simple_point3d_lut_tbb.hh | 189 ++++++++ milena/tools/simple_point_3d_lut_tbb.cc | 49 +++ milena/tools/test_simple_point3d_lut_26_6.cc | 136 ++++++ milena/tools/tools.mk | 6 +- 63 files changed, 4335 insertions(+), 281 deletions(-) delete mode 100644 milena/apps/generic-skel/image2d-skel.hh create mode 100644 milena/apps/generic-skel/image3d-skel-unconstrained.cc create mode 100644 milena/apps/generic-skel/image3d-skel-with-1d-isthmuses.cc create mode 100644 milena/apps/generic-skel/image3d-skel-with-end-points.cc create mode 100644 milena/apps/generic-skel/image3d-skel.hh create mode 100644 milena/apps/generic-skel/test-mixed.in create mode 100644 milena/apps/mesh-segm-skel/test-mixed.in create mode 100755 milena/img/bunny.pgm create mode 100644 milena/mln/topo/connectivity_number_2d.hh create mode 100644 milena/mln/topo/connectivity_number_3d.hh create mode 100644 milena/mln/topo/is_not_1d_isthmus.hh create mode 100644 milena/mln/topo/is_simple_point3d.hh create mode 100644 milena/mln/topo/no_constraint.hh create mode 100644 milena/tests/core/alias/neighb2d.cc create mode 100644 milena/tests/topo/connectivity_numbers_2d.cc create mode 100644 milena/tests/value/int_u32.cc create mode 100644 milena/tools/compute_local_configurations.cc create mode 100644 milena/tools/connectivity_numbers_3d.cc create mode 100644 milena/tools/connectivity_numbers_3d.hh create mode 100644 milena/tools/connectivity_numbers_3d_tbb.cc create mode 100644 milena/tools/connectivity_numbers_3d_tbb.hh create mode 100755 milena/tools/gen_cxx_lut create mode 100644 milena/tools/simple_point3d_lut.cc create mode 100644 milena/tools/simple_point3d_lut.hh create mode 100644 milena/tools/simple_point3d_lut_26_6.cc create mode 100644 milena/tools/simple_point3d_lut_tbb.hh create mode 100644 milena/tools/simple_point_3d_lut_tbb.cc create mode 100644 milena/tools/test_simple_point3d_lut_26_6.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch cleanup updated: olena-2.0-31-gb2369d6
by git＠lrde.epita.fr 15 Jun '12

15 Jun '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch cleanup has been updated via b2369d6d4c5f48d3b44808b8be120cc380363774 (commit) from 2b70784ca52b9411cc83b882ee3009d1d673fbc3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- b2369d6 Remove dependencies on suppressed files. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 7 +++++++ .../examples/tuto4_genericity_and_algorithms.cc | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-31-gb2369d6 Remove dependencies on suppressed files.
by Roland Levillain 15 Jun '12

15 Jun '12

* doc/examples/tuto4_genericity_and_algorithms.cc: Do not include mln/extract/green.hh. --- milena/ChangeLog | 7 +++++++ .../examples/tuto4_genericity_and_algorithms.cc | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5d5a89a..83f5520 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2012-06-15 Roland Levillain <roland(a)lrde.epita.fr> + + Remove dependencies on suppressed files. + + * doc/examples/tuto4_genericity_and_algorithms.cc: Do not include + mln/extract/green.hh. + 2012-06-14 Roland Levillain <roland(a)lrde.epita.fr> Fix the distcheck target. diff --git a/milena/doc/examples/tuto4_genericity_and_algorithms.cc b/milena/doc/examples/tuto4_genericity_and_algorithms.cc index 78237a4..46893bd 100644 --- a/milena/doc/examples/tuto4_genericity_and_algorithms.cc +++ b/milena/doc/examples/tuto4_genericity_and_algorithms.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2012 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -34,8 +34,6 @@ #include <mln/fun/p2b/chess.hh> -#include <mln/extract/green.hh> - #include <mln/accu/stat/max.hh> #include <mln/geom/all.hh> -- 1.7.2.5

1 0