April 2010 - Olena-patches

last-svn-commit-150-g81ebf31 Help g++ 3.3 compile Scribo code.
by Roland Levillain 27 Apr '10

27 Apr '10

* text/clean.hh (scribo::text::clean): Help g++ 3.3 type-check a pointer on template function. --- scribo/ChangeLog | 7 +++++++ scribo/text/clean.hh | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 58b564f..ef877c8 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2010-04-27 Roland Levillain <roland(a)lrde.epita.fr> + + Help g++ 3.3 compile Scribo code. + + * text/clean.hh (scribo::text::clean): Help g++ 3.3 type-check a + pointer on template function. + 2010-04-26 Roland Levillain <roland(a)lrde.epita.fr> Clean Scribo's tests' outputs. diff --git a/scribo/text/clean.hh b/scribo/text/clean.hh index cd8657e..b1ea088 100644 --- a/scribo/text/clean.hh +++ b/scribo/text/clean.hh @@ -129,7 +129,7 @@ namespace scribo // Skeleton I skel_on_gaussian = morpho::skeleton_constrained(input_large, c8(), - topo::skeleton::is_simple_point<I,neighb2d>, + &topo::skeleton::is_simple_point<I,neighb2d>, extend(K, false), arith::revert(blur)); // Dilation -- 1.5.6.5

1 0

last-svn-commit-149-g04e7d80 Help g++ 3.3 compile Milena code.
by Roland Levillain 27 Apr '10

27 Apr '10

* apps/graph-morpho/convert.hh (convert::to_image2d(const mln::bin_1complex_image2d&)): Break up an object's construction to help g++ 3.3 understand it. --- milena/ChangeLog | 8 ++++++++ milena/apps/graph-morpho/convert.hh | 7 +++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f0ad22e..39cc7f3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2010-04-27 Roland Levillain <roland(a)lrde.epita.fr> + + Help g++ 3.3 compile Milena code. + + * apps/graph-morpho/convert.hh + (convert::to_image2d(const mln::bin_1complex_image2d&)): + Break up an object's construction to help g++ 3.3 understand it. + 2010-04-23 Roland Levillain <roland(a)lrde.epita.fr> Prevent g++ 4.2 from issuing bad code for graph-morpho/samples_image2d. diff --git a/milena/apps/graph-morpho/convert.hh b/milena/apps/graph-morpho/convert.hh index 6e4ad55..bd8ade5 100644 --- a/milena/apps/graph-morpho/convert.hh +++ b/milena/apps/graph-morpho/convert.hh @@ -64,10 +64,9 @@ namespace convert } mln::box2d support = bbox; - image2d<bool> output(box2d(point2d(support.pmin().row() * 2, - support.pmin().col() * 2), - point2d(support.pmax().row() * 2, - support.pmax().col() * 2))); + point2d box_p_min(support.pmin().row() * 2, support.pmin().col() * 2); + point2d box_p_max(support.pmax().row() * 2, support.pmax().col() * 2); + image2d<bool> output(box2d(box_p_min, box_p_max)); data::fill(output, false); // Iterate on vertices. -- 1.5.6.5

1 0

branch fix-lrde-upload created: last-svn-commit-148-gc260d59
by git＠lrde.epita.fr 27 Apr '10

27 Apr '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-lrde-upload has been created at c260d597d0718762ff60972c3a9834f5f1a9db8f (commit) - Log ----------------------------------------------------------------- c260d59 Improve lrde-upload.sh. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-148-gc260d59 Improve lrde-upload.sh.
by Roland Levillain 27 Apr '10

27 Apr '10

* lrde-upload.sh: Be more robust to cases of missing files. --- ChangeLog | 6 ++++++ lrde-upload.sh | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb44b23..534624a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-04-27 Roland Levillain <roland(a)lrde.epita.fr> + + Improve lrde-upload.sh. + + * lrde-upload.sh: Be more robust to cases of missing files. + 2010-04-26 Roland Levillain <roland(a)lrde.epita.fr> Update lrde-upload.sh. diff --git a/lrde-upload.sh b/lrde-upload.sh index 4785567..e2481d9 100755 --- a/lrde-upload.sh +++ b/lrde-upload.sh @@ -51,8 +51,14 @@ chmod -R a+rX milena/doc/white-paper cp -pR milena/doc/user-refman $DEST_DOC/user-refman.tmp cp -pR milena/doc/white-paper $DEST_DOC/white-paper.tmp -mv -f $DEST_DOC/user-refman $DEST_DOC/user-refman.old -mv -f $DEST_DOC/white-paper $DEST_DOC/white-paper.old +if test -e $DEST_DOC/user-refman; then + rm -rf $DEST_DOC/user-refman.old + mv -f $DEST_DOC/user-refman $DEST_DOC/user-refman.old +fi +if test -e $DEST_DOC/white-paper; then + rm -rf $DEST_DOC/white-paper.old + mv -f $DEST_DOC/white-paper $DEST_DOC/white-paper.old +fi mv -f $DEST_DOC/user-refman.tmp $DEST_DOC/user-refman mv -f $DEST_DOC/white-paper.tmp $DEST_DOC/white-paper -- 1.5.6.5

1 0

branch next updated: last-svn-commit-147-g7b351ec
by git＠lrde.epita.fr 26 Apr '10

26 Apr '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 7b351ecac19fd1c42ae0382ef7179496a1e565c8 (commit) via ab8bd495b70c9c78f8fc13f1df545d487fc94217 (commit) via 5ba9288148acd3aecef5df8ec260e51887375d87 (commit) via 72a1d9cca4425b195b9132e2bd645274f52c765a (commit) via 62982aae637e6591a4f4ae8f52f04f507691ab80 (commit) from 2891ae779a6ddf363a34ad8188fdda31b8e06849 (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 ----------------------------------------------------------------- 7b351ec Update lrde-upload.sh. ab8bd49 Clean Scribo's tests' outputs. 5ba9288 Document configure variables. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 19 ++++++++++++ configure.ac | 30 +++++++++++++++---- lrde-upload.sh | 48 ++++++++++++++----------------- milena/ChangeLog | 8 +++++ milena/apps/graph-morpho/Makefile.am | 4 ++- scribo/ChangeLog | 7 ++++ scribo/tests/preprocessing/Makefile.am | 4 ++- 7 files changed, 85 insertions(+), 35 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-147-g7b351ec Update lrde-upload.sh.
by Roland Levillain 26 Apr '10

26 Apr '10

* lrde-upload.sh: Catch up with the tree's current layout. --- ChangeLog | 6 ++++++ lrde-upload.sh | 48 ++++++++++++++++++++++-------------------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f28b13..eb44b23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-04-26 Roland Levillain <roland(a)lrde.epita.fr> + + Update lrde-upload.sh. + + * lrde-upload.sh: Catch up with the tree's current layout. + 2010-04-23 Roland Levillain <roland(a)lrde.epita.fr> Document configure variables. diff --git a/lrde-upload.sh b/lrde-upload.sh index 9a19946..4785567 100755 --- a/lrde-upload.sh +++ b/lrde-upload.sh @@ -3,9 +3,7 @@ # This file is run by the LRDE autobuilder after a successful compilation. # It is not meant to be distributed with Olena. -set -e -set -x - +set -ex DEST=/lrde/dload/olena/snapshots DEST_DOC=$DEST/doc/milena @@ -18,19 +16,18 @@ REV=$VERSION-snapshot-$CURRENT_DATE # Always do "cp then mv" when uploading the file, so that nobody # can start a download while the destination file is incomplete. -# Upload the tarball. mkdir -p $DEST # Delete tarballs older than 2 days. find $DEST -maxdepth 1 -type f -mtime +1 -name 'olena-*-snapshot-*' \ -exec rm -f {} \; -# tar.gz +# Upload the `.tar.gz' tarball. cp -f olena-$VERSION.tar.gz $DEST/olena-$REV.tar.gz.tmp mv -f $DEST/olena-$REV.tar.gz.tmp $DEST/olena-$REV.tar.gz chmod -R a+r $DEST/olena-$REV.tar.gz -# tar.bz2 +# Upload the `.tar.bz2' tarball. cp -f olena-$VERSION.tar.bz2 $DEST/olena-$REV.tar.bz2.tmp mv -f $DEST/olena-$REV.tar.bz2.tmp $DEST/olena-$REV.tar.bz2 chmod -R a+r $DEST/olena-$REV.tar.bz2 @@ -39,32 +36,31 @@ chmod -R a+r $DEST/olena-$REV.tar.bz2 # Upload a copy of the reference manual and other documentation. mkdir -p $DEST_DOC -rm -rf $DEST_DOC/user_doc.tmp -rm -rf $DEST_DOC/white_paper_html.tmp - +cp milena/doc/ref-guide.pdf $DEST_DOC +cp milena/doc/tutorial.pdf $DEST_DOC +cp milena/doc/user-refman.pdf $DEST_DOC +cp milena/doc/white-paper.pdf $DEST_DOC -# `make distcheck' sets umask to 077. Restoring permissions for all -chmod -R a+rx milena/doc/user-refman-html -chmod -R a+rx milena/doc/white_paper +rm -rf $DEST_DOC/user-refman.tmp +rm -rf $DEST_DOC/white-paper.tmp -cp -pR milena/doc/user-refman-html $DEST_DOC/user_doc.tmp -cp -pR milena/doc/white_paper/white_paper_html $DEST_DOC/white_paper_html.tmp +# `make distcheck' sets umask to 077. Restore read permissions for all. +chmod -R a+rX milena/doc/user-refman +chmod -R a+rX milena/doc/white-paper -cp milena/doc/ref_guide/ref_guide.pdf $DEST_DOC/ -cp milena/doc/tutorial/tutorial.pdf $DEST_DOC/ -cp milena/doc/user-refman.pdf $DEST_DOC/user_doc.pdf -cp milena/doc/white_paper/white_paper.pdf $DEST_DOC/ +cp -pR milena/doc/user-refman $DEST_DOC/user-refman.tmp +cp -pR milena/doc/white-paper $DEST_DOC/white-paper.tmp -mv -f $DEST_DOC/user_doc $DEST_DOC/user_doc.old -mv -f $DEST_DOC/white_paper_html $DEST_DOC/white_paper_html.old +mv -f $DEST_DOC/user-refman $DEST_DOC/user-refman.old +mv -f $DEST_DOC/white-paper $DEST_DOC/white-paper.old -mv -f $DEST_DOC/user_doc.tmp $DEST_DOC/user_doc -mv -f $DEST_DOC/white_paper_html.tmp $DEST_DOC/white_paper_html +mv -f $DEST_DOC/user-refman.tmp $DEST_DOC/user-refman +mv -f $DEST_DOC/white-paper.tmp $DEST_DOC/white-paper -rm -rf $DEST_DOC/user_doc.old -rm -rf $DEST_DOC/white_paper_html.old +rm -rf $DEST_DOC/user-refman.old +rm -rf $DEST_DOC/white-paper.old # We want to be able to modify these files with both the `build' and # `doc' accounts. -chmod -R g+w $DEST_DOC/user_doc -chmod -R g+w $DEST_DOC/white_paper_html +chmod -R g+w $DEST_DOC/user-refman +chmod -R g+w $DEST_DOC/white-paper -- 1.5.6.5

1 0

last-svn-commit-162-g7aacb61 Enable parallel tests.
by Roland Levillain 26 Apr '10

26 Apr '10

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

1 0

last-svn-commit-163-gb398c74 Enable parallel tests.
by Roland Levillain 26 Apr '10

26 Apr '10

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

1 0

last-svn-commit-146-gab8bd49 Clean Scribo's tests' outputs.
by Roland Levillain 26 Apr '10

26 Apr '10

* tests/preprocessing/Makefile.am (MOSTLYCLEANFILES): New. Add unskew.pbm --- scribo/ChangeLog | 7 +++++++ scribo/tests/preprocessing/Makefile.am | 4 +++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index bc2b9d3..58b564f 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2010-04-26 Roland Levillain <roland(a)lrde.epita.fr> + + Clean Scribo's tests' outputs. + + * tests/preprocessing/Makefile.am (MOSTLYCLEANFILES): New. + Add unskew.pbm + 2010-04-21 Roland Levillain <roland(a)lrde.epita.fr> Fix the Scribo distribution. diff --git a/scribo/tests/preprocessing/Makefile.am b/scribo/tests/preprocessing/Makefile.am index 4666033..5182bc0 100644 --- a/scribo/tests/preprocessing/Makefile.am +++ b/scribo/tests/preprocessing/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -25,3 +25,5 @@ check_PROGRAMS = \ unskew_SOURCES = unskew.cc TESTS = $(check_PROGRAMS) + +MOSTLYCLEANFILES = unskew.pbm -- 1.5.6.5

1 0

last-svn-commit-161-g4def5f0 Canonize Swilena's tests' output file names to support parallel tests.
by Roland Levillain 26 Apr '10

26 Apr '10

* python/morpho-fun.py, * python/morpho-segm.py: Add the name of the test as prefix of its output file names. * python/Makefile.am (CLEANFILES): Adjust. Add morpho-segm-gradient.pgm. Rename as... (MOSTLYCLEANFILES): ...this. --- swilena/ChangeLog | 12 ++++++++++++ swilena/python/Makefile.am | 26 ++++++++++++++------------ swilena/python/morpho-fun.py | 23 +++++++++++++---------- swilena/python/morpho-segm.py | 7 ++++--- 4 files changed, 43 insertions(+), 25 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index efa4e9b..55237de 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,15 @@ +2010-04-26 Roland Levillain <roland(a)lrde.epita.fr> + + Canonize Swilena's tests' output file names to support parallel tests. + + * python/morpho-fun.py, + * python/morpho-segm.py: + Add the name of the test as prefix of its output file names. + * python/Makefile.am (CLEANFILES): Adjust. + Add morpho-segm-gradient.pgm. + Rename as... + (MOSTLYCLEANFILES): ...this. + 2009-09-12 Roland Levillain <roland(a)lrde.epita.fr> * neighb2d.i: Aesthetic changes. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index aec8a05..cc4a70f 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -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. # @@ -238,14 +239,15 @@ TESTS = \ EXTRA_DIST += $(TESTS) # Images generated by tests. -CLEANFILES += \ - closing.pgm \ - closing_area.pgm \ - dilation.pgm \ - erosion.pgm \ - gradient.pgm \ - gradient_external.pgm \ - gradient_internal.pgm \ - opening.pgm \ - opening_area.pgm \ - segm.pgm +MOSTLYCLEANFILES = \ + morpho-fun-closing.pgm \ + morpho-fun-closing_area.pgm \ + morpho-fun-dilation.pgm \ + morpho-fun-erosion.pgm \ + morpho-fun-gradient.pgm \ + morpho-fun-gradient_external.pgm \ + morpho-fun-gradient_internal.pgm \ + morpho-fun-opening.pgm \ + morpho-fun-opening_area.pgm \ + morpho-segm-gradient.pgm \ + morpho-segm-ws.pgm diff --git a/swilena/python/morpho-fun.py b/swilena/python/morpho-fun.py index fd55202..6bcc6fc 100644 --- a/swilena/python/morpho-fun.py +++ b/swilena/python/morpho-fun.py @@ -1,6 +1,7 @@ #! /usr/bin/env python -# 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. # @@ -28,17 +29,19 @@ image = image2d_int_u8 ima = image.load(data.lena) dilated = image.dilation(ima, win_c4p()) -image.save(dilated, "dilation.pgm") +image.save(dilated, "morpho-fun-dilation.pgm") eroded = image.erosion(ima, win_c4p()) -image.save(eroded, "erosion.pgm") +image.save(eroded, "morpho-fun-erosion.pgm") -image.save(image.opening(ima, c4()), "opening.pgm") -image.save(image.closing(ima, c4()), "closing.pgm") +image.save(image.opening(ima, c4()), "morpho-fun-opening.pgm") +image.save(image.closing(ima, c4()), "morpho-fun-closing.pgm") -image.save(image.gradient(ima, win_c4p()), "gradient.pgm") -image.save(image.gradient_internal(ima, win_c4p()), "gradient_internal.pgm") -image.save(image.gradient_external(ima, win_c4p()), "gradient_external.pgm") +image.save(image.gradient(ima, win_c4p()), "morpho-fun-gradient.pgm") +image.save(image.gradient_internal(ima, win_c4p()), + "morpho-fun-gradient_internal.pgm") +image.save(image.gradient_external(ima, win_c4p()), + "morpho-fun-gradient_external.pgm") -image.save(image.closing_area(ima, c4(), 50), "closing_area.pgm") -image.save(image.closing_area(ima, c4(), 50), "opening_area.pgm") +image.save(image.closing_area(ima, c4(), 50), "morpho-fun-closing_area.pgm") +image.save(image.closing_area(ima, c4(), 50), "morpho-fun-opening_area.pgm") diff --git a/swilena/python/morpho-segm.py b/swilena/python/morpho-segm.py index 021f91a..3ddf0a8 100644 --- a/swilena/python/morpho-segm.py +++ b/swilena/python/morpho-segm.py @@ -1,6 +1,7 @@ #! /usr/bin/env python -# 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. # @@ -29,14 +30,14 @@ ima = image.load(data.lena) # Gradient. gradient = image.gradient(ima, win_c4p()) -image.save(gradient, "gradient.pgm") +image.save(gradient, "morpho-segm-gradient.pgm") # Area closing of the gradient. closed_gradient = image.closing_area(ima, c4(), 50) # Watershed transform. nbasins = int_u8(); ws = image.meyer_wst (closed_gradient, c4(), nbasins) print nbasins -image.save(ws, "segm.pgm") +image.save(ws, "morpho-segm-ws.pgm") # FIXME: Also re-enable the naive segmentation with no gradient # simplification, and an output on an image2d<int_u32>. -- 1.5.6.5

1 0