[Olena-patches] last-svn-commit-562-ge75f830 Aesthetic changes in Swilena.

* swilena/box.ixx, * swilena/box2d.i, * swilena/image2d.ixx, * swilena/image2d_point2d.i, * swilena/morpho.ixx: Here. --- swilena/ChangeLog | 11 +++++++++++ swilena/box.ixx | 2 +- swilena/box2d.i | 4 ++-- swilena/image2d.ixx | 5 +++-- swilena/image2d_point2d.i | 2 +- swilena/morpho.ixx | 5 ++++- 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 5712e11..6bf2e1b 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,16 @@ 2012-08-28 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Aesthetic changes in Swilena. + + * swilena/box.ixx, + * swilena/box2d.i, + * swilena/image2d.ixx, + * swilena/image2d_point2d.i, + * swilena/morpho.ixx: + Here. + +2012-08-28 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Add sps-gdb-local, a script to run the Swilena Python Shell in GDB. * python/sps-gdb-local.in: New. diff --git a/swilena/box.ixx b/swilena/box.ixx index 88cdec7..12f6dd4 100644 --- a/swilena/box.ixx +++ b/swilena/box.ixx @@ -41,7 +41,7 @@ /** Instantiate an mln::box<P> type. The variadic argument ``P...'' is used to allow template type - names having commas (e.g. mln::point<grid::square, def::coord) as + names having commas (e.g. mln::point<grid::square, def::coord >) as argument. */ %define instantiate_box(Name, P...) /* Swig tries to wrap everything by default; prevent it from wrapping diff --git a/swilena/box2d.i b/swilena/box2d.i index fcfd766..f13790e 100644 --- a/swilena/box2d.i +++ b/swilena/box2d.i @@ -42,8 +42,8 @@ %extend mln::box< mln::point<mln::grid::square, mln::def::coord> > { // Provide a ctor creating an `mln::box2d' from two `int's. - mln::box< mln::point< mln::grid::square, mln::def::coord> > (int nrows, - int ncols) + mln::box< mln::point<mln::grid::square, mln::def::coord> > (int nrows, + int ncols) { return new mln::box<mln::point2d>(nrows, ncols); } diff --git a/swilena/image2d.ixx b/swilena/image2d.ixx index a08864b..963fcfc 100644 --- a/swilena/image2d.ixx +++ b/swilena/image2d.ixx @@ -84,9 +84,10 @@ // Instantiate base classes of mln::image2d<T> so that Swig knows it // derives from mln::Image. - %template() mln::internal::image_primary< T, mln::box2d, mln::image2d< T > >; - %template() mln::internal::image_base< T, mln::box2d, mln::image2d< T > >; + %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> %template(I) mln::image2d< T >; %enddef // !instantiate_image2d diff --git a/swilena/image2d_point2d.i b/swilena/image2d_point2d.i index 0ef3bd9..851d0e2 100644 --- a/swilena/image2d_point2d.i +++ b/swilena/image2d_point2d.i @@ -36,7 +36,7 @@ #include "mln/core/alias/point2d.hh" %} -%include concat.ixx +%include "concat.ixx" %include "image2d.ixx" instantiate_image2d(image2d_point2d, diff --git a/swilena/morpho.ixx b/swilena/morpho.ixx index bf84d2d..54f51c7 100644 --- a/swilena/morpho.ixx +++ b/swilena/morpho.ixx @@ -48,7 +48,7 @@ %include "mln/morpho/dilation.hh" %include "mln/morpho/erosion.hh" - would require a lot of efforts. Use an explicit prototypes + would require a lot of efforts. Use explicit prototypes instead. */ namespace mln { @@ -65,6 +65,9 @@ namespace mln } +/* FIXME: We should try to factor the multiple instantiations of + `mln::trait::concrete< I >'. */ + %define instantiate_dilation(Name, I, W) // Explicit instantiation of this trait for the return type. %template() mln::trait::concrete< I >; -- 1.7.2.5