- Olena-patches

olena: olena-2.0-572-g61b6d4e mln/make/relabelfun.hh: Fix bad variable replacement.
by Guillaume Lazzara 25 Apr '13

25 Apr '13

--- milena/ChangeLog | 4 ++++ milena/mln/make/relabelfun.hh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2c047e2..5310fbd 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/make/relabelfun.hh: Fix bad variable replacement. + +2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/Doxyfile.in: Enable BRIEF_MEMBER_DESC. 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/mln/make/relabelfun.hh b/milena/mln/make/relabelfun.hh index 834d6ba..50ed95f 100644 --- a/milena/mln/make/relabelfun.hh +++ b/milena/mln/make/relabelfun.hh @@ -116,7 +116,7 @@ namespace mln new_labels(0) = literal::zero; V tmp_nlabels = literal::zero; fun::v2v::array<V> output(nlabels_i, mln_max(V)); - fv2v(0) = literal::zero; + output(0) = literal::zero; for (V i = 1; i < nlabels_i; ++i) { -- 1.7.2.5

1 0

olena: olena-2.0-599-g64ea46b Merge branch 'exp/tmms' into exp/TL
by Jonathan Fabrizio 25 Apr '13

25 Apr '13

This is a merge commit message of the following branches: Merge: ad20949 3596ac7 milena/mln/binarization/tmms_hysteresis.hh | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch exp/TL updated: olena-2.0-599-g64ea46b
by git＠lrde.epita.fr 25 Apr '13

25 Apr '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 exp/TL has been updated via 64ea46b45ff414d59d532d641a9ffa6d0ddd5bd1 (commit) via 3596ac75b533b25f489f3a6acc104c0bdd8a7ac3 (commit) from ad209491c16f7c64ce240725776dedb1ff387f1b (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 ----------------------------------------------------------------- 64ea46b Merge branch 'exp/tmms' into exp/TL ----------------------------------------------------------------------- Summary of changes: milena/mln/binarization/tmms_hysteresis.hh | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch exp/tmms updated: olena-2.0-494-g3596ac7
by git＠lrde.epita.fr 25 Apr '13

25 Apr '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 exp/tmms has been updated via 3596ac75b533b25f489f3a6acc104c0bdd8a7ac3 (commit) from 65cb509e02b9da20679880798b8446cf23db1a0d (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: milena/mln/binarization/tmms_hysteresis.hh | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch exp/newdoc updated: olena-2.0-571-g1712786
by git＠lrde.epita.fr 25 Apr '13

25 Apr '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 exp/newdoc has been updated via 1712786ce30c5b090ec7791afa60895afd55d3cf (commit) from f290054235a9ad05cb1c69451452dd46ca14fdb6 (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 ----------------------------------------------------------------- 1712786 doc/Doxyfile.in: Enable BRIEF_MEMBER_DESC. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 4 ++++ milena/doc/Doxyfile.in | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-571-g1712786 doc/Doxyfile.in: Enable BRIEF_MEMBER_DESC.
by Guillaume Lazzara 25 Apr '13

25 Apr '13

--- milena/ChangeLog | 4 ++++ milena/doc/Doxyfile.in | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4275792..2c047e2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/Doxyfile.in: Enable BRIEF_MEMBER_DESC. + +2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/split-examples.mk: Regen. 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index 67830b6..c092b1b 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -81,7 +81,7 @@ OUTPUT_LANGUAGE = English # the file and class documentation (similar to JavaDoc). # Set to NO to disable this. -BRIEF_MEMBER_DESC = NO +BRIEF_MEMBER_DESC = YES # If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend # the brief description of a member or function before the detailed description. -- 1.7.2.5

1 0

olena: branch exp/newdoc updated: olena-2.0-570-gf290054
by git＠lrde.epita.fr 25 Apr '13

25 Apr '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 exp/newdoc has been updated discards b39e31d8fec7484934ca043474f5a0d9fcbf98ff (commit) via f290054235a9ad05cb1c69451452dd46ca14fdb6 (commit) via 3843deb9f02d6eebcdab9dceb564962d7bdd2e04 (commit) via f3b9c195f9cb4f5fd2056d0672e02900a2dd820b (commit) via d78a5aba6a90a712ac9dcc605284654a3350a0b4 (commit) via ea774ef1f09e34a28a60b526f771e4466556b2dd (commit) via 113964975065838c47d1f04f3ba9e440813310ec (commit) via f8afac7b74f3544975f153e169daf11e5e6fde8b (commit) via 138bfd82249360b0097cdb5f406265f0baeeb4dc (commit) via 7df1b84f9480be019636df2265a6156c665b6a33 (commit) via 9745710feac32abec1d4fbcab09f17e9836fad19 (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 (b39e31d8fec7484934ca043474f5a0d9fcbf98ff) \ N -- N -- N (f290054235a9ad05cb1c69451452dd46ca14fdb6) 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 ----------------------------------------------------------------- f290054 src/text_in_picture.cc: Add more descriptions in usage. 3843deb doc/split-examples.mk: Regen. f3b9c19 mln/core/concept/function.hh: Make Function_vv2b inherit from Function_vv2v. d78a5ab Add function module in Milena documentation. ea774ef doc/mln/convert.dox: Fix a typo. 1139649 doc/Makefile.am: Do not regenerate non-generated images. f8afac7 Add a new figure in Milena documentation. 138bfd8 Rename fun::i2v, fun::stat and fun::v2i to fun::v2v. 7df1b84 configure.ac: Do not configure milena/tests/fun/i2v and milena/tests/fun/stat. 9745710 Move fun::i2v, fun::stat and fun::v2i in fun::v2v. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 5 + milena/ChangeLog | 177 +++++++++++ milena/doc/Makefile.am | 10 +- milena/doc/img/function_hierarchy.png | Bin 0 -> 8738 bytes milena/doc/img/src/function_hierarchy.dia | Bin 0 -> 1807 bytes milena/doc/mln/fun/fun.dox | 41 +++ milena/doc/ref-guide.tex | 2 +- milena/mln/data/convert.hh | 28 +-- milena/mln/fun/v2v/all_to.hh | 110 +++++++ milena/mln/fun/v2v/array.hh | 386 +++++++++++++++++++++++ milena/mln/fun/v2v/index_of_value.hh | 104 ++++++ milena/mln/fun/v2v/mahalanobis.hh | 109 +++++++ milena/mln/fun/v2v/value_at_index.hh | 94 ++++++ milena/tests/fun/v2v/all_to.cc | 38 +++ milena/tests/fun/v2v/array.cc | 42 +++ milena/tests/fun/v2v/index_of_value.cc | 50 +++ milena/tests/fun/v2v/mahalanobis.cc | 67 ++++ milena/tests/fun/v2v/value_at_index.cc | 51 +++ scribo/ChangeLog | 23 ++ scribo/headers.mk | 15 - scribo/scribo/layout/docstrum/within_closure.hh | 108 ------- scribo/src/text_in_picture.cc | 2 +- scribo/tests/unit_test/unit-tests.mk | 15 - 23 files changed, 1314 insertions(+), 163 deletions(-) create mode 100644 milena/doc/img/function_hierarchy.png create mode 100644 milena/doc/img/src/function_hierarchy.dia create mode 100644 milena/doc/mln/fun/fun.dox create mode 100644 milena/mln/fun/v2v/all_to.hh create mode 100644 milena/mln/fun/v2v/array.hh create mode 100644 milena/mln/fun/v2v/index_of_value.hh create mode 100644 milena/mln/fun/v2v/mahalanobis.hh create mode 100644 milena/mln/fun/v2v/value_at_index.hh create mode 100644 milena/tests/fun/v2v/all_to.cc create mode 100644 milena/tests/fun/v2v/array.cc create mode 100644 milena/tests/fun/v2v/index_of_value.cc create mode 100644 milena/tests/fun/v2v/mahalanobis.cc create mode 100644 milena/tests/fun/v2v/value_at_index.cc delete mode 100644 scribo/scribo/layout/docstrum/within_closure.hh hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-570-gf290054 src/text_in_picture.cc: Add more descriptions in usage.
by Guillaume Lazzara 25 Apr '13

25 Apr '13

--- scribo/ChangeLog | 4 ++++ scribo/src/text_in_picture.cc | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 446604a..a3d6325 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/text_in_picture.cc: Add more descriptions in usage. + +2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Rename fun::i2v, fun::stat and fun::v2i to fun::v2v. * scribo/postprocessing/fill_object_holes.hh, diff --git a/scribo/src/text_in_picture.cc b/scribo/src/text_in_picture.cc index 64e1462..9e28b3a 100644 --- a/scribo/src/text_in_picture.cc +++ b/scribo/src/text_in_picture.cc @@ -58,7 +58,7 @@ static const scribo::debug::opt_data opt_desc[] = { "debug-prefix", "Enable debug image outputs. Prefix image name with that " "given prefix.", "<prefix>", 0, 1, 0 }, { "max-dim-size", "Set the maximum size of the largest image dimension.", "<size>", 0, 1, "1024" }, - { "lambda", "Set the maximum area of the background objects. It is only useful if fg-extraction is enabled.", "<size>", + { "lambda", "Set the maximum area of the background objects. It is only useful if fg-extraction is enabled. By default it is automatically adjusted.", "<size>", 0, 1, "0" }, { "verbose", "Enable verbose mode", 0, 0, 0, 0 }, {0, 0, 0, 0, 0, 0} -- 1.7.2.5

1 0

olena: olena-2.0-569-g3843deb doc/split-examples.mk: Regen.
by Guillaume Lazzara 25 Apr '13

25 Apr '13

--- milena/ChangeLog | 4 ++++ milena/doc/split-examples.mk | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 76bd4b7..4275792 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/split-examples.mk: Regen. + +2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/core/concept/function.hh: Make Function_vv2b inherit from Function_vv2v. diff --git a/milena/doc/split-examples.mk b/milena/doc/split-examples.mk index f7141ba..373ddd9 100644 --- a/milena/doc/split-examples.mk +++ b/milena/doc/split-examples.mk @@ -94,6 +94,7 @@ SPLIT_EXAMPLES = \ $(srcdir)/examples/split/tuto3_rw_image-5.cc.raw \ $(srcdir)/examples/split/tuto3_rw_image-6.cc.raw \ $(srcdir)/examples/split/tuto3_rw_image-7.cc.raw \ + $(srcdir)/examples/split/tuto3_rw_image-8.cc.raw \ $(srcdir)/examples/split/tuto4_point2d-1.cc.raw \ $(srcdir)/examples/split/tuto4_site_set_create-1.cc.raw \ $(srcdir)/examples/split/tuto4_site_set_create-2.cc.raw \ @@ -828,7 +829,7 @@ $(srcdir)/examples/split/tuto3_rw_image.cc.stamp: $(srcdir)/examples/tuto3_rw_im EXTRA_DIST += $(srcdir)/examples/split/tuto3_rw_image.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto3_rw_image.cc.stamp -$(srcdir)/examples/split/tuto3_rw_image-1.cc.raw $(srcdir)/examples/split/tuto3_rw_image-2.cc.raw $(srcdir)/examples/split/tuto3_rw_image-3.cc.raw $(srcdir)/examples/split/tuto3_rw_image-4.cc.raw $(srcdir)/examples/split/tuto3_rw_image-5.cc.raw $(srcdir)/examples/split/tuto3_rw_image-6.cc.raw $(srcdir)/examples/split/tuto3_rw_image-7.cc.raw: $(srcdir)/examples/split/tuto3_rw_image.cc.stamp +$(srcdir)/examples/split/tuto3_rw_image-1.cc.raw $(srcdir)/examples/split/tuto3_rw_image-2.cc.raw $(srcdir)/examples/split/tuto3_rw_image-3.cc.raw $(srcdir)/examples/split/tuto3_rw_image-4.cc.raw $(srcdir)/examples/split/tuto3_rw_image-5.cc.raw $(srcdir)/examples/split/tuto3_rw_image-6.cc.raw $(srcdir)/examples/split/tuto3_rw_image-7.cc.raw $(srcdir)/examples/split/tuto3_rw_image-8.cc.raw: $(srcdir)/examples/split/tuto3_rw_image.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ -- 1.7.2.5

1 0

olena: olena-2.0-568-gf3b9c19 mln/core/concept/function.hh: Make Function_vv2b inherit from Function_vv2v.
by Guillaume Lazzara 25 Apr '13

25 Apr '13

--- milena/ChangeLog | 5 +++++ milena/mln/core/concept/function.hh | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 50fc4d0..76bd4b7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/core/concept/function.hh: Make Function_vv2b inherit from + Function_vv2v. + +2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Add function module in Milena documentation. * doc/mln/fun/fun.dox: Add new documentation groups. diff --git a/milena/mln/core/concept/function.hh b/milena/mln/core/concept/function.hh index 1da6247..4c6df4f 100644 --- a/milena/mln/core/concept/function.hh +++ b/milena/mln/core/concept/function.hh @@ -303,7 +303,7 @@ namespace mln \ingroup modfun */ template <typename E> - struct Function_vv2b : public Function<E> + struct Function_vv2b : public Function_vv2v<E> { typedef bool result; typedef Function_vv2b<void> category; -- 1.7.2.5

1 0