May 2014 - Olena-patches

olena: branch master updated: olena-2.0-860-gc2f9c9a
by git＠lrde.epita.fr 26 May '14

26 May '14

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 master has been updated via c2f9c9a9f7acd631d9c3c4fb6419ff825aabad6a (commit) via 63d66e39bb96c71a2ebd613bbf453d26830fe9ad (commit) via 72913431d79e073bfd76e7ba8f3ea6b279e882b9 (commit) via 6b8ee78a0db416947c46f8fe1ddf89bce9c72177 (commit) via aac38bd4b474f6faab1fe0c9965496bbc078393c (commit) via 478a682a3cb681141326b26012411d5cf5d3c881 (commit) via 874c85fe31204751a2317ca2cf00dbc43050f848 (commit) via 11434c3d5bce98164462b59d0a30c9a0219297c7 (commit) via f1072390229a482c78e88aee3f3c67ea8502b4ea (commit) from be96bce6673467409255e03efc46fe870dc440ec (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/ChangeLog | 39 +++++++++++ .../mln/core/image/dmorph/mutable_extension_ima.hh | 6 +- milena/mln/core/internal/image_base.hh | 10 +-- .../core/internal/site_relative_iterator_base.hh | 3 +- milena/mln/topo/is_not_1d_isthmus.hh | 5 +- milena/mln/topo/is_not_end_point.hh | 5 +- milena/mln/topo/is_simple_point2d.hh | 6 +- milena/mln/topo/is_simple_point3d.hh | 5 +- milena/tests/border/Makefile.am | 5 +- milena/tests/border/mirror.cc | 74 +++++++++++--------- milena/tests/metal/is.cc | 5 +- milena/tests/transform/fft.cc | 13 ++-- swilena/ChangeLog | 34 +++++++++ swilena/dynamic_image2d.i | 25 ++++--- swilena/image2d.ixx | 16 ++--- swilena/morpho.ixx | 22 +++--- swilena/neighb2d.i | 23 +++--- swilena/println.ixx | 6 +- swilena/python/max-tree.py | 24 ++----- swilena/window2d.i | 9 ++- 20 files changed, 211 insertions(+), 124 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch next updated: olena-2.0-860-gc2f9c9a
by git＠lrde.epita.fr 23 May '14

23 May '14

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 discards 2a3d61a5c8f1b4e572d094fd8ba7196c4b936dff (commit) via c2f9c9a9f7acd631d9c3c4fb6419ff825aabad6a (commit) via 63d66e39bb96c71a2ebd613bbf453d26830fe9ad (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 (2a3d61a5c8f1b4e572d094fd8ba7196c4b936dff) \ N -- N -- N (c2f9c9a9f7acd631d9c3c4fb6419ff825aabad6a) 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 ----------------------------------------------------------------- c2f9c9a Improve Swilena's max-tree.py output. 63d66e3 Make Swilena's max-tree.py test fully work with SWIG 2.0.7. ----------------------------------------------------------------------- Summary of changes: swilena/ChangeLog | 13 +++++++++++-- swilena/morpho.ixx | 22 +++++++++++----------- swilena/python/max-tree.py | 11 +---------- 3 files changed, 23 insertions(+), 23 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-859-g63d66e3 Make Swilena's max-tree.py test fully work with SWIG 2.0.7.
by Roland Levillain 23 May '14

23 May '14

* morpho.ixx: Give names to wrapped traits, to let SWIG properly deduce the return types of wrapped functions templates. * python/max-tree.py: Reenable a previously disabled println statement. --- swilena/ChangeLog | 9 +++++++++ swilena/morpho.ixx | 22 +++++++++++----------- swilena/python/max-tree.py | 16 ++++------------ 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index e183332..6778779 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,14 @@ 2014-05-23 Roland Levillain <roland(a)lrde.epita.fr> + Make Swilena's max-tree.py test fully work with SWIG 2.0.7. + + * morpho.ixx: Give names to wrapped traits, to let SWIG properly + deduce the return types of wrapped functions templates. + * python/max-tree.py: Reenable a previously disabled println + statement. + +2014-05-23 Roland Levillain <roland(a)lrde.epita.fr> + Make Swilena compatible with SWIG 2.0.9+. * image2d.ixx, diff --git a/swilena/morpho.ixx b/swilena/morpho.ixx index 3e5a91d..8ac70a1 100644 --- a/swilena/morpho.ixx +++ b/swilena/morpho.ixx @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2008, 2009, 2013 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -71,13 +71,13 @@ namespace mln %define instantiate_dilation(Name, I, W) // Explicit instantiation of this trait for the return type. - %template() mln::trait::concrete; + %template(Name ## _concrete_trait) mln::trait::concrete; %template(Name) mln::morpho::dilation< I, W >; %enddef %define instantiate_erosion(Name, I, W) // Explicit instantiation of this trait for the return type. - %template() mln::trait::concrete; + %template(Name ## _concrete_trait) mln::trait::concrete; %template(Name) mln::morpho::erosion< I, W >; %enddef @@ -95,13 +95,13 @@ namespace mln %define instantiate_closing(Name, I, N) // Explicit instantiation of this trait for the return type. - %template() mln::trait::concrete; + %template(Name ## _concrete_trait) mln::trait::concrete; %template(Name) mln::morpho::elementary::closing< I, N >; %enddef %define instantiate_opening(Name, I, N) // Explicit instantiation of this trait for the return type. - %template() mln::trait::concrete; + %template(Name ## _concrete_trait) mln::trait::concrete; %template(Name) mln::morpho::elementary::opening< I, N >; %enddef @@ -117,19 +117,19 @@ namespace mln %define instantiate_gradient(Name, I, W) // Explicit instantiation of this trait for the return type. - %template() mln::trait::concrete; + %template(Name ## _concrete_trait) mln::trait::concrete; %template(Name) mln::morpho::gradient< I, W >; %enddef %define instantiate_gradient_internal(Name, I, W) // Explicit instantiation of this trait for the return type. - %template() mln::trait::concrete; + %template(Name ## _concrete_trait) mln::trait::concrete; %template(Name) mln::morpho::gradient_internal< I, W >; %enddef %define instantiate_gradient_external(Name, I, W) // Explicit instantiation of this trait for the return type. - %template() mln::trait::concrete; + %template(Name ## _concrete_trait) mln::trait::concrete; %template(Name) mln::morpho::gradient_external< I, W >; %enddef @@ -165,7 +165,7 @@ namespace mln %define instantiate_watershed_flooding(Name, L, I, N) // Explicit instantiation of this trait for the return type. - %template() mln::trait::ch_value< I, L >; + %template(Name ## _ch_value_trait) mln::trait::ch_value< I, L >; %template(Name) mln::morpho::watershed::flooding< L, I, N >; %enddef @@ -181,7 +181,7 @@ namespace mln %define instantiate_max_tree(Name, I, N) // Explicit instantiation of this trait for the return type. - %template() mln::trait::ch_value< I, mln_psite(I) >; + %template(Name ## _ch_value_trait) mln::trait::ch_value< I, mln_psite(I) >; %template(Name) mln::morpho::tree::max< I, N >; %enddef diff --git a/swilena/python/max-tree.py b/swilena/python/max-tree.py index f537285..345d966 100644 --- a/swilena/python/max-tree.py +++ b/swilena/python/max-tree.py @@ -1,6 +1,7 @@ #! /usr/bin/env python -# Copyright (C) 2010, 2012 EPITA Research and Development Laboratory (LRDE) +# Copyright (C) 2010, 2012, 2014 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -37,16 +38,7 @@ for p, v in itertools.izip(ima.domain(), values): ima.set(p, int_u8(v)) image.println("ima =", ima) -# FIXME: The type of the (Python) object returned by this call, -# <type 'SwigPyObject'>, is wrong. The right type should be -# <class 'image2d_point2d.image2d_point2d'>, but the fact that the -# routine and the result object are located in two different -# (generated) Swilena submodules seems to confuse SWIG. A consequence -# of this issue is that `max_tree_parent' is not usable at all, hence -# the failure of the last line of this test. We should perhaps review -# Swilena's design and minimize or even completely get rid of the -# modular approach... -max_tree_parent = image.max_tree(ima, c4()); +max_tree_parent = image.max_tree(ima, c4()) # FIXME: Overloading issue: Why can't we use # @@ -54,4 +46,4 @@ max_tree_parent = image.max_tree(ima, c4()); # # ? ## 2013-04-09: Disabled, until a solution is found. -#par_image.println(max_tree_parent) +par_image.println(max_tree_parent) -- 1.7.10.4

1 0

olena: branch next updated: olena-2.0-859-g2a3d61a
by git＠lrde.epita.fr 23 May '14

23 May '14

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 2a3d61a5c8f1b4e572d094fd8ba7196c4b936dff (commit) from 72913431d79e073bfd76e7ba8f3ea6b279e882b9 (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 ----------------------------------------------------------------- 2a3d61a Repair a Swilena test case. ----------------------------------------------------------------------- Summary of changes: swilena/ChangeLog | 9 +++++++++ swilena/println.ixx | 6 +++++- swilena/python/max-tree.py | 11 +++-------- 3 files changed, 17 insertions(+), 9 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-860-gc2f9c9a Improve Swilena's max-tree.py output.
by Roland Levillain 23 May '14

23 May '14

* println.ixx: Include std_string.i to help SWIG wrap mln::debug::println(const std::string&, const Image&) and use it... * python/max-tree.py: ...here. --- swilena/ChangeLog | 9 +++++++++ swilena/println.ixx | 6 +++++- swilena/python/max-tree.py | 8 +------- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 6778779..fc6f0b1 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,14 @@ 2014-05-23 Roland Levillain <roland(a)lrde.epita.fr> + Improve Swilena's max-tree.py output. + + * println.ixx: Include std_string.i to help SWIG wrap + mln::debug::println(const std::string&, const Image&) and use + it... + * python/max-tree.py: ...here. + +2014-05-23 Roland Levillain <roland(a)lrde.epita.fr> + Make Swilena's max-tree.py test fully work with SWIG 2.0.7. * morpho.ixx: Give names to wrapped traits, to let SWIG properly diff --git a/swilena/println.ixx b/swilena/println.ixx index 5f56e63..04ed710 100644 --- a/swilena/println.ixx +++ b/swilena/println.ixx @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -27,6 +27,10 @@ /// \file println.ixx /// \brief A wrapper of mln::debug::println. +%module println + +%include std_string.i + %{ #include "mln/debug/println.hh" %} diff --git a/swilena/python/max-tree.py b/swilena/python/max-tree.py index 345d966..ee8d249 100644 --- a/swilena/python/max-tree.py +++ b/swilena/python/max-tree.py @@ -40,10 +40,4 @@ image.println("ima =", ima) max_tree_parent = image.max_tree(ima, c4()) -# FIXME: Overloading issue: Why can't we use -# -# image2d_point2d.println("max_tree_parent =", max_tree_parent) -# -# ? -## 2013-04-09: Disabled, until a solution is found. -par_image.println(max_tree_parent) +par_image.println("max_tree_parent =", max_tree_parent) -- 1.7.10.4

1 0

olena: olena-2.0-859-g2a3d61a Repair a Swilena test case.
by Roland Levillain 23 May '14

23 May '14

* println.ixx: Include std_string.i to help SWIG wrap mln::debug::println(const std::string&, const Image&). * python/max-tree.py: Reenable a previously disabled println statement. --- swilena/ChangeLog | 9 +++++++++ swilena/println.ixx | 6 +++++- swilena/python/max-tree.py | 11 +++-------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index e183332..b88a740 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,14 @@ 2014-05-23 Roland Levillain <roland(a)lrde.epita.fr> + Repair a Swilena test case. + + * println.ixx: Include std_string.i to help SWIG wrap + mln::debug::println(const std::string&, const Image&). + * python/max-tree.py: Reenable a previously disabled println + statement. + +2014-05-23 Roland Levillain <roland(a)lrde.epita.fr> + Make Swilena compatible with SWIG 2.0.9+. * image2d.ixx, diff --git a/swilena/println.ixx b/swilena/println.ixx index 5f56e63..04ed710 100644 --- a/swilena/println.ixx +++ b/swilena/println.ixx @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -27,6 +27,10 @@ /// \file println.ixx /// \brief A wrapper of mln::debug::println. +%module println + +%include std_string.i + %{ #include "mln/debug/println.hh" %} diff --git a/swilena/python/max-tree.py b/swilena/python/max-tree.py index f537285..b4194a9 100644 --- a/swilena/python/max-tree.py +++ b/swilena/python/max-tree.py @@ -1,6 +1,7 @@ #! /usr/bin/env python -# Copyright (C) 2010, 2012 EPITA Research and Development Laboratory (LRDE) +# Copyright (C) 2010, 2012, 2014 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -48,10 +49,4 @@ image.println("ima =", ima) # modular approach... max_tree_parent = image.max_tree(ima, c4()); -# FIXME: Overloading issue: Why can't we use -# -# image2d_point2d.println("max_tree_parent =", max_tree_parent) -# -# ? -## 2013-04-09: Disabled, until a solution is found. -#par_image.println(max_tree_parent) +par_image.println("max_tree_parent =", max_tree_parent) -- 1.7.10.4

1 0

olena: branch next updated: olena-2.0-858-g7291343
by git＠lrde.epita.fr 23 May '14

23 May '14

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 72913431d79e073bfd76e7ba8f3ea6b279e882b9 (commit) via 6b8ee78a0db416947c46f8fe1ddf89bce9c72177 (commit) from aac38bd4b474f6faab1fe0c9965496bbc078393c (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 ----------------------------------------------------------------- 7291343 Make Swilena compatible with SWIG 2.0.9+. 6b8ee78 Help SWIG wrap mln::internal::image_base. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 7 +++++++ milena/mln/core/internal/image_base.hh | 10 +++++----- swilena/ChangeLog | 10 ++++++++++ swilena/image2d.ixx | 16 +++++++--------- swilena/neighb2d.i | 23 ++++++++++++----------- swilena/window2d.i | 9 ++++----- 6 files changed, 45 insertions(+), 30 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-858-g7291343 Make Swilena compatible with SWIG 2.0.9+.
by Roland Levillain 23 May '14

23 May '14

* image2d.ixx, * neighb2d.i, * window2d.i: Give names to wrapped base classes, so that recent version of SWIG actually considers them and allows upcasts. --- swilena/ChangeLog | 10 ++++++++++ swilena/image2d.ixx | 16 +++++++--------- swilena/neighb2d.i | 23 ++++++++++++----------- swilena/window2d.i | 9 ++++----- 4 files changed, 33 insertions(+), 25 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index aeb9f6b..e183332 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,13 @@ +2014-05-23 Roland Levillain <roland(a)lrde.epita.fr> + + Make Swilena compatible with SWIG 2.0.9+. + + * image2d.ixx, + * neighb2d.i, + * window2d.i: + Give names to wrapped base classes, so that recent version of SWIG + actually considers them and allows upcasts. + 2014-05-22 Roland Levillain <roland(a)lrde.epita.fr> Address Clang warnings in Swilena. diff --git a/swilena/image2d.ixx b/swilena/image2d.ixx index 963fcfc..3972cff 100644 --- a/swilena/image2d.ixx +++ b/swilena/image2d.ixx @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -82,12 +82,10 @@ } } - // Instantiate base classes of mln::image2d<T> so that Swig knows it - // derives from mln::Image. - %template() mln::Image< mln::image2d< int > >; - %template() mln::internal::image_checked_< mln::image2d< T > >; - %template() mln::internal::image_base< T, mln::box2d, mln::image2d< T > >; - %template() mln::internal::image_primary< T, mln::box2d, mln::image2d< T > >; - // Instantiate mln::image2d<T> + // Instantiate mln::image2d<T> and its (directly useful) base classes. + %template(Image_ ## I) mln::Image< mln::image2d< T > >; + %template(image_checked_ ## I) mln::internal::image_checked_< mln::image2d< T > >; + %template(image_base_ ## I) mln::internal::image_base< T, mln::box2d, mln::image2d< T > >; + %template(image_primary_ ## I) mln::internal::image_primary< T, mln::box2d, mln::image2d< T > >; %template(I) mln::image2d< T >; %enddef // !instantiate_image2d diff --git a/swilena/neighb2d.i b/swilena/neighb2d.i index 1dba3dd..4f644ab 100644 --- a/swilena/neighb2d.i +++ b/swilena/neighb2d.i @@ -1,5 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -57,37 +58,37 @@ const typename mln::dpoint<mln::grid::square,mln::def::coord>::coord&, const typename mln::dpoint<mln::grid::square,mln::def::coord>::coord&); -// Instantiate base classes of mln::neighb2d so that Swig knows it -// derives from mln::Neighborhood. -%template() mln::Neighborhood< +// Instantiate mln::neighb2d and its (directly useful) base classes. +%template(Neighborhood_neighb2d) mln::Neighborhood< mln::neighb< - mln::window< mln::dpoint< mln::grid::square,mln::def::coord > > + mln::window< mln::dpoint< mln::grid::square, mln::def::coord > > > >; -%template() mln::internal::neighborhood_extra_impl< +%template(neighborhood_extra_impl_neighb2d) mln::internal::neighborhood_extra_impl< mln::window< mln::dpoint< mln::grid::square, mln::def::coord > >, mln::neighb< mln::window< mln::dpoint< mln::grid::square, mln::def::coord > > > >; -%template() mln::internal::neighborhood_impl< +%template(neighborhood_impl_neighb2d) mln::internal::neighborhood_impl< mln::window< mln::dpoint< mln::grid::square, mln::def::coord > >, mln::neighb< mln::window< mln::dpoint< mln::grid::square, mln::def::coord > > > >; -%template() mln::internal::neighborhood_base< +%template(neighborhood_base_neighb2d) mln::internal::neighborhood_base< mln::window< mln::dpoint< mln::grid::square, mln::def::coord > >, mln::neighb< mln::window< mln::dpoint< mln::grid::square, mln::def::coord > > > >; -%template() mln::internal::neighb_base< +%template(neighb_base_neighb2d) mln::internal::neighb_base< mln::window< mln::dpoint< mln::grid::square, mln::def::coord > >, mln::neighb< mln::window< mln::dpoint< mln::grid::square, mln::def::coord > > > >; -// Instantiate mln::neighb2d. %template(neighb2d) -mln::neighb< mln::window < mln::dpoint< mln::grid::square, mln::def::coord > > >; +mln::neighb< + mln::window < mln::dpoint< mln::grid::square, mln::def::coord > > +>; diff --git a/swilena/window2d.i b/swilena/window2d.i index bf2247d..5ffd12c 100644 --- a/swilena/window2d.i +++ b/swilena/window2d.i @@ -1,5 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -68,12 +69,10 @@ insert(const typename mln::dpoint<mln::grid::square, mln::def::coord>::coord&, } } -// Instantiate base classes of mln::window2d so that Swig knows it -// derives from mln::Window. -%template() mln::internal::window_base< + // Instantiate mln::window2d and its base class. +%template(Window_window2d) mln::internal::window_base< mln::dpoint<mln::grid::square, mln::def::coord >, mln::window< mln::dpoint<mln::grid::square, mln::def::coord > > >; - // Instantiate mln::window2d. %template(window2d) mln::window< mln::dpoint<mln::grid::square,mln::def::coord > >; -- 1.7.10.4

1 0

olena: olena-2.0-857-g6b8ee78 Help SWIG wrap mln::internal::image_base.
by Roland Levillain 23 May '14

23 May '14

* mln/core/internal/image_base.hh: Use mln::util::tracked_ptr with its fully qualified name. --- milena/ChangeLog | 7 +++++++ milena/mln/core/internal/image_base.hh | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 47e0c5e..be75602 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2014-05-23 Roland Levillain <roland(a)lrde.epita.fr> + + Help SWIG wrap mln::internal::image_base. + + * mln/core/internal/image_base.hh: Use mln::util::tracked_ptr + with its fully qualified name. + 2014-05-22 Roland Levillain <roland(a)lrde.epita.fr> Fix Doxygen command names in Milena documentation. diff --git a/milena/mln/core/internal/image_base.hh b/milena/mln/core/internal/image_base.hh index 1b068ca..3cdbdad 100644 --- a/milena/mln/core/internal/image_base.hh +++ b/milena/mln/core/internal/image_base.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2012, 2013 EPITA Research and -// Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2012, 2013, 2014 EPITA Research and +// Development Laboratory (LRDE). // // This file is part of Olena. // @@ -158,7 +158,7 @@ namespace mln const void* id_() const; /// \brief Hook to the image data. - const util::tracked_ptr< internal::data<E> >& hook_data_() const; + const mln::util::tracked_ptr< internal::data<E> >& hook_data_() const; /// \endcond @@ -173,7 +173,7 @@ namespace mln /// \cond INTERNAL_API /// Internal data, sharable by several images. - util::tracked_ptr< internal::data<E> > data_; + mln::util::tracked_ptr< internal::data<E> > data_; /// \endcond }; @@ -269,7 +269,7 @@ namespace mln template <typename T, typename S, typename E> inline - const util::tracked_ptr< internal::data<E> >& + const mln::util::tracked_ptr< internal::data<E> >& image_base<T, S, E>::hook_data_() const { return data_; -- 1.7.10.4

1 0

olena: branch next updated: olena-2.0-856-gaac38bd
by git＠lrde.epita.fr 22 May '14

22 May '14

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 discards 7f135958759e0b5bbbfdbedd6873ad4bda2c666a (commit) via aac38bd4b474f6faab1fe0c9965496bbc078393c (commit) via 478a682a3cb681141326b26012411d5cf5d3c881 (commit) via 874c85fe31204751a2317ca2cf00dbc43050f848 (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 (7f135958759e0b5bbbfdbedd6873ad4bda2c666a) \ N -- N -- N (aac38bd4b474f6faab1fe0c9965496bbc078393c) 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 ----------------------------------------------------------------- aac38bd Address Clang warnings in Swilena. 478a682 Fix Doxygen command names in Milena documentation. 874c85f Address Clang warnings in Milena. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 20 ++++++++-- .../mln/core/image/dmorph/mutable_extension_ima.hh | 6 +-- milena/mln/topo/is_not_1d_isthmus.hh | 5 ++- milena/mln/topo/is_not_end_point.hh | 5 ++- milena/mln/topo/is_simple_point2d.hh | 6 +-- milena/mln/topo/is_simple_point3d.hh | 5 ++- milena/tests/metal/is.cc | 5 ++- milena/tests/transform/fft.cc | 13 ++++--- milena/tests/value/Makefile.am | 5 +-- milena/tests/value/literals_op.cc | 39 -------------------- swilena/ChangeLog | 6 +++ swilena/dynamic_image2d.i | 25 +++++++++---- 12 files changed, 67 insertions(+), 73 deletions(-) delete mode 100644 milena/tests/value/literals_op.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-856-gaac38bd Address Clang warnings in Swilena.
by Roland Levillain 22 May '14

22 May '14

* dynamic_image2d.i: Here. --- swilena/ChangeLog | 6 ++++++ swilena/dynamic_image2d.i | 25 +++++++++++++++++-------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index fcd4fd9..aeb9f6b 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,9 @@ +2014-05-22 Roland Levillain <roland(a)lrde.epita.fr> + + Address Clang warnings in Swilena. + + * dynamic_image2d.i: Here. + 2013-09-10 Roland Levillain <roland(a)lrde.epita.fr> Swilena: Remove lines `VARIABLE = @VARIABLE@' from Makefile.am's. diff --git a/swilena/dynamic_image2d.i b/swilena/dynamic_image2d.i index 532f1e0..2a0430d 100644 --- a/swilena/dynamic_image2d.i +++ b/swilena/dynamic_image2d.i @@ -1,5 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -152,7 +153,7 @@ namespace mln /// 3). dynamic_image2d(const box2d& b); - // FIXME: Add a virtual dtor? + virtual ~dynamic_image2d(); /// Initialize an empty image. virtual void init_(const box2d& b); @@ -230,6 +231,12 @@ namespace mln template <typename T> inline + dynamic_image2d<T>::~dynamic_image2d() + { + } + + template <typename T> + inline void dynamic_image2d<T>::init_(const box2d& b) { @@ -258,10 +265,11 @@ namespace mln template <typename T> inline const T& - dynamic_image2d<T>::operator()(const point2d& p) const + dynamic_image2d<T>::operator()(const point2d&) const { - // Dummy. - assert(false); + abort(); + static T v; + return v; } // Dummy implementation, provided to have swig wrap the class (swig won't @@ -269,10 +277,11 @@ namespace mln template <typename T> inline T& - dynamic_image2d<T>::operator()(const point2d& p) + dynamic_image2d<T>::operator()(const point2d&) { - // Dummy. - assert(false); + abort(); + static T v; + return v; } template <typename T> -- 1.7.10.4

1 0

olena: olena-2.0-855-g478a682 Fix Doxygen command names in Milena documentation.
by Roland Levillain 22 May '14

22 May '14

* mln/topo/is_not_1d_isthmus.hh, * mln/topo/is_not_end_point.hh, * mln/topo/is_simple_point2d.hh, * mln/topo/is_simple_point3d.hh: Here. --- milena/ChangeLog | 10 ++++++++++ milena/mln/topo/is_not_1d_isthmus.hh | 5 +++-- milena/mln/topo/is_not_end_point.hh | 5 +++-- milena/mln/topo/is_simple_point2d.hh | 6 +++--- milena/mln/topo/is_simple_point3d.hh | 5 +++-- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c00e8fa..47e0c5e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2014-05-22 Roland Levillain <roland(a)lrde.epita.fr> + Fix Doxygen command names in Milena documentation. + + * mln/topo/is_not_1d_isthmus.hh, + * mln/topo/is_not_end_point.hh, + * mln/topo/is_simple_point2d.hh, + * mln/topo/is_simple_point3d.hh: + Here. + +2014-05-22 Roland Levillain <roland(a)lrde.epita.fr> + Address Clang warnings in Milena. * mln/core/image/dmorph/mutable_extension_ima.hh, diff --git a/milena/mln/topo/is_not_1d_isthmus.hh b/milena/mln/topo/is_not_1d_isthmus.hh index 101cdf2..e6ba5f5 100644 --- a/milena/mln/topo/is_not_1d_isthmus.hh +++ b/milena/mln/topo/is_not_1d_isthmus.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -58,7 +59,7 @@ namespace mln /// /// \param nbh_fg The foreground neighborhood. /// \param nbh_bg The background neighborhood. - /// \apram ima The image. + /// \param ima The image. is_not_1d_isthmus(const Neighborhood<N>& nbh_fg, const Neighborhood<N>& nbh_bg, const Image& ima); diff --git a/milena/mln/topo/is_not_end_point.hh b/milena/mln/topo/is_not_end_point.hh index 31ac02d..61b6e7b 100644 --- a/milena/mln/topo/is_not_end_point.hh +++ b/milena/mln/topo/is_not_end_point.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -51,7 +52,7 @@ namespace mln /// Build a functor, and assign an image to it. /// /// \param nbh The (foreground) neighborhood. - /// \apram ima The image. + /// \param ima The image. is_not_end_point(const Neighborhood<N>& nbh, const Image& ima); /// Set the underlying image. diff --git a/milena/mln/topo/is_simple_point2d.hh b/milena/mln/topo/is_simple_point2d.hh index ae05663..d8f3fc6 100644 --- a/milena/mln/topo/is_simple_point2d.hh +++ b/milena/mln/topo/is_simple_point2d.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2011, 2013 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2010, 2011, 2013, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -69,7 +69,7 @@ namespace mln /// /// \param nbh_fg The foreground neighborhood. /// \param nbh_bg The background neighborhood. - /// \apram ima The image. + /// \param ima The image. is_simple_point2d(const Neighborhood<N>& nbh_fg, const Neighborhood<N>& nbh_bg, const Image& ima); diff --git a/milena/mln/topo/is_simple_point3d.hh b/milena/mln/topo/is_simple_point3d.hh index d3dac55..de83168 100644 --- a/milena/mln/topo/is_simple_point3d.hh +++ b/milena/mln/topo/is_simple_point3d.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -64,7 +65,7 @@ namespace mln /// /// \param nbh_fg The foreground neighborhood. /// \param nbh_bg The background neighborhood. - /// \apram ima The image. + /// \param ima The image. is_simple_point3d(const Neighborhood<N>& nbh_fg, const Neighborhood<N>& nbh_bg, const Image& ima); -- 1.7.10.4

1 0

olena: olena-2.0-854-g874c85f Address Clang warnings in Milena.
by Roland Levillain 22 May '14

22 May '14

* mln/core/image/dmorph/mutable_extension_ima.hh, * tests/metal/is.cc, * tests/transform/fft.cc: Here. --- milena/ChangeLog | 9 +++++++++ milena/mln/core/image/dmorph/mutable_extension_ima.hh | 6 +++--- milena/tests/metal/is.cc | 5 +++-- milena/tests/transform/fft.cc | 13 ++++++++----- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index acf88b9..c00e8fa 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2014-05-22 Roland Levillain <roland(a)lrde.epita.fr> + + Address Clang warnings in Milena. + + * mln/core/image/dmorph/mutable_extension_ima.hh, + * tests/metal/is.cc, + * tests/transform/fft.cc: + Here. + 2014-05-20 Roland Levillain <roland(a)lrde.epita.fr> Improve tests on mln::border::mirror. diff --git a/milena/mln/core/image/dmorph/mutable_extension_ima.hh b/milena/mln/core/image/dmorph/mutable_extension_ima.hh index f208581..701534f 100644 --- a/milena/mln/core/image/dmorph/mutable_extension_ima.hh +++ b/milena/mln/core/image/dmorph/mutable_extension_ima.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2008, 2009, 2010, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -40,7 +40,7 @@ namespace mln { // Forward declaration. - template <typename I, typename J> struct mutable_extension_ima; + template <typename I, typename J> class mutable_extension_ima; namespace internal diff --git a/milena/tests/metal/is.cc b/milena/tests/metal/is.cc index 9778c6c..d9d1962 100644 --- a/milena/tests/metal/is.cc +++ b/milena/tests/metal/is.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -39,7 +40,7 @@ struct dest struct from_2 { - operator dest() const { dest* tmp; return *tmp; } + operator dest() const { dest* tmp = 0; return *tmp; } }; diff --git a/milena/tests/transform/fft.cc b/milena/tests/transform/fft.cc index 1dce9df..c5449c9 100644 --- a/milena/tests/transform/fft.cc +++ b/milena/tests/transform/fft.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004, 2012 EPITA Research and Development Laboratory +// Copyright (C) 2004, 2012, 2014 EPITA Research and Development Laboratory. // // This file is part of Olena. // @@ -86,12 +86,15 @@ int main () io::pgm::save(out, "fft_trans_log.pgm"); - for (int row = 40; row < im2.nrows() - 40; ++row) - for (int col = 0; col < im2.ncols(); ++col) + int nrows = im2.nrows(); + int ncols = im2.ncols(); + int hlen = 40; + for (int row = hlen; row < nrows - hlen; ++row) + for (int col = 0; col < ncols; ++col) opt::at(im2, row, col) = 0; - for (int row = 0; row < im2.nrows(); ++row) - for (int col = 40; col < im2.ncols() - 40; ++col) + for (int row = 0; row < nrows; ++row) + for (int col = hlen; col < ncols - hlen; ++col) opt::at(im2, row, col) = 0; fft = fourier.transformed_image_log_magn<int_u8>(true); -- 1.7.10.4

1 0

olena: branch next updated: olena-2.0-854-g7f13595
by git＠lrde.epita.fr 22 May '14

22 May '14

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 discards 37db86920108a095aa87b2ae0be6322ee3804e49 (commit) discards 8f4ee017f9b8e2bf3541df3e464bc2d56368bf04 (commit) via 7f135958759e0b5bbbfdbedd6873ad4bda2c666a (commit) via 11434c3d5bce98164462b59d0a30c9a0219297c7 (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 (37db86920108a095aa87b2ae0be6322ee3804e49) \ N -- N -- N (7f135958759e0b5bbbfdbedd6873ad4bda2c666a) 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 ----------------------------------------------------------------- 7f13595 Add a test case to exercise the issue of Trac ticket #125. 11434c3 Improve tests on mln::border::mirror. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 5 +- milena/mln/border/mirror.hh | 225 +++++++++++++++++++++++-------------------- 2 files changed, 122 insertions(+), 108 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-853-g11434c3 Improve tests on mln::border::mirror.
by Roland Levillain 22 May '14

22 May '14

* tests/border/mirror.cc: Revamp. * tests/border/Makefile.am (check_PROGRAMS): Reenable mirror_full. --- milena/ChangeLog | 7 ++++ milena/tests/border/Makefile.am | 5 +-- milena/tests/border/mirror.cc | 74 ++++++++++++++++++++++----------------- 3 files changed, 51 insertions(+), 35 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a2e295e..acf88b9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2014-05-20 Roland Levillain <roland(a)lrde.epita.fr> + + Improve tests on mln::border::mirror. + + * tests/border/mirror.cc: Revamp. + * tests/border/Makefile.am (check_PROGRAMS): Reenable mirror_full. + 2012-10-02 Guillaume Lazzara <z(a)lrde.epita.fr> Fix a precondition (Trac ticket #256). diff --git a/milena/tests/border/Makefile.am b/milena/tests/border/Makefile.am index 64c8197..a268a5b 100644 --- a/milena/tests/border/Makefile.am +++ b/milena/tests/border/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2014 EPITA Research and +# Development Laboratory (LRDE). # # This file is part of Olena. # @@ -26,6 +26,7 @@ check_PROGRAMS = \ find \ get \ mirror \ + mirror_full \ resize_equal \ resize_image1d_1 \ resize_image1d_2 \ diff --git a/milena/tests/border/mirror.cc b/milena/tests/border/mirror.cc index 09435e5..58a038e 100644 --- a/milena/tests/border/mirror.cc +++ b/milena/tests/border/mirror.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -24,7 +24,7 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -/// \file +// Exercise mln::border::mirror. #include <mln/core/image/image1d.hh> #include <mln/core/image/image2d.hh> @@ -35,46 +35,54 @@ #include <mln/data/paste_without_localization.hh> #include <mln/data/compare.hh> -using namespace mln; - int -main (void) +main() { - { - image1d<int> ima(2, 3); - debug::iota(ima); - border::mirror(ima); - mln_assertion(opt::element(ima, 0) == 2); - mln_assertion(opt::element(ima, 1) == 2); - mln_assertion(opt::element(ima, 2) == 1); - mln_assertion(opt::element(ima, 3) == 1); - mln_assertion(opt::element(ima, 4) == 2); - mln_assertion(opt::element(ima, 5) == 2); - mln_assertion(opt::element(ima, 6) == 1); - mln_assertion(opt::element(ima, 7) == 1); - } - + using namespace mln; - // Image2d + // image1d. { - unsigned ref_data[6][7] = { - { 1, 1, 4, 5, 6, 3, 3 }, - { 1, 1, 1, 2, 3, 3, 3 }, - { 2, 1, 1, 2, 3, 3, 2 }, - { 5, 4, 4, 5, 6, 6, 5 }, - { 4, 4, 4, 5, 6, 6, 6 }, - { 4, 4, 1, 2, 3, 6, 6 } - }; + // A 2-pixel 1D image with a 3-pixel border. + image1d<unsigned> input(2, 3); + debug::iota(input); + border::mirror(input); + // Data are framed; other values form the border. + unsigned ref_data[8] = + // ,-------------. + { 2, 2, 1, /* | */ 1, 2, /* | */ 2, 1, 1 }; + // `-------------' + image1d<unsigned> ref = make::image(ref_data); - image2d<unsigned> ref = make::image(ref_data); + image1d<unsigned> output(8, 0); + data::paste_without_localization(extended_to(input, input.vbbox()), + output); + mln_assertion(output == ref); + } + + // image2d. + { + // A 2x3-pixel 2D image with a 2-pixel border. image2d<unsigned> input(2, 3, 2); - image2d<unsigned> res(6, 7, 0); debug::iota(input, 0); border::mirror(input); - data::paste_without_localization(extended_to(input, input.vbbox()), res); + // Data are framed; other values form the border. + unsigned ref_data[6][7] = { + { 1, 1, 4, 5, 6, 3, 3 }, + { 1, 1, 1, 2, 3, 3, 3 }, + // ,----------------. + { 2, 1, /* | */ 1, 2, 3, /* | */ 3, 2 }, + { 5, 4, /* | */ 4, 5, 6, /* | */ 6, 5 }, + // `----------------' + { 4, 4, 4, 5, 6, 6, 6 }, + { 4, 4, 1, 2, 3, 6, 6 } + }; + image2d<unsigned> ref = make::image(ref_data); - mln_assertion(res == ref); + image2d<unsigned> output(6, 7, 0); + data::paste_without_localization(extended_to(input, input.vbbox()), + output); + mln_assertion(output == ref); } } -- 1.7.10.4

1 0

olena: branch next updated: olena-2.0-854-g37db869
by git＠lrde.epita.fr 21 May '14

21 May '14

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 discards ffdd63fed19fc26c8807ce67a72fb42d507a9f94 (commit) discards 888cdfe7745e9f4016e0c73b64933a8162229e4a (commit) via 37db86920108a095aa87b2ae0be6322ee3804e49 (commit) via 8f4ee017f9b8e2bf3541df3e464bc2d56368bf04 (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 (ffdd63fed19fc26c8807ce67a72fb42d507a9f94) \ N -- N -- N (37db86920108a095aa87b2ae0be6322ee3804e49) 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 ----------------------------------------------------------------- 37db869 Add a test case to exercise the issue of Trac ticket #125. 8f4ee01 Various changes in mln::border::mirror. ----------------------------------------------------------------------- Summary of changes: milena/mln/border/mirror.hh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch next updated: olena-2.0-854-gffdd63f
by git＠lrde.epita.fr 20 May '14

20 May '14

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 discards 8758e60615436bdf40fc662343cad3ac24e74d9a (commit) via ffdd63fed19fc26c8807ce67a72fb42d507a9f94 (commit) via 888cdfe7745e9f4016e0c73b64933a8162229e4a (commit) via f1072390229a482c78e88aee3f3c67ea8502b4ea (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 (8758e60615436bdf40fc662343cad3ac24e74d9a) \ N -- N -- N (ffdd63fed19fc26c8807ce67a72fb42d507a9f94) 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 ----------------------------------------------------------------- ffdd63f Add a test case to exercise the issue of Trac ticket #125. 888cdfe Various changes in mln::border::mirror. f107239 Fix a precondition (Trac ticket #256). ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 20 +- milena/mln/border/mirror.hh | 223 +++++++++----------- milena/tests/border/Makefile.am | 5 +- milena/tests/border/mirror.cc | 74 ++++--- milena/tests/value/Makefile.am | 5 +- .../essential.hh => tests/value/literals_op.cc} | 21 +- 6 files changed, 178 insertions(+), 170 deletions(-) copy milena/{mln/literal/essential.hh => tests/value/literals_op.cc} (78%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-854-g7f13595 Add a test case to exercise the issue of Trac ticket #125.
by Roland Levillain 20 May '14

20 May '14

* tests/value/literals_op.cc: New test. * tests/value/Makefile.am (check_PROGRAMS): Add literals_op. --- milena/ChangeLog | 7 +++++++ milena/tests/value/Makefile.am | 5 +++-- .../essential.hh => tests/value/literals_op.cc} | 21 +++++++++++--------- 3 files changed, 22 insertions(+), 11 deletions(-) copy milena/{mln/literal/essential.hh => tests/value/literals_op.cc} (78%) diff --git a/milena/ChangeLog b/milena/ChangeLog index acf88b9..97b2bb9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2014-05-20 Roland Levillain <roland(a)lrde.epita.fr> + Add a test case to exercise the issue of Trac ticket #125. + + * tests/value/literals_op.cc: New test. + * tests/value/Makefile.am (check_PROGRAMS): Add literals_op. + +2014-05-20 Roland Levillain <roland(a)lrde.epita.fr> + Improve tests on mln::border::mirror. * tests/border/mirror.cc: Revamp. diff --git a/milena/tests/value/Makefile.am b/milena/tests/value/Makefile.am index 21ca6f4..e9f6bd1 100644 --- a/milena/tests/value/Makefile.am +++ b/milena/tests/value/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 EPITA Research and -# Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 EPITA +# Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -31,6 +31,7 @@ check_PROGRAMS = \ int_u8 \ interop \ label \ + literals_op \ proxy \ rgb8 \ set \ diff --git a/milena/mln/literal/essential.hh b/milena/tests/value/literals_op.cc similarity index 78% copy from milena/mln/literal/essential.hh copy to milena/tests/value/literals_op.cc index 32d8869..6e2605e 100644 --- a/milena/mln/literal/essential.hh +++ b/milena/tests/value/literals_op.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -23,14 +23,17 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_LITERAL_ESSENTIAL_HH -# define MLN_LITERAL_ESSENTIAL_HH - -/*! \file - * - * \brief File that includes essential literals. - */ +// Exercise operators between Milena values (such as mln::value::gl8) +// and literals (such as mln::literal::white). +# include <mln/value/gl8.hh> # include <mln/literal/all.hh> -#endif // ! MLN_LITERAL_ESSENTIAL_HH +int main() +{ + using mln::value::gl8; + using mln::literal::white; + + gl8 g = 255; + mln_assertion(g == white); +} -- 1.7.10.4

1 0

olena: olena-2.0-854-g37db869 Add a test case to exercise the issue of Trac ticket #125.
by Roland Levillain 20 May '14

20 May '14

* tests/value/literals_op.cc: New test. * tests/value/Makefile.am (check_PROGRAMS): Add literals_op. --- milena/ChangeLog | 7 +++++++ milena/tests/value/Makefile.am | 5 +++-- .../essential.hh => tests/value/literals_op.cc} | 21 +++++++++++--------- 3 files changed, 22 insertions(+), 11 deletions(-) copy milena/{mln/literal/essential.hh => tests/value/literals_op.cc} (78%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0206b0f..8f2766a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2014-05-20 Roland Levillain <roland(a)lrde.epita.fr> + Add a test case to exercise the issue of Trac ticket #125. + + * tests/value/literals_op.cc: New test. + * tests/value/Makefile.am (check_PROGRAMS): Add literals_op. + +2014-05-20 Roland Levillain <roland(a)lrde.epita.fr> + Various changes in mln::border::mirror. * mln/border/mirror.hh: Here. diff --git a/milena/tests/value/Makefile.am b/milena/tests/value/Makefile.am index 21ca6f4..e9f6bd1 100644 --- a/milena/tests/value/Makefile.am +++ b/milena/tests/value/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 EPITA Research and -# Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 EPITA +# Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -31,6 +31,7 @@ check_PROGRAMS = \ int_u8 \ interop \ label \ + literals_op \ proxy \ rgb8 \ set \ diff --git a/milena/mln/literal/essential.hh b/milena/tests/value/literals_op.cc similarity index 78% copy from milena/mln/literal/essential.hh copy to milena/tests/value/literals_op.cc index 32d8869..6e2605e 100644 --- a/milena/mln/literal/essential.hh +++ b/milena/tests/value/literals_op.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -23,14 +23,17 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_LITERAL_ESSENTIAL_HH -# define MLN_LITERAL_ESSENTIAL_HH - -/*! \file - * - * \brief File that includes essential literals. - */ +// Exercise operators between Milena values (such as mln::value::gl8) +// and literals (such as mln::literal::white). +# include <mln/value/gl8.hh> # include <mln/literal/all.hh> -#endif // ! MLN_LITERAL_ESSENTIAL_HH +int main() +{ + using mln::value::gl8; + using mln::literal::white; + + gl8 g = 255; + mln_assertion(g == white); +} -- 1.7.10.4

1 0

olena: olena-2.0-854-gffdd63f Add a test case to exercise the issue of Trac ticket #125.
by Roland Levillain 20 May '14

20 May '14

* tests/value/literals_op.cc: New test. * tests/value/Makefile.am (check_PROGRAMS): Add literals_op. --- milena/ChangeLog | 7 +++++++ milena/tests/value/Makefile.am | 5 +++-- .../essential.hh => tests/value/literals_op.cc} | 21 +++++++++++--------- 3 files changed, 22 insertions(+), 11 deletions(-) copy milena/{mln/literal/essential.hh => tests/value/literals_op.cc} (78%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0206b0f..8f2766a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2014-05-20 Roland Levillain <roland(a)lrde.epita.fr> + Add a test case to exercise the issue of Trac ticket #125. + + * tests/value/literals_op.cc: New test. + * tests/value/Makefile.am (check_PROGRAMS): Add literals_op. + +2014-05-20 Roland Levillain <roland(a)lrde.epita.fr> + Various changes in mln::border::mirror. * mln/border/mirror.hh: Here. diff --git a/milena/tests/value/Makefile.am b/milena/tests/value/Makefile.am index 21ca6f4..e9f6bd1 100644 --- a/milena/tests/value/Makefile.am +++ b/milena/tests/value/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 EPITA Research and -# Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 EPITA +# Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -31,6 +31,7 @@ check_PROGRAMS = \ int_u8 \ interop \ label \ + literals_op \ proxy \ rgb8 \ set \ diff --git a/milena/mln/literal/essential.hh b/milena/tests/value/literals_op.cc similarity index 78% copy from milena/mln/literal/essential.hh copy to milena/tests/value/literals_op.cc index 32d8869..6e2605e 100644 --- a/milena/mln/literal/essential.hh +++ b/milena/tests/value/literals_op.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -23,14 +23,17 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_LITERAL_ESSENTIAL_HH -# define MLN_LITERAL_ESSENTIAL_HH - -/*! \file - * - * \brief File that includes essential literals. - */ +// Exercise operators between Milena values (such as mln::value::gl8) +// and literals (such as mln::literal::white). +# include <mln/value/gl8.hh> # include <mln/literal/all.hh> -#endif // ! MLN_LITERAL_ESSENTIAL_HH +int main() +{ + using mln::value::gl8; + using mln::literal::white; + + gl8 g = 255; + mln_assertion(g == white); +} -- 1.7.10.4

1 0

olena: olena-2.0-853-g8f4ee01 Various changes in mln::border::mirror.
by Roland Levillain 20 May '14

20 May '14

* mln/border/mirror.hh: Here. * tests/border/mirror.cc: Revamp test. * tests/border/Makefile.am (check_PROGRAMS): Reenable mirror_full. --- milena/ChangeLog | 8 ++ milena/mln/border/mirror.hh | 225 ++++++++++++++++++--------------------- milena/tests/border/Makefile.am | 5 +- milena/tests/border/mirror.cc | 74 +++++++------ 4 files changed, 157 insertions(+), 155 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a2e295e..0206b0f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2014-05-20 Roland Levillain <roland(a)lrde.epita.fr> + + Various changes in mln::border::mirror. + + * mln/border/mirror.hh: Here. + * tests/border/mirror.cc: Revamp test. + * tests/border/Makefile.am (check_PROGRAMS): Reenable mirror_full. + 2012-10-02 Guillaume Lazzara <z(a)lrde.epita.fr> Fix a precondition (Trac ticket #256). diff --git a/milena/mln/border/mirror.hh b/milena/mln/border/mirror.hh index 89a132d..6fcb788 100644 --- a/milena/mln/border/mirror.hh +++ b/milena/mln/border/mirror.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2011, 2012, 2013 EPITA Research and -// Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011, 2012, 2013, 2014 EPITA +// Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -28,28 +28,23 @@ # define MLN_BORDER_MIRROR_HH /// \file +/// \brief Fill an image's border using a mirror tranformation. /// -/// Define function that fills border using nearer pixels with a -/// mirroring effect. -/// -/// \todo 2D version is not correct if the border is larger than the -/// image domain. -/// -/// \todo Awful code: rewrite it! +/// \todo The 2D version is not correct when the border is larger than +/// the image's domain. # include <mln/core/image/image1d.hh> # include <mln/core/image/image2d.hh> # include <mln/core/image/image3d.hh> -# include <mln/core/concept/image.hh> -# include <mln/core/internal/fixme.hh> -# include <mln/core/internal/fixme.hh> # include <mln/geom/min_row.hh> # include <mln/geom/max_row.hh> # include <mln/geom/min_col.hh> # include <mln/geom/max_col.hh> # include <mln/geom/ninds.hh> +# include <mln/math/min.hh> + # include <mln/opt/element.hh> @@ -60,13 +55,18 @@ namespace mln { /*! \brief Mirror the virtual (outer) border of image \p ima with - * the (inner) level contents of this image. + * the (inner) contents of this image. * * \param[in,out] ima The image whose border is to be mirrored. + * Note that \a ima is modified, even though it + * is passed as a const reference, + * as---following to the usual Milena + * semantics---only values in the border (not + * the actual image's contents) are altered by + * this routine. * - * \pre \p ima has to be initialized. - * - * \todo Implement 3d version + optimize with memset if possible. + * \todo Implement a 3D version. + * \todo Optimize using memset if possible. * * \ingroup mlnborderext */ @@ -79,131 +79,122 @@ namespace mln namespace impl { + // Implementation for images based on an mln::box1d. + template <typename I> inline - void mirror_(const box1d&, const I& ima_) + void mirror_(const box1d&, I& ima) { mln_trace("border::impl::mirror_"); - I& ima = const_cast<I&>(ima_); - - def::coord - border = static_cast<def::coord>(ima.border()), - nbinds = static_cast<def::coord>(geom::ninds(ima)), - min; - - if (border > nbinds) - min = nbinds; - else - min = border; - - /// left border - { - def::coord i = 0; - for (; i < min; ++i) - opt::element(ima, border - 1 - i) = ima(point1d(i)); - - for (; i < border; ++i) - opt::element(ima, border - 1 - i) = ima(point1d(static_cast<def::coord>(min - 1))); - } - - /// right border - { - def::coord - i = 0, - j = static_cast<def::coord>(nbinds - 1); - for (; - i < min; - ++i, --j) - opt::element(ima, border + nbinds + i) = ima(point1d(j)); - ++j; - for (; - i < border; - ++i) - opt::element(ima, border + nbinds + i) = ima(point1d(j)); - } + + def::coord border = ima.border(); + def::coord ninds = geom::ninds(ima); + def::coord min = math::min(border, ninds); + + // Left-hand border. + for (def::coord i = 0; i < min; ++i) + opt::element(ima, border - 1 - i) = ima(point1d(i)); + for (def::coord i = min; i < border; ++i) + opt::element(ima, border - 1 - i) = ima(point1d(min - 1)); + + // Right-hand border. + def::coord j = ninds - 1; + for (def::coord i = 0; i < min; ++i, --j) + opt::element(ima, border + ninds + i) = ima(point1d(j)); + ++j; + for (def::coord i = min; i < border; ++i) + opt::element(ima, border + ninds + i) = ima(point1d(j)); } + + // Implementation for images based on an mln::box2d. + template <typename I> inline - void mirror_(const box2d&, const I& ima_) + void mirror_(const box2d&, I& ima) { mln_trace("border::impl::mirror_"); - I& ima = const_cast<I&>(ima_); - - unsigned border = ima.border (); - unsigned nbrows = geom::max_row(ima) - geom::min_row(ima); - unsigned nbcols = geom::max_col(ima) - geom::min_col(ima); - unsigned real_nbcols = (nbcols + 1) + 2 * border; - unsigned start = real_nbcols * border + border; - unsigned s = start; - - // mirror top left corner - for (unsigned i = 0; i < border; ++i) - for (unsigned j = 0; j < border; ++j) - opt::element(ima, i * ((nbcols + 1) + 2 * border) + j) = + + /* FIXME: This implementation is buggy, as it does not address + the case of a border larger than the width or the height of + the image. */ + + def::coord border = ima.border (); + def::coord nrows = geom::max_row(ima) - geom::min_row(ima); + def::coord ncols = geom::max_col(ima) - geom::min_col(ima); + def::coord real_ncols = (ncols + 1) + 2 * border; + def::coord start = real_ncols * border + border; + def::coord s = start; + + // Top left-hand corner. + for (def::coord i = 0; i < border; ++i) + for (def::coord j = 0; j < border; ++j) + opt::element(ima, i * real_ncols + j) = opt::element(ima, s); - // mirror top left corner - s = start + nbcols; - for (unsigned i = 0; i < border; ++i) - for (unsigned j = 1; j <= border; ++j) - opt::element(ima, i * ((nbcols + 1) + 2 * border) + (nbcols + border + j)) = opt::element(ima, s); - - // mirror bottom left corner - s = start + (nbrows * real_nbcols); - for (unsigned i = 1; i <= border; ++i) - for (unsigned j = 1; j <= border; ++j) - opt::element(ima, s - i + (j * (real_nbcols))) = + // Top right-hand corner. + s = start + ncols; + for (def::coord i = 0; i < border; ++i) + for (def::coord j = 1; j <= border; ++j) + opt::element(ima, i * real_ncols + (ncols + border + j)) = opt::element(ima, s); - // mirror bottom right corner - s = start + (nbrows * real_nbcols) + nbcols; - for (unsigned i = 1; i <= border; ++i) - for (unsigned j = 1; j <= border; ++j) - opt::element(ima, s + i + (j * real_nbcols)) = + // Bottom left-hand corner. + s = start + (nrows * real_ncols); + for (def::coord i = 1; i <= border; ++i) + for (def::coord j = 1; j <= border; ++j) + opt::element(ima, s - i + (j * real_ncols)) = opt::element(ima, s); - // mirror top border - s = start; - for (unsigned i = 0; i <= nbcols; ++i) - for (unsigned j = 1; j <= border; ++j) - opt::element(ima, s + i - (j * real_nbcols)) = - opt::element(ima, s + i + ((j - 1)* real_nbcols)); + // Bottom right-hand corner. + s = start + (nrows * real_ncols) + ncols; + for (def::coord i = 1; i <= border; ++i) + for (def::coord j = 1; j <= border; ++j) + opt::element(ima, s + i + (j * real_ncols)) = + opt::element(ima, s); - // mirror left border + // Top border. s = start; - for (unsigned i = 0; i <= nbrows; ++i) - for (unsigned j = 1; j <= border; ++j) - opt::element(ima, s + (i * real_nbcols) - j) = - opt::element(ima, s + (i * real_nbcols) + (j - 1)); + for (def::coord i = 0; i <= ncols; ++i) + for (def::coord j = 1; j <= border; ++j) + opt::element(ima, s + i - (j * real_ncols)) = + opt::element(ima, s + i + ((j - 1) * real_ncols)); - // mirror right border + // Left-hand border. s = start; - for (unsigned i = 0; i <= nbrows; ++i) - for (unsigned j = 1; j <= border; ++j) - opt::element(ima, s + (i * real_nbcols + nbcols) + j) = - opt::element(ima, s + (i * real_nbcols + nbcols) - (j - 1)); - - // mirror bottom border - s = start + (nbrows * real_nbcols); - for (unsigned i = 0; i <= nbcols; ++i) - for (unsigned j = 1; j <= border; ++j) - opt::element(ima, s + i + (j * real_nbcols)) = - opt::element(ima, s + i - ((j - 1)* real_nbcols)); + for (def::coord i = 0; i <= nrows; ++i) + for (def::coord j = 1; j <= border; ++j) + opt::element(ima, s + (i * real_ncols) - j) = + opt::element(ima, s + (i * real_ncols) + (j - 1)); + // Right-hand border. + s = start; + for (def::coord i = 0; i <= nrows; ++i) + for (def::coord j = 1; j <= border; ++j) + opt::element(ima, s + (i * real_ncols + ncols) + j) = + opt::element(ima, s + (i * real_ncols + ncols) - (j - 1)); + + // Bottom border. + s = start + (nrows * real_ncols); + for (def::coord i = 0; i <= ncols; ++i) + for (def::coord j = 1; j <= border; ++j) + opt::element(ima, s + i + (j * real_ncols)) = + opt::element(ima, s + i - ((j - 1) * real_ncols)); } + + // Implementation for images based on an mln::box3d. + template <typename I> inline - void mirror_(const box3d&, const I& ima) + void mirror_(const box3d&, I& /* ima */) { mln_trace_warning("border::mirror for 3D image is not implemented," " so image borders have not been mirrored!"); - (void) ima; - // FIXME write it! + // FIXME: write it! + abort(); } - } // end of namespace mln::border::impl @@ -212,19 +203,13 @@ namespace mln void mirror(const Image& ima_) { mln_trace("border::mirror"); - - const I& ima = exact(ima_); - - mln_precondition(ima.is_valid()); mlc_is(mln_trait_image_speed(I), trait::image::speed::fastest)::check(); - typedef mln_psite(I) P; - - if (!ima.border ()) + I& ima = const_cast<I&>(exact(ima_)); + mln_precondition(ima.is_valid()); + if (!ima.border()) return; - impl::mirror_(ima.bbox(), ima); - } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/tests/border/Makefile.am b/milena/tests/border/Makefile.am index 64c8197..a268a5b 100644 --- a/milena/tests/border/Makefile.am +++ b/milena/tests/border/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2014 EPITA Research and +# Development Laboratory (LRDE). # # This file is part of Olena. # @@ -26,6 +26,7 @@ check_PROGRAMS = \ find \ get \ mirror \ + mirror_full \ resize_equal \ resize_image1d_1 \ resize_image1d_2 \ diff --git a/milena/tests/border/mirror.cc b/milena/tests/border/mirror.cc index 09435e5..58a038e 100644 --- a/milena/tests/border/mirror.cc +++ b/milena/tests/border/mirror.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -24,7 +24,7 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -/// \file +// Exercise mln::border::mirror. #include <mln/core/image/image1d.hh> #include <mln/core/image/image2d.hh> @@ -35,46 +35,54 @@ #include <mln/data/paste_without_localization.hh> #include <mln/data/compare.hh> -using namespace mln; - int -main (void) +main() { - { - image1d<int> ima(2, 3); - debug::iota(ima); - border::mirror(ima); - mln_assertion(opt::element(ima, 0) == 2); - mln_assertion(opt::element(ima, 1) == 2); - mln_assertion(opt::element(ima, 2) == 1); - mln_assertion(opt::element(ima, 3) == 1); - mln_assertion(opt::element(ima, 4) == 2); - mln_assertion(opt::element(ima, 5) == 2); - mln_assertion(opt::element(ima, 6) == 1); - mln_assertion(opt::element(ima, 7) == 1); - } - + using namespace mln; - // Image2d + // image1d. { - unsigned ref_data[6][7] = { - { 1, 1, 4, 5, 6, 3, 3 }, - { 1, 1, 1, 2, 3, 3, 3 }, - { 2, 1, 1, 2, 3, 3, 2 }, - { 5, 4, 4, 5, 6, 6, 5 }, - { 4, 4, 4, 5, 6, 6, 6 }, - { 4, 4, 1, 2, 3, 6, 6 } - }; + // A 2-pixel 1D image with a 3-pixel border. + image1d<unsigned> input(2, 3); + debug::iota(input); + border::mirror(input); + // Data are framed; other values form the border. + unsigned ref_data[8] = + // ,-------------. + { 2, 2, 1, /* | */ 1, 2, /* | */ 2, 1, 1 }; + // `-------------' + image1d<unsigned> ref = make::image(ref_data); - image2d<unsigned> ref = make::image(ref_data); + image1d<unsigned> output(8, 0); + data::paste_without_localization(extended_to(input, input.vbbox()), + output); + mln_assertion(output == ref); + } + + // image2d. + { + // A 2x3-pixel 2D image with a 2-pixel border. image2d<unsigned> input(2, 3, 2); - image2d<unsigned> res(6, 7, 0); debug::iota(input, 0); border::mirror(input); - data::paste_without_localization(extended_to(input, input.vbbox()), res); + // Data are framed; other values form the border. + unsigned ref_data[6][7] = { + { 1, 1, 4, 5, 6, 3, 3 }, + { 1, 1, 1, 2, 3, 3, 3 }, + // ,----------------. + { 2, 1, /* | */ 1, 2, 3, /* | */ 3, 2 }, + { 5, 4, /* | */ 4, 5, 6, /* | */ 6, 5 }, + // `----------------' + { 4, 4, 4, 5, 6, 6, 6 }, + { 4, 4, 1, 2, 3, 6, 6 } + }; + image2d<unsigned> ref = make::image(ref_data); - mln_assertion(res == ref); + image2d<unsigned> output(6, 7, 0); + data::paste_without_localization(extended_to(input, input.vbbox()), + output); + mln_assertion(output == ref); } } -- 1.7.10.4

1 0

olena: olena-2.0-853-g888cdfe Various changes in mln::border::mirror.
by Roland Levillain 20 May '14

20 May '14

* mln/border/mirror.hh: Here. * tests/border/mirror.cc: Revamp test. * tests/border/Makefile.am (check_PROGRAMS): Reenable mirror_full. --- milena/ChangeLog | 8 ++ milena/mln/border/mirror.hh | 223 ++++++++++++++++++--------------------- milena/tests/border/Makefile.am | 5 +- milena/tests/border/mirror.cc | 74 +++++++------ 4 files changed, 153 insertions(+), 157 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a2e295e..0206b0f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2014-05-20 Roland Levillain <roland(a)lrde.epita.fr> + + Various changes in mln::border::mirror. + + * mln/border/mirror.hh: Here. + * tests/border/mirror.cc: Revamp test. + * tests/border/Makefile.am (check_PROGRAMS): Reenable mirror_full. + 2012-10-02 Guillaume Lazzara <z(a)lrde.epita.fr> Fix a precondition (Trac ticket #256). diff --git a/milena/mln/border/mirror.hh b/milena/mln/border/mirror.hh index 89a132d..405caab 100644 --- a/milena/mln/border/mirror.hh +++ b/milena/mln/border/mirror.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2011, 2012, 2013 EPITA Research and -// Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011, 2012, 2013, 2014 EPITA +// Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -28,28 +28,23 @@ # define MLN_BORDER_MIRROR_HH /// \file +/// \brief Fill an image's border using a mirror tranformation. /// -/// Define function that fills border using nearer pixels with a -/// mirroring effect. -/// -/// \todo 2D version is not correct if the border is larger than the -/// image domain. -/// -/// \todo Awful code: rewrite it! +/// \todo The 2D version is not correct when the border is larger than +/// the image's domain. # include <mln/core/image/image1d.hh> # include <mln/core/image/image2d.hh> # include <mln/core/image/image3d.hh> -# include <mln/core/concept/image.hh> -# include <mln/core/internal/fixme.hh> -# include <mln/core/internal/fixme.hh> # include <mln/geom/min_row.hh> # include <mln/geom/max_row.hh> # include <mln/geom/min_col.hh> # include <mln/geom/max_col.hh> # include <mln/geom/ninds.hh> +# include <mln/math/min.hh> + # include <mln/opt/element.hh> @@ -60,18 +55,17 @@ namespace mln { /*! \brief Mirror the virtual (outer) border of image \p ima with - * the (inner) level contents of this image. + * the (inner) contents of this image. * * \param[in,out] ima The image whose border is to be mirrored. * - * \pre \p ima has to be initialized. - * - * \todo Implement 3d version + optimize with memset if possible. + * \todo Implement a 3D version. + * \todo Optimize using memset if possible. * * \ingroup mlnborderext */ template <typename I> - void mirror(const Image& ima); + void mirror(Image& ima); # ifndef MLN_INCLUDE_ONLY @@ -79,152 +73,137 @@ namespace mln namespace impl { + // Implementation for images based on an mln::box1d. + template <typename I> inline - void mirror_(const box1d&, const I& ima_) + void mirror_(const box1d&, I& ima) { mln_trace("border::impl::mirror_"); - I& ima = const_cast<I&>(ima_); - - def::coord - border = static_cast<def::coord>(ima.border()), - nbinds = static_cast<def::coord>(geom::ninds(ima)), - min; - - if (border > nbinds) - min = nbinds; - else - min = border; - - /// left border - { - def::coord i = 0; - for (; i < min; ++i) - opt::element(ima, border - 1 - i) = ima(point1d(i)); - - for (; i < border; ++i) - opt::element(ima, border - 1 - i) = ima(point1d(static_cast<def::coord>(min - 1))); - } - - /// right border - { - def::coord - i = 0, - j = static_cast<def::coord>(nbinds - 1); - for (; - i < min; - ++i, --j) - opt::element(ima, border + nbinds + i) = ima(point1d(j)); - ++j; - for (; - i < border; - ++i) - opt::element(ima, border + nbinds + i) = ima(point1d(j)); - } + + def::coord border = ima.border(); + def::coord ninds = geom::ninds(ima); + def::coord min = math::min(border, ninds); + + // Left-hand border. + for (def::coord i = 0; i < min; ++i) + opt::element(ima, border - 1 - i) = ima(point1d(i)); + for (def::coord i = min; i < border; ++i) + opt::element(ima, border - 1 - i) = ima(point1d(min - 1)); + + // Right-hand border. + def::coord j = ninds - 1; + for (def::coord i = 0; i < min; ++i, --j) + opt::element(ima, border + ninds + i) = ima(point1d(j)); + ++j; + for (def::coord i = min; i < border; ++i) + opt::element(ima, border + ninds + i) = ima(point1d(j)); } + + // Implementation for images based on an mln::box2d. + template <typename I> inline - void mirror_(const box2d&, const I& ima_) + void mirror_(const box2d&, I& ima) { mln_trace("border::impl::mirror_"); - I& ima = const_cast<I&>(ima_); - - unsigned border = ima.border (); - unsigned nbrows = geom::max_row(ima) - geom::min_row(ima); - unsigned nbcols = geom::max_col(ima) - geom::min_col(ima); - unsigned real_nbcols = (nbcols + 1) + 2 * border; - unsigned start = real_nbcols * border + border; - unsigned s = start; - - // mirror top left corner - for (unsigned i = 0; i < border; ++i) - for (unsigned j = 0; j < border; ++j) - opt::element(ima, i * ((nbcols + 1) + 2 * border) + j) = + + /* FIXME: This implementation is buggy, as it does not address + the case of a border larger than the width or the height of + the image. */ + + def::coord border = ima.border (); + def::coord nrows = geom::max_row(ima) - geom::min_row(ima); + def::coord ncols = geom::max_col(ima) - geom::min_col(ima); + def::coord real_ncols = (ncols + 1) + 2 * border; + def::coord start = real_ncols * border + border; + def::coord s = start; + + // Top left-hand corner. + for (def::coord i = 0; i < border; ++i) + for (def::coord j = 0; j < border; ++j) + opt::element(ima, i * real_ncols + j) = opt::element(ima, s); - // mirror top left corner - s = start + nbcols; - for (unsigned i = 0; i < border; ++i) - for (unsigned j = 1; j <= border; ++j) - opt::element(ima, i * ((nbcols + 1) + 2 * border) + (nbcols + border + j)) = opt::element(ima, s); - - // mirror bottom left corner - s = start + (nbrows * real_nbcols); - for (unsigned i = 1; i <= border; ++i) - for (unsigned j = 1; j <= border; ++j) - opt::element(ima, s - i + (j * (real_nbcols))) = + // Top right-hand corner. + s = start + ncols; + for (def::coord i = 0; i < border; ++i) + for (def::coord j = 1; j <= border; ++j) + opt::element(ima, i * real_ncols + (ncols + border + j)) = opt::element(ima, s); - // mirror bottom right corner - s = start + (nbrows * real_nbcols) + nbcols; - for (unsigned i = 1; i <= border; ++i) - for (unsigned j = 1; j <= border; ++j) - opt::element(ima, s + i + (j * real_nbcols)) = + // Bottom left-hand corner. + s = start + (nrows * real_ncols); + for (def::coord i = 1; i <= border; ++i) + for (def::coord j = 1; j <= border; ++j) + opt::element(ima, s - i + (j * real_ncols)) = opt::element(ima, s); - // mirror top border - s = start; - for (unsigned i = 0; i <= nbcols; ++i) - for (unsigned j = 1; j <= border; ++j) - opt::element(ima, s + i - (j * real_nbcols)) = - opt::element(ima, s + i + ((j - 1)* real_nbcols)); + // Bottom right-hand corner. + s = start + (nrows * real_ncols) + ncols; + for (def::coord i = 1; i <= border; ++i) + for (def::coord j = 1; j <= border; ++j) + opt::element(ima, s + i + (j * real_ncols)) = + opt::element(ima, s); - // mirror left border + // Top border. s = start; - for (unsigned i = 0; i <= nbrows; ++i) - for (unsigned j = 1; j <= border; ++j) - opt::element(ima, s + (i * real_nbcols) - j) = - opt::element(ima, s + (i * real_nbcols) + (j - 1)); + for (def::coord i = 0; i <= ncols; ++i) + for (def::coord j = 1; j <= border; ++j) + opt::element(ima, s + i - (j * real_ncols)) = + opt::element(ima, s + i + ((j - 1) * real_ncols)); - // mirror right border + // Left-hand border. s = start; - for (unsigned i = 0; i <= nbrows; ++i) - for (unsigned j = 1; j <= border; ++j) - opt::element(ima, s + (i * real_nbcols + nbcols) + j) = - opt::element(ima, s + (i * real_nbcols + nbcols) - (j - 1)); - - // mirror bottom border - s = start + (nbrows * real_nbcols); - for (unsigned i = 0; i <= nbcols; ++i) - for (unsigned j = 1; j <= border; ++j) - opt::element(ima, s + i + (j * real_nbcols)) = - opt::element(ima, s + i - ((j - 1)* real_nbcols)); + for (def::coord i = 0; i <= nrows; ++i) + for (def::coord j = 1; j <= border; ++j) + opt::element(ima, s + (i * real_ncols) - j) = + opt::element(ima, s + (i * real_ncols) + (j - 1)); + // Right-hand border. + s = start; + for (def::coord i = 0; i <= nrows; ++i) + for (def::coord j = 1; j <= border; ++j) + opt::element(ima, s + (i * real_ncols + ncols) + j) = + opt::element(ima, s + (i * real_ncols + ncols) - (j - 1)); + + // Bottom border. + s = start + (nrows * real_ncols); + for (def::coord i = 0; i <= ncols; ++i) + for (def::coord j = 1; j <= border; ++j) + opt::element(ima, s + i + (j * real_ncols)) = + opt::element(ima, s + i - ((j - 1) * real_ncols)); } + + // Implementation for images based on an mln::box3d. + template <typename I> inline - void mirror_(const box3d&, const I& ima) + void mirror_(const box3d&, I& /* ima */) { mln_trace_warning("border::mirror for 3D image is not implemented," " so image borders have not been mirrored!"); - (void) ima; - // FIXME write it! + // FIXME: write it! + abort(); } - } // end of namespace mln::border::impl template <typename I> inline - void mirror(const Image& ima_) + void mirror(Image& ima_) { mln_trace("border::mirror"); - - const I& ima = exact(ima_); - - mln_precondition(ima.is_valid()); mlc_is(mln_trait_image_speed(I), trait::image::speed::fastest)::check(); - typedef mln_psite(I) P; - - if (!ima.border ()) + I& ima = exact(ima_); + mln_precondition(ima.is_valid()); + if (!ima.border()) return; - impl::mirror_(ima.bbox(), ima); - } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/tests/border/Makefile.am b/milena/tests/border/Makefile.am index 64c8197..a268a5b 100644 --- a/milena/tests/border/Makefile.am +++ b/milena/tests/border/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2014 EPITA Research and +# Development Laboratory (LRDE). # # This file is part of Olena. # @@ -26,6 +26,7 @@ check_PROGRAMS = \ find \ get \ mirror \ + mirror_full \ resize_equal \ resize_image1d_1 \ resize_image1d_2 \ diff --git a/milena/tests/border/mirror.cc b/milena/tests/border/mirror.cc index 09435e5..58a038e 100644 --- a/milena/tests/border/mirror.cc +++ b/milena/tests/border/mirror.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -24,7 +24,7 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -/// \file +// Exercise mln::border::mirror. #include <mln/core/image/image1d.hh> #include <mln/core/image/image2d.hh> @@ -35,46 +35,54 @@ #include <mln/data/paste_without_localization.hh> #include <mln/data/compare.hh> -using namespace mln; - int -main (void) +main() { - { - image1d<int> ima(2, 3); - debug::iota(ima); - border::mirror(ima); - mln_assertion(opt::element(ima, 0) == 2); - mln_assertion(opt::element(ima, 1) == 2); - mln_assertion(opt::element(ima, 2) == 1); - mln_assertion(opt::element(ima, 3) == 1); - mln_assertion(opt::element(ima, 4) == 2); - mln_assertion(opt::element(ima, 5) == 2); - mln_assertion(opt::element(ima, 6) == 1); - mln_assertion(opt::element(ima, 7) == 1); - } - + using namespace mln; - // Image2d + // image1d. { - unsigned ref_data[6][7] = { - { 1, 1, 4, 5, 6, 3, 3 }, - { 1, 1, 1, 2, 3, 3, 3 }, - { 2, 1, 1, 2, 3, 3, 2 }, - { 5, 4, 4, 5, 6, 6, 5 }, - { 4, 4, 4, 5, 6, 6, 6 }, - { 4, 4, 1, 2, 3, 6, 6 } - }; + // A 2-pixel 1D image with a 3-pixel border. + image1d<unsigned> input(2, 3); + debug::iota(input); + border::mirror(input); + // Data are framed; other values form the border. + unsigned ref_data[8] = + // ,-------------. + { 2, 2, 1, /* | */ 1, 2, /* | */ 2, 1, 1 }; + // `-------------' + image1d<unsigned> ref = make::image(ref_data); - image2d<unsigned> ref = make::image(ref_data); + image1d<unsigned> output(8, 0); + data::paste_without_localization(extended_to(input, input.vbbox()), + output); + mln_assertion(output == ref); + } + + // image2d. + { + // A 2x3-pixel 2D image with a 2-pixel border. image2d<unsigned> input(2, 3, 2); - image2d<unsigned> res(6, 7, 0); debug::iota(input, 0); border::mirror(input); - data::paste_without_localization(extended_to(input, input.vbbox()), res); + // Data are framed; other values form the border. + unsigned ref_data[6][7] = { + { 1, 1, 4, 5, 6, 3, 3 }, + { 1, 1, 1, 2, 3, 3, 3 }, + // ,----------------. + { 2, 1, /* | */ 1, 2, 3, /* | */ 3, 2 }, + { 5, 4, /* | */ 4, 5, 6, /* | */ 6, 5 }, + // `----------------' + { 4, 4, 4, 5, 6, 6, 6 }, + { 4, 4, 1, 2, 3, 6, 6 } + }; + image2d<unsigned> ref = make::image(ref_data); - mln_assertion(res == ref); + image2d<unsigned> output(6, 7, 0); + data::paste_without_localization(extended_to(input, input.vbbox()), + output); + mln_assertion(output == ref); } } -- 1.7.10.4

1 0

olena: olena-2.0-852-gf107239 Fix a precondition (Trac ticket #256).
by Roland Levillain 20 May '14

20 May '14

* mln/core/internal/site_relative_iterator_base.hh: Here. Signed-off-by: Roland Levillain <roland(a)lrde.epita.fr> --- milena/ChangeLog | 6 ++++++ milena/mln/core/internal/site_relative_iterator_base.hh | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7897b5e..a2e295e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2012-10-02 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix a precondition (Trac ticket #256). + + * mln/core/internal/site_relative_iterator_base.hh: Here. + 2014-04-02 Roland Levillain <roland(a)lrde.epita.fr> Milena: Streamline mln/test/positive.cc. diff --git a/milena/mln/core/internal/site_relative_iterator_base.hh b/milena/mln/core/internal/site_relative_iterator_base.hh index 87b69b1..caa99e8 100644 --- a/milena/mln/core/internal/site_relative_iterator_base.hh +++ b/milena/mln/core/internal/site_relative_iterator_base.hh @@ -195,7 +195,8 @@ namespace mln const mln_psite(S)& site_relative_iterator_base<S,E,C>::subj_() { - mln_assertion(exact(this)->compute_p_() == p_); + // valid => exact(this)->compute_p_() == p_ + mln_assertion(!this->is_valid() || exact(this)->compute_p_() == p_); return p_; } -- 1.7.10.4

1 0

olena: branch next updated: olena-2.0-852-g8758e60
by git＠lrde.epita.fr 19 May '14

19 May '14

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 8758e60615436bdf40fc662343cad3ac24e74d9a (commit) from be96bce6673467409255e03efc46fe870dc440ec (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 ----------------------------------------------------------------- 8758e60 Fix a precondition (Trac ticket #256). ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 5 +++++ milena/mln/core/internal/site_relative_iterator_base.hh | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0