Olena-patches April 2010

olena-patches@lrde.epita.fr

5 participants
182 discussions

last-svn-commit-121-g10c5d39 Help g++ 4.1 compile Scribo.

by Roland Levillain

* binarization/sauvola_threshold.hh: Help g++ 4.1 find an unambiguous overload of std::pow. --- scribo/ChangeLog | 7 +++++++ scribo/src/binarization/sauvola_ms.cc | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 160ced4..2375a50 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2010-04-09 Roland Levillain <roland(a)lrde.epita.fr> + + Help g++ 4.1 compile Scribo. + + * binarization/sauvola_threshold.hh: Help g++ 4.1 find an + unambiguous overload of std::pow. + 2010-03-31 Roland Levillain <roland(a)lrde.epita.fr> Have Scribo compile again. diff --git a/scribo/src/binarization/sauvola_ms.cc b/scribo/src/binarization/sauvola_ms.cc index 196a15c..30742a3 100644 --- a/scribo/src/binarization/sauvola_ms.cc +++ b/scribo/src/binarization/sauvola_ms.cc @@ -303,7 +303,7 @@ int main(int argc, char *argv[]) // Additional subscales. for (unsigned i = 1; i < nb_subscale; ++i) { - unsigned ratio = std::pow(q, i); + unsigned ratio = std::pow(float(q), int(i)); // std::cout << "Scale " << 2 + i << " - 1/" << s * ratio << std::endl; timer_.restart(); unsigned @@ -332,7 +332,7 @@ int main(int argc, char *argv[]) for (int i = nb_subscale - 1; i >= 0; --i) { - unsigned ratio = std::pow(q, i); + unsigned ratio = std::pow(float(q), int(i)); std::cout << "Scale " << 2 + i << " - 1/" << s * ratio << " merged" << std::endl; @@ -369,7 +369,7 @@ int main(int argc, char *argv[]) mln::fun::i2v::array<value::int_u16> f(nb_subscale, 0); for (unsigned i = 0; i < nb_subscale; ++i) { - unsigned ratio = std::pow(q, i); + unsigned ratio = std::pow(float(q), int(i)); f(i) = ratio * w; } -- 1.5.6.5

14 years, 8 months

Re: [Olena-patches] [Olena] #96: Update Olena's Web site for Olena 1.0

by Olena Trac

#96: Update Olena's Web site for Olena 1.0 -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: critical | Milestone: Olena 1.1 Component: Web | Version: 1.0 Resolution: | Keywords: organization -----------------------+---------------------------------------------------- Old description: > Update http://olena.lrde.epita.fr (TWiki site). > * Create/update the release page. > * Update the main page. > > * Don't forget to announce the release > * on LRDE's Web site; > * to the `annonce` mailing list. > > * Reformat to follow this new outline (from the May 26, 2009 meeting): > 1. Home > * Overview > * Short Description > * Goals > * Components > * News > 1. Demos > * Morphers Examples > * Mathematical Morphology Examples > * Supporting example for the ISMM'09 paper. > 1. Download > * Binary Distributions? > * Source Distributions > * Source Repository Access (see also Development) > * Installing > 1. Documentation > * Tutorial > * Publications > * Related Links > * Quick Tour > * Presentation > * White Paper > * Contents / What's In It? / What's Inside? > * Features > * Platform Architecture > * Reference Documentation > 1. FAQ > 1. Platform Components (using links and inclusions) > * Milena > * Swilena > * SCRIBO > * ICDAR > 1. Development (or ''Contributing'' or ''For Developers'' or > ''Developers' Corners'' > 1. Contact > 1. About > * Contributors > * History > * License > 1. Site Map New description: Update http://olena.lrde.epita.fr (TWiki site). * Create/update the release page. * Update the main page. * Don't forget to announce the release * on LRDE's Web site; * to the `annonce` mailing list. * Reformat to follow this new outline (from the May 26, 2009 meeting): 1. Home * Overview * Short Description * Goals * Components * News 1. Demos * Morphers Examples * Mathematical Morphology Examples * Supporting example for the ISMM'09 paper. 1. Download * Binary Distributions? * Source Distributions * Source Repository Access (see also Development) * Installing 1. Documentation * Tutorial * Publications * Related Links * Quick Tour * Presentation * White Paper * Contents / What's In It? / What's Inside? * Features * Platform Architecture * Reference Documentation 1. FAQ 1. Platform Components (using links and inclusions) * Milena * Swilena * SCRIBO * ICDAR 1. Development (or ''Contributing'' or ''For Developers'' or ''Developers' Corners'') 1. Contact 1. About * Contributors * History * License 1. Site Map -- Comment(by levill_r): Typo. -- Ticket URL: <https://trac.lrde.org/olena/ticket/96#comment:5> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

14 years, 8 months

[PATCH 1/5] Help Swilena wrap mln::complex<D>.

by Roland Levillain

* mln/topo/complex.hh: Use `0' instead of `0u' as template parameter. --- milena/ChangeLog | 7 +++++++ milena/mln/topo/complex.hh | 38 +++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0806c6b..80958f0 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2010-04-08 Roland Levillain <roland(a)lrde.epita.fr> + + Help Swilena wrap mln::complex<D>. + + * mln/topo/complex.hh: Use `0' instead of `0u' as template + parameter. + 2010-03-30 Roland Levillain <roland(a)lrde.epita.fr> Do not install low-quality HTML documentation. diff --git a/milena/mln/topo/complex.hh b/milena/mln/topo/complex.hh index 3662396..2ecb551 100644 --- a/milena/mln/topo/complex.hh +++ b/milena/mln/topo/complex.hh @@ -107,7 +107,7 @@ namespace mln complex(); /// Add a 0-face to the complex. - n_face<0u, D> add_face(); + n_face<0, D> add_face(); /// Add a \p (N+1)-face to the complex (with \p N >= 0). /// @@ -369,9 +369,9 @@ namespace mln /// Faces of lowest dimension (0). template <unsigned D> - struct faces_set_mixin<0u, D> : public higher_dim_faces_set_mixin<0u, D> + struct faces_set_mixin<0, D> : public higher_dim_faces_set_mixin<0, D> { - std::vector< face_data<0u, D> > faces_; + std::vector< face_data<0, D> > faces_; /// Pretty-printing. /// \{ @@ -396,9 +396,9 @@ namespace mln /// Faces of a 0-complex. template <> - struct faces_set_mixin<0u, 0u> + struct faces_set_mixin<0, 0> { - std::vector< face_data<0u, 0u> > faces_; + std::vector< face_data<0, 0> > faces_; /// Pretty-printing. /// \{ @@ -475,14 +475,14 @@ namespace mln template <unsigned D> inline - n_face<0u, D> + n_face<0, D> complex<D>::add_face() { /* FIXME: This is not thread-proof (these two lines should form an atomic section). */ - data_->internal::faces_set_mixin<0u, D>::faces_.push_back(face_data<0u, D>()); - unsigned id = nfaces_of_static_dim<0u>() - 1; - return n_face<0u, D>(*this, id); + data_->internal::faces_set_mixin<0, D>::faces_.push_back(face_data<0, D>()); + unsigned id = nfaces_of_static_dim<0>() - 1; + return n_face<0, D>(*this, id); } template <unsigned D> @@ -716,7 +716,7 @@ namespace mln template <unsigned D> inline void - faces_set_mixin<0u, D>::print_rec_asc(std::ostream& ostr) const + faces_set_mixin<0, D>::print_rec_asc(std::ostream& ostr) const { print(ostr); } @@ -732,7 +732,7 @@ namespace mln inline void - faces_set_mixin<0u, 0u>::print_rec_asc(std::ostream& ostr) const + faces_set_mixin<0, 0>::print_rec_asc(std::ostream& ostr) const { print(ostr); } @@ -760,9 +760,9 @@ namespace mln template <unsigned D> inline void - faces_set_mixin<0u, D>::print(std::ostream& ostr) const + faces_set_mixin<0, D>::print(std::ostream& ostr) const { - const unsigned N = 0u; + const unsigned N = 0; ostr << "Faces of dimension " << N << " and their ajacent faces of dimension " << N + 1 << std::endl; @@ -793,9 +793,9 @@ namespace mln inline void - faces_set_mixin<0u, 0u>::print(std::ostream& ostr) const + faces_set_mixin<0, 0>::print(std::ostream& ostr) const { - const unsigned N = 0u; + const unsigned N = 0; ostr << "Faces of dimension " << N << std::endl; for (unsigned f = 0; f < faces_.size(); ++f) ostr << " " << f << std::endl; @@ -873,7 +873,7 @@ namespace mln template <typename BinaryFunction, typename T> inline T - faces_set_mixin<0u, D>::fold_left_(const BinaryFunction& f, + faces_set_mixin<0, D>::fold_left_(const BinaryFunction& f, const T& accu) const { return f(accu, faces_); @@ -882,7 +882,7 @@ namespace mln template <typename BinaryFunction, typename T> inline T - faces_set_mixin<0u, 0u>::fold_left_(const BinaryFunction& f, + faces_set_mixin<0, 0>::fold_left_(const BinaryFunction& f, const T& accu) const { return f(accu, faces_); @@ -943,7 +943,7 @@ namespace mln template <typename UnaryFunction> inline typename UnaryFunction::result_type - faces_set_mixin<0u, D>::apply_if_dim_matches_(unsigned n, + faces_set_mixin<0, D>::apply_if_dim_matches_(unsigned n, const UnaryFunction& f) const { // If we reached this method, then N should be 0. @@ -956,7 +956,7 @@ namespace mln template <typename UnaryFunction> inline typename UnaryFunction::result_type - faces_set_mixin<0u, 0u>::apply_if_dim_matches_(unsigned n, + faces_set_mixin<0, 0>::apply_if_dim_matches_(unsigned n, const UnaryFunction& f) const { // If we reached this method, then N should be 0. -- 1.7.0.4

14 years, 8 months

[Olena] #129: Reintegrate oln.m4 (full or a part of it) into Olena 1.0

by Olena

#129: Reintegrate oln.m4 (full or a part of it) into Olena 1.0 -----------------------------------+---------------------------------------- Reporter: levill_r | Owner: levill_r Type: enhancement | Status: new Priority: minor | Milestone: Olena 1.0ß Component: Olena | Version: 1.0 Keywords: configure autoconf M4 | -----------------------------------+---------------------------------------- In Olena 0.11, `oln.m4` (which might be renamed to `olena.m4`) provided useful services to both the Olena package (search for libraries, set up flags for tests, etc.) and autoconfiscated packages using Olena, by providing a `--with-oln` (to be renamed to `--with-olena`) flag. We should reintegrate a part of these features, possibly in two M4 macro packages: * one for Olena, * one for Olena-based projects. -- Ticket URL: <https://trac.lrde.org/olena/ticket/129> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image library.

14 years, 8 months

*****SPAM***** Possibilite de gagner de l'argent dans votre ville.

by olena-patches＠lrde.epita.fr

Spam detection software, running on the system "kualalumpur.lrde.epita.fr", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Un magasin auto recherche des telecollaborateurs. En quoi consiste le travail : des annonces de vente de voitures apparaissent dans votre ville et nos clients veulent acheter ces voitures. Habituellement, une petite avance est versee au vendeur afin que la voiture soit reservee pour notre client. Mais, ces derniers temps, on tombe sur des escrocs qui mettent en vente des voitures qui n'existent pas et qui disparaissent apres avoir recu l'avance. [...] Content analysis details: (9.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.0 NO_REAL_NAME From: does not include a real name 0.1 FORGED_RCVD_HELO Received: contains a forged HELO 1.4 MSGID_FROM_MTA_ID Message-Id for external message added locally -2.6 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [score: 0.0000] 0.0 HTML_MESSAGE BODY: HTML included in message 1.4 HTML_10_20 BODY: Message is 10% to 20% HTML 0.0 MIME_HTML_ONLY BODY: Message only has text/html MIME parts 1.5 RAZOR2_CF_RANGE_E4_51_100 Razor2 gives engine 4 confidence level above 50% [cf: 100] 0.5 RAZOR2_CHECK Listed in Razor2 (http://razor.sf.net/) 0.5 RAZOR2_CF_RANGE_51_100 Razor2 gives confidence level above 50% [cf: 100] 1.6 RCVD_IN_BL_SPAMCOP_NET RBL: Received via a relay in bl.spamcop.net [Blocked - see <http://www.spamcop.net/bl.shtml?78.2.44.215>] 3.9 RCVD_IN_XBL RBL: Received via a relay in Spamhaus XBL [78.2.44.215 listed in sbl-xbl.spamhaus.org] 0.0 ADVANCE_FEE_1 Appears to be advance fee fraud (Nigerian 419) The original message was not completely plain text, and may be unsafe to open with some email clients; in particular, it may contain a virus, or confirm that your address can receive spam. If you wish to view it, it may be safer to save it to a file and open it with an editor.

14 years, 8 months

Teletravail pour des personnes responsables

by olena-patches＠lrde.epita.fr

14 years, 8 months

last-svn-commit-128-g1c8af3d Add a Swilena wrapper for mln::image2d<mln::value::rgb8>.

by Roland Levillain

* 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

14 years, 8 months

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

by Roland Levillain

* 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

14 years, 8 months

last-svn-commit-126-g9d56c7e Add a setter in the mln::image2d<T> meta-wrapper.

by Roland Levillain

* 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

14 years, 8 months

last-svn-commit-125-g8f7d423 Add a Swilena wrapper for mln::value::rgb8.

by Roland Levillain

* 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

14 years, 8 months

← Newer
1
...
9
10
11
12
13
14
15
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches April 2010