- Olena-patches

last-svn-commit-173-gace04a4 Add variables for C++ compiler flags for Scribo.
by Roland Levillain 04 Jun '10

04 Jun '10

* configure.ac (SCRIBO_CXXFLAGS, SCRIBO_TESTS_CXXFLAGS): New configure variables. --- ChangeLog | 7 +++++++ configure.ac | 9 +++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 499818f..57df1c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-04-23 Roland Levillain <roland(a)lrde.epita.fr> + + Add variables for C++ compiler flags for Scribo. + + * configure.ac (SCRIBO_CXXFLAGS, SCRIBO_TESTS_CXXFLAGS): + New configure variables. + 2010-06-04 Roland Levillain <roland(a)lrde.epita.fr> Set decent compiler flags when the Intel C++ compiler is used. diff --git a/configure.ac b/configure.ac index a4b5cb5..20efb20 100644 --- a/configure.ac +++ b/configure.ac @@ -309,6 +309,15 @@ AC_CONFIG_FILES([ scribo/tests/text/Makefile scribo/tests/unit_test/Makefile ]) + +# Flags for Scribo +AC_ARG_VAR([SCRIBO_CXXFLAGS], [C++ compiler flags for Scribo binaries]) +AC_ARG_VAR([SCRIBO_TESTS_CXXFLAGS], [C++ compiler flags for Scribo tests]) +if test "$GXX" = yes || test "$ICPC" = yes; then + test -z "$SCRIBO_CXXFLAGS" && SCRIBO_CXXFLAGS="-DNDEBUG -O2" + # FIXME: We might want to use -ggdb when g++ is used. + test -z "$SCRIBO_TESTS_CXXFLAGS" && SCRIBO_TESTS_CXXFLAGS="-g -O0" +fi dnl>> ## --------------- ## -- 1.5.6.5

1 0

last-svn-commit-171-g75c57ad Add a simple test to identify the Intel C++ compiler.
by Roland Levillain 04 Jun '10

04 Jun '10

* configure.ac: Here. --- ChangeLog | 6 ++++++ configure.ac | 3 +++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 51e3c84..6c7b309 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-04-23 Roland Levillain <roland(a)lrde.epita.fr> + + Add a simple test to identify the Intel C++ compiler. + + * configure.ac: Here. + 2010-06-03 Roland Levillain <roland(a)lrde.epita.fr> Clean up a bit Olena's Makefiles. diff --git a/configure.ac b/configure.ac index aa216f6..ca041b3 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,9 @@ fi AC_LANG([C++]) AC_PROG_CXX +# Set `ICPC' to `yes' if the Intel C++ compiler is used. +test $CXX --version 2>/dev/null | grep '\bICC\b' >/dev/null 2>&1 && ICPC=yes + # GNU C++ compiler setup. if test "$GXX" = yes; then # Speed up compiling times. -- 1.5.6.5

1 0

branch configuration created: last-svn-commit-174-g4ef6706
by git＠lrde.epita.fr 04 Jun '10

04 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 configuration has been created at 4ef67060e4a70bf4af46d54548b4dafdbd04dcf9 (commit) - Log ----------------------------------------------------------------- 4ef6706 Get C++ compiler flags for Scribo from configure. ace04a4 Add variables for C++ compiler flags for Scribo. 51c347f Set decent compiler flags when the Intel C++ compiler is used. 75c57ad Add a simple test to identify the Intel C++ compiler. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-172-g51c347f Set decent compiler flags when the Intel C++ compiler is used.
by Roland Levillain 04 Jun '10

04 Jun '10

* configure.ac: Here. --- ChangeLog | 6 ++++++ configure.ac | 49 +++++++++++++++++++++++++++++++++++++------------ 2 files changed, 43 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c7b309..499818f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-06-04 Roland Levillain <roland(a)lrde.epita.fr> + + Set decent compiler flags when the Intel C++ compiler is used. + + * configure.ac: Here. + 2010-04-23 Roland Levillain <roland(a)lrde.epita.fr> Add a simple test to identify the Intel C++ compiler. diff --git a/configure.ac b/configure.ac index ca041b3..a4b5cb5 100644 --- a/configure.ac +++ b/configure.ac @@ -108,8 +108,14 @@ esac AC_ARG_VAR([TESTS_CXXFLAGS], [C++ compiler flags for tests]) # We want no optimization for the tests (it slows down compiling # times), and debugging information. -if test "$GXX" = yes && test -z "$TESTS_CXXFLAGS"; then - TESTS_CXXFLAGS="-O0 -ggdb $WARNINGS_CXXFLAGS" +if test -z "$TESTS_CXXFLAGS"; then + if test "$GXX" = yes; then + # GNU C++ compiler setup. + TESTS_CXXFLAGS="-O0 -ggdb $WARNINGS_CXXFLAGS" + elif test "$ICPC" = yes; then + # Intel C++ compiler setup. + TESTS_CXXFLAGS="-O0 -g $WARNINGS_CXXFLAGS" + fi fi # Flags for complex tests. @@ -117,8 +123,14 @@ AC_ARG_VAR([TESTS_CXXFLAGS_SPEED], [C++ compiler optimization flags for (complex) tests]) # We want optimization for complex tests, and keep debugging flags # (still useful). -if test "$GXX" = yes && test -z "$TESTS_CXXFLAGS_SPEED"; then - TESTS_CXXFLAGS_SPEED="-O3 -DNDEBUG -ggdb -Wall -W" +if test -z "$TESTS_CXXFLAGS_SPEED"; then + if test "$GXX" = yes; then + # GNU C++ compiler setup. + TESTS_CXXFLAGS_SPEED="-O3 -DNDEBUG -ggdb $WARNINGS_CXXFLAGS" + elif test "$ICPC" = yes; then + # Intel C++ compiler setup. + TESTS_CXXFLAGS_SPEED="-O3 -DNDEBUG -g $WARNINGS_CXXFLAGS" + fi fi # Flags for tests with with all debugging features turned on. @@ -129,8 +141,12 @@ AC_ARG_VAR([TESTS_CXXFLAGS_DEBUG], [C++ compiler debug flags]) # http://gcc.gnu.org/onlinedocs/libstdc++/manual/debug_mode.html # * GNU C++ Library Compile Time Checks (a.k.a. concept checking): # http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt12ch29.html -if test "$GXX" = yes && test -z "$TESTS_CXXFLAGS_DEBUG"; then - TESTS_CXXFLAGS_DEBUG="-O0 -ggdb $WARNINGS_CXXFLAGS -D_GLIBCXX_DEBUG -D_GLIBCXX_CONCEPT_CHECKS" +if test -z "$TESTS_CXXFLAGS_DEBUG"; then + if test "$GXX" = yes; then + TESTS_CXXFLAGS_DEBUG="-O0 -ggdb $WARNINGS_CXXFLAGS -D_GLIBCXX_DEBUG -D_GLIBCXX_CONCEPT_CHECKS" + elif test "$ICPC" = yes; then + TESTS_CXXFLAGS_DEBUG="-O0 -g $WARNINGS_CXXFLAGS -D_GLIBCXX_DEBUG -D_GLIBCXX_CONCEPT_CHECKS" + fi fi @@ -194,8 +210,9 @@ OLN_WITH_LIB([TIFF], [tiff.h], [tiff]) OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm], [GDCM], [-lgdcmzlib]) -# Tesseract -OLN_WITH_LIB([TESSERACT], [tesseract/baseapi.h], [tesseract_full], [tesseract], [TESSERACT]) +# Tesseract. +OLN_WITH_LIB([TESSERACT], [tesseract/baseapi.h], [tesseract_full], + [tesseract], [TESSERACT]) @@ -494,8 +511,12 @@ AC_CONFIG_FILES([milena/apps/constrained-connectivity/test-constrained-connectiv # Flags for apps. AC_ARG_VAR([APPS_CXXFLAGS], [C++ compiler flags for applications]) # We want fast binaries for apps. -if test "$GXX" = yes && test -z "$APPS_CXXFLAGS"; then - APPS_CXXFLAGS="-O3 -DNDEBUG -ggdb $WARNINGS_CXXFLAGS" +if test -z "$APPS_CXXFLAGS"; then + if test "$GXX" = yes; then + APPS_CXXFLAGS="-O3 -DNDEBUG -ggdb $WARNINGS_CXXFLAGS" + elif test "$ICPC" = yes; then + APPS_CXXFLAGS="-O3 -DNDEBUG -g $WARNINGS_CXXFLAGS" + fi fi ## ------- ## @@ -513,8 +534,12 @@ AC_CONFIG_FILES([milena/tools/Makefile]) # Flags for tools. AC_ARG_VAR([TOOLS_CXXFLAGS], [C++ compiler flags for tools]) # We want fast binaries for tools. -if test "$GXX" = yes && test -z "$TOOLS_CXXFLAGS"; then - TOOLS_CXXFLAGS="-O3 -DNDEBUG -ggdb $WARNINGS_CXXFLAGS" +if test -z "$TOOLS_CXXFLAGS"; then + if test "$GXX" = yes; then + TOOLS_CXXFLAGS="-O3 -DNDEBUG -ggdb $WARNINGS_CXXFLAGS" + elif test "$ICPC" = yes; then + TOOLS_CXXFLAGS="-O3 -DNDEBUG -g $WARNINGS_CXXFLAGS" + fi fi -- 1.5.6.5

1 0

last-svn-commit-170-gceed614 Add missing const qualifiers in iterators on complexes.
by Roland Levillain 04 Jun '10

04 Jun '10

* mln/topo/internal/complex_set_iterator_base.hh (complex_set_iterator_base<F, E>::complex_set_iterator_base) (complex_set_iterator_base<F, E>::set_cplx): Add const qualifier to argument. --- milena/ChangeLog | 9 +++++++++ .../mln/topo/internal/complex_set_iterator_base.hh | 14 ++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9080034..69c050f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> + + Add missing const qualifiers in iterators on complexes. + + * mln/topo/internal/complex_set_iterator_base.hh + (complex_set_iterator_base<F, E>::complex_set_iterator_base) + (complex_set_iterator_base<F, E>::set_cplx): + Add const qualifier to argument. + 2010-06-03 Roland Levillain <roland(a)lrde.epita.fr> Clean up some tests in tests/morpho/. diff --git a/milena/mln/topo/internal/complex_set_iterator_base.hh b/milena/mln/topo/internal/complex_set_iterator_base.hh index 85e3cd1..f428566 100644 --- a/milena/mln/topo/internal/complex_set_iterator_base.hh +++ b/milena/mln/topo/internal/complex_set_iterator_base.hh @@ -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 Olena. // @@ -66,17 +67,14 @@ namespace mln /// Construction and assignment. /// \{ - /* FIXME: Keep this non-const? See a (big) comment about this in - milena/tests/complex_image.cc. */ complex_set_iterator_base(); - complex_set_iterator_base(complex_type& c); + complex_set_iterator_base(const complex_type& c); /// \} /// Manipulation. /// \{ /// Change the target complex. - // FIXME: Same comment as the ctor above. - void set_cplx(complex_type& c); + void set_cplx(const complex_type& c); /// Test if the iterator is valid. bool is_valid() const; @@ -98,7 +96,7 @@ namespace mln template <typename F, typename E> inline - complex_set_iterator_base<F, E>::complex_set_iterator_base(complex_type& c) + complex_set_iterator_base<F, E>::complex_set_iterator_base(const complex_type& c) { this->f_.set_cplx(c); // Invalidate f_. @@ -108,7 +106,7 @@ namespace mln template <typename F, typename E> inline void - complex_set_iterator_base<F, E>::set_cplx(complex_type& c) + complex_set_iterator_base<F, E>::set_cplx(const complex_type& c) { this->f_.set_cplx(c); // Invalidate f_. -- 1.5.6.5

1 0

branch missing-consts created: last-svn-commit-170-gceed614
by git＠lrde.epita.fr 04 Jun '10

04 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 missing-consts has been created at ceed614319364a103d4c7c15afd2ea2a3b6d2186 (commit) - Log ----------------------------------------------------------------- ceed614 Add missing const qualifiers in iterators on complexes. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch next updated: last-svn-commit-169-gccc4a32
by git＠lrde.epita.fr 03 Jun '10

03 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 next has been updated via ccc4a321e56015b6d2824f0f67236bdad14990c4 (commit) from 5758dd72a0d8fe7849e99ad6f5dbf6f0b97c1c6d (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 ----------------------------------------------------------------- ccc4a32 Clean up some tests in tests/morpho/. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 10 +++ milena/tests/morpho/rank_filter.cc | 5 +- milena/tests/morpho/skeleton_constrained.cc | 83 +++++++++++++-------------- 3 files changed, 53 insertions(+), 45 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-169-gccc4a32 Clean up some tests in tests/morpho/.
by Roland Levillain 03 Jun '10

03 Jun '10

* tests/morpho/rank_filter.cc: Do not include mln/io/pgm/save.hh. * tests/morpho/skeleton_constrained.cc: Likewise. (mln::show_connectivity_numbers): Move this function into the global namespace to avoid the pollution of the `mln' namespace. Aesthetic changes. --- milena/ChangeLog | 10 +++ milena/tests/morpho/rank_filter.cc | 5 +- milena/tests/morpho/skeleton_constrained.cc | 83 +++++++++++++-------------- 3 files changed, 53 insertions(+), 45 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 929c182..9080034 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-06-03 Roland Levillain <roland(a)lrde.epita.fr> + Clean up some tests in tests/morpho/. + + * tests/morpho/rank_filter.cc: Do not include mln/io/pgm/save.hh. + * tests/morpho/skeleton_constrained.cc: Likewise. + (mln::show_connectivity_numbers): Move this function into the + global namespace to avoid the pollution of the `mln' namespace. + Aesthetic changes. + +2010-06-03 Roland Levillain <roland(a)lrde.epita.fr> + Clean up a bit Milena's Makefiles. * Makefile.am, diff --git a/milena/tests/morpho/rank_filter.cc b/milena/tests/morpho/rank_filter.cc index d08f866..23598b0 100644 --- a/milena/tests/morpho/rank_filter.cc +++ b/milena/tests/morpho/rank_filter.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -28,7 +29,6 @@ #include <mln/core/alias/window2d.hh> #include <mln/io/pgm/load.hh> -#include <mln/io/pgm/save.hh> #include <mln/value/int_u8.hh> #include <mln/data/fill.hh> @@ -37,7 +37,6 @@ #include <mln/morpho/rank_filter.hh> #include <mln/morpho/dilation.hh> - #include <mln/pw/value.hh> #include <mln/pw/cst.hh> #include <mln/fun/ops.hh> diff --git a/milena/tests/morpho/skeleton_constrained.cc b/milena/tests/morpho/skeleton_constrained.cc index a39ac76..9138911 100644 --- a/milena/tests/morpho/skeleton_constrained.cc +++ b/milena/tests/morpho/skeleton_constrained.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 Olena. // @@ -33,7 +34,6 @@ #include <mln/morpho/skeleton_constrained.hh> #include <mln/io/pbm/load.hh> -#include <mln/io/pbm/save.hh> #include <mln/data/fill.hh> #include <mln/pw/value.hh> @@ -49,49 +49,46 @@ #include "tests/data.hh" -namespace mln +template <typename N> +void +show_connectivity_numbers(const mln::image2d<bool>& ima, const N& nbh) { + mln::extension::adjust_duplicate(ima, nbh); - template <typename N> - void show_connectivity_numbers(const image2d<bool>& ima, - const N& nbh) + mln::image2d<unsigned> when_true(ima.domain()), when_false(ima.domain()); + mln_piter(mln::box2d) p(ima.domain()); + for_all(p) { - extension::adjust_duplicate(ima, nbh); - - image2d<unsigned> when_true(ima.domain()), when_false(ima.domain()); - mln_piter(box2d) p(ima.domain()); - for_all(p) - { - when_true(p) = connectivity_number_2d(ima, nbh.foreground(), p, true); - when_false(p) = connectivity_number_2d(ima, nbh.background(), p, false); - } + when_true(p) = connectivity_number_2d(ima, nbh.foreground(), p, true); + when_false(p) = connectivity_number_2d(ima, nbh.background(), p, false); } +} + + +bool skl_ref_[22][18] = + { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, + { 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 } }; -} // mln - - -bool skl_ref_[22][18] = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 } }; int main() { @@ -103,8 +100,10 @@ int main() image2d<bool> pic; io::pbm::load(pic, MLN_IMG_DIR "/tiny.pbm"); - typedef neighb<win::multiple_size<2u, window<dpoint<grid::square, short int> >, - pw::value_<image2d<bool> > > > nbh_t; + typedef + neighb<win::multiple_size<2u, window<dpoint<grid::square, short int> >, + pw::value_<image2d<bool> > > > + nbh_t; nbh_t nbh = make::dual_neighb(pic, c4(), c8()); show_connectivity_numbers(pic, nbh); -- 1.5.6.5

1 0

branch next updated: last-svn-commit-168-g5758dd7
by git＠lrde.epita.fr 03 Jun '10

03 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 next has been updated via 5758dd72a0d8fe7849e99ad6f5dbf6f0b97c1c6d (commit) via a32f582d8894e37cb18614521c262ab5ae49c1a7 (commit) via 635ff15ca3cc548f282d4bb96587bb6d3b2e8c7f (commit) via 70dedf8ba8537b7d8081641e15553637317f4e03 (commit) via 68624e4c54dd06c46428b7dd914bdbd1e8c06678 (commit) from bfdea8debb5538103da4cc28ca092309850fd597 (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 ----------------------------------------------------------------- 5758dd7 configure.ac: Clean up a bit. a32f582 Clean up a bit Scribo's Makefiles. 635ff15 Clean up a bit Swilena's Makefiles. 70dedf8 Clean up a bit Milena's Makefiles. 68624e4 Clean up a bit Olena's Makefiles. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 + Makefile.am | 7 +- external/Makefile.am | 3 - external/trimesh/ChangeLog | 4 + external/trimesh/configure.ac | 3 - milena/ChangeLog | 127 ++++++++++++++++++++ milena/Makefile.am | 3 - milena/apps/mesh-segm-skel/Makefile.am | 3 - milena/mesh/Makefile.am | 3 - 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 | 3 - 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/routine/Makefile.am | 3 - milena/tests/core/site_set/Makefile.am | 3 - milena/tests/data/Makefile.am | 3 - milena/tests/data/approx/Makefile.am | 3 - milena/tests/data/naive/Makefile.am | 3 - 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 | 5 +- 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 | 3 - milena/tests/io/pbm/Makefile.am | 5 +- milena/tests/io/pbms/Makefile.am | 5 +- milena/tests/io/pfm/Makefile.am | 3 - milena/tests/io/pgm/Makefile.am | 3 - milena/tests/io/pgms/Makefile.am | 5 +- milena/tests/io/pnm/Makefile.am | 3 - milena/tests/io/ppm/Makefile.am | 3 - milena/tests/io/ppms/Makefile.am | 5 +- milena/tests/io/tiff/Makefile.am | 3 - milena/tests/labeling/Makefile.am | 6 +- milena/tests/linear/Makefile.am | 5 +- milena/tests/linear/gaussian/Makefile.am | 3 - milena/tests/linear/local/Makefile.am | 6 +- 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 | 6 +- milena/tests/morpho/approx/Makefile.am | 4 - 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/elementary/Makefile.am | 3 - milena/tests/morpho/opening/Makefile.am | 3 - milena/tests/morpho/opening/approx/Makefile.am | 3 - milena/tests/morpho/reconstruction/Makefile.am | 5 - .../morpho/reconstruction/by_dilation/Makefile.am | 5 - .../morpho/reconstruction/by_erosion/Makefile.am | 5 - 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 | 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 | 3 - milena/tests/upscaling/Makefile.am | 4 - milena/tests/upscaling/art/Makefile.am | 3 - milena/tests/util/Makefile.am | 7 +- 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 | 27 ++++ scribo/Makefile.am | 2 - scribo/demo/Makefile.am | 2 - scribo/src/Makefile.am | 3 - scribo/src/binarization/Makefile.am | 4 - 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 | 3 - scribo/tests/table/Makefile.am | 3 - scribo/tests/text/Makefile.am | 3 - scribo/tests/unit_test/Makefile.am | 3 - swilena/ChangeLog | 6 + swilena/Makefile.am | 3 - swilena/python/Makefile.am | 3 - 152 files changed, 239 insertions(+), 495 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch fix-graphs deleted: last-svn-commit-156-gd53b427
by git＠lrde.epita.fr 03 Jun '10

03 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 fix-graphs has been deleted was d53b4271ddc93c8fa098f4ef4c2fc7432f808357 ----------------------------------------------------------------------- d53b4271ddc93c8fa098f4ef4c2fc7432f808357 Miscellaneous changes in graphs and graph-based images. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0