- Olena-patches

olena: branch fixes updated: olena-2.0-798-g748696a
by git＠lrde.epita.fr 10 Sep '13

10 Sep '13

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 fixes has been updated via 748696af65992a1aa453978892ba0f4b18417075 (commit) via 8aa7db7833601e75444522502cca8618b89f3948 (commit) via 9e354c74547565ff7d29e8509356725f91a40bbb (commit) via 8699ea5d37befe5372b398283d60cc96bf5f289d (commit) via e61d93d250fd875e8b378e93ef55b2d2c504d9f7 (commit) via 9c2f117f480691cd5ca4b496fd12b33471924d75 (commit) via 9d5b6b6cd73db02b4917b059ba8152f3a0a434ad (commit) via c9517b9272f27be5500296a6dc4e4622caf109f9 (commit) via b8bc67ae64aa16d0de4b3b99c9e008d54770507c (commit) via 9c0005463aea1f7eb5712255de62333d8add3a4b (commit) via b19aab25fc68b97d9c34ac4667ecb19c6800f1ca (commit) via fad39ca77b6cb3c4c6652b905a4bc5c67b35300c (commit) via 5158238ced7f9256ca51e68dc497e434c2e23109 (commit) from ffd06991c036d91cd0e1d7c5694547213ddbc125 (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 ----------------------------------------------------------------- 748696a Swilena: Remove lines `VARIABLE = @VARIABLE@' from Makefile.am's. 8aa7db7 Scribo: Remove lines `VARIABLE = @VARIABLE@' from Makefile.am's. 9e354c7 Milena: Remove lines `VARIABLE = @VARIABLE@' from Makefile.am's. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 21 +++++++ configure.ac | 12 ++-- doc/Makefile.am | 5 +- milena/ChangeLog | 66 +++++++++++++++++++++ milena/Makefile.am | 43 +++++++++++--- milena/apps/constrained-connectivity/Makefile.am | 8 ++- milena/apps/generic-skel/Makefile.am | 5 +- milena/apps/graph-morpho/Makefile.am | 9 +-- milena/apps/mesh-segm-skel/Makefile.am | 5 +- milena/apps/morphers/Makefile.am | 5 +- milena/apps/papers/levillain.09.ismm/Makefile.am | 7 ++- milena/doc/Makefile.am | 7 ++- milena/headers.mk | 1 + milena/mln/{version.hh.in => version.hh} | 10 ++-- milena/mln/version.hh.in | 2 +- milena/tests/tests.mk | 29 ++------- milena/tools/tools.mk | 15 +---- scribo/ChangeLog | 34 +++++++++++ scribo/doc/Makefile.am | 5 +- scribo/scribo.mk | 3 +- scribo/src/Makefile.am | 6 +- scribo/src/contest/DAE-2011/Makefile.am | 6 +- scribo/src/contest/hbr-2013/Makefile.am | 3 +- scribo/src/contest/hdlac-2011/Makefile.am | 3 +- scribo/src/contest/hnla-2013/Makefile.am | 3 +- scribo/src/pbm_text_in_doc.cc | 6 +- scribo/src/text/Makefile.am | 8 +-- scribo/src/text/pbm_lines_recognition.cc | 6 +- scribo/src/text/pbm_recognition.cc | 6 +- scribo/src/text_recognition_in_picture.cc | 4 -- scribo/src/toolchain/nepomuk/Makefile.am | 3 +- scribo/src/toolchain/nepomuk/text_extraction.cc | 6 +- scribo/tests/tests.mk | 16 ----- scribo/tests/toolchain/nepomuk/Makefile.am | 3 +- scribo/tests/toolchain/nepomuk/text_extraction.cc | 6 +- swilena/ChangeLog | 13 ++++ swilena/python/Makefile.am | 3 +- 37 files changed, 240 insertions(+), 153 deletions(-) copy milena/mln/{version.hh.in => version.hh} (83%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-798-g748696a Swilena: Remove lines `VARIABLE = @VARIABLE@' from Makefile.am's.
by Roland Levillain 10 Sep '13

10 Sep '13

* python/Makefile.am: Here, as Automake 1.11+ already takes care of this. --- swilena/ChangeLog | 7 +++++++ swilena/python/Makefile.am | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index e84f1f9..9830d70 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,10 @@ +2013-09-10 Roland Levillain <roland(a)lrde.epita.fr> + + Swilena: Remove lines `VARIABLE = @VARIABLE@' from Makefile.am's. + + * python/Makefile.am: Here, as Automake 1.11+ already takes care + of this. + 2013-09-09 Roland Levillain <roland(a)lrde.epita.fr> Swilena: Remove Milena's build dir from the file inclusion path. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 2d8dfa7..d77cdc4 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -23,7 +23,6 @@ ## FIXME: Factor as much as possible. See how we handled this in TC. AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/milena -TOOLS_CXXFLAGS = @TOOLS_CXXFLAGS@ AM_CXXFLAGS = $(TOOLS_CXXFLAGS) AM_SWIGFLAGS = -Wall -c++ -python -I$(top_srcdir)/milena # We build modules, not plain libs. -- 1.7.10.4

1 0

olena: olena-2.0-797-g8aa7db7 Scribo: Remove lines `VARIABLE = @VARIABLE@' from Makefile.am's.
by Roland Levillain 10 Sep '13

10 Sep '13

* scribo.mk, * tests/tests.mk: Here, as Automake 1.11+ already takes care of this. --- scribo/ChangeLog | 8 ++++++++ scribo/scribo.mk | 3 +-- scribo/tests/tests.mk | 16 ---------------- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4b9d587..96def1c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,11 @@ +2013-09-10 Roland Levillain <roland(a)lrde.epita.fr> + + Scribo: Remove lines `VARIABLE = @VARIABLE@' from Makefile.am's. + + * scribo.mk, + * tests/tests.mk: + Here, as Automake 1.11+ already takes care of this. + 2013-09-09 Roland Levillain <roland(a)lrde.epita.fr> Scribo: Do not look for headers in the build tree uselessly. diff --git a/scribo/scribo.mk b/scribo/scribo.mk index 0d97440..4151f6e 100644 --- a/scribo/scribo.mk +++ b/scribo/scribo.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +# Copyright (C) 2009, 2010, 2013 EPITA Research and Development Laboratory # (LRDE). # # This file is part of Olena. @@ -17,7 +17,6 @@ include $(top_srcdir)/scribo/common.mk -SCRIBO_CXXFLAGS = @SCRIBO_CXXFLAGS@ AM_CXXFLAGS = $(SCRIBO_CXXFLAGS) utilexecdir = $(libexecdir)/scribo diff --git a/scribo/tests/tests.mk b/scribo/tests/tests.mk index 422601d..2e876a6 100644 --- a/scribo/tests/tests.mk +++ b/scribo/tests/tests.mk @@ -21,23 +21,7 @@ include $(top_srcdir)/scribo/common.mk -SCRIBO_TESTS_CXXFLAGS = @SCRIBO_TESTS_CXXFLAGS@ AM_CXXFLAGS = $(SCRIBO_TESTS_CXXFLAGS) -# Flags for optional dependencies. - -MAGICKXX_CPPFLAGS = @MAGICKXX_CPPFLAGS@ -MAGICKXX_LDFLAGS = @MAGICKXX_LDFLAGS@ - -TIFF_CPPFLAGS = @TIFF_CPPFLAGS@ -TIFF_LDFLAGS = @TIFF_LDFLAGS@ - -QT_CPPFLAGS = @QT_CPPFLAGS@ -QT_LDFLAGS = @QT_LDFLAGS@ @QT_LIBS@ - -TESSERACT_CPPFLAGS = @TESSERACT_CPPFLAGS@ -TESSERACT_LDFLAGS = @TESSERACT_LDFLAGS@ - - # Inject rules to compile tests (recursively), without running them. include $(top_srcdir)/build-aux/tests-recursive.mk -- 1.7.10.4

1 0

olena: olena-2.0-796-g9e354c7 Milena: Remove lines `VARIABLE = @VARIABLE@' from Makefile.am's.
by Roland Levillain 10 Sep '13

10 Sep '13

* apps/constrained-connectivity/Makefile.am, * apps/generic-skel/Makefile.am, * apps/graph-morpho/Makefile.am, * apps/mesh-segm-skel/Makefile.am, * apps/morphers/Makefile.am, * apps/papers/levillain.09.ismm/Makefile.am, * tests/tests.mk, * tools/tools.mk: Here, as Automake 1.11+ already takes care of this. --- milena/ChangeLog | 14 ++++++++++++++ milena/apps/constrained-connectivity/Makefile.am | 1 - milena/apps/generic-skel/Makefile.am | 1 - milena/apps/graph-morpho/Makefile.am | 2 -- milena/apps/mesh-segm-skel/Makefile.am | 1 - milena/apps/morphers/Makefile.am | 1 - milena/apps/papers/levillain.09.ismm/Makefile.am | 1 - milena/tests/tests.mk | 20 -------------------- milena/tools/tools.mk | 1 - 9 files changed, 14 insertions(+), 28 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c27a410..f88f452 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,17 @@ +2013-09-10 Roland Levillain <roland(a)lrde.epita.fr> + + Milena: Remove lines `VARIABLE = @VARIABLE@' from Makefile.am's. + + * apps/constrained-connectivity/Makefile.am, + * apps/generic-skel/Makefile.am, + * apps/graph-morpho/Makefile.am, + * apps/mesh-segm-skel/Makefile.am, + * apps/morphers/Makefile.am, + * apps/papers/levillain.09.ismm/Makefile.am, + * tests/tests.mk, + * tools/tools.mk: + Here, as Automake 1.11+ already takes care of this. + 2013-09-09 Roland Levillain <roland(a)lrde.epita.fr> Milena: Do not look for headers in the build tree uselessly. diff --git a/milena/apps/constrained-connectivity/Makefile.am b/milena/apps/constrained-connectivity/Makefile.am index 1141317..0ccb4c9 100644 --- a/milena/apps/constrained-connectivity/Makefile.am +++ b/milena/apps/constrained-connectivity/Makefile.am @@ -22,7 +22,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/milena # Find apps/data.hh (generated header). AM_CPPFLAGS += -I$(top_builddir)/milena # Produce fast code. -APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) noinst_PROGRAMS = constrained-connectivity diff --git a/milena/apps/generic-skel/Makefile.am b/milena/apps/generic-skel/Makefile.am index 44fc0dd..7736788 100644 --- a/milena/apps/generic-skel/Makefile.am +++ b/milena/apps/generic-skel/Makefile.am @@ -21,7 +21,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/milena # Find apps/data.hh (generated header). AM_CPPFLAGS += -I$(top_builddir)/milena # Produce fast code. -APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) generated_checked_tests = diff --git a/milena/apps/graph-morpho/Makefile.am b/milena/apps/graph-morpho/Makefile.am index 61eede8..bc725aa 100644 --- a/milena/apps/graph-morpho/Makefile.am +++ b/milena/apps/graph-morpho/Makefile.am @@ -22,9 +22,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/milena # Find apps/data.hh (generated header). AM_CPPFLAGS += -I$(top_builddir)/milena # Produce fast code. -APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) -STRICT_ALIASING_CXXFLAGS = @STRICT_ALIASING_CXXFLAGS@ noinst_HEADERS = convert.hh debug.hh make.hh morpho.hh make_complex2d.hh diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index 90af4ee..7c58008 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -22,7 +22,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/milena # Find apps/data.hh (generated header). AM_CPPFLAGS += -I$(top_builddir)/milena # Produce fast code. -APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) noinst_PROGRAMS = diff --git a/milena/apps/morphers/Makefile.am b/milena/apps/morphers/Makefile.am index f874601..989ee59 100644 --- a/milena/apps/morphers/Makefile.am +++ b/milena/apps/morphers/Makefile.am @@ -24,7 +24,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/milena # Find apps/data.hh (generated header). AM_CPPFLAGS += -I$(top_builddir)/milena # Produce fast code. -APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) noinst_PROGRAMS = \ diff --git a/milena/apps/papers/levillain.09.ismm/Makefile.am b/milena/apps/papers/levillain.09.ismm/Makefile.am index fbc3567..db9ce42 100644 --- a/milena/apps/papers/levillain.09.ismm/Makefile.am +++ b/milena/apps/papers/levillain.09.ismm/Makefile.am @@ -24,7 +24,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/milena # Find apps/data.hh (generated header). AM_CPPFLAGS += -I$(top_builddir)/milena # Produce fast code. -APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) noinst_HEADERS = chain.hh io.hh influence_zones.hh diff --git a/milena/tests/tests.mk b/milena/tests/tests.mk index 9a41031..dc6e80d 100644 --- a/milena/tests/tests.mk +++ b/milena/tests/tests.mk @@ -26,27 +26,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/milena # Find test/data.hh (generated header). AM_CPPFLAGS += -I$(top_builddir)/milena -TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ AM_CXXFLAGS = $(TESTS_CXXFLAGS) -TESTS_CXXFLAGS_SPEED = @TESTS_CXXFLAGS_SPEED@ -TESTS_CXXFLAGS_DEBUG = @TESTS_CXXFLAGS_DEBUG@ - - -# Flags for optional dependencies. - -GDCM_CPPFLAGS = @GDCM_CPPFLAGS@ -GDCM_LDFLAGS = @GDCM_LDFLAGS@ - -CFITSIO_CPPFLAGS = @CFITSIO_CPPFLAGS@ -CFITSIO_LDFLAGS = @CFITSIO_LDFLAGS@ - -MAGICKXX_CPPFLAGS = @MAGICKXX_CPPFLAGS@ -MAGICKXX_LDFLAGS = @MAGICKXX_LDFLAGS@ - -TIFF_CPPFLAGS = @TIFF_CPPFLAGS@ -TIFF_LDFLAGS = @TIFF_LDFLAGS@ - - # Inject rules to compile tests (recursively), without running them. include $(top_srcdir)/build-aux/tests-recursive.mk diff --git a/milena/tools/tools.mk b/milena/tools/tools.mk index f75daa2..a60f4d0 100644 --- a/milena/tools/tools.mk +++ b/milena/tools/tools.mk @@ -20,5 +20,4 @@ include $(top_srcdir)/milena/common.mk # Find Milena headers. AM_CPPFLAGS = -I$(top_srcdir)/milena -TOOLS_CXXFLAGS = @TOOLS_CXXFLAGS@ AM_CXXFLAGS = $(TOOLS_CXXFLAGS) -- 1.7.10.4

1 0

olena: branch next updated: olena-2.0-795-g8699ea5
by git＠lrde.epita.fr 10 Sep '13

10 Sep '13

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 8699ea5d37befe5372b398283d60cc96bf5f289d (commit) via e61d93d250fd875e8b378e93ef55b2d2c504d9f7 (commit) via 9c2f117f480691cd5ca4b496fd12b33471924d75 (commit) via 9d5b6b6cd73db02b4917b059ba8152f3a0a434ad (commit) via c9517b9272f27be5500296a6dc4e4622caf109f9 (commit) via b8bc67ae64aa16d0de4b3b99c9e008d54770507c (commit) via 9c0005463aea1f7eb5712255de62333d8add3a4b (commit) via b19aab25fc68b97d9c34ac4667ecb19c6800f1ca (commit) via fad39ca77b6cb3c4c6652b905a4bc5c67b35300c (commit) via 5158238ced7f9256ca51e68dc497e434c2e23109 (commit) via ffd06991c036d91cd0e1d7c5694547213ddbc125 (commit) from bb6ddb7e8f323fa072b903b81b87d81f410734b3 (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 ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 21 +++++++ configure.ac | 12 ++-- doc/Makefile.am | 5 +- milena/ChangeLog | 59 ++++++++++++++++++++ milena/Makefile.am | 43 +++++++++++--- milena/apps/constrained-connectivity/Makefile.am | 7 ++- milena/apps/generic-skel/Makefile.am | 4 +- milena/apps/graph-morpho/Makefile.am | 7 ++- milena/apps/mesh-segm-skel/Makefile.am | 4 +- milena/apps/morphers/Makefile.am | 4 +- milena/apps/papers/levillain.09.ismm/Makefile.am | 6 +- milena/doc/Makefile.am | 7 ++- .../examples/split/tuto3_first_routine-1.cc.raw | 1 - milena/doc/examples/tuto3/first_routine.cc | 1 - milena/headers.mk | 1 + milena/mln/{version.hh.in => version.hh} | 10 ++-- milena/mln/version.hh.in | 2 +- milena/tests/tests.mk | 9 +-- milena/tools/tools.mk | 14 +---- scribo/ChangeLog | 26 +++++++++ scribo/doc/Makefile.am | 5 +- scribo/src/Makefile.am | 6 +- scribo/src/contest/DAE-2011/Makefile.am | 6 +- scribo/src/contest/hbr-2013/Makefile.am | 3 +- scribo/src/contest/hdlac-2011/Makefile.am | 3 +- scribo/src/contest/hnla-2013/Makefile.am | 3 +- scribo/src/pbm_text_in_doc.cc | 6 +- scribo/src/text/Makefile.am | 8 +-- scribo/src/text/pbm_lines_recognition.cc | 6 +- scribo/src/text/pbm_recognition.cc | 6 +- scribo/src/text_recognition_in_picture.cc | 4 -- scribo/src/toolchain/nepomuk/Makefile.am | 3 +- scribo/src/toolchain/nepomuk/text_extraction.cc | 6 +- scribo/tests/toolchain/nepomuk/Makefile.am | 3 +- scribo/tests/toolchain/nepomuk/text_extraction.cc | 6 +- swilena/ChangeLog | 6 ++ swilena/python/Makefile.am | 2 +- 37 files changed, 217 insertions(+), 108 deletions(-) copy milena/mln/{version.hh.in => version.hh} (83%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch master updated: olena-2.0-795-g8699ea5
by git＠lrde.epita.fr 10 Sep '13

10 Sep '13

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 master has been updated via 8699ea5d37befe5372b398283d60cc96bf5f289d (commit) via e61d93d250fd875e8b378e93ef55b2d2c504d9f7 (commit) via 9c2f117f480691cd5ca4b496fd12b33471924d75 (commit) via 9d5b6b6cd73db02b4917b059ba8152f3a0a434ad (commit) via c9517b9272f27be5500296a6dc4e4622caf109f9 (commit) via b8bc67ae64aa16d0de4b3b99c9e008d54770507c (commit) via 9c0005463aea1f7eb5712255de62333d8add3a4b (commit) via b19aab25fc68b97d9c34ac4667ecb19c6800f1ca (commit) via fad39ca77b6cb3c4c6652b905a4bc5c67b35300c (commit) via 5158238ced7f9256ca51e68dc497e434c2e23109 (commit) via ffd06991c036d91cd0e1d7c5694547213ddbc125 (commit) from bb6ddb7e8f323fa072b903b81b87d81f410734b3 (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 ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 21 +++++++ configure.ac | 12 ++-- doc/Makefile.am | 5 +- milena/ChangeLog | 59 ++++++++++++++++++++ milena/Makefile.am | 43 +++++++++++--- milena/apps/constrained-connectivity/Makefile.am | 7 ++- milena/apps/generic-skel/Makefile.am | 4 +- milena/apps/graph-morpho/Makefile.am | 7 ++- milena/apps/mesh-segm-skel/Makefile.am | 4 +- milena/apps/morphers/Makefile.am | 4 +- milena/apps/papers/levillain.09.ismm/Makefile.am | 6 +- milena/doc/Makefile.am | 7 ++- .../examples/split/tuto3_first_routine-1.cc.raw | 1 - milena/doc/examples/tuto3/first_routine.cc | 1 - milena/headers.mk | 1 + milena/mln/{version.hh.in => version.hh} | 10 ++-- milena/mln/version.hh.in | 2 +- milena/tests/tests.mk | 9 +-- milena/tools/tools.mk | 14 +---- scribo/ChangeLog | 26 +++++++++ scribo/doc/Makefile.am | 5 +- scribo/src/Makefile.am | 6 +- scribo/src/contest/DAE-2011/Makefile.am | 6 +- scribo/src/contest/hbr-2013/Makefile.am | 3 +- scribo/src/contest/hdlac-2011/Makefile.am | 3 +- scribo/src/contest/hnla-2013/Makefile.am | 3 +- scribo/src/pbm_text_in_doc.cc | 6 +- scribo/src/text/Makefile.am | 8 +-- scribo/src/text/pbm_lines_recognition.cc | 6 +- scribo/src/text/pbm_recognition.cc | 6 +- scribo/src/text_recognition_in_picture.cc | 4 -- scribo/src/toolchain/nepomuk/Makefile.am | 3 +- scribo/src/toolchain/nepomuk/text_extraction.cc | 6 +- scribo/tests/toolchain/nepomuk/Makefile.am | 3 +- scribo/tests/toolchain/nepomuk/text_extraction.cc | 6 +- swilena/ChangeLog | 6 ++ swilena/python/Makefile.am | 2 +- 37 files changed, 217 insertions(+), 108 deletions(-) copy milena/mln/{version.hh.in => version.hh} (83%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

[Olena] #282: Improve the support of FFTW
by Olena Trac 10 Sep '13

10 Sep '13

#282: Improve the support of FFTW -------------------------+------------------------ Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: minor | Milestone: Olena 2.2 Component: Milena | Version: 2.0 Keywords: | -------------------------+------------------------ Our support of the Fast Fourier Transform (trough FFTW) is rudimentary. We should * provide more services, i.e. support more data types and offer a better coverage of the FFTW API; * minimize I/Os by providing Milena image types wrapping raw FFTW data. -- Ticket URL: <https://trac.lrde.epita.fr/olena/ticket/282> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient image processing platform

1 0

olena: branch version.hh updated: olena-2.0-795-g8699ea5
by git＠lrde.epita.fr 09 Sep '13

09 Sep '13

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 version.hh has been updated discards 2a2dbc6c5881dab17ccee633d5391fa20538f8ee (commit) discards 6cc134760d8b349dd07656af7f72c88ebe3629ee (commit) via 8699ea5d37befe5372b398283d60cc96bf5f289d (commit) via e61d93d250fd875e8b378e93ef55b2d2c504d9f7 (commit) via 9c2f117f480691cd5ca4b496fd12b33471924d75 (commit) via 9d5b6b6cd73db02b4917b059ba8152f3a0a434ad (commit) via c9517b9272f27be5500296a6dc4e4622caf109f9 (commit) via b8bc67ae64aa16d0de4b3b99c9e008d54770507c (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 (2a2dbc6c5881dab17ccee633d5391fa20538f8ee) \ N -- N -- N (8699ea5d37befe5372b398283d60cc96bf5f289d) 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 ----------------------------------------------------------------- 8699ea5 Swilena: Remove Milena's build dir from the file inclusion path. e61d93d Scribo: Do not look for headers in the build tree uselessly. 9c2f117 Milena: Do not look for headers in the build tree uselessly. 9d5b6b6 Olena: Remove Milena's build dir from the file inclusion path. c9517b9 Force make to regen Milena's mln/version.hh before other files. b8bc67a Have `make regen' also regenerate Milena's mln/version.hh. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 +++++ doc/Makefile.am | 5 ++-- milena/ChangeLog | 21 ++++++++++++++++- milena/apps/constrained-connectivity/Makefile.am | 7 ++++-- milena/apps/generic-skel/Makefile.am | 4 ++-- milena/apps/graph-morpho/Makefile.am | 7 ++++-- milena/apps/mesh-segm-skel/Makefile.am | 4 +++- milena/apps/morphers/Makefile.am | 4 +++- milena/apps/papers/levillain.09.ismm/Makefile.am | 6 +++-- milena/doc/Makefile.am | 7 +++--- milena/tests/tests.mk | 9 +++---- milena/tools/tools.mk | 14 ++--------- scribo/ChangeLog | 26 +++++++++++++++++++++ scribo/doc/Makefile.am | 5 ++-- scribo/src/Makefile.am | 6 ++--- scribo/src/contest/DAE-2011/Makefile.am | 6 ++--- scribo/src/contest/hbr-2013/Makefile.am | 3 +-- scribo/src/contest/hdlac-2011/Makefile.am | 3 +-- scribo/src/contest/hnla-2013/Makefile.am | 3 +-- scribo/src/pbm_text_in_doc.cc | 6 +---- scribo/src/text/Makefile.am | 8 +++---- scribo/src/text/pbm_lines_recognition.cc | 6 +---- scribo/src/text/pbm_recognition.cc | 6 +---- scribo/src/text_recognition_in_picture.cc | 4 ---- scribo/src/toolchain/nepomuk/Makefile.am | 3 +-- scribo/src/toolchain/nepomuk/text_extraction.cc | 6 +---- scribo/tests/toolchain/nepomuk/Makefile.am | 3 +-- scribo/tests/toolchain/nepomuk/text_extraction.cc | 6 +---- swilena/ChangeLog | 6 +++++ swilena/python/Makefile.am | 2 +- 30 files changed, 113 insertions(+), 89 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-795-g8699ea5 Swilena: Remove Milena's build dir from the file inclusion path.
by Roland Levillain 09 Sep '13

09 Sep '13

* python/Makefile.am (AM_CPPFLAGS): Here. --- swilena/ChangeLog | 6 ++++++ swilena/python/Makefile.am | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 38ccc2b..e84f1f9 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,9 @@ +2013-09-09 Roland Levillain <roland(a)lrde.epita.fr> + + Swilena: Remove Milena's build dir from the file inclusion path. + + * python/Makefile.am (AM_CPPFLAGS): Here. + 2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> Fix inclusion paths in Swilena. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 66630b9..2d8dfa7 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -22,7 +22,7 @@ ## FIXME: Factor as much as possible. See how we handled this in TC. -AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/milena -I$(top_builddir)/milena +AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/milena TOOLS_CXXFLAGS = @TOOLS_CXXFLAGS@ AM_CXXFLAGS = $(TOOLS_CXXFLAGS) AM_SWIGFLAGS = -Wall -c++ -python -I$(top_srcdir)/milena -- 1.7.10.4

1 0

olena: olena-2.0-793-g9c2f117 Milena: Do not look for headers in the build tree uselessly.
by Roland Levillain 09 Sep '13

09 Sep '13

* tools/tools.mk (AM_CPPFLAGS): Remove Milena's build dir from the file inclusion path. Remove outdated FIXMEs. * apps/constrained-connectivity/Makefile.am, * apps/graph-morpho/Makefile.am, * apps/mesh-segm-skel/Makefile.am, * apps/morphers/Makefile.am, * apps/papers/levillain.09.ismm/Makefile.am (AM_CPPFLAGS): Explain why $(top_builddir)/milena is part of the file inclusion path. * apps/generic-skel/Makefile.am, * doc/Makefile.am, * tests/tests.mk (AM_CPPFLAGS): Uniformity changes. --- milena/ChangeLog | 19 +++++++++++++++++++ milena/apps/constrained-connectivity/Makefile.am | 7 +++++-- milena/apps/generic-skel/Makefile.am | 4 ++-- milena/apps/graph-morpho/Makefile.am | 7 +++++-- milena/apps/mesh-segm-skel/Makefile.am | 4 +++- milena/apps/morphers/Makefile.am | 4 +++- milena/apps/papers/levillain.09.ismm/Makefile.am | 6 ++++-- milena/doc/Makefile.am | 7 ++++--- milena/tests/tests.mk | 9 +++++---- milena/tools/tools.mk | 14 ++------------ 10 files changed, 52 insertions(+), 29 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 05aa014..c27a410 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,22 @@ +2013-09-09 Roland Levillain <roland(a)lrde.epita.fr> + + Milena: Do not look for headers in the build tree uselessly. + + * tools/tools.mk (AM_CPPFLAGS): Remove Milena's build dir from the + file inclusion path. + Remove outdated FIXMEs. + * apps/constrained-connectivity/Makefile.am, + * apps/graph-morpho/Makefile.am, + * apps/mesh-segm-skel/Makefile.am, + * apps/morphers/Makefile.am, + * apps/papers/levillain.09.ismm/Makefile.am + (AM_CPPFLAGS): Explain why $(top_builddir)/milena is part of the + file inclusion path. + * apps/generic-skel/Makefile.am, + * doc/Makefile.am, + * tests/tests.mk + (AM_CPPFLAGS): Uniformity changes. + 2013-09-06 Roland Levillain <roland(a)lrde.epita.fr> Force make to regen Milena's mln/version.hh before other files. diff --git a/milena/apps/constrained-connectivity/Makefile.am b/milena/apps/constrained-connectivity/Makefile.am index 6b3d3f3..1141317 100644 --- a/milena/apps/constrained-connectivity/Makefile.am +++ b/milena/apps/constrained-connectivity/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) +# Copyright (C) 2009, 2010, 2013 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -17,7 +18,9 @@ include $(top_srcdir)/milena/common.mk # Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +AM_CPPFLAGS = -I$(top_srcdir)/milena +# Find apps/data.hh (generated header). +AM_CPPFLAGS += -I$(top_builddir)/milena # Produce fast code. APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) diff --git a/milena/apps/generic-skel/Makefile.am b/milena/apps/generic-skel/Makefile.am index eb4f8ba..44fc0dd 100644 --- a/milena/apps/generic-skel/Makefile.am +++ b/milena/apps/generic-skel/Makefile.am @@ -16,9 +16,9 @@ include $(top_srcdir)/milena/common.mk -# Find Milena and trimesh headers. +# Find Milena headers. AM_CPPFLAGS = -I$(top_srcdir)/milena -# Find apps/data.hh (generated file). +# Find apps/data.hh (generated header). AM_CPPFLAGS += -I$(top_builddir)/milena # Produce fast code. APPS_CXXFLAGS = @APPS_CXXFLAGS@ diff --git a/milena/apps/graph-morpho/Makefile.am b/milena/apps/graph-morpho/Makefile.am index d85a9ca..61eede8 100644 --- a/milena/apps/graph-morpho/Makefile.am +++ b/milena/apps/graph-morpho/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) +# Copyright (C) 2009, 2010, 2013 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -17,7 +18,9 @@ include $(top_srcdir)/milena/common.mk # Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +AM_CPPFLAGS = -I$(top_srcdir)/milena +# Find apps/data.hh (generated header). +AM_CPPFLAGS += -I$(top_builddir)/milena # Produce fast code. APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index afde381..90af4ee 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -18,7 +18,9 @@ include $(top_srcdir)/milena/common.mk # Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +AM_CPPFLAGS = -I$(top_srcdir)/milena +# Find apps/data.hh (generated header). +AM_CPPFLAGS += -I$(top_builddir)/milena # Produce fast code. APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) diff --git a/milena/apps/morphers/Makefile.am b/milena/apps/morphers/Makefile.am index ae8e3ff..f874601 100644 --- a/milena/apps/morphers/Makefile.am +++ b/milena/apps/morphers/Makefile.am @@ -20,7 +20,9 @@ include $(top_srcdir)/milena/common.mk # Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +AM_CPPFLAGS = -I$(top_srcdir)/milena +# Find apps/data.hh (generated header). +AM_CPPFLAGS += -I$(top_builddir)/milena # Produce fast code. APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) diff --git a/milena/apps/papers/levillain.09.ismm/Makefile.am b/milena/apps/papers/levillain.09.ismm/Makefile.am index f9f3808..fbc3567 100644 --- a/milena/apps/papers/levillain.09.ismm/Makefile.am +++ b/milena/apps/papers/levillain.09.ismm/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development +# Copyright (C) 2008, 2009, 2010, 2011, 2013 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -20,7 +20,9 @@ include $(top_srcdir)/milena/common.mk # Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +AM_CPPFLAGS = -I$(top_srcdir)/milena +# Find apps/data.hh (generated header). +AM_CPPFLAGS += -I$(top_builddir)/milena # Produce fast code. APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 8ba4971..f0532a2 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -16,9 +16,10 @@ # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# Look for Milena headers in srcdir and for (generated) test headers -# (like data.hh) in builddir. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +# Find Milena headers. +AM_CPPFLAGS = -I$(top_srcdir)/milena +# Find tests/data.hh and doc/tools/data.hh (generated headers). +AM_CPPFLAGS += -I$(top_builddir)/milena DOXYGEN = doxygen diff --git a/milena/tests/tests.mk b/milena/tests/tests.mk index 304b46e..9a41031 100644 --- a/milena/tests/tests.mk +++ b/milena/tests/tests.mk @@ -2,7 +2,7 @@ ## Shared configuration for tests. -## Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +## Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and Development ## Laboratory (LRDE) ## ## This file is part of Olena. @@ -21,9 +21,10 @@ include $(top_srcdir)/milena/common.mk -# Look for Milena header in srcdir and for (generated) test headers -# (like data.hh) in builddir. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +# Find Milena headers. +AM_CPPFLAGS = -I$(top_srcdir)/milena +# Find test/data.hh (generated header). +AM_CPPFLAGS += -I$(top_builddir)/milena TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ AM_CXXFLAGS = $(TESTS_CXXFLAGS) diff --git a/milena/tools/tools.mk b/milena/tools/tools.mk index 9704d04..f75daa2 100644 --- a/milena/tools/tools.mk +++ b/milena/tools/tools.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2010, 2011 EPITA Research and Development +# Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development # Laboratory (LRDE) # # This file is part of Olena. @@ -17,18 +17,8 @@ include $(top_srcdir)/milena/common.mk -## FIXME: Revamp (see Olena 0.11's test suite). - -# Look for Milena headers in srcdir. +# Find Milena headers. AM_CPPFLAGS = -I$(top_srcdir)/milena -# Look for Milena headers in builddir. -AM_CPPFLAGS += -I$(top_builddir)/milena -# FIXME: Add -# -# AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) -# -# when oln.m4 (or just a part of it) is available in the distribution, -# instead of using the hand-made TOOLS_CXXFLAGS. TOOLS_CXXFLAGS = @TOOLS_CXXFLAGS@ AM_CXXFLAGS = $(TOOLS_CXXFLAGS) -- 1.7.10.4

1 0