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
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
* 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< I >;
+ %template(Name ## _concrete_trait) mln::trait::concrete< I >;
%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< I >;
+ %template(Name ## _concrete_trait) mln::trait::concrete< I >;
%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< I >;
+ %template(Name ## _concrete_trait) mln::trait::concrete< I >;
%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< I >;
+ %template(Name ## _concrete_trait) mln::trait::concrete< I >;
%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< I >;
+ %template(Name ## _concrete_trait) mln::trait::concrete< I >;
%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< I >;
+ %template(Name ## _concrete_trait) mln::trait::concrete< I >;
%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< I >;
+ %template(Name ## _concrete_trait) mln::trait::concrete< I >;
%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
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
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
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