- Olena-patches

olena-2.0-40-g7293e08 demo/viewer/runner.cc: Make xml2doc binary lookup more robust.
by Guillaume Lazzara 23 May '12

23 May '12

--- scribo/ChangeLog | 4 ++++ scribo/demo/viewer/runner.cc | 16 +++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index bd888be..d01f048 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + * demo/viewer/runner.cc: Make xml2doc binary lookup more robust. + 2011-12-07 Guillaume Lazzara <z(a)lrde.epita.fr> * src/scribo-cli.in: Move shebang on first line. diff --git a/scribo/demo/viewer/runner.cc b/scribo/demo/viewer/runner.cc index 05ddac5..fe6732f 100644 --- a/scribo/demo/viewer/runner.cc +++ b/scribo/demo/viewer/runner.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010, 2011, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -50,9 +50,15 @@ QString get_pathto(const QString& file, // Installed in a specific path but moved elsewhere ? QDir dir(QCoreApplication::applicationDirPath()); dir.cdUp(); // move from prefix/bin to prefix/ - f.setFileName(dir.currentPath() + "/libexec/scribo" + file); - if (f.exists()) - return dir.currentPath() + "/libexec/scribo"; + + const char *path[] = { "lib", "libexec", 0 }; + + for (int i = 0; path[i]; ++i) + { + f.setFileName(dir.currentPath() + QString("/%1/scribo").arg(path[i]) + file); + if (f.exists()) + return dir.currentPath() + QString("/%1/scribo").arg(path[i]); + } qDebug() << "FATAL ERROR: Can't locate file: " + file; -- 1.7.2.5

1 0

olena-2.0-39-g7c61b39 Add missing description in manpages.
by Guillaume Lazzara 22 May '12

22 May '12

* debian/scribo-cli.1, * debian/scribo-viewer.1: Here. --- ChangeLog | 7 +++++++ debian/scribo-cli.1 | 2 +- debian/scribo-viewer.1 | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 21cf8ee..928d28e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> + Add missing description in manpages. + + * debian/scribo-cli.1, + * debian/scribo-viewer.1: Here. + +2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix Lintian warnings. * debian/changelog: Update date. diff --git a/debian/scribo-cli.1 b/debian/scribo-cli.1 index df5cc0e..5ba7e26 100644 --- a/debian/scribo-cli.1 +++ b/debian/scribo-cli.1 @@ -1,6 +1,6 @@ .TH "SCRIBO-CLI" "1" "" "" "" .SH "NAME" -Scribo-cli +Scribo-cli \- Command line Inteface for Scribo. .SH "DESCRIPTION" .PP Olena's Scribo module commande-line utilities to analyse, segment and diff --git a/debian/scribo-viewer.1 b/debian/scribo-viewer.1 index e621cc5..10fb55e 100644 --- a/debian/scribo-viewer.1 +++ b/debian/scribo-viewer.1 @@ -1,6 +1,6 @@ .TH "SCRIBO-VIEWER" "1" "" "" "" .SH "NAME" -Scribo-viewer +Scribo-viewer \- Graphical Interface for Document Image Analysis .SH "DESCRIPTION" .PP Graphical User Interface for segmenting, analysing and reconstructing -- 1.7.2.5

1 0

olena-2.0-38-g8b07f49 Fix Lintian warnings.
by Guillaume Lazzara 22 May '12

22 May '12

* debian/changelog: Update date. * debian/compat: Increase minimum required version of debhelper. * debian/control: Add dependencies and fix description. * debian/olena.menu, * debian/copyright: Add a missing endline. * debian/gbp.conf: New. * debian/olena-dev.manpages: Rename to... * debian/olena-bin.manpages: ... this. * debian/rules: Use standard target names. * debian/watch: New. --- ChangeLog | 22 +++++++++++++++++++ debian/changelog | 4 +- debian/compat | 5 +++- debian/control | 24 +++++++++++++------- debian/copyright | 2 +- debian/gbp.conf | 7 ++++++ debian/olena-bin.install | 2 +- debian/{olena-dev.manpages => olena-bin.manpages} | 0 debian/olena.menu | 3 +- debian/rules | 12 +++++----- debian/source/format | 4 +- debian/watch | 5 ++++ 12 files changed, 66 insertions(+), 24 deletions(-) create mode 100644 debian/gbp.conf rename debian/{olena-dev.manpages => olena-bin.manpages} (100%) create mode 100644 debian/watch diff --git a/ChangeLog b/ChangeLog index f5d9933..21cf8ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,27 @@ 2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix Lintian warnings. + + * debian/changelog: Update date. + + * debian/compat: Increase minimum required version of debhelper. + + * debian/control: Add dependencies and fix description. + + * debian/olena.menu, + * debian/copyright: Add a missing endline. + + * debian/gbp.conf: New. + + * debian/olena-dev.manpages: Rename to... + * debian/olena-bin.manpages: ... this. + + * debian/rules: Use standard target names. + + * debian/watch: New. + +2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> + Add options for dpkg-source. * debian/source/format: Force dpkg-source 3.0. diff --git a/debian/changelog b/debian/changelog index 6fe7392..c0656c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -olena (2.0-1) unstable; urgency=low +olena (2.0-1) testing; urgency=low * Initial release. - -- Olena Team <olena(a)lrde.epita.fr> Fri, 16 Sep 2011 22:35:27 +0200 + -- Olena Team <olena(a)lrde.epita.fr> Fri, 22 May 2012 22:35:27 +0200 diff --git a/debian/compat b/debian/compat index 7ed6ff8..0251a88 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1,4 @@ -5 +8 +# Specifies the "compatibility level" for the debhelper tool +# See http://wiki.debian.org/IntroDebianPackaging + diff --git a/debian/control b/debian/control index 8e91275..d74f69b 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Homepage: http://olena.lrde.epita.fr Package: olena Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, olena-dev, olena-bin -Description: An Image Processing Platform. +Description: Image Processing Platform written in C++. Install the whole plaform. . This is a meta-package. @@ -21,10 +21,14 @@ Description: An Image Processing Platform. Package: olena-bin Architecture: any Depends: - libtesseract-dev (>= 3.02), - libgraphicsmagick++1-dev, - graphicsmagick-libmagick-dev-compat, - libqt4-dev + ${shlibs:Depends}, + ${misc:Depends}, + libtesseract-dev (>= 3.02), + libgraphicsmagick++1-dev, + graphicsmagick-libmagick-dev-compat, + libqt4-dev, + xsltproc, + fop Description: Tools based on Olena. It includes several tools for manipulating images. @@ -32,11 +36,13 @@ Description: Tools based on Olena. Package: olena-dev Architecture: all +Depends: + ${misc:Depends} Recommends: - libgraphicsmagick++1-dev, - graphicsmagick-libmagick-dev-compat, + libgraphicsmagick++1-dev, + graphicsmagick-libmagick-dev-compat, Suggests: - libqt4-dev, - libtesseract-dev (>= 3.02) + libqt4-dev, + libtesseract-dev (>= 3.02) Description: Development files for Olena. It includes HTML documentation and C++ headers. diff --git a/debian/copyright b/debian/copyright index e6130ab..dc2134d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,2 +1,2 @@ Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) -The content of this package is under GPLv2 License. \ No newline at end of file +The content of this package is under GPLv2 License. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..27e3b6a --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,7 @@ +[DEFAULT] +# this is the upstream-branch: +upstream-branch=next + +[git-buildpackage] +export-dir = ../build-area/ +builder = debuild -i'\.git' -I.git \ No newline at end of file diff --git a/debian/olena-bin.install b/debian/olena-bin.install index d333438..34b2678 100644 --- a/debian/olena-bin.install +++ b/debian/olena-bin.install @@ -1,2 +1,2 @@ usr/bin/* -usr/libexec/scribo/* +usr/lib/scribo/* diff --git a/debian/olena-dev.manpages b/debian/olena-bin.manpages similarity index 100% rename from debian/olena-dev.manpages rename to debian/olena-bin.manpages diff --git a/debian/olena.menu b/debian/olena.menu index 7993c23..99165ab 100644 --- a/debian/olena.menu +++ b/debian/olena.menu @@ -1,4 +1,3 @@ - ?package(olena):needs="text" section="Apps/Tools" \ title="Olena" command="/usr/bin/olena" \ - icon="/usr/share/pixmaps/olena.xpm" \ No newline at end of file + icon="/usr/share/pixmaps/olena.xpm" diff --git a/debian/rules b/debian/rules index 4aa335a..8e0f6d5 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,7 @@ build: build-stamp build-stamp: dh_testdir ./bootstrap - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-scribo --prefix=/usr + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-scribo --prefix=/usr --libexecdir=/usr/lib $(MAKE) touch $@ @@ -32,7 +32,7 @@ clean: dh_testdir dh_testroot rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP# - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean rm -f config.{sub,guess,status,log} dh_clean @@ -44,7 +44,7 @@ install: build $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install # Build architecture independant packages. -binary-indep: build install +build-indep: build install dh_testdir dh_testroot dh_installchangelogs -i @@ -59,7 +59,7 @@ binary-indep: build install dh_builddeb -i # Build architecture dependant packages. -binary-arch: build install +build-arch: build install dh_testdir dh_testroot dh_installchangelogs -a @@ -83,6 +83,6 @@ binary-arch: build install dh_md5sums -a dh_builddeb -a -binary: binary-arch binary-indep +binary: build-arch build-indep -.PHONY: install build clean binary-indep binary-arch binary +.PHONY: install build clean build-indep build-arch binary diff --git a/debian/source/format b/debian/source/format index 8404db8..a671065 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1,3 +1,3 @@ +3.0 (quilt) # Switch to dpkg-source 3.0 (quilt) format -# See http://wiki.debian.org/Projects/DebSrc3.0 -3.0 (quilt) \ No newline at end of file +# See http://wiki.debian.org/Projects/DebSrc3.0 \ No newline at end of file diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..2235b96 --- /dev/null +++ b/debian/watch @@ -0,0 +1,5 @@ +# Used to check for newer versions of upstream software is available +# and to download it if necessary. +# See http://wiki.debian.org/debian/watch/ +version=3 +http://www.lrde.epita.fr/dload/olena/olena-(.+).tar.bz2 \ No newline at end of file -- 1.7.2.5

1 0

branch lambdas-as-milena-functions updated: olena-2.0-4-g8fa6d86
by git＠lrde.epita.fr 22 May '12

22 May '12

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 lambdas-as-milena-functions has been updated via 8fa6d867f923cd7f7b7ca5d4d4e308fb0a9dc9a7 (commit) via 1a8f8432210c92df9f46f4daa66839953d59d286 (commit) via a067f791e3cd82592e0a87a353992be93d148ac9 (commit) from 9a717ea467c439f46436fdf3a66d2df44e5d23bc (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 ----------------------------------------------------------------- 8fa6d86 Exercise mln::transform with lambdas with more than one argument. 1a8f843 Simplify and generalize the wrapping of lambdas in Milena functions. a067f79 Clean up tests/data/transform-lambda.cc. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 28 +++++++++ milena/tests/data/transform-lambda.cc | 101 ++++++++++++++++++++------------- 2 files changed, 90 insertions(+), 39 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-4-g8fa6d86 Exercise mln::transform with lambdas with more than one argument.
by Roland Levillain 22 May '12

22 May '12

* tests/data/transform-lambda.cc (mln::fun::C< R (*)(A1, A2) >): New explicit class template specialization. (mln::category< R (*)(A1, A2) >): Likewise. (main): Use `mln::test::predicate' and a binary lambda to check the output instead of a hand-made browsing. --- milena/ChangeLog | 10 ++++++ milena/tests/data/transform-lambda.cc | 55 ++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a4f8dfb..e8c17cd 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2012-05-22 Roland Levillain <roland(a)lrde.epita.fr> + Exercise mln::transform with lambdas with more than one argument. + + * tests/data/transform-lambda.cc (mln::fun::C< R (*)(A1, A2) >): + New explicit class template specialization. + (mln::category< R (*)(A1, A2) >): Likewise. + (main): Use `mln::test::predicate' and a binary lambda to check + the output instead of a hand-made browsing. + +2012-05-22 Roland Levillain <roland(a)lrde.epita.fr> + Simplify and generalize the wrapping of lambdas in Milena functions. * tests/data/transform-lambda.cc (first_arg_of, return_of): diff --git a/milena/tests/data/transform-lambda.cc b/milena/tests/data/transform-lambda.cc index 1873b16..242a3e8 100644 --- a/milena/tests/data/transform-lambda.cc +++ b/milena/tests/data/transform-lambda.cc @@ -36,6 +36,55 @@ #include <mln/data/transform.hh> #include <mln/debug/iota.hh> +#include <mln/test/predicate.hh> + + +/*---------------------------------------------------. +| Extension of mln::fun::C to 2-argument functions. | +`---------------------------------------------------*/ + +// FIXME: To be completed, revamped and moved into Milena. +namespace mln +{ + + /// Category declaration for a unary C function. + template <typename R, typename A1, typename A2> + struct category< R (*)(A1, A2) > + { + typedef C_Function<void> ret; + }; + + namespace fun + { + + /// Wrapper of a pointer to a 2-argument function into a Milena + /// function. + template <typename R, typename A1, typename A2> + struct C< R (*)(A1, A2) > + : + // FIXME: Hard-coded base class, so as to make this part of the + // code as small as possible for this test. + // + // This functor should inherit from either `Function_vv2b' or + // `Function_vv2b', depending on the result type. See how it is + // implemented in `C< R (*)(A) >' (located in mln/fun/c.hh). + Function_vv2b< C< R (*)(A1, A2) > > + { + C() {} + C(R (*f)(A1, A2)) : f_(f) {} + typedef R result; + R operator()(const mlc_unqualif(A1)& a, const mlc_unqualif(A2)& b) const + { + return f_(a, b); + } + protected: + R (*f_)(A1, A2); + }; + + } // end of namespace mln::fun + +} // end of namespace mln::fun + /*----------------. | Lambda traits. | @@ -92,8 +141,6 @@ main() I output = data::transform(input, to_fun([](V x) { return x * x; })); - // FIXME: Or use mln::test instead? - mln_piter_(I) p(output.domain()); - for_all(p) - mln_assertion(output(p) = math::sqr(input(p))); + mln_assertion(test::predicate(output, input, + to_fun([](V x, V y) { return x == y * y; }))); } -- 1.7.2.5

1 0

olena-2.0-3-g1a8f843 Simplify and generalize the wrapping of lambdas in Milena functions.
by Roland Levillain 22 May '12

22 May '12

* tests/data/transform-lambda.cc (first_arg_of, return_of): Remove traits. (fun_ptr): New trait. (to_fun): Adjust. Use `fun_ptr' instead of `first_arg_of' and `return_of' to create a more general pointer-to-function-based Milena functor. --- milena/ChangeLog | 11 ++++++++ milena/tests/data/transform-lambda.cc | 42 ++++++++------------------------ 2 files changed, 22 insertions(+), 31 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 745b3b6..a4f8dfb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2012-05-22 Roland Levillain <roland(a)lrde.epita.fr> + Simplify and generalize the wrapping of lambdas in Milena functions. + + * tests/data/transform-lambda.cc (first_arg_of, return_of): + Remove traits. + (fun_ptr): New trait. + (to_fun): Adjust. Use `fun_ptr' instead of `first_arg_of' and + `return_of' to create a more general pointer-to-function-based + Milena functor. + +2012-05-22 Roland Levillain <roland(a)lrde.epita.fr> + Clean up tests/data/transform-lambda.cc. * tests/data/transform-lambda.cc (main): Remove a useless lambda. diff --git a/milena/tests/data/transform-lambda.cc b/milena/tests/data/transform-lambda.cc index d2cf485..1873b16 100644 --- a/milena/tests/data/transform-lambda.cc +++ b/milena/tests/data/transform-lambda.cc @@ -41,38 +41,20 @@ | Lambda traits. | `----------------*/ -// Metaprogramming traits for the deduction of return and argument -// types of lambda asbtractions. Inspired from +// Metaprogramming trait for the deduction of the pointer-to-function +// type equivalent to the type of a lambda asbtraction. Inspired from // http://stackoverflow.com/questions/6512019/can-we-get-the-type-of-a-lambda-… -/// Deduce the type of \p F's first argument. template <typename F> -struct first_arg_of +struct fun_ptr { - template <typename Ret, typename A, typename... Rest> - static A - helper(Ret (F::*)(A, Rest...)); + template <typename Ret, typename... Rest> + static auto + helper(Ret (F::*)(Rest...)) -> Ret(*)(Rest...); - template <typename Ret, typename A, typename... Rest> - static A - helper(Ret (F::*)(A, Rest...) const); - - typedef decltype( helper(&F::operator()) ) type; -}; - -/// Deduce the type of \p F's first argument. -/// -/// This traits works with lambdas, whereas std::result_of does not. -template <typename F> -struct return_of -{ - template <typename Ret, typename A, typename... Rest> - static Ret - helper(Ret (F::*)(A, Rest...)); - - template <typename Ret, typename A, typename... Rest> - static Ret - helper(Ret (F::*)(A, Rest...) const); + template <typename Ret, typename... Rest> + static auto + helper(Ret (F::*)(Rest...) const) -> Ret(*)(Rest...); typedef decltype( helper(&F::operator()) ) type; }; @@ -82,13 +64,11 @@ struct return_of | Conversion routine. | `---------------------*/ -/// Convert a lambda abstraction into a Milena function (functor). - template <typename F> auto -to_fun (F f) -> mln::fun::C< typename return_of<F>::type (*) (typename first_arg_of<F>::type) > +to_fun (F f) -> mln::fun::C< typename fun_ptr<F>::type > { - return mln::fun::C< typename return_of<F>::type (*) (typename first_arg_of<F>::type) > (f); + return mln::fun::C< typename fun_ptr<F>::type > (f); } -- 1.7.2.5

1 0

olena-2.0-2-ga067f79 Clean up tests/data/transform-lambda.cc.
by Roland Levillain 22 May '12

22 May '12

* tests/data/transform-lambda.cc (main): Remove a useless lambda. Do not write the output image on the standard output. --- milena/ChangeLog | 7 +++++++ milena/tests/data/transform-lambda.cc | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 65f6803..745b3b6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2012-05-22 Roland Levillain <roland(a)lrde.epita.fr> + Clean up tests/data/transform-lambda.cc. + + * tests/data/transform-lambda.cc (main): Remove a useless lambda. + Do not write the output image on the standard output. + +2012-05-22 Roland Levillain <roland(a)lrde.epita.fr> + Add an optional test to exercise mln::transform with lambdas. * tests/data/transform-lambda.cc: New. diff --git a/milena/tests/data/transform-lambda.cc b/milena/tests/data/transform-lambda.cc index 25de53a..d2cf485 100644 --- a/milena/tests/data/transform-lambda.cc +++ b/milena/tests/data/transform-lambda.cc @@ -35,7 +35,6 @@ #include <mln/data/transform.hh> #include <mln/debug/iota.hh> -#include <mln/debug/println.hh> /*----------------. @@ -111,10 +110,7 @@ main() I input(3, 3); debug::iota(input); - auto sqr = [](V x) { return x * x; }; - I output = data::transform(input, to_fun([](V x) { return x * x; })); - debug::println(output); // FIXME: Or use mln::test instead? mln_piter_(I) p(output.domain()); -- 1.7.2.5

1 0

branch lambdas-as-milena-functions created: olena-2.0-1-g9a717ea
by git＠lrde.epita.fr 22 May '12

22 May '12

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 lambdas-as-milena-functions has been created at 9a717ea467c439f46436fdf3a66d2df44e5d23bc (commit) - Log ----------------------------------------------------------------- 9a717ea Add an optional test to exercise mln::transform with lambdas. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-1-g9a717ea Add an optional test to exercise mln::transform with lambdas.
by Roland Levillain 22 May '12

22 May '12

* tests/data/transform-lambda.cc: New. * tests/data/Makefile.am (EXTRA_PROGRAMS) (transform_lambda_SOURCES): New. (extra-check): New (phony) target. --- milena/ChangeLog | 9 +++ milena/tests/data/Makefile.am | 12 +++ milena/tests/data/transform-lambda.cc | 123 +++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+), 0 deletions(-) create mode 100644 milena/tests/data/transform-lambda.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 5712ee9..65f6803 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2012-05-22 Roland Levillain <roland(a)lrde.epita.fr> + + Add an optional test to exercise mln::transform with lambdas. + + * tests/data/transform-lambda.cc: New. + * tests/data/Makefile.am (EXTRA_PROGRAMS) + (transform_lambda_SOURCES): New. + (extra-check): New (phony) target. + 2011-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> Fix Scribo build system. diff --git a/milena/tests/data/Makefile.am b/milena/tests/data/Makefile.am index 205337e..269567b 100644 --- a/milena/tests/data/Makefile.am +++ b/milena/tests/data/Makefile.am @@ -74,3 +74,15 @@ MOSTLYCLEANFILES = \ median-out_line.pgm \ median-out_rect.pgm \ median_fast-out.pgm + + +# FIXME: We should introduce a conditional (e.g named HAVE_CXX_LAMBDA) +# to guard these lines, and make them actually part of the test suite +# if the C++ compiler found by `configure' supports lambda +# abstractions. +EXTRA_PROGRAMS = transform-lambda +transform_lambda_SOURCES = transform-lambda.cc + +.PHONY: extra-check +extra-check: transform-lambda + ./transform-lambda$(EXEEXT) diff --git a/milena/tests/data/transform-lambda.cc b/milena/tests/data/transform-lambda.cc new file mode 100644 index 0000000..25de53a --- /dev/null +++ b/milena/tests/data/transform-lambda.cc @@ -0,0 +1,123 @@ +// Copyright (C) 2012 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 +/// Exercise mln::data::transform with a lambda abstraction. + +#include <type_traits> + +#include <mln/core/concept/function.hh> +#include <mln/fun/c.hh> + +#include <mln/core/image/image2d.hh> + +#include <mln/data/transform.hh> +#include <mln/debug/iota.hh> +#include <mln/debug/println.hh> + + +/*----------------. +| Lambda traits. | +`----------------*/ + +// Metaprogramming traits for the deduction of return and argument +// types of lambda asbtractions. Inspired from +// http://stackoverflow.com/questions/6512019/can-we-get-the-type-of-a-lambda-… + +/// Deduce the type of \p F's first argument. +template <typename F> +struct first_arg_of +{ + template <typename Ret, typename A, typename... Rest> + static A + helper(Ret (F::*)(A, Rest...)); + + template <typename Ret, typename A, typename... Rest> + static A + helper(Ret (F::*)(A, Rest...) const); + + typedef decltype( helper(&F::operator()) ) type; +}; + +/// Deduce the type of \p F's first argument. +/// +/// This traits works with lambdas, whereas std::result_of does not. +template <typename F> +struct return_of +{ + template <typename Ret, typename A, typename... Rest> + static Ret + helper(Ret (F::*)(A, Rest...)); + + template <typename Ret, typename A, typename... Rest> + static Ret + helper(Ret (F::*)(A, Rest...) const); + + typedef decltype( helper(&F::operator()) ) type; +}; + + +/*---------------------. +| Conversion routine. | +`---------------------*/ + +/// Convert a lambda abstraction into a Milena function (functor). + +template <typename F> +auto +to_fun (F f) -> mln::fun::C< typename return_of<F>::type (*) (typename first_arg_of<F>::type) > +{ + return mln::fun::C< typename return_of<F>::type (*) (typename first_arg_of<F>::type) > (f); +} + + +/*-------. +| Test. | +`-------*/ + +int +main() +{ + using namespace mln; + + // FIXME: Replacing unsigned by int_u8 would trigger a bug here, as + // the (low quantization) implementation of data::transform would + // create values that would not fit in int_u8 (e.g. sqr(16) = 256). + typedef unsigned V; + typedef image2d<V> I; + + I input(3, 3); + debug::iota(input); + + auto sqr = [](V x) { return x * x; }; + + I output = data::transform(input, to_fun([](V x) { return x * x; })); + debug::println(output); + + // FIXME: Or use mln::test instead? + mln_piter_(I) p(output.domain()); + for_all(p) + mln_assertion(output(p) = math::sqr(input(p))); +} -- 1.7.2.5

1 0

olena-2.0-36-gc3a81b5 debian/control: Add dependencies.
by Guillaume Lazzara 22 May '12

22 May '12

--- ChangeLog | 4 ++++ debian/control | 20 +++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index dda2b9e..87179d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + * debian/control: Add dependencies. + 2012-01-30 Guillaume Lazzara <z(a)lrde.epita.fr> * debian/HOWTO: Add more details. diff --git a/debian/control b/debian/control index c0e6c58..8e91275 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,10 @@ Priority: extra Maintainer: Olena Team <olena(a)lrde.epita.fr> Build-Depends: debhelper (>= 5), autotools-dev, dpkg-dev (>= 1.13.19) Standards-Version: 3.9.1 +Vcs-Browser: https://trac.lrde.epita.fr/olena/browser +Vcs-Git: git://git.lrde.epita.fr/olena +Homepage: http://olena.lrde.epita.fr + Package: olena Architecture: all @@ -11,14 +15,28 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, olena-dev, olena-bin Description: An Image Processing Platform. Install the whole plaform. . - This is a meta-package + This is a meta-package. + Package: olena-bin Architecture: any +Depends: + libtesseract-dev (>= 3.02), + libgraphicsmagick++1-dev, + graphicsmagick-libmagick-dev-compat, + libqt4-dev Description: Tools based on Olena. It includes several tools for manipulating images. + + Package: olena-dev Architecture: all +Recommends: + libgraphicsmagick++1-dev, + graphicsmagick-libmagick-dev-compat, +Suggests: + libqt4-dev, + libtesseract-dev (>= 3.02) Description: Development files for Olena. It includes HTML documentation and C++ headers. -- 1.7.2.5

1 0