[Olena-patches] olena: olena-2.0-859-g2a3d61a Repair a Swilena test case.

* println.ixx: Include std_string.i to help SWIG wrap mln::debug::println(const std::string&, const Image<I>&). * 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 &lt;roland(a)lrde.epita.fr&gt; + Repair a Swilena test case. + + * println.ixx: Include std_string.i to help SWIG wrap + mln::debug::println(const std::string&, const Image<I>&). + * python/max-tree.py: Reenable a previously disabled println + statement. + +2014-05-23 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + 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