Olena-patches November 2011

olena-patches@lrde.epita.fr

5 participants
178 discussions

olena-2.0-14-g849c137 Work around decorated_image's lack of properties, for the recorder.

by Roland Levillain

* apps/morphers/recorder.hh (trait::image_< decorated_image<I,D> >): Replace with.. (trait::image_< decorated_image<I, recorder > >): ...this. Add a value_storage property. (ch_value_< decorated_image< image_, data_< recorder > >, V >): New trait, to handle changes of value types in images decorated with a recorder. * apps/morphers/mask+channel.cc, * apps/morphers/mask+recorder.cc, * apps/morphers/recorder.cc: Simplify these programs thanks to the preceding changes. --- milena/ChangeLog | 16 +++++++ milena/apps/morphers/mask+channel.cc | 7 +-- milena/apps/morphers/mask+recorder.cc | 6 +-- milena/apps/morphers/recorder.cc | 5 +-- milena/apps/morphers/recorder.hh | 77 ++++++++++++++++++++++++++++++--- 5 files changed, 91 insertions(+), 20 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 84c70af..4b904dc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,21 @@ 2011-11-24 Roland Levillain <roland(a)lrde.epita.fr> + Work around decorated_image's lack of properties, for the recorder. + + * apps/morphers/recorder.hh + (trait::image_< decorated_image<I,D> >): Replace with.. + (trait::image_< decorated_image<I, recorder > >): ...this. + Add a value_storage property. + (ch_value_< decorated_image< image_, data_< recorder > >, V >): + New trait, to handle changes of value types in images decorated + with a recorder. + * apps/morphers/mask+channel.cc, + * apps/morphers/mask+recorder.cc, + * apps/morphers/recorder.cc: + Simplify these programs thanks to the preceding changes. + +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. diff --git a/milena/apps/morphers/mask+channel.cc b/milena/apps/morphers/mask+channel.cc index 2e170a2..130a168 100644 --- a/milena/apps/morphers/mask+channel.cc +++ b/milena/apps/morphers/mask+channel.cc @@ -61,10 +61,7 @@ int main() image2d<rgb8> lena = io::ppm::load<rgb8>(MLN_IMG_DIR "/tiny.ppm"); fun::green green; - /* FIXME: Cheat: use generic fill as mln::decorated_image does not - define properly its properties. */ - data::impl::generic::fill_with_value((thru(green, lena).rw() | - make::box2d(5,5, 10,10)).rw(), - 255); + data::fill((thru(green, lena).rw() | make::box2d(5,5, 10,10)).rw(), + 255); io::ppm::save(lena, "lena-mask-channel.ppm"); } diff --git a/milena/apps/morphers/mask+recorder.cc b/milena/apps/morphers/mask+recorder.cc index 2693dbc..067ff6e 100644 --- a/milena/apps/morphers/mask+recorder.cc +++ b/milena/apps/morphers/mask+recorder.cc @@ -59,9 +59,7 @@ int main() typedef image2d<rgb8> I; I lena = io::ppm::load<rgb8>(MLN_IMG_DIR "/tiny.ppm"); decorated_image< I, recorder > lena_rec = record(lena); - /* FIXME: Cheat: use generic fill as mln::decorated_image does not - define properly its properties. */ - data::impl::generic::fill_with_value((lena_rec | make::box2d(5,5, 10,10)).rw(), - literal::green); + data::fill((lena_rec | make::box2d(5,5, 10,10)).rw(), + literal::green); ppm::save(lena_rec, "lena-roi-fill"); } diff --git a/milena/apps/morphers/recorder.cc b/milena/apps/morphers/recorder.cc index 4a3f1ab..86af667 100644 --- a/milena/apps/morphers/recorder.cc +++ b/milena/apps/morphers/recorder.cc @@ -56,9 +56,6 @@ int main() typedef image2d<rgb8> I; I lena = io::ppm::load<rgb8>(MLN_IMG_DIR "/tiny.ppm"); decorated_image< I, recorder > lena_rec = record(lena); - /* FIXME: Cheat: use generic fill as mln::decorated_image does not - define properly its properties. */ - data::impl::generic::fill_with_value(lena_rec, - literal::green); + data::fill(lena_rec, literal::green); ppm::save(lena_rec, "lena-fill"); } diff --git a/milena/apps/morphers/recorder.hh b/milena/apps/morphers/recorder.hh index 98b5f70..f8fc4f4 100644 --- a/milena/apps/morphers/recorder.hh +++ b/milena/apps/morphers/recorder.hh @@ -36,6 +36,8 @@ #include <string> +#include <mln/trait/ch_value.hh> + #include <mln/core/image/imorph/decorated_image.hh> #include <mln/value/rgb8.hh> @@ -47,22 +49,29 @@ #include "apps/data.hh" -// FIXME: mln::decorated_image lacks a proper definition of -// properties! (see mln/core/image/imorph/decorated_image.hh). We use -// the following (minimal) set of properties as a workaround. +// Forward declaration. +template <typename I> struct recorder; + +/* FIXME: mln::decorated_image lacks a proper definition of + properties! (see mln/core/image/imorph/decorated_image.hh). We use + the following (minimal) set of properties as a workaround for the + recorder decoration. */ namespace mln { - namespace trait { - template <typename I, typename D> - struct image_< decorated_image<I,D> > + template <typename I> + struct image_< decorated_image< I, recorder > > : default_image_morpher< I, mln_value(I), - decorated_image<I,D> > + decorated_image< I, recorder > > { typedef trait::image::category::identity_morpher category; + + // Prevent fast processing of images requiring a specific + // interface that we are unable to retrieve now. + typedef trait::image::value_storage::disrupted value_storage; }; } // end of namespace mln::trait @@ -87,6 +96,60 @@ struct recorder std::vector sequence; }; +/* Skeleton of an image decorated with a recorder. + + Initialy, I (Roland) wanted to add this to mln/trait/ch_value.hh: + + template < template <class, class> class M, typename I, typename D, + typename V > + struct ch_value_< M< tag::image_, tag::data_<D> >, V > + { + typedef M< mln_ch_value(I, V), D > ret; + }; + + However, this would not work in the case of the recorder since the + type D of the data attached to the image (of type I) has to be + changed as well. Indeed the initial decoration contains a sequence + of images of type I, which should be changed into a sequence of + images of type mln_ch_value(I, V). + + There are several option to improve this. One is to create a + ch_value trait for data/decorations such as `recorder'. Another + one is to refine the skeleton of decorated_image<I, D> to have it + convey the type the data stored in the decoration, e.g, changing + + typedef decorated_image< tag::image_, tag::data_<D> > skeleton; + + into something like + + typedef decorated_image< tag::image_, tag::data_<D, V> > skeleton; + + but this seems overly complicated. + + The workaround chosen here is very local, and address the very + specific case of decorated_image< I, recorder >. */ + +namespace mln +{ + namespace trait + { + namespace impl + { + template < typename I, typename V > + struct ch_value_< decorated_image< tag::image_, + tag::data_< recorder > >, + V > + { + typedef decorated_image< mln_ch_value(I, V), + recorder< mln_ch_value(I, V) > > ret; + }; + } // end namespace mln::trait::impl + + } // end namespace mln::trait + +} // end namespace mln + +// Helper. template <typename I> mln::decorated_image< I, recorder > record(mln::Image& ima) -- 1.7.2.5

13 years, 1 month

olena-2.0-14-gd10d450 Work around decorated_image's lack of properties, for the recorder.

by Roland Levillain

13 years, 1 month

olena-2.0-13-gdcad6ad Fix the initialization of mln::decorated_image.

by Roland Levillain

* 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

13 years, 1 month

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

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

13 years, 1 month

olena-2.0-43-g8765935 Improve io::dump tests with floating values.

by Guillaume Lazzara

* 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

13 years, 1 month

branch next updated: olena-2.0-17-g8612399

by git＠lrde.epita.fr

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

13 years, 1 month

olena-2.0-17-g8612399 distrib/macports/Portfile.in: Fix maintainers field.

by Guillaume Lazzara

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

13 years, 1 month

olena-2.0-16-g3112579 lrde-scmstats.sh: Fix branch name ambiguities.

by Guillaume Lazzara

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

13 years, 1 month

olena-2.0-15-g7dbcef7 mln/fun/v2v/rgb_to_hsl.hh: Fix constructor declaration.

by Guillaume Lazzara

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

13 years, 1 month

branch apps-ismm-2009 updated: olena-2.0-13-gd590e49

by git＠lrde.epita.fr

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

13 years, 1 month

← Newer
1
...
7
8
9
10
11
12
13
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches November 2011