* int_u24.i: New. * Makefile.am (wrappers): Add int_u24.i. * python/Makefile.am: Generate Python wrapper from int_u24.i. --- swilena/ChangeLog | 8 ++++++++ swilena/Makefile.am | 4 +++- swilena/{int_u32.i => int_u24.i} | 14 +++++++------- swilena/python/Makefile.am | 12 +++++++++++- 4 files changed, 29 insertions(+), 9 deletions(-) copy swilena/{int_u32.i => int_u24.i} (83%) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index c5aed82..6047f18 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,11 @@ +2012-10-05 Roland Levillain <roland@lrde.epita.fr> + + Wrap mln::value::int_u24. + + * int_u24.i: New. + * Makefile.am (wrappers): Add int_u24.i. + * python/Makefile.am: Generate Python wrapper from int_u24.i. + 2009-10-27 Roland Levillain <roland@lrde.epita.fr> Clean up Swilena Makefiles. diff --git a/swilena/Makefile.am b/swilena/Makefile.am index 109fb2e..ee2d642 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2012 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -42,6 +43,7 @@ wrappers = \ dpoint2d.i \ image2d_int.i \ image2d_int_u8.i \ + int_u24.i \ int_u32.i \ int_u8.i \ neighb2d.i \ diff --git a/swilena/int_u32.i b/swilena/int_u24.i similarity index 83% copy from swilena/int_u32.i copy to swilena/int_u24.i index b11662b..fe07b51 100644 --- a/swilena/int_u32.i +++ b/swilena/int_u24.i @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,17 +24,17 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -/// \file int_u32.i -/// \brief A wrapper of mln::value::int_u32. +/// \file int_u24.i +/// \brief A wrapper of mln::value::int_u24. -%module int_u32 +%module int_u24 %include "int_u.ixx" %{ -#include "mln/value/int_u32.hh" +#include "mln/value/int_u24.hh" %} -%include "mln/value/int_u32.hh" +%include "mln/value/int_u24.hh" -%template (int_u32) mln::value::int_u<32>; +%template (int_u24) mln::value::int_u<24>; diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index e522233..6bdc815 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Copyright (C) 2008, 2009, 2010, 2012 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -125,6 +125,16 @@ CLEANFILES += $(nodist__int_u8_la_SOURCES) int_u8.py int_u8.py[co] @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_int_u8-wrap.Pcc@am__quote@ nodist_python_PYTHON += int_u8.py +## int_u24. +pyexec_LTLIBRARIES += _int_u24.la +nodist__int_u24_la_SOURCES = int_u24-wrap.cc +_int_u24_la_LIBADD = $(AM_LIBADD) +CLEANFILES += $(nodist__int_u24_la_SOURCES) int_u24.py int_u24.py[co] +## Include the dependency files. Copied from Automake's generated +## case for C++. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_int_u24-wrap.Pcc@am__quote@ +nodist_python_PYTHON += int_u24.py + ## int_u32. pyexec_LTLIBRARIES += _int_u32.la nodist__int_u32_la_SOURCES = int_u32-wrap.cc -- 1.7.2.5