- Olena-patches

last-svn-commit-122-g796ae83 python/morpho-segm.py: Remove a superfluous semi-colon.
by Roland Levillain 01 Apr '10

01 Apr '10

--- swilena/ChangeLog | 4 ++++ swilena/python/morpho-segm.py | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 3232f15..f6a3e78 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,7 @@ +2009-11-17 Roland Levillain <roland(a)lrde.epita.fr> + + * python/morpho-segm.py: Remove a superfluous semi-colon. + 2009-10-27 Roland Levillain <roland(a)lrde.epita.fr> Clean up Swilena Makefiles. diff --git a/swilena/python/morpho-segm.py b/swilena/python/morpho-segm.py index 021f91a..654aa95 100644 --- a/swilena/python/morpho-segm.py +++ b/swilena/python/morpho-segm.py @@ -33,7 +33,7 @@ image.save(gradient, "gradient.pgm") # Area closing of the gradient. closed_gradient = image.closing_area(ima, c4(), 50) # Watershed transform. -nbasins = int_u8(); +nbasins = int_u8() ws = image.meyer_wst (closed_gradient, c4(), nbasins) print nbasins image.save(ws, "segm.pgm") -- 1.5.6.5

1 0

last-svn-commit-123-gab1256d Improve dependency management in Swilena/Python.
by Roland Levillain 01 Apr '10

01 Apr '10

* python/Makefile.am (int_u_ixx_deps, box_ixx_deps) (morpho_ixx_deps): New variables. (int_u8-wrap.cc, int_u32-wrap.cc, box2d-wrap.cc) (box2d_piter-wrap.cc, point2d-wrap.cc, dynamic_image2d-wrap.cc) (image2d_int-wrap.cc, image2d_int_u8-wrap.cc): Add dependencies. --- swilena/ChangeLog | 12 ++++++++++++ swilena/python/Makefile.am | 43 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index f6a3e78..0860765 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,15 @@ +2010-02-08 Roland Levillain <roland(a)lrde.epita.fr> + + Improve dependency management in Swilena/Python. + + * python/Makefile.am (int_u_ixx_deps, box_ixx_deps) + (morpho_ixx_deps): + New variables. + (int_u8-wrap.cc, int_u32-wrap.cc, box2d-wrap.cc) + (box2d_piter-wrap.cc, point2d-wrap.cc, dynamic_image2d-wrap.cc) + (image2d_int-wrap.cc, image2d_int_u8-wrap.cc): + Add dependencies. + 2009-11-17 Roland Levillain <roland(a)lrde.epita.fr> * python/morpho-segm.py: Remove a superfluous semi-colon. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 0ad96da..f6a834c 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -1,4 +1,5 @@ -# 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. # @@ -188,6 +189,46 @@ CLEANFILES += $(nodist__dynamic_image2d_la_SOURCES) dynamic_image2d.py dynamic_i nodist_python_PYTHON += dynamic_image2d.py +## -------------------- ## +## Extra dependencies. ## +## -------------------- ## + +# FIXME: It would be cool to have them generated automatically. + +# Dependencies pulled by the meta wrapper (.ixx) files. +int_u_ixx_deps = $(top_srcdir)/swilena/python-utils.ixx + +box_ixx_deps = $(top_srcdir)/swilena/coord.ixx + +morpho_ixx_deps = \ + $(top_srcdir)/swilena/concrete.ixx \ + $(top_srcdir)/swilena/ch_value.ixx + +# 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) + +box2d-wrap.cc: $(top_srcdir)/swilena/box.ixx $(box_ixx_deps) +box2d_piter-wrap.cc: $(top_srcdir)/swilena/box_piter.ixx + +point2d-wrap.cc: $(top_srcdir)/swilena/concat.ixx +point2d-wrap.cc: $(top_srcdir)/swilena/python-utils.ixx + +dynamic_image2d-wrap.cc: $(top_srcdir)/swilena/fill.ixx +dynamic_image2d-wrap.cc: $(top_srcdir)/swilena/println.ixx + +image2d_int-wrap.cc: $(top_srcdir)/swilena/image2d.ixx +image2d_int-wrap.cc: $(top_srcdir)/swilena/fill.ixx +image2d_int-wrap.cc: $(top_srcdir)/swilena/println.ixx +image2d_int-wrap.cc: $(top_srcdir)/swilena/morpho.ixx $(morpho_ixx_deps) + +image2d_int_u8-wrap.cc: $(top_srcdir)/swilena/image2d.ixx +image2d_int_u8-wrap.cc: $(top_srcdir)/swilena/pgm.ixx +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) + + ## ---------------------------- ## ## Swilena Python Shell (sps). ## ## ---------------------------- ## -- 1.5.6.5

1 0

last-svn-commit-124-gdce6468 Add a Swilena meta-wrapper for mln::value::rgb<n>.
by Roland Levillain 01 Apr '10

01 Apr '10

* rgb.ixx: New file. * Makefile.am (meta_wrappers): Add rgb.ixx. * python/Makefile.am (rgb_ixx_deps): New variable. --- swilena/ChangeLog | 8 ++ swilena/Makefile.am | 6 +- swilena/python/Makefile.am | 1 + swilena/rgb.ixx | 155 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 168 insertions(+), 2 deletions(-) create mode 100644 swilena/rgb.ixx diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 0860765..7d670b3 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,13 @@ 2010-02-08 Roland Levillain <roland(a)lrde.epita.fr> + Add a Swilena meta-wrapper for mln::value::rgb<n>. + + * rgb.ixx: New file. + * Makefile.am (meta_wrappers): Add rgb.ixx. + * python/Makefile.am (rgb_ixx_deps): New variable. + +2010-02-08 Roland Levillain <roland(a)lrde.epita.fr> + Improve dependency management in Swilena/Python. * python/Makefile.am (int_u_ixx_deps, box_ixx_deps) diff --git a/swilena/Makefile.am b/swilena/Makefile.am index 109fb2e..ea221a3 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, 2010 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -32,7 +33,8 @@ meta_wrappers = \ morpho.ixx \ pgm.ixx \ println.ixx \ - python-utils.ixx + python-utils.ixx \ + rgb.ixx # Wrappers (generating actual modules). wrappers = \ diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index f6a834c..8f7faa9 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -197,6 +197,7 @@ nodist_python_PYTHON += dynamic_image2d.py # Dependencies pulled by the meta wrapper (.ixx) files. int_u_ixx_deps = $(top_srcdir)/swilena/python-utils.ixx +rgb_ixx_deps = $(top_srcdir)/swilena/python-utils.ixx box_ixx_deps = $(top_srcdir)/swilena/coord.ixx diff --git a/swilena/rgb.ixx b/swilena/rgb.ixx new file mode 100644 index 0000000..c5607f3 --- /dev/null +++ b/swilena/rgb.ixx @@ -0,0 +1,155 @@ +// -*- C++ -*- +// Copyright (C) 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 rgb.i +/// \brief A wrapper of mln::value::rgb. + +%module rgb + +%{ +#include "mln/value/rgb.hh" +%} + +// FIXME: Wrap mln::rgb by hand, for Milena macros disturb swig. +// Annotate the original source code instead? +namespace mln +{ + + namespace value + { + + /*! \brief Unsigned integer value class. + * + * The parameter is \c n the number of encoding bits. + */ + template <unsigned n> + struct rgb + : + public Vectorial< rgb<n> > + , + public internal::value_like_< algebra::vec< 3, int_u<n> >, // Equivalent. + algebra::vec< 3, int_u<n> >, // Encoding. + algebra::vec< 3, int >, // Interoperation. + rgb<n> > // Exact. + { + public: + + typedef int_u<n> red_t; + typedef int_u<n> green_t; + typedef int_u<n> blue_t; + + /// Acces to red/green/blue component. + /// \{ + mln::value::int_u<n> red() const; + mln::value::int_u<n>& red(); + + mln::value::int_u<n> green() const; + mln::value::int_u<n>& green(); + + mln::value::int_u<n> blue() const; + mln::value::int_u<n>& blue(); + + mln::value::int_u<n> comp(unsigned k); + mln::value::int_u<n>& comp(unsigned k); + /// \} + + /// Constructor without argument. + rgb<n>(); + + /// Constructor from component values. + rgb<n>(int r, int g, int b); + + /// Constructor from a algebra::vec. + rgb<n>(const mln::algebra::vec<3, int>& rhs); + rgb<n>(const mln::algebra::vec<3, unsigned>& rhs); + rgb<n>(const mln::algebra::vec<3, mln::value::int_u<n> >& rhs); + rgb<n>(const mln::algebra::vec<3, float>& rhs); + + // Conversion to the interoperation type. + operator mln::algebra::vec<3, int>() const; + // Conversion to the sum type. + operator mln::algebra::vec<3, float>() const; + + /// Constructors with literals. + /// \{ + rgb<n>(const mln::literal::white_t&); + rgb<n>(const mln::literal::black_t&); + + rgb<n>(const mln::literal::light_gray_t&); + rgb<n>(const mln::literal::medium_gray_t&); + rgb<n>(const mln::literal::dark_gray_t&); + + rgb<n>(const mln::literal::red_t&); + rgb<n>(const mln::literal::blue_t&); + rgb<n>(const mln::literal::green_t&); + rgb<n>(const mln::literal::brown_t&); + rgb<n>(const mln::literal::lime_t&); + rgb<n>(const mln::literal::orange_t&); + rgb<n>(const mln::literal::pink_t&); + rgb<n>(const mln::literal::purple_t&); + rgb<n>(const mln::literal::teal_t&); + rgb<n>(const mln::literal::violet_t&); + rgb<n>(const mln::literal::cyan_t&); + rgb<n>(const mln::literal::magenta_t&); + rgb<n>(const mln::literal::yellow_t&); + rgb<n>(const mln::literal::olive_t&); + /// \} + + /// Assignment. + rgb<n>& operator=(const rgb<n>& rhs); + + /// Zero value. + static const rgb<n> zero; + }; + + + /*! \brief Print an unsigned integer \p i into the output stream \p ostr. + * + * \param[in,out] ostr An output stream. + * \param[in] i An unsigned integer. + * + * \return The modified output stream \p ostr. + */ + template <unsigned n> + std::ostream& operator<<(std::ostream& ostr, const rgb<n>& i); + + // FIXME: Doc! + template <unsigned n> + std::istream& operator>>(std::istream& istr, rgb<n>& i); + + } // end of namespace mln::value + +} // end of namespace mln + + +/*--------------------------------. +| Conversion helpers for Python. | +`--------------------------------*/ + +#if SWIGPYTHON +%include python-utils.ixx +generate__str__(mln::value::rgb) +#endif // !SWIGPYTHON -- 1.5.6.5

1 0

last-svn-commit-125-g8f7d423 Add a Swilena wrapper for mln::value::rgb8.
by Roland Levillain 01 Apr '10

01 Apr '10

* 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(a)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(a)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>; -- 1.5.6.5

1 0

last-svn-commit-126-g9d56c7e Add a setter in the mln::image2d<T> meta-wrapper.
by Roland Levillain 01 Apr '10

01 Apr '10

* image2d.ixx (mln::image2d<T>::set): New method (extension). --- swilena/ChangeLog | 6 ++++++ swilena/image2d.ixx | 23 +++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 9b948f7..ac6fcdf 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,11 @@ 2010-02-08 Roland Levillain <roland(a)lrde.epita.fr> + Add a setter in the mln::image2d<T> meta-wrapper. + + * image2d.ixx (mln::image2d<T>::set): New method (extension). + +2010-02-08 Roland Levillain <roland(a)lrde.epita.fr> + Add a Swilena wrapper for mln::value::rgb8. * rgb8.i: New file. diff --git a/swilena/image2d.ixx b/swilena/image2d.ixx index 90532bc..702bc74 100644 --- a/swilena/image2d.ixx +++ b/swilena/image2d.ixx @@ -1,5 +1,6 @@ // -*- C++ -*- -// 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. // @@ -63,6 +64,24 @@ // FIXME: Doc. %define instantiate_image2d(I, T) + /* Add a setter, since Python does not seem to allow writings like + + ima(p) = 1 + + and will complain with this message: + + SyntaxError: can't assign to function call + + which is a real pain. How about adding an operator `[]'? Or a + method , like `at'? */ + %extend mln::image2d< T > + { + void set(const point2d& p, const T& v) + { + (*$self)(p) = v; + } + } + // 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 > >; @@ -70,4 +89,4 @@ %template() mln::internal::image_checked_< mln::image2d< T > >; // Instantiate mln::image2d<T> %template(I) mln::image2d< T >; -%enddef +%enddef // !instantiate_image2d -- 1.5.6.5

1 0

last-svn-commit-127-gf779a36 Add a Swilena meta-wrapper for PPM I/O.
by Roland Levillain 01 Apr '10

01 Apr '10

* 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 <roland(a)lrde.epita.fr> + 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 <roland(a)lrde.epita.fr> + 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

1 0

last-svn-commit-128-g1c8af3d Add a Swilena wrapper for mln::image2d<mln::value::rgb8>.
by Roland Levillain 01 Apr '10

01 Apr '10

* 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. --- swilena/ChangeLog | 14 +++++++++++ swilena/Makefile.am | 1 + swilena/{image2d_int.i => image2d_rgb8.i} | 36 +++++++++++++++++++--------- swilena/python/Makefile.am | 15 ++++++++++++ swilena/python/swilena.py | 1 + 5 files changed, 55 insertions(+), 12 deletions(-) copy swilena/{image2d_int.i => image2d_rgb8.i} (62%) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 605c3d5..fb854f5 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,19 @@ 2010-02-08 Roland Levillain <roland(a)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(a)lrde.epita.fr> + Add a Swilena meta-wrapper for PPM I/O. * ppm.ixx: New file. diff --git a/swilena/Makefile.am b/swilena/Makefile.am index 7e84230..f484707 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -45,6 +45,7 @@ wrappers = \ dpoint2d.i \ image2d_int.i \ image2d_int_u8.i \ + image2d_rgb8.i \ int_u32.i \ int_u8.i \ neighb2d.i \ diff --git a/swilena/image2d_int.i b/swilena/image2d_rgb8.i similarity index 62% copy from swilena/image2d_int.i copy to swilena/image2d_rgb8.i index ac82fe6..bda1ff9 100644 --- a/swilena/image2d_int.i +++ b/swilena/image2d_rgb8.i @@ -1,5 +1,6 @@ -// -*- C++ -*- -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// -*- C++ -*- +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -25,20 +26,29 @@ // executable file might be covered by the GNU General Public License. /// \file image2d.i -/// \brief A simple wrapping of mln::image2d<int> along with some -/// algorithms. +/// \brief A simple wrapping of mln::image2d<mln::value::rgb8> along +/// with some algorithms. -%module image2d_int +%module image2d_rgb8 + +%import "rgb8.i" +// FIXME: The import directive does not include the `%{ ... %}' clauses. +%{ +#include "mln/value/rgb8.hh" +%} -%include "intp.ixx" %include "image2d.ixx" -instantiate_image2d(image2d_int, int) +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<int> >; +%template(fill) mln::data::fill< mln::image2d< mln::value::rgb<8> > >; %include "println.ixx" -%template(println) mln::debug::println< mln::image2d<int> >; +%template(println) mln::debug::println< mln::image2d< mln::value::rgb<8> > >; %import "window2d.i" // FIXME: The import directive does not include the `%{ ... %}' clauses. @@ -46,6 +56,8 @@ instantiate_image2d(image2d_int, int) #include "mln/core/alias/window2d.hh" %} -%include "morpho.ixx" -instantiate_erosion(erosion, mln::image2d<int>, mln::window2d) -instantiate_dilation(dilation, mln::image2d<int>, mln::window2d) +%import "neighb2d.i" +// FIXME: The import directive does not include the `%{ ... %}' clauses. +%{ +#include "mln/core/alias/neighb2d.hh" +%} diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 13b17cc..44b9210 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -184,6 +184,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 @@ -240,6 +250,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). ## diff --git a/swilena/python/swilena.py b/swilena/python/swilena.py index 763bf40..14b9838 100644 --- a/swilena/python/swilena.py +++ b/swilena/python/swilena.py @@ -36,3 +36,4 @@ from rgb8 import * import image2d_int import image2d_int_u8 +import image2d_rgb8 -- 1.5.6.5

1 0

branch swilena updated: last-svn-commit-132-g750037f
by git＠lrde.epita.fr 01 Apr '10

01 Apr '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch swilena has been updated discards 4ecf262f4ba4de5707563fe2c8de9d2217546be6 (commit) discards b97f6e3b9ea5b43d93f46c979c90ee605acad21f (commit) discards 2cf95fd79ccbc2ef1c068c0cbf1286dac6e20df2 (commit) discards 43118cb755752fd7663a02cdb6e3b65cbbce4086 (commit) discards 84088370fd0baca5e4f36a3bcdfc47a40aae19ea (commit) discards 1276c8a1a1198e9cdf177f7caec0226f9788e0b9 (commit) discards 59a68eb99f090769e7790382bb4f0b66e9459903 (commit) discards 32444d9de7ff23a924a031e05cb6bda516a12fcc (commit) via 750037f5afd5e3763154629f5bcbad61445c89e6 (commit) via 45f7819a65278f4092f00f7d2795256e55294a64 (commit) via 25eca5a30f5e3d9a9ecbdee14eb528b5fefe0c8e (commit) via 7b138bf9d60291820e50b08e0122e79e460ce567 (commit) via 1c8af3df2e759f1ced3eaa1b93af31448527810b (commit) via f779a3630b9af6de464001c08bcaa1f075358ad7 (commit) via 9d56c7ec85be27c49fd8b55f7ae60bb4ea0f181d (commit) via 8f7d423143d3eeeec8fb91cdd6ca27a38243b27a (commit) via dce6468999855b1b6d2b71082bf70b6af053decb (commit) via ab1256d0e7bf0e819d79ffc39228c5ee9d0ec1d1 (commit) via 796ae83111fff8e0b9dacd82d8f8bdf996eedd9a (commit) via 1ac17a4c8a6da019f324706bdef6ee9b38a5753c (commit) via 66a288802969285cb0bdf97c4737c47db786e02c (commit) via 12dd47935880554c3a3cf24db5cd06de2413ae45 (commit) via e4a1fc8155fbff94835c50f7208de3d9b8c5477a (commit) via 5bb93504bd963799300af770178dee12c8cd487c (commit) via 5d5c643d6beaaf64eda9f0e0634f0ffda72cc886 (commit) via b59137ab61cc11a7d9fa58fd6e87168dda9e9b57 (commit) via 15608e30b32328403b14f4602f87b85c8d56af02 (commit) via cb0b452338b03e470cdec5b68d41b99f75ee9975 (commit) via 4502becc0a7c74d9c36df8b2f607855cb18c77fa (commit) via fe084d58f31ef12a5aac620164c35878ad4f36ce (commit) via 5025e33455e29e74226406c7ceebbcd0cdd17fa5 (commit) via b6b3517c054e387bef3d3a3c371de9b5cdf859fc (commit) via 942c6a807a7881b4115ab63232d39fc42730c6fb (commit) via 422b78ec70dc819e3f9ccb81b7aefed7e413790c (commit) via e8f81c85019744c6c9b993469dfb9da58fc7f13e (commit) via defd509888b0234193712b39f34095952366b72d (commit) via 8116ef19fc52af21a79189f607bce880b600ade5 (commit) via 4faa18c9479d0f5fa0b1780431327141396731ec (commit) via c0a26759095070ff5a69a8c508d7574b6c12b2a5 (commit) via 2199e6c6df1b10ac78e84405273befe20fa6eb96 (commit) via 390b09559fc9faf1131b057fdc12931e33430556 (commit) via c94f5179c33d27d1c3aaf46804e48d5710baeafc (commit) via e5e506be9a2edf6a0d5c184dc2fd0efee09b29c1 (commit) via d637b9962218aa697776ef9bdc509e7e50da0644 (commit) via 084fcc94307783b55e2b77f2d8217ffc68b65702 (commit) via 67c299f41df3d45fd0d6a8e3c777631367626dbe (commit) via 9196858aa3f15eba540420164e21bf929a3f2f53 (commit) via c0e0ae6fee6b9e6e6092647e1a942f1b2e9336c8 (commit) via 642d87acb6320ca145bab0149ee04cef2e3d976b (commit) via 2c4e1e1dd3e2df60cc57a9e0917b5e509fb583ef (commit) via b599cccfd46f95c9337b526e0b172e019aaaa5cb (commit) via 4ee83123b5ef3dd0ba1a0b47ad345aeae3852f22 (commit) via 9b894672a7c13f2f2720d5a425981524e92d707b (commit) via 6c5106c0a059bc80a2abed23021f450335386f1b (commit) via fca542826e4bf7909f343cdcd6a75ed3c7afc478 (commit) via 55f2622b2ccce58bee6d912ee92cb33c873a5392 (commit) via 2152dd039b5e78eaeb179cf19d640aef81ef3330 (commit) via 19eee8ed618cf36f4803e2d3ab823c8e3682fd39 (commit) via ba6a3f88edc827a030919df1ead7b16621008063 (commit) via a4d6bc84bb23a0b58e2e612124876e3dcc1a3f78 (commit) via 8293184f19cedcb42b8a33da195def597db06e6a (commit) via 6b0e5460e1c05d98beb1166a410c5919cc802348 (commit) via 7fe9e76d1693fecdc0f0de4bdcfa62297935561a (commit) via 3fac2c7d82a1bf409d3c012b10f6f98de8f36d97 (commit) via 3e079f7e60ae9d34b471db83a37709ea586166d5 (commit) via 82f86bd0049463e4f53af83742d0d63245825448 (commit) via 55cb496c91c19c956241762d43bca9bc2c522517 (commit) via 378fc00cc34856163226061563ff0cf2f26ac186 (commit) via 8a2626d805c214e0847639c112bc0c19be991033 (commit) via 5ef318c063365486ceacc847858bdfd23d93aaf1 (commit) via 8aae86da7f075b92c9872a0a4e6b2d45c4054b52 (commit) via a8e00b1cee3271cc86191b9cb18103d8f00ed781 (commit) via e89fc5123b67bba9bf2a778a4ceed26ca95132d4 (commit) via 365cdb48620a38fbea0f1b4af15e73935b938e25 (commit) via 1d9cee32593cff25aa6ef8cefc75add9bfd2038f (commit) via 3b9b30f42413743de6a5e868d6aa428f9c6f4f52 (commit) via c16f093945ae2a974a36964501b16d74733fe210 (commit) via f23d9cf9c311e552731dd144af75ac7dcaf92a27 (commit) via d76722cb4eb8feb47c6fa1b5f073b11f421a8194 (commit) via 073d3d953a4c0844363cd495462a7bef70c877b0 (commit) via e126d4ccdf50168c2439913eb47f746cc75b727c (commit) via 4e0645dc40c3b3f66df8ffb1445b47b80fad8a76 (commit) via 63aa7224f25656693c22d5f402f74b62c47728ee (commit) via 428990430d4af2b2f26b1dc6ae4ed3f2dd515c07 (commit) via a1b9977eb88d0b4608a7794031bf04c572f8f2e1 (commit) via 15b0083c5c39692271a1d9690f163598b399c655 (commit) via 71903ba675c551e3bd9073f706c4aaf961da00ce (commit) via fb074a9399bfe05e35a743437e0cd281c557db6e (commit) via f9e6be6b4b26d40873ff9cb309707f12c0ce64a5 (commit) via ab842943d315f2e78e9da8fd3ff79a381d73bc18 (commit) via 6e6e5b7d2ee1be09e8cc6978f41bf3c638028808 (commit) via 2038fc7a5be0586d14916be9980dbf1e897dc64a (commit) via c8e9fa84800ed8848e10366224fa26cdee00345d (commit) via a4af792177bc1187beb2eb1c55c5a2fa5e9a6f87 (commit) via 5440f59412f4158b3c1d73d5fbe77b935ff674ba (commit) via 03ae101e2638983b87f7d49f0cefbdc68e55dc94 (commit) via 512f054e50de04f6d163144a9c1f272dbd047078 (commit) via 0f9327c948c0cf9933a967499150f492fe63094f (commit) via f5190eace449936c1b96389dc249e5605c5abc74 (commit) via 38d31738f248e2aa8b91e4d6608851e1e9476e74 (commit) via d9fedc37413c7aeed75e85fb7c12e906f980aa5a (commit) via 42bc78f899ef2b8f2ea8100b7344c1ebe1ffc911 (commit) via f94a9b43d47fb921845f6ae5ca58cfb1ecd91062 (commit) via 40ff74388c63c2c13d24529249817f9f60d4a703 (commit) via 2e0e1ee3f937ed7de3144df16f00a0e71a70cfb7 (commit) via 2d20a625dd7aadf2e469e5e9837ff903fbbdf79f (commit) via 01ee98f52063896dac40a1e85687259b38429916 (commit) via d510e3e555ae4614d51d8d2fc692753e6cf8626b (commit) via 92124b54d54f4f85169698560e99c82387a66ce8 (commit) via 3e3486096f0f6ba002f6374dafc2fe2a69704493 (commit) via 873492a24aa0368a80567448e46dd05b25d438e0 (commit) via 0f1307f3571fb35b1782ae1f659b48aaeab842fe (commit) via 2e5cd0954a7b9383106589ae907f0271636e85bc (commit) via 6bfa9af7a48fb9674db992197a9a348c1175019f (commit) via cae77fdc1dbd50993c91117ee6e09e6e7c66377c (commit) via 76860ade539a188320cf749486d8d9a646eeead9 (commit) via 9dd6263a3e2212c4841d2de989de00382fa02185 (commit) via e0ecffb4c67d8b01e9ab1dbc6185647d55315663 (commit) via 69c0a1da93b5d8d9287a87b528679c36db331113 (commit) via dc704d34907ddbc7256ac48c4c27d01a258edf20 (commit) via 2aade6999e6deedf85c6b0201e502c1e51492bfb (commit) via ae7290b1239a974997e9caa8f99fef0d89fcca8e (commit) via a4ff06b6a32b65a7e12d8b79fe07fe15939e86ea (commit) via 50d2dc67f522262edccc662bddaaf6ba7fee417a (commit) via 1743cdc3a9ec1175eb556382c484858681c6cebd (commit) via c98d4ae07afc6e2eee02a95b0bdd6825f58ee6c3 (commit) via 7f55f7c8208591422b98ef0d8dbf73738b564ebd (commit) via 9ae11a0ca2f57fefd5c3e15a6c98ee7f11b22f1a (commit) via f382e4a24e8376645c7bf4aac2cfec4f933413c9 (commit) via 808c4e8be9333d74ac480ce7773c2c44af50abc3 (commit) via a32de0fdcfb1292f0eebd37857eeda829acb1bcc (commit) via e44073ea19332cde2bdd69ea5eb515d4cfc0e140 (commit) via fbe0b7f5ec449ab79dfad0b4d285a745f625e41e (commit) via 851beeb4d1256b38ff6d57b2c0f2944fd0479db2 (commit) via 77004f3748794e5990deca22ecbafb173fd44eef (commit) via 08a77f75484a3b12fcee2cf1f1970aefad936362 (commit) via 501c45e68c71fc00982b8b21a629d7b6757272cc (commit) via f9ac5d4d841e31df0aa208435d302202852a9a6b (commit) via c81c18f8fda28be370e9d8a01f2b1162db514c8d (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (4ecf262f4ba4de5707563fe2c8de9d2217546be6) \ N -- N -- N (750037f5afd5e3763154629f5bcbad61445c89e6) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 750037f Wrap function mln::morpho::tree::max<I, N>. 45f7819 Add a Swilena wrapper for mln::image2d<mln::point2d>. 25eca5a Have Make generate the Swilena Python Shell (sps). 7b138bf Stop configuring swilena/python/sps and swilena/python/sps-local. 1c8af3d Add a Swilena wrapper for mln::image2d<mln::value::rgb8>. f779a36 Add a Swilena meta-wrapper for PPM I/O. 9d56c7e Add a setter in the mln::image2d<T> meta-wrapper. 8f7d423 Add a Swilena wrapper for mln::value::rgb8. dce6468 Add a Swilena meta-wrapper for mln::value::rgb<n>. ab1256d Improve dependency management in Swilena/Python. 796ae83 python/morpho-segm.py: Remove a superfluous semi-colon. 1ac17a4 Clean up Swilena Makefiles. ----------------------------------------------------------------------- Summary of changes: AUTHORS | 24 +- ChangeLog | 204 ++ HACKING | 95 + INSTALL | 469 +++-- Makefile.am | 6 +- README | 223 ++- bootstrap | 126 +- build-aux/Makefile.am | 12 +- build-aux/extra-recursive-targets.mk | 23 +- build-aux/regen-recursive.mk | 27 +- build-aux/tex.mk | 47 + build-aux/texi2dvi | 1959 +++++++++++++++++++ configure.ac | 20 +- external/trimesh/ChangeLog | 6 +- external/trimesh/gluit/gluit.mk | 2 +- milena/ChangeLog | 1236 ++++++++++++ milena/Makefile.am | 9 +- milena/apps/graph-morpho/morpho.hh | 31 +- milena/apps/mesh-segm-skel/io.hh | 2 + milena/doc/.gitignore | 45 +- milena/doc/Doxyfile.in | 50 +- milena/doc/Makefile.am | 915 +++++++--- milena/doc/doc.mk | 36 - milena/doc/examples-outputs.mk | 919 +++++++++ milena/doc/examples.mk | 85 + milena/doc/examples/Makefile.am | 274 --- ...nstanciation.cc => accu-right-instantiation.cc} | 0 ...tion.cc.raw => accu-wrong-instantiation.cc.raw} | 0 milena/doc/examples/examples.mk | 125 -- milena/doc/examples/fill-imageif-cfun.cc | 2 +- milena/doc/examples/ima-load.cc | 8 +- milena/doc/examples/ima-save.cc | 8 +- milena/doc/examples/ima2d-rot.cc | 7 +- milena/doc/examples/labeling-compute.cc | 3 +- ...-1.cc.raw => accu-right-instantiation-1.cc.raw} | 0 milena/doc/examples/split/ima-load-1.cc.raw | 2 +- milena/doc/examples/split/ima-save-1.cc.raw | 2 +- milena/doc/examples/split/ima2d-rot-1.cc.raw | 4 +- milena/doc/examples/tuto3/println.cc | 10 +- milena/doc/examples/tuto4/image.cc | 4 +- milena/doc/examples/tuto4/site_set_create.cc | 14 +- milena/doc/figures.mk | 188 ++ milena/doc/figures/figures.mk | 41 - milena/doc/figures/fill-subdomain-2.ppm | Bin 206 -> 206 bytes milena/doc/figures/fill-subdomain-3.ppm | Bin 206 -> 206 bytes milena/doc/{white_paper => }/figures/house.png | Bin 26653 -> 26653 bytes milena/doc/{white_paper => }/figures/house_rag.png | Bin 9454 -> 9454 bytes .../doc/{white_paper => }/figures/house_wshed.png | Bin 27668 -> 27668 bytes .../figures/house_wshed_mean_colors.png | Bin 6618 -> 6618 bytes milena/doc/figures/labeling-compute-2.ppm | Bin 206 -> 206 bytes .../figures => figures/technical}/file_layout.pdf | Bin 26680 -> 26680 bytes .../figures => figures/technical}/file_layout.png | Bin 117801 -> 117801 bytes milena/doc/figures/tuto3_colorize-2.ppm | Bin 191 -> 191 bytes .../figures/tuto4_genericity_and_algorithms-1.ppm | Bin 12406 -> 12406 bytes .../figures/tuto4_genericity_and_algorithms-5.ppm | Bin 12406 -> 12406 bytes .../figures/tuto4_genericity_and_algorithms-7.pgm | 6 - .../figures/tuto4_genericity_and_algorithms-7.ppm | Bin 24696 -> 0 bytes .../figures/tuto4_genericity_and_algorithms-8.pgm | 6 - .../figures/tuto4_genericity_and_algorithms-8.ppm | 6 - .../figures/tuto4_genericity_and_algorithms-9.pgm | 6 - .../figures/tuto4_genericity_and_algorithms-9.ppm | 6 - milena/doc/gen-examples-outputs-mk | 71 + milena/doc/gen-figures-mk | 192 ++ milena/doc/gen-make-variable | 52 + milena/doc/gen-split-examples-mk | 136 ++ milena/doc/gen-split-outputs-mk | 140 ++ milena/doc/graphicx.hva | 3 + milena/doc/img/small.pbm | 1 + milena/doc/outputs.mk | 54 + ...tanciation.txt => accu-right-instantiation.txt} | 0 .../doc/outputs/{ima2d-decl-2.txt => ima-load.txt} | 0 milena/doc/outputs/outputs.mk | 69 - .../tuto3_first_routine.txt} | 0 ...ccu-right-instanciation.txt => tuto4_image.txt} | 0 milena/doc/programs-examples.mk | 147 ++ milena/doc/ref-guide.tex | 2024 ++++++++++++++++++++ milena/doc/ref_guide/Makefile.am | 112 -- milena/doc/ref_guide/ref_guide.tex | 2024 -------------------- milena/doc/split-examples.mk | 916 +++++++++ milena/doc/split-outputs.mk | 60 + .../designs/properties/values.txt | 0 .../designs/site_psite_piter/README | 0 milena/doc/technical.tex | 234 +++ milena/doc/technical/Makefile.am | 112 -- milena/doc/technical/technical.tex | 234 --- milena/doc/tools/data.hh.in | 37 + milena/doc/tools/sample_utils.hh | 13 +- milena/doc/tools/split_sample.sh | 4 +- milena/doc/tools/todoxygen.sh | 50 +- .../doc/{tutorial => tutorial.old}/design/Makefile | 0 .../{tutorial => tutorial.old}/design/design.tex | 0 .../design/include/imagetours.tex | 0 .../design/include/properties.tex | 0 .../{tutorial => tutorial.old}/doxyfile_tuto.local | 0 .../doc/{tutorial => tutorial.old}/image_types.txt | 0 .../{tutorial => tutorial.old}/image_values.txt | 0 .../doc/{tutorial => tutorial.old}/images_tour.txt | 0 milena/doc/{tutorial => tutorial.old}/slides.tex | 0 milena/doc/{tutorial => }/tutorial.tex | 0 milena/doc/tutorial/Makefile.am | 111 -- .../white_paper.tex => white-paper.tex} | 0 milena/doc/white_paper/Makefile.am | 115 -- milena/headers.mk | 5 + milena/mln/core/concept/object.hh | 4 +- milena/tests/tests-recursive.mk | 36 +- milena/tests/tests.mk | 36 +- milena/tests/transform/Makefile.am | 2 - milena/tests/unit_test/unit-tests.mk | 10 + scribo/ChangeLog | 23 + scribo/core/object_image.hh | 2 +- scribo/headers.mk | 36 +- scribo/primitive/link/internal/anchors_3.hh | 13 +- scribo/src/binarization/sauvola_ms.cc | 6 +- scribo/src/debug/Makefile.am | 7 +- scribo/src/primitive/group/Makefile.am | 5 +- scribo/table/internal/connect_lines.hh | 7 +- scribo/tests/unit_test/unit-tests.mk | 58 + swilena/ChangeLog | 35 + swilena/Makefile.am | 1 + swilena/image2d_point2d.i | 53 + swilena/morpho.ixx | 18 + swilena/python/Makefile.am | 44 +- swilena/python/max-tree.py | 48 + swilena/python/swilena.py | 2 + 124 files changed, 10673 insertions(+), 3982 deletions(-) create mode 100644 HACKING create mode 100644 build-aux/tex.mk create mode 100755 build-aux/texi2dvi delete mode 100644 milena/doc/doc.mk create mode 100644 milena/doc/examples-outputs.mk create mode 100644 milena/doc/examples.mk delete mode 100644 milena/doc/examples/Makefile.am rename milena/doc/examples/{accu-right-instanciation.cc => accu-right-instantiation.cc} (100%) rename milena/doc/examples/{accu-wrong-instanciation.cc.raw => accu-wrong-instantiation.cc.raw} (100%) delete mode 100644 milena/doc/examples/examples.mk rename milena/doc/examples/split/{accu-right-instanciation-1.cc.raw => accu-right-instantiation-1.cc.raw} (100%) create mode 100644 milena/doc/figures.mk delete mode 100644 milena/doc/figures/figures.mk rename milena/doc/{white_paper => }/figures/house.png (100%) rename milena/doc/{white_paper => }/figures/house_rag.png (100%) rename milena/doc/{white_paper => }/figures/house_wshed.png (100%) rename milena/doc/{white_paper => }/figures/house_wshed_mean_colors.png (100%) rename milena/doc/{technical/figures => figures/technical}/file_layout.pdf (100%) rename milena/doc/{technical/figures => figures/technical}/file_layout.png (100%) delete mode 100644 milena/doc/figures/tuto4_genericity_and_algorithms-7.pgm delete mode 100644 milena/doc/figures/tuto4_genericity_and_algorithms-7.ppm delete mode 100644 milena/doc/figures/tuto4_genericity_and_algorithms-8.pgm delete mode 100644 milena/doc/figures/tuto4_genericity_and_algorithms-8.ppm delete mode 100644 milena/doc/figures/tuto4_genericity_and_algorithms-9.pgm delete mode 100644 milena/doc/figures/tuto4_genericity_and_algorithms-9.ppm create mode 100755 milena/doc/gen-examples-outputs-mk create mode 100755 milena/doc/gen-figures-mk create mode 100755 milena/doc/gen-make-variable create mode 100755 milena/doc/gen-split-examples-mk create mode 100755 milena/doc/gen-split-outputs-mk create mode 100644 milena/doc/graphicx.hva create mode 120000 milena/doc/img/small.pbm create mode 100644 milena/doc/outputs.mk copy milena/doc/outputs/{accu-right-instanciation.txt => accu-right-instantiation.txt} (100%) rename milena/doc/outputs/{ima2d-decl-2.txt => ima-load.txt} (100%) delete mode 100644 milena/doc/outputs/outputs.mk rename milena/doc/{tutorial/headers.stamp => outputs/tuto3_first_routine.txt} (100%) rename milena/doc/outputs/{accu-right-instanciation.txt => tuto4_image.txt} (100%) create mode 100644 milena/doc/programs-examples.mk create mode 100644 milena/doc/ref-guide.tex delete mode 100644 milena/doc/ref_guide/Makefile.am delete mode 100644 milena/doc/ref_guide/ref_guide.tex create mode 100644 milena/doc/split-examples.mk create mode 100644 milena/doc/split-outputs.mk rename milena/doc/{technical => technical.old}/designs/properties/values.txt (100%) rename milena/doc/{technical => technical.old}/designs/site_psite_piter/README (100%) create mode 100644 milena/doc/technical.tex delete mode 100644 milena/doc/technical/Makefile.am delete mode 100644 milena/doc/technical/technical.tex create mode 100644 milena/doc/tools/data.hh.in rename milena/doc/{tutorial => tutorial.old}/design/Makefile (100%) rename milena/doc/{tutorial => tutorial.old}/design/design.tex (100%) rename milena/doc/{tutorial => tutorial.old}/design/include/imagetours.tex (100%) rename milena/doc/{tutorial => tutorial.old}/design/include/properties.tex (100%) rename milena/doc/{tutorial => tutorial.old}/doxyfile_tuto.local (100%) rename milena/doc/{tutorial => tutorial.old}/image_types.txt (100%) rename milena/doc/{tutorial => tutorial.old}/image_values.txt (100%) rename milena/doc/{tutorial => tutorial.old}/images_tour.txt (100%) rename milena/doc/{tutorial => tutorial.old}/slides.tex (100%) rename milena/doc/{tutorial => }/tutorial.tex (100%) delete mode 100644 milena/doc/tutorial/Makefile.am rename milena/doc/{white_paper/white_paper.tex => white-paper.tex} (100%) delete mode 100644 milena/doc/white_paper/Makefile.am create mode 100644 swilena/image2d_point2d.i create mode 100644 swilena/python/max-tree.py hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-132-g750037f Wrap function mln::morpho::tree::max<I, N>.
by Roland Levillain 01 Apr '10

01 Apr '10

* morpho.ixx (instantiate_max_tree): New macro. Call it... (instantiate_morpho): ...here. * python/max-tree.py: New test. * python/Makefile.am (TESTS): Add max-tree.py. --- swilena/ChangeLog | 10 ++++++ swilena/morpho.ixx | 18 +++++++++++ swilena/python/Makefile.am | 3 +- swilena/python/{morpho-segm.py => max-tree.py} | 40 +++++++++++++---------- 4 files changed, 53 insertions(+), 18 deletions(-) copy swilena/python/{morpho-segm.py => max-tree.py} (53%) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index b0145d8..9790b3f 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,15 @@ 2010-04-01 Roland Levillain <roland(a)lrde.epita.fr> + Wrap function mln::morpho::tree::max<I, N>. + + * morpho.ixx (instantiate_max_tree): New macro. + Call it... + (instantiate_morpho): ...here. + * python/max-tree.py: New test. + * python/Makefile.am (TESTS): Add max-tree.py. + +2010-04-01 Roland Levillain <roland(a)lrde.epita.fr> + Add a Swilena wrapper for mln::image2d<mln::point2d>. * image2d_point2d.i: New. diff --git a/swilena/morpho.ixx b/swilena/morpho.ixx index 7807694..d917ac0 100644 --- a/swilena/morpho.ixx +++ b/swilena/morpho.ixx @@ -166,6 +166,22 @@ namespace mln %template(Name) mln::morpho::meyer_wst< L, I, N >; %enddef +/*-----------. +| Max-tree. | +`-----------*/ + +%{ +#include "mln/morpho/tree/max.hh" +%} + +%include "mln/morpho/tree/max.hh" + +%define instantiate_max_tree(Name, I, N) + // Explicit instantiation of this trait for the return type. + %template() mln::trait::ch_value< I, mln_psite(I) >; + %template(Name) mln::morpho::tree::max< I, N >; +%enddef + /*-------------------------. | Instantiate everything. | `-------------------------*/ @@ -185,4 +201,6 @@ namespace mln instantiate_opening_area(opening_area, I, N) instantiate_meyer_wst(meyer_wst, mln_value(I), I, N) + + instantiate_max_tree(max_tree, I, N) %enddef diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 71ca9e7..ea4b25d 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -339,7 +339,8 @@ $(srcdir)/run.stamp: $(RUN_IN) # as `--python' to `run'. TESTS = \ box2d-misc.py \ - image2d-misc.py morpho-fun.py morpho-segm.py dynamic-image2d-misc.py + image2d-misc.py morpho-fun.py morpho-segm.py max-tree.py \ + dynamic-image2d-misc.py EXTRA_DIST += $(TESTS) diff --git a/swilena/python/morpho-segm.py b/swilena/python/max-tree.py similarity index 53% copy from swilena/python/morpho-segm.py copy to swilena/python/max-tree.py index 654aa95..0c5dd65 100644 --- a/swilena/python/morpho-segm.py +++ b/swilena/python/max-tree.py @@ -1,6 +1,6 @@ #! /usr/bin/env python -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -16,27 +16,33 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# \file python/morpho-segm.py -# \brief Test on watershed transform-based segmentation. +# \file python/max-tree.py +# \brief Test on the max-tree. import data from swilena import * -# Module alias. +# Module aliases. image = image2d_int_u8 +par_image = image2d_point2d ima = image.load(data.lena) +ima = image.image2d_int_u8(3, 3) -# Gradient. -gradient = image.gradient(ima, win_c4p()) -image.save(gradient, "gradient.pgm") -# Area closing of the gradient. -closed_gradient = image.closing_area(ima, c4(), 50) -# Watershed transform. -nbasins = int_u8() -ws = image.meyer_wst (closed_gradient, c4(), nbasins) -print nbasins -image.save(ws, "segm.pgm") - -# FIXME: Also re-enable the naive segmentation with no gradient -# simplification, and an output on an image2d<int_u32>. +values = [5, 6, 6, + 8, 9, 9, + 8, 9, 9] + +v = values.__iter__() + +for p in ima.domain(): + ima.set(p, int_u8(v.next())) +image.println("ima =", ima) + +max_tree_parent = image.max_tree(ima, c4()); +# FIXME: Why can't we use +# +# image2d_point2d.println("max_tree_parent =", max_tree_parent) +# +# ? +par_image.println(max_tree_parent) -- 1.5.6.5

1 0

last-svn-commit-131-g45f7819 Add a Swilena wrapper for mln::image2d<mln::point2d>.
by Roland Levillain 01 Apr '10

01 Apr '10

* image2d_point2d.i: New. * Makefile.am (wrappers): Add image2d_point2d.i. * python/Makefile.am (pyexec_LTLIBRARIES): Add _image2d_point2d.la. (nodist__image2d_point2d_la_SOURCES, _image2d_point2d_la_LIBADD): New. (CLEANFILES): Add $(nodist__image2d_point2d_la_SOURCES) image2d_point2d.py image2d_point2d.py[co]. (nodist_python_PYTHON): Add image2d_point2d.py. (image2d_point2d-wrap.cc): Add dependencies. * python/swilena.py: Import image2d_point2d. --- swilena/ChangeLog | 16 ++++++++++ swilena/Makefile.am | 1 + swilena/{image2d_int.i => image2d_point2d.i} | 42 +++++++++++++------------ swilena/python/Makefile.am | 14 ++++++++ swilena/python/swilena.py | 2 + 5 files changed, 55 insertions(+), 20 deletions(-) copy swilena/{image2d_int.i => image2d_point2d.i} (67%) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 89da33d..b0145d8 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,21 @@ 2010-04-01 Roland Levillain <roland(a)lrde.epita.fr> + Add a Swilena wrapper for mln::image2d<mln::point2d>. + + * image2d_point2d.i: New. + * Makefile.am (wrappers): Add image2d_point2d.i. + * python/Makefile.am (pyexec_LTLIBRARIES): + Add _image2d_point2d.la. + (nodist__image2d_point2d_la_SOURCES, _image2d_point2d_la_LIBADD): + New. + (CLEANFILES): Add $(nodist__image2d_point2d_la_SOURCES) + image2d_point2d.py image2d_point2d.py[co]. + (nodist_python_PYTHON): Add image2d_point2d.py. + (image2d_point2d-wrap.cc): Add dependencies. + * python/swilena.py: Import image2d_point2d. + +2010-04-01 Roland Levillain <roland(a)lrde.epita.fr> + Have Make generate the Swilena Python Shell (sps). * python/Makefile.am (EXTRA_DIST): Add sps-common.in, sps.in and diff --git a/swilena/Makefile.am b/swilena/Makefile.am index f484707..98eb4f6 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -45,6 +45,7 @@ wrappers = \ dpoint2d.i \ image2d_int.i \ image2d_int_u8.i \ + image2d_point2d.i \ image2d_rgb8.i \ int_u32.i \ int_u8.i \ diff --git a/swilena/image2d_int.i b/swilena/image2d_point2d.i similarity index 67% copy from swilena/image2d_int.i copy to swilena/image2d_point2d.i index ac82fe6..0ef3bd9 100644 --- a/swilena/image2d_int.i +++ b/swilena/image2d_point2d.i @@ -1,5 +1,5 @@ -// -*- C++ -*- -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// -*- C++ -*- +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,28 +24,30 @@ // 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<int> along with some -/// algorithms. +/// \file image2d_point2d.i +/// \brief A simple wrapping of mln::image2d<mln::point2d> along +/// with some algorithms. -%module image2d_int +%module image2d_point2d + +%import "point2d.i" +// FIXME: The import directive does not include the `%{ ... %}' clauses. +%{ +#include "mln/core/alias/point2d.hh" +%} + +%include concat.ixx -%include "intp.ixx" %include "image2d.ixx" -instantiate_image2d(image2d_int, int) +instantiate_image2d(image2d_point2d, + concat2(mln::point< mln::grid::square, mln::def::coord >)) %include "fill.ixx" -%template(fill) mln::data::fill< mln::image2d<int> >; +%template(fill) +mln::data::fill< mln::image2d< mln::point< mln::grid::square, + mln::def::coord> > >; %include "println.ixx" -%template(println) mln::debug::println< mln::image2d<int> >; - -%import "window2d.i" -// FIXME: The import directive does not include the `%{ ... %}' clauses. -%{ -#include "mln/core/alias/window2d.hh" -%} - -%include "morpho.ixx" -instantiate_erosion(erosion, mln::image2d<int>, mln::window2d) -instantiate_dilation(dilation, mln::image2d<int>, mln::window2d) +%template(println) +mln::debug::println< mln::image2d< mln::point< mln::grid::square, + mln::def::coord> > >; diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 9693c2e..71ca9e7 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -194,6 +194,16 @@ CLEANFILES += $(nodist__image2d_rgb8_la_SOURCES) image2d_rgb8.py image2d_rgb8.py @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_image2d_rgb8-wrap.Pcc@am__quote@ nodist_python_PYTHON += image2d_rgb8.py +## image2d_point2d. +pyexec_LTLIBRARIES += _image2d_point2d.la +nodist__image2d_point2d_la_SOURCES = image2d_point2d-wrap.cc +_image2d_point2d_la_LIBADD = $(AM_LIBADD) +CLEANFILES += $(nodist__image2d_point2d_la_SOURCES) image2d_point2d.py image2d_point2d.py[co] +## Include the dependency files. Copied from Automake's generated +## case for C++. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_image2d_point2d-wrap.Pcc@am__quote@ +nodist_python_PYTHON += image2d_point2d.py + ## dynamic_image2d. pyexec_LTLIBRARIES += _dynamic_image2d.la # Swig also generates a header for this module, since it makes use of @@ -255,6 +265,10 @@ 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 +image2d_point2d-wrap.cc: $(top_srcdir)/swilena/image2d.ixx +image2d_point2d-wrap.cc: $(top_srcdir)/swilena/fill.ixx +image2d_point2d-wrap.cc: $(top_srcdir)/swilena/println.ixx + ## ---------------------------- ## ## Swilena Python Shell (sps). ## diff --git a/swilena/python/swilena.py b/swilena/python/swilena.py index 14b9838..6c4dc89 100644 --- a/swilena/python/swilena.py +++ b/swilena/python/swilena.py @@ -37,3 +37,5 @@ from rgb8 import * import image2d_int import image2d_int_u8 import image2d_rgb8 + +import image2d_point2d -- 1.5.6.5

1 0