- Olena-patches

last-svn-commit-170-g9f19274 upsampling/eagle.hh: Add a new upsampling algorithm.
by Guillaume Lazzara 25 Jun '10

25 Jun '10

--- scribo/ChangeLog | 12 ++- scribo/upsampling/{bs2x.hh => eagle.hh} | 108 +++++++++++++++---------------- 2 files changed, 61 insertions(+), 59 deletions(-) copy scribo/upsampling/{bs2x.hh => eagle.hh} (50%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 609abf5..b03b8e4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,11 +1,15 @@ +2010-06-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * upsampling/eagle.hh: Add a new upsampling algorithm. + 2010-06-23 Arthur Crepin-Leblond <crepin(a)stockholm.lrde.epita.fr> Add extensions to ICDAR XML format. - + * io/xml/save_text_lines.hh: Rename as... * io/xml/save.hh: ...this. - - * src/pbm_text_in_doc.cc: update call to io::xml::save. + + * src/pbm_text_in_doc.cc: update call to io::xml::save. 2010-06-18 green <jacquelet(a)lrde.epita.fr> @@ -14,7 +18,7 @@ * sandbox: New experimental directory. * sandbox/green: New green'work. * sandbox/green/ChangeLog: New ChangeLog file. - + 2010-06-15 Guillaume Lazzara <z(a)lrde.epita.fr> Small fixes. diff --git a/scribo/upsampling/bs2x.hh b/scribo/upsampling/eagle.hh similarity index 50% copy from scribo/upsampling/bs2x.hh copy to scribo/upsampling/eagle.hh index c701e47..eab1989 100644 --- a/scribo/upsampling/bs2x.hh +++ b/scribo/upsampling/eagle.hh @@ -23,34 +23,32 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_UPSAMPLING_BS2X_HH -# define SCRIBO_UPSAMPLING_BS2X_HH +#ifndef SCRIBO_UPSAMPLING_EAGLE_HH_ +# define SCRIBO_UPSAMPLING_EAGLE_HH_ /// \file /// /// Scale 2x algorithm for binary images. # include <mln/core/concept/image.hh> -# include <mln/core/alias/box2d.hh> +# include <mln/core/def/coord.hh> # include <mln/opt/at.hh> -# include <mln/geom/all.hh> - - +# include <mln/make/box2d.hh> namespace scribo { namespace upsampling { - using namespace mln; + using namespace mln; /// \brief Scale 2x algorithm for binary images. /// // template <typename I> mln_concrete(I) - bs2x(const Image<I>& input); + eagle(const Image<I>& ima); @@ -59,80 +57,81 @@ namespace scribo template <typename I> mln_concrete(I) - bs2x(const mln::Image<I>& input_) + eagle(const Image<I>& input_) { - trace::entering("scribo::upsampling::bs2x"); + trace::entering("scribo::upsampling::eagle"); + typedef mln_value(I) V; const I& input = exact(input_); - mlc_is(mln_domain(I), mln::box2d)::check(); - mlc_is(mln_value(I), bool)::check(); - mln_precondition(input.is_valid()); - typedef mln_value(I) V; - mln::def::coord mrow = geom::min_row(input), - mcol = geom::min_col(input); + mcol = geom::min_col(input), + mxrow = geom::max_row(input), + mxcol = geom::max_col(input); mln_piter(I) p(input.domain()); - mln_concrete(I) output(mln::make::box2d(mrow, mcol, - mrow + 2 * input.nrows() - 1, - mcol + 2 * input.ncols() - 1)); + mln_concrete(I) + output(mln::make::box2d(mrow, mcol, + mrow + 2 * input.nrows() - 1, + mcol + 2 * input.ncols() - 1)); + for_all(p) { mln::def::coord - row = mrow + 2 * (p.row() - mrow), - col = mcol + 2 * (p.col() - mcol); + prow = p.row() - mrow, + pcol = p.col() - mcol; - if(p.row() == geom::min_row(input) - || p.col() == geom::min_col(input) - || p.row() == geom::max_row(input) - || p.col() == geom::max_col(input)) + if (p.row() == mrow + || p.col() == mcol + || p.row() == mxrow + || p.col() == mxcol) { - mln::box2d b = mln::make::box2d(row, col, - row + 1, col + 1); + box2d b = mln::make::box2d(2 * prow, 2 * pcol, + 2 * prow + 1, 2 * pcol + 1); + mln_piter_(box2d) pb(b); V value = opt::at(input, p.row(), p.col()); - data::fill((output | b).rw(), value); + for_all(pb) + opt::at(output, mrow + pb.row(), mcol + pb.col()) = value; } else { - // nw n ne - // - // w value e - // - // sw s se - - V n = input(p + mln::up), - s = input(p + mln::down), - e = input(p + mln::right), - w = input(p + mln::left), - nw = input(p + mln::up_left), - ne = input(p + mln::up_right), - sw = input(p + mln::down_left), - se = input(p + mln::down_right), - value = input(p); - - if(e != w && n != s) + V + n = opt::at(input, p.row() - 1, p.col()), + s = opt::at(input, p.row() + 1, p.col()), + e = opt::at(input, p.row(), p.col() + 1), + w = opt::at(input, p.row(), p.col() - 1), + nw = opt::at(input, p.row() - 1, p.col() - 1), + ne = opt::at(input, p.row() - 1, p.col() + 1), + sw = opt::at(input, p.row() + 1, p.col() - 1), + se = opt::at(input, p.row() + 1, p.col() + 1), + value = opt::at(input, p.row(), p.col()); + + if (e != w || n != s || e != n) { - opt::at(output, row, col) = (w == n &&((se != nw) || !value)) ? w : value; - opt::at(output, row, col + 1) = (e == n &&((sw != ne) || !value)) ? e : value; - opt::at(output, row + 1, col) = (w == s &&((ne != sw) || !value)) ? w : value; - opt::at(output, row + 1, col + 1) = (e == s &&((nw != se) || !value)) ? e : value; + opt::at(output, mrow + 2 * prow, mcol + 2 * pcol) = ((w == n && w == nw && nw == n) ? nw : value); + opt::at(output, mrow + 2 * prow, mcol + 2 * pcol + 1) = ((e == n && e == ne && ne == n) ? ne : value); + opt::at(output, mrow + 2 * prow + 1, mcol + 2 * pcol) = ((w == s && w == sw && sw == s) ? sw : value); + opt::at(output, mrow + 2 * prow + 1, mcol + 2 * pcol + 1) = ((e == s && e == se && se == s) ? se : value); } else { - mln::box2d b = mln::make::box2d(row, col, - row + 1, col + 1); - data::fill((output | b).rw(), value); + box2d b = mln::make::box2d(2 * prow, 2 * pcol, + 2 * prow + 1, 2 * pcol + 1); + mln_piter_(box2d) pb(b); + V value = opt::at(input, p.row(), p.col()); + + for_all(pb) + opt::at(output, mrow + pb.row(), mcol + pb.col()) = value; } } } - trace::exiting("scribo::upsampling::bs2x"); + trace::exiting("scribo::upsampling::eagle"); return output; } @@ -143,5 +142,4 @@ namespace scribo } // end of namespace scribo - -#endif // ! SCRIBO_UPSAMPLING_BS2X_HH +#endif // ! SCRIBO_UPSAMPLING_EAGLE_HH_ -- 1.5.6.5

1 0

last-svn-commit-183-g06265bd Configure milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema.
by Roland Levillain 24 Jun '10

24 Jun '10

* configure.ac: Here. --- ChangeLog | 6 ++++++ configure.ac | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44386d3..bfce0d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> + + Configure milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema. + + * configure.ac: Here. + 2010-06-24 Roland Levillain <roland(a)lrde.epita.fr> Add `mesh-segm-skel' to the branches to be uploaded (as snapshot). diff --git a/configure.ac b/configure.ac index 20efb20..4d6bfaf 100644 --- a/configure.ac +++ b/configure.ac @@ -505,6 +505,8 @@ AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-max-curv], [chmod +x milena/apps/mesh-segm-skel/test-mesh-max-curv]) AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv], [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv]) +AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema], + [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema]) AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-segm], [chmod +x milena/apps/mesh-segm-skel/test-mesh-segm]) AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-segm], -- 1.5.6.5

1 0

last-svn-commit-184-g068f539 Clean up and new FIXMES in in apps/mesh-segm-skel.
by Roland Levillain 24 Jun '10

24 Jun '10

* apps/mesh-segm-skel/mesh-complex-max-curv.cc: Remove dead code. * apps/mesh-segm-skel/mesh-complex-skel.cc: Typo. * apps/mesh-segm-skel/Makefile.am: Add titles and FIXMES. --- milena/ChangeLog | 8 ++++ milena/apps/mesh-segm-skel/Makefile.am | 36 ++++++++++++++++++-- .../apps/mesh-segm-skel/mesh-complex-max-curv.cc | 13 +------ milena/apps/mesh-segm-skel/mesh-complex-skel.cc | 2 +- 4 files changed, 44 insertions(+), 15 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f0064f7..b22b7bf 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> + Clean up and new FIXMES in in apps/mesh-segm-skel. + + * apps/mesh-segm-skel/mesh-complex-max-curv.cc: Remove dead code. + * apps/mesh-segm-skel/mesh-complex-skel.cc: Typo. + * apps/mesh-segm-skel/Makefile.am: Add titles and FIXMES. + +2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> + New application: mesh-complex-max-curv-extrema. * apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc: New. diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index 230ef0a..3114055 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -79,11 +79,13 @@ endif ENABLE_TRIMESH if ENABLE_TRIMESH bin_PROGRAMS += mesh-pinv-curv mesh-max-curv + # FIXME: Rename as mesh-trimesh-pinv-curv? mesh_pinv_curv_SOURCES = mesh-pinv-curv.cc io.hh mesh_pinv_curv_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_trimesh) mesh_pinv_curv_LDFLAGS = $(LDFLAGS_trimesh) mesh_pinv_curv_LDADD = $(LDADD_trimesh) + # FIXME: Rename as mesh-trimesh-max-curv? mesh_max_curv_SOURCES = mesh-max-curv.cc io.hh mesh_max_curv_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_trimesh) mesh_max_curv_LDFLAGS = $(LDFLAGS_trimesh) @@ -93,17 +95,34 @@ if ENABLE_TRIMESH endif ENABLE_TRIMESH ## ---------------------------------------------------- ## +## Graph-based applications, independent of Trimesh. ## +## ---------------------------------------------------- ## + +# FIXME: To be written (and factored, of course): +# +# mesh-graph-{max,pinv}-curv +# +# mesh-graph-segm +# mesh-graph-{max,pinv}-curv-segm +# +# mesh-graph-skel +# mesh-graph-{max,pinv}-curv-skel +# +# ... + +## ---------------------------------------------------- ## ## Complex-based applications, independent of Trimesh. ## ## ---------------------------------------------------- ## # A Milena re-implementation of some features from Trimesh. This code # is completely independent from the Trimesh library. # FIXME: Change the name of this directory, as it is confusing. +# FIXME: Integrate this header into Milena. noinst_HEADERS = trimesh/misc.hh EXTRA_DIST = trimesh/README -## Segmentation. -## ------------ +## Curvature computation. +## ---------------------- # A small program exercising the curvature computation routines ported # from Trimesh to Milena. @@ -112,6 +131,7 @@ mesh_complex_max_curv_SOURCES = mesh-complex-max-curv.cc TESTS += test-mesh-complex-max-curv MOSTLYCLEANFILES += teapot-complex-max-curv.off +# FIXME: Implement (and exercise) mesh-complex-pinv-curv. # A program computing the max curvature at each (2-)face of the # surface of a triangle mesh and displaying its local minima @@ -123,7 +143,14 @@ MOSTLYCLEANFILES += \ socket-complex-max-curv-extrema.off \ teapot-complex-max-curv-extrema.off -# Segmentation program working on precomputed meshes with curvatures data. +# FIXME: Implement (and exercise) mesh-complex-pinv-curv-extrema. + +## Segmentation. +## ------------- + +# Segmentation program working on precomputed meshes with curvature +# data. Less accurate, since curvature is stored on triangles +# (polygons), whereas the segmentation is performed on edges. bin_PROGRAMS += mesh-complex-segm mesh_complex_segm_SOURCES = mesh-complex-segm.cc TESTS += test-mesh-complex-segm @@ -159,3 +186,6 @@ MOSTLYCLEANFILES += \ socket-max-curv-skel.off \ teapot-max-curv.off \ three-triangles-skel.off + +# FIXME: Implement `mesh-complex-{max,pinv}-curv-skel'. +# ... diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc index 8d79839..79ac4ea 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of the Milena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -86,16 +87,6 @@ int main(int argc, char* argv[]) mln::bin_2complex_image3df input; mln::io::off::load(input, input_filename); -// // ------------------------------------------------------------ -// // FIXME: TEST. -// mln::complex_image< 2, mln::space_2complex_geometry, mln::algebra::vec<3, float> > -// normal = mesh_normal(input.domain()); -// mln::p_n_faces_fwd_piter<D, G> v_(normal.domain(), 0); -// for_all(v_) -// std::cout << normal(v_) << std::endl; -// std::exit(0); -// // ------------------------------------------------------------ - std::pair<ima_t, ima_t> curv = mln::geom::mesh_curvature(input.domain()); // Compute the max curvature at each vertex. diff --git a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc index a4df815..b7e1f1f 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc @@ -209,7 +209,7 @@ main(int argc, char* argv[]) `---------*/ /* FIXME: This does not work (yet). - Use workaround mln::io::off::save_bin_salt instead (bad!) */ + Use workaround mln::io::off::save_bin_alt instead (bad!) */ #if 0 mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), output_filename); -- 1.5.6.5

1 0

last-svn-commit-182-gdaf48e6 New application: mesh-complex-max-curv-extrema.
by Roland Levillain 24 Jun '10

24 Jun '10

* apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc: New. * apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema.in: New. * apps/mesh-segm-skel/Makefile.am (bin_PROGRAMS): Add mesh-complex-max-curv-extrema. (mesh_complex_max_curv_extrema_SOURCES): New. (TESTS): Add test-mesh-complex-max-curv-segm-extrema. (MOSTLYCLEANFILES): Add socket-complex-max-curv-segm-extrema.off and teapot-complex-max-curv-segm-extrema.off. --- milena/ChangeLog | 13 +++ milena/apps/mesh-segm-skel/Makefile.am | 13 ++- ...ax-curv.cc => mesh-complex-max-curv-extrema.cc} | 105 +++++++++++++------- .../test-mesh-complex-max-curv-extrema.in | 10 ++ 4 files changed, 101 insertions(+), 40 deletions(-) copy milena/apps/mesh-segm-skel/{mesh-complex-max-curv.cc => mesh-complex-max-curv-extrema.cc} (64%) create mode 100644 milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema.in diff --git a/milena/ChangeLog b/milena/ChangeLog index b2f2330..f0064f7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,18 @@ 2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> + New application: mesh-complex-max-curv-extrema. + + * apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc: New. + * apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema.in: New. + * apps/mesh-segm-skel/Makefile.am (bin_PROGRAMS): Add + mesh-complex-max-curv-extrema. + (mesh_complex_max_curv_extrema_SOURCES): New. + (TESTS): Add test-mesh-complex-max-curv-segm-extrema. + (MOSTLYCLEANFILES): Add socket-complex-max-curv-segm-extrema.off + and teapot-complex-max-curv-segm-extrema.off. + +2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> + Revive, fix and update application mesh-segm. * apps/mesh-segm-skel/mesh-segm.cc: Catch up with the new diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index 501dec0..230ef0a 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -112,9 +112,16 @@ mesh_complex_max_curv_SOURCES = mesh-complex-max-curv.cc TESTS += test-mesh-complex-max-curv MOSTLYCLEANFILES += teapot-complex-max-curv.off -# FIXME: Write a program showing the local minima (and maxima) of -# scalar-valued complex-based mesh (to see the curvature extrema). -# ... + +# A program computing the max curvature at each (2-)face of the +# surface of a triangle mesh and displaying its local minima +# (in blue) and maxima (in red). +bin_PROGRAMS += mesh-complex-max-curv-extrema +mesh_complex_max_curv_extrema_SOURCES = mesh-complex-max-curv-extrema.cc +TESTS += test-mesh-complex-max-curv-extrema +MOSTLYCLEANFILES += \ + socket-complex-max-curv-extrema.off \ + teapot-complex-max-curv-extrema.off # Segmentation program working on precomputed meshes with curvatures data. bin_PROGRAMS += mesh-complex-segm diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc similarity index 64% copy from milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc copy to milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc index 8d79839..8f68b3d 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of the Milena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,10 +26,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file apps/mesh-segm-skel/mesh-complex-max-curv.cc +/// \file apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc /// \brief A program computing the max curvature at each (2-)face of -/// the surface of the (triangle) mesh of a statue, using a -/// complex-based image. +/// the surface of the (triangle) mesh of a statue, using +/// complex-based image, and displaying its local minima (in blue) and +/// maxima (in red). #include <cstdlib> #include <cmath> @@ -42,13 +44,20 @@ #include <mln/data/fill.hh> #include <mln/literal/zero.hh> +#include <mln/labeling/regional_minima.hh> +#include <mln/labeling/regional_maxima.hh> + #include <mln/math/max.hh> #include <mln/math/sqr.hh> #include <mln/accu/stat/min_max.hh> #include <mln/fun/v2v/linear.hh> #include <mln/data/transform.hh> +#include <mln/value/label_16.hh> + #include <mln/literal/white.hh> +#include <mln/literal/grays.hh> +#include <mln/literal/colors.hh> #include <mln/io/off/load.hh> #include <mln/io/off/save.hh> @@ -86,16 +95,6 @@ int main(int argc, char* argv[]) mln::bin_2complex_image3df input; mln::io::off::load(input, input_filename); -// // ------------------------------------------------------------ -// // FIXME: TEST. -// mln::complex_image< 2, mln::space_2complex_geometry, mln::algebra::vec<3, float> > -// normal = mesh_normal(input.domain()); -// mln::p_n_faces_fwd_piter<D, G> v_(normal.domain(), 0); -// for_all(v_) -// std::cout << normal(v_) << std::endl; -// std::exit(0); -// // ------------------------------------------------------------ - std::pair<ima_t, ima_t> curv = mln::geom::mesh_curvature(input.domain()); // Compute the max curvature at each vertex. @@ -133,29 +132,61 @@ int main(int argc, char* argv[]) mln_invariant(n <= 3); } - // Normalize values between 0 and 1. - /* Shrink the values of FACE_M into the range 0..1, as these are - the only values accepted a an RGB floating-point component in the - OFF file format. */ - ima_t output(max_curv.domain()); - mln::data::fill(output, mln::literal::zero); - std::pair<float, float> min_max(acc); - // FIXME: Taken from mln/data/stretch.hh (this should be factored). - float min = min_max.first; - float max = min_max.second; - std::cout << min << std::endl; - std::cout << max << std::endl; - // Don't normalize actually if the curvature is constant (i.e., - // if min == max). - if (min != max) - { - float m = 0.0f; - float M = 1.0f; - float a = (M - m) / (max - min); - float b = (m * max - M * min) / (max - min); - mln::fun::v2v::linear<float, float, float> f(a, b); - output = mln::data::transform(max_curv, f); - } + /*----------------. + | Local extrema. | + `----------------*/ + + /// Adjacent triangles are connected by shared edges. + typedef mln::complex_lower_dim_connected_n_face_neighborhood<D, G> nbh_t; + nbh_t nbh; + + typedef mln::value::label_16 label_t; + typedef mln_ch_value_(ima_t, label_t) label_ima_t; + + /* FIXME: We should use something like `ima_t | p_n_faces(2)' instead + of `ima_t' here. Or better: `input' should only associate data + to 2-faces. */ + label_t nminima; + label_ima_t minima = + mln::labeling::regional_minima(max_curv, nbh, nminima); + std::cout << "nminima = " << nminima << std::endl; + + label_t nmaxima; + label_ima_t maxima = + mln::labeling::regional_maxima(max_curv, nbh, nmaxima); + std::cout << "nmaxima = " << nmaxima << std::endl; + + /*-----------------. + | Colored output. | + `-----------------*/ + + typedef mln::rgb8_2complex_image3df output_t; + output_t output(max_curv.domain()); + + for_all(t) + { + if (minima(t) != mln::literal::zero) + { + // Special (unexpected) case: T is both a minimum and a + // maximum. Paint it in magenta (blue + red). + if (maxima(t) != mln::literal::zero) + { + std::cerr + << "warning: " << t << " is both a minimum and a maximum." + << std::endl; + output(t) = mln::literal::magenta; + } + else + // Paint minimum T in blue. + output(t) = mln::literal::blue; + } + else if (maxima(t) != mln::literal::zero) + // Paint maximum T in red. + output(t) = mln::literal::red; + else + // Default color. + output(t) = mln::literal::medium_gray; + } // Output. mln::io::off::save(output, output_filename); diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema.in b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema.in new file mode 100644 index 0000000..c6fa1e8 --- /dev/null +++ b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema.in @@ -0,0 +1,10 @@ +#! /bin/sh + +set -ex + +mesh_dir=@top_srcdir@/milena/mesh + +time ./mesh-complex-max-curv-extrema $mesh_dir/socket.off socket-complex-max-curv-extrema.off +time ./mesh-complex-max-curv-extrema $mesh_dir/teapot.off teapot-complex-max-curv-extrema.off +# FIXME: Too long. Should be run with (future) target `check-full'. +#time ./mesh-complex-max-curv-extrema $mesh_dir/bunny-holefilled.off bunny-holefilled-complex-max-curv-extrema.off -- 1.5.6.5

1 0

branch mesh-segm-skel updated: last-svn-commit-188-gc68caaf
by git＠lrde.epita.fr 24 Jun '10

24 Jun '10

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 discards f36081f28428672f81cbb700a0a52da51b10d7ff (commit) discards 3f6e1c50761b9ca2c8c8f5403c9236c45d04e969 (commit) discards b5e8235b7e417cd015a4978999d1d51540645b7e (commit) discards f1c3f6a489dfa9606ce6fa0d13020ea314acd1e7 (commit) discards ead83a9b2e0b7269825675cb0a769c119d92ff16 (commit) discards 45fcb1970125f5bba8b68ecff943188234caf1ca (commit) discards 56c4e2c3c79bec09c11003e222f480443c1288c5 (commit) via c68caaf54cabebfd094a596d54fa6517dac6278b (commit) via ca0ba34f44e7d21d6487865f6a937a6f43a00f7a (commit) via f452dc6fdc528b2e40112e77a78c577e4504b081 (commit) via 8a4d99755f78bbf1bab1b7646722a2a840c48c97 (commit) via 068f539a01aed9ace0a3d95f9fe889816224830e (commit) via 06265bdd495a0eea3305ff40a345e0243bcff936 (commit) via daf48e6da1a7cdc3c4d51465b80b66da9f50ec2d (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (f36081f28428672f81cbb700a0a52da51b10d7ff) \ N -- N -- N (c68caaf54cabebfd094a596d54fa6517dac6278b) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 ----------------------------------------------------------------- c68caaf Actually use the maximal curvature in mesh-complex-max-curv-segm. ca0ba34 Improve the precision of some mesh-segm-skel apps. f452dc6 Configure milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-skel. 8a4d997 New application: mesh-complex-max-curv-skel. 068f539 Clean up and new FIXMES in in apps/mesh-segm-skel. 06265bd Configure milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema. daf48e6 New application: mesh-complex-max-curv-extrema. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 7 +++---- milena/apps/mesh-segm-skel/Makefile.am | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch exp/scribo-z updated: last-svn-commit-169-g5ca84d1
by git＠lrde.epita.fr 24 Jun '10

24 Jun '10

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 exp/scribo-z has been updated via 5ca84d197b8742460dfda8b9435a02a79603ab0a (commit) via d12e77e06b9cfdb409a36b3f4fb65b09327acfdb (commit) via b3416b2f45e4e3ab0e853c2e73f1c670891e5d8d (commit) via 3591f2a690fbd20c6caaf51283ba96505e87c0c0 (commit) via 76dd7c37346ba9280d586e31b0ff558af2a44d90 (commit) from 91b205927506a09d3c921c4980da3b114617775d (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 ----------------------------------------------------------------- 5ca84d1 Define documentation files. d12e77e Define gnuplot shell export format. b3416b2 Import files from milena/sandbox/green. 3591f2a Define accumulator which computes histogram view as image. 76dd7c3 Import files from milena/sandbox/green. ----------------------------------------------------------------------- Summary of changes: scribo/sandbox/green/ChangeLog | 171 +++ scribo/sandbox/green/README | 32 - scribo/sandbox/green/README.green | 288 ++++++ scribo/sandbox/green/README.img | 124 +++ scribo/sandbox/green/README.result | 143 +++ .../histo1d => scribo/sandbox/green}/gaussian.sh | 0 .../histo2d => scribo/sandbox/green}/gaussian2d.sh | 0 scribo/sandbox/green/mln/accu/stat/histo1d.hh | 338 ++++++ scribo/sandbox/green/mln/accu/stat/histo2d.hh | 341 ++++++ scribo/sandbox/green/mln/accu/stat/histo3d_hsl.hh | 387 +++++++ scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh | 343 ++++++ .../sandbox/green/mln/clustering/k_mean.hh | 0 .../sandbox/green/mln/clustering/kmean1d.hh | 0 .../sandbox/green/mln/clustering/kmean2d.hh | 0 .../sandbox/green/mln/clustering/kmean3d.hh | 0 scribo/sandbox/green/mln/clustering/kmean_rgb.hh | 973 +++++++++++++++++ scribo/sandbox/green/mln/display/display_histo.hh | 180 ++++ scribo/sandbox/green/mln/display/project_histo.hh | 536 ++++++++++ scribo/sandbox/green/mln/fun/p2b/achromatic.hh | 112 ++ .../sandbox/green/mln/fun/p2b/component_equals.hh | 99 ++ scribo/sandbox/green/mln/fun/v2v/achromatism.hh | 64 ++ .../sandbox/green/mln/fun/v2v/hue_concentration.hh | 100 ++ .../green/mln/fun/v2v/int_u16_to_int_u14.hh | 0 .../sandbox/green/mln/fun/v2v/log.hh | 0 .../sandbox/green/mln/fun/v2v/rg_to_rgb.hh | 0 scribo/sandbox/green/mln/fun/v2v/rgb8_to_int_u8.hh | 71 ++ scribo/sandbox/green/mln/fun/v2v/rgb8_to_rgbn.hh | 119 +++ .../green/mln/fun/v2v/rgb_to_achromatism_map.hh | 77 ++ scribo/sandbox/green/mln/fun/v2v/rgb_to_hsv.hh | 149 +++ scribo/sandbox/green/mln/fun/v2v/rgb_to_hue_map.hh | 96 ++ scribo/sandbox/green/mln/fun/v2v/rgb_to_rg.hh | 109 ++ .../green/mln/fun/v2v/rgb_to_saturation_map.hh | 83 ++ .../sandbox/green/mln/fun/v2v/rgb_to_value_map.hh | 75 ++ scribo/sandbox/green/mln/img_path.hh | 239 +++++ scribo/sandbox/green/mln/io/plot/save_image_sh.hh | 1090 ++++++++++++++++++++ scribo/sandbox/green/mln/math/ceil.hh | 64 ++ scribo/sandbox/green/mln/math/floor.hh | 64 ++ scribo/sandbox/green/mln/value/hsv.hh | 424 ++++++++ scribo/sandbox/green/mln/value/rg.hh | 175 ++++ scribo/sandbox/green/test_labelling.cc | 336 ++++++ .../green/tests/accu/stat/histo1d/Makefile.am | 153 +++ .../green/tests/accu/stat/histo1d/histo1d.cc | 507 +++++++++ .../green/tests/accu/stat/histo3d_hsl/Makefile.am | 153 +++ .../tests/accu/stat/histo3d_hsl/histo3d_hsl.cc | 391 +++++++ .../green/tests/accu/stat/histo3d_rgb/Makefile.am | 153 +++ .../tests/accu/stat/histo3d_rgb/histo3d_rgb.cc | 397 +++++++ .../green/tests/clustering/k_mean/Makefile.am | 0 .../green/tests/clustering/k_mean/k_mean.cc | 0 .../green/tests/clustering/kmean1d/Makefile.am | 0 .../green/tests/clustering/kmean1d/kmean1d.cc | 0 .../green/tests/io/plot/save_image_sh/Makefile.am | 153 +++ .../tests/io/plot/save_image_sh/save_image_sh.cc | 774 ++++++++++++++ .../green/use/accu/stat/histo1d/Makefile.am | 153 +++ .../sandbox/green/use/accu/stat/histo1d/histo1d.cc | 51 + .../green/use/accu/stat/histo2d/Makefile.am | 153 +++ .../sandbox/green/use/accu/stat/histo2d/histo2d.cc | 58 + .../green/use/accu/stat/histo3d_hsl/Makefile.am | 153 +++ .../green/use/accu/stat/histo3d_hsl/histo3d_hsl.cc | 59 ++ .../green/use/accu/stat/histo3d_rgb/Makefile.am | 153 +++ .../green/use/accu/stat/histo3d_rgb/histo3d_rgb.cc | 57 + .../green/use/fun/v2v/rgb8_to_rgbn/Makefile.am | 153 +++ .../green/use/fun/v2v/rgb8_to_rgbn/rgb8_to_rgbn.cc | 57 + .../green/use/fun/v2v/rgb_to_rg/Makefile.am | 153 +++ .../green/use/fun/v2v/rgb_to_rg/rgb_to_rg.cc | 58 + .../green/use/io/plot/save_image_sh/Makefile.am | 153 +++ .../use/io/plot/save_image_sh/save_image_sh.cc | 53 + scribo/sandbox/green/use/value/rg/Makefile.am | 153 +++ scribo/sandbox/green/use/value/rg/rg.cc | 58 + 68 files changed, 11726 insertions(+), 32 deletions(-) delete mode 100644 scribo/sandbox/green/README create mode 100644 scribo/sandbox/green/README.green create mode 100644 scribo/sandbox/green/README.img create mode 100644 scribo/sandbox/green/README.result copy {milena/sandbox/green/tests/accu/stat/histo1d => scribo/sandbox/green}/gaussian.sh (100%) copy {milena/sandbox/green/tests/accu/stat/histo2d => scribo/sandbox/green}/gaussian2d.sh (100%) create mode 100644 scribo/sandbox/green/mln/accu/stat/histo1d.hh create mode 100644 scribo/sandbox/green/mln/accu/stat/histo2d.hh create mode 100644 scribo/sandbox/green/mln/accu/stat/histo3d_hsl.hh create mode 100644 scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh copy {milena => scribo}/sandbox/green/mln/clustering/k_mean.hh (100%) copy {milena => scribo}/sandbox/green/mln/clustering/kmean1d.hh (100%) copy {milena => scribo}/sandbox/green/mln/clustering/kmean2d.hh (100%) copy {milena => scribo}/sandbox/green/mln/clustering/kmean3d.hh (100%) create mode 100644 scribo/sandbox/green/mln/clustering/kmean_rgb.hh create mode 100644 scribo/sandbox/green/mln/display/display_histo.hh create mode 100644 scribo/sandbox/green/mln/display/project_histo.hh create mode 100644 scribo/sandbox/green/mln/fun/p2b/achromatic.hh create mode 100644 scribo/sandbox/green/mln/fun/p2b/component_equals.hh create mode 100644 scribo/sandbox/green/mln/fun/v2v/achromatism.hh create mode 100644 scribo/sandbox/green/mln/fun/v2v/hue_concentration.hh copy {milena => scribo}/sandbox/green/mln/fun/v2v/int_u16_to_int_u14.hh (100%) copy {milena => scribo}/sandbox/green/mln/fun/v2v/log.hh (100%) copy {milena => scribo}/sandbox/green/mln/fun/v2v/rg_to_rgb.hh (100%) create mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb8_to_int_u8.hh create mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb8_to_rgbn.hh create mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb_to_achromatism_map.hh create mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb_to_hsv.hh create mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb_to_hue_map.hh create mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb_to_rg.hh create mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb_to_saturation_map.hh create mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb_to_value_map.hh create mode 100644 scribo/sandbox/green/mln/img_path.hh create mode 100644 scribo/sandbox/green/mln/io/plot/save_image_sh.hh create mode 100644 scribo/sandbox/green/mln/math/ceil.hh create mode 100644 scribo/sandbox/green/mln/math/floor.hh create mode 100644 scribo/sandbox/green/mln/value/hsv.hh create mode 100644 scribo/sandbox/green/mln/value/rg.hh create mode 100644 scribo/sandbox/green/test_labelling.cc create mode 100644 scribo/sandbox/green/tests/accu/stat/histo1d/Makefile.am create mode 100644 scribo/sandbox/green/tests/accu/stat/histo1d/histo1d.cc create mode 100644 scribo/sandbox/green/tests/accu/stat/histo3d_hsl/Makefile.am create mode 100644 scribo/sandbox/green/tests/accu/stat/histo3d_hsl/histo3d_hsl.cc create mode 100644 scribo/sandbox/green/tests/accu/stat/histo3d_rgb/Makefile.am create mode 100644 scribo/sandbox/green/tests/accu/stat/histo3d_rgb/histo3d_rgb.cc copy {milena => scribo}/sandbox/green/tests/clustering/k_mean/Makefile.am (100%) copy {milena => scribo}/sandbox/green/tests/clustering/k_mean/k_mean.cc (100%) copy {milena => scribo}/sandbox/green/tests/clustering/kmean1d/Makefile.am (100%) copy {milena => scribo}/sandbox/green/tests/clustering/kmean1d/kmean1d.cc (100%) create mode 100644 scribo/sandbox/green/tests/io/plot/save_image_sh/Makefile.am create mode 100644 scribo/sandbox/green/tests/io/plot/save_image_sh/save_image_sh.cc create mode 100644 scribo/sandbox/green/use/accu/stat/histo1d/Makefile.am create mode 100644 scribo/sandbox/green/use/accu/stat/histo1d/histo1d.cc create mode 100644 scribo/sandbox/green/use/accu/stat/histo2d/Makefile.am create mode 100644 scribo/sandbox/green/use/accu/stat/histo2d/histo2d.cc create mode 100644 scribo/sandbox/green/use/accu/stat/histo3d_hsl/Makefile.am create mode 100644 scribo/sandbox/green/use/accu/stat/histo3d_hsl/histo3d_hsl.cc create mode 100644 scribo/sandbox/green/use/accu/stat/histo3d_rgb/Makefile.am create mode 100644 scribo/sandbox/green/use/accu/stat/histo3d_rgb/histo3d_rgb.cc create mode 100644 scribo/sandbox/green/use/fun/v2v/rgb8_to_rgbn/Makefile.am create mode 100644 scribo/sandbox/green/use/fun/v2v/rgb8_to_rgbn/rgb8_to_rgbn.cc create mode 100644 scribo/sandbox/green/use/fun/v2v/rgb_to_rg/Makefile.am create mode 100644 scribo/sandbox/green/use/fun/v2v/rgb_to_rg/rgb_to_rg.cc create mode 100644 scribo/sandbox/green/use/io/plot/save_image_sh/Makefile.am create mode 100644 scribo/sandbox/green/use/io/plot/save_image_sh/save_image_sh.cc create mode 100644 scribo/sandbox/green/use/value/rg/Makefile.am create mode 100644 scribo/sandbox/green/use/value/rg/rg.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-186-g3a850a0 Distribute xz archives.
by Roland Levillain 24 Jun '10

24 Jun '10

* configure.ac (AM_INIT_AUTOMAKE): Add option `dist-xz'. --- ChangeLog | 6 ++++++ configure.ac | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 38ca80e..973a9d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-04-22 Roland Levillain <roland(a)lrde.epita.fr> + + Distribute xz archives. + + * configure.ac (AM_INIT_AUTOMAKE): Add option `dist-xz'. + 2010-04-26 Roland Levillain <roland(a)lrde.epita.fr> Enable parallel tests. diff --git a/configure.ac b/configure.ac index 7454a26..a63fd66 100644 --- a/configure.ac +++ b/configure.ac @@ -34,7 +34,7 @@ AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_FILES([build-aux/Makefile]) # Automake. -AM_INIT_AUTOMAKE([1.11 subdir-objects check-news dist-bzip2 +AM_INIT_AUTOMAKE([1.11 subdir-objects check-news dist-bzip2 dist-xz nostdinc parallel-tests -Wall]) # Package metadata. -- 1.5.6.5

1 0

last-svn-commit-187-g9125952 bootstrap: Check for xz (>= 4.999.9).
by Roland Levillain 24 Jun '10

24 Jun '10

--- ChangeLog | 4 ++++ bootstrap | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 973a9d6..1222ce0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-05-03 Roland Levillain <roland(a)lrde.epita.fr> + + * bootstrap: Check for xz (>= 4.999.9). + 2010-04-22 Roland Levillain <roland(a)lrde.epita.fr> Distribute xz archives. diff --git a/bootstrap b/bootstrap index d0e8b58..5f7d0f7 100755 --- a/bootstrap +++ b/bootstrap @@ -157,6 +157,9 @@ require doxygen 1.5.6 require convert 6.3.7 require hevea 1.10 -version +# For Make target `dist-xz'. +require xz 4.999.9 + # Regen files stored in the repository if asked so. if $regen_p; then -- 1.5.6.5

1 0

branch dist-xz updated: last-svn-commit-187-g9125952
by git＠lrde.epita.fr 24 Jun '10

24 Jun '10

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 dist-xz has been updated discards f62ea1f61ad96620adacb43da6a8b3a05820c5d8 (commit) discards f6e5d4d66f3c1158717d9f6f9f47ff3553add53f (commit) discards 7aacb61a0046adfcd926193d2a78de91cdbbb9d0 (commit) discards 4def5f0d7d19e7dd01c7ed42b1dc6019689c56f5 (commit) discards 5c1e70424e2d99a22cad909500f167b6189466d2 (commit) discards d134e182361389ad6c3e00a6a4a8fd50fe30c03a (commit) discards 74142adbc2697eeb721f42e6104a311b0aa23fbb (commit) discards 3240a14f9500348960cfe86b465182bac885780e (commit) discards ea5d26525d6e6db053348d79c86b3e0699d882ed (commit) discards d916229ffca1d1611531146d96757c40265f3508 (commit) discards b0d18239af4e6840aa131abab08d16248b684e2f (commit) via 9125952fccf2e8c19d11046898bc51ce3c78c5e5 (commit) via 3a850a03194db8c0f07d09ffbfb08cb5f87bde4d (commit) via 1632a8f59efe364ecc9366be99bbe59b5de139c6 (commit) via aa63bcb2576049200512f85e8ab584b6f149d24c (commit) via b64adfacb31e03d3debb788964337972250df5bb (commit) via 4bcc5bc53c219fd75895502d465116dc32e1b949 (commit) via 8194448d493450e3156d76a8903b7646abb1a961 (commit) via b6d70623f4ebe72255fb522c585c89dfe31d593f (commit) via 15ff6353f95db7159eb8b3b74aad3940e25d6cef (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) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (f62ea1f61ad96620adacb43da6a8b3a05820c5d8) \ N -- N -- N (9125952fccf2e8c19d11046898bc51ce3c78c5e5) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 ----------------------------------------------------------------- 9125952 bootstrap: Check for xz (>= 4.999.9). 3a850a0 Distribute xz archives. ----------------------------------------------------------------------- Summary of changes: AUTHORS | 3 + ChangeLog | 65 ++++++ Makefile.am | 7 +- 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 | 79 ++++++-- 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 | 77 +++++-- milena/ChangeLog | 237 ++++++++++++++++++-- milena/Makefile.am | 3 - .../test-constrained-connectivity.in | 16 ++ milena/apps/mesh-segm-skel/Makefile.am | 14 +- .../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 | 2 +- milena/doc/graphicx.hva | 16 ++ milena/doc/tools/clearbanner.sh | 16 ++ milena/doc/tools/split_sample.sh | 17 ++ milena/mesh/Makefile.am | 3 - milena/mln/core/image/edge_image.hh | 8 +- milena/mln/core/image/vertex_image.hh | 8 +- 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/tests/Makefile.am | 3 - milena/tests/accu/Makefile.am | 3 - 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 | 3 - milena/tests/binarization/Makefile.am | 3 +- milena/tests/border/Makefile.am | 3 - milena/tests/canvas/Makefile.am | 5 - milena/tests/canvas/browsing/Makefile.am | 3 - 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/routine/Makefile.am | 3 - milena/tests/core/site_set/Makefile.am | 3 - milena/tests/debug/Makefile.am | 3 - milena/tests/display/Makefile.am | 6 +- milena/tests/draw/Makefile.am | 3 - milena/tests/estim/Makefile.am | 3 - 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 | 3 - milena/tests/geom/Makefile.am | 3 - milena/tests/graph/Makefile.am | 3 - milena/tests/graph/attribute/Makefile.am | 3 - milena/tests/histo/Makefile.am | 3 - milena/tests/io/Makefile.am | 6 +- milena/tests/io/dicom/Makefile.am | 3 - milena/tests/io/dump/Makefile.am | 3 +- milena/tests/io/fits/Makefile.am | 3 +- milena/tests/io/fld/Makefile.am | 5 +- milena/tests/io/magick/Makefile.am | 3 +- milena/tests/io/off/Makefile.am | 4 +- milena/tests/io/pbm/Makefile.am | 3 +- milena/tests/io/pbms/Makefile.am | 3 +- milena/tests/io/pfm/Makefile.am | 3 - milena/tests/io/pgm/Makefile.am | 3 +- milena/tests/io/pgms/Makefile.am | 3 +- milena/tests/io/pnm/Makefile.am | 3 - milena/tests/io/ppm/Makefile.am | 3 +- milena/tests/io/ppms/Makefile.am | 3 +- milena/tests/io/tiff/Makefile.am | 3 - milena/tests/labeling/Makefile.am | 3 - milena/tests/linear/gaussian/Makefile.am | 2 +- milena/tests/linear/local/Makefile.am | 3 - milena/tests/literal/Makefile.am | 3 - milena/tests/logical/Makefile.am | 3 - milena/tests/make/Makefile.am | 3 - milena/tests/math/Makefile.am | 3 - milena/tests/metal/Makefile.am | 3 - milena/tests/metal/make/Makefile.am | 3 - milena/tests/metal/math/Makefile.am | 3 - milena/tests/morpho/Makefile.am | 4 +- milena/tests/morpho/approx/Makefile.am | 3 +- milena/tests/morpho/attribute/Makefile.am | 3 - milena/tests/morpho/closing/Makefile.am | 3 +- milena/tests/morpho/closing/approx/Makefile.am | 3 +- milena/tests/morpho/closing/sum.cc | 2 +- milena/tests/morpho/closing/volume.cc | 2 +- milena/tests/morpho/elementary/Makefile.am | 3 - milena/tests/morpho/line_graph_image_morpho.cc | 4 +- milena/tests/morpho/opening/Makefile.am | 3 +- milena/tests/morpho/opening/approx/Makefile.am | 3 +- milena/tests/morpho/opening/sum.cc | 2 +- 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/tree/Makefile.am | 5 +- milena/tests/morpho/tree/filter/Makefile.am | 3 - milena/tests/morpho/watershed/Makefile.am | 3 +- milena/tests/norm/Makefile.am | 3 - milena/tests/opt/Makefile.am | 3 - milena/tests/pw/Makefile.am | 3 - milena/tests/registration/Makefile.am | 3 - milena/tests/set/Makefile.am | 3 - 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 | 3 - milena/tests/trait/image/Makefile.am | 3 - milena/tests/trait/op/Makefile.am | 3 - milena/tests/trait/value/Makefile.am | 3 - milena/tests/transform/Makefile.am | 3 - milena/tests/unit_test/Makefile.am | 3 - milena/tests/upscaling/Makefile.am | 4 - milena/tests/upscaling/art/Makefile.am | 3 - milena/tests/util/Makefile.am | 4 - milena/tests/value/Makefile.am | 3 - milena/tests/value/builtin/Makefile.am | 3 - milena/tests/value/concept/Makefile.am | 3 - milena/tests/win/Makefile.am | 3 - 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 | 45 ++++ 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 | 5 - scribo/src/debug/Makefile.am | 3 - scribo/src/filter/Makefile.am | 3 - scribo/src/misc/Makefile.am | 5 - scribo/src/multi_scale/Makefile.am | 5 - scribo/src/preprocessing/Makefile.am | 3 - scribo/src/primitive/Makefile.am | 3 - scribo/src/primitive/extract/Makefile.am | 5 - scribo/src/primitive/find/Makefile.am | 6 - 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 | 3 - scribo/tests/table/Makefile.am | 3 - scribo/tests/tests.mk | 5 +- scribo/tests/text/Makefile.am | 3 - scribo/tests/unit_test/Makefile.am | 3 - swilena/ChangeLog | 8 +- swilena/Makefile.am | 3 - swilena/python/Makefile.am | 3 - 189 files changed, 950 insertions(+), 692 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-185-g1632a8f Enable parallel tests.
by Roland Levillain 24 Jun '10

24 Jun '10

* configure.ac (AM_INIT_AUTOMAKE): Add option `parallel-tests'. --- ChangeLog | 6 ++++++ configure.ac | 3 ++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index d0067c1..38ca80e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-04-26 Roland Levillain <roland(a)lrde.epita.fr> + + Enable parallel tests. + + * configure.ac (AM_INIT_AUTOMAKE): Add option `parallel-tests'. + 2010-04-22 Roland Levillain <roland(a)lrde.epita.fr> Simplify build_unit_test.sh thanks to AM_DEFAULT_SOURCE_EXT. diff --git a/configure.ac b/configure.ac index 80207df..7454a26 100644 --- a/configure.ac +++ b/configure.ac @@ -34,7 +34,8 @@ AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_FILES([build-aux/Makefile]) # Automake. -AM_INIT_AUTOMAKE([1.11 subdir-objects check-news dist-bzip2 nostdinc -Wall]) +AM_INIT_AUTOMAKE([1.11 subdir-objects check-news dist-bzip2 + nostdinc parallel-tests -Wall]) # Package metadata. AC_CONFIG_FILES([milena/mln/version.hh]) -- 1.5.6.5

1 0