October 2010 - Olena-patches

last-svn-commit-536-g2a61065 milena/mln/core/image/vmorph/fun_image.hh: Fix an invalid function call.
by Guillaume Lazzara 28 Oct '10

28 Oct '10

--- milena/ChangeLog | 5 +++++ milena/mln/core/image/vmorph/fun_image.hh | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f9b40f9..7dccad8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2010-09-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + * milena/mln/core/image/vmorph/fun_image.hh: Fix an invalid + function call. + 2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> * headers.mk, tests/unit_test/unit-tests.mk: Regen. diff --git a/milena/mln/core/image/vmorph/fun_image.hh b/milena/mln/core/image/vmorph/fun_image.hh index 3934725..30ac44e 100644 --- a/milena/mln/core/image/vmorph/fun_image.hh +++ b/milena/mln/core/image/vmorph/fun_image.hh @@ -132,8 +132,6 @@ namespace mln /// Mutable access is for reading only. mln_result(F) operator()(const mln_psite(I)& p); // lvalue operator()(const mln_psite(I)& p); De-activated for 1.0 - - F f; }; @@ -211,7 +209,7 @@ namespace mln fun_image<F,I>::operator()(const mln_psite(I)& p) const { mln_precondition(this->data_->ima_.has(p)); - return f( this->data_->ima_(p) ); + return this->data_->f_( this->data_->ima_(p) ); } template <typename F, typename I> @@ -220,7 +218,7 @@ namespace mln fun_image<F,I>::operator()(const mln_psite(I)& p) { mln_precondition(this->data_->ima_.has(p)); - return f( this->data_->ima_(p) ); + return this->data_->f_( this->data_->ima_(p) ); // return mln::value::shell<F, I>( this->data_->ima_, p ); De-activated for 1.0 } -- 1.5.6.5

1 0

branch exp/next-build-ok updated: last-svn-commit-547-gbcad23e
by lazzara＠lrde.epita.fr 28 Oct '10

28 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 exp/next-build-ok has been updated via bcad23e451dd1e759c7d0af2f8706e6e9279f2b6 (commit) via e313ea201d38347de8f94b7fc0add27ff112b098 (commit) via 8022d3d0347ebe0cecd98e7d243210ab0880bd81 (commit) via 66683946f29dd1fc11eb79c8f18829cbc0bed2a8 (commit) via a280e6bd70b2bade36e7085e021e91f7ab3bcb60 (commit) via 4cf994ed4b1388b89e8b2c14005a6b6f79c9bd04 (commit) via e03994db0862f5a246ac8ea4cbe22f3a6af7e478 (commit) via fb411ccc6182ca371d0d10228e94ba952ca0affe (commit) via ab11b69bf3320e80d970a92c8cdaf3f0450c0d17 (commit) via f3d71b3837ab87c355b4cc467aede2ee62e6ee4b (commit) via bef5b90d379e533ee10ba14bf5988b67e5824720 (commit) via 2a6106514287e253fe76fb95b7b9a56bdc399faf (commit) from 2eafecb020b1a4666eb9eeab739f82570ae5adbe (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 ----------------------------------------------------------------- bcad23e Small fixes in Scribo e313ea2 Add tests for objects filtering routines. 8022d3d Fix objects filtering routines. 6668394 Change return value for background in filtering functions. a280e6b scribo/toolchain/text_in_doc_preprocess.hh: Add a new overload. 4cf994e mln/labeling/compute.hh: Add a missing overload in dispatch. e03994d Rename examples. fb411cc headers.mk: Regen. ab11b69 Add a preprocessing toolchain. f3d71b3 Fix namespace ambiguities. bef5b90 scribo/filter/object_links_bbox_w_ratio.hh: Rename arguments. 2a61065 milena/mln/core/image/vmorph/fun_image.hh: Fix an invalid function call. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 9 + milena/mln/core/image/vmorph/fun_image.hh | 6 +- milena/mln/labeling/compute.hh | 14 ++ scribo/ChangeLog | 96 +++++++++++ scribo/headers.mk | 1 + scribo/scribo/binarization/global_threshold.hh | 5 + .../scribo/binarization/global_threshold_auto.hh | 2 +- scribo/scribo/binarization/sauvola_ms.hh | 28 ++-- .../scribo/binarization/sauvola_threshold_image.hh | 6 +- scribo/scribo/filter/object_links_bbox_w_ratio.hh | 8 +- scribo/scribo/filter/objects_h_thick.hh | 2 +- scribo/scribo/filter/objects_h_thin.hh | 2 +- scribo/scribo/filter/objects_large.hh | 46 +++++ scribo/scribo/filter/objects_size_ratio.hh | 2 +- scribo/scribo/filter/objects_small.hh | 10 +- scribo/scribo/filter/objects_thick.hh | 2 +- scribo/scribo/filter/objects_thin.hh | 2 +- scribo/scribo/filter/objects_v_thick.hh | 2 +- scribo/scribo/filter/objects_v_thin.hh | 2 +- scribo/scribo/fun/v2b/objects_large_filter.hh | 21 ++- scribo/scribo/fun/v2b/objects_small_filter.hh | 28 +++- scribo/scribo/preprocessing/deskew.hh | 9 +- scribo/scribo/subsampling/integral_single_image.hh | 7 +- scribo/scribo/toolchain/text_in_doc_preprocess.hh | 176 ++++++++++++++++++++ scribo/src/binarization/Makefile.am | 12 +- .../{ppm_fg_sauvola_ms.cc => ppm_sauvola_ms_fg.cc} | 0 .../{fg_sauvola_ms.cc => sauvola_ms_fg.cc} | 0 scribo/src/preprocessing/preprocess.cc | 9 +- scribo/src/text_in_doc_preprocess.cc | 39 +---- scribo/tests/filter/Makefile.am | 9 +- ...all_and_large_bboxes.cc => components_large.cc} | 49 ++++-- ...all_and_large_bboxes.cc => components_small.cc} | 48 ++++-- 32 files changed, 526 insertions(+), 126 deletions(-) create mode 100644 scribo/scribo/toolchain/text_in_doc_preprocess.hh rename scribo/src/binarization/{ppm_fg_sauvola_ms.cc => ppm_sauvola_ms_fg.cc} (100%) rename scribo/src/binarization/{fg_sauvola_ms.cc => sauvola_ms_fg.cc} (100%) copy scribo/tests/filter/{small_and_large_bboxes.cc => components_large.cc} (68%) rename scribo/tests/filter/{small_and_large_bboxes.cc => components_small.cc} (69%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

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-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-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