- Olena-patches

olena-2.0-13-g8d55a9e * mln/tag/init.hh (tag::data_t): New tag type. (tag::data): New tag. * mln/core/image/imorph/decorated_image.hh (init_(tag::data_t, D&, const decorated_image<I, D>&)) (init_(tag::data_t, D&, const decorated_image<I, D2>&)) (init_(tag::image_t, decorated_image<I, D>&, const J&)): New functions.
by Roland Levillain 24 Nov '11

24 Nov '11

--- milena/ChangeLog | 12 ++++++++++ milena/mln/core/image/imorph/decorated_image.hh | 26 +++++++++++++++++++++++ milena/mln/tag/init.hh | 3 ++ 3 files changed, 41 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 21db4fd..84c70af 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,15 @@ +2011-11-24 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the initialization of mln::decorated_image. + + * mln/tag/init.hh (tag::data_t): New tag type. + (tag::data): New tag. + * mln/core/image/imorph/decorated_image.hh + (init_(tag::data_t, D&, const decorated_image<I,D>&)) + (init_(tag::data_t, D&, const decorated_image<I,D2>&)) + (init_(tag::image_t, decorated_image<I,D>&, const J&)): + New functions. + 2011-11-18 Roland Levillain <roland(a)lrde.epita.fr> Simplify some apps/morpher programs using mln::make::box2d. diff --git a/milena/mln/core/image/imorph/decorated_image.hh b/milena/mln/core/image/imorph/decorated_image.hh index 181cbcd..39f2c9d 100644 --- a/milena/mln/core/image/imorph/decorated_image.hh +++ b/milena/mln/core/image/imorph/decorated_image.hh @@ -140,6 +140,32 @@ namespace mln # ifndef MLN_INCLUDE_ONLY + // init_. + + template <typename I, typename D> + void init_(tag::data_t, D& d, const decorated_image<I,D>& model) + { + d = model.decoration(); + } + + // Initializing a decoration with a model of another type. + template <typename I, typename D, typename D2> + void init_(tag::data_t, D& /* d */, const decorated_image<I,D2>& /* model */) + { + // FIXME: No initialization, really? + } + + template <typename I, typename D, typename J> + void init_(tag::image_t, decorated_image<I,D>& target, const J& model) + { + I ima; + init_(tag::image, ima, exact(model)); + D d; + init_(tag::data, d, exact(model)); + target.init_(ima, d); + } + + namespace internal { diff --git a/milena/mln/tag/init.hh b/milena/mln/tag/init.hh index c1db35c..7d94337 100644 --- a/milena/mln/tag/init.hh +++ b/milena/mln/tag/init.hh @@ -40,6 +40,7 @@ namespace mln struct bbox_t {}; struct border_t {}; + struct data_t {}; struct domain_t {}; struct extension_t {}; struct function_t {}; @@ -47,6 +48,7 @@ namespace mln extern bbox_t bbox; extern border_t border; + extern data_t data; extern domain_t domain; extern extension_t extension; extern function_t function; @@ -58,6 +60,7 @@ namespace mln bbox_t bbox; border_t border; + data_t data; domain_t domain; extension_t extension; function_t function; -- 1.7.2.5

1 0

olena-2.0-13-gdcad6ad Fix the initialization of mln::decorated_image.
by Roland Levillain 24 Nov '11

24 Nov '11

* mln/tag/init.hh (tag::data_t): New tag type. (tag::data): New tag. * mln/core/image/imorph/decorated_image.hh (init_(tag::data_t, D&, const decorated_image<I,D>&)) (init_(tag::data_t, D&, const decorated_image<I,D2>&)) (init_(tag::image_t, decorated_image<I,D>&, const J&)): New functions. --- milena/ChangeLog | 12 ++++++++++ milena/mln/core/image/imorph/decorated_image.hh | 26 +++++++++++++++++++++++ milena/mln/tag/init.hh | 3 ++ 3 files changed, 41 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 21db4fd..84c70af 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,15 @@ +2011-11-24 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the initialization of mln::decorated_image. + + * mln/tag/init.hh (tag::data_t): New tag type. + (tag::data): New tag. + * mln/core/image/imorph/decorated_image.hh + (init_(tag::data_t, D&, const decorated_image<I,D>&)) + (init_(tag::data_t, D&, const decorated_image<I,D2>&)) + (init_(tag::image_t, decorated_image<I,D>&, const J&)): + New functions. + 2011-11-18 Roland Levillain <roland(a)lrde.epita.fr> Simplify some apps/morpher programs using mln::make::box2d. diff --git a/milena/mln/core/image/imorph/decorated_image.hh b/milena/mln/core/image/imorph/decorated_image.hh index 181cbcd..39f2c9d 100644 --- a/milena/mln/core/image/imorph/decorated_image.hh +++ b/milena/mln/core/image/imorph/decorated_image.hh @@ -140,6 +140,32 @@ namespace mln # ifndef MLN_INCLUDE_ONLY + // init_. + + template <typename I, typename D> + void init_(tag::data_t, D& d, const decorated_image<I,D>& model) + { + d = model.decoration(); + } + + // Initializing a decoration with a model of another type. + template <typename I, typename D, typename D2> + void init_(tag::data_t, D& /* d */, const decorated_image<I,D2>& /* model */) + { + // FIXME: No initialization, really? + } + + template <typename I, typename D, typename J> + void init_(tag::image_t, decorated_image<I,D>& target, const J& model) + { + I ima; + init_(tag::image, ima, exact(model)); + D d; + init_(tag::data, d, exact(model)); + target.init_(ima, d); + } + + namespace internal { diff --git a/milena/mln/tag/init.hh b/milena/mln/tag/init.hh index c1db35c..7d94337 100644 --- a/milena/mln/tag/init.hh +++ b/milena/mln/tag/init.hh @@ -40,6 +40,7 @@ namespace mln struct bbox_t {}; struct border_t {}; + struct data_t {}; struct domain_t {}; struct extension_t {}; struct function_t {}; @@ -47,6 +48,7 @@ namespace mln extern bbox_t bbox; extern border_t border; + extern data_t data; extern domain_t domain; extern extension_t extension; extern function_t function; @@ -58,6 +60,7 @@ namespace mln bbox_t bbox; border_t border; + data_t data; domain_t domain; extension_t extension; function_t function; -- 1.7.2.5

1 0

olena-2.0-43-g8765935 Improve io::dump tests with floating values.
by Guillaume Lazzara 24 Nov '11

24 Nov '11

* tests/io/dump/Makefile.am, * tests/io/dump/dump.cc: Here. --- milena/ChangeLog | 7 +++++++ milena/tests/io/dump/Makefile.am | 4 +++- milena/tests/io/dump/dump.cc | 20 +++++++++++++++++--- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a628305..ecf9a42 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2011-11-24 Guillaume Lazzara <z(a)lrde.epita.fr> + + Improve io::dump tests with floating values. + + * tests/io/dump/Makefile.am, + * tests/io/dump/dump.cc: Here. + 2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> New routine in Milena. diff --git a/milena/tests/io/dump/Makefile.am b/milena/tests/io/dump/Makefile.am index dedd818..eb2f606 100644 --- a/milena/tests/io/dump/Makefile.am +++ b/milena/tests/io/dump/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010, 2011 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -25,6 +26,7 @@ TESTS = $(check_PROGRAMS) MOSTLYCLEANFILES = \ dump-bool.dump \ + dump-double.dump \ dump-float.dump \ dump-int_u8.dump \ dump-rgb8.dump \ diff --git a/milena/tests/io/dump/dump.cc b/milena/tests/io/dump/dump.cc index f8b8f66..598237a 100644 --- a/milena/tests/io/dump/dump.cc +++ b/milena/tests/io/dump/dump.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -85,8 +86,8 @@ int main() /// Value: float { - float data[4] = { 5, 1, - 1, 9 }; + float data[4] = { 5.2, 1.4, + mln_min(float), mln_max(float) }; image2d<float> pic = make::image2d(data); io::dump::save(pic, "dump-float.dump"); image2d<float> pic2; @@ -96,6 +97,19 @@ int main() mln_assertion(pic == pic2); } + /// Value: double + { + double data[4] = { 5.2, 1.4, + mln_min(double), mln_max(double) }; + image2d<double> pic = make::image2d(data); + io::dump::save(pic, "dump-double.dump"); + image2d<double> pic2; + io::dump::load(pic2, "dump-double.dump"); + + mln_assertion(pic.domain() == pic2.domain()); + mln_assertion(pic == pic2); + } + /// Value: rgb8 { -- 1.7.2.5

1 0

branch next updated: olena-2.0-17-g8612399
by git＠lrde.epita.fr 24 Nov '11

24 Nov '11

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 861239963254a72f51b25bfd8323a12ff4a58b82 (commit) via 31125795c939e4f5a1175022dc534025ad8ed179 (commit) via 7dbcef7b638f3e0a133551a7b5a0c81b8326e979 (commit) from e2e8ec06e477c50bb1a3448650b43dc400ec4b46 (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 ----------------------------------------------------------------- 8612399 distrib/macports/Portfile.in: Fix maintainers field. 3112579 lrde-scmstats.sh: Fix branch name ambiguities. 7dbcef7 mln/fun/v2v/rgb_to_hsl.hh: Fix constructor declaration. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 8 ++++++++ distrib/macports/Portfile.in | 2 +- lrde-scmstats.sh | 5 ++++- milena/ChangeLog | 4 ++++ milena/mln/fun/v2v/rgb_to_hsl.hh | 2 +- 5 files changed, 18 insertions(+), 3 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-17-g8612399 distrib/macports/Portfile.in: Fix maintainers field.
by Guillaume Lazzara 24 Nov '11

24 Nov '11

--- ChangeLog | 4 ++++ distrib/macports/Portfile.in | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92e4e7c..75e4788 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-11-24 Guillaume Lazzara <z(a)lrde.epita.fr> + * distrib/macports/Portfile.in: Fix maintainers field. + +2011-11-24 Guillaume Lazzara <z(a)lrde.epita.fr> + * lrde-scmstats.sh: Fix branch name ambiguities. 2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/distrib/macports/Portfile.in b/distrib/macports/Portfile.in index ea329bf..63f41d7 100644 --- a/distrib/macports/Portfile.in +++ b/distrib/macports/Portfile.in @@ -8,7 +8,7 @@ version @version@ categories devel framework graphics science platforms darwin license GPL-2 -maintainers Olena Team +maintainers lrde.epita.fr:olena description Software platform for efficient and generic image processing long_description It is composed of a Generic and efficient C++ image \ processing library, a framework for Document Image \ -- 1.7.2.5

1 0

olena-2.0-16-g3112579 lrde-scmstats.sh: Fix branch name ambiguities.
by Guillaume Lazzara 24 Nov '11

24 Nov '11

--- ChangeLog | 4 ++++ lrde-scmstats.sh | 5 ++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a7d31f..92e4e7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-11-24 Guillaume Lazzara <z(a)lrde.epita.fr> + + * lrde-scmstats.sh: Fix branch name ambiguities. + 2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> * lrde-scmstats.sh: Compute stats per branches. diff --git a/lrde-scmstats.sh b/lrde-scmstats.sh index 4919f80..859f100 100755 --- a/lrde-scmstats.sh +++ b/lrde-scmstats.sh @@ -36,5 +36,8 @@ esac DEST=/lrde/dload/olena/stats/ -gitstats -c commit_end=$branch . $DEST/$branch +# option '-c commit_end=$branch' is not needed since buildbot and git +# only checkout the current branch as 'master'. +gitstats . $DEST/$branch + -- 1.7.2.5

1 0

olena-2.0-15-g7dbcef7 mln/fun/v2v/rgb_to_hsl.hh: Fix constructor declaration.
by Guillaume Lazzara 24 Nov '11

24 Nov '11

--- milena/ChangeLog | 4 ++++ milena/mln/fun/v2v/rgb_to_hsl.hh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b51d355..c8c67db 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2011-11-24 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/fun/v2v/rgb_to_hsl.hh: Fix constructor declaration. + 2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> Fix compilation with multiple files. diff --git a/milena/mln/fun/v2v/rgb_to_hsl.hh b/milena/mln/fun/v2v/rgb_to_hsl.hh index b28036c..7ec9b72 100644 --- a/milena/mln/fun/v2v/rgb_to_hsl.hh +++ b/milena/mln/fun/v2v/rgb_to_hsl.hh @@ -82,7 +82,7 @@ namespace mln # endif // ! MLN_WO_GLOBAL_VARS template <typename T_hsl> - f_rgb_to_hsl_f_t<T_hsl>::f_rgb_to_hsl_f_t() + f_rgb_to_hsl_<T_hsl>::f_rgb_to_hsl_() { } -- 1.7.2.5

1 0

branch apps-ismm-2009 updated: olena-2.0-13-gd590e49
by git＠lrde.epita.fr 24 Nov '11

24 Nov '11

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 apps-ismm-2009 has been updated via d590e49dcb0541a2f964fbbc10032fa3ffcc260b (commit) from 4649bd3bb8ff982893c774075f03d937fe3d995b (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 ----------------------------------------------------------------- d590e49 Honor a precondition in classification examples (ISMM 2009). ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 11 +++++++++++ .../papers/levillain.09.ismm/classif-1complex.cc | 2 +- .../apps/papers/levillain.09.ismm/classif-graph.cc | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-13-gd590e49 Honor a precondition in classification examples (ISMM 2009).
by Roland Levillain 24 Nov '11

24 Nov '11

* apps/papers/levillain.09.ismm/classif-graph.cc, * apps/papers/levillain.09.ismm/classif-1complex.cc: Do not use a value outside the range [0, nbasins] in `canvas_wst' to prevent a failed precondition in labeling::colorize (when NDEBUG is not defined). Reported by David Coeurjolly <david.coeurjolly at liris.cnrs.fr>. --- milena/ChangeLog | 11 +++++++++++ .../papers/levillain.09.ismm/classif-1complex.cc | 2 +- .../apps/papers/levillain.09.ismm/classif-graph.cc | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index bad4207..295f398 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2011-11-24 Roland Levillain <roland(a)lrde.epita.fr> + + Honor a precondition in classification examples (ISMM 2009). + + * apps/papers/levillain.09.ismm/classif-graph.cc, + * apps/papers/levillain.09.ismm/classif-1complex.cc: + Do not use a value outside the range [0, nbasins] in `canvas_wst' + to prevent a failed precondition in labeling::colorize (when + NDEBUG is not defined). + Reported by David Coeurjolly <david.coeurjolly at liris.cnrs.fr>. + 2011-10-11 Roland Levillain <roland(a)lrde.epita.fr> Graph-based version of the classification example. diff --git a/milena/apps/papers/levillain.09.ismm/classif-1complex.cc b/milena/apps/papers/levillain.09.ismm/classif-1complex.cc index 43853e3..674b392 100644 --- a/milena/apps/papers/levillain.09.ismm/classif-1complex.cc +++ b/milena/apps/papers/levillain.09.ismm/classif-1complex.cc @@ -281,7 +281,7 @@ main(int argc, char* argv[]) // Output image showing the results of the above chain on an image // similar to the input. image2d<int_u8> canvas_wst(seeds.domain()); - data::fill(canvas_wst, 255); + data::fill(canvas_wst, 0); // Iterator on the edges (1-faces) of WST_IMA. p_n_faces_fwd_piter<D, G> e(wst_ima.domain(), 1); diff --git a/milena/apps/papers/levillain.09.ismm/classif-graph.cc b/milena/apps/papers/levillain.09.ismm/classif-graph.cc index 36a6369..f832c11 100644 --- a/milena/apps/papers/levillain.09.ismm/classif-graph.cc +++ b/milena/apps/papers/levillain.09.ismm/classif-graph.cc @@ -267,7 +267,7 @@ main(int argc, char* argv[]) // Output image showing the results of the above chain on an image // similar to the input. image2d<int_u8> canvas_wst(seeds.domain()); - data::fill(canvas_wst, 255); + data::fill(canvas_wst, 0); // Iterator on (the edges of) WST_IMA. mln_piter_(wst_ima_t) e(wst_ima.domain()); -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-42-g54defbb
by git＠lrde.epita.fr 24 Nov '11

24 Nov '11

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 unstable/scribo has been updated via 54defbbea0f22afc1413698b007cd6457d245f40 (commit) via d5de13336922ea9fe734e176b0f25a22e895d302 (commit) via e2e8ec06e477c50bb1a3448650b43dc400ec4b46 (commit) from 7307887029d66c125b3fc70de134e40913814c30 (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 ----------------------------------------------------------------- 54defbb New routine in Milena. d5de133 Merge branch 'next' into unstable/scribo ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 36 +++ milena/mln/canvas/browsing/snake_vert.hh | 2 +- milena/mln/data/compute_in_window.hh | 248 ++++++++++++++++++++ milena/mln/fun/v2v/hsi_to_rgb.hh | 2 +- milena/mln/literal/grays.hh | 3 - milena/tests/data/Makefile.am | 2 + ...ithout_localization.cc => compute_in_window.cc} | 66 +++--- 7 files changed, 320 insertions(+), 39 deletions(-) create mode 100644 milena/mln/data/compute_in_window.hh copy milena/tests/data/{paste_without_localization.cc => compute_in_window.cc} (61%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0