- 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