- Olena-patches

last-svn-commit-123-gab9ba6d Explain properly how to build Swilena.
by Roland Levillain 09 Apr '10

09 Apr '10

* README (Swilena): Here. --- ChangeLog | 6 ++++++ README | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39fe1e3..8ad6baa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2010-04-09 Roland Levillain <roland(a)lrde.epita.fr> + Explain properly how to build Swilena. + + * README (Swilena): Here. + +2010-04-09 Roland Levillain <roland(a)lrde.epita.fr> + Require SWIG >= 1.3.35 for Swilena. * m4/with-swilena.m4 (_OLN_WITH_SWIG): Here. diff --git a/README b/README index cf35e0a..3c207e4 100644 --- a/README +++ b/README @@ -230,7 +230,7 @@ Python). To enable the installation of this module use:: - ./configure --enable-swilena + ./configure --with-swig --enable-swilena Tools ----- -- 1.5.6.5

1 0

last-svn-commit-122-ga1b8610 Require SWIG >= 1.3.35 for Swilena.
by Roland Levillain 09 Apr '10

09 Apr '10

* m4/with-swilena.m4 (_OLN_WITH_SWIG): Here. --- ChangeLog | 6 ++++++ m4/with-swilena.m4 | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f6b6cd..39fe1e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-04-09 Roland Levillain <roland(a)lrde.epita.fr> + + Require SWIG >= 1.3.35 for Swilena. + + * m4/with-swilena.m4 (_OLN_WITH_SWIG): Here. + 2010-03-31 Roland Levillain <roland(a)lrde.epita.fr> * bootstrap: Check for HeVeA instead of TeX4ht. diff --git a/m4/with-swilena.m4 b/m4/with-swilena.m4 index 08cfdf4..c33b72c 100644 --- a/m4/with-swilena.m4 +++ b/m4/with-swilena.m4 @@ -95,14 +95,14 @@ if test x$with_swig != xno; then # [You need Ruby development files to compile the Ruby interface.])]) # CPPFLAGS=$save_CPPFLAGS - AC_PROG_SWIG([1.3.36]) + AC_PROG_SWIG([1.3.35]) if (eval "$SWIG -version") >/dev/null 2>&1; then :; else oln_has_swig=no fi case $with_swig:$oln_has_swig in yes:no) - AC_MSG_ERROR([SWIG 1.3.36 is required. + AC_MSG_ERROR([SWIG 1.3.35 is required. Use `--without-swig' to disable SWIG modules.]);; esac fi -- 1.5.6.5

1 0

branch next updated: last-svn-commit-121-g10c5d39
by git＠lrde.epita.fr 09 Apr '10

09 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 next has been updated via 10c5d398cd691716db99d2ab6f78d48f7762a75d (commit) from 66a288802969285cb0bdf97c4737c47db786e02c (commit) 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 ----------------------------------------------------------------- 10c5d39 Help g++ 4.1 compile Scribo. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 7 +++++++ scribo/src/binarization/sauvola_ms.cc | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-121-g10c5d39 Help g++ 4.1 compile Scribo.
by Roland Levillain 09 Apr '10

09 Apr '10

* 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

1 0

Re: [Olena-patches] [Olena] #96: Update Olena's Web site for Olena 1.0
by Olena Trac 09 Apr '10

09 Apr '10

#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.

1 0

[PATCH 1/5] Help Swilena wrap mln::complex<D>.
by Roland Levillain 09 Apr '10

09 Apr '10

* 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

1 4

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

07 Apr '10

#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.

2 2

*****SPAM***** Possibilite de gagner de l'argent dans votre ville.
by olena-patches＠lrde.epita.fr 06 Apr '10

06 Apr '10

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.

1 0

Teletravail pour des personnes responsables
by olena-patches＠lrde.epita.fr 06 Apr '10

06 Apr '10

1 0

last-svn-commit-121-g1ac17a4 Clean up Swilena Makefiles.
by Roland Levillain 01 Apr '10

01 Apr '10

* Makefile.am: Here. * python/Makefile.am: Likewise. (python_PYTHON): Move data.py... (EXTRA_DIST): ...here. --- swilena/ChangeLog | 9 +++++++++ swilena/Makefile.am | 3 --- swilena/python/Makefile.am | 13 ++++++------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index efa4e9b..3232f15 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,12 @@ +2009-10-27 Roland Levillain <roland(a)lrde.epita.fr> + + Clean up Swilena Makefiles. + + * Makefile.am: Here. + * python/Makefile.am: Likewise. + (python_PYTHON): Move data.py... + (EXTRA_DIST): ...here. + 2009-09-12 Roland Levillain <roland(a)lrde.epita.fr> * neighb2d.i: Aesthetic changes. diff --git a/swilena/Makefile.am b/swilena/Makefile.am index c6fd023..109fb2e 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -14,9 +14,6 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. - -## Process this file through Automake to produce Makefile.in. - SUBDIRS = python # Meta-wrappers (templates), not generating a module, but factoring diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index aec8a05..0ad96da 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -13,9 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# -## Process this file through Automake to produce Makefile.in. ## ------------------ ## ## Generic material. ## @@ -28,11 +26,11 @@ AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/milena TOOLS_CXXFLAGS = @TOOLS_CXXFLAGS@ AM_CXXFLAGS = $(TOOLS_CXXFLAGS) AM_SWIGFLAGS = -Wall -c++ -python -I$(top_srcdir)/milena -## We build modules, not plain libs. +# We build modules, not plain libs. AM_LDFLAGS = -avoid-version -module -shared -## Run Swig to create the C++ wrapper files, the Python interface -## files, and the dependency Makefile snippets. +# Run Swig to create the C++ wrapper files, the Python interface +# files, and the dependency Makefile snippets. %-wrap.cc %.py: $(top_srcdir)/swilena/%.i if $(SWIG) $(AM_SWIGFLAGS) $(SWIGFLAGS) -MD -MF "$(DEPDIR)/$*-wrap.Tcc" -o $@ $<; then \ mv -f "$(DEPDIR)/$*-wrap.Tcc" "$(DEPDIR)/$*-wrap.Pcc";\ @@ -45,8 +43,9 @@ AM_LDFLAGS = -avoid-version -module -shared python_PYTHON = ltihooks.py # swilena.py: The whole Swilena suite. python_PYTHON += swilena.py + # data.py: Access to the data of the distribution (images, meshes, etc.) -python_PYTHON += data.py +EXTRA_DIST = data.py ## ----------------- ## @@ -218,7 +217,7 @@ $(TESTS): $(srcdir)/run.stamp # The dependency is on `run.in' and not `run', since `run' is # regenerated at distribution time, and voids the time stamps (which # we don't want!). -EXTRA_DIST = $(srcdir)/run.stamp +EXTRA_DIST += $(srcdir)/run.stamp $(srcdir)/run.stamp: $(RUN_IN) @rm -f $@ @rm -f $@.tmp -- 1.5.6.5

1 0