* rgb8.i: New file. * Makefile.am (wrappers): Add rgb8.i. * python/swilena.py: Import the contents of module rgb8. * python/Makefile.am (pyexec_LTLIBRARIES): Add _rgb8.la. (nodist__rgb8_la_SOURCES, _rgb8_la_LIBADD): New. (CLEANFILES): Add $(nodist__rgb8_la_SOURCES) rgb8.py rgb8.py[co]. (nodist_python_PYTHON): Add rgb8.py. (rgb8-wrap.cc): Add dependencies. --- swilena/ChangeLog | 13 +++++++++++++ swilena/Makefile.am | 1 + swilena/python/Makefile.am | 11 +++++++++++ swilena/python/swilena.py | 4 +++- swilena/{println.ixx => rgb8.i} | 16 +++++++++++----- 5 files changed, 39 insertions(+), 6 deletions(-) copy swilena/{println.ixx => rgb8.i} (82%)
diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 7d670b3..9b948f7 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,18 @@ 2010-02-08 Roland Levillain roland@lrde.epita.fr
+ Add a Swilena wrapper for mln::value::rgb8. + + * rgb8.i: New file. + * Makefile.am (wrappers): Add rgb8.i. + * python/swilena.py: Import the contents of module rgb8. + * python/Makefile.am (pyexec_LTLIBRARIES): Add _rgb8.la. + (nodist__rgb8_la_SOURCES, _rgb8_la_LIBADD): New. + (CLEANFILES): Add $(nodist__rgb8_la_SOURCES) rgb8.py rgb8.py[co]. + (nodist_python_PYTHON): Add rgb8.py. + (rgb8-wrap.cc): Add dependencies. + +2010-02-08 Roland Levillain roland@lrde.epita.fr + Add a Swilena meta-wrapper for mln::value::rgb<n>.
* rgb.ixx: New file. diff --git a/swilena/Makefile.am b/swilena/Makefile.am index ea221a3..f6638b6 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -48,6 +48,7 @@ wrappers = \ int_u8.i \ neighb2d.i \ point2d.i \ + rgb8.i \ window2d.i \ \ dynamic_image2d.i diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 8f7faa9..13b17cc 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -144,6 +144,16 @@ CLEANFILES += $(nodist__neighb2d_la_SOURCES) neighb2d.py neighb2d.py[co] @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_neighb2d-wrap.Pcc@am__quote@ nodist_python_PYTHON += neighb2d.py
+## rgb8. +pyexec_LTLIBRARIES += _rgb8.la +nodist__rgb8_la_SOURCES = rgb8-wrap.cc +_rgb8_la_LIBADD = $(AM_LIBADD) +CLEANFILES += $(nodist__rgb8_la_SOURCES) rgb8.py rgb8.py[co] +## Include the dependency files. Copied from Automake's generated +## case for C++. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_rgb8-wrap.Pcc@am__quote@ +nodist_python_PYTHON += rgb8.py + ## window2d. pyexec_LTLIBRARIES += _window2d.la nodist__window2d_la_SOURCES = window2d-wrap.cc @@ -208,6 +218,7 @@ morpho_ixx_deps = \ # Dependencies of wrappers not automatically computed (yet). int_u8-wrap.cc: $(top_srcdir)/swilena/int_u.ixx $(int_u_ixx_deps) int_u32-wrap.cc: $(top_srcdir)/swilena/int_u.ixx $(int_u_ixx_deps) +rgb8-wrap.cc: $(top_srcdir)/swilena/rgb.ixx $(rgb_ixx_deps)
box2d-wrap.cc: $(top_srcdir)/swilena/box.ixx $(box_ixx_deps) box2d_piter-wrap.cc: $(top_srcdir)/swilena/box_piter.ixx diff --git a/swilena/python/swilena.py b/swilena/python/swilena.py index 8cb695a..763bf40 100644 --- a/swilena/python/swilena.py +++ b/swilena/python/swilena.py @@ -1,6 +1,7 @@ #! /usr/bin/env python
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -31,6 +32,7 @@ from window2d import *
from int_u8 import * from int_u32 import * +from rgb8 import *
import image2d_int import image2d_int_u8 diff --git a/swilena/println.ixx b/swilena/rgb8.i similarity index 82% copy from swilena/println.ixx copy to swilena/rgb8.i index 5f56e63..bc6d313 100644 --- a/swilena/println.ixx +++ b/swilena/rgb8.i @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,11 +24,17 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License.
-/// \file println.ixx -/// \brief A wrapper of mln::debug::println. +/// \file rgb8.i +/// \brief A wrapper of mln::value::rgb8. + +%module rgb8 + +%include "rgb.ixx"
%{ - #include "mln/debug/println.hh" +#include "mln/value/rgb8.hh" %}
-%include "mln/debug/println.hh" +%include "mln/value/rgb8.hh" + +%template (rgb8) mln::value::rgb<8>;
-
Roland Levillain