- Olena-patches

last-svn-commit-133-g6dd7d24 Fix accu::compute(const Meta_Accumulator<A>, const Image&).
by Roland Levillain 13 Apr '10

13 Apr '10

* mln/accu/compute.hh (accu::compute(const Meta_Accumulator<A>, const Image&)): Here. --- milena/ChangeLog | 7 +++++++ milena/mln/accu/compute.hh | 6 ++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 374c8d9..8485b4f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2010-04-13 Roland Levillain <roland(a)lrde.epita.fr> + + Fix accu::compute(const Meta_Accumulator<A>, const Image&). + + * mln/accu/compute.hh + (accu::compute(const Meta_Accumulator<A>, const Image&)): Here. + 2010-04-20 Roland Levillain <roland(a)lrde.epita.fr> Exercise mln::util::ord. diff --git a/milena/mln/accu/compute.hh b/milena/mln/accu/compute.hh index aeb86e2..9c0e6b1 100644 --- a/milena/mln/accu/compute.hh +++ b/milena/mln/accu/compute.hh @@ -147,11 +147,9 @@ namespace mln mln_precondition(exact(input).is_valid()); - //FIXME: why adding util::pix here? typedef mln_accu_with(A, util::pix) A_; - util::pix* pix_; // So we can pass a pixel below (pixel has - // no ctor without arg). - A_ a_ = accu::unmeta(exact(a), *pix_); + util::pix pix_(exact(input), mln_psite(I)()); + A_ a_ = accu::unmeta(exact(a), pix_); mln_result(A_) output = internal::compute_dispatch(a_, input); -- 1.5.6.5

1 0

last-svn-commit-128-g0df20ed Fix accu::compute(const Meta_Accumulator<A>, const Image&).
by Roland Levillain 13 Apr '10

13 Apr '10

* mln/accu/compute.hh (accu::compute(const Meta_Accumulator<A>, const Image&)): Here. --- milena/ChangeLog | 7 +++++++ milena/mln/accu/compute.hh | 6 ++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 74bb42d..7083db0 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2010-04-13 Roland Levillain <roland(a)lrde.epita.fr> + + Fix accu::compute(const Meta_Accumulator<A>, const Image&). + + * mln/accu/compute.hh + (accu::compute(const Meta_Accumulator<A>, const Image&)): Here. + 2010-04-09 Roland Levillain <roland(a)lrde.epita.fr> Fix test core/other/box_runend_piter. diff --git a/milena/mln/accu/compute.hh b/milena/mln/accu/compute.hh index aeb86e2..9c0e6b1 100644 --- a/milena/mln/accu/compute.hh +++ b/milena/mln/accu/compute.hh @@ -147,11 +147,9 @@ namespace mln mln_precondition(exact(input).is_valid()); - //FIXME: why adding util::pix here? typedef mln_accu_with(A, util::pix) A_; - util::pix* pix_; // So we can pass a pixel below (pixel has - // no ctor without arg). - A_ a_ = accu::unmeta(exact(a), *pix_); + util::pix pix_(exact(input), mln_psite(I)()); + A_ a_ = accu::unmeta(exact(a), pix_); mln_result(A_) output = internal::compute_dispatch(a_, input); -- 1.5.6.5

1 0

last-svn-commit-127-g25eb4fe Fix test core/other/box_runend_piter.
by Roland Levillain 09 Apr '10

09 Apr '10

* tests/core/other/box_runend_piter.cc: Fix assertion. --- milena/ChangeLog | 6 ++++++ milena/tests/core/other/box_runend_piter.cc | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0806c6b..74bb42d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2010-04-09 Roland Levillain <roland(a)lrde.epita.fr> + + Fix test core/other/box_runend_piter. + + * tests/core/other/box_runend_piter.cc: Fix assertion. + 2010-03-30 Roland Levillain <roland(a)lrde.epita.fr> Do not install low-quality HTML documentation. diff --git a/milena/tests/core/other/box_runend_piter.cc b/milena/tests/core/other/box_runend_piter.cc index fe7cb43..7af994f 100644 --- a/milena/tests/core/other/box_runend_piter.cc +++ b/milena/tests/core/other/box_runend_piter.cc @@ -35,7 +35,7 @@ int main() box_runend_piter<point2d> p(b); unsigned i = 2; for_all(p) - mln_assertion(p == point2d(i, 2)); + mln_assertion(p == point2d(i--, 2)); mln_assertion(p.run_length() == 3); } -- 1.5.6.5

1 0

branch next updated: last-svn-commit-126-g77c420e
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 77c420e02087c7499fa59caaa8c2c6cf8b27e84c (commit) via 103e1e747ab4e16f95f94e3742b3d21b9d637354 (commit) via 5a5ceb89dd3811caae3296fce041a47c5a45564d (commit) via 03908bb38ac692efdb3ce76c8e56bc86a2ee2334 (commit) from a1b86103434c66825a1a089e7bc039f62761b692 (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 ----------------------------------------------------------------- 77c420e configure.ac: Add option `--enable-scribo'. 103e1e7 configure.ac: Protect variables with double quotes. 5a5ceb8 Improve Swilena's configuration. 03908bb Require Python >= 2.4 for Swilena. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 22 +++++++++ configure.ac | 39 ++++++++++++--- m4/with-swilena.m4 | 129 ---------------------------------------------------- 3 files changed, 53 insertions(+), 137 deletions(-) delete mode 100644 m4/with-swilena.m4 hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-126-g77c420e configure.ac: Add option `--enable-scribo'.
by Roland Levillain 09 Apr '10

09 Apr '10

--- ChangeLog | 4 ++++ configure.ac | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68cbe4f..f19f672 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-04-09 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac: Add option `--enable-scribo'. + +2010-04-09 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac: Protect variables with double quotes. 2010-04-09 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/configure.ac b/configure.ac index 151a4b2..d9953c5 100644 --- a/configure.ac +++ b/configure.ac @@ -226,6 +226,9 @@ dnl<<lrde ## Scribo. ## ## -------- ## +AC_ARG_ENABLE([scribo], + [AS_HELP_STRING([--enable-scribo], + [enable Scribo])]) AM_CONDITIONAL([ENABLE_SCRIBO], [test "x$enable_scribo" = xyes]) AC_CONFIG_FILES([ -- 1.5.6.5

1 0

last-svn-commit-125-g103e1e7 configure.ac: Protect variables with double quotes.
by Roland Levillain 09 Apr '10

09 Apr '10

--- ChangeLog | 4 ++++ configure.ac | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f231ff..68cbe4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-04-09 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac: Protect variables with double quotes. + +2010-04-09 Roland Levillain <roland(a)lrde.epita.fr> + Improve Swilena's configuration. * m4/with-swilena.m4: Remove file. diff --git a/configure.ac b/configure.ac index 7e99431..151a4b2 100644 --- a/configure.ac +++ b/configure.ac @@ -173,7 +173,7 @@ OLN_WITH_LIB([TESSERACT], [tesseract/baseapi.h], [tesseract_full], [tesseract], AC_ARG_ENABLE([trimesh], [AS_HELP_STRING([--enable-trimesh], [build the (bundled) trimesh2 library])]) -AM_CONDITIONAL([ENABLE_TRIMESH], [test x$enable_trimesh = xyes]) +AM_CONDITIONAL([ENABLE_TRIMESH], [test "x$enable_trimesh" = xyes]) AC_CONFIG_SUBDIRS([external/trimesh]) ## --------- ## @@ -226,7 +226,7 @@ dnl<<lrde ## Scribo. ## ## -------- ## -AM_CONDITIONAL([ENABLE_SCRIBO], [test x$enable_scribo = xyes]) +AM_CONDITIONAL([ENABLE_SCRIBO], [test "x$enable_scribo" = xyes]) AC_CONFIG_FILES([ scribo/Makefile -- 1.5.6.5

1 0

last-svn-commit-124-g5a5ceb8 Improve Swilena's configuration.
by Roland Levillain 09 Apr '10

09 Apr '10

* m4/with-swilena.m4: Remove file. Supeseded by other tests performed... * configure.ac: ...here. --- ChangeLog | 8 +++ configure.ac | 32 ++++++++++-- m4/with-swilena.m4 | 129 ---------------------------------------------------- 3 files changed, 34 insertions(+), 135 deletions(-) delete mode 100644 m4/with-swilena.m4 diff --git a/ChangeLog b/ChangeLog index 6ccefd3..9f231ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2010-04-09 Roland Levillain <roland(a)lrde.epita.fr> + Improve Swilena's configuration. + + * m4/with-swilena.m4: Remove file. + Supeseded by other tests performed... + * configure.ac: ...here. + +2010-04-09 Roland Levillain <roland(a)lrde.epita.fr> + Require Python >= 2.4 for Swilena. * m4/with-swilena.m4 (_OLN_WITH_SWIG): Here. diff --git a/configure.ac b/configure.ac index 9b825a7..7e99431 100644 --- a/configure.ac +++ b/configure.ac @@ -111,15 +111,11 @@ fi # ``--enable-all'' is set and a given feature is disabled (say, # ``--disable-apps''), then the disable flag has priority. -# FIXME: Due to with-swilena.m4's limitations, we have to explicitly -# enable SWIG. Will be repaired when OLN_WITH_SWILENA is revamped. - AC_ARG_ENABLE([all], [AS_HELP_STRING([--enable-all], [enable maintainer mode])], [ enable_trimesh=yes - with_swig=yes enable_swilena=yes dnl<<lrde enable_scribo=yes @@ -184,8 +180,32 @@ AC_CONFIG_SUBDIRS([external/trimesh]) ## Swilena. ## ## --------- ## -OLN_WITH_SWILENA([enable_swilena=yes], []) -AM_CONDITIONAL([ENABLE_SWILENA], [test x$enable_swilena = xyes]) +AC_ARG_ENABLE([swilena], + [AS_HELP_STRING([--enable-swilena], + [build Swilena Python bindings])]) +AS_IF([test "x$enable_swilena" = xyes], + [# Ensure dynamic libraries are enabled. + if test "x$enable_shared" = xno; then + AC_MSG_ERROR([`--enable-swilena' was given, but dynamic libraries are +disabled. Try to invoke configure with `--enable-shared'.]) + fi + # Check for SWIG. + AC_PROG_SWIG([1.3.35]) + if (eval "$SWIG -version") >/dev/null 2>&1; then :; else + AC_MSG_ERROR([SWIG 1.3.35 is required for Swilena]) + fi + # Check for Python. + AM_PATH_PYTHON([2.4], [], + [AC_MSG_ERROR([Python 2.4 is required for Swilena.])]) + adl_CHECK_PYTHON + # Check for Python headers. + save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$PYTHONINC" + AC_CHECK_HEADERS([Python.h], [], + [AC_MSG_ERROR([`Python.h' is required for Swilena. +Try adding `-I <Python include path>' to `CPPFLAGS'.])]) + CPPFLAGS=$save_CPPFLAGS]) +AM_CONDITIONAL([ENABLE_SWILENA], [test "x$enable_swilena" = xyes]) AC_CONFIG_FILES([swilena/Makefile swilena/python/Makefile]) diff --git a/m4/with-swilena.m4 b/m4/with-swilena.m4 deleted file mode 100644 index a5b968f..0000000 --- a/m4/with-swilena.m4 +++ /dev/null @@ -1,129 +0,0 @@ -# -*- Autoconf -*- - -# Copyright (C) 2008, 2009 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/>. - - -# FIXME: Revamp and make it generic, so that it can shared among -# Olena, TC and clspr. - -# _OLN_WITH_SWIG(HAS-SWIG, HAS-NOT) -# --------------------------------- -# Check whether SWIG is requested, enabled, or disabled. If -# requested, check that Python is present as needed. If enabled, -# actually enable only if the environment is complete. -AC_DEFUN([_OLN_WITH_SWIG], -# FIXME: `with-swig' used to be set to `auto', but `no' is prefered -# now, as -# 1. users don't necessarily want to build Swilena by default; -# 2. the `auto' flag is not honored by the checks for Python and Ruby. -[AC_ARG_WITH([swig], - [AC_HELP_STRING([--with-swig], - [require SWIG modules (defaults to no)])], - [], - [with_swig=no]) - -case $with_swig:$enable_shared in - auto:no) - AC_MSG_NOTICE([SWIG use disabled: dynamic libraries disabled]) - with_swig=no - ;; -esac - -if test x$with_swig != xno; then - oln_has_swig=yes - AM_PATH_PYTHON([2.4]) - adl_CHECK_PYTHON - - # Check for Python and SWIG. - save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$PYTHONINC" - AC_CHECK_HEADERS([Python.h], - [python_headers=yes], - [python_headers=no]) - - if test x$python_headers = xno; then - oln_has_swig=no - if test x$with_swig = xyes; then - AC_MSG_ERROR( - [Python.h is required to build SWIG modules. - Add `-I python_include_path' to `CPPFLAGS' - or `--without-swig' to disable SWIG modules.]) - fi - fi - - CPPFLAGS=$save_CPPFLAGS - -# FIXME: Disabled. Swilena does not support Ruby again (as it used to -# in Olena 0.11). Moreover, the user should be given the choice -# between the front ends (Python, Ruby, etc.); enabling Swilena shall -# not systematically imply compiling the *whole* back ends! -# -# # Check for Ruby. -# AC_CHECK_PROGS([RUBY], [ruby], [$am_aux_dir/missing ruby]) -# if test "x$RUBY" = "x$am_aux_dir/missing ruby"; then -# AC_MSG_ERROR([no suitable Ruby interpreter found]) -# fi -# -# AC_ARG_VAR([RUBY_CPPFLAGS], [Path to ruby.h]) -# AC_ARG_WITH([ruby-includedir], [Include path for ruby.h], -# [RUBY_CPPFLAGS="-I$withval"], -# [RUBY_CPPFLAGS="-I`$RUBY -e 'puts $:.join("\n")' | \ -# while read line -# do -# if [[ -f ${line}/ruby.h ]]; then -# echo $line -# fi -# done`"]) -# save_CPPFLAGS=$CPPFLAGS -# CPPFLAGS="$CPPFLAGS $RUBY_CPPFLAGS" -# AC_CHECK_HEADERS([ruby.h], [], -# [AC_MSG_ERROR( -# [You need Ruby development files to compile the Ruby interface.])]) -# CPPFLAGS=$save_CPPFLAGS - - 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.35 is required. - Use `--without-swig' to disable SWIG modules.]);; - esac -fi - -case $oln_has_swig in - yes) $1;; - * ) $2;; -esac -]) - -# OLN_WITH_SWILENA(WITH, WITHOUT) -# ------------------------------- -# Should we build Swilena or not. -AC_DEFUN([OLN_WITH_SWILENA], -[AC_CACHE_CHECK([whether building Swilena], - [oln_cv_with_swilena], - [_OLN_WITH_SWIG([oln_cv_with_swilena=yes], - [oln_cv_with_swilena=no])]) -case $oln_cv_with_swilena in - yes) $1;; - no ) $2;; - *) AC_MSG_ERROR([incorrect oln_cv_with_swilena value: $oln_cv_with_swilena]);; -esac -]) -- 1.5.6.5

1 0

last-svn-commit-123-g03908bb Require Python >= 2.4 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 | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39fe1e3..6ccefd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2010-04-09 Roland Levillain <roland(a)lrde.epita.fr> + Require Python >= 2.4 for Swilena. + + * m4/with-swilena.m4 (_OLN_WITH_SWIG): 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/m4/with-swilena.m4 b/m4/with-swilena.m4 index c33b72c..a5b968f 100644 --- a/m4/with-swilena.m4 +++ b/m4/with-swilena.m4 @@ -45,7 +45,7 @@ esac if test x$with_swig != xno; then oln_has_swig=yes - AM_PATH_PYTHON([2.5]) + AM_PATH_PYTHON([2.4]) adl_CHECK_PYTHON # Check for Python and SWIG. -- 1.5.6.5

1 0

branch next updated: last-svn-commit-122-ga1b8610
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 discards ab9ba6d053657847f4e24549727afaed347fa1c5 (commit) This update discarded existing revisions and left the branch pointing at a previous point in the repository history. * -- * -- N (a1b86103434c66825a1a089e7bc039f62761b692) \ O -- O -- O (ab9ba6d053657847f4e24549727afaed347fa1c5) The removed revisions are not necessarilly gone - if another reference still refers to them they will stay in the repository. No new revisions were added by this update. Summary of changes: ChangeLog | 6 ------ README | 2 +- 2 files changed, 1 insertions(+), 7 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch next updated: last-svn-commit-123-gab9ba6d
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 ab9ba6d053657847f4e24549727afaed347fa1c5 (commit) via a1b86103434c66825a1a089e7bc039f62761b692 (commit) from 10c5d398cd691716db99d2ab6f78d48f7762a75d (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 ----------------------------------------------------------------- ab9ba6d Explain properly how to build Swilena. a1b8610 Require SWIG >= 1.3.35 for Swilena. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 12 ++++++++++++ README | 2 +- m4/with-swilena.m4 | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0