Olena-patches June 2010

olena-patches@lrde.epita.fr

9 participants
276 discussions

last-svn-commit-172-g51c347f Set decent compiler flags when the Intel C++ compiler is used.

by Roland Levillain

* 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

14 years, 10 months

last-svn-commit-170-gceed614 Add missing const qualifiers in iterators on complexes.

by Roland Levillain

* 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

14 years, 10 months

branch missing-consts created: last-svn-commit-170-gceed614

by git＠lrde.epita.fr

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

14 years, 10 months

branch next updated: last-svn-commit-169-gccc4a32

by git＠lrde.epita.fr

14 years, 10 months

last-svn-commit-169-gccc4a32 Clean up some tests in tests/morpho/.

by Roland Levillain

* 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

14 years, 10 months

branch next updated: last-svn-commit-168-g5758dd7

by git＠lrde.epita.fr

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

14 years, 10 months

branch fix-graphs deleted: last-svn-commit-156-gd53b427

by git＠lrde.epita.fr

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

14 years, 10 months

last-svn-commit-168-g5758dd7 configure.ac: Clean up a bit.

by Roland Levillain

--- external/trimesh/ChangeLog | 4 ++++ external/trimesh/configure.ac | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/external/trimesh/ChangeLog b/external/trimesh/ChangeLog index 8e79d5d..d105ff4 100644 --- a/external/trimesh/ChangeLog +++ b/external/trimesh/ChangeLog @@ -1,3 +1,7 @@ +2010-06-03 Roland Levillain <roland(a)lrde.epita.fr> + + * configure.ac: Clean up a bit. + 2010-05-12 Roland Levillain <roland(a)lrde.epita.fr> Remove improper copyright headers in Trimesh. diff --git a/external/trimesh/configure.ac b/external/trimesh/configure.ac index 5ba80ce..27152d2 100644 --- a/external/trimesh/configure.ac +++ b/external/trimesh/configure.ac @@ -1,6 +1,3 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - AC_PREREQ([2.61]) AC_INIT([trimesh2], [2.8], [smr at princeton edu]) -- 1.5.6.5

14 years, 10 months

last-svn-commit-167-ga32f582 Clean up a bit Scribo's Makefiles.

by Roland Levillain

* Makefile.am, * demo/Makefile.am, * src/Makefile.am, * src/binarization/Makefile.am, * src/debug/Makefile.am, * src/filter/Makefile.am, * src/misc/Makefile.am, * src/multi_scale/Makefile.am, * src/preprocessing/Makefile.am, * src/primitive/Makefile.am, * src/primitive/extract/Makefile.am, * src/primitive/find/Makefile.am, * src/primitive/group/Makefile.am, * src/table/Makefile.am, * src/text/Makefile.am, * tests/Makefile.am, * tests/filter/Makefile.am, * tests/preprocessing/Makefile.am, * tests/table/Makefile.am, * tests/text/Makefile.am, * tests/unit_test/Makefile.am: Here. --- 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 --- 22 files changed, 27 insertions(+), 66 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 0627bc3..3c7fe21 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,30 @@ +2010-06-03 Roland Levillain <roland(a)lrde.epita.fr> + + Clean up a bit Scribo's Makefiles. + + * Makefile.am, + * demo/Makefile.am, + * src/Makefile.am, + * src/binarization/Makefile.am, + * src/debug/Makefile.am, + * src/filter/Makefile.am, + * src/misc/Makefile.am, + * src/multi_scale/Makefile.am, + * src/preprocessing/Makefile.am, + * src/primitive/Makefile.am, + * src/primitive/extract/Makefile.am, + * src/primitive/find/Makefile.am, + * src/primitive/group/Makefile.am, + * src/table/Makefile.am, + * src/text/Makefile.am, + * tests/Makefile.am, + * tests/filter/Makefile.am, + * tests/preprocessing/Makefile.am, + * tests/table/Makefile.am, + * tests/text/Makefile.am, + * tests/unit_test/Makefile.am: + Here. + 2010-05-12 Roland Levillain <roland(a)lrde.epita.fr> Add missing copyright headers in Scribo. diff --git a/scribo/Makefile.am b/scribo/Makefile.am index 3fb05fd..0f98de6 100644 --- a/scribo/Makefile.am +++ b/scribo/Makefile.am @@ -14,8 +14,6 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -## Process this file through Automake to create Makefile.in. - SUBDIRS = tests src .PHONY: bin diff --git a/scribo/demo/Makefile.am b/scribo/demo/Makefile.am index bab9f0f..9fcd083 100644 --- a/scribo/demo/Makefile.am +++ b/scribo/demo/Makefile.am @@ -14,8 +14,6 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -## Process this file through Automake to create Makefile.in. - include $(top_srcdir)/scribo/scribo.mk .PHONY : demo diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 6cc4229..5f2367f 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk diff --git a/scribo/src/binarization/Makefile.am b/scribo/src/binarization/Makefile.am index 531d4cf..4adf1a6 100644 --- a/scribo/src/binarization/Makefile.am +++ b/scribo/src/binarization/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk @@ -29,4 +26,3 @@ sauvola_SOURCES = sauvola.cc sauvola_ms_SOURCES = sauvola_ms.cc sauvola_pgm_SOURCES = sauvola_pgm.cc simple_SOURCES = simple.cc - diff --git a/scribo/src/debug/Makefile.am b/scribo/src/debug/Makefile.am index 36bbfcb..7ec5669 100644 --- a/scribo/src/debug/Makefile.am +++ b/scribo/src/debug/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk diff --git a/scribo/src/filter/Makefile.am b/scribo/src/filter/Makefile.am index e8a2b9c..5074b49 100644 --- a/scribo/src/filter/Makefile.am +++ b/scribo/src/filter/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk diff --git a/scribo/src/misc/Makefile.am b/scribo/src/misc/Makefile.am index dc64bb9..693b579 100644 --- a/scribo/src/misc/Makefile.am +++ b/scribo/src/misc/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk @@ -31,4 +28,3 @@ morpho_SOURCES = morpho.cc negate_SOURCES = negate.cc rectangularity_SOURCES = rectangularity.cc superpose_SOURCES = superpose.cc - diff --git a/scribo/src/multi_scale/Makefile.am b/scribo/src/multi_scale/Makefile.am index f3dfb42..9964153 100644 --- a/scribo/src/multi_scale/Makefile.am +++ b/scribo/src/multi_scale/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk @@ -23,4 +20,3 @@ bin_PROGRAMS = \ find_lines find_lines_SOURCES = find_lines.cc - diff --git a/scribo/src/preprocessing/Makefile.am b/scribo/src/preprocessing/Makefile.am index 8c1cd80..4f1195d 100644 --- a/scribo/src/preprocessing/Makefile.am +++ b/scribo/src/preprocessing/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk diff --git a/scribo/src/primitive/Makefile.am b/scribo/src/primitive/Makefile.am index 44d9434..7e46a66 100644 --- a/scribo/src/primitive/Makefile.am +++ b/scribo/src/primitive/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk diff --git a/scribo/src/primitive/extract/Makefile.am b/scribo/src/primitive/extract/Makefile.am index 7e1ea78..6f20ea3 100644 --- a/scribo/src/primitive/extract/Makefile.am +++ b/scribo/src/primitive/extract/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk @@ -34,4 +31,3 @@ extract_discontinued_hlines_SOURCES = extract_discontinued_hlines.cc extract_thick_vlines_SOURCES = extract_thick_vlines.cc extract_thick_hlines_SOURCES = extract_thick_hlines.cc lines_pattern_SOURCES = lines_pattern.cc - diff --git a/scribo/src/primitive/find/Makefile.am b/scribo/src/primitive/find/Makefile.am index 93a3920..3b5dbd2 100644 --- a/scribo/src/primitive/find/Makefile.am +++ b/scribo/src/primitive/find/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk @@ -32,5 +29,3 @@ find_pattern_lines_SOURCES = find_pattern_lines.cc find_single_lines_SOURCES = find_single_lines.cc find_thick_lines_SOURCES = find_thick_lines.cc find_thick_and_single_lines_SOURCES = find_thick_and_single_lines.cc - - diff --git a/scribo/src/primitive/group/Makefile.am b/scribo/src/primitive/group/Makefile.am index e52e373..92a81fc 100644 --- a/scribo/src/primitive/group/Makefile.am +++ b/scribo/src/primitive/group/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk diff --git a/scribo/src/table/Makefile.am b/scribo/src/table/Makefile.am index 334d5f9..7fc7008 100644 --- a/scribo/src/table/Makefile.am +++ b/scribo/src/table/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk diff --git a/scribo/src/text/Makefile.am b/scribo/src/text/Makefile.am index b84e0dd..39c7811 100644 --- a/scribo/src/text/Makefile.am +++ b/scribo/src/text/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index e36d250..163ecae 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -16,8 +16,6 @@ include $(srcdir)/tests.mk -## Process this file through Automake to create Makefile.in. - SUBDIRS = \ filter \ preprocessing \ diff --git a/scribo/tests/filter/Makefile.am b/scribo/tests/filter/Makefile.am index fd3299e..e466523 100644 --- a/scribo/tests/filter/Makefile.am +++ b/scribo/tests/filter/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/tests/tests.mk diff --git a/scribo/tests/preprocessing/Makefile.am b/scribo/tests/preprocessing/Makefile.am index 5182bc0..dc139fa 100644 --- a/scribo/tests/preprocessing/Makefile.am +++ b/scribo/tests/preprocessing/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/tests/tests.mk diff --git a/scribo/tests/table/Makefile.am b/scribo/tests/table/Makefile.am index 0c15a63..3427e6b 100644 --- a/scribo/tests/table/Makefile.am +++ b/scribo/tests/table/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/tests/tests.mk diff --git a/scribo/tests/text/Makefile.am b/scribo/tests/text/Makefile.am index f6cb0e5..0d48025 100644 --- a/scribo/tests/text/Makefile.am +++ b/scribo/tests/text/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/tests/tests.mk diff --git a/scribo/tests/unit_test/Makefile.am b/scribo/tests/unit_test/Makefile.am index 0d3a591..8b3e47f 100644 --- a/scribo/tests/unit_test/Makefile.am +++ b/scribo/tests/unit_test/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/tests/tests.mk -- 1.5.6.5

14 years, 10 months

last-svn-commit-166-g635ff15 Clean up a bit Swilena's Makefiles.

by Roland Levillain

* Makefile.am, python/Makefile.am: Here. --- swilena/ChangeLog | 6 ++++++ swilena/Makefile.am | 3 --- swilena/python/Makefile.am | 3 --- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index efa4e9b..6a4269c 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,9 @@ +2010-06-03 Roland Levillain <roland(a)lrde.epita.fr> + + Clean up a bit Swilena's Makefiles. + + * Makefile.am, python/Makefile.am: Here. + 2009-09-12 Roland Levillain <roland(a)lrde.epita.fr> * neighb2d.i: Aesthetic changes. diff --git a/swilena/Makefile.am b/swilena/Makefile.am index c6fd023..109fb2e 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -14,9 +14,6 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. - -## Process this file through Automake to produce Makefile.in. - SUBDIRS = python # Meta-wrappers (templates), not generating a module, but factoring diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index aec8a05..dee4255 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to produce Makefile.in. ## ------------------ ## ## Generic material. ## -- 1.5.6.5

14 years, 10 months

← Newer
1
...
20
21
22
23
24
25
26
27
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches June 2010