Olena-patches June 2012

olena-patches@lrde.epita.fr

6 participants
147 discussions

olena-2.0-28-g223d19d Strip and remove files to match distributed files.

by Roland Levillain

* configure.ac, * milena/mln/accu/math/all.hh, * milena/mln/all.hh, * milena/mln/core/image/vmorph/all.hh, * milena/mln/core/image/vmorph/fun_image.hh, * milena/mln/data/all.hh, * milena/mln/essential/routine.hh, * milena/mln/fun/all.hh, * milena/mln/fun/essential.hh, * milena/mln/fun/v2v/all.hh, * milena/mln/fun/v2v/essential.hh, * milena/mln/linear/all.hh, * milena/mln/trait/all.hh, * milena/mln/trait/ch_value.hh, * milena/mln/value/all.hh, * milena/mln/value/essential.hh, * milena/tests/Makefile.am, * milena/tests/convert/Makefile.am, * milena/tests/extract/Makefile.am, * milena/tests/fun/v2v/Makefile.am, * milena/tests/linear/Makefile.am, * milena/tests/linear/gaussian/Makefile.am, * milena/tests/registration/Makefile.am, * milena/tests/trait/ch_value.cc, * milena/tests/value/Makefile.am: Strip (some) parts between tags `<<lrde' and `>>'. * Makefile.am: Likewise. (LRDE_STRIPPED_DIST_FILES, LRDE_NODIST_FILES, dist-hook): Remove. * milena/tests/convert/to_hsl.cc, * milena/tests/extract/blue.cc, * milena/tests/extract/green.cc, * milena/tests/extract/hue.cc, * milena/tests/extract/lum.cc, * milena/tests/extract/red.cc, * milena/tests/extract/sat.cc, * milena/tests/fun/v2v/component.cc, * milena/tests/linear/gaussian/filter.cc, * milena/tests/registration/registration.cc, * milena/tests/value/stack.cc: Remove. * build-aux/strip-lrde: Remove. --- ChangeLog | 46 +++++++++++++++ Makefile.am | 89 +---------------------------- build-aux/strip-lrde | 23 -------- configure.ac | 10 --- milena/mln/accu/math/all.hh | 5 -- milena/mln/all.hh | 12 +--- milena/mln/core/image/vmorph/all.hh | 5 +- milena/mln/core/image/vmorph/fun_image.hh | 4 +- milena/mln/data/all.hh | 4 +- milena/mln/essential/routine.hh | 12 +--- milena/mln/fun/all.hh | 8 +-- milena/mln/fun/essential.hh | 4 +- milena/mln/fun/v2v/all.hh | 10 +--- milena/mln/fun/v2v/essential.hh | 4 +- milena/mln/linear/all.hh | 12 ---- milena/mln/trait/all.hh | 6 -- milena/mln/trait/ch_value.hh | 19 ------ milena/mln/value/all.hh | 8 --- milena/mln/value/essential.hh | 5 -- milena/tests/Makefile.am | 9 +--- milena/tests/convert/Makefile.am | 10 +--- milena/tests/convert/to_hsl.cc | 44 -------------- milena/tests/extract/Makefile.am | 20 +------ milena/tests/extract/blue.cc | 47 --------------- milena/tests/extract/green.cc | 47 --------------- milena/tests/extract/hue.cc | 47 --------------- milena/tests/extract/lum.cc | 47 --------------- milena/tests/extract/red.cc | 47 --------------- milena/tests/extract/sat.cc | 47 --------------- milena/tests/fun/v2v/Makefile.am | 8 +-- milena/tests/fun/v2v/component.cc | 69 ---------------------- milena/tests/linear/Makefile.am | 13 +---- milena/tests/linear/gaussian/Makefile.am | 13 +---- milena/tests/linear/gaussian/filter.cc | 48 --------------- milena/tests/registration/Makefile.am | 9 +-- milena/tests/registration/registration.cc | 55 ------------------ milena/tests/trait/ch_value.cc | 12 ---- milena/tests/value/Makefile.am | 8 +-- milena/tests/value/stack.cc | 55 ------------------ 39 files changed, 73 insertions(+), 868 deletions(-) delete mode 100755 build-aux/strip-lrde delete mode 100644 milena/tests/convert/to_hsl.cc delete mode 100644 milena/tests/extract/blue.cc delete mode 100644 milena/tests/extract/green.cc delete mode 100644 milena/tests/extract/hue.cc delete mode 100644 milena/tests/extract/lum.cc delete mode 100644 milena/tests/extract/red.cc delete mode 100644 milena/tests/extract/sat.cc delete mode 100644 milena/tests/fun/v2v/component.cc delete mode 100644 milena/tests/linear/gaussian/filter.cc delete mode 100644 milena/tests/registration/registration.cc delete mode 100644 milena/tests/value/stack.cc diff --git a/ChangeLog b/ChangeLog index 6f2cfc5..f73582f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,49 @@ +2012-06-11 Roland Levillain <roland(a)lrde.epita.fr> + + Strip and remove files to match distributed files. + + * configure.ac, + * milena/mln/accu/math/all.hh, + * milena/mln/all.hh, + * milena/mln/core/image/vmorph/all.hh, + * milena/mln/core/image/vmorph/fun_image.hh, + * milena/mln/data/all.hh, + * milena/mln/essential/routine.hh, + * milena/mln/fun/all.hh, + * milena/mln/fun/essential.hh, + * milena/mln/fun/v2v/all.hh, + * milena/mln/fun/v2v/essential.hh, + * milena/mln/linear/all.hh, + * milena/mln/trait/all.hh, + * milena/mln/trait/ch_value.hh, + * milena/mln/value/all.hh, + * milena/mln/value/essential.hh, + * milena/tests/Makefile.am, + * milena/tests/convert/Makefile.am, + * milena/tests/extract/Makefile.am, + * milena/tests/fun/v2v/Makefile.am, + * milena/tests/linear/Makefile.am, + * milena/tests/linear/gaussian/Makefile.am, + * milena/tests/registration/Makefile.am, + * milena/tests/trait/ch_value.cc, + * milena/tests/value/Makefile.am: + Strip (some) parts between tags `<<lrde' and `>>'. + * Makefile.am: Likewise. + (LRDE_STRIPPED_DIST_FILES, LRDE_NODIST_FILES, dist-hook): Remove. + * milena/tests/convert/to_hsl.cc, + * milena/tests/extract/blue.cc, + * milena/tests/extract/green.cc, + * milena/tests/extract/hue.cc, + * milena/tests/extract/lum.cc, + * milena/tests/extract/red.cc, + * milena/tests/extract/sat.cc, + * milena/tests/fun/v2v/component.cc, + * milena/tests/linear/gaussian/filter.cc, + * milena/tests/registration/registration.cc, + * milena/tests/value/stack.cc: + Remove. + * build-aux/strip-lrde: Remove. + 2011-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> * m4/oln-with-lib.m4: Lookup for multiple AND single libraries diff --git a/Makefile.am b/Makefile.am index 66dc10c..a3e3eed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2006, 2007, 2008, 2009, 2010 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2012 EPITA Research and +# Development Laboratory (LRDE). # # This file is part of Olena. # @@ -38,55 +38,6 @@ include $(top_srcdir)/build-aux/regen-recursive.mk REGEN_SUBDIRS += milena scribo -#<<lrde -## FIXME: All of this it too much ad hoc. Use Git branches to -## distinguish distributed files from non distributed ones after the -## conversion of the repository. - -LRDE_STRIPPED_DIST_FILES = \ - $(distdir)/Makefile.am \ - $(distdir)/configure.ac \ - $(distdir)/milena/mln/accu/math/all.hh \ - $(distdir)/milena/mln/all.hh \ - $(distdir)/milena/mln/core/image/vmorph/all.hh \ - $(distdir)/milena/mln/core/image/vmorph/fun_image.hh \ - $(distdir)/milena/mln/data/all.hh \ - $(distdir)/milena/mln/essential/routine.hh \ - $(distdir)/milena/mln/fun/all.hh \ - $(distdir)/milena/mln/fun/essential.hh \ - $(distdir)/milena/mln/fun/v2v/all.hh \ - $(distdir)/milena/mln/fun/v2v/essential.hh \ - $(distdir)/milena/mln/linear/all.hh \ - $(distdir)/milena/mln/trait/all.hh \ - $(distdir)/milena/mln/trait/ch_value.hh \ - $(distdir)/milena/mln/value/all.hh \ - $(distdir)/milena/mln/value/essential.hh \ - $(distdir)/milena/tests/Makefile.am \ - $(distdir)/milena/tests/convert/Makefile.am \ - $(distdir)/milena/tests/extract/Makefile.am \ - $(distdir)/milena/tests/fun/v2v/Makefile.am \ - $(distdir)/milena/tests/linear/Makefile.am \ - $(distdir)/milena/tests/linear/gaussian/Makefile.am \ - $(distdir)/milena/tests/registration/Makefile.am \ - $(distdir)/milena/tests/trait/ch_value.cc \ - $(distdir)/milena/tests/value/Makefile.am - -LRDE_NODIST_FILES = \ - $(distdir)/milena/tests/convert/to_hsl.cc \ - $(distdir)/milena/tests/extract/blue.cc \ - $(distdir)/milena/tests/extract/green.cc \ - $(distdir)/milena/tests/extract/hue.cc \ - $(distdir)/milena/tests/extract/lum.cc \ - $(distdir)/milena/tests/extract/red.cc \ - $(distdir)/milena/tests/extract/sat.cc \ - $(distdir)/milena/tests/fun/v2v/component.cc \ - $(distdir)/milena/tests/fun/v2v/hsl_to_rgb.cc \ - $(distdir)/milena/tests/fun/v2v/rgb_to_hsl.cc \ - $(distdir)/milena/tests/linear/gaussian.cc \ - $(distdir)/milena/tests/linear/gaussian/filter.cc \ - $(distdir)/milena/tests/registration/registration.cc \ - $(distdir)/milena/tests/value/stack.cc - PORTFILE=distrib/macports/Portfile TARBALL_GZ=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz @@ -115,41 +66,6 @@ CLEANFILES = $(PORTFILE) port: $(PORTFILE) -## FIXME: Running `build-aux/build_unit_test.sh' just to update -## `milena/tests/unit_test/unit-tests.mk' is overkill: -## -## 1. It recreates *all* the sources (more than 1200 `.cc' files!). -## => We should just regen `unit-tests.mk', not the `.cc' files. -## -## 2. It visits (almost) all the directories and files under -## milena/mln/ (which admittedly a smaller issue compared to the -## previous one) -## => Prune `unit-tests.mk' instead of regenerating it. The -## simplest solution is probably to equip `unit-tests.mk' in the -## first place with `<<lrde'/`>>' tags, then prune it with -## dist-strip. -## - -# Do not distribute parts tagged `lrde' (see build-aux/strip-lrde). -dist-hook: - for f in $(LRDE_STRIPPED_DIST_FILES); do \ - $(top_srcdir)/build-aux/strip-lrde $$f; \ - done; \ - rm -rf $(LRDE_NODIST_FILES) && \ - $(top_srcdir)/build-aux/build_unit_test.sh \ - $(distdir)/milena/mln \ - $(distdir)/milena/tests/unit_test \ - $(top_srcdir)/milena/tests/unit_test/disabled_tests \ - mln \ - && \ - ( \ - cd $(distdir); \ - set -evx; \ - autoreconf -f -v -i; \ - find . -name autom4te.cache | xargs rm -rf \ - ) - - # Set the package version to olena-x.x-snapshot-dd-mm-yy. # # Do not check NEWS file (this is not a release so there is no @@ -163,4 +79,3 @@ snapshot: && cp -f $(srcdir)/configure.ac.tmp $(srcdir)/configure.ac \ && $(MAKE) $(AM_MAKEFLAGS) dist \ && mv -f $(srcdir)/configure.ac.old $(srcdir)/configure.ac -#>> diff --git a/build-aux/strip-lrde b/build-aux/strip-lrde deleted file mode 100755 index b8d009a..0000000 --- a/build-aux/strip-lrde +++ /dev/null @@ -1,23 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2007, 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/>. - -# Remove everything between `<<lrde' and `>>' (these tags being at the -# beginning of comment line starting with `#', `//' or `dnl'). -exec perl -0777 -pi -e \ - 's,\n\s*(#|//|dnl)\s*<<lrde(.|\n)+?\n\s*(#|//|dnl)\s*>>\s*\n,\n\n,g' \ - "$@" diff --git a/configure.ac b/configure.ac index a53bcf8..1ca8d4d 100644 --- a/configure.ac +++ b/configure.ac @@ -537,16 +537,6 @@ AC_CONFIG_FILES([ milena/tests/world/inter_pixel/dim2/Makefile ]) -dnl<<lrde -AC_CONFIG_FILES([ - milena/tests/extract/Makefile - milena/tests/linear/gaussian/Makefile - milena/tests/registration/Makefile - milena/tests/subsampling/Makefile -]) -dnl>> - - ## -------------- ## ## Applications. ## ## -------------- ## diff --git a/milena/mln/accu/math/all.hh b/milena/mln/accu/math/all.hh index 2e94362..7fec32d 100644 --- a/milena/mln/accu/math/all.hh +++ b/milena/mln/accu/math/all.hh @@ -55,9 +55,4 @@ namespace mln # include <mln/accu/math/sum.hh> # include <mln/accu/math/count.hh> -//<<lrde -# include <mln/accu/math/inf.hh> -# include <mln/accu/math/sup.hh> -//>> - #endif // ! MLN_ACCU_MATH_ALL_HH diff --git a/milena/mln/all.hh b/milena/mln/all.hh index fb34399..ee33bab 100644 --- a/milena/mln/all.hh +++ b/milena/mln/all.hh @@ -45,9 +45,7 @@ #include <mln/draw/all.hh> #include <mln/estim/all.hh> #include <mln/extension/all.hh> -//<<lrde -#include <mln/extract/all.hh> -//>> + #include <mln/fun/all.hh> #include <mln/geom/all.hh> #include <mln/graph/all.hh> @@ -64,13 +62,9 @@ #include <mln/norm/all.hh> #include <mln/opt/all.hh> #include <mln/pw/all.hh> -//<<lrde -#include <mln/registration/all.hh> -//>> + #include <mln/set/all.hh> -//<<lrde -#include <mln/subsampling/all.hh> -//>> + #include <mln/tag/all.hh> #include <mln/test/all.hh> #include <mln/trace/all.hh> diff --git a/milena/mln/core/image/vmorph/all.hh b/milena/mln/core/image/vmorph/all.hh index 1b14677..616ca8e 100644 --- a/milena/mln/core/image/vmorph/all.hh +++ b/milena/mln/core/image/vmorph/all.hh @@ -33,10 +33,7 @@ # include <mln/core/image/vmorph/cast_image.hh> # include <mln/core/image/vmorph/fun_image.hh> -//<<lrde -# include <mln/core/image/vmorph/thrubin_image.hh> -# include <mln/core/image/vmorph/thru_image.hh> -//>> + # include <mln/core/image/vmorph/violent_cast_image.hh> diff --git a/milena/mln/core/image/vmorph/fun_image.hh b/milena/mln/core/image/vmorph/fun_image.hh index 24d7e37..9443198 100644 --- a/milena/mln/core/image/vmorph/fun_image.hh +++ b/milena/mln/core/image/vmorph/fun_image.hh @@ -35,9 +35,7 @@ # include <mln/core/internal/image_value_morpher.hh> # include <mln/trait/images.hh> # include <mln/value/set.hh> -//<<lrde -# include <mln/value/shell.hh> -//>> + # include <mln/metal/if.hh> # include <mln/metal/equal.hh> diff --git a/milena/mln/data/all.hh b/milena/mln/data/all.hh index de00450..4d7ab0b 100644 --- a/milena/mln/data/all.hh +++ b/milena/mln/data/all.hh @@ -69,9 +69,7 @@ namespace mln # include <mln/data/to_enc.hh> # include <mln/data/transform.hh> # include <mln/data/update.hh> -//<<lrde -# include <mln/data/was.median.hh> -//>> + # include <mln/data/wrap.hh> diff --git a/milena/mln/essential/routine.hh b/milena/mln/essential/routine.hh index d2f57f1..95f8edd 100644 --- a/milena/mln/essential/routine.hh +++ b/milena/mln/essential/routine.hh @@ -40,9 +40,7 @@ # include <mln/draw/essential.hh> # include <mln/estim/essential.hh> # include <mln/extension/essential.hh> -//<<lrde -# include <mln/extract/essential.hh> -//>> + # include <mln/fun/essential.hh> # include <mln/geom/essential.hh> # include <mln/graph/essential.hh> @@ -60,13 +58,9 @@ # include <mln/norm/essential.hh> # include <mln/opt/essential.hh> # include <mln/pw/essential.hh> -//<<lrde -# include <mln/registration/essential.hh> -//>> + # include <mln/set/essential.hh> -//<<lrde -# include <mln/subsampling/essential.hh> -//>> + # include <mln/tag/essential.hh> # include <mln/test/essential.hh> # include <mln/trace/essential.hh> diff --git a/milena/mln/fun/all.hh b/milena/mln/fun/all.hh index b4f3ebb..3f1d2d3 100644 --- a/milena/mln/fun/all.hh +++ b/milena/mln/fun/all.hh @@ -60,14 +60,10 @@ namespace mln # include <mln/fun/n2v/all.hh> # include <mln/fun/i2v/all.hh> -//<<lrde -# include <mln/fun/meta/all.hh> -//>> + # include <mln/fun/p2b/all.hh> # include <mln/fun/p2v/all.hh> -//<<lrde -// # include <mln/fun/spe/all.hh> -//>> + # include <mln/fun/stat/all.hh> # include <mln/fun/v2b/all.hh> # include <mln/fun/v2i/all.hh> diff --git a/milena/mln/fun/essential.hh b/milena/mln/fun/essential.hh index 7bd51f5..551d604 100644 --- a/milena/mln/fun/essential.hh +++ b/milena/mln/fun/essential.hh @@ -34,9 +34,7 @@ # include <mln/fun/c.hh> # include <mln/fun/ops.hh> # include <mln/fun/i2v/essential.hh> -//<<lrde -# include <mln/fun/meta/essential.hh> -//>> + # include <mln/fun/p2b/essential.hh> # include <mln/fun/p2v/essential.hh> # include <mln/fun/v2b/essential.hh> diff --git a/milena/mln/fun/v2v/all.hh b/milena/mln/fun/v2v/all.hh index 2c455a5..36ddaec 100644 --- a/milena/mln/fun/v2v/all.hh +++ b/milena/mln/fun/v2v/all.hh @@ -52,19 +52,13 @@ namespace mln # include <mln/fun/v2v/convert.hh> # include <mln/fun/v2v/dec.hh> # include <mln/fun/v2v/enc.hh> -//<<lrde -# include <mln/fun/v2v/hsi_to_rgb.hh> -# include <mln/fun/v2v/hsl_to_rgb.hh> -//>> + # include <mln/fun/v2v/id.hh> # include <mln/fun/v2v/linear.hh> # include <mln/fun/v2v/norm.hh> # include <mln/fun/v2v/projection.hh> # include <mln/fun/v2v/rgb_to_int_u.hh> -//<<lrde -# include <mln/fun/v2v/rgb_to_hsi.hh> -# include <mln/fun/v2v/rgb_to_hsl.hh> -//>> + # include <mln/fun/v2v/saturate.hh> # include <mln/fun/v2v/wrap.hh> diff --git a/milena/mln/fun/v2v/essential.hh b/milena/mln/fun/v2v/essential.hh index 79fda4e..e4102b2 100644 --- a/milena/mln/fun/v2v/essential.hh +++ b/milena/mln/fun/v2v/essential.hh @@ -34,9 +34,7 @@ # include <mln/fun/v2v/abs.hh> # include <mln/fun/v2v/cast.hh> # include <mln/fun/v2v/convert.hh> -//<<lrde -# include <mln/fun/v2v/rgb_to_hsi.hh> -//>> + # include <mln/fun/v2v/saturate.hh> diff --git a/milena/mln/linear/all.hh b/milena/mln/linear/all.hh index c7e70e4..764dd3b 100644 --- a/milena/mln/linear/all.hh +++ b/milena/mln/linear/all.hh @@ -60,19 +60,7 @@ namespace mln # include <mln/linear/convolve_2x1d.hh> # include <mln/linear/convolve_directional.hh> -//<<lrde -# include <mln/linear/gaussian.hh> -# include <mln/linear/gaussian_directional_2d.hh> -# include <mln/linear/gaussian_1d.hh> -//>> - # include <mln/linear/lap.hh> # include <mln/linear/log.hh> -//<<lrde -# include <mln/linear/sobel_2d.hh> -# include <mln/linear/local/convolve.hh> -//>> - - #endif // ! MLN_LINEAR_ALL_HH diff --git a/milena/mln/trait/all.hh b/milena/mln/trait/all.hh index 08f0494..76277b4 100644 --- a/milena/mln/trait/all.hh +++ b/milena/mln/trait/all.hh @@ -57,10 +57,4 @@ namespace mln # include <mln/trait/promote.hh> # include <mln/trait/op/all.hh> -//<<lrde -// # include <mln/trait/next/all.hh> -# include <mln/trait/functions.hh> -//>> - - #endif // ! MLN_TRAIT_ALL_HH diff --git a/milena/mln/trait/ch_value.hh b/milena/mln/trait/ch_value.hh index ae6e1d2..eb120a1 100644 --- a/milena/mln/trait/ch_value.hh +++ b/milena/mln/trait/ch_value.hh @@ -116,25 +116,6 @@ namespace mln typedef M< mln_ch_value(I, V), E > ret; }; -//<<lrde - // For mln::value::stack_image<n,I>. - template < template <unsigned, class> class M, unsigned n, typename I, - typename V > - struct ch_value_< M< n, tag::image_<I> >, V > - { - /* FIXME: The code used to read - - typedef algebra::vec<n, V> value; - typedef mln_ch_value(I, value) ret; - - here. But this is wrong IMHO (Roland). Changing the value - type of a stack image (in fact, a vectorial image) shall - alter the *value type* of the image, not the type of the - *components* of the vector. Hence the current definition. */ - typedef mln_ch_value(I, V) ret; - }; -//>> - // For mln::complex_image<D, G, T>. template < template <unsigned, class, class> class M, unsigned D, typename G, typename T, typename V > diff --git a/milena/mln/value/all.hh b/milena/mln/value/all.hh index a1deb2a..6621553 100644 --- a/milena/mln/value/all.hh +++ b/milena/mln/value/all.hh @@ -57,12 +57,4 @@ namespace mln // FIXME: that includes concept/image.hh! -//<<lrde -# include <mln/value/cast.hh> -# include <mln/value/shell.hh> -# include <mln/value/stack.hh> -//>> - - - #endif // ! MLN_VALUE_ALL_HH diff --git a/milena/mln/value/essential.hh b/milena/mln/value/essential.hh index 55177af..afdc173 100644 --- a/milena/mln/value/essential.hh +++ b/milena/mln/value/essential.hh @@ -37,11 +37,6 @@ # include <mln/value/float01_8.hh> # include <mln/value/float01_16.hh> -//<<lrde -# include <mln/value/gl8.hh> -# include <mln/value/gl16.hh> -//>> - # include <mln/value/int_s8.hh> # include <mln/value/int_s16.hh> # include <mln/value/int_s32.hh> diff --git a/milena/tests/Makefile.am b/milena/tests/Makefile.am index 3493250..099436c 100644 --- a/milena/tests/Makefile.am +++ b/milena/tests/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -62,13 +62,6 @@ SUBDIRS = \ win \ world -#<<lrde -SUBDIRS += \ - extract \ - registration \ - subsampling -#>> - check_PROGRAMS = \ all_headers \ essential_headers \ diff --git a/milena/tests/convert/Makefile.am b/milena/tests/convert/Makefile.am index e4e3545..752a412 100644 --- a/milena/tests/convert/Makefile.am +++ b/milena/tests/convert/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Copyright (C) 2007, 2008, 2009, 2010, 2012 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -33,14 +33,6 @@ to_p_set_SOURCES = to_p_set.cc to_rgb_SOURCES = to_rgb.cc to_window_SOURCES = to_window.cc -#<<lrde -# FIXME: Not distributed (yet). -check_PROGRAMS += to_hsl -to_hsl_SOURCES = to_hsl.cc -#>> - - - if HAVE_QT check_PROGRAMS += to_qimage diff --git a/milena/tests/convert/to_hsl.cc b/milena/tests/convert/to_hsl.cc deleted file mode 100644 index 89a86b8..0000000 --- a/milena/tests/convert/to_hsl.cc +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (C) 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/>. -// -// 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. - -#include <mln/core/image/image2d.hh> -#include <mln/value/hsl.hh> -#include <mln/value/rgb8.hh> -#include <mln/convert/to.hh> - - -int main() -{ - using namespace mln; - -// value::rgb8 c1(3,3,3); -// value::hsl_f c2 = convert::to<value::hsl_f>(c1); -// // mln_assertion(c2 == hsl_f(0,0,3)); //FIXME: wrong result. - -// value::hsl_f c3(3,3,3); -// c1 = convert::to<value::rgb8>(c3); -// // mln_assertion(c1 == rgb8(2,4,0)); //FIXME: wrong result. - -} diff --git a/milena/tests/extract/Makefile.am b/milena/tests/extract/Makefile.am index 2168f8d..96208eb 100644 --- a/milena/tests/extract/Makefile.am +++ b/milena/tests/extract/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2012 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -16,22 +16,4 @@ include $(top_srcdir)/milena/tests/tests.mk -#<<lrde -# FIXME: Not distributed (yet). -check_PROGRAMS = \ - blue \ - green \ - hue \ - lum \ - red \ - sat - -blue_SOURCES = blue.cc -green_SOURCES = green.cc -hue_SOURCES = hue.cc -lum_SOURCES = lum.cc -red_SOURCES = red.cc -sat_SOURCES = sat.cc -#>> - TESTS = $(check_PROGRAMS) diff --git a/milena/tests/extract/blue.cc b/milena/tests/extract/blue.cc deleted file mode 100644 index 9ffc01a..0000000 --- a/milena/tests/extract/blue.cc +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (C) 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/>. -// -// 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. - -# include <mln/core/image/image2d.hh> -# include <mln/extract/blue.hh> -# include <mln/value/rgb8.hh> - - -int main() -{ - using namespace mln; - using value::rgb8; - - typedef image2d<rgb8> I; - I ima(2,2); - point2d p(1,1); - ima(p) = rgb8(200, 230, 240); - - thru_image< I, meta::blue<rgb8> > ima_blue = extract::blue(ima); - - mln_assertion(ima(p).blue() == ima_blue(p)); - -// ima_blue(p) = 0; -// mln_assertion(ima_blue(p) == 0u); -} diff --git a/milena/tests/extract/green.cc b/milena/tests/extract/green.cc deleted file mode 100644 index 4799833..0000000 --- a/milena/tests/extract/green.cc +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (C) 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/>. -// -// 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. - -# include <mln/core/image/image2d.hh> -# include <mln/extract/green.hh> -# include <mln/value/rgb8.hh> - - -int main() -{ - using namespace mln; - using value::rgb8; - - typedef image2d<rgb8> I; - I ima(2,2); - point2d p(1,1); - ima(p) = rgb8(200, 230, 240); - - thru_image< I, meta::green<rgb8> > ima_green = extract::green(ima); - - mln_assertion(ima(p).green() == ima_green(p)); - -// ima_green(p) = 0; -// mln_assertion(ima_green(p) == 0u); -} diff --git a/milena/tests/extract/hue.cc b/milena/tests/extract/hue.cc deleted file mode 100644 index 858a1a4..0000000 --- a/milena/tests/extract/hue.cc +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (C) 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/>. -// -// 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. - -# include <mln/core/image/image2d.hh> -# include <mln/extract/hue.hh> -# include <mln/value/hsl.hh> - - -int main() -{ - using namespace mln; - using value::hsl_f; - - typedef image2d<hsl_f> I; - I ima(2,2); - point2d p(1,1); - ima(p) = hsl_f(200, 230, 240); - - thru_image< I, meta::hue<hsl_f> > ima_hue = extract::hue(ima); - - mln_assertion(ima(p).hue() == ima_hue(p)); - -// ima_hue(p) = 0; -// mln_assertion(ima_hue(p) == 0u); -} diff --git a/milena/tests/extract/lum.cc b/milena/tests/extract/lum.cc deleted file mode 100644 index 9417441..0000000 --- a/milena/tests/extract/lum.cc +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (C) 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/>. -// -// 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. - -# include <mln/core/image/image2d.hh> -# include <mln/extract/lum.hh> -# include <mln/value/hsl.hh> - - -int main() -{ - using namespace mln; - using value::hsl_f; - - typedef image2d<hsl_f> I; - I ima(2,2); - point2d p(1,1); - ima(p) = hsl_f(200, 230, 240); - - thru_image< I, meta::lum<hsl_f> > ima_lum = extract::lum(ima); - - mln_assertion(ima(p).lum() == ima_lum(p)); - -// ima_lum(p) = 0; -// mln_assertion(ima_lum(p) == 0u); -} diff --git a/milena/tests/extract/red.cc b/milena/tests/extract/red.cc deleted file mode 100644 index 0db9bd4..0000000 --- a/milena/tests/extract/red.cc +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (C) 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/>. -// -// 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. - -# include <mln/core/image/image2d.hh> -# include <mln/extract/red.hh> -# include <mln/value/rgb8.hh> - - -int main() -{ - using namespace mln; - using value::rgb8; - - typedef image2d<rgb8> I; - I ima(2,2); - point2d p(1,1); - ima(p) = rgb8(200, 230, 240); - - thru_image< I, meta::red<rgb8> > ima_red = extract::red(ima); - - mln_assertion(ima(p).red() == ima_red(p)); - -// ima_red(p) = 0; -// mln_assertion(ima_red(p) == 0u); -} diff --git a/milena/tests/extract/sat.cc b/milena/tests/extract/sat.cc deleted file mode 100644 index cf19cfd..0000000 --- a/milena/tests/extract/sat.cc +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (C) 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/>. -// -// 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. - -# include <mln/core/image/image2d.hh> -# include <mln/extract/sat.hh> -# include <mln/value/hsl.hh> - - -int main() -{ - using namespace mln; - using value::hsl_f; - - typedef image2d<hsl_f> I; - I ima(2,2); - point2d p(1,1); - ima(p) = hsl_f(200, 230, 240); - - thru_image< I, meta::sat<hsl_f> > ima_sat = extract::sat(ima); - - mln_assertion(ima(p).sat() == ima_sat(p)); - -// ima_sat(p) = 0.f; -// mln_assertion(ima_sat(p) == 0.f); -} diff --git a/milena/tests/fun/v2v/Makefile.am b/milena/tests/fun/v2v/Makefile.am index ad0f173..f079295 100644 --- a/milena/tests/fun/v2v/Makefile.am +++ b/milena/tests/fun/v2v/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -34,17 +34,11 @@ qt_rgb_to_int_u_SOURCES = qt_rgb_to_int_u.cc endif HAVE_QT - -#<<lrde -# FIXME: Not distributed (yet). check_PROGRAMS += \ - component \ hsl_to_rgb \ rgb_to_hsl -component_SOURCES = component.cc hsl_to_rgb_SOURCES = hsl_to_rgb.cc rgb_to_hsl_SOURCES = rgb_to_hsl.cc -#>> TESTS = $(check_PROGRAMS) diff --git a/milena/tests/fun/v2v/component.cc b/milena/tests/fun/v2v/component.cc deleted file mode 100644 index dacf5eb..0000000 --- a/milena/tests/fun/v2v/component.cc +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright (C) 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/>. -// -// 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. - -#include <mln/fun/v2v/component.hh> -#include <mln/algebra/vec.hh> -#include <mln/value/rgb8.hh> -#include <mln/value/hsl.hh> - - -int main() -{ - using namespace mln; - - { - fun::v2v::component<int, 0> f; - int i = 51; - mln_assertion(f(i) == 51); - } - { - typedef int V[1]; - V v; - v[0] = 51; - fun::v2v::component<V, 0> f; - mln_assertion(f(v) == 51); - } - { - typedef algebra::vec<2,int> V; - V v; - v[0] = 51; - fun::v2v::component<V, 0> f; - mln_assertion(f(v) == 51); - } - { - typedef value::rgb8 V; - V v; - v.red() = 51; - fun::v2v::component<V, 0> f; - mln_assertion(f(v) == 51); - } - { - typedef value::hsl_<int,int,int> V; - V v; - v.hue() = 51; - fun::v2v::component<V, 0> f; - mln_assertion(f(v) == 51); - } -} diff --git a/milena/tests/linear/Makefile.am b/milena/tests/linear/Makefile.am index 8842b8d..1d12f75 100644 --- a/milena/tests/linear/Makefile.am +++ b/milena/tests/linear/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -20,11 +20,6 @@ include $(top_srcdir)/milena/tests/tests.mk SUBDIRS = \ local -#<<lrde -SUBDIRS += \ - gaussian -#>> - check_PROGRAMS = \ convolve \ convolve_directional \ @@ -40,11 +35,8 @@ convolve_2x1d_SOURCES = convolve_2x1d.cc log_SOURCES = log.cc sobel_2d_SOURCES = sobel_2d.cc -#<<lrde -# FIXME: Not distributed (yet). check_PROGRAMS += gaussian_ gaussian__SOURCES = gaussian.cc -#>> TESTS = $(check_PROGRAMS) @@ -56,6 +48,3 @@ MOSTLYCLEANFILES = \ log-out.pgm \ sobel_2d-out.pgm -#<<lrde -MOSTLYCLEANFILES += gaussian-out.pgm -#>> diff --git a/milena/tests/linear/gaussian/Makefile.am b/milena/tests/linear/gaussian/Makefile.am index 952a711..b1282ea 100644 --- a/milena/tests/linear/gaussian/Makefile.am +++ b/milena/tests/linear/gaussian/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010, 2012 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -16,14 +17,4 @@ include $(top_srcdir)/milena/tests/tests.mk -#<<lrde -# FIXME: Not distributed (yet). -check_PROGRAMS = \ - filter - -filter_SOURCES = filter.cc - -MOSTLYCLEANFILES = filter-out.pgm -#>> - TESTS = $(check_PROGRAMS) diff --git a/milena/tests/linear/gaussian/filter.cc b/milena/tests/linear/gaussian/filter.cc deleted file mode 100644 index 52daed4..0000000 --- a/milena/tests/linear/gaussian/filter.cc +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (C) 2007, 2008, 2009, 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. - -#include <mln/core/image/image2d.hh> - -#include <mln/value/int_u8.hh> -#include <mln/io/pgm/load.hh> -#include <mln/io/pgm/save.hh> - -#include <mln/linear/gaussian/filter.hh> - -#include "tests/data.hh" - - - -int main() -{ - using namespace mln; - - image2d<value::int_u8> lena; - io::pgm::load(lena, MLN_IMG_DIR "/lena.pgm"); - - image2d<value::int_u8> out = linear::gaussian::filter(lena, 5.1f); - io::pgm::save(out, "filter-out.pgm"); - } diff --git a/milena/tests/registration/Makefile.am b/milena/tests/registration/Makefile.am index 2910259..31b8981 100644 --- a/milena/tests/registration/Makefile.am +++ b/milena/tests/registration/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2012 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -16,10 +17,4 @@ include $(top_srcdir)/milena/tests/tests.mk -#<<lrde -# FIXME: Not distributed (yet) and currently disabled. -# check_PROGRAMS = registration -# registration_SOURCES = registration.cc -#>> - TESTS = $(check_PROGRAMS) diff --git a/milena/tests/registration/registration.cc b/milena/tests/registration/registration.cc deleted file mode 100644 index ad4ee61..0000000 --- a/milena/tests/registration/registration.cc +++ /dev/null @@ -1,55 +0,0 @@ -// 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/>. -// -// 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. - -#include "tests/data.hh" -#include <mln/core/image/image2d.hh> -#include <mln/core/image/image3d.hh> -#include <mln/registration/registration.hh> -#include <mln/make/image3d.hh> -#include <mln/io/pbm/all.hh> - -int main() -{ - using namespace mln; - - image2d<bool> img1_; - image2d<bool> img2_; - - //load images - io::pbm::load(img1_, MLN_IMG_DIR "/fly.pbm"); - io::pbm::load(img2_, MLN_IMG_DIR "/fly.pbm"); - - image3d<bool> img1 = make::image3d(img1_); - image3d<bool> img2 = make::image3d(img2_); - - typedef p_array<point3d> arr_t; - arr_t arr1 = convert::to<arr_t>(img1); - arr_t arr2 = convert::to<arr_t>(img2); - - box3d bbox = img2.bbox(); - bbox.enlarge(10); - registration::registration1(bbox, arr1, arr2); - //FIXME: Auto test result -} diff --git a/milena/tests/trait/ch_value.cc b/milena/tests/trait/ch_value.cc index d20428a..236d09d 100644 --- a/milena/tests/trait/ch_value.cc +++ b/milena/tests/trait/ch_value.cc @@ -27,10 +27,6 @@ #include <mln/trait/ch_value.hh> #include <mln/core/image/image2d.hh> -//<<lrde -#include <mln/value/stack.hh> -//>> - int main() { @@ -40,14 +36,6 @@ int main() typedef trait::ch_value<I, bool>::ret J; J ima1; -//<<lrde - // Stack image. - typedef value::stack_image<3, I> K; - typedef trait::ch_value<K, float>::ret L; - L ima2; - mlc_equal(L, image2d<float>)::check(); -//>> - // FIXME: Exercise more image types. // ... } diff --git a/milena/tests/value/Makefile.am b/milena/tests/value/Makefile.am index 975d471..a8e43a4 100644 --- a/milena/tests/value/Makefile.am +++ b/milena/tests/value/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -59,12 +59,6 @@ scalar_SOURCES = scalar.cc set_SOURCES = set.cc sign_SOURCES = sign.cc -#<<lrde -# FIXME: Not distributed (yet). -check_PROGRAMS += stack -stack_SOURCES = stack.cc -#>> - # FIXME: Enable when make check_full works. # check_full_PROGRAMS = \ # graylevel_full \ diff --git a/milena/tests/value/stack.cc b/milena/tests/value/stack.cc deleted file mode 100644 index 05c3e06..0000000 --- a/milena/tests/value/stack.cc +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (C) 2007, 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/>. -// -// 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. - -#include <mln/core/image/image2d.hh> -#include <mln/value/stack.hh> - - -int main() -{ - using namespace mln; - - typedef image2d<int> I; - - box2d b = make::box2d(2, 2); - image2d<int> ima5(b), ima1(b); - - point2d p = point2d(0, 0); - algebra::vec<2, int> v = make::vec(5, 1); - - value::stack(ima5, ima1)(p) = v; - mln_assertion(value::stack(ima5, ima1)(p) == v); - mln_assertion(ima5(p) == 5 && ima1(p) == 1); - - value::stack_image<2, image2d<int> > s1(value::stack(ima5, ima1)); - - value::stack_image<2, image2d<int> > s2; - - p = point2d(1, 1); - s2 = s1; - s2(p) = v; - mln_assertion(s1(p) == v); - mln_assertion(ima5(p) == 5 && ima1(p) == 1); -} -- 1.7.2.5

11 years, 11 months

branch next updated: olena-2.0-25-g39e1152

by git＠lrde.epita.fr

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 28adecba2ea2583a997d208c14798544ca4209d7 (commit) This update discarded existing revisions and left the branch pointing at a previous point in the repository history. * -- * -- N (39e1152eceddabf1c61e368c2f7bd477dbc2c46e) \ O -- O -- O (28adecba2ea2583a997d208c14798544ca4209d7) 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: milena/ChangeLog | 7 ------- milena/mln/io/pnm/load.hh | 43 ++++--------------------------------------- 2 files changed, 4 insertions(+), 46 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 11 months

branch next-to-apply created: olena-2.0-27-g6a27016

by git＠lrde.epita.fr

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-to-apply has been created at 6a27016906382fb09dffdecc3253aa89efb27834 (commit) - Log ----------------------------------------------------------------- 6a27016 Remove extra debug code from last patch. Add tests. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 11 months

olena-2.0-27-g6a27016 Remove extra debug code from last patch. Add tests.

by Edwin Carlinet

* mln/io/pnm/load.hh: Minor fixes. * tests/io/ppm/Makefile.am, * tests/io/ppm/ppm_ascii.cc, * img/fly_ascii.ppm: Tests and test image.F Signed-off-by: Guillaume Lazzara <z(a)lrde.epita.fr> --- milena/ChangeLog | 11 ++++++++++- milena/img/fly_ascii.ppm | 9 +++++++++ milena/mln/io/pnm/load.hh | 2 -- milena/tests/io/ppm/Makefile.am | 4 +++- .../tests/io/{dicom/dicom.cc => ppm/ppm_ascii.cc} | 17 +++++++++-------- 5 files changed, 31 insertions(+), 12 deletions(-) create mode 100644 milena/img/fly_ascii.ppm copy milena/tests/io/{dicom/dicom.cc => ppm/ppm_ascii.cc} (78%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 391e5e8..00bbe46 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,8 +1,17 @@ 2012-06-05 Edwin Carlinet <carlinet(a)lrde.epita.fr> + Remove extra debug code from last patch. Add tests. + + * mln/io/pnm/load.hh: Minor fixes. + * tests/io/ppm/Makefile.am, + * tests/io/ppm/ppm_ascii.cc, + * img/fly_ascii.ppm: Tests and test image. + +2012-06-05 Edwin Carlinet <carlinet(a)lrde.epita.fr> + Fix issues with loading ascii ppm. - * io/pnm/load.hh: add specials cases to handle vectorial type when + * mln/io/pnm/load.hh: add specials cases to handle vectorial type when loading from ascii ppms. 2011-11-29 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/img/fly_ascii.ppm b/milena/img/fly_ascii.ppm new file mode 100644 index 0000000..5d02169 --- /dev/null +++ b/milena/img/fly_ascii.ppm @@ -0,0 +1,9 @@ +P3 +# CREATOR: GIMP PNM Filter Version 1.1 + +5 5 +255 +201 99 93 200 92 94 208 126 122 208 109 102 162 81 90 189 85 86 198 98 99 +197 138 143 203 149 145 167 94 105 188 87 90 142 64 93 186 107 117 159 84 102 +201 133 123 166 80 95 126 65 103 189 86 96 161 85 98 210 154 131 154 85 98 +113 50 91 201 93 94 204 138 131 173 94 95 diff --git a/milena/mln/io/pnm/load.hh b/milena/mln/io/pnm/load.hh index 88139ec..fee4688 100644 --- a/milena/mln/io/pnm/load.hh +++ b/milena/mln/io/pnm/load.hh @@ -44,7 +44,6 @@ # include <mln/io/pnm/max_component.hh> # include <mln/io/pnm/macros.hh> -# include <mln/trait/value_.hh> # include <mln/metal/is_a.hh> # include <mln/metal/bool.hh> @@ -201,7 +200,6 @@ namespace mln for_all(p) { file >> c; - std::cout << c << std::endl; ima(p) = c; } } diff --git a/milena/tests/io/ppm/Makefile.am b/milena/tests/io/ppm/Makefile.am index 695e5d7..3683d08 100644 --- a/milena/tests/io/ppm/Makefile.am +++ b/milena/tests/io/ppm/Makefile.am @@ -20,11 +20,13 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ ppm16 \ ppm23 \ - ppm + ppm \ + ppm_ascii ppm16_SOURCES = ppm16.cc ppm23_SOURCES = ppm23.cc ppm_SOURCES = ppm.cc +ppm_ascii_SOURCES = ppm_ascii.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/dicom/dicom.cc b/milena/tests/io/ppm/ppm_ascii.cc similarity index 78% copy from milena/tests/io/dicom/dicom.cc copy to milena/tests/io/ppm/ppm_ascii.cc index 1a523cb..8040a9c 100644 --- a/milena/tests/io/dicom/dicom.cc +++ b/milena/tests/io/ppm/ppm_ascii.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -24,19 +25,19 @@ // executable file might be covered by the GNU General Public License. #include <mln/core/image/image2d.hh> -#include <mln/io/dicom/load.hh> - +#include <mln/value/rgb8.hh> +#include <mln/io/ppm/load.hh> #include <mln/data/compare.hh> -#include <mln/value/int_u12.hh> - -#include <mln/debug/println.hh> - #include "tests/data.hh" int main() { using namespace mln; + using value::rgb8; + + image2d<rgb8> ima1 = io::ppm::load<rgb8>(MLN_IMG_DIR "/fly.ppm"); + image2d<rgb8> ima2 = io::ppm::load<rgb8>(MLN_IMG_DIR "/fly_ascii.ppm"); - // FIXME: This test is empty! + mln_assertion(ima1 == ima2); } -- 1.7.2.5

11 years, 11 months

branch next updated: olena-2.0-26-g28adecb

by git＠lrde.epita.fr

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 28adecba2ea2583a997d208c14798544ca4209d7 (commit) from 39e1152eceddabf1c61e368c2f7bd477dbc2c46e (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 ----------------------------------------------------------------- 28adecb Fix issues with loading ascii ppm. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 7 +++++++ milena/mln/io/pnm/load.hh | 43 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 4 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 11 months

olena-2.0-26-g28adecb Fix issues with loading ascii ppm.

by Edwin Carlinet

* io/pnm/load.hh: add specials cases to handle vectorial type when loading from ascii ppms. --- milena/ChangeLog | 7 +++++++ milena/mln/io/pnm/load.hh | 43 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b977679..391e5e8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2012-06-05 Edwin Carlinet <carlinet(a)lrde.epita.fr> + + Fix issues with loading ascii ppm. + + * io/pnm/load.hh: add specials cases to handle vectorial type when + loading from ascii ppms. + 2011-11-29 Guillaume Lazzara <z(a)lrde.epita.fr> Fix the initialization of all global constants (ticket #43) diff --git a/milena/mln/io/pnm/load.hh b/milena/mln/io/pnm/load.hh index 46587df..88139ec 100644 --- a/milena/mln/io/pnm/load.hh +++ b/milena/mln/io/pnm/load.hh @@ -44,7 +44,9 @@ # include <mln/io/pnm/max_component.hh> # include <mln/io/pnm/macros.hh> +# include <mln/trait/value_.hh> # include <mln/metal/is_a.hh> +# include <mln/metal/bool.hh> namespace mln { @@ -59,7 +61,13 @@ namespace mln # ifndef MLN_INCLUDE_ONLY template <typename I> - void load_ascii_value(std::ifstream& file, I& ima); + void + load_ascii_value(std::ifstream& file, I& ima, metal::true_ is_scalar); + + template <typename I> + void + load_ascii_value(std::ifstream& file, I& ima, metal::false_ is_scalar); + template <typename I> void load_ascii_builtin(std::ifstream& file, I& ima); @@ -73,7 +81,7 @@ namespace mln void load_ascii_dispatch(std::ifstream& file, I& ima, const metal::bool_<true>&) { - load_ascii_value(file, ima); + load_ascii_value(file, ima, mlc_bool( mln_dim(mln_value(I)) == 1 ) () ); } template <typename I> @@ -158,20 +166,47 @@ namespace mln file.read((char*)(&ima(p)), len); } - /// load_ascii for Milena value types. + /// load_ascii for Vectorial Milena value types. template <typename I> inline - void load_ascii_value(std::ifstream& file, I& ima) + void + load_ascii_value(std::ifstream& file, I& ima, metal::false_) + { + enum { dim = mln_dim(mln_value(I)) }; + typedef mln_equiv(mln_value_(I)) E; + typedef mln_equiv(trait::value_<E>::comp) T; + E v; + T x; + + mln_fwd_piter(I) p(ima.domain()); + for_all(p) + { + for (int i = 0; i<dim; ++i) { + file >> x; + v[i] = x; + } + ima(p) = v; + } + } + + /// load_ascii for Scalar Milena value types + template <typename I> + inline + void + load_ascii_value(std::ifstream& file, I& ima, metal::true_) { mln_equiv(mln_value_(I)) c; + mln_fwd_piter(I) p(ima.domain()); for_all(p) { file >> c; + std::cout << c << std::endl; ima(p) = c; } } + /// load_ascii for builtin value types. template <typename I> inline -- 1.7.2.5

11 years, 11 months

[Olena] #255: Vectorial type with ascii pnm.

by Olena Trac

#255: Vectorial type with ascii pnm. ----------------------+----------------------------------------------------- Reporter: carlinet | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- Milena does not load correctly ppm when they are in ascii (P3) To reproduce: Let the following foo.ppm: P3 6 5 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 127 0 127 127 0 127 127 0 127 127 0 0 0 0 0 0 0 127 127 0 0 255 0 255 0 0 127 127 0 0 0 0 0 0 0 127 127 0 127 127 0 127 127 0 127 127 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 and the following code: int main() { image2d<value::rgb8> ima; io::ppm::load("foo.ppm", ima); debug::println(ima); } show: (48,48,48) (48,48,48) (48,48,48) (48,48,48) (48,48,48) (48,48,48) (48,48,48) (48,49,50) (55,49,50) (55,48,49) (50,55,49) (50,55,48) (49,50,55) (49,50,55) (48,49,50) (55,49,50) (55,48,48) (48,48,48) (48,48,49) (50,55,49) (50,55,48) (48,50,53) (53,48,50) (53,53,48) (48,49,50) (55,49,50) (55,48,48) (48,48,48) (48,48,49) (50,55,49) The patch in PJ solves this problem. -- Ticket URL: <https://trac.lrde.epita.fr/olena/ticket/255> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

11 years, 11 months

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 June 2012