- Olena-patches

last-svn-commit-547-gbcad23e Small fixes in Scribo
by Guillaume Lazzara 28 Oct '10

28 Oct '10

* scribo/binarization/global_threshold.hh: Add a fixme. * scribo/binarization/global_threshold_auto.hh: Make the result consistent with other binarization methods. * scribo/preprocessing/deskew.hh: Use mln_min(V) as background value anymore. * src/preprocessing/preprocess.cc: Do not negate anymore. Don't pass const nlabel value. --- scribo/ChangeLog | 15 +++++++++++++++ scribo/scribo/binarization/global_threshold.hh | 5 +++++ .../scribo/binarization/global_threshold_auto.hh | 2 +- scribo/scribo/preprocessing/deskew.hh | 2 +- scribo/src/preprocessing/preprocess.cc | 9 +++------ 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 5db7b16..ee5d3d9 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,18 @@ +2010-10-28 Guillaume Lazzara <z(a)lrde.epita.fr> + + Small fixes in Scribo + + * scribo/binarization/global_threshold.hh: Add a fixme. + + * scribo/binarization/global_threshold_auto.hh: Make the result + consistent with other binarization methods. + + * scribo/preprocessing/deskew.hh: Use mln_min(V) as background + value. + + * src/preprocessing/preprocess.cc: Do not negate anymore. Don't + pass const nlabel value anymore. + 2010-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> Add tests for objects filtering routines. diff --git a/scribo/scribo/binarization/global_threshold.hh b/scribo/scribo/binarization/global_threshold.hh index ebf25c4..b90d6df 100644 --- a/scribo/scribo/binarization/global_threshold.hh +++ b/scribo/scribo/binarization/global_threshold.hh @@ -35,6 +35,11 @@ /// /// \brief Binarize an image using a global threshold value. + +/// FIXME: result is not consistent with other binarization +/// methods. The result is inverted because of the threshold functor: +/// should we invert the test in this functor? + namespace scribo { diff --git a/scribo/scribo/binarization/global_threshold_auto.hh b/scribo/scribo/binarization/global_threshold_auto.hh index babf884..a17f9da 100644 --- a/scribo/scribo/binarization/global_threshold_auto.hh +++ b/scribo/scribo/binarization/global_threshold_auto.hh @@ -152,7 +152,7 @@ namespace scribo } mln_ch_value(I, bool) output; - output = duplicate((pw::value(input) > pw::cst(threshold)) | input.domain()); + output = duplicate((pw::value(input) < pw::cst(threshold)) | input.domain()); trace::exiting("scribo::binarization::global_threshold_auto"); return output; diff --git a/scribo/scribo/preprocessing/deskew.hh b/scribo/scribo/preprocessing/deskew.hh index 234ffd6..80ea351 100644 --- a/scribo/scribo/preprocessing/deskew.hh +++ b/scribo/scribo/preprocessing/deskew.hh @@ -420,7 +420,7 @@ namespace scribo if (angle > 0.5 || angle < -0.5) output = geom::rotate(input_gl, - angle, //mln_max(mln_value(I)), - extend(input_gl, mln_max(mln_value(I))), + extend(input_gl, mln_min(mln_value(I))), mln::make::box2d(input_gl.nrows(), input_gl.ncols())); diff --git a/scribo/src/preprocessing/preprocess.cc b/scribo/src/preprocessing/preprocess.cc index 322bfef..0695450 100644 --- a/scribo/src/preprocessing/preprocess.cc +++ b/scribo/src/preprocessing/preprocess.cc @@ -34,8 +34,6 @@ #include <mln/io/pgm/load.hh> #include <mln/io/pbm/save.hh> -#include <mln/logical/not.hh> - #include <scribo/binarization/global_threshold_auto.hh> #include <scribo/preprocessing/deskew.hh> #include <scribo/filter/objects_small.hh> @@ -68,18 +66,17 @@ int main(int argc, char *argv[]) image2d<bool> input_bw = scribo::binarization::global_threshold_auto(input); - logical::not_inplace(input_bw); + value::label_16 nlabels; input_bw = scribo::filter::components_small(input_bw, c8(), - value::label_16(), 3); + nlabels, 3); input_bw = scribo::filter::components_thin(input_bw, c8(), - value::label_16(), 1); + nlabels, 1); image2d<value::int_u8> input_gl = data::convert(value::int_u8(), input_bw); input_gl = scribo::preprocessing::deskew(input_gl); input_bw = data::convert(bool(), input_gl); - logical::not_inplace(input_bw); io::pbm::save(input_bw, argv[2]); trace::exiting("main"); -- 1.5.6.5

1 0

branch next-next updated: last-svn-commit-527-g7c25953
by git＠lrde.epita.fr 27 Oct '10

27 Oct '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-next has been updated discards 23f310d3c2e77582df2964eed642e30f77623e13 (commit) discards 99dae6cbdd98a1af94fe3e229d4200af0e605e9d (commit) via 7c25953a8c1e0d82f2c31696ae94c1bc616281e1 (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 (23f310d3c2e77582df2964eed642e30f77623e13) \ N -- N -- N (7c25953a8c1e0d82f2c31696ae94c1bc616281e1) 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 ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch autoconfiscate-subprojects updated: last-svn-commit-536-g86cd9e2
by git＠lrde.epita.fr 27 Oct '10

27 Oct '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 autoconfiscate-subprojects has been updated discards 6dffea169fd73d0748efc14564716810f503ed6b (commit) discards dad2f447a3db39acbf9d1ffb209bde0cced8f29e (commit) discards 851e028212f99b43e9b52a15f015fed034f8a189 (commit) discards 209f82358c09b9cd739bc45a0c5109e7d39b9317 (commit) discards 5d4057e28d8a62ca484774ddbe9faab15ad0cc4a (commit) discards 9b1df698ea960f525edb08c72e669f43e8cadbbf (commit) discards 9884f001b6c8673217ed1d9eef625ed7fdc9db18 (commit) discards fc061052d3f32881b4972ed8b639a75192f18c4b (commit) discards cefd8a84b99538fc916b72736818afb5b2bac38b (commit) discards 23f310d3c2e77582df2964eed642e30f77623e13 (commit) discards 99dae6cbdd98a1af94fe3e229d4200af0e605e9d (commit) via 86cd9e2a9ba4e3a5941c263e0eb3a049486c3550 (commit) via 1e1204928dfc3b14877d139f6cc530f10cc08d3f (commit) via 82a8284278d46caae6e13ba9d78fc1aa67ff2f98 (commit) via 4ef7d30107fff85bf3827f1aecba3bc01ca48281 (commit) via 06ad42f116d869c3486bd1d28fde46ddd5e1627d (commit) via 2725412dd4e6ad101a657f545f6d91f2c4678bb1 (commit) via f9da35e3e8d4ed5fc5b564bef7c80d96481ef504 (commit) via 4964cd17fede1b717b8da295081c7e1bf381a790 (commit) via 1585c7112b9b4fb133ed85b86414613b02f6b3b6 (commit) via 7c25953a8c1e0d82f2c31696ae94c1bc616281e1 (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 (6dffea169fd73d0748efc14564716810f503ed6b) \ N -- N -- N (86cd9e2a9ba4e3a5941c263e0eb3a049486c3550) 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 ----------------------------------------------------------------- 86cd9e2 Add advice about the release process. 1e12049 Have Milena be in charge of its own configuration and distribution. 82a8284 Autoconfiscate Milena. 4ef7d30 Move trimesh2 into Milena. 06ad42f Have Scribo be in charge of its own configuration. 2725412 Autoconfiscate Scribo. f9da35e Factor .gitignore files. 4964cd1 Have Swilena be in charge of its own configuration. 1585c71 Autoconfiscate Swilena. 7c25953 Fix Boost.Tuple handling. ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch next-next updated: last-svn-commit-528-g23f310d
by git＠lrde.epita.fr 27 Oct '10

27 Oct '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-next has been updated via 23f310d3c2e77582df2964eed642e30f77623e13 (commit) via 99dae6cbdd98a1af94fe3e229d4200af0e605e9d (commit) via bc407e203f38df5a984d5ba5463907394b335f7e (commit) via 83d0183b7c6e7850ff42b1143978de4a8498171b (commit) via 7924629f9a5ed75553a8fa6cee857bf59b634c0f (commit) from b9df1795cd61827f66a60ce6cd7edde8115b5b7f (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 | 6 ++++++ configure.ac | 1 - milena/ChangeLog | 13 +++++++++++++ milena/Makefile.am | 1 + milena/tests/accu/Makefile.am | 1 + milena/tests/unit_test/Makefile.am | 5 +++++ swilena/ChangeLog | 7 +++++++ swilena/python/Makefile.am | 11 ++++++----- 8 files changed, 39 insertions(+), 6 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch autoconfiscate-subprojects created: last-svn-commit-537-g6dffea1
by git＠lrde.epita.fr 27 Oct '10

27 Oct '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 autoconfiscate-subprojects has been created at 6dffea169fd73d0748efc14564716810f503ed6b (commit) - Log ----------------------------------------------------------------- 6dffea1 Add advice about the release process. dad2f44 Have Milena be in charge of its own configuration and distribution. 851e028 Autoconfiscate Milena. 209f823 Move trimesh2 into Milena. 5d4057e Have Scribo be in charge of its own configuration. 9b1df69 Autoconfiscate Scribo. 9884f00 Factor .gitignore files. fc06105 Have Swilena be in charge of its own configuration. cefd8a8 Autoconfiscate Swilena. 23f310d Fix Boost.Tuple handling. 99dae6c WIP: Fix Boost.Tuple handling. bc407e2 Remove a superfluous invocation of AM_CONDITIONAL regarding Magick++. 83d0183 Fix Milena's distribution. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-528-g23f310d Fix Boost.Tuple handling.
by Roland Levillain 27 Oct '10

27 Oct '10

* tests/accu/Makefile.am (tuple_CPPFLAGS): New. * tests/unit_test/Makefile.am (BOOST_TUPLE_CPPFLAGS): New. --- milena/ChangeLog | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index cbdb79b..8e94f5d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2010-10-27 Roland Levillain <roland(a)lrde.epita.fr> + + Fix Boost.Tuple handling. + + * tests/accu/Makefile.am (tuple_CPPFLAGS): New. + * tests/unit_test/Makefile.am (BOOST_TUPLE_CPPFLAGS): New. + 2010-10-26 Roland Levillain <roland(a)lrde.epita.fr> Fix Milena's distribution. -- 1.5.6.5

1 0

last-svn-commit-527-g99dae6c WIP: Fix Boost.Tuple handling.
by Roland Levillain 27 Oct '10

27 Oct '10

--- milena/tests/accu/Makefile.am | 1 + milena/tests/unit_test/Makefile.am | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/milena/tests/accu/Makefile.am b/milena/tests/accu/Makefile.am index 7c0790a..d494d46 100644 --- a/milena/tests/accu/Makefile.am +++ b/milena/tests/accu/Makefile.am @@ -54,6 +54,7 @@ transform_snake_SOURCES = transform_snake.cc if HAVE_BOOST_TUPLE check_PROGRAMS += tuple tuple_SOURCES = tuple.cc + tuple_CPPFLAGS = $(AM_CPPFLAGS) $(BOOST_CPPFLAGS) endif HAVE_BOOST_TUPLE TESTS = $(check_PROGRAMS) diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index b5c8803..4ee9885 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -51,6 +51,11 @@ $(srcdir)/unit-tests.mk: $(top_srcdir)/build-aux/build_unit_test.sh disabled_tes milena/tests/unit_test/disabled_tests \ mln +# Handling Boost.Tuple-dependent programs: `boost.m4' defines +# BOOST_CPPFLAGS, but `unit-tests.mk' expects BOOST_TUPLE_CPPFLAGS; +# help it by defining the later using the former. +BOOST_TUPLE_CPPFLAGS = $(BOOST_CPPFLAGS) + include $(srcdir)/unit-tests.mk MAINTAINERCLEANFILES = $(srcdir)/mln_*.cc -- 1.5.6.5

1 0

last-svn-commit-527-g7c25953 Fix Boost.Tuple handling.
by Roland Levillain 27 Oct '10

27 Oct '10

* tests/accu/Makefile.am (tuple_CPPFLAGS): New. * tests/unit_test/Makefile.am (BOOST_TUPLE_CPPFLAGS): New. --- milena/ChangeLog | 7 +++++++ milena/tests/accu/Makefile.am | 1 + milena/tests/unit_test/Makefile.am | 5 +++++ 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index cbdb79b..8e94f5d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2010-10-27 Roland Levillain <roland(a)lrde.epita.fr> + + Fix Boost.Tuple handling. + + * tests/accu/Makefile.am (tuple_CPPFLAGS): New. + * tests/unit_test/Makefile.am (BOOST_TUPLE_CPPFLAGS): New. + 2010-10-26 Roland Levillain <roland(a)lrde.epita.fr> Fix Milena's distribution. diff --git a/milena/tests/accu/Makefile.am b/milena/tests/accu/Makefile.am index 7c0790a..d494d46 100644 --- a/milena/tests/accu/Makefile.am +++ b/milena/tests/accu/Makefile.am @@ -54,6 +54,7 @@ transform_snake_SOURCES = transform_snake.cc if HAVE_BOOST_TUPLE check_PROGRAMS += tuple tuple_SOURCES = tuple.cc + tuple_CPPFLAGS = $(AM_CPPFLAGS) $(BOOST_CPPFLAGS) endif HAVE_BOOST_TUPLE TESTS = $(check_PROGRAMS) diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index b5c8803..4ee9885 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -51,6 +51,11 @@ $(srcdir)/unit-tests.mk: $(top_srcdir)/build-aux/build_unit_test.sh disabled_tes milena/tests/unit_test/disabled_tests \ mln +# Handling Boost.Tuple-dependent programs: `boost.m4' defines +# BOOST_CPPFLAGS, but `unit-tests.mk' expects BOOST_TUPLE_CPPFLAGS; +# help it by defining the later using the former. +BOOST_TUPLE_CPPFLAGS = $(BOOST_CPPFLAGS) + include $(srcdir)/unit-tests.mk MAINTAINERCLEANFILES = $(srcdir)/mln_*.cc -- 1.5.6.5

1 0

last-svn-commit-526-gbc407e2 Remove a superfluous invocation of AM_CONDITIONAL regarding Magick++.
by Roland Levillain 27 Oct '10

27 Oct '10

* configure.ac: Here. --- ChangeLog | 6 ++++++ configure.ac | 1 - 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 263dfff..3155d63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-10-27 Roland Levillain <roland(a)lrde.epita.fr> + + Remove a superfluous invocation of AM_CONDITIONAL regarding Magick++. + + * configure.ac: Here. + 2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> Do not trigger an error when Qt is missing, too old or not working. diff --git a/configure.ac b/configure.ac index 63e26c0..1febf2c 100644 --- a/configure.ac +++ b/configure.ac @@ -210,7 +210,6 @@ OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio]) OLN_WITH_LIB_PKG_CONFIG([Magick++], [Magick++.h], [Magick++], [magickxx], [MAGICKXX], [], [ImageMagick++]) -AM_CONDITIONAL(HAVE_MAGICKXX, test "x$oln_have_magickxx" = xyes) # ---- # # Qt. # -- 1.5.6.5

1 0

last-svn-commit-537-g6dffea1 Add advice about the release process.
by Roland Levillain 27 Oct '10

27 Oct '10

* HACKING (Required Software): Add LaTeX2HTML. Aesthetic changes. (Useful Tools): Rename as... (Useful Developer Tools): ...this. (Releasing): New section. --- ChangeLog | 10 ++++++ HACKING | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 87 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 95f6f93..01b7429 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2010-10-27 Roland Levillain <roland(a)lrde.epita.fr> + Add advice about the release process. + + * HACKING (Required Software): Add LaTeX2HTML. + Aesthetic changes. + (Useful Tools): Rename as... + (Useful Developer Tools): ...this. + (Releasing): New section. + +2010-10-27 Roland Levillain <roland(a)lrde.epita.fr> + Have Milena be in charge of its own configuration and distribution. * configure.ac: Remove parts now handled by Milena's configure.ac. diff --git a/HACKING b/HACKING index 24e2dac..f453ef0 100644 --- a/HACKING +++ b/HACKING @@ -38,7 +38,7 @@ repository:: By default, `bootstrap' does not regenerate files that are stored on the repository. If you want to refresh them (e.g., because your -working copy is in a bad state), you can ask boostrap to regenerate +working copy is in a bad state), you can ask bootstrap to regenerate them:: ./bootstrap --regen @@ -58,41 +58,103 @@ the following extra programs if you want to work on the Olena project. * If you want to make changes anywhere within the project, you will need: - - GNU Autoconf 2.61 + - GNU Autoconf 2.61, - - GNU Automake 1.10 + - GNU Automake 1.10, - - GNU Libtool 1.5.22 + - GNU Libtool 1.5.22. * If you plan to make changes within Swilena, you must have: - - SWIG 1.3.35 + - SWIG 1.3.35, - - Python 2.5 + - Python 2.5. * If you want to change and/or rebuild the documentation, the following tools are required: - - Doxygen 1.5.6 + - Doxygen 1.5.6, - - a fairly recent LaTeX distribution + - a fairly recent LaTeX distribution, - - the `listings' LaTeX package + - the `listings' LaTeX package, - - the `convert' utility from ImageMagick (6.3.7) + - the `convert' utility from ImageMagick (6.3.7), - HeVeA 1.10 + - LaTeX2HTML (or at minimum, its `html.sty' style file). + Note that `bootstrap' checks for the presence of most of these tools. ------------- -Useful Tools ------------- +---------------------- +Useful Developer Tools +---------------------- + + * `rebox.el' is a useful companion to Emacs, creating boxes with + comment delimiters. + + +--------- +Releasing +--------- + +Things to remember before releasing a new version of Olena, roughly in +this order: + + * Olena is designed to be released as a whole package + (`olena-x.y.tar.{gz,bz2}') *and* as seperate components + (`milena-x.y.tar.{gz,bz2}', `olena-scribo-x.y.tar.{gz,bz2}', + `swilena-x.y.tar.{gz,bz2}', etc.). Both procedures should be + checked. + + * Update and sync `NEWS' and `README' files in the top-level and + subprojects directories (milena/, scribo/, etc.). + + * Likewise, update all `AUTHORS' files. Hint: use + `git shortlog -s DIR' to get the list of all authors who have + contributed to the files under directory DIR. + + * Update revision numbers in `configure.ac' in the top-level and + subprojects directories (`milena/', `scribo/', etc.). + + * Create all packages using `make distcheck' (not just + `make dist'). + + * Install the packages in `/lrde/dload/olena/x.y/', along with the + Olena's `NEWS' and `README' files, and Milena's documentation (in + `/lrde/dload/olena/x.y./doc/') and ensure they are accessible + from the Web. + + * Create a new page on the Olena Web site for the new release (e.g, + http://olena.lrde.epita.fr/OlenaXYZ for release x.y.z), update + the Download page (http://olena.lrde.epita.fr/Download) and make + an announcement on the main page (http://olena.lrde.epita.fr/) + Also update the link under the Download item of the left bar + (http://olena.lrde.epita.fr/WebContents) + + * Likewise, announce the release on the Olena Trac + (https://trac.lrde.org/olena/) + + * Make an announce on the LRDE Web site as well + (http://www.lrde.epita.fr/cgi-bin/twiki/view/Lrde/News) + + * Finally, post an announce to annonce(a)lrde.epita.fr. See the files + `ANNOUNCE-x.y' at the root of the repository for models. + + * Tag the commit COMMIT corresponding to the release in the + repository, and push it to the Git server. + + git tag -m "Olena release x.y." olena-x.y COMMIT + git push tag olena-x.y -`rebox.el' is a useful companion to Emacs, creating boxes with comment -delimiters. + * After the release, do not forget to append an `a' to the release + number in `configure.ac's (e.g., turn `1.1' into `1.1a') to + prevent any mistake regarding version numbers in subsequent + releases. Create new (empty) sections in `NEWS' files + accordingly. -- 1.5.6.5

1 0