Commit 5e4d3053 authored by Roland Levillain's avatar Roland Levillain
Browse files

Add a Swilena wrapper for mln::image2d<mln::value::rgb8>.

	* image2d_rgb8.i: New file.
	* Makefile.am (wrappers): Add image2d_rgb8.i.
	* python/swilena.py: Import the contents of module image2d_rgb8.
	* python/Makefile.am (pyexec_LTLIBRARIES): Add _image2d_rgb8.la.
	(nodist__image2d_rgb8_la_SOURCES, _image2d_rgb8_la_LIBADD): New.
	(CLEANFILES): Add $(nodist__image2d_rgb8_la_SOURCES)
	image2d_rgb8.py image2d_rgb8.py[co].
	(nodist_python_PYTHON): Add image2d_rgb8.py.
	(image2d_rgb8-wrap.cc): Add dependencies.
parent 272ccdac
2010-02-08 Roland Levillain <roland@lrde.epita.fr>
Add a Swilena wrapper for mln::image2d<mln::value::rgb8>.
* image2d_rgb8.i: New file.
* Makefile.am (wrappers): Add image2d_rgb8.i.
* python/swilena.py: Import the contents of module image2d_rgb8.
* python/Makefile.am (pyexec_LTLIBRARIES): Add _image2d_rgb8.la.
(nodist__image2d_rgb8_la_SOURCES, _image2d_rgb8_la_LIBADD): New.
(CLEANFILES): Add $(nodist__image2d_rgb8_la_SOURCES)
image2d_rgb8.py image2d_rgb8.py[co].
(nodist_python_PYTHON): Add image2d_rgb8.py.
(image2d_rgb8-wrap.cc): Add dependencies.
2010-02-08 Roland Levillain <roland@lrde.epita.fr>
Add a Swilena meta-wrapper for PPM I/O.
......
......@@ -45,6 +45,7 @@ wrappers = \
dpoint2d.i \
image2d_int.i \
image2d_int_u8.i \
image2d_rgb8.i \
int_u24.i \
int_u8.i \
neighb2d.i \
......
// -*- C++ -*-
// Copyright (C) 2008, 2009, 2010 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
// Olena is free software: you can redistribute it and/or modify it under
// the terms of the GNU General Public License as published by the Free
// Software Foundation, version 2 of the License.
//
// Olena is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Olena. If not, see <http://www.gnu.org/licenses/>.
//
// As a special exception, you may use this file as part of a free
// software project without restriction. Specifically, if other files
// instantiate templates or use macros or inline functions from this
// file, or you compile this file and link it with other files to produce
// an executable, this file does not by itself cause the resulting
// executable to be covered by the GNU General Public License. This
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
/// \file image2d.i
/// \brief A simple wrapping of mln::image2d<mln::value::rgb8> along
/// with some algorithms.
%module image2d_rgb8
%import "rgb8.i"
// FIXME: The import directive does not include the `%{ ... %}' clauses.
%{
#include "mln/value/rgb8.hh"
%}
%include "image2d.ixx"
instantiate_image2d(image2d_rgb8, mln::value::rgb<8>)
%include "ppm.ixx"
%template(load) mln::io::ppm::load< mln::value::rgb<8> >;
%template(save) mln::io::ppm::save< mln::image2d< mln::value::rgb<8> > >;
%include "fill.ixx"
%template(fill) mln::data::fill< mln::image2d< mln::value::rgb<8> > >;
%include "println.ixx"
%template(println) mln::debug::println< mln::image2d< mln::value::rgb<8> > >;
%import "window2d.i"
// FIXME: The import directive does not include the `%{ ... %}' clauses.
%{
#include "mln/core/alias/window2d.hh"
%}
%import "neighb2d.i"
// FIXME: The import directive does not include the `%{ ... %}' clauses.
%{
#include "mln/core/alias/neighb2d.hh"
%}
......@@ -185,6 +185,16 @@ CLEANFILES += $(nodist__image2d_int_u8_la_SOURCES) image2d_int_u8.py image2d_int
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_image2d_int_u8-wrap.Pcc@am__quote@
nodist_python_PYTHON += image2d_int_u8.py
## image2d_rgb8.
pyexec_LTLIBRARIES += _image2d_rgb8.la
nodist__image2d_rgb8_la_SOURCES = image2d_rgb8-wrap.cc
_image2d_rgb8_la_LIBADD = $(AM_LIBADD)
CLEANFILES += $(nodist__image2d_rgb8_la_SOURCES) image2d_rgb8.py image2d_rgb8.py[co]
## Include the dependency files. Copied from Automake's generated
## case for C++.
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_image2d_rgb8-wrap.Pcc@am__quote@
nodist_python_PYTHON += image2d_rgb8.py
## dynamic_image2d.
pyexec_LTLIBRARIES += _dynamic_image2d.la
# Swig also generates a header for this module, since it makes use of
......@@ -241,6 +251,11 @@ image2d_int_u8-wrap.cc: $(top_srcdir)/swilena/fill.ixx
image2d_int_u8-wrap.cc: $(top_srcdir)/swilena/println.ixx
image2d_int_u8-wrap.cc: $(top_srcdir)/swilena/morpho.ixx $(morpho_ixx_deps)
image2d_rgb8-wrap.cc: $(top_srcdir)/swilena/image2d.ixx
image2d_rgb8-wrap.cc: $(top_srcdir)/swilena/ppm.ixx
image2d_rgb8-wrap.cc: $(top_srcdir)/swilena/fill.ixx
image2d_rgb8-wrap.cc: $(top_srcdir)/swilena/println.ixx
## ---------------------------- ##
## Swilena Python Shell (sps). ##
......
......@@ -36,3 +36,4 @@ from rgb8 import *
import image2d_int
import image2d_int_u8
import image2d_rgb8
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment