[Olena-patches] last-svn-commit-127-gf779a36 Add a Swilena meta-wrapper for PPM I/O.

* ppm.ixx: New file. * Makefile.am (meta_wrappers): Add ppm.ixx. --- swilena/ChangeLog | 7 +++++++ swilena/Makefile.am | 1 + swilena/{pgm.ixx => ppm.ixx} | 20 ++++++++++---------- 3 files changed, 18 insertions(+), 10 deletions(-) copy swilena/{pgm.ixx => ppm.ixx} (79%) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index ac6fcdf..605c3d5 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,12 @@ 2010-02-08 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Add a Swilena meta-wrapper for PPM I/O. + + * ppm.ixx: New file. + * Makefile.am (meta_wrappers): Add ppm.ixx. + +2010-02-08 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Add a setter in the mln::image2d<T> meta-wrapper. * image2d.ixx (mln::image2d<T>::set): New method (extension). diff --git a/swilena/Makefile.am b/swilena/Makefile.am index f6638b6..7e84230 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -32,6 +32,7 @@ meta_wrappers = \ intp.ixx \ morpho.ixx \ pgm.ixx \ + ppm.ixx \ println.ixx \ python-utils.ixx \ rgb.ixx diff --git a/swilena/pgm.ixx b/swilena/ppm.ixx similarity index 79% copy from swilena/pgm.ixx copy to swilena/ppm.ixx index 166903a..c66a577 100644 --- a/swilena/pgm.ixx +++ b/swilena/ppm.ixx @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,34 +24,34 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -/// \file pgm.ixx -/// \brief A wrapper of mln::io::pgm::load and mln::io::pgm::save +/// \file ppm.ixx +/// \brief A wrapper of mln::io::ppm::load and mln::io::ppm::save -%module pgm +%module ppm %include std_string.i %{ -#include "mln/io/pgm/load.hh" -#include "mln/io/pgm/save.hh" +#include "mln/io/ppm/load.hh" +#include "mln/io/ppm/save.hh" %} -// Wrap mln::io::pgm::load(const std::string&) by hand, to force swig +// Wrap mln::io::ppm::load(const std::string&) by hand, to force swig // to choose this overloading. namespace mln { namespace io { - namespace pgm + namespace ppm { template <typename V> mln::image2d<V> load(const std::string& filename); - } // end of namespace mln::io::pgm + } // end of namespace mln::io::ppm } // end of namespace mln::io } // end of namespace mln -%include "mln/io/pgm/save.hh" +%include "mln/io/ppm/save.hh" -- 1.5.6.5