Olena-patches

Download

olena-patches@lrde.epita.fr

9625 discussions

[PATCH 05/31] Canonicalize tests/io/fits/Makefile.am.
by Roland Levillain 15 May '09

15 May '09

* tests/io/fits/Makefile.am [CFITSIO]: Recall the conditional's name on `endif'. --- milena/ChangeLog | 7 +++++++ milena/tests/io/fits/Makefile.am | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 48eb4b6..4c6fc7e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2009-04-16 Roland Levillain <roland(a)lrde.epita.fr> + + Canonicalize tests/io/fits/Makefile.am. + + * tests/io/fits/Makefile.am [CFITSIO]: Recall the conditional's + name on `endif'. + 2009-05-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Small fixes (again) diff --git a/milena/tests/io/fits/Makefile.am b/milena/tests/io/fits/Makefile.am index 0468616..b463de4 100644 --- a/milena/tests/io/fits/Makefile.am +++ b/milena/tests/io/fits/Makefile.am @@ -9,7 +9,6 @@ if CFITSIO fits_SOURCES = fits.cc fits_CPPFLAGS = $(AM_CPPFLAGS) $(CFITSIO_CPPFLAGS) fits_LDFLAGS = $(AM_LDFLAGS) $(CFITSIO_LDFLAGS) - -endif +endif CFITSIO TESTS = $(check_PROGRAMS) -- 1.6.1.2

1 0

[PATCH 04/31] Fix messages in m4/freeimageplus.m4.
by Roland Levillain 15 May '09

15 May '09

* m4/freeimageplus.m4: s/FreeImage/FreeImagePlus/g. --- ChangeLog | 6 ++++++ m4/freeimageplus.m4 | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 272b419..05a0d4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-04-16 Roland Levillain <roland(a)lrde.epita.fr> + Fix messages in m4/freeimageplus.m4. + + * m4/freeimageplus.m4: s/FreeImage/FreeImagePlus/g. + +2009-04-16 Roland Levillain <roland(a)lrde.epita.fr> + Fix messages in m4/cfitsio.m4. * m4/cfitsio.m4: s/FreeImage/CFITSIO/g. diff --git a/m4/freeimageplus.m4 b/m4/freeimageplus.m4 index 6ef720e..660b77b 100644 --- a/m4/freeimageplus.m4 +++ b/m4/freeimageplus.m4 @@ -14,7 +14,7 @@ AC_DEFUN([OLN_WITH_FREEIMAGEPLUS], AC_ARG_WITH([freeimageplus], [AC_HELP_STRING([--with-freeimageplus@<:@=DIR@:>@], - [using FreeImage (DIR = prefix for FreeImage installation)])]) + [using FreeImagePlus (DIR = prefix for FreeImagePlus installation)])]) FREEIMAGEPLUS_CXXFLAGS='' FREEIMAGEPLUS_LDFLAGS='' if test "x$with_freeimageplus" != xno; then -- 1.6.1.2

1 0

[PATCH 03/31] Fix messages in m4/cfitsio.m4.
by Roland Levillain 15 May '09

15 May '09

* m4/cfitsio.m4: s/FreeImage/CFITSIO/g. --- ChangeLog | 6 ++++++ m4/cfitsio.m4 | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5448079..272b419 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-04-16 Roland Levillain <roland(a)lrde.epita.fr> + Fix messages in m4/cfitsio.m4. + + * m4/cfitsio.m4: s/FreeImage/CFITSIO/g. + +2009-04-16 Roland Levillain <roland(a)lrde.epita.fr> + Do not impose Emacs' Makefile major mode in Makefile.am's. * Makefile.am, diff --git a/m4/cfitsio.m4 b/m4/cfitsio.m4 index 32fd89d..0660968 100644 --- a/m4/cfitsio.m4 +++ b/m4/cfitsio.m4 @@ -2,7 +2,7 @@ # OLN_WITH_CFITSIO # ---------------------- -# Checks whether the Cfitsio library is available from C++ +# Checks whether the CFITSIO library is available from C++ # programs. # # This macro sets CFITSIO_CXXFLAGS and CFITSIO_LDFLAGS if @@ -14,7 +14,7 @@ AC_DEFUN([OLN_WITH_CFITSIO], AC_ARG_WITH([cfitsio], [AC_HELP_STRING([--with-cfitsio@<:@=DIR@:>@], - [using FreeImage (DIR = prefix for FreeImage installation)])]) + [using CFITSIO (DIR = prefix for CFITSIO installation)])]) CFITSIO_CXXFLAGS='' CFITSIO_LDFLAGS='' if test "x$with_cfitsio" != xno; then @@ -33,7 +33,7 @@ AC_DEFUN([OLN_WITH_CFITSIO], [oln_have_cfitsio=yes CFITSIO_LDFLAGS="$CFITSIO_LDFLAGS -lcfitsio" AC_DEFINE([HAVE_CFITSIO], 1, - [Define to 1 if we can use FreeImage]) + [Define to 1 if we can use CFITSIO]) ] )] ) -- 1.6.1.2

1 0

[PATCH 02/31] Do not impose Emacs' Makefile major mode in Makefile.am's.
by Roland Levillain 15 May '09

15 May '09

* Makefile.am, * build-aux/Makefile.am, * external/Makefile.am, * external/trimesh/Makefile.am, * external/trimesh/gluit/Makefile.am, * external/trimesh/include/Makefile.am, * external/trimesh/libsrc/Makefile.am, * external/trimesh/utilsrc/Makefile.am, * milena/Makefile.am, * milena/apps/Makefile.am, * milena/apps/statues/Makefile.am, * milena/doc/examples/Makefile.am, * milena/mesh/Makefile.am, * milena/sandbox/scribo/src/Makefile.am, * milena/sandbox/scribo/src/binarization/Makefile.am, * milena/sandbox/scribo/tests/Makefile.am, * milena/sandbox/scribo/tests/filter/Makefile.am, * milena/sandbox/scribo/tests/table/Makefile.am, * milena/sandbox/scribo/tests/text/Makefile.am, * milena/tests/Makefile.am, * milena/tests/accu/Makefile.am, * milena/tests/accu/image/Makefile.am, * milena/tests/accu/site_set/Makefile.am, * milena/tests/algebra/Makefile.am, * milena/tests/arith/Makefile.am, * milena/tests/binarization/Makefile.am, * milena/tests/border/Makefile.am, * milena/tests/canvas/Makefile.am, * milena/tests/canvas/browsing/Makefile.am, * milena/tests/canvas/morpho/Makefile.am, * milena/tests/convert/Makefile.am, * milena/tests/convert/impl/Makefile.am, * milena/tests/core/Makefile.am, * milena/tests/core/alias/Makefile.am, * milena/tests/core/image/Makefile.am, * milena/tests/core/other/Makefile.am, * milena/tests/core/routine/Makefile.am, * milena/tests/core/site_set/Makefile.am, * milena/tests/data/Makefile.am, * milena/tests/debug/Makefile.am, * milena/tests/display/Makefile.am, * milena/tests/draw/Makefile.am, * milena/tests/estim/Makefile.am, * milena/tests/extension/Makefile.am, * milena/tests/extract/Makefile.am, * milena/tests/fun/Makefile.am, * milena/tests/fun/i2v/Makefile.am, * milena/tests/fun/l2l/Makefile.am, * milena/tests/fun/p2b/Makefile.am, * milena/tests/fun/p2p/Makefile.am, * milena/tests/fun/p2v/Makefile.am, * milena/tests/fun/v2v/Makefile.am, * milena/tests/fun/vv2v/Makefile.am, * milena/tests/fun/x2x/Makefile.am, * milena/tests/geom/Makefile.am, * milena/tests/graph/Makefile.am, * milena/tests/graph/attribute/Makefile.am, * milena/tests/histo/Makefile.am, * milena/tests/io/Makefile.am, * milena/tests/io/dump/Makefile.am, * milena/tests/io/fits/Makefile.am, * milena/tests/io/off/Makefile.am, * milena/tests/io/pbm/Makefile.am, * milena/tests/io/pfm/Makefile.am, * milena/tests/io/pgm/Makefile.am, * milena/tests/io/pnm/Makefile.am, * milena/tests/io/ppm/Makefile.am, * milena/tests/io/tiff/Makefile.am, * milena/tests/labeling/Makefile.am, * milena/tests/level/Makefile.am, * milena/tests/level/approx/Makefile.am, * milena/tests/level/naive/Makefile.am, * milena/tests/linear/Makefile.am, * milena/tests/linear/local/Makefile.am, * milena/tests/literal/Makefile.am, * milena/tests/logical/Makefile.am, * milena/tests/make/Makefile.am, * milena/tests/math/Makefile.am, * milena/tests/metal/Makefile.am, * milena/tests/metal/make/Makefile.am, * milena/tests/metal/math/Makefile.am, * milena/tests/morpho/Makefile.am, * milena/tests/morpho/approx/Makefile.am, * milena/tests/morpho/attribute/Makefile.am, * milena/tests/morpho/closing/Makefile.am, * milena/tests/morpho/closing/approx/Makefile.am, * milena/tests/morpho/elementary/Makefile.am, * milena/tests/morpho/opening/Makefile.am, * milena/tests/morpho/opening/approx/Makefile.am, * milena/tests/morpho/tree/Makefile.am, * milena/tests/morpho/watershed/Makefile.am, * milena/tests/norm/Makefile.am, * milena/tests/opt/Makefile.am, * milena/tests/pw/Makefile.am, * milena/tests/registration/Makefile.am, * milena/tests/set/Makefile.am, * milena/tests/subsampling/Makefile.am, * milena/tests/tag/Makefile.am, * milena/tests/test/Makefile.am, * milena/tests/topo/Makefile.am, * milena/tests/trace/Makefile.am, * milena/tests/trait/Makefile.am, * milena/tests/trait/image/Makefile.am, * milena/tests/trait/op/Makefile.am, * milena/tests/trait/value/Makefile.am, * milena/tests/transform/Makefile.am, * milena/tests/unit_test/Makefile.am, * milena/tests/util/Makefile.am, * milena/tests/value/Makefile.am, * milena/tests/value/builtin/Makefile.am, * milena/tests/value/concept/Makefile.am, * milena/tests/win/Makefile.am, * milena/tools/Makefile.am, * swilena/Makefile.am, * swilena/python/Makefile.am: Here. --- ChangeLog | 121 ++++++++++++++++++++ Makefile.am | 2 +- build-aux/Makefile.am | 2 +- external/Makefile.am | 2 +- external/trimesh/Makefile.am | 2 +- external/trimesh/gluit/Makefile.am | 2 +- external/trimesh/include/Makefile.am | 2 +- external/trimesh/libsrc/Makefile.am | 2 +- external/trimesh/utilsrc/Makefile.am | 2 +- milena/Makefile.am | 2 +- milena/apps/Makefile.am | 2 +- milena/apps/statues/Makefile.am | 2 +- milena/doc/examples/Makefile.am | 2 +- milena/mesh/Makefile.am | 2 +- milena/sandbox/scribo/src/Makefile.am | 2 +- milena/sandbox/scribo/src/binarization/Makefile.am | 2 +- milena/sandbox/scribo/tests/Makefile.am | 2 +- milena/sandbox/scribo/tests/filter/Makefile.am | 2 +- milena/sandbox/scribo/tests/table/Makefile.am | 2 +- milena/sandbox/scribo/tests/text/Makefile.am | 2 +- milena/tests/Makefile.am | 2 +- milena/tests/accu/Makefile.am | 2 +- milena/tests/accu/image/Makefile.am | 2 +- milena/tests/accu/site_set/Makefile.am | 2 +- milena/tests/algebra/Makefile.am | 2 +- milena/tests/arith/Makefile.am | 2 +- milena/tests/binarization/Makefile.am | 2 +- milena/tests/border/Makefile.am | 2 +- milena/tests/canvas/Makefile.am | 2 +- milena/tests/canvas/browsing/Makefile.am | 2 +- milena/tests/canvas/morpho/Makefile.am | 2 +- milena/tests/convert/Makefile.am | 2 +- milena/tests/convert/impl/Makefile.am | 2 +- milena/tests/core/Makefile.am | 2 +- milena/tests/core/alias/Makefile.am | 2 +- milena/tests/core/image/Makefile.am | 2 +- milena/tests/core/other/Makefile.am | 2 +- milena/tests/core/routine/Makefile.am | 2 +- milena/tests/core/site_set/Makefile.am | 2 +- milena/tests/data/Makefile.am | 2 +- milena/tests/debug/Makefile.am | 2 +- milena/tests/display/Makefile.am | 2 +- milena/tests/draw/Makefile.am | 2 +- milena/tests/estim/Makefile.am | 2 +- milena/tests/extension/Makefile.am | 2 +- milena/tests/extract/Makefile.am | 2 +- milena/tests/fun/Makefile.am | 2 +- milena/tests/fun/i2v/Makefile.am | 2 +- milena/tests/fun/p2b/Makefile.am | 2 +- milena/tests/fun/p2p/Makefile.am | 2 +- milena/tests/fun/p2v/Makefile.am | 2 +- milena/tests/fun/v2v/Makefile.am | 2 +- milena/tests/fun/vv2v/Makefile.am | 2 +- milena/tests/fun/x2x/Makefile.am | 2 +- milena/tests/geom/Makefile.am | 2 +- milena/tests/graph/Makefile.am | 2 +- milena/tests/graph/attribute/Makefile.am | 2 +- milena/tests/histo/Makefile.am | 2 +- milena/tests/io/Makefile.am | 2 +- milena/tests/io/dump/Makefile.am | 2 +- milena/tests/io/fits/Makefile.am | 2 +- milena/tests/io/off/Makefile.am | 2 +- milena/tests/io/pbm/Makefile.am | 2 +- milena/tests/io/pfm/Makefile.am | 2 +- milena/tests/io/pgm/Makefile.am | 2 +- milena/tests/io/pnm/Makefile.am | 2 +- milena/tests/io/ppm/Makefile.am | 2 +- milena/tests/io/tiff/Makefile.am | 2 +- milena/tests/labeling/Makefile.am | 2 +- milena/tests/level/Makefile.am | 2 +- milena/tests/level/approx/Makefile.am | 2 +- milena/tests/level/naive/Makefile.am | 2 +- milena/tests/linear/Makefile.am | 2 +- milena/tests/linear/local/Makefile.am | 2 +- milena/tests/literal/Makefile.am | 2 +- milena/tests/logical/Makefile.am | 2 +- milena/tests/make/Makefile.am | 2 +- milena/tests/math/Makefile.am | 2 +- milena/tests/metal/Makefile.am | 2 +- milena/tests/metal/make/Makefile.am | 2 +- milena/tests/metal/math/Makefile.am | 2 +- milena/tests/morpho/Makefile.am | 2 +- milena/tests/morpho/approx/Makefile.am | 2 +- milena/tests/morpho/attribute/Makefile.am | 2 +- milena/tests/morpho/closing/Makefile.am | 2 +- milena/tests/morpho/closing/approx/Makefile.am | 2 +- milena/tests/morpho/elementary/Makefile.am | 2 +- milena/tests/morpho/opening/Makefile.am | 2 +- milena/tests/morpho/opening/approx/Makefile.am | 2 +- milena/tests/morpho/tree/Makefile.am | 2 +- milena/tests/morpho/watershed/Makefile.am | 2 +- milena/tests/norm/Makefile.am | 2 +- milena/tests/opt/Makefile.am | 2 +- milena/tests/pw/Makefile.am | 2 +- milena/tests/registration/Makefile.am | 2 +- milena/tests/set/Makefile.am | 2 +- milena/tests/subsampling/Makefile.am | 2 +- milena/tests/tag/Makefile.am | 2 +- milena/tests/test/Makefile.am | 2 +- milena/tests/topo/Makefile.am | 2 +- milena/tests/trace/Makefile.am | 2 +- milena/tests/trait/Makefile.am | 2 +- milena/tests/trait/image/Makefile.am | 2 +- milena/tests/trait/op/Makefile.am | 2 +- milena/tests/trait/value/Makefile.am | 2 +- milena/tests/transform/Makefile.am | 2 +- milena/tests/unit_test/Makefile.am | 2 +- milena/tests/util/Makefile.am | 2 +- milena/tests/value/Makefile.am | 2 +- milena/tests/value/builtin/Makefile.am | 2 +- milena/tests/value/concept/Makefile.am | 2 +- milena/tests/win/Makefile.am | 2 +- milena/tests/world/inter_pixel/dim2/Makefile.am | 2 +- milena/tools/Makefile.am | 2 +- swilena/Makefile.am | 2 +- swilena/python/Makefile.am | 2 +- 116 files changed, 236 insertions(+), 115 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c5162d..5448079 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,124 @@ +2009-04-16 Roland Levillain <roland(a)lrde.epita.fr> + + Do not impose Emacs' Makefile major mode in Makefile.am's. + + * Makefile.am, + * build-aux/Makefile.am, + * external/Makefile.am, + * external/trimesh/Makefile.am, + * external/trimesh/gluit/Makefile.am, + * external/trimesh/include/Makefile.am, + * external/trimesh/libsrc/Makefile.am, + * external/trimesh/utilsrc/Makefile.am, + * milena/Makefile.am, + * milena/apps/Makefile.am, + * milena/apps/statues/Makefile.am, + * milena/doc/examples/Makefile.am, + * milena/mesh/Makefile.am, + * milena/sandbox/scribo/src/Makefile.am, + * milena/sandbox/scribo/src/binarization/Makefile.am, + * milena/sandbox/scribo/tests/Makefile.am, + * milena/sandbox/scribo/tests/filter/Makefile.am, + * milena/sandbox/scribo/tests/table/Makefile.am, + * milena/sandbox/scribo/tests/text/Makefile.am, + * milena/tests/Makefile.am, + * milena/tests/accu/Makefile.am, + * milena/tests/accu/image/Makefile.am, + * milena/tests/accu/site_set/Makefile.am, + * milena/tests/algebra/Makefile.am, + * milena/tests/arith/Makefile.am, + * milena/tests/binarization/Makefile.am, + * milena/tests/border/Makefile.am, + * milena/tests/canvas/Makefile.am, + * milena/tests/canvas/browsing/Makefile.am, + * milena/tests/canvas/morpho/Makefile.am, + * milena/tests/convert/Makefile.am, + * milena/tests/convert/impl/Makefile.am, + * milena/tests/core/Makefile.am, + * milena/tests/core/alias/Makefile.am, + * milena/tests/core/image/Makefile.am, + * milena/tests/core/other/Makefile.am, + * milena/tests/core/routine/Makefile.am, + * milena/tests/core/site_set/Makefile.am, + * milena/tests/data/Makefile.am, + * milena/tests/debug/Makefile.am, + * milena/tests/display/Makefile.am, + * milena/tests/draw/Makefile.am, + * milena/tests/estim/Makefile.am, + * milena/tests/extension/Makefile.am, + * milena/tests/extract/Makefile.am, + * milena/tests/fun/Makefile.am, + * milena/tests/fun/i2v/Makefile.am, + * milena/tests/fun/l2l/Makefile.am, + * milena/tests/fun/p2b/Makefile.am, + * milena/tests/fun/p2p/Makefile.am, + * milena/tests/fun/p2v/Makefile.am, + * milena/tests/fun/v2v/Makefile.am, + * milena/tests/fun/vv2v/Makefile.am, + * milena/tests/fun/x2x/Makefile.am, + * milena/tests/geom/Makefile.am, + * milena/tests/graph/Makefile.am, + * milena/tests/graph/attribute/Makefile.am, + * milena/tests/histo/Makefile.am, + * milena/tests/io/Makefile.am, + * milena/tests/io/dump/Makefile.am, + * milena/tests/io/fits/Makefile.am, + * milena/tests/io/off/Makefile.am, + * milena/tests/io/pbm/Makefile.am, + * milena/tests/io/pfm/Makefile.am, + * milena/tests/io/pgm/Makefile.am, + * milena/tests/io/pnm/Makefile.am, + * milena/tests/io/ppm/Makefile.am, + * milena/tests/io/tiff/Makefile.am, + * milena/tests/labeling/Makefile.am, + * milena/tests/level/Makefile.am, + * milena/tests/level/approx/Makefile.am, + * milena/tests/level/naive/Makefile.am, + * milena/tests/linear/Makefile.am, + * milena/tests/linear/local/Makefile.am, + * milena/tests/literal/Makefile.am, + * milena/tests/logical/Makefile.am, + * milena/tests/make/Makefile.am, + * milena/tests/math/Makefile.am, + * milena/tests/metal/Makefile.am, + * milena/tests/metal/make/Makefile.am, + * milena/tests/metal/math/Makefile.am, + * milena/tests/morpho/Makefile.am, + * milena/tests/morpho/approx/Makefile.am, + * milena/tests/morpho/attribute/Makefile.am, + * milena/tests/morpho/closing/Makefile.am, + * milena/tests/morpho/closing/approx/Makefile.am, + * milena/tests/morpho/elementary/Makefile.am, + * milena/tests/morpho/opening/Makefile.am, + * milena/tests/morpho/opening/approx/Makefile.am, + * milena/tests/morpho/tree/Makefile.am, + * milena/tests/morpho/watershed/Makefile.am, + * milena/tests/norm/Makefile.am, + * milena/tests/opt/Makefile.am, + * milena/tests/pw/Makefile.am, + * milena/tests/registration/Makefile.am, + * milena/tests/set/Makefile.am, + * milena/tests/subsampling/Makefile.am, + * milena/tests/tag/Makefile.am, + * milena/tests/test/Makefile.am, + * milena/tests/topo/Makefile.am, + * milena/tests/trace/Makefile.am, + * milena/tests/trait/Makefile.am, + * milena/tests/trait/image/Makefile.am, + * milena/tests/trait/op/Makefile.am, + * milena/tests/trait/value/Makefile.am, + * milena/tests/transform/Makefile.am, + * milena/tests/unit_test/Makefile.am, + * milena/tests/util/Makefile.am, + * milena/tests/value/Makefile.am, + * milena/tests/value/builtin/Makefile.am, + * milena/tests/value/concept/Makefile.am, + * milena/tests/win/Makefile.am, + * milena/tools/Makefile.am, + * swilena/Makefile.am, + * swilena/python/Makefile.am: + Here. + 2009-05-11 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * configure.ac: configure new directories in milena/tests/. diff --git a/Makefile.am b/Makefile.am index 814551a..ef05249 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to produce Makefile.in -*- Makefile -*- +## Process this file through Automake to produce Makefile.in. ACLOCAL_AMFLAGS = -I m4 diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am index c5812a4..81adc78 100644 --- a/build-aux/Makefile.am +++ b/build-aux/Makefile.am @@ -1 +1 @@ -## Process this file through Automake to produce Makefile.in -*- Makefile -*- +## Process this file through Automake to produce Makefile.in. diff --git a/external/Makefile.am b/external/Makefile.am index e01abab..e288aa7 100644 --- a/external/Makefile.am +++ b/external/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to produce Makefile.in -*- Makefile -*- +## Process this file through Automake to produce Makefile.in. SUBDIRS = diff --git a/external/trimesh/Makefile.am b/external/trimesh/Makefile.am index 0d3d7d7..5ec6bd7 100644 --- a/external/trimesh/Makefile.am +++ b/external/trimesh/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to produce Makefile.in -*- Makefile -*- +## Process this file through Automake to produce Makefile.in. SUBDIRS = include libsrc gluit utilsrc diff --git a/external/trimesh/gluit/Makefile.am b/external/trimesh/gluit/Makefile.am index e1de369..ac1db13 100644 --- a/external/trimesh/gluit/Makefile.am +++ b/external/trimesh/gluit/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to produce Makefile.in -*- Makefile -*- +## Process this file through Automake to produce Makefile.in. # Find config.h. AM_CPPFLAGS = -I$(top_builddir) diff --git a/external/trimesh/include/Makefile.am b/external/trimesh/include/Makefile.am index 1baedf6..415f4b4 100644 --- a/external/trimesh/include/Makefile.am +++ b/external/trimesh/include/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to produce Makefile.in -*- Makefile -*- +## Process this file through Automake to produce Makefile.in. trimeshdir = $(includedir)/trimesh nobase_trimesh_HEADERS = \ diff --git a/external/trimesh/libsrc/Makefile.am b/external/trimesh/libsrc/Makefile.am index c253204..b25c030 100644 --- a/external/trimesh/libsrc/Makefile.am +++ b/external/trimesh/libsrc/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to produce Makefile.in -*- Makefile -*- +## Process this file through Automake to produce Makefile.in. AM_CPPFLAGS = -I$(top_srcdir)/include diff --git a/external/trimesh/utilsrc/Makefile.am b/external/trimesh/utilsrc/Makefile.am index 34972ff..0ede26a 100644 --- a/external/trimesh/utilsrc/Makefile.am +++ b/external/trimesh/utilsrc/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to produce Makefile.in -*- Makefile -*- +## Process this file through Automake to produce Makefile.in. # Linking with gluit and GLUT/OpenGL. gluit_builddir = $(top_builddir)/gluit diff --git a/milena/Makefile.am b/milena/Makefile.am index ffb87cc..8ff2f4f 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. ##FIXME SUBDIRS = \ diff --git a/milena/apps/Makefile.am b/milena/apps/Makefile.am index 8b1e9cf..78125c4 100644 --- a/milena/apps/Makefile.am +++ b/milena/apps/Makefile.am @@ -1,3 +1,3 @@ -## Process this file through Automake to produce Makefile.in -*- Makefile -*- +## Process this file through Automake to produce Makefile.in. SUBDIRS = statues diff --git a/milena/apps/statues/Makefile.am b/milena/apps/statues/Makefile.am index 1407fbe..3c04596 100644 --- a/milena/apps/statues/Makefile.am +++ b/milena/apps/statues/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to produce Makefile.in -*- Makefile -*- +## Process this file through Automake to produce Makefile.in. # Linking with gluit and GLUT/OpenGL. gluit_builddir = $(top_builddir)/external/trimesh/gluit diff --git a/milena/doc/examples/Makefile.am b/milena/doc/examples/Makefile.am index 88e7639..10b460b 100644 --- a/milena/doc/examples/Makefile.am +++ b/milena/doc/examples/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/doc/doc.mk diff --git a/milena/mesh/Makefile.am b/milena/mesh/Makefile.am index b342a6a..4ea4a0a 100644 --- a/milena/mesh/Makefile.am +++ b/milena/mesh/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. ## This Makefile makes use of GNU Make extensions (%-patterns, ## patsubst). We might want to turn it into something more portable diff --git a/milena/sandbox/scribo/src/Makefile.am b/milena/sandbox/scribo/src/Makefile.am index 2ac673a..8511787 100644 --- a/milena/sandbox/scribo/src/Makefile.am +++ b/milena/sandbox/scribo/src/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/sandbox/scribo/scribo.mk diff --git a/milena/sandbox/scribo/src/binarization/Makefile.am b/milena/sandbox/scribo/src/binarization/Makefile.am index aeb103a..9f149c7 100644 --- a/milena/sandbox/scribo/src/binarization/Makefile.am +++ b/milena/sandbox/scribo/src/binarization/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/sandbox/scribo/scribo.mk diff --git a/milena/sandbox/scribo/tests/Makefile.am b/milena/sandbox/scribo/tests/Makefile.am index 2436042..4f6e663 100644 --- a/milena/sandbox/scribo/tests/Makefile.am +++ b/milena/sandbox/scribo/tests/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. SUBDIRS = \ filter \ diff --git a/milena/sandbox/scribo/tests/filter/Makefile.am b/milena/sandbox/scribo/tests/filter/Makefile.am index c2a02ef..0f01eea 100644 --- a/milena/sandbox/scribo/tests/filter/Makefile.am +++ b/milena/sandbox/scribo/tests/filter/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/sandbox/scribo/scribo.mk diff --git a/milena/sandbox/scribo/tests/table/Makefile.am b/milena/sandbox/scribo/tests/table/Makefile.am index 1a4c5c3..0e008bc 100644 --- a/milena/sandbox/scribo/tests/table/Makefile.am +++ b/milena/sandbox/scribo/tests/table/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/sandbox/scribo/scribo.mk diff --git a/milena/sandbox/scribo/tests/text/Makefile.am b/milena/sandbox/scribo/tests/text/Makefile.am index d9df32a..70e77bf 100644 --- a/milena/sandbox/scribo/tests/text/Makefile.am +++ b/milena/sandbox/scribo/tests/text/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/sandbox/scribo/scribo.mk diff --git a/milena/tests/Makefile.am b/milena/tests/Makefile.am index 23cb39e..cf419b8 100644 --- a/milena/tests/Makefile.am +++ b/milena/tests/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/accu/Makefile.am b/milena/tests/accu/Makefile.am index f7b9927..9e0f437 100644 --- a/milena/tests/accu/Makefile.am +++ b/milena/tests/accu/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/accu/image/Makefile.am b/milena/tests/accu/image/Makefile.am index c1d1a2d..4376cba 100644 --- a/milena/tests/accu/image/Makefile.am +++ b/milena/tests/accu/image/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/accu/site_set/Makefile.am b/milena/tests/accu/site_set/Makefile.am index 042cf00..929c56a 100644 --- a/milena/tests/accu/site_set/Makefile.am +++ b/milena/tests/accu/site_set/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/algebra/Makefile.am b/milena/tests/algebra/Makefile.am index 28731b0..ec9bc36 100644 --- a/milena/tests/algebra/Makefile.am +++ b/milena/tests/algebra/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/arith/Makefile.am b/milena/tests/arith/Makefile.am index 1cd2aeb..bdca808 100644 --- a/milena/tests/arith/Makefile.am +++ b/milena/tests/arith/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/binarization/Makefile.am b/milena/tests/binarization/Makefile.am index de02ee8..0a1e55a 100644 --- a/milena/tests/binarization/Makefile.am +++ b/milena/tests/binarization/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/border/Makefile.am b/milena/tests/border/Makefile.am index 34c67b2..4075b11 100644 --- a/milena/tests/border/Makefile.am +++ b/milena/tests/border/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/canvas/Makefile.am b/milena/tests/canvas/Makefile.am index 5a4973f..e09f93c 100644 --- a/milena/tests/canvas/Makefile.am +++ b/milena/tests/canvas/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/canvas/browsing/Makefile.am b/milena/tests/canvas/browsing/Makefile.am index 5d28778..b8de4c2 100644 --- a/milena/tests/canvas/browsing/Makefile.am +++ b/milena/tests/canvas/browsing/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/canvas/morpho/Makefile.am b/milena/tests/canvas/morpho/Makefile.am index c8d0261..0c2c9c5 100644 --- a/milena/tests/canvas/morpho/Makefile.am +++ b/milena/tests/canvas/morpho/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/convert/Makefile.am b/milena/tests/convert/Makefile.am index e2f84b0..ffab9fa 100644 --- a/milena/tests/convert/Makefile.am +++ b/milena/tests/convert/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/convert/impl/Makefile.am b/milena/tests/convert/impl/Makefile.am index 343def8..d17a569 100644 --- a/milena/tests/convert/impl/Makefile.am +++ b/milena/tests/convert/impl/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/core/Makefile.am b/milena/tests/core/Makefile.am index c1733bf..27e499f 100644 --- a/milena/tests/core/Makefile.am +++ b/milena/tests/core/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/core/alias/Makefile.am b/milena/tests/core/alias/Makefile.am index 1d212a5..3d44ff9 100644 --- a/milena/tests/core/alias/Makefile.am +++ b/milena/tests/core/alias/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am index cdd52f6..f628181 100644 --- a/milena/tests/core/image/Makefile.am +++ b/milena/tests/core/image/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/core/other/Makefile.am b/milena/tests/core/other/Makefile.am index 703c248..512f81b 100644 --- a/milena/tests/core/other/Makefile.am +++ b/milena/tests/core/other/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/core/routine/Makefile.am b/milena/tests/core/routine/Makefile.am index 9457ec9..532d8f4 100644 --- a/milena/tests/core/routine/Makefile.am +++ b/milena/tests/core/routine/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/core/site_set/Makefile.am b/milena/tests/core/site_set/Makefile.am index b22ffc8..b44be2c 100644 --- a/milena/tests/core/site_set/Makefile.am +++ b/milena/tests/core/site_set/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/data/Makefile.am b/milena/tests/data/Makefile.am index b8660d1..3f57c9b 100644 --- a/milena/tests/data/Makefile.am +++ b/milena/tests/data/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/debug/Makefile.am b/milena/tests/debug/Makefile.am index 08e9162..07735d5 100644 --- a/milena/tests/debug/Makefile.am +++ b/milena/tests/debug/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/display/Makefile.am b/milena/tests/display/Makefile.am index e6e27fe..7f20fd2 100644 --- a/milena/tests/display/Makefile.am +++ b/milena/tests/display/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/draw/Makefile.am b/milena/tests/draw/Makefile.am index 7b3fed1..33a4d77 100644 --- a/milena/tests/draw/Makefile.am +++ b/milena/tests/draw/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/estim/Makefile.am b/milena/tests/estim/Makefile.am index 4985a46..bbda76c 100644 --- a/milena/tests/estim/Makefile.am +++ b/milena/tests/estim/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/extension/Makefile.am b/milena/tests/extension/Makefile.am index ccf2925..e7fe49c 100644 --- a/milena/tests/extension/Makefile.am +++ b/milena/tests/extension/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/extract/Makefile.am b/milena/tests/extract/Makefile.am index d39a20f..62bbd0c 100644 --- a/milena/tests/extract/Makefile.am +++ b/milena/tests/extract/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/fun/Makefile.am b/milena/tests/fun/Makefile.am index 7cea3a5..603b8e5 100644 --- a/milena/tests/fun/Makefile.am +++ b/milena/tests/fun/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/fun/i2v/Makefile.am b/milena/tests/fun/i2v/Makefile.am index 99c64d4..068db4d 100644 --- a/milena/tests/fun/i2v/Makefile.am +++ b/milena/tests/fun/i2v/Makefile.am @@ -1,3 +1,3 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/fun/p2b/Makefile.am b/milena/tests/fun/p2b/Makefile.am index 99c64d4..068db4d 100644 --- a/milena/tests/fun/p2b/Makefile.am +++ b/milena/tests/fun/p2b/Makefile.am @@ -1,3 +1,3 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/fun/p2p/Makefile.am b/milena/tests/fun/p2p/Makefile.am index 82031c8..73b3409 100644 --- a/milena/tests/fun/p2p/Makefile.am +++ b/milena/tests/fun/p2p/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/fun/p2v/Makefile.am b/milena/tests/fun/p2v/Makefile.am index 99c64d4..068db4d 100644 --- a/milena/tests/fun/p2v/Makefile.am +++ b/milena/tests/fun/p2v/Makefile.am @@ -1,3 +1,3 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/fun/v2v/Makefile.am b/milena/tests/fun/v2v/Makefile.am index 7e236f0..9627a2d 100644 --- a/milena/tests/fun/v2v/Makefile.am +++ b/milena/tests/fun/v2v/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/fun/vv2v/Makefile.am b/milena/tests/fun/vv2v/Makefile.am index 5eb985e..f08236c 100644 --- a/milena/tests/fun/vv2v/Makefile.am +++ b/milena/tests/fun/vv2v/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/fun/x2x/Makefile.am b/milena/tests/fun/x2x/Makefile.am index a56a762..97b9608 100644 --- a/milena/tests/fun/x2x/Makefile.am +++ b/milena/tests/fun/x2x/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/geom/Makefile.am b/milena/tests/geom/Makefile.am index c162770..ca7d761 100644 --- a/milena/tests/geom/Makefile.am +++ b/milena/tests/geom/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/graph/Makefile.am b/milena/tests/graph/Makefile.am index cca4bcd..aa21697 100644 --- a/milena/tests/graph/Makefile.am +++ b/milena/tests/graph/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/graph/attribute/Makefile.am b/milena/tests/graph/attribute/Makefile.am index 520371f..42d38db 100644 --- a/milena/tests/graph/attribute/Makefile.am +++ b/milena/tests/graph/attribute/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/histo/Makefile.am b/milena/tests/histo/Makefile.am index aa3ead6..6906fb9 100644 --- a/milena/tests/histo/Makefile.am +++ b/milena/tests/histo/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/io/Makefile.am b/milena/tests/io/Makefile.am index 760d591..52b6750 100644 --- a/milena/tests/io/Makefile.am +++ b/milena/tests/io/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/io/dump/Makefile.am b/milena/tests/io/dump/Makefile.am index 36be121..ecab041 100644 --- a/milena/tests/io/dump/Makefile.am +++ b/milena/tests/io/dump/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/io/fits/Makefile.am b/milena/tests/io/fits/Makefile.am index 72f9bff..0468616 100644 --- a/milena/tests/io/fits/Makefile.am +++ b/milena/tests/io/fits/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/io/off/Makefile.am b/milena/tests/io/off/Makefile.am index aa750d8..c85f5b0 100644 --- a/milena/tests/io/off/Makefile.am +++ b/milena/tests/io/off/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/io/pbm/Makefile.am b/milena/tests/io/pbm/Makefile.am index b44b737..91d23f0 100644 --- a/milena/tests/io/pbm/Makefile.am +++ b/milena/tests/io/pbm/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/io/pfm/Makefile.am b/milena/tests/io/pfm/Makefile.am index 99c64d4..068db4d 100644 --- a/milena/tests/io/pfm/Makefile.am +++ b/milena/tests/io/pfm/Makefile.am @@ -1,3 +1,3 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/io/pgm/Makefile.am b/milena/tests/io/pgm/Makefile.am index 4f46d4d..929b163 100644 --- a/milena/tests/io/pgm/Makefile.am +++ b/milena/tests/io/pgm/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/io/pnm/Makefile.am b/milena/tests/io/pnm/Makefile.am index 99c64d4..068db4d 100644 --- a/milena/tests/io/pnm/Makefile.am +++ b/milena/tests/io/pnm/Makefile.am @@ -1,3 +1,3 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/io/ppm/Makefile.am b/milena/tests/io/ppm/Makefile.am index 7bb87f8..763ec0c 100644 --- a/milena/tests/io/ppm/Makefile.am +++ b/milena/tests/io/ppm/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/io/tiff/Makefile.am b/milena/tests/io/tiff/Makefile.am index 92fc55c..c94eeb1 100644 --- a/milena/tests/io/tiff/Makefile.am +++ b/milena/tests/io/tiff/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/labeling/Makefile.am b/milena/tests/labeling/Makefile.am index 0dfb121..a599f52 100644 --- a/milena/tests/labeling/Makefile.am +++ b/milena/tests/labeling/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/level/Makefile.am b/milena/tests/level/Makefile.am index 39f3a63..f6a4cfc 100644 --- a/milena/tests/level/Makefile.am +++ b/milena/tests/level/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/level/approx/Makefile.am b/milena/tests/level/approx/Makefile.am index 4f7d9cc..9e0483a 100644 --- a/milena/tests/level/approx/Makefile.am +++ b/milena/tests/level/approx/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/level/naive/Makefile.am b/milena/tests/level/naive/Makefile.am index c0fe35d..27eb128 100644 --- a/milena/tests/level/naive/Makefile.am +++ b/milena/tests/level/naive/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/linear/Makefile.am b/milena/tests/linear/Makefile.am index cc5758d..1d6e969 100644 --- a/milena/tests/linear/Makefile.am +++ b/milena/tests/linear/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/linear/local/Makefile.am b/milena/tests/linear/local/Makefile.am index 7e1c82b..f36f8dc 100644 --- a/milena/tests/linear/local/Makefile.am +++ b/milena/tests/linear/local/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/literal/Makefile.am b/milena/tests/literal/Makefile.am index 2a70c5b..a443dcd 100644 --- a/milena/tests/literal/Makefile.am +++ b/milena/tests/literal/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/logical/Makefile.am b/milena/tests/logical/Makefile.am index 70ed785..c11d57e 100644 --- a/milena/tests/logical/Makefile.am +++ b/milena/tests/logical/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/make/Makefile.am b/milena/tests/make/Makefile.am index d9e391c..fc32c0d 100644 --- a/milena/tests/make/Makefile.am +++ b/milena/tests/make/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/math/Makefile.am b/milena/tests/math/Makefile.am index 99c64d4..068db4d 100644 --- a/milena/tests/math/Makefile.am +++ b/milena/tests/math/Makefile.am @@ -1,3 +1,3 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/metal/Makefile.am b/milena/tests/metal/Makefile.am index f609377..2b0469d 100644 --- a/milena/tests/metal/Makefile.am +++ b/milena/tests/metal/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/metal/make/Makefile.am b/milena/tests/metal/make/Makefile.am index 99c64d4..068db4d 100644 --- a/milena/tests/metal/make/Makefile.am +++ b/milena/tests/metal/make/Makefile.am @@ -1,3 +1,3 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/metal/math/Makefile.am b/milena/tests/metal/math/Makefile.am index 490ff5c..dd37727 100644 --- a/milena/tests/metal/math/Makefile.am +++ b/milena/tests/metal/math/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am index f66924d..c53bb70 100644 --- a/milena/tests/morpho/Makefile.am +++ b/milena/tests/morpho/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/morpho/approx/Makefile.am b/milena/tests/morpho/approx/Makefile.am index 31c56d7..28723a7 100644 --- a/milena/tests/morpho/approx/Makefile.am +++ b/milena/tests/morpho/approx/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/morpho/attribute/Makefile.am b/milena/tests/morpho/attribute/Makefile.am index 082c763..618715f 100644 --- a/milena/tests/morpho/attribute/Makefile.am +++ b/milena/tests/morpho/attribute/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/morpho/closing/Makefile.am b/milena/tests/morpho/closing/Makefile.am index 696cd14..6b3f26d 100644 --- a/milena/tests/morpho/closing/Makefile.am +++ b/milena/tests/morpho/closing/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/morpho/closing/approx/Makefile.am b/milena/tests/morpho/closing/approx/Makefile.am index 357c059..466f86d 100644 --- a/milena/tests/morpho/closing/approx/Makefile.am +++ b/milena/tests/morpho/closing/approx/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/morpho/elementary/Makefile.am b/milena/tests/morpho/elementary/Makefile.am index 970996a..261c191 100644 --- a/milena/tests/morpho/elementary/Makefile.am +++ b/milena/tests/morpho/elementary/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/morpho/opening/Makefile.am b/milena/tests/morpho/opening/Makefile.am index 5f7e44a..9c59ef7 100644 --- a/milena/tests/morpho/opening/Makefile.am +++ b/milena/tests/morpho/opening/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/morpho/opening/approx/Makefile.am b/milena/tests/morpho/opening/approx/Makefile.am index 357c059..466f86d 100644 --- a/milena/tests/morpho/opening/approx/Makefile.am +++ b/milena/tests/morpho/opening/approx/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/morpho/tree/Makefile.am b/milena/tests/morpho/tree/Makefile.am index 7a51686..59bcbe3 100644 --- a/milena/tests/morpho/tree/Makefile.am +++ b/milena/tests/morpho/tree/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/morpho/watershed/Makefile.am b/milena/tests/morpho/watershed/Makefile.am index 63dc2a7..0068b43 100644 --- a/milena/tests/morpho/watershed/Makefile.am +++ b/milena/tests/morpho/watershed/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/norm/Makefile.am b/milena/tests/norm/Makefile.am index ff74b8d..fbc9b0b 100644 --- a/milena/tests/norm/Makefile.am +++ b/milena/tests/norm/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/opt/Makefile.am b/milena/tests/opt/Makefile.am index b9e1924..c56bb1f 100644 --- a/milena/tests/opt/Makefile.am +++ b/milena/tests/opt/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/pw/Makefile.am b/milena/tests/pw/Makefile.am index a07e38a..50e3b80 100644 --- a/milena/tests/pw/Makefile.am +++ b/milena/tests/pw/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/registration/Makefile.am b/milena/tests/registration/Makefile.am index 2dc70ed..229af48 100644 --- a/milena/tests/registration/Makefile.am +++ b/milena/tests/registration/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/set/Makefile.am b/milena/tests/set/Makefile.am index fc936de..71f81d1 100644 --- a/milena/tests/set/Makefile.am +++ b/milena/tests/set/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/subsampling/Makefile.am b/milena/tests/subsampling/Makefile.am index 99c64d4..068db4d 100644 --- a/milena/tests/subsampling/Makefile.am +++ b/milena/tests/subsampling/Makefile.am @@ -1,3 +1,3 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/tag/Makefile.am b/milena/tests/tag/Makefile.am index 99c64d4..068db4d 100644 --- a/milena/tests/tag/Makefile.am +++ b/milena/tests/tag/Makefile.am @@ -1,3 +1,3 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/test/Makefile.am b/milena/tests/test/Makefile.am index 91c3a68..04d1954 100644 --- a/milena/tests/test/Makefile.am +++ b/milena/tests/test/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/topo/Makefile.am b/milena/tests/topo/Makefile.am index d6258d8..b955229 100644 --- a/milena/tests/topo/Makefile.am +++ b/milena/tests/topo/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/trace/Makefile.am b/milena/tests/trace/Makefile.am index 99c64d4..068db4d 100644 --- a/milena/tests/trace/Makefile.am +++ b/milena/tests/trace/Makefile.am @@ -1,3 +1,3 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/trait/Makefile.am b/milena/tests/trait/Makefile.am index 801682c..2658a7d 100644 --- a/milena/tests/trait/Makefile.am +++ b/milena/tests/trait/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/trait/image/Makefile.am b/milena/tests/trait/image/Makefile.am index ef4a560..eeff845 100644 --- a/milena/tests/trait/image/Makefile.am +++ b/milena/tests/trait/image/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/trait/op/Makefile.am b/milena/tests/trait/op/Makefile.am index 7437ffc..41bd1df 100644 --- a/milena/tests/trait/op/Makefile.am +++ b/milena/tests/trait/op/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/trait/value/Makefile.am b/milena/tests/trait/value/Makefile.am index 3aa35ca..f13c31a 100644 --- a/milena/tests/trait/value/Makefile.am +++ b/milena/tests/trait/value/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/transform/Makefile.am b/milena/tests/transform/Makefile.am index 04087f7..a1a9788 100644 --- a/milena/tests/transform/Makefile.am +++ b/milena/tests/transform/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index 658b4f6..efdd5b3 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/util/Makefile.am b/milena/tests/util/Makefile.am index a808683..1e49416 100644 --- a/milena/tests/util/Makefile.am +++ b/milena/tests/util/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/value/Makefile.am b/milena/tests/value/Makefile.am index eb97a3a..ac4fdc5 100644 --- a/milena/tests/value/Makefile.am +++ b/milena/tests/value/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/value/builtin/Makefile.am b/milena/tests/value/builtin/Makefile.am index 45c3d0c..e81ab23 100644 --- a/milena/tests/value/builtin/Makefile.am +++ b/milena/tests/value/builtin/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/value/concept/Makefile.am b/milena/tests/value/concept/Makefile.am index 99c64d4..068db4d 100644 --- a/milena/tests/value/concept/Makefile.am +++ b/milena/tests/value/concept/Makefile.am @@ -1,3 +1,3 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/win/Makefile.am b/milena/tests/win/Makefile.am index e6bf84d..55bdcd1 100644 --- a/milena/tests/win/Makefile.am +++ b/milena/tests/win/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tests/world/inter_pixel/dim2/Makefile.am b/milena/tests/world/inter_pixel/dim2/Makefile.am index 51fef42..882968d 100644 --- a/milena/tests/world/inter_pixel/dim2/Makefile.am +++ b/milena/tests/world/inter_pixel/dim2/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk diff --git a/milena/tools/Makefile.am b/milena/tools/Makefile.am index 335f622..dbcf956 100644 --- a/milena/tools/Makefile.am +++ b/milena/tools/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tools/tools.mk diff --git a/swilena/Makefile.am b/swilena/Makefile.am index f796795..ef711d8 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to produce Makefile.in -*- Makefile -*- +## Process this file through Automake to produce Makefile.in. SUBDIRS = python diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 568526b..6dce7a3 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -1,4 +1,4 @@ -## Process this file through Automake to produce Makefile.in -*- Makefile -*- +## Process this file through Automake to produce Makefile.in. ## ------------------ ## ## Generic material. ## -- 1.6.1.2

1 0

[PATCH 01/31] Clean up ChangeLogs.
by Roland Levillain 15 May '09

15 May '09

--- ChangeLog | 456 +--------------- milena/ChangeLog | 1430 +++++++++++++++++++++++++++++----------------- milena/sandbox/ChangeLog | 628 +++++++++++---------- swilena/ChangeLog | 18 +- 4 files changed, 1269 insertions(+), 1263 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50179ba..9c5162d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,85 +18,6 @@ * configure.ac: Do not configure tests/fun/l2l anymore. -2009-04-28 Frederic Bour <bour(a)lrde.epita.fr> - - Correct bugs, point functions. - * milena/mln/fun/point/col.hh: New. - * milena/mln/fun/point/row.hh: New. - * milena/mln/fun/point/sli.hh: New. - * milena/mln/fun/point: New. - * milena/mln/fun/spe/unary.hh: Improved proxy support. - * milena/mln/fun/unary.hh: Improved proxy support. - * milena/mln/trait/next/solve_proxy.hh: Typo errors correction. - * milena/sandbox/fred/tests/fun.cc, - * milena/sandbox/fred/tests/thru.cc: Add some tests for proxy. - -2009-04-27 Frederic Bour <bour(a)lrde.epita.fr> - - Merge new fun implementation to main milena directory. - * milena/mln/accu/inf.hh: New. - * milena/mln/accu/sup.hh: New. - * milena/mln/core/concept/meta_function.hh: New. - * milena/mln/core/image/thru_morpher.hh: New. - * milena/mln/core/image/thrubin_morpher.hh: New. - * milena/mln/fun/accu_result.hh: New. - * milena/mln/fun/binary.hh: New. - * milena/mln/fun/component/blue.hh: New. - * milena/mln/fun/component/comp.hh: New. - * milena/mln/fun/component/green.hh: New. - * milena/mln/fun/component/red.hh: New. - * milena/mln/fun/component/rgb.hh: New. - * milena/mln/fun/component: New. - * milena/mln/fun/compose.hh: New. - * milena/mln/fun/composition.hh: New. - * milena/mln/fun/from_accu.hh: New. - * milena/mln/fun/math/abs.hh: New. - * milena/mln/fun/math/cos.hh: New. - * milena/mln/fun/math/inf.hh: New. - * milena/mln/fun/math/norm.hh: New. - * milena/mln/fun/math/sup.hh: New. - * milena/mln/fun/math: New. - * milena/mln/fun/param.hh: New. - * milena/mln/fun/spe/binary.hh: New. - * milena/mln/fun/spe/unary.hh: New. - * milena/mln/fun/spe: New. - * milena/mln/fun/unary.hh: New. - * milena/mln/trait/fun.hh: New. - * milena/mln/trait/next/solve.hh: New. - * milena/mln/trait/next/solve_binary.hh: New. - * milena/mln/trait/next/solve_proxy.hh: New. - * milena/mln/trait/next/solve_unary.hh: New. - * milena/mln/trait/next: New. - * milena/sandbox/fred/mln/accu/inf.hh: Remove. - * milena/sandbox/fred/mln/accu/sup.hh: Remove. - * milena/sandbox/fred/mln/core/concept/meta_function.hh: Remove. - * milena/sandbox/fred/mln/core/image/thru_morpher.hh: Remove. - * milena/sandbox/fred/mln/core/image/thrubin_morpher.hh: Remove. - * milena/sandbox/fred/mln/fun/accu_result.hh: Remove. - * milena/sandbox/fred/mln/fun/binary.hh: Remove. - * milena/sandbox/fred/mln/fun/component/blue.hh: Remove. - * milena/sandbox/fred/mln/fun/component/comp.hh: Remove. - * milena/sandbox/fred/mln/fun/component/green.hh: Remove. - * milena/sandbox/fred/mln/fun/component/red.hh: Remove. - * milena/sandbox/fred/mln/fun/component/rgb.hh: Remove. - * milena/sandbox/fred/mln/fun/compose.hh: Remove. - * milena/sandbox/fred/mln/fun/composition.hh: Remove. - * milena/sandbox/fred/mln/fun/from_accu.hh: Remove. - * milena/sandbox/fred/mln/fun/math/abs.hh: Remove. - * milena/sandbox/fred/mln/fun/math/cos.hh: Remove. - * milena/sandbox/fred/mln/fun/math/inf.hh: Remove. - * milena/sandbox/fred/mln/fun/math/norm.hh: Remove. - * milena/sandbox/fred/mln/fun/math/sup.hh: Remove. - * milena/sandbox/fred/mln/fun/param.hh: Remove. - * milena/sandbox/fred/mln/fun/spe/binary.hh: Remove. - * milena/sandbox/fred/mln/fun/spe/unary.hh: Remove. - * milena/sandbox/fred/mln/fun/unary.hh: Remove. - * milena/sandbox/fred/mln/trait/fun.hh: Remove. - * milena/sandbox/fred/mln/trait/next/solve.hh: Remove. - * milena/sandbox/fred/mln/trait/next/solve_binary.hh: Remove. - * milena/sandbox/fred/mln/trait/next/solve_proxy.hh: Remove. - * milena/sandbox/fred/mln/trait/next/solve_unary.hh: Remove. - 2009-04-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * configure.ac: configure milena/tests/graph/. @@ -121,61 +42,15 @@ * configure.ac: Always configure directory external/trimesh/. -2009-03-13 Frederic Bour <bour(a)lrde.epita.fr> - - fun update: add unary & binary composition. - - * milena/sandbox/fred/fun/cos.hh, - * milena/sandbox/fred/fun/abs.hh: - WIP, switching from solve to nsolve. - * milena/sandbox/fred/fun/assignability.hh: New. - Traits to check function properties using sfinae (should be renamed). - * milena/sandbox/fred/fun/binary.hh: New. Binary function - * milena/sandbox/fred/fun/compose.hh: New. Compose function. - * milena/sandbox/fred/fun/composition.hh: New. - Composition result objects definition. - * milena/sandbox/fred/fun/cos.cc: New. Test for composition. - * milena/sandbox/fred/fun/fun.cc: WIP. - * milena/sandbox/fred/fun/meta_function.hh: - Added Meta_Function_v2v and Meta_Function_vv2v categories. - * milena/sandbox/fred/fun/nsolve.hh, - * milena/sandbox/fred/fun/nsolve_binary.hh, - * milena/sandbox/fred/fun/nsolve_unary.hh: New. - Original trait solver modification now based - on typename flag instead of template <class> class - * milena/sandbox/fred/fun/thru_morpher.hh: WIP. - * milena/sandbox/fred/fun/unary.hh: Update & redesign, - especially for composition. - 2009-03-10 Guillaume Lazzara <lazzara(a)lrde.epita.fr> - configure.ac: configure approx/ and closing/approx in + * configure.ac: configure approx/ and closing/approx in milena/tests/morpho/. 2009-03-10 Guillaume Lazzara <z(a)lrde.epita.fr> * configure.ac: configure tests/morpho/opening/approx. -2009-03-09 Frederic Bour <bour(a)lrde.epita.fr> - - Add missing trait for thru_morpher. - * milena/sandbox/fred/fun/unary.hh: Add is_assignable trait, just - a workaround. - -2009-03-09 Frederic Bour <bour(a)lrde.epita.fr> - - Verify constness of "thru" image morpher. - * milena/mln/trait/image/props.hh: Correct small typos errors. - * milena/sandbox/fred/fun/abs.hh, - * milena/sandbox/fred/fun/cos.hh, - * milena/sandbox/fred/fun/inc.hh, - * milena/sandbox/fred/fun/norm.hh, - * milena/sandbox/fred/fun/red.hh: - Namespace name desambiguation. - * milena/sandbox/fred/fun/thru.cc, - * milena/sandbox/fred/fun/thru_morpher.hh: - Verify constness (WIP). - 2009-03-05 Guillaume Lazzara <z(a)lrde.epita.fr> Add Update mln/doc configuration. @@ -184,30 +59,6 @@ * configure.ac: configure new directories milena/doc. -2009-03-01 Frederic Bour <bour(a)lrde.epita.fr> - - Add rush/exo3. - * milena/mln/canvas/morpho/attribute_filter.hh: Add one missing include. - * milena/sandbox/theo/rush/exo3/Makefile: New. - * milena/sandbox/theo/rush/exo3/exo3_1.cc: New. - * milena/sandbox/theo/rush/exo3/exo3_2.cc: New. - * milena/sandbox/theo/rush/exo3/inverse.cc: New. - * milena/sandbox/theo/rush/exo3: New. - -2009-02-28 Edwin Carlinet <carlinet(a)lrde.epita.fr> - - Correct bugs in tests. - * milena/mln/morpho/closing/algebraic.hh, - * milena/mln/morpho/closing/leveling.hh: Correct some bugs. - - * milena/tests/morpho/closing/Makefile.am, - * milena/tests/morpho/closing/algebraic.cc, - * milena/tests/morpho/closing/leveling.cc, - * milena/tests/morpho/opening/Makefile.am, - * milena/tests/morpho/opening/algebraic.cc, - * milena/tests/morpho/opening/leveling.cc: - Correct some bugs and comment reference code using generic accumulators. - 2009-02-28 Edwin Carlinet <carlinet(a)lrde.epita.fr> Add leveling/algebraic morpho tests. @@ -236,21 +87,6 @@ * configure.ac: configure tests/morpho/watershed and tests/morpho/attribute. -2009-02-12 Frederic Bour <bour(a)lrde.epita.fr> - - Add connected filters dispatcher (not tested).. - * milena/sandbox/fred/Makefile: . - * milena/sandbox/fred/connected_filter.hh: New. - * milena/sandbox/fred/leveling_filter.hh: . - * milena/sandbox/fred/mean.hh: . - -2009-02-11 Frederic Bour <bour(a)lrde.epita.fr> - - Wip of mean attribute set_value. - * milena/sandbox/fred/Makefile: . - * milena/sandbox/fred/mean.hh: set_value WIP. - * milena/sandbox/fred/meantest.cc: New. - 2009-02-10 Roland Levillain <roland(a)lrde.epita.fr> * .gitignore: Ignore pattern `*.dSYM'. @@ -281,15 +117,6 @@ 2009-02-03 Roland Levillain <roland(a)lrde.epita.fr> - Typo: s/splitted/split/. - - * milena/doc/Doxyfile.in, - * milena/doc/doc.mk, - * milena/doc/tutorial/tools/split_sample.sh, - * milena/doc/tutorial/tutorial.tex: Here. - -2009-02-03 Roland Levillain <roland(a)lrde.epita.fr> - Use modern idioms of Libtool. * configure.ac: Invoke LT_INIT instead of AC_PROG_LIBTOOL. @@ -480,293 +307,12 @@ * configure.ac: Add tutorial/samples Makefiles. -2008-11-10 Matthieu Garrigues <garrigues(a)lrde.epita.fr> - - Put Licence to 70 cols. - - * milena/doc/benchmark/morpho/erosion.cc: . - * milena/mln/accu/count_adjacent_vertices.hh: . - * milena/mln/accu/height.hh: . - * milena/mln/border/fill.hh: . - * milena/mln/border/get.hh: . - * milena/mln/canvas/morpho/algebraic_union_find.hh: . - * milena/mln/convert/to_p_array.hh: . - * milena/mln/convert/to_upper_window.hh: . - * milena/mln/convert/to_window.hh: . - * milena/mln/core/alias/dpoint1d.hh: . - * milena/mln/core/alias/dpoint2d.hh: . - * milena/mln/core/alias/dpoint2d_h.hh: . - * milena/mln/core/alias/dpoint3d.hh: . - * milena/mln/core/alias/point1d.hh: . - * milena/mln/core/alias/point2d.hh: . - * milena/mln/core/alias/point2d_h.hh: . - * milena/mln/core/alias/point3d.hh: . - * milena/mln/core/alias/point3df.hh: . - * milena/mln/core/alias/window1d.hh: . - * milena/mln/core/alias/window3d.hh: . - * milena/mln/core/dpoints_pixter.hh: . - * milena/mln/core/image/bgraph_image.hh: . - * milena/mln/core/image/bgraph_psite.hh: . - * milena/mln/core/image/decorated_image.hh: . - * milena/mln/core/image/fi_adaptor.hh: . - * milena/mln/core/image/graph_elt_neighborhood.hh: . - * milena/mln/core/image/graph_elt_window.hh: . - * milena/mln/core/image/graph_image.hh: . - * milena/mln/core/image/graph_neighborhood_piter.hh: . - * milena/mln/core/image/graph_window_piter.hh: . - * milena/mln/core/image/line_graph_elt_neighborhood.hh: . - * milena/mln/core/image/line_graph_elt_window.hh: . - * milena/mln/core/image/line_graph_image.hh: . - * milena/mln/core/image/line_graph_neighborhood_piter.hh: . - * milena/mln/core/image/line_graph_psite.hh: . - * milena/mln/core/image/line_graph_window_piter.hh: . - * milena/mln/core/internal/force_exact.hh: . - * milena/mln/core/internal/image_value_morpher.hh: . - * milena/mln/core/internal/line_graph_vicinity_piter.hh: . - * milena/mln/core/internal/pixel_iterator_base.hh: . - * milena/mln/core/pixter1d.hh: . - * milena/mln/core/pixter2d.hh: . - * milena/mln/core/pixter3d.hh: . - * milena/mln/core/site_set/p_bgraph.hh: . - * milena/mln/core/site_set/p_bgraph_piter.hh: . - * milena/mln/core/site_set/p_edges.hh: . - * milena/mln/core/site_set/p_graph.hh: . - * milena/mln/core/site_set/p_graph_piter.hh: . - * milena/mln/core/site_set/p_line_graph.hh: . - * milena/mln/core/site_set/p_line_graph_piter.hh: . - * milena/mln/core/site_set/p_vertices.hh: . - * milena/mln/core/trait/qlf_value.hh: . - * milena/mln/debug/graph.hh: . - * milena/mln/geom/seeds2tiling.hh: . - * milena/mln/geom/seeds2tiling_roundness.hh: . - * milena/mln/labeling/background.hh: . - * milena/mln/labeling/flat_zones.hh: . - * milena/mln/labeling/foreground.hh: . - * milena/mln/labeling/regional_maxima.hh: . - * milena/mln/labeling/regional_minima.hh: . - * milena/mln/level/memset_.hh: . - * milena/mln/linear/gaussian.hh: . - * milena/mln/make/voronoi.hh: . - * milena/mln/math/abs.hh: . - * milena/mln/metal/abort.hh: . - * milena/mln/morpho/closing_area.hh: . - * milena/mln/morpho/closing_area_on_vertices.hh: . - * milena/mln/morpho/closing_attribute.hh: . - * milena/mln/morpho/closing_height.hh: . - * milena/mln/morpho/closing_volume.hh: . - * milena/mln/morpho/opening_area.hh: . - * milena/mln/morpho/opening_area_on_vertices.hh: . - * milena/mln/morpho/opening_attribute.hh: . - * milena/mln/morpho/opening_height.hh: . - * milena/mln/morpho/opening_volume.hh: . - * milena/mln/set/inter.hh: . - * milena/mln/tag/skeleton.hh: . - * milena/mln/trait/ch_value.hh: . - * milena/mln/util/graph.hh: . - * milena/mln/util/greater_point.hh: . - * milena/mln/util/greater_psite.hh: . - * milena/mln/util/internal/boost_graph.hh: . - * milena/mln/util/internal/boost_graph_access.hh: . - * milena/mln/util/internal/boost_graph_property.hh: . - * milena/mln/util/internal/boost_graph_structure.hh: . - * milena/mln/util/internal/graph_base.hh: . - * milena/mln/util/ord_pair.hh: . - * milena/mln/value/int_u_sat.hh: . - * milena/mln/value/proxy.hh: . - * milena/mln/value/stack.hh: . - * milena/mln/win/line.hh: . - * milena/sandbox/garrigues/ocr/check.sh: . - * milena/sandbox/garrigues/ocr/ocr_with_preprocess.cc: . - * milena/sandbox/garrigues/ocr/skeleton.hh: . - * milena/sandbox/jardonnet/array/old/1d.hh: . - * milena/sandbox/jardonnet/array/old/2d.hh: . - * milena/sandbox/jardonnet/array/old/3d.hh: . - * milena/sandbox/jardonnet/array/old/all.hh: . - * milena/sandbox/jardonnet/array/old/nd.hh: . - * milena/sandbox/jardonnet/array/old/objs.hh: . - * milena/sandbox/levillain/morpho/lower_completion.hh: . - * milena/sandbox/levillain/morpho/shortest_path_watershed.hh: . - * milena/sandbox/nivault/dmap.hh: . - * milena/sandbox/pellegrin/set/core/p_bgraph.hh: . - * milena/sandbox/pellegrin/set/core/p_graph.hh: . - * milena/sandbox/pellegrin/set/core/p_line_graph.hh: . - * milena/sandbox/vigouroux/color.hh: . - * milena/sandbox/vigouroux/color/color.hh: . - * milena/sandbox/vigouroux/color/hsi.hh: . - * milena/sandbox/vigouroux/color/hsl.hh: . - * milena/sandbox/vigouroux/color/hsv.hh: . - * milena/sandbox/vigouroux/color/nrgb.hh: . - * milena/sandbox/vigouroux/color/rgb.hh: . - * milena/sandbox/vigouroux/color/xyz.hh: . - * milena/sandbox/vigouroux/color/yiq.hh: . - * milena/sandbox/vigouroux/color/yuv.hh: . - * milena/sandbox/vigouroux/convert/abstract/colorconv.hh: . - * milena/sandbox/vigouroux/convert/abstract/conversion.hh: . - * milena/sandbox/vigouroux/convert/basics.hh: . - * milena/sandbox/vigouroux/convert/bound.hh: . - * milena/sandbox/vigouroux/convert/cast.hh: . - * milena/sandbox/vigouroux/convert/conversion.hh: . - * milena/sandbox/vigouroux/convert/conversion_ng_se.hh: . - * milena/sandbox/vigouroux/convert/force.hh: . - * milena/sandbox/vigouroux/convert/nrgbxyz.hh: . - * milena/sandbox/vigouroux/convert/rgbhsi.hh: . - * milena/sandbox/vigouroux/convert/rgbhsl.hh: . - * milena/sandbox/vigouroux/convert/rgbhsv.hh: . - * milena/sandbox/vigouroux/convert/rgbnrgb.hh: . - * milena/sandbox/vigouroux/convert/rgbxyz.hh: . - * milena/sandbox/vigouroux/convert/rgbyiq.hh: . - * milena/sandbox/vigouroux/convert/rgbyuv.hh: . - * milena/sandbox/vigouroux/convert/stretch.hh: . - * milena/tests/timer.hh: . - 2008-11-04 Ugo Jardonnet <jardonnet(a)lrde.epita.fr> Update configure.ac for unit_test. * configure.ac: Add unit_test Makefile. -2008-11-03 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> - - Remove a std::size_t. - - In my opinion nelements must not return size_t. - * milena/mln/core/site_set/p_image.hh, - * milena/mln/core/image/image3d.hh: Here. - -2008-10-31 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - - Clean-up from_to, add some new overloads, and fix (c). - - * milena/tests/core/other/w_window.cc: New. - * milena/tests/core/other/Makefile.am: Update. - * milena/tests/core/alias/window2d.cc: Remove echos. - * milena/mln/make/image2d.hh: New. - * milena/tests/make/image2d.cc: New. - * milena/tests/make/Makefile.am: Update. - * milena/tests/convert/to_image.cc: Fix copyright. - (include): Remove; useless. - * milena/mln/core/alias/window2d.hh: Fix include. - * milena/mln/core/w_window.hh (from_to): New overload. - * milena/mln/core/dpoint.hh: Fix (c). - * milena/mln/core/concept/weighted_window.hh: Fix (c). - * milena/mln/core/concept/object.hh: Include all metal math. - Include metal converts_to. - * milena/mln/core/concept/window.hh (from_to): New overload. - (todo): New. - * milena/mln/core/concept/image.hh (from_to): New overload. - * milena/mln/core/concept/gpoint.hh: Fix doc. - * milena/mln/core/concept/gdpoint.hh (from_to): New overload. - * milena/mln/core/def/all.hh: New. - * milena/mln/core/window.hh: Fix copyright. - * milena/mln/linear/convolve.hh: Fix warning + copyright. - * milena/mln/make/image.hh (image): New overload for 3D. - * milena/mln/make/w_window2d.hh: Fix copyright. - Remove useless include. - * milena/mln/convert/to_image.hh - (mln_image_from, helper_dim_, helper_image_from_): Remove. - Redundant with image_from_grid. - (to_image): Update and use convert::from_to. - * milena/mln/convert/from_to.hxx: Layout and update. - -2008-10-31 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - - Introduce make::image. - - When there is no ambiguity, the user can call make::image. - - * milena/mln/make/image2d.hh: Rename as... - * milena/mln/make/image.hh: ...this. - Import code from... - * milena/mln/make/image1d.hh: ...this removed file. - * milena/mln/make/all.hh: Update. - * milena/tests/debug/iota.cc, - * milena/tests/draw/graph.cc, - * milena/tests/level/abs.cc, - * milena/tests/level/replace.cc, - * milena/tests/level/stretch.cc, - * milena/tests/level/apply.cc, - * milena/tests/level/compare.cc, - * milena/tests/level/saturate.cc, - * milena/tests/arith/minus.cc, - * milena/tests/arith/times.cc, - * milena/tests/arith/plus.cc, - * milena/tests/arith/revert.cc, - * milena/tests/accu/compute.cc, - * milena/tests/geom/resize.cc, - * milena/tests/geom/seed2tiling_roundness.cc, - * milena/tests/geom/seed2tiling.cc, - * milena/tests/display/color_pretty.cc, - * milena/tests/logical/or.cc, - * milena/tests/logical/not.cc, - * milena/tests/logical/and_not.cc, - * milena/tests/logical/and.cc, - * milena/tests/canvas/chamfer.cc, - * milena/tests/util/tree_to_image.cc, - * milena/tests/util/lemmings.cc, - * milena/tests/util/tree_fast_to_image.cc, - * milena/tests/labeling/compute.cc, - * milena/mln/core/image/image1d.hh: Update. - * milena/mln/core/image/image2d.hh: Update. - (todo): New. - * milena/mln/core/w_window.hh (from_to): New overload. - * milena/mln/make/w_window2d.hh: Change tests into checks. - * milena/mln/convert/from_to.hxx: Update. - * milena/mln/canvas/browsing/directional.hh: . - * milena/tests/core/alias/w_window2d_int.cc: Add alt code. - -2008-10-30 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - - Add a generic discrete distance transform. - - * milena/mln/transform: New. - * milena/mln/transform/distance.hh: New. - * milena/tests/transform: New directory. - * milena/tests/transform/Makefile.am: New. - * milena/tests/transform/distance.cc: New. - * milena/sandbox/geraud/skel.cc: Layout. - * milena/sandbox/geraud/dmap.cc: Update. - - Slight change in w_window. - - * milena/mln/core/w_window.hh (from_to): Prepare new overload. - For that, add some new meta-code: - * milena/mln/metal/math/root.hh: New. - * milena/mln/metal/math/all.hh: Update. - * milena/mln/metal/math/sqrt.hh (todo): New. - * milena/tests/metal/math/root.cc: New. - * milena/tests/metal/math/pow.cc: Remove echo. - * milena/tests/metal/math/Makefile.am: Update. - * milena/tests/morpho/Makefile.am (SUBDIRS): Fix missing. - -2008-10-29 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - - Few updates. - - * milena/tests/draw/line.cc: Fix missing update. - * milena/mln/draw/line.hh: Make it safe. - * milena/mln/morpho/closing_volume.hh (closing_volume): New - overload with output as return. - * milena/mln/morpho/all.hh: Better doc. - (include): Update. - * milena/sandbox/geraud/wst_edge.cc: Prefer volume closing over - area closing. - -2008-10-27 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - - Add fun::v2v::convert and level::convert. - - * milena/mln/fun/v2v/convert.hh: New. - * milena/mln/fun/v2v/cast.hh (todo): New. - * milena/mln/level/convert.hh: New. - * milena/tests/level/convert.cc: New. - * milena/tests/level/Makefile.am: Update. - * milena/mln/value/rgb.hh (todo): New. - (from_to): New overload for bool->rgbn. - * milena/mln/convert/from_to.hxx - (from_to): New decl for bool->rgbn. - * milena/sandbox/scribo/demat.hh - (include): Remove obsolete dependency. - 2008-10-15 Roland Levillain <roland(a)lrde.epita.fr> * configure.ac: Configure milena/tests/io/off/Makefile. diff --git a/milena/ChangeLog b/milena/ChangeLog index d334fc3..48eb4b6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -7,53 +7,54 @@ * doc/examples/labeling-compute.cc, * doc/examples/tuto3/colorize.cc, * doc/examples/tuto4/point2d.cc, - * doc/examples/tuto4_genericity_and_algorithms.cc: update examples. + * doc/examples/tuto4_genericity_and_algorithms.cc: Update examples. * doc/outputs/site_set_create.txt, * doc/outputs/colorize.txt, * doc/outputs/println.txt, - * doc/outputs/trace.txt: rename as... + * doc/outputs/trace.txt: Rename as... * doc/outputs/tuto4_site_set_create.txt, * doc/outputs/tuto3_println.txt, * doc/outputs/tuto3_colorize.txt, - * doc/outputs/tuto3_trace.txt: ... this. + * doc/outputs/tuto3_trace.txt: ...this. - * doc/outputs/tuto4_point2d.txt: new reference output file. + * doc/outputs/tuto4_point2d.txt: New reference output file. - * doc/tools/split_sample.sh: add subdir names to example binary names. + * doc/tools/split_sample.sh: Add subdir names to example binary names. - * doc/tutorial/tutorial.tex: include correct code samples. + * doc/tutorial/tutorial.tex: Include correct code samples. - * mln/accu/bbox.hh: temporary disable a precondition. + * mln/accu/bbox.hh: Temporary disable a precondition. - * mln/accu/compute.hh: add a fixme. + * mln/accu/compute.hh: Add a fixme. - * mln/core/image/tr_image.hh: require an image to be const in the constructor. + * mln/core/image/tr_image.hh: Require an image to be const in the + constructor. - * mln/core/site_set/p_array.hh: fix invalid static_cast. + * mln/core/site_set/p_array.hh: Fix invalid static_cast. - * mln/labeling/compute.hh: add more comments. - - * mln/labeling/essential.hh: add missing include. - - * mln/morpho/hit_or_miss.hh: avoid warnings. + * mln/labeling/compute.hh: Add more comments. + + * mln/labeling/essential.hh: Add missing include. + + * mln/morpho/hit_or_miss.hh: Avoid warnings. 2009-05-12 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Small fixes. - * milena/doc/examples/tuto3/fill_non_generic.cc.raw: fix. + * milena/doc/examples/tuto3/fill_non_generic.cc.raw: Fix. * milena/tests/unit_test/build_unit_test.sh, - * milena/generate_dist_headers.sh: use 'sort' to be sure of the output + * milena/generate_dist_headers.sh: Use 'sort' to be sure of the output lines order. * milena/headers.mk, - * milena/tests/unit_test/unit-tests.mk: regenerate with the previous + * milena/tests/unit_test/unit-tests.mk: Regenerate with the previous modified scripts. - * milena/mln/core/image/vertex_image.hh: fix a wrong type declaration. + * milena/mln/core/image/vertex_image.hh: Fix a wrong type declaration. * milena/mln/core/internal/graph_psite_base.hh: Remove comparison operators. @@ -62,22 +63,22 @@ site type. * milena/mln/core/site_set/p_edges_psite.hh, - * milena/mln/core/site_set/p_vertices_psite.hh: add operator ==, != + * milena/mln/core/site_set/p_vertices_psite.hh: Add operator ==, != and <. - * milena/mln/fun/v2v/hsi_to_rgb.hh: reindent. + * milena/mln/fun/v2v/hsi_to_rgb.hh: Reindent. - * milena/mln/fun/v2v/hsl_to_rgb.hh: add a missing forward declaration. + * milena/mln/fun/v2v/hsl_to_rgb.hh: Add a missing forward declaration. - * milena/mln/io/magick/load.hh: move fixme. + * milena/mln/io/magick/load.hh: Move fixme. - * milena/mln/io/magick/save.hh: cleanup. + * milena/mln/io/magick/save.hh: Cleanup. - * milena/mln/value/hsl.hh: add operator==. + * milena/mln/value/hsl.hh: Add operator==. - * milena/tests/io/magick/Makefile.am: add ldflags to magick test. + * milena/tests/io/magick/Makefile.am: Add ldflags to magick test. - * milena/tests/io/magick/magick.cc: write a new test. + * milena/tests/io/magick/magick.cc: Write a new test. 2009-05-15 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -145,60 +146,60 @@ Small fixes. - * milena/headers.mk: update distributed files list. + * headers.mk: Update distributed files list. - * milena/mln/core/image/edge_image.hh, - * milena/mln/core/image/vertex_image.hh: fix a wrong image type. + * mln/core/image/edge_image.hh, + * mln/core/image/vertex_image.hh: Fix a wrong image type. - * milena/mln/fun/math/sup.hh: fix wrong template parameters. + * mln/fun/math/sup.hh: Fix wrong template parameters. - * milena/mln/value/rgb.hh, - * milena/mln/util/essential.hh, - * milena/mln/util/all.hh, - * milena/mln/labeling/all.hh, - * milena/mln/debug/all.hh, - * milena/mln/fun/v2v/all.hh: fix includes. + * mln/value/rgb.hh, + * mln/util/essential.hh, + * mln/util/all.hh, + * mln/labeling/all.hh, + * mln/debug/all.hh, + * mln/fun/v2v/all.hh: Fix includes. - * milena/mln/fun/v2v/rgb_to_hsi.hh: fix duplicate declarations. + * mln/fun/v2v/rgb_to_hsi.hh: Fix duplicate declarations. - * milena/mln/make/influence_zone_adjacency_graph.hh: add missing const + * mln/make/influence_zone_adjacency_graph.hh: Add missing const references. - * milena/mln/morpho/opening/area_on_vertices.hh: update according new + * mln/morpho/opening/area_on_vertices.hh: Update according new graph image types. - * milena/mln/registration/icp.hh: fix use of random_color. + * mln/registration/icp.hh: Fix use of random_color. - * milena/mln/util/adjacency_matrix.hh: fix wrong ifndef. + * mln/util/adjacency_matrix.hh: Fix wrong ifndef. - * milena/mln/util/object_id.hh, - * milena/mln/util/vertex.hh, - * milena/mln/util/edge.hh: fix operator< and operator==. + * mln/util/object_id.hh, + * mln/util/vertex.hh, + * mln/util/edge.hh: Fix operator< and operator==. - * milena/mln/util/graph.hh: add preconditions. + * mln/util/graph.hh: Add preconditions. - * milena/mln/world/binary_2d/all.hh: new. + * mln/world/binary_2d/all.hh: New. - * milena/tests/morpho/closing/Makefile.am, - * milena/tests/morpho/closing/area_on_vertices.cc, - * milena/tests/morpho/opening/Makefile.am, - * milena/tests/morpho/opening/area_on_vertices.cc: new tests. + * tests/morpho/closing/Makefile.am, + * tests/morpho/closing/area_on_vertices.cc, + * tests/morpho/opening/Makefile.am, + * tests/morpho/opening/area_on_vertices.cc: New tests. - * milena/tests/unit_test/unit-tests.mk: update unit test list. + * tests/unit_test/unit-tests.mk: Update unit test list. - * milena/tests/util/Makefile.am, - * milena/tests/util/tree_fast_to_image.cc, - * milena/tests/util/tree_to_image.cc: remove tests. + * tests/util/Makefile.am, + * tests/util/tree_fast_to_image.cc, + * tests/util/tree_to_image.cc: Remove tests. 2009-05-11 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Fix documentation. - * doc/Doxyfile.in: add macro definitions. + * doc/Doxyfile.in: Add macro definitions. - * doc/outputs/outputs.mk: update output reference files list. + * doc/outputs/outputs.mk: Update output reference files list. - * headers.mk: update distributed files list. + * headers.mk: Update distributed files list. * apps/statues/trimesh/misc.hh, * doc/examples/tuto3/first_routine.cc, @@ -318,11 +319,11 @@ Move debug::colorize to labeling::colorize. - * mln/debug/colorize.hh: move... - * mln/labeling/colorize.hh: ... here. + * mln/debug/colorize.hh: Move... + * mln/labeling/colorize.hh: ...here. * tests/labeling/Makefile.am, - * tests/labeling/colorize.cc: add a new test. + * tests/labeling/colorize.cc: Add a new test. 2009-05-07 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -398,7 +399,7 @@ Add couple to couple conversion. * mln/fun/i2v/array.hh (from_to_): Remove static check. - * milena/mln/convert/from_to.hxx: New overload for couple->couple. + * mln/convert/from_to.hxx: New overload for couple->couple. 2009-05-06 Fabien Freling <fabien.freling(a)lrde.epita.fr> @@ -414,57 +415,57 @@ Add adjacency matrix. * mln/make/influence_zone_adjacency_graph.hh, - * mln/make/region_adjacency_graph.hh: make use of this new structure. + * mln/make/region_adjacency_graph.hh: Make use of this new structure. - * mln/util/adjacency_matrix.hh: new structure. + * mln/util/adjacency_matrix.hh: New structure. * tests/util/Makefile.am, - * tests/util/adjacency_matrix.cc: associated test. + * tests/util/adjacency_matrix.cc: Associated test. 2009-05-06 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Small fixes. - * doc/tutorial/tutorial.tex: fix compilation. + * doc/tutorial/tutorial.tex: Fix compilation. - * mln/core/internal/neighb_niter_impl.hh: fix ambiguities and add more + * mln/core/internal/neighb_niter_impl.hh: Fix ambiguities and add more doc. - * mln/fun/v2v/rgb_to_hsl.hh: remove duplicate declarations. + * mln/fun/v2v/rgb_to_hsl.hh: Remove duplicate declarations. * mln/literal/one.hh, - * mln/literal/zero.hh: add 'const' qualification to conversion + * mln/literal/zero.hh: Add 'const' qualification to conversion operator. - * mln/make/edge_image.hh: update prototype. + * mln/make/edge_image.hh: Update prototype. - * mln/make/rag_and_labeled_wsl.hh: remove useless local variable. + * mln/make/rag_and_labeled_wsl.hh: Remove useless local variable. - * mln/pw/internal/image_base.hh: add missing include. + * mln/pw/internal/image_base.hh: Add missing include. - * mln/util/vertex.hh: add missing include and forward declaration. + * mln/util/vertex.hh: Add missing include and forward declaration. - * tests/util/set.cc: update header. + * tests/util/set.cc: Update header. 2009-05-06 Frederic Bour <bour(a)lrde.epita.fr> Correct typo errors, rename storage_ to state, update thrubin morpher. * mln/core/concept/meta_function.hh: Add mln_fun_withbin for binary - metafunction. + metafunction. * mln/core/image/thrubin_morpher.hh: Correct implementation of - thrubin_morpher.hh. + thrubin_morpher.hh. * mln/core/image/thru_morpher.hh: Typos correction. * mln/fun/binary.hh, * mln/fun/binary_param.hh: Renamed storage_get to state. * mln/fun/math/inf.hh, * mln/fun/math/sup.hh: Correct bug when working on two different - types. + types. * mln/fun/spe/binary.hh, * mln/fun/spe/unary.hh, * mln/fun/unary.hh, * mln/fun/unary_param.hh: Renamed storage_get to state. * mln/trait/next/solve_proxy.hh: Added one inclusion to prevent - errors. + errors. * sandbox/fred/tests/thru.cc: Added test for thrubin. 2009-05-05 Guillaume Lazzara <lazzara(a)lrde.epita.fr> @@ -605,7 +606,7 @@ Add overload for creating 2D neighborhood with a functor. * mln/make/double_neighb2d.hh: Add overload with a functor. * mln/world/inter_pixel/neighb2d.hh: Fix types, now passing - a functor instead of a C function. + a functor instead of a C function. 2009-05-04 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -745,7 +746,7 @@ Fixed display_edge() function. * mln/world/inter_pixel/display_edge.hh: Create an image - displaying edges values (int_u8). + displaying edges values (int_u8). 2009-04-30 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -781,7 +782,7 @@ Modification to parametrized functions, functions tutorial WIP. * mln/fun/binary.hh, * mln/fun/unary.hh: Modified parameters system. Now distinguish - Exact type from Flag type. + Exact type from Flag type. * mln/fun/binary_param.hh: New. * mln/fun/from_accu.hh: Updated to latest functions syntax. * mln/fun/unary.hh: Modified parameters system. @@ -1086,6 +1087,19 @@ renaming into... (pack_inplace): ...this. +2009-04-28 Frederic Bour <bour(a)lrde.epita.fr> + + Correct bugs, point functions. + * mln/fun/point/col.hh: New. + * mln/fun/point/row.hh: New. + * mln/fun/point/sli.hh: New. + * mln/fun/point: New. + * mln/fun/spe/unary.hh: Improved proxy support. + * mln/fun/unary.hh: Improved proxy support. + * mln/trait/next/solve_proxy.hh: Typo errors correction. + * sandbox/fred/tests/fun.cc, + * sandbox/fred/tests/thru.cc: Add some tests for proxy. + 2009-04-28 Fabien Freling <fabien.freling(a)lrde.epita.fr> Add world/ directory for inter_pixel images. @@ -1095,9 +1109,9 @@ * mln/io/magick/save.hh: Update. * mln/io/plot/save.hh: Update. * mln/world/inter_pixel/full.hh: Convert standard image - to inter_pixel image. + to inter_pixel image. * mln/world/inter_pixel/neighb2d.hh: Define standard - inter_pixel neighborhood. + inter_pixel neighborhood. 2009-04-28 Guillaume Lazzara <lazzara(a)lrde.epita.fr> @@ -1137,6 +1151,72 @@ * tests/unit_test/unit-tests.mk: update list of unit tests. +2009-04-27 Frederic Bour <bour(a)lrde.epita.fr> + + Merge new fun implementation to main milena directory. + * mln/accu/inf.hh: New. + * mln/accu/sup.hh: New. + * mln/core/concept/meta_function.hh: New. + * mln/core/image/thru_morpher.hh: New. + * mln/core/image/thrubin_morpher.hh: New. + * mln/fun/accu_result.hh: New. + * mln/fun/binary.hh: New. + * mln/fun/component/blue.hh: New. + * mln/fun/component/comp.hh: New. + * mln/fun/component/green.hh: New. + * mln/fun/component/red.hh: New. + * mln/fun/component/rgb.hh: New. + * mln/fun/component: New. + * mln/fun/compose.hh: New. + * mln/fun/composition.hh: New. + * mln/fun/from_accu.hh: New. + * mln/fun/math/abs.hh: New. + * mln/fun/math/cos.hh: New. + * mln/fun/math/inf.hh: New. + * mln/fun/math/norm.hh: New. + * mln/fun/math/sup.hh: New. + * mln/fun/math: New. + * mln/fun/param.hh: New. + * mln/fun/spe/binary.hh: New. + * mln/fun/spe/unary.hh: New. + * mln/fun/spe: New. + * mln/fun/unary.hh: New. + * mln/trait/fun.hh: New. + * mln/trait/next/solve.hh: New. + * mln/trait/next/solve_binary.hh: New. + * mln/trait/next/solve_proxy.hh: New. + * mln/trait/next/solve_unary.hh: New. + * mln/trait/next: New. + * sandbox/fred/mln/accu/inf.hh: Remove. + * sandbox/fred/mln/accu/sup.hh: Remove. + * sandbox/fred/mln/core/concept/meta_function.hh: Remove. + * sandbox/fred/mln/core/image/thru_morpher.hh: Remove. + * sandbox/fred/mln/core/image/thrubin_morpher.hh: Remove. + * sandbox/fred/mln/fun/accu_result.hh: Remove. + * sandbox/fred/mln/fun/binary.hh: Remove. + * sandbox/fred/mln/fun/component/blue.hh: Remove. + * sandbox/fred/mln/fun/component/comp.hh: Remove. + * sandbox/fred/mln/fun/component/green.hh: Remove. + * sandbox/fred/mln/fun/component/red.hh: Remove. + * sandbox/fred/mln/fun/component/rgb.hh: Remove. + * sandbox/fred/mln/fun/compose.hh: Remove. + * sandbox/fred/mln/fun/composition.hh: Remove. + * sandbox/fred/mln/fun/from_accu.hh: Remove. + * sandbox/fred/mln/fun/math/abs.hh: Remove. + * sandbox/fred/mln/fun/math/cos.hh: Remove. + * sandbox/fred/mln/fun/math/inf.hh: Remove. + * sandbox/fred/mln/fun/math/norm.hh: Remove. + * sandbox/fred/mln/fun/math/sup.hh: Remove. + * sandbox/fred/mln/fun/param.hh: Remove. + * sandbox/fred/mln/fun/spe/binary.hh: Remove. + * sandbox/fred/mln/fun/spe/unary.hh: Remove. + * sandbox/fred/mln/fun/unary.hh: Remove. + * sandbox/fred/mln/trait/fun.hh: Remove. + * sandbox/fred/mln/trait/next/solve.hh: Remove. + * sandbox/fred/mln/trait/next/solve_binary.hh: Remove. + * sandbox/fred/mln/trait/next/solve_proxy.hh: Remove. + * sandbox/fred/mln/trait/next/solve_unary.hh: Remove. + 2009-04-27 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Small fixes. @@ -1232,7 +1312,7 @@ Fix seeds2tiling_roundness test. * mln/geom/chamfer.hh: Fix a too restrictive test (true == 1 but not > - 0). + 0). * mln/geom/seeds2tiling_roundness.hh: Fix wrong declaration/use of p_priority site_set. Priority was based on sites and not on priority @@ -1570,7 +1650,7 @@ Handle tiff orientation in scalar images. * mln/io/tiff/load.hh: Handle tiff orientation in scalar - images. + images. * tests/io/tiff: New directory. * tests/io/tiff/tiff2pbm.cc: New. @@ -1725,7 +1805,7 @@ * sandbox/fred/mln/fun/spe/binary.hh, * sandbox/fred/mln/fun/spe/unary.hh, * sandbox/fred/mln/fun/unary.hh: Clean and update to make use of - param.hh. + param.hh. * sandbox/fred/mln/fun/param.hh: New. * sandbox/fred/mln/trait/fun.hh: Add support for parameter storage. @@ -1874,7 +1954,7 @@ Avoid invalid assigments with image concept. * mln/core/concept/image.hh: Add an invalid operator= in order to - avoid wrong assignment. See sandbox/bug/concept_and_assignment.cc. + avoid wrong assignment. See sandbox/bug/concept_and_assignment.cc. 2009-03-30 Guillaume Lazzara <lazzara(a)lrde.epita.fr> @@ -1890,7 +1970,7 @@ Add a plot format save() routine. * mln/io/plot/save.hh: New routine save() for saving arrays and - 1d images into plot formatted file. + 1d images into plot formatted file. 2009-03-27 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -2026,8 +2106,8 @@ * mln/make/graph.hh: adjust extension to structural element. * mln/util/array.hh: - - add subject_impl specialization. - - Update from_to overloads: add a special case for element[0]. + Add subject_impl specialization. + Update from_to overloads: add a special case for element[0]. * tests/accu/site_set/rectangularity.cc: add more tests. @@ -2062,7 +2142,7 @@ Change arguments of projected_histo(). * mln/world/binary_2d/projected_histo.hh: Change arguments, now returns - a couple of image1d. + a couple of image1d. 2009-03-20 Fabien Freling <fabien.freling(a)lrde.epita.fr> @@ -2079,7 +2159,7 @@ Implement binary 2d specific routines. * mln/world/binary_2d/projected_histo.hh: New projected histogram - for binary 2d images. + for binary 2d images. * mln/world/binary_2d/subsample.hh: Update. 2009-03-20 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -2264,7 +2344,7 @@ * sandbox/fred/mln/trait/next, * sandbox/fred/mln/trait, * sandbox/fred/mln: New. Clean files, - respecting milena file hierarchy. + respecting milena file hierarchy. * sandbox/fred/Makefile, * sandbox/fred/overload.cc, * sandbox/fred/old/site_wrapper.hh, @@ -2339,14 +2419,14 @@ Disambiguate component tree iterators. * mln/morpho/tree/data.hh: - Add children image to get instant access to child relationship. - Remove mln_fwd_piter, mln_bkd_piter and mln_piter definition + Add children image to get instant access to child relationship. + Remove mln_fwd_piter, mln_bkd_piter and mln_piter definition from tree structure. - Add mln_up_site_piter, mln_dn_site_piter, mln_up_node_piter, + Add mln_up_site_piter, mln_dn_site_piter, mln_up_node_piter, mln_dn_node_piter iterator adaptator. - Add mln_preorder_piter, the preorder tree traversal + Add mln_preorder_piter, the preorder tree traversal iterator. - Move inline code out of class definition. + Move inline code out of class definition. * sandbox/edwin/tree/propagate_node.hh: Fix with new iterator, but not yet optimized with new tree structure. * sandbox/edwin/tree/propagate_value.hh: Fix with new @@ -2381,7 +2461,7 @@ Fix tutorial compilation. - * milena/doc/tutorial/tutorial.tex: Fix syntax errors. + * doc/tutorial/tutorial.tex: Fix syntax errors. 2009-03-13 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -2435,11 +2515,11 @@ * mln/io/dump/load.hh, * mln/io/dump/save.hh: - - Add new information in the header. - - Add more assertion on value type, dimension and file type. + Add new information in the header. + Add more assertion on value type, dimension and file type. - Important note: Old dump files are not compatible with this new - format. + Important note: Old dump files are not compatible with this new + format. * mln/trait/value_.hh: add a new macro mln_trait_value_name. @@ -2450,7 +2530,7 @@ * mln/value/int_u.hh * mln/value/label.hh * mln/value/rgb.hh: add name() member to value_<> specialization. - It returns the type name as a const char*. + It returns the type name as a const char*. * tests/io/dump/dump.cc: add new tests with builtin types. @@ -2492,13 +2572,27 @@ * mln/fun/meta/first.hh, * mln/fun/meta/second.hh: meta function to access util::couple data. +2009-03-09 Frederic Bour <bour(a)lrde.epita.fr> + + Verify constness of "thru" image morpher. + * mln/trait/image/props.hh: Correct small typos errors. + * sandbox/fred/fun/abs.hh, + * sandbox/fred/fun/cos.hh, + * sandbox/fred/fun/inc.hh, + * sandbox/fred/fun/norm.hh, + * sandbox/fred/fun/red.hh: + Namespace name desambiguation. + * sandbox/fred/fun/thru.cc, + * sandbox/fred/fun/thru_morpher.hh: + Verify constness (WIP). + 2009-03-09 Edwin Carlinet <carlinet(a)lrde.epita.fr> Add leaves container in tree structure and test new propagations. * mln/morpho/tree/data.hh: Add leaves container (not tested yet). * sandbox/edwin/tree/propagate.hh: Add new propagation. * sandbox/edwin/tree/routines.hh: Try to correct bug in first node - calculus. + calculus. * sandbox/edwin/tree/tree.cc: Main file for tests. 2009-03-08 Frederic Bour <bour(a)lrde.epita.fr> @@ -2507,14 +2601,14 @@ * sandbox/fred/fun/abs.hh: New. * sandbox/fred/fun/cos.hh: New. * sandbox/fred/fun/fun.cc: New. - Some tests don't pass, see FIXMEs (operator==(rgb::red_t,int) ?) + Some tests don't pass, see FIXMEs (operator==(rgb::red_t,int) ?) * sandbox/fred/fun/inc.hh: New. * sandbox/fred/fun/meta_function.hh: New. * sandbox/fred/fun/norm.hh: New. * sandbox/fred/fun/red.hh: New. * sandbox/fred/fun/thru.cc: New. * sandbox/fred/fun/thru_morpher.hh: New. - Constness of thru_image has to be corrected. + Constness of thru_image has to be corrected. * sandbox/fred/fun/unary.hh: New. * sandbox/fred/fun: New. @@ -3061,7 +3155,7 @@ Add standard deviation accumulator. * mln/accu/stat/deviation.hh: New accumulator for standard - deviation. + deviation. 2009-03-03 Guillaume Lazzara <lazzara(a)lrde.epita.fr> @@ -3114,8 +3208,8 @@ * mln/transform/closest_point_geodesic.hh: rename as... * mln/transform/distance_and_closest_point_geodesic.hh: ... this. - Now returns both dmap and closest point images. - Add a version returning a closest point image containing indexes. + Now returns both dmap and closest point images. + Add a version returning a closest point image containing indexes. * mln/transform/all.hh: update includes. @@ -3124,15 +3218,15 @@ * tests/Makefile.am: run transform tests. - * tests/transform/Makefile.am: update test names - . + * tests/transform/Makefile.am: update test names. + * tests/transform/bench_closest_point_geodesic.cc: fix missing include. * tests/transform/closest_point_geodesic.cc: rename as... * tests/transform/distance_and_closest_point_geodesic.cc: ... this. - Update according modifications in - distance_and_closest_point_geodesic.hh. + Update according modifications in + distance_and_closest_point_geodesic.hh. 2009-03-03 Guillaume Lazzara <lazzara(a)lrde.epita.fr> @@ -3302,18 +3396,18 @@ * mln/morpho/attribute/count_adjacent_vertices.hh, * mln/morpho/closing/area_on_vertices.hh, * mln/morpho/opening/area_on_vertices.hh: - Make area_on_vertices work with new algebraic code, and + Make area_on_vertices work with new algebraic code, and adapt count_adjacent_vertices accumulator as a morpho attribute. * mln/morpho/closing_area_on_vertices.hh, * mln/morpho/closing_attribute.hh, * mln/morpho/opening_area_on_vertices.hh, * mln/morpho/opening_attribute.hh: - Delete old implementations. + Delete old implementations. * tests/morpho/artificial_line_graph_image_wst.cc, * tests/morpho/lena_line_graph_image_wst2.cc: - Update test files using area_on_vertices. + Update test files using area_on_vertices. 2009-03-01 Edwin Carlinet <carlinet(a)lrde.epita.fr> @@ -3322,6 +3416,16 @@ * sandbox/theo/rush/exo2/exo2.cc * sandbox/theo/rush/exo2/exo2.sh: Shell script for exo2. +2009-03-01 Frederic Bour <bour(a)lrde.epita.fr> + + Add rush/exo3. + * mln/canvas/morpho/attribute_filter.hh: Add one missing include. + * sandbox/theo/rush/exo3/Makefile: New. + * sandbox/theo/rush/exo3/exo3_1.cc: New. + * sandbox/theo/rush/exo3/exo3_2.cc: New. + * sandbox/theo/rush/exo3/inverse.cc: New. + * sandbox/theo/rush/exo3: New. + 2009-03-01 Edwin Carlinet <carlinet(a)lrde.epita.fr> Remove algebraic_filter and algebraic_union_find from canvas. @@ -3341,7 +3445,7 @@ * sandbox/edwin/filtres/connectes, * sandbox/edwin/filtres, * sandbox/edwin/leveling.hh: Remove all files related to - filters from my sandbox. + filters from my sandbox. 2009-02-28 Edwin Carlinet <carlinet(a)lrde.epita.fr> @@ -3364,7 +3468,7 @@ * mln/accu/volume.hh, * mln/morpho/all.hh, * mln/morpho/essential.hh: Replace mln::morpho::closing_ by - mln::morpho::closing:: + mln::morpho::closing:: * tests/morpho/Makefile.am: Removed old tests * tests/morpho/complex_image_wst.cc, * tests/morpho/lena_line_graph_image_wst1.cc, @@ -3382,7 +3486,7 @@ Correct Makefile rules. * tests/morpho/tree/compute_attribute_image.cc: Test file for - compute_attribute_image. + compute_attribute_image. 2009-02-28 Frederic Bour <bour(a)lrde.epita.fr> @@ -3404,6 +3508,20 @@ * tests/morpho/opening/Makefile.am: Add sum test. * tests/morpho/opening/sum.cc: New. +2009-02-28 Edwin Carlinet <carlinet(a)lrde.epita.fr> + + Correct bugs in tests. + * mln/morpho/closing/algebraic.hh, + * mln/morpho/closing/leveling.hh: Correct some bugs. + + * tests/morpho/closing/Makefile.am, + * tests/morpho/closing/algebraic.cc, + * tests/morpho/closing/leveling.cc, + * tests/morpho/opening/Makefile.am, + * tests/morpho/opening/algebraic.cc, + * tests/morpho/opening/leveling.cc: + Correct some bugs and comment reference code using generic accumulators. + 2009-02-28 Frederic Bour <bour(a)lrde.epita.fr> Adjusted tests for new opening/closing naming scheme. @@ -3413,7 +3531,7 @@ * tests/morpho/opening/area.cc, * tests/morpho/opening/height.cc, * tests/morpho/opening/volume.cc: Now use closing and opening - namespaces. + namespaces. 2009-02-28 Frederic Bour <bour(a)lrde.epita.fr> @@ -3590,7 +3708,7 @@ * mln/core/image/extension_fun.hh, * mln/core/image/extension_ima.hh, * mln/core/image/extension_val.hh: remove extended_with() (duplicate - core/routine/extend). + core/routine/extend). * mln/value/label.hh * mln/value/rgb.hh: fix badly closed namespace. @@ -3888,9 +4006,9 @@ Fix fun::x2v::rotation. * mln/fun/x2x/rotation.hh: - (get_rot_h_mat 3d): fix matrix construction. - (rotation(algebra::quat)): update attributes in order to produce a - valid inverted rotation. + (get_rot_h_mat 3d): fix matrix construction. + (rotation(algebra::quat)): update attributes in order to produce a + valid inverted rotation. * tests/fun/x2x/rotation.cc: improve test. @@ -4053,7 +4171,7 @@ Fix from_to overloads and add missing operators in value::hsl. * mln/convert/from_to.hxx: Update forward declarations to from_to - overloads. + overloads. * mln/value/hsl.hh: Add missing operators +,-,/,*. @@ -4472,6 +4590,15 @@ 2009-02-03 Roland Levillain <roland(a)lrde.epita.fr> + Typo: s/splitted/split/. + + * doc/Doxyfile.in, + * doc/doc.mk, + * doc/tutorial/tools/split_sample.sh, + * doc/tutorial/tutorial.tex: Here. + +2009-02-03 Roland Levillain <roland(a)lrde.epita.fr> + Have I/O-related code compile again. * mln/io/all.hh: Remove spurious inclusion of mln/io/raw/all.hh. @@ -4713,7 +4840,7 @@ functor passed as argument. * mln/transform/internal/distance_functor.hh: add missing init_p() - member. + member. * mln/transform/internal/closest_point_functor.hh: New. Construct an image of closest point. @@ -5129,36 +5256,36 @@ Use extract::* routines in tutorial examples. - * milena/doc/tutorial/figures/tuto4_genericity_and_algorithms-10.ppm - * milena/doc/tutorial/figures/tuto4_genericity_and_algorithms-7.pgm - * milena/doc/tutorial/figures/tuto4_genericity_and_algorithms-7.ppm - * milena/doc/tutorial/figures/tuto4_genericity_and_algorithms-8.pgm - * milena/doc/tutorial/figures/tuto4_genericity_and_algorithms-8.ppm - * milena/doc/tutorial/figures/tuto4_genericity_and_algorithms-9.pgm - * milena/doc/tutorial/figures/tuto4_genericity_and_algorithms-9.ppm: + * doc/tutorial/figures/tuto4_genericity_and_algorithms-10.ppm + * doc/tutorial/figures/tuto4_genericity_and_algorithms-7.pgm + * doc/tutorial/figures/tuto4_genericity_and_algorithms-7.ppm + * doc/tutorial/figures/tuto4_genericity_and_algorithms-8.pgm + * doc/tutorial/figures/tuto4_genericity_and_algorithms-8.ppm + * doc/tutorial/figures/tuto4_genericity_and_algorithms-9.pgm + * doc/tutorial/figures/tuto4_genericity_and_algorithms-9.ppm: new reference files. - * milena/doc/tutorial/samples/tuto4_genericity_and_algorithms.cc: + * doc/tutorial/samples/tuto4_genericity_and_algorithms.cc: uncomment code using extract::* routines. - * milena/doc/tutorial/tutorial.tex: include code and images related to + * doc/tutorial/tutorial.tex: include code and images related to extract::* routines. More explanations need to be written. 2009-01-23 Guillaume Lazzara <z(a)lrde.epita.fr> Introduce literal::min and literal::max. - * milena/headers.mk: add new headers to distribution. + * headers.mk: add new headers to distribution. - * milena/mln/literal/all.hh: include new headers. + * mln/literal/all.hh: include new headers. - * milena/mln/literal/max.hh, - * milena/mln/literal/min.hh: New literals. They use mln_{max,min} + * mln/literal/max.hh, + * mln/literal/min.hh: New literals. They use mln_{max,min} internaly. - * milena/tests/unit_test/Makefile.am, - * milena/tests/unit_test/mln_literal_max.cc, - * milena/tests/unit_test/mln_literal_min.cc: new unit tests. + * tests/unit_test/Makefile.am, + * tests/unit_test/mln_literal_max.cc, + * tests/unit_test/mln_literal_min.cc: new unit tests. 2009-01-23 Guillaume Lazzara <z(a)lrde.epita.fr> @@ -5708,36 +5835,36 @@ Add is_valid and invalidate to util::graph - * milena/mln/util/graph.hh: add is_valid and invalidate. These methods + * mln/util/graph.hh: add is_valid and invalidate. These methods should be fixed later. - * milena/mln/core/site_set/p_edges.hh, - * milena/mln/core/site_set/p_vertices.hh, - * milena/mln/util/edge.hh, - * milena/mln/util/vertex.hh: make use of the new graph methods. + * mln/core/site_set/p_edges.hh, + * mln/core/site_set/p_vertices.hh, + * mln/util/edge.hh, + * mln/util/vertex.hh: make use of the new graph methods. 2009-01-05 Guillaume Lazzara <z(a)lrde.epita.fr> Add graph_elt_neighborhood and line_graph_elt_neighborhood aliases. - * milena/headers.mk: add new headers to distribution. + * headers.mk: add new headers to distribution. - * milena/mln/core/image/graph_elt_neighborhood.hh, - * milena/mln/core/image/line_graph_elt_neighborhood.hh: new files. Add + * mln/core/image/graph_elt_neighborhood.hh, + * mln/core/image/line_graph_elt_neighborhood.hh: new files. Add new aliases for graph based neighborhoods. - * milena/mln/core/image/graph_elt_window.hh, - * milena/mln/core/image/line_graph_elt_window.hh, - * milena/mln/core/internal/neighborhood_base.hh, - * milena/tests/core/image/graph_image.cc, - * milena/tests/core/image/line_graph_image.cc, - * milena/tests/core/other/graph_elt_neighborhood.cc, - * milena/tests/core/other/line_graph_elt_neighborhood.cc, - * milena/tools/area_flooding.cc: make use of these new aliases. - - * milena/tests/unit_test/Makefile.am, - * milena/tests/unit_test/mln_core_image_graph_elt_neighborhood.cc, - * milena/tests/unit_test/mln_core_image_line_graph_elt_neighborhood.cc: + * mln/core/image/graph_elt_window.hh, + * mln/core/image/line_graph_elt_window.hh, + * mln/core/internal/neighborhood_base.hh, + * tests/core/image/graph_image.cc, + * tests/core/image/line_graph_image.cc, + * tests/core/other/graph_elt_neighborhood.cc, + * tests/core/other/line_graph_elt_neighborhood.cc, + * tools/area_flooding.cc: make use of these new aliases. + + * tests/unit_test/Makefile.am, + * tests/unit_test/mln_core_image_graph_elt_neighborhood.cc, + * tests/unit_test/mln_core_image_line_graph_elt_neighborhood.cc: Add new unit tests. 2009-01-05 Nicolas Ballas <ballas(a)lrde.epita.fr> @@ -7060,12 +7187,12 @@ Make the tutorial part of the distribution. - * milena/Makefile.am: add target `tutorial'. + * Makefile.am: add target `tutorial'. - * milena/doc/Doxyfile.in: Use short file names. + * doc/Doxyfile.in: Use short file names. - * milena/doc/Makefile.am, - * milena/doc/tutorial/Makefile.am: add documentation to EXTRA_DIST. + * doc/Makefile.am, + * doc/tutorial/Makefile.am: add documentation to EXTRA_DIST. 2008-12-18 Guillaume Lazzara <z(a)lrde.epita.fr> @@ -7235,112 +7362,112 @@ Quick cleanup in io. - * milena/tests/io/off/load_bin.cc, - * milena/tests/io/off/load_float.cc, - * milena/mln/io/fits/load.hh, - * milena/mln/io/off/save.hh, - * milena/mln/io/pfm/load.hh: update doc. + * tests/io/off/load_bin.cc, + * tests/io/off/load_float.cc, + * mln/io/fits/load.hh, + * mln/io/off/save.hh, + * mln/io/pfm/load.hh: update doc. - * milena/mln/io/pfm/save.hh: avoid a warning and update doc. + * mln/io/pfm/save.hh: avoid a warning and update doc. - * milena/tests/io/off/load_float.cc: Fix test. + * tests/io/off/load_float.cc: Fix test. 2008-12-16 Alexandre Abraham <abraham(a)lrde.epita.fr> Add functors and HSL color space. * mln/core/image/violent_cast_image.hh: New - Add capacity to cast value passing by void *. + Add capacity to cast value passing by void *. * mln/core/concept/meta_fun.hh: New - Meta function concept. + Meta function concept. * mln/math/cos.hh: New - Cosinus operation. + Cosinus operation. * mln/math/acos.hh: New - Arc cosinus operation. + Arc cosinus operation. * mln/math/all.hh: - Add cosinus and arcosinus headers. + Add cosinus and arcosinus headers. * mln/value/mixin.hh: New - Allow operator addition to values. + Allow operator addition to values. * mln/value/hsl.hh: New - New color space. + New color space. * mln/value/shell.hh: New - Value allowing to set values when using bijective functions. + Value allowing to set values when using bijective functions. * mln/fun/meta/hue.hh: - Functor allowing direct access to hue. + Functor allowing direct access to hue. * mln/fun/meta/inty.hh: - Functor allowing direct access to intensity. + Functor allowing direct access to intensity. * mln/fun/meta/sat.hh: - Functor allowing direct access to saturation. + Functor allowing direct access to saturation. * mln/fun/meta/to_enc.hh: - Functor allowing direct access to encoding. + Functor allowing direct access to encoding. * mln/fun/meta/red.hh: - Fix trailing ;. + Fix trailing ;. * mln/fun/v2v/rgb_to_hsl.hh: New - Conversion form rgb to hsl and vice versa. + Conversion form rgb to hsl and vice versa. 2008-12-16 Guillaume Lazzara <z(a)lrde.epita.fr> Fix tests. - * milena/headers.mk: update includes part of the distribution. + * headers.mk: update includes part of the distribution. - * milena/mln/core/image/fun_image.hh - * milena/mln/fun/v2w_w2v/norm.hh - * milena/mln/io/off/load.hh: cleanup comments. + * mln/core/image/fun_image.hh + * mln/fun/v2w_w2v/norm.hh + * mln/io/off/load.hh: cleanup comments. - * milena/mln/topo/adj_higher_face_iter.hh - * milena/mln/topo/adj_lower_face_iter.hh - * milena/mln/topo/adj_m_face_iter.hh - * milena/mln/value/graylevel.hh - * milena/mln/value/graylevel_f.hh - * milena/mln/value/internal/gray_.hh - * milena/mln/value/internal/gray_f.hh: fix includes/forward + * mln/topo/adj_higher_face_iter.hh + * mln/topo/adj_lower_face_iter.hh + * mln/topo/adj_m_face_iter.hh + * mln/value/graylevel.hh + * mln/value/graylevel_f.hh + * mln/value/internal/gray_.hh + * mln/value/internal/gray_f.hh: fix includes/forward declarations. - * milena/tests/unit_test/Makefile.am, - * milena/tests/unit_test/mln_core_image_fun_image.cc, - * milena/tests/unit_test/mln_fun_internal_ch_function_value_impl.cc, - * milena/tests/unit_test/mln_fun_meta_hue.cc, - * milena/tests/unit_test/mln_fun_meta_inty.cc, - * milena/tests/unit_test/mln_fun_meta_red.cc, - * milena/tests/unit_test/mln_fun_meta_sat.cc, - * milena/tests/unit_test/mln_fun_meta_to_enc.cc, - * milena/tests/unit_test/mln_fun_v2v_ch_function_value.cc, - * milena/tests/unit_test/mln_fun_v2w2v_cos.cc, - * milena/tests/unit_test/mln_fun_v2w_w2v_norm.cc, - * milena/tests/unit_test/mln_fun_vv2b_eq.cc, - * milena/tests/unit_test/mln_fun_vv2b_ge.cc, - * milena/tests/unit_test/mln_fun_vv2b_gt.cc, - * milena/tests/unit_test/mln_fun_vv2b_implies.cc, - * milena/tests/unit_test/mln_fun_vv2b_le.cc, - * milena/tests/unit_test/mln_fun_vv2b_lt.cc, - * milena/tests/unit_test/mln_trait_ch_function_value.cc: add new + * tests/unit_test/Makefile.am, + * tests/unit_test/mln_core_image_fun_image.cc, + * tests/unit_test/mln_fun_internal_ch_function_value_impl.cc, + * tests/unit_test/mln_fun_meta_hue.cc, + * tests/unit_test/mln_fun_meta_inty.cc, + * tests/unit_test/mln_fun_meta_red.cc, + * tests/unit_test/mln_fun_meta_sat.cc, + * tests/unit_test/mln_fun_meta_to_enc.cc, + * tests/unit_test/mln_fun_v2v_ch_function_value.cc, + * tests/unit_test/mln_fun_v2w2v_cos.cc, + * tests/unit_test/mln_fun_v2w_w2v_norm.cc, + * tests/unit_test/mln_fun_vv2b_eq.cc, + * tests/unit_test/mln_fun_vv2b_ge.cc, + * tests/unit_test/mln_fun_vv2b_gt.cc, + * tests/unit_test/mln_fun_vv2b_implies.cc, + * tests/unit_test/mln_fun_vv2b_le.cc, + * tests/unit_test/mln_fun_vv2b_lt.cc, + * tests/unit_test/mln_trait_ch_function_value.cc: add new unit tests. 2008-12-16 Guillaume Lazzara <z(a)lrde.epita.fr> Cleanup morpho. - * milena/mln/morpho/closing.hh, - * milena/mln/morpho/closing_area_on_vertices.hh, - * milena/mln/morpho/opening.hh, - * milena/mln/morpho/opening_area.hh, - * milena/mln/morpho/opening_area_on_vertices.hh, - * milena/mln/morpho/opening_attribute.hh, - * milena/mln/morpho/opening_height.hh, - * milena/mln/morpho/opening_volume.hh: return an image instead of + * mln/morpho/closing.hh, + * mln/morpho/closing_area_on_vertices.hh, + * mln/morpho/opening.hh, + * mln/morpho/opening_area.hh, + * mln/morpho/opening_area_on_vertices.hh, + * mln/morpho/opening_attribute.hh, + * mln/morpho/opening_height.hh, + * mln/morpho/opening_volume.hh: return an image instead of taking the output by argument. - * milena/tests/morpho/opening_area.cc, - * milena/tests/morpho/opening_height.cc, - * milena/tests/morpho/opening_volume.cc: update tests. + * tests/morpho/opening_area.cc, + * tests/morpho/opening_height.cc, + * tests/morpho/opening_volume.cc: update tests. 2008-12-15 Alexandre Abraham <abraham(a)lrde.epita.fr> Add missing concept for bijective functions. * mln/core/concept/function.hh: - Add Function_v2w2v and Function_v2w_w2v. + Add Function_v2w2v and Function_v2w_w2v. 2008-12-15 Alexandre Abraham <abraham(a)lrde.epita.fr> @@ -7350,73 +7477,73 @@ * mln/fun/meta/red.hh: red meta accessor. * mln/fun/v2w2v: New. * mln/fun/v2w2v/cos.hh: New - cos bijective functor. + cos bijective functor. * mln/fun/v2w_w2v: New. * mln/fun/v2w_w2v/norm.hh: New - norm 2 way functors. + norm 2 way functors. 2008-12-15 Guillaume Lazzara <z(a)lrde.epita.fr> Fix unit tests. - * milena/headers.mk: do not distribute deleted headers. + * headers.mk: do not distribute deleted headers. - * milena/mln/core/clock_neighb.hh: fix type ambiguity. + * mln/core/clock_neighb.hh: fix type ambiguity. - * milena/mln/core/image/mono_obased_rle_image.hh, - * milena/mln/core/image/mono_rle_image.hh, - * milena/mln/core/image/obased_rle_image.hh, - * milena/mln/core/image/rle_image.hh, - * milena/mln/core/image/value_enc_image.hh, - * milena/mln/core/image/bgraph_image.hh: Disable image properties + * mln/core/image/mono_obased_rle_image.hh, + * mln/core/image/mono_rle_image.hh, + * mln/core/image/obased_rle_image.hh, + * mln/core/image/rle_image.hh, + * mln/core/image/value_enc_image.hh, + * mln/core/image/bgraph_image.hh: Disable image properties since they are not update with the new property names. - * milena/mln/core/image/bgraph_psite.hh: fix wrong include. + * mln/core/image/bgraph_psite.hh: fix wrong include. - * milena/mln/core/image/fi_adaptor.hh, - * milena/mln/core/image/graph_image.hh, - * milena/mln/core/image/line_graph_image.hh: move to... + * mln/core/image/fi_adaptor.hh, + * mln/core/image/graph_image.hh, + * mln/core/image/line_graph_image.hh: move to... - * milena/trash/fi_adaptor.hh, - * milena/trash/graph_image.hh, - * milena/trash/line_graph_image.hh: ... here. + * trash/fi_adaptor.hh, + * trash/graph_image.hh, + * trash/line_graph_image.hh: ... here. - * milena/mln/core/site_set/p_bgraph.hh, - * milena/mln/metal/ref.hh, - * milena/mln/topo/adj_higher_face_iter.hh, - * milena/mln/topo/adj_lower_face_iter.hh, - * milena/mln/topo/adj_lower_higher_face_iter.hh, - * milena/mln/topo/face_iter.hh, - * milena/mln/topo/n_face_iter.hh, - * milena/mln/util/internal/boost_graph.hh, - * milena/mln/util/internal/boost_graph_structure.hh, - * milena/mln/util/tree_to_image.hh: Add missing + * mln/core/site_set/p_bgraph.hh, + * mln/metal/ref.hh, + * mln/topo/adj_higher_face_iter.hh, + * mln/topo/adj_lower_face_iter.hh, + * mln/topo/adj_lower_higher_face_iter.hh, + * mln/topo/face_iter.hh, + * mln/topo/n_face_iter.hh, + * mln/util/internal/boost_graph.hh, + * mln/util/internal/boost_graph_structure.hh, + * mln/util/tree_to_image.hh: Add missing includes/forward declarations. - * milena/tests/unit_test/Makefile.am: update test list. - - * milena/tests/unit_test/mln_core_concept_doc_accumulator.cc, - * milena/tests/unit_test/mln_core_concept_doc_box.cc, - * milena/tests/unit_test/mln_core_concept_doc_dpoint.cc, - * milena/tests/unit_test/mln_core_concept_doc_generalized_pixel.cc, - * milena/tests/unit_test/mln_core_concept_doc_image.cc, - * milena/tests/unit_test/mln_core_concept_doc_image_fastest.cc, - * milena/tests/unit_test/mln_core_concept_doc_iterator.cc, - * milena/tests/unit_test/mln_core_concept_doc_neighborhood.cc, - * milena/tests/unit_test/mln_core_concept_doc_object.cc, - * milena/tests/unit_test/mln_core_concept_doc_pixel_iterator.cc, - * milena/tests/unit_test/mln_core_concept_doc_point_iterator.cc, - * milena/tests/unit_test/mln_core_concept_doc_point_site.cc, - * milena/tests/unit_test/mln_core_concept_doc_site_set.cc, - * milena/tests/unit_test/mln_core_concept_doc_value_iterator.cc, - * milena/tests/unit_test/mln_core_concept_doc_value_set.cc, - * milena/tests/unit_test/mln_core_concept_doc_weighted_window.cc, - * milena/tests/unit_test/mln_core_concept_doc_window.cc, - * milena/tests/unit_test/mln_core_image_fi_adaptor.cc, - * milena/tests/unit_test/mln_core_image_graph_image.cc, - * milena/tests/unit_test/mln_core_image_line_graph_image.cc, - * milena/tests/unit_test/mln_metal_has_neighborhood.cc: removed since + * tests/unit_test/Makefile.am: update test list. + + * tests/unit_test/mln_core_concept_doc_accumulator.cc, + * tests/unit_test/mln_core_concept_doc_box.cc, + * tests/unit_test/mln_core_concept_doc_dpoint.cc, + * tests/unit_test/mln_core_concept_doc_generalized_pixel.cc, + * tests/unit_test/mln_core_concept_doc_image.cc, + * tests/unit_test/mln_core_concept_doc_image_fastest.cc, + * tests/unit_test/mln_core_concept_doc_iterator.cc, + * tests/unit_test/mln_core_concept_doc_neighborhood.cc, + * tests/unit_test/mln_core_concept_doc_object.cc, + * tests/unit_test/mln_core_concept_doc_pixel_iterator.cc, + * tests/unit_test/mln_core_concept_doc_point_iterator.cc, + * tests/unit_test/mln_core_concept_doc_point_site.cc, + * tests/unit_test/mln_core_concept_doc_site_set.cc, + * tests/unit_test/mln_core_concept_doc_value_iterator.cc, + * tests/unit_test/mln_core_concept_doc_value_set.cc, + * tests/unit_test/mln_core_concept_doc_weighted_window.cc, + * tests/unit_test/mln_core_concept_doc_window.cc, + * tests/unit_test/mln_core_image_fi_adaptor.cc, + * tests/unit_test/mln_core_image_graph_image.cc, + * tests/unit_test/mln_core_image_line_graph_image.cc, + * tests/unit_test/mln_metal_has_neighborhood.cc: removed since not needed anymore. 2008-12-12 Matthieu Garrigues <garrigues(a)lrde.epita.fr> @@ -8584,11 +8711,11 @@ * tests/fun/x2x/rotation.cc: fix wrong namespace. - * milena/tests/unit_test/Makefile.am, - * milena/tests/unit_test/mln_canvas_browsing_depth_first_search.cc: + * tests/unit_test/Makefile.am, + * tests/unit_test/mln_canvas_browsing_depth_first_search.cc: add a new unit test. - * milena/headers.mk: update distributed headers. + * headers.mk: update distributed headers. 2008-12-10 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -8795,54 +8922,54 @@ Fix compilation issues. - * milena/doc/tutorial/Makefile.am, - * milena/Makefile.am: Add files to make dist. + * doc/tutorial/Makefile.am, + * Makefile.am: Add files to make dist. - * milena/mln/essential/routine.hh, - * milena/mln/core/image/all.hh, - * milena/mln/draw/essential.hh: fix headers. + * mln/essential/routine.hh, + * mln/core/image/all.hh, + * mln/draw/essential.hh: fix headers. - * milena/tests/unit_test/mln_core_def_low_quant_nbits.cc, - * milena/tests/unit_test/mln_core_internal_neighb_niter_impl.cc, - * milena/tests/unit_test/mln_fun_p2b_big_chess.cc, - * milena/tests/unit_test/mln_fun_p2p_mirror.cc: new unit_tests. + * tests/unit_test/mln_core_def_low_quant_nbits.cc, + * tests/unit_test/mln_core_internal_neighb_niter_impl.cc, + * tests/unit_test/mln_fun_p2b_big_chess.cc, + * tests/unit_test/mln_fun_p2p_mirror.cc: new unit_tests. 2008-12-06 Guillaume Lazzara <z(a)lrde.epita.fr> Update unit tests. - * milena/tests/unit_test/Makefile.am: Update. - - * milena/tests/unit_test/mln_convert_to_tiles.cc, - * milena/tests/unit_test/mln_core_image_graph_neighborhood_piter.cc, - * milena/tests/unit_test/mln_core_image_line_graph_elt_piter.cc, - * milena/tests/unit_test/mln_core_image_line_graph_neighborhood_piter.cc, - * milena/tests/unit_test/mln_core_image_line_graph_window_piter.cc, - * milena/tests/unit_test/mln_core_image_translate_image.cc, - * milena/tests/unit_test/mln_display_color_pretty.cc, - * milena/tests/unit_test/mln_display_remove.cc, - * milena/tests/unit_test/mln_display_save.cc, - * milena/tests/unit_test/mln_display_save_and_show.cc, - * milena/tests/unit_test/mln_display_show.cc, - * milena/tests/unit_test/mln_draw_label.cc, - * milena/tests/unit_test/mln_morpho_dilation_fast.cc, - * milena/tests/unit_test/mln_morpho_erosion_fast.cc, - * milena/tests/unit_test/mln_neighb_all.cc, - * milena/tests/unit_test/mln_neighb_essential.cc, - * milena/tests/unit_test/mln_neighb_get.cc, - * milena/tests/unit_test/mln_neighb_image.cc: remove. + * tests/unit_test/Makefile.am: Update. + + * tests/unit_test/mln_convert_to_tiles.cc, + * tests/unit_test/mln_core_image_graph_neighborhood_piter.cc, + * tests/unit_test/mln_core_image_line_graph_elt_piter.cc, + * tests/unit_test/mln_core_image_line_graph_neighborhood_piter.cc, + * tests/unit_test/mln_core_image_line_graph_window_piter.cc, + * tests/unit_test/mln_core_image_translate_image.cc, + * tests/unit_test/mln_display_color_pretty.cc, + * tests/unit_test/mln_display_remove.cc, + * tests/unit_test/mln_display_save.cc, + * tests/unit_test/mln_display_save_and_show.cc, + * tests/unit_test/mln_display_show.cc, + * tests/unit_test/mln_draw_label.cc, + * tests/unit_test/mln_morpho_dilation_fast.cc, + * tests/unit_test/mln_morpho_erosion_fast.cc, + * tests/unit_test/mln_neighb_all.cc, + * tests/unit_test/mln_neighb_essential.cc, + * tests/unit_test/mln_neighb_get.cc, + * tests/unit_test/mln_neighb_image.cc: remove. 2008-12-06 Guillaume Lazzara <z(a)lrde.epita.fr> Make milena/tools compile. - * milena/Makefile.am: re-enable tools subdir. + * Makefile.am: re-enable tools subdir. - * milena/tests/Makefile.am: re-enable display subdir. + * tests/Makefile.am: re-enable display subdir. - * milena/tools/Makefile.am: disable area_flooding. + * tools/Makefile.am: disable area_flooding. - * milena/tools/seed2tiling.cc: make it compile. + * tools/seed2tiling.cc: make it compile. 2008-12-05 Guillaume Lazzara <z(a)lrde.epita.fr> @@ -9270,7 +9397,7 @@ Fix more tests. * mln/accu/count_adjacent_vertices.hh: make it work with the - new graph images. + new graph images. * mln/accu/median_alt.hh: fix compilation issue. @@ -9722,7 +9849,7 @@ Add a missing Makefile.am - * milena/tests/morpho/elementary/Makefile.am: new. + * tests/morpho/elementary/Makefile.am: new. 2008-11-26 Guillaume Lazzara <z(a)lrde.epita.fr> @@ -10112,9 +10239,10 @@ Add a new from_to for fun::i2v::array. * mln/convert/from_to.hxx, - * mln/fun/i2v/array.hh: add two from_to; - - from_to(util::array, fun::i2v::array) - - from_to(std::vector, fun::i2v::array) + * mln/fun/i2v/array.hh: + (from_to(util::array, fun::i2v::array)) + (from_to(std::vector, fun::i2v::array)): + New. * mln/convert/to.hh, * doc/examples/labeling_algo.cc: cleanup. @@ -11261,6 +11389,146 @@ * mln/linear/gaussian.hh: Fix conversion issues. * doc/tutorial/design/include/imagetours.tex: Update documentation. +2008-11-10 Matthieu Garrigues <garrigues(a)lrde.epita.fr> + + Put Licence to 70 cols. + + * doc/benchmark/morpho/erosion.cc, + * mln/accu/count_adjacent_vertices.hh, + * mln/accu/height.hh, + * mln/border/fill.hh, + * mln/border/get.hh, + * mln/canvas/morpho/algebraic_union_find.hh, + * mln/convert/to_p_array.hh, + * mln/convert/to_upper_window.hh, + * mln/convert/to_window.hh, + * mln/core/alias/dpoint1d.hh, + * mln/core/alias/dpoint2d.hh, + * mln/core/alias/dpoint2d_h.hh, + * mln/core/alias/dpoint3d.hh, + * mln/core/alias/point1d.hh, + * mln/core/alias/point2d.hh, + * mln/core/alias/point2d_h.hh, + * mln/core/alias/point3d.hh, + * mln/core/alias/point3df.hh, + * mln/core/alias/window1d.hh, + * mln/core/alias/window3d.hh, + * mln/core/dpoints_pixter.hh, + * mln/core/image/bgraph_image.hh, + * mln/core/image/bgraph_psite.hh, + * mln/core/image/decorated_image.hh, + * mln/core/image/fi_adaptor.hh, + * mln/core/image/graph_elt_neighborhood.hh, + * mln/core/image/graph_elt_window.hh, + * mln/core/image/graph_image.hh, + * mln/core/image/graph_neighborhood_piter.hh, + * mln/core/image/graph_window_piter.hh, + * mln/core/image/line_graph_elt_neighborhood.hh, + * mln/core/image/line_graph_elt_window.hh, + * mln/core/image/line_graph_image.hh, + * mln/core/image/line_graph_neighborhood_piter.hh, + * mln/core/image/line_graph_psite.hh, + * mln/core/image/line_graph_window_piter.hh, + * mln/core/internal/force_exact.hh, + * mln/core/internal/image_value_morpher.hh, + * mln/core/internal/line_graph_vicinity_piter.hh, + * mln/core/internal/pixel_iterator_base.hh, + * mln/core/pixter1d.hh, + * mln/core/pixter2d.hh, + * mln/core/pixter3d.hh, + * mln/core/site_set/p_bgraph.hh, + * mln/core/site_set/p_bgraph_piter.hh, + * mln/core/site_set/p_edges.hh, + * mln/core/site_set/p_graph.hh, + * mln/core/site_set/p_graph_piter.hh, + * mln/core/site_set/p_line_graph.hh, + * mln/core/site_set/p_line_graph_piter.hh, + * mln/core/site_set/p_vertices.hh, + * mln/core/trait/qlf_value.hh, + * mln/debug/graph.hh, + * mln/geom/seeds2tiling.hh, + * mln/geom/seeds2tiling_roundness.hh, + * mln/labeling/background.hh, + * mln/labeling/flat_zones.hh, + * mln/labeling/foreground.hh, + * mln/labeling/regional_maxima.hh, + * mln/labeling/regional_minima.hh, + * mln/level/memset_.hh, + * mln/linear/gaussian.hh, + * mln/make/voronoi.hh, + * mln/math/abs.hh, + * mln/metal/abort.hh, + * mln/morpho/closing_area.hh, + * mln/morpho/closing_area_on_vertices.hh, + * mln/morpho/closing_attribute.hh, + * mln/morpho/closing_height.hh, + * mln/morpho/closing_volume.hh, + * mln/morpho/opening_area.hh, + * mln/morpho/opening_area_on_vertices.hh, + * mln/morpho/opening_attribute.hh, + * mln/morpho/opening_height.hh, + * mln/morpho/opening_volume.hh, + * mln/set/inter.hh, + * mln/tag/skeleton.hh, + * mln/trait/ch_value.hh, + * mln/util/graph.hh, + * mln/util/greater_point.hh, + * mln/util/greater_psite.hh, + * mln/util/internal/boost_graph.hh, + * mln/util/internal/boost_graph_access.hh, + * mln/util/internal/boost_graph_property.hh, + * mln/util/internal/boost_graph_structure.hh, + * mln/util/internal/graph_base.hh, + * mln/util/ord_pair.hh, + * mln/value/int_u_sat.hh, + * mln/value/proxy.hh, + * mln/value/stack.hh, + * mln/win/line.hh, + * sandbox/garrigues/ocr/check.sh, + * sandbox/garrigues/ocr/ocr_with_preprocess.cc, + * sandbox/garrigues/ocr/skeleton.hh, + * sandbox/jardonnet/array/old/1d.hh, + * sandbox/jardonnet/array/old/2d.hh, + * sandbox/jardonnet/array/old/3d.hh, + * sandbox/jardonnet/array/old/all.hh, + * sandbox/jardonnet/array/old/nd.hh, + * sandbox/jardonnet/array/old/objs.hh, + * sandbox/levillain/morpho/lower_completion.hh, + * sandbox/levillain/morpho/shortest_path_watershed.hh, + * sandbox/nivault/dmap.hh, + * sandbox/pellegrin/set/core/p_bgraph.hh, + * sandbox/pellegrin/set/core/p_graph.hh, + * sandbox/pellegrin/set/core/p_line_graph.hh, + * sandbox/vigouroux/color.hh, + * sandbox/vigouroux/color/color.hh, + * sandbox/vigouroux/color/hsi.hh, + * sandbox/vigouroux/color/hsl.hh, + * sandbox/vigouroux/color/hsv.hh, + * sandbox/vigouroux/color/nrgb.hh, + * sandbox/vigouroux/color/rgb.hh, + * sandbox/vigouroux/color/xyz.hh, + * sandbox/vigouroux/color/yiq.hh, + * sandbox/vigouroux/color/yuv.hh, + * sandbox/vigouroux/convert/abstract/colorconv.hh, + * sandbox/vigouroux/convert/abstract/conversion.hh, + * sandbox/vigouroux/convert/basics.hh, + * sandbox/vigouroux/convert/bound.hh, + * sandbox/vigouroux/convert/cast.hh, + * sandbox/vigouroux/convert/conversion.hh, + * sandbox/vigouroux/convert/conversion_ng_se.hh, + * sandbox/vigouroux/convert/force.hh, + * sandbox/vigouroux/convert/nrgbxyz.hh, + * sandbox/vigouroux/convert/rgbhsi.hh, + * sandbox/vigouroux/convert/rgbhsl.hh, + * sandbox/vigouroux/convert/rgbhsv.hh, + * sandbox/vigouroux/convert/rgbnrgb.hh, + * sandbox/vigouroux/convert/rgbxyz.hh, + * sandbox/vigouroux/convert/rgbyiq.hh, + * sandbox/vigouroux/convert/rgbyuv.hh, + * sandbox/vigouroux/convert/stretch.hh, + * tests/timer.hh: + Here. + 2008-11-10 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Make erosion work on nD images. @@ -11506,9 +11774,9 @@ Fix missing include in gdpoint and void as lvalue in point wise image. * mln/core/concept/gdpoint.hh: - Add missing header. + Add missing header. * mln/pw/image.hh: - Remove void as lvalue. + Remove void as lvalue. 2008-11-05 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> @@ -12600,29 +12868,29 @@ Various small fixes. - * milena/mln/accu/line.hh: avoid compilation warnings. + * mln/accu/line.hh: avoid compilation warnings. - * milena/mln/accu/volume.hh: Fix missing include. + * mln/accu/volume.hh: Fix missing include. - * milena/mln/core/dpsites_piter.hh: use to_vec() instead of + * mln/core/dpsites_piter.hh: use to_vec() instead of std_vector(). - * milena/mln/core/image/tr_image.hh: call to_vec(); + * mln/core/image/tr_image.hh: call to_vec(); - * milena/mln/debug/println_with_border.spe.hh: use point_at_index() + * mln/debug/println_with_border.spe.hh: use point_at_index() instead of operator[]. - * milena/mln/trait/value_.hh: change max card value for low + * mln/trait/value_.hh: change max card value for low quantification. - * milena/mln/util/internal/graph_psite_base.hh: Add missing operators. + * mln/util/internal/graph_psite_base.hh: Add missing operators. - * milena/tests/core/image/tr_image.cc: fix include. + * tests/core/image/tr_image.cc: fix include. - * milena/tests/core/other/box_runstart_piter.cc: remove make:: + * tests/core/other/box_runstart_piter.cc: remove make:: prefix. - * milena/tests/core/other/point_set_compatibility.cc: update test + * tests/core/other/point_set_compatibility.cc: update test according last changes in p_vertices. 2008-11-04 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -12674,7 +12942,7 @@ Fix subsampling algorithm. * mln/subsampling/subsampling.hh: Use mln_deduce instead of - mln_dpsite. + mln_dpsite. 2008-11-03 Guillaume Lazzara <z(a)lrde.epita.fr> @@ -12885,7 +13153,7 @@ * mln/literal/origin.hh, * mln/literal/white.hh, * mln/literal/zero.hh: Fix the initialization of all the global - constants in literal::* according to ticket #43. + constants in literal::* according to ticket #43. * mln/value/rgb.hh: Add new constructors. @@ -13046,17 +13314,106 @@ * mln/convert/to_image.hh: Likewise. (to_image): Fix sig in the Weighted_Window overload. +2008-11-03 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> + + Remove a std::size_t. + + In my opinion nelements must not return size_t. + * mln/core/site_set/p_image.hh, + * mln/core/image/image3d.hh: Here. + 2008-11-02 Florian Lesaint <florian.lesaint(a)lrde.epita.fr> Fix the gaussian_2nd_derivative coef normalisation. and remove stretch since it can be a problem with float images. * linear/gaussian.hh: Here. +2008-10-31 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Clean-up from_to, add some new overloads, and fix (c). + + * tests/core/other/w_window.cc: New. + * tests/core/other/Makefile.am: Update. + * tests/core/alias/window2d.cc: Remove echos. + * mln/make/image2d.hh: New. + * tests/make/image2d.cc: New. + * tests/make/Makefile.am: Update. + * tests/convert/to_image.cc: Fix copyright. + (include): Remove; useless. + * mln/core/alias/window2d.hh: Fix include. + * mln/core/w_window.hh (from_to): New overload. + * mln/core/dpoint.hh: Fix (c). + * mln/core/concept/weighted_window.hh: Fix (c). + * mln/core/concept/object.hh: Include all metal math. + Include metal converts_to. + * mln/core/concept/window.hh (from_to): New overload. + (todo): New. + * mln/core/concept/image.hh (from_to): New overload. + * mln/core/concept/gpoint.hh: Fix doc. + * mln/core/concept/gdpoint.hh (from_to): New overload. + * mln/core/def/all.hh: New. + * mln/core/window.hh: Fix copyright. + * mln/linear/convolve.hh: Fix warning + copyright. + * mln/make/image.hh (image): New overload for 3D. + * mln/make/w_window2d.hh: Fix copyright. + Remove useless include. + * mln/convert/to_image.hh + (mln_image_from, helper_dim_, helper_image_from_): Remove. + Redundant with image_from_grid. + (to_image): Update and use convert::from_to. + * mln/convert/from_to.hxx: Layout and update. + 2008-10-31 Vivien Delmon <vivien.delmon(a)lrde.epita.fr> Add void cast to remove unused variable warnings. * mln/morpho/erosion.hh: Done. +2008-10-31 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Introduce make::image. + + When there is no ambiguity, the user can call make::image. + + * mln/make/image2d.hh: Rename as... + * mln/make/image.hh: ...this. + Import code from... + * mln/make/image1d.hh: ...this removed file. + * mln/make/all.hh: Update. + * tests/debug/iota.cc, + * tests/draw/graph.cc, + * tests/level/abs.cc, + * tests/level/replace.cc, + * tests/level/stretch.cc, + * tests/level/apply.cc, + * tests/level/compare.cc, + * tests/level/saturate.cc, + * tests/arith/minus.cc, + * tests/arith/times.cc, + * tests/arith/plus.cc, + * tests/arith/revert.cc, + * tests/accu/compute.cc, + * tests/geom/resize.cc, + * tests/geom/seed2tiling_roundness.cc, + * tests/geom/seed2tiling.cc, + * tests/display/color_pretty.cc, + * tests/logical/or.cc, + * tests/logical/not.cc, + * tests/logical/and_not.cc, + * tests/logical/and.cc, + * tests/canvas/chamfer.cc, + * tests/util/tree_to_image.cc, + * tests/util/lemmings.cc, + * tests/util/tree_fast_to_image.cc, + * tests/labeling/compute.cc, + * mln/core/image/image1d.hh: Update. + * mln/core/image/image2d.hh: Update. + (todo): New. + * mln/core/w_window.hh (from_to): New overload. + * mln/make/w_window2d.hh: Change tests into checks. + * mln/convert/from_to.hxx: Update. + * mln/canvas/browsing/directional.hh: . + * tests/core/alias/w_window2d_int.cc: Add alt code. + 2008-10-31 Vivien Delmon <vivien.delmon(a)lrde.epita.fr> Fix previous patch. @@ -13066,7 +13423,7 @@ Generalize erosion in 2d for any accumulator. * mln/morpho/erosion.spe.hh: Add accumulator type as parameter and - rename min as accu. + rename min as accu. 2008-10-31 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -13135,6 +13492,30 @@ 2008-10-30 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + Add a generic discrete distance transform. + + * mln/transform: New. + * mln/transform/distance.hh: New. + * tests/transform: New directory. + * tests/transform/Makefile.am: New. + * tests/transform/distance.cc: New. + * sandbox/geraud/skel.cc: Layout. + * sandbox/geraud/dmap.cc: Update. + + Slight change in w_window. + + * mln/core/w_window.hh (from_to): Prepare new overload. + For that, add some new meta-code: + * mln/metal/math/root.hh: New. + * mln/metal/math/all.hh: Update. + * mln/metal/math/sqrt.hh (todo): New. + * tests/metal/math/root.cc: New. + * tests/metal/math/pow.cc: Remove echo. + * tests/metal/math/Makefile.am: Update. + * tests/morpho/Makefile.am (SUBDIRS): Fix missing. + +2008-10-30 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + Start cleaning weighted windows and linear operators. * mln/core/w_window.hh (trait): New @@ -13158,12 +13539,12 @@ Add gaussian_1st_derivative and gaussian_2nd_derivative. * mln/extension/adjust_fill.hh: Add a adjust_fill version which takes - a delta. + a delta. * mln/level/stretch.hh: Fix code. * mln/level/transform.hh: Revert work done by Nicolas Ballas to make - gaussian work. + gaussian work. * mln/linear/gaussian.hh: Add gaussian_1st_derivative and - gaussian_2nd_derivative. + gaussian_2nd_derivative. * tests/linear/gaussian.cc: Fix test. 2008-10-30 Guillaume Lazzara <z(a)lrde.epita.fr> @@ -13192,27 +13573,27 @@ * mln/core/image/graph_elt_neighborhood.hh, * mln/core/image/graph_elt_window.hh: - Use the new util::graph API. + Use the new util::graph API. * mln/core/image/graph_window_piter.hh, * mln/core/image/graph_neighborhood_piter.hh: - Update template parameters. + Update template parameters. * mln/core/image/graph_psite.hh: - Deleted. - Replaced by mln/util/internal/graph_vertex_psite. + Deleted. + Replaced by mln/util/internal/graph_vertex_psite. * mln/core/image/image2d.hh: Update comments. * mln/core/internal/graph_iter_base.hh: - Deleted. - Replaced by mln/util/internal/graph_iter_base.hh. + Deleted. + Replaced by mln/util/internal/graph_iter_base.hh. * mln/core/internal/graph_vicinity_piter.hh: Renamed as... * mln/core/internal/graph_relative_piter.hh: ...this. * mln/core/internal/site_relative_iterator_base.hh: - Update an assertion. + Update an assertion. * mln/core/site_set/p_vertices.hh, * mln/core/site_set/p_edges.hh: returns the function by reference. @@ -13223,12 +13604,25 @@ * mln/core/var.hh: add mln_const_VAR(). * mln/util/internal/graph_psite_base.hh: - pass the vertex id to the site set's function instead of the - vertex itself. + pass the vertex id to the site set's function instead of the + vertex itself. * tests/core/image/graph_image.cc: Update according the new graph structure. +2008-10-29 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Few updates. + + * tests/draw/line.cc: Fix missing update. + * mln/draw/line.hh: Make it safe. + * mln/morpho/closing_volume.hh (closing_volume): New + overload with output as return. + * mln/morpho/all.hh: Better doc. + (include): Update. + * sandbox/geraud/wst_edge.cc: Prefer volume closing over + area closing. + 2008-10-28 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add morphological top hats. @@ -13348,8 +13742,8 @@ 2008-10-27 Guillaume Lazzara <z(a)lrde.epita.fr> Fix wrong or missing traces. - * milena/mln/level/fill_with_image.spe.hh, - * milena/mln/morpho/erosion.spe.hh: + * mln/level/fill_with_image.spe.hh, + * mln/morpho/erosion.spe.hh: Call trace::exiting before the return statement. * mln/io/fits/load.hh, @@ -13380,6 +13774,22 @@ * mln/level/transform.hh, * mln/level/paste.hh: Rename routines. +2008-10-27 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Add fun::v2v::convert and level::convert. + + * mln/fun/v2v/convert.hh: New. + * mln/fun/v2v/cast.hh (todo): New. + * mln/level/convert.hh: New. + * tests/level/convert.cc: New. + * tests/level/Makefile.am: Update. + * mln/value/rgb.hh (todo): New. + (from_to): New overload for bool->rgbn. + * mln/convert/from_to.hxx + (from_to): New decl for bool->rgbn. + * sandbox/scribo/demat.hh + (include): Remove obsolete dependency. + 2008-10-27 Guillaume Lazzara <z(a)lrde.epita.fr> Add missing methods in graph related classes. @@ -13529,16 +13939,16 @@ * doc/tutorial/samples/point-1.tex: Fix mistakes in code sample. * doc/tutorial/samples/ima2d-6-clone.tex: clone() is not a - method. Use a routine instead. + method. Use a routine instead. * doc/tutorial/samples/logical-not-output.tex, * doc/tutorial/samples/logical-not.tex: new sample code. * doc/tutorial/tutorial.tex: Update tutorial. - - Add a section about useful macros. - - Emphazise keywords such as variable names, method names, type - names,... - - Add a section about logical::not() routine. + Add a section about useful macros. + Emphazise keywords such as variable names, method names, type + names,... + Add a section about logical::not() routine. 2008-10-24 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -13658,7 +14068,7 @@ Convert n-faces set to algebraic faces. - * milena/mln/topo/n_faces_set.hh + * mln/topo/n_faces_set.hh (mln::topo::n_faces_set::faces_type): New typedef. Use it as type of... (mln::topo::n_faces_set::faces_): ...this member. @@ -13709,7 +14119,7 @@ (mln::topo::make_n_face): Remove useless helper. (mln::topo::edge(const n_face<0, D>&, const n_face<0, D>&)): Have this helper return an algebraic 1-face, and move it... - * milena/mln/topo/face.hh: ...here. + * mln/topo/face.hh: ...here. 2008-10-23 Roland Levillain <roland(a)lrde.epita.fr> @@ -13761,9 +14171,9 @@ * doc/tutorial/samples/win-create-2.tex: new sample code. * doc/tutorial/tutorial.tex: Update. - - Start writing section about windows and neighborhoods. - - Write section about dpoints. - - Add a section about the global variables. + Start writing section about windows and neighborhoods. + Write section about dpoints. + Add a section about the global variables. 2008-10-23 Nicolas Ballas <ballas(a)lrde.epita.fr> @@ -14098,8 +14508,8 @@ * doc/tutorial.tex: Write section about: - - accumulators and *::compute. - - blobs + - accumulators and *::compute. + - blobs 2008-10-20 Nicolas Ballas <ballas(a)lrde.epita.fr> @@ -15436,9 +15846,9 @@ Update tutorial.. * doc/tutorial/tutorial.tex: - - Add a new section about sites - - Add new subsections about image domain and values. - - Talk about operator '/' used to create sub images. + Add a new section about sites + Add new subsections about image domain and values. + Talk about operator '/' used to create sub images. 2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> @@ -15987,8 +16397,8 @@ Fixes on median. - * mln/level/median.hh: Add initialisation of p : - p = input.domain().pmin() + up; + * mln/level/median.hh: Add initialisation of p: + p = input.domain().pmin() + up; * tests/level/median_.cc: Some tests. 2008-09-30 Roland Levillain <roland(a)lrde.epita.fr> @@ -17500,15 +17910,15 @@ Update tutorial. * tutorial.tex: Add sections about values and differences between - sites and psites. + sites and psites. 2008-09-22 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Add snake_vert browsing canvas. * mln/canvas/browsing/snake_vert.hh: New, snake vert browsing - canvas. This canvas browse all the point of an image 'input' like - this : + canvas. This canvas browse all the point of an image 'input' like + this : 1 4 5 || /\ || || || || @@ -17614,8 +18024,8 @@ * mln/core/image/mono_obased_rle_image.hh, * mln/core/image/rle_image.hh, * mln/core/image/obased_rle_image.hh: - Rename size_mem() to memory_size(). - Rename p_of_run() to index(). + Rename size_mem() to memory_size(). + Rename p_of_run() to index(). * mln/core/image/plain.hh: add missing init_(). @@ -17624,11 +18034,11 @@ * mln/core/image/mono_obased_rle_image.hh, * mln/core/image/rle_image.hh, * mln/core/image/value_enc_image.hh: - Use p_set_of and p_run instead of p_runs_. + Use p_set_of and p_run instead of p_runs_. * mln/estim/sum.hh: - Fully specify the types in template parameters. + Fully specify the types in template parameters. * mln/geom/bbox.hh: Add support for weighted_windows. @@ -17643,7 +18053,7 @@ * tests/core/alias/w_window1d_int.cc: use convert::to(). * tests/core/image/value_enc_image.cc: - use the proper p_runs2d type. + use the proper p_runs2d type. 2008-09-17 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> @@ -17770,7 +18180,7 @@ make seed2tiling_roundness test compile. * mln/convert/to_image.hh: - use operator(point1d p) instead of operator(int index). + use operator(point1d p) instead of operator(int index). * mln/display/color_pretty.hh: add missing header. @@ -17780,11 +18190,11 @@ Make w_window compile. * mln/core/site_set/p_priority.hh: - Add missing comparison operator. + Add missing comparison operator. * mln/core/w_window.hh, * mln/core/concept/weighted_window.hh: - Update typedefs. + Update typedefs. 2008-09-17 Guillaume Lazzara <z(a)lrde.epita.fr> @@ -18245,7 +18655,7 @@ * mln/level/fill.hh, * mln/level/fill_with_image.hh, * mln/level/fill_with_value.hh: - Avoid compilation warning when compiled with -DNDEBUG. + Avoid compilation warning when compiled with -DNDEBUG. * mln/convert/to_p_array.hh: Add a missing exact(). @@ -18475,8 +18885,8 @@ * mln/level/was.median.hh: Use median_h. * mln/level/memset_.hh: Use full namespace name to call - force_exact (g++ does not look at the right namespace if the full name - is not given). + force_exact (g++ does not look at the right namespace if the full name + is not given). * mln/convert/to_image.hh: use geom::bbox(). @@ -18496,7 +18906,7 @@ * mln/core/image/plain.hh, * mln/core/image/safe.hh, * mln/core/image/sparse_image.hh: - Add missing init_() here . + Add missing init_() here . * mln/core/image/status.txt: Update cast_image status. @@ -18689,22 +19099,22 @@ Temporary fix doc compilation. * doc/Doxyfile.in: - Temporary excludes core/concept from the doc generation. - The doc can now be generated. - Due to core/concept the doc generation never ended. + Temporary excludes core/concept from the doc generation. + The doc can now be generated. + Due to core/concept the doc generation never ended. 2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> Remove deprecated tests. * tests/core/image/Makefile.am: - Remove deprecated tests and comments few others. + Remove deprecated tests and comments few others. 2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> Fix fill_with_image. * mln/level/fill_with_image.hh: Use exact(). * mln/level/fill_with_image.spe.hh: - Fix fill_with_image prototype. + Fix fill_with_image prototype. * mln/level/memcpy_.hh: Use full namespace name. @@ -18867,10 +19277,10 @@ * tests/core/site_set/p_priority_queue_fast_with_array.cc, * tests/core/site_set/p_runs.cc, * tests/core/site_set/pset_array.cc: - Remove these tests according to core/site_set/status.txt. + Remove these tests according to core/site_set/status.txt. * mln/level/fill_with_value.hh: fix a compilation warning - (unused variable). + (unused variable). * mln/set/get.hh: new algorithm to get the ith element in a site set. @@ -18884,7 +19294,7 @@ * tests/core/site_set/p_priority_queue.cc, * tests/core/site_set/p_set.cc, * tests/core/site_set/pset_if.cc: - update assertions and make the test compile. + update assertions and make the test compile. 2008-09-12 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -18953,7 +19363,7 @@ * mln/core/site_set/p_faces.hh, * mln/core/site_set/p_bgraph_piter.hh, * mln/core/site_set/p_graph_piter.hh: - remove useless '_' in class names. + remove useless '_' in class names. * tests/canvas/browsing/directional.cc, * tests/canvas/browsing/fwd.cc, @@ -19282,7 +19692,7 @@ * mln/convert/to_image.hh: Rename mln_point to mln_site. * mln/geom/shift.hh: - Use convert::to instead of convert::to_dpoint(). + Use convert::to instead of convert::to_dpoint(). * mln/level/median.hh: Update the use of io property. @@ -19355,11 +19765,11 @@ * tests/morpho/meyer_wst_long.cc, * tests/test/positive.cc, * tests/value/builtin/builtin.cc: - Fix \file tag with the proper file name. + Fix \file tag with the proper file name. * doc/Doxyfile.in: Add new macro expansions. * doc/Makefile.am: set EXCLUDE_SYMBOLS properly when - making the user doc. + making the user doc. 2008-09-11 Guillaume Lazzara <z(a)lrde.epita.fr> @@ -19443,7 +19853,7 @@ Add a section about graph images in tutorial. * doc/tutorial/tutorial.tex: Add a section about graph images and fix - few mistakes all along the tutorial. + few mistakes all along the tutorial. 2008-09-10 Roland Levillain <roland(a)lrde.epita.fr> @@ -27232,12 +27642,12 @@ Add traits for rgb. Fix the test rgb_full. * mln/value/rgb.hh: Add traits : - rgb<n> + rgb<n> -> rgb<n> - rgb<n> - rgb<n> -> rgb<n> - rgb<n> * scalar_ -> rgb<n> - rgb<n> / scalar_ -> rgb<n> - rgb<n> * int_u -> rgb<n> - rgb<n> / int_u -> rgb<n> + rgb<n> + rgb<n> -> rgb<n> + rgb<n> - rgb<n> -> rgb<n> + rgb<n> * scalar_ -> rgb<n> + rgb<n> / scalar_ -> rgb<n> + rgb<n> * int_u -> rgb<n> + rgb<n> / int_u -> rgb<n> * tests/value/rgb_full.cc: Fix the macro test_interop_sc, add a FIXME for operators *,/ on (rgb<n>, float). @@ -27597,14 +28007,14 @@ Complete the macros in Meta Accumlator. * mln/core/concept/meta_accumulator.hh: (mln_accu_with_, - mln_accu_result_) New. + mln_accu_result_) New. 2007-12-03 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Complete the macros in Meta Accumlator. * mln/core/concept/meta_accumulator.hh: (mln_accu_with_, - mln_accu_result_) New. + mln_accu_result_) New. 2007-12-03 Matthieu Garrigues <garrigues(a)lrde.epita.fr> @@ -28151,8 +28561,8 @@ * mln/io/ppm/load.hh, * mln/io/ppm/save.hh, * tests/io/ppm/ppm.cc: Add documentation, review the code, put - MLN_INCLUDE_ONLY gards, add missing function declaration (outside - MLN_INCLUDE_ONLY). + MLN_INCLUDE_ONLY gards, add missing function declaration (outside + MLN_INCLUDE_ONLY). 2007-11-28 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> @@ -28203,7 +28613,7 @@ Review debug directory. * mln/debug/iota.hh: Resolve a fixme due to a resolved bug (in - operator %) + operator %) * mln/debug/iota.spe.hh: likewise * tests/Makefile.am: Move debug tests... * tests/debug/Makefile.am: ...here @@ -28220,7 +28630,7 @@ make save pgm work on graylevels. document pnm::save. * mln/io/pgm/save.hh: Disable type checking in pgm::save to allow to - save graylevel images. + save graylevel images. * mln/io/pnm/save.hh: Documentation. * mln/io/pnm/save_header.hh: graylevel compatibility. @@ -28279,7 +28689,7 @@ convert for graylevel. * mln/value/graylevel.hh: the graylevel type wasn't compatible with - the generic convert in convert.hh because of a conversion to int. + the generic convert in convert.hh because of a conversion to int. 2007-11-27 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> @@ -28335,8 +28745,8 @@ Add an error of incompatible types in pnm loading. * mln/io/pnm/load.hh: io::ppm::load<rgb8>("image16bits.ppm") now abort - because we can't store rgb 16 bits into rgb 8 bits (likewise for - pgm). + because we can't store rgb 16 bits into rgb 8 bits (likewise for + pgm). * tests/io/ppm/ppm16.cc: Add some tests due to this update. @@ -28346,10 +28756,10 @@ * mln/io/pnm/load.hh: (load(image&, filename)) now work on rgb images. * mln/io/pnm/max_component.hh: Define a function which give the max of - the component of a value type. + the component of a value type. * tests/io/pgm/pgm16.cc: Now test the other way to load an image - (load(image&, filename)). + (load(image&, filename)). * tests/io/ppm/ppm16.cc: likewise. * img/lena_16.ppm: New, lena, ppm 16 bits. @@ -28359,7 +28769,7 @@ Fixes in int_u. * mln/value/int_u.hh: max() is now mlc_pow_int(2, n) - 1. and - (unsigned int) is back to (int) (cf my previous patch). + (unsigned int) is back to (int) (cf my previous patch). 2007-11-27 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> @@ -30419,12 +30829,12 @@ Add traits for rgb. Fix the test rgb_full. * mln/value/rgb.hh: Add traits : - rgb<n> + rgb<n> -> rgb<n> - rgb<n> - rgb<n> -> rgb<n> - rgb<n> * scalar_ -> rgb<n> - rgb<n> / scalar_ -> rgb<n> - rgb<n> * int_u -> rgb<n> - rgb<n> / int_u -> rgb<n> + rgb<n> + rgb<n> -> rgb<n> + rgb<n> - rgb<n> -> rgb<n> + rgb<n> * scalar_ -> rgb<n> + rgb<n> / scalar_ -> rgb<n> + rgb<n> * int_u -> rgb<n> + rgb<n> / int_u -> rgb<n> * tests/value/rgb_full.cc: Fix the macro test_interop_sc, add a FIXME for operators *,/ on (rgb<n>, float). @@ -30783,15 +31193,15 @@ Complete the macros in Meta Accumlator. - * mln/core/concept/meta_accumulator.hh: (mln_accu_with_, - mln_accu_result_) New. + * mln/core/concept/meta_accumulator.hh (mln_accu_with_) + (mln_accu_result_): New. 2007-12-03 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Complete the macros in Meta Accumlator. - * mln/core/concept/meta_accumulator.hh: (mln_accu_with_, - mln_accu_result_) New. + * mln/core/concept/meta_accumulator.hh (mln_accu_with_) + (mln_accu_result_): New. 2007-12-03 Matthieu Garrigues <garrigues(a)lrde.epita.fr> @@ -31338,8 +31748,8 @@ * mln/io/ppm/load.hh, * mln/io/ppm/save.hh, * tests/io/ppm/ppm.cc: Add documentation, review the code, put - MLN_INCLUDE_ONLY gards, add missing function declaration (outside - MLN_INCLUDE_ONLY). + MLN_INCLUDE_ONLY gards, add missing function declaration (outside + MLN_INCLUDE_ONLY). 2007-11-28 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> @@ -31390,7 +31800,7 @@ Review debug directory. * mln/debug/iota.hh: Resolve a fixme due to a resolved bug (in - operator %) + operator %) * mln/debug/iota.spe.hh: likewise * tests/Makefile.am: Move debug tests... * tests/debug/Makefile.am: ...here @@ -31407,7 +31817,7 @@ make save pgm work on graylevels. document pnm::save. * mln/io/pgm/save.hh: Disable type checking in pgm::save to allow to - save graylevel images. + save graylevel images. * mln/io/pnm/save.hh: Documentation. * mln/io/pnm/save_header.hh: graylevel compatibility. @@ -31466,7 +31876,7 @@ convert for graylevel. * mln/value/graylevel.hh: the graylevel type wasn't compatible with - the generic convert in convert.hh because of a conversion to int. + the generic convert in convert.hh because of a conversion to int. 2007-11-27 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> @@ -31522,8 +31932,8 @@ Add an error of incompatible types in pnm loading. * mln/io/pnm/load.hh: io::ppm::load<rgb8>("image16bits.ppm") now abort - because we can't store rgb 16 bits into rgb 8 bits (likewise for - pgm). + because we can't store rgb 16 bits into rgb 8 bits (likewise for + pgm). * tests/io/ppm/ppm16.cc: Add some tests due to this update. @@ -31533,10 +31943,10 @@ * mln/io/pnm/load.hh: (load(image&, filename)) now work on rgb images. * mln/io/pnm/max_component.hh: Define a function which give the max of - the component of a value type. + the component of a value type. * tests/io/pgm/pgm16.cc: Now test the other way to load an image - (load(image&, filename)). + (load(image&, filename)). * tests/io/ppm/ppm16.cc: likewise. * img/lena_16.ppm: New, lena, ppm 16 bits. @@ -31546,7 +31956,7 @@ Fixes in int_u. * mln/value/int_u.hh: max() is now mlc_pow_int(2, n) - 1. and - (unsigned int) is back to (int) (cf my previous patch). + (unsigned int) is back to (int) (cf my previous patch). 2007-11-27 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> @@ -32371,7 +32781,7 @@ Review the mln/geom directory. * mln/geom/seeds2tiling.hh: Clean dead code, update doc. Fixme for - guillaume : Review the documentation. + guillaume : Review the documentation. * mln/geom/seeds2tiling_with_chamfer.hh: likewise. Add unit tests. @@ -32437,9 +32847,9 @@ * mln/debug/println.hh: Move spezialisations to println.spe.hh. * mln/debug/println.spe.hh: New, specializations of println. * mln/debug/println_with_border.hh: Move spezialisations to - println_with_border.spe.hh. + println_with_border.spe.hh. * mln/debug/println_with_border.spe.hh: New, specializations of - println. + println. * tests/debug_iota.cc: New, add a test for iota. @@ -32536,7 +32946,7 @@ * mln/literal/origin.hh, * mln/literal/white.hh, * tests/literal/black.cc: Use extern const ref, not static. Move - impl. within MLN_INCLUDE_ONLY. + impl. within MLN_INCLUDE_ONLY. Move/add some unit tests. @@ -32632,7 +33042,7 @@ A better test for io::pbm. * tests/io_pbm.cc: Take a pgm, binarise it, save it, read it, and - check we we get the same pbm. + check we we get the same pbm. 2007-11-13 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> @@ -32669,10 +33079,10 @@ Add fast priority queue with array. * mln/core/p_priority_queue_fast_with_array.hh: - New kind of fast priority queue based on std::vector. + New kind of fast priority queue based on std::vector. * tests/core_p_priority_queue_fast_with_array.cc: - New test for that. + New test for that. 2007-11-13 Simon Nivault <simon.nivault(a)lrde.epita.fr> @@ -32741,7 +33151,7 @@ Clean and optimise FLLT. * mln/util/branch_iter_ind.hh: Check if the tree has not - been subject to updates which can invalidate the iterator. + been subject to updates which can invalidate the iterator. 2007-11-12 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> @@ -32928,22 +33338,22 @@ Fix an bug in make::image2d. * mln/make/image2d.hh: (for (unsigned row = 0; row <= R; ++row)) - replaced by... - (for (unsigned row = 0; row < R; ++row)) ...this. + replaced by... + (for (unsigned row = 0; row < R; ++row)) ...this. 2007-11-05 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Add box_bounds_piter_ to iterate on the bounds of a box2d. * mln/core/box_piter.hh: (box_bounds_piter_) New, iterator to iterate - on the bounds of a box2d. + on the bounds of a box2d. 2007-11-05 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Fix compilation error in core/concept/box.hh. * mln/core/concept/box.hh: Add parenthesis to remove an ambiguity at - the operator !. + the operator !. 2007-11-05 Simon Nivault <simon.nivault(a)lrde.epita.fr> @@ -33096,7 +33506,7 @@ * mln/core/image2d.hh: Include make/image2d.hh at the end of the file. * mln/make/image2d.hh: New, Add routine to make a image2d with a 2d - array + array * tests/make_image2d.cc: New, tests on make::image2d. 2007-10-30 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -33207,7 +33617,7 @@ Improve fllt. Add more tests. * mln/set/is_subset_of.hh: New, Test if a point set is a subset of - another. + another. * mln/util/branch_iter.hh: Update * mln/util/tree.hh: (tree<T>::add_child(node<T>*)) New, (tree<T>::main_branch()) New. @@ -35226,7 +35636,7 @@ * mln/value/concept/structured.hh, * mln/value/concept/symbolic.hh, * mln/value/concept/vectorial.hh: Add categories for each of these - types (in namespace value). + types (in namespace value). 2007-10-05 Matthieu Garrigues <garrigues(a)lrde.epita.fr> @@ -35455,7 +35865,7 @@ Update doc of accus. Update Accumulator. * mln/core/concept/accumulator.hh: Test if the conversion operator - exist. + exist. * mln/core/concept/doc/accumulator.hh: Add operator result(). @@ -35472,7 +35882,7 @@ Remove conversion method in median_alt. * mln/accu/median_alt.hh: Move conversion method to the super class - accu::internal::base_ + accu::internal::base_ * mln/accu/nil.hh, * mln/accu/p.hh: Clean old includes. @@ -36195,7 +36605,7 @@ Clean interpolated image class. * mln/core/interpolated.hh: Remove useless methods because of - inherited methods from identity morpher. + inherited methods from identity morpher. 2007-09-25 Matthieu Garrigues <garrigues(a)lrde.epita.fr> @@ -36224,7 +36634,7 @@ * mln/core/rle_image.hh, * mln/core/sparse_image.hh: Move the data allocation to the insert - method. + method. 2007-09-25 Simon Nivault <simon.nivault(a)lrde.epita.fr> @@ -36249,16 +36659,16 @@ * mln/core/decorated_image.hh: Remove super_ typedef. * mln/core/interpolated.hh: Inherit from identity morpher. Add memory - managment. + management. * mln/core/rle_image.hh, * mln/core/sparse_image.hh, * mln/core/internal/run_image.hh: Inherit from image_primary, move - domain_ attribute to the descendants classes rle_images and - sparse_image. Add memory managment to rle and sparse images. + domain_ attribute to the descendants classes rle_images and + sparse_image. Add memory managment to rle and sparse images. * mln/core/safe.hh: Inherit from identity morpher. Add memory - managment. + managment. * mln/value/stack.hh: Inherit from value morpher. @@ -36673,11 +37083,11 @@ * image2d_b.hh: * image2d_b_data.hh: move image data into an imaage2d_b_data class, - then hold it with a tracked pointer to avoid useless data copy like - in olena + then hold it with a tracked pointer to avoid useless data copy like + in olena * internal/tracked_ptr.hh: tracked pointer class from olena. fix a bug - related to invariant_ call to optimize data access. + related to invariant_ call to optimize data access. 2007-09-19 Simon Nivault <simon.nivault(a)lrde.epita.fr> @@ -36802,20 +37212,20 @@ Improve pnm support. * mln/io/fits/load.hh: start debug, only the first column of the image - is filled + is filled * mln/io/internal/pnm/load.hh: add a second funtion to load a function - load(ima, filename). Then we can check if ima is the right type to - load the image in the file filename. + load(ima, filename). Then we can check if ima is the right type to + load the image in the file filename. * mln/io/internal/pnm/load_header.hh: update read_header to get the - maxvalue of the pnm header. We need it to check if max(mln_value(I)) - == maxval + maxvalue of the pnm header. We need it to check if max(mln_value(I)) + == maxval * mln/io/internal/pnm/save.hh: * mln/io/internal/pnm/save_header.hh: change save_header(type, maxval, - ima, filename, file) to save_header(type, maxval, ima, filename, - file) + ima, filename, file) to save_header(type, maxval, ima, filename, + file) * mln/io/pbm/save.hh: * mln/io/pgm/load.hh: @@ -36847,11 +37257,11 @@ 2007-09-17 Matthieu Garrigues <garrigues(a)lrde.epita.fr> move the io_fits test - from: + from: * sandbox/garrigues/io_fits.cc: - to: + to: * tests/io_fits.cc: Remove. - because it can't compile without the cfitsio library + because it can't compile without the cfitsio library 2007-09-14 Simon Nivault <simon.nivault(a)lrde.epita.fr> @@ -36908,61 +37318,61 @@ improving PNM format support * img/test.fits: - a fits image + a fits image * mln/io/internal: - The functions to save and load ppm, pbm and pgm format - looked quite similar. I add this directory to factorise - all these similarities + The functions to save and load ppm, pbm and pgm format + looked quite similar. I add this directory to factorise + all these similarities * mln/io/internal/abort.hh: - the abort function used in loading functions + the abort function used in loading functions * mln/io/internal/pnm/load.hh: - functions to load pnm files, 8 or 16 bits. + functions to load pnm files, 8 or 16 bits. * mln/io/internal/pnm/load_header.hh: - function to read a pnm header. + function to read a pnm header. * mln/io/internal/pnm/macros.hh: - Some macros to identify the magic numbers of the formats + Some macros to identify the magic numbers of the formats * mln/io/internal/pnm/save.hh: - functions to load pnm files, 8 or 16 bits. + functions to load pnm files, 8 or 16 bits. * mln/io/internal/pnm/save_header.hh: - function to save a pnm header. + function to save a pnm header. * mln/io/internal/pnm: - all internal treatments of pnm format, used by - concrete formats (pbm, pgm, ppm) + all internal treatments of pnm format, used by + concrete formats (pbm, pgm, ppm) * mln/io/pbm/load.hh: - loading of pbm format done + loading of pbm format done * mln/io/pbm/save.hh: - saving of pbm format done + saving of pbm format done * mln/io/pfm/load.hh: - loading of pfm format done + loading of pfm format done * mln/io/pgm/load.hh: - loading of pgm format done + loading of pgm format done * mln/io/pgm/save.hh: - saving of pgm 8/16 bits format done + saving of pgm 8/16 bits format done * mln/io/ppm/load.hh: - loading of ppm 8/16 bits format done + loading of ppm 8/16 bits format done * mln/io/ppm/save.hh: - loading of ppm 8/16 bits format done + loading of ppm 8/16 bits format done * mln/value/rgb.hh: - To fix : we can't apply level:transform on rgb images - convert_< rgb8 > could be one part of the problem. + To fix : we can't apply level:transform on rgb images + convert_< rgb8 > could be one part of the problem. * mln/value/rgb16.hh: - add rgb16 type to test ppm 16bits + add rgb16 type to test ppm 16bits * tests/io_pbm.cc: - some tests + some tests * tests/io_pgm.cc: - some tests + some tests * tests/io_ppm16.cc: - some tests + some tests 2007-09-13 Simon Nivault <simon.nivault(a)lrde.epita.fr> @@ -37002,34 +37412,34 @@ * img/lena.pbm: lena in pbm * img/lena.ppm: lena in ppm * mln/convert/to_rgb.hh: operation to convert - some values to rgb in order to make pgm::load<rgb8> - compile + some values to rgb in order to make pgm::load<rgb8> + compile * mln/io/pbm/load.hh: - load a pbm image into an image2d_b<bool> + load a pbm image into an image2d_b<bool> * mln/io/pbm/save.hh: New. - save an image2d_b<bool> into a pbm image file + save an image2d_b<bool> into a pbm image file * mln/io/pbm: New. * mln/io/pgm/load.hh: - add 16 bits handling + add 16 bits handling * mln/io/pgm/save.hh: - add 16 bits handling + add 16 bits handling * mln/io/ppm/load.hh: New. - load a ppm image into an image2d_b<rgb8> + load a ppm image into an image2d_b<rgb8> * mln/io/ppm/save.hh: New. - save an image2d_b<rgb8> into a ppm image file + save an image2d_b<rgb8> into a ppm image file * mln/io/ppm: New directory. * mln/value/int_u.hh: - fix to compile with the good flags + fix to compile with the good flags * mln/value/rgb.hh: - update of rgb values + update of rgb values * tests/io_pbm.cc: - a test + a test * tests/io_pgm.cc: - a test + a test * tests/io_pgm16.cc: - a test + a test * tests/io_ppm.cc: - a test + a test 2007-09-11 Simon Nivault <simon.nivault(a)lrde.epita.fr> @@ -37074,7 +37484,7 @@ * mln/value/rgb.hh: templated value rgb<n> * mln/value/rgb8.hh: just a typedef * mln/value/rgb8_non_templated.hh: the old version without template - (to delete) + (to delete) * tests/debug_println_with_border.cc: (uplate includes) * tests/value_rgb8.cc: tests rgb operation @@ -37114,8 +37524,8 @@ bug fix in image1d_b * mln/core/image1d_b.hh: re-add array_ attribute in the image1d_b class - we actually need it to handle the border offset - => array_ = buffer_ - vb_.pmin().ind(); + we actually need it to handle the border offset + => array_ = buffer_ - vb_.pmin().ind(); * mln/debug/println.hh: update * tests/debug_println_with_border.cc: add 1d test. diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index df55f1f..17196d9 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -34,7 +34,7 @@ Create mean and deviation images. * fabien/igr/fixed_seg/Makefile: New target for building - fixed segmentation. + fixed segmentation. * fabien/igr/fixed_seg/main.cc: Create mean image. * fabien/igr/smooth_fixed_seg/main.cc: Small update, on hold. @@ -50,7 +50,7 @@ Add a morpho transformation before edges computation. * fabien/igr/smooth_fixed_seg/main.cc: New edge computation, using - morpho transformations. + morpho transformations. 2009-05-12 Edwin Carlinet <carlinet(a)lrde.epita.fr> @@ -74,14 +74,14 @@ Plot labels in fixed watershed. * fabien/igr/plot_label.hh: Implement plot_label() for - fixed segmentation. + fixed segmentation. * fabien/igr/seg_fixed.cc: Add plot_label() calls. 2009-05-10 Edwin Carlinet <carlinet(a)lrde.epita.fr> Make clean in tree files and procedures. * edwin/mln/morpho/tree/filter.hh: - group strategies for non-increasing attribute filtering. + Group strategies for non-increasing attribute filtering. * edwin/attributes/bbox.hh, * edwin/attributes/occupation.hh, @@ -100,7 +100,7 @@ * edwin/tree/propagate.hh, * edwin/tree/propagate_if.hh, * edwin/tree/propagate_node.hh, - move all tree materials in edwin/mln/morpho/tree. + Move all tree materials in edwin/mln/morpho/tree. 2009-05-07 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -281,7 +281,7 @@ Add watershed in fixed segmentation. * fabien/igr/seg_fixed.cc: Add closing::volume() and - watershed::flooding() in fixed segmentation. + watershed::flooding() in fixed segmentation. 2009-04-30 Guillaume Lazzara <lazzara(a)lrde.epita.fr> @@ -292,14 +292,14 @@ * icdar/2009/hsc/first_attempts/exec/relabel_lines.cc, * inim/2010/boxes/boxes.cc, * lazzara/igr/irm/grad_clo_and_wshd.cc, - * lazzara/igr/irm/hsl_grad_and_wst.cc: use v2v::wrap instead of + * lazzara/igr/irm/hsl_grad_and_wst.cc: Use v2v::wrap instead of l2l::wrap. 2009-05-03 Edwin Carlinet <carlinet(a)lrde.epita.fr> Rewrite propagation using predicate. * edwin/tree/propagate_if.hh: Rewrite propagation using predicate - and add postcondition. + and add postcondition. * edwin/tree/propagation.cc: Test file update. 2009-04-30 Fabien Freling <fabien.freling(a)lrde.epita.fr> @@ -323,7 +323,8 @@ Histograms update. * folio/mln/histo/compute_histo.hh: Some brainstorming. - * folio/mln/histo/compute_histo_3d.hh: Some corrections from compute_histo. + * folio/mln/histo/compute_histo_3d.hh: Some corrections from + compute_histo. 2009-04-29 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -353,26 +354,26 @@ Convert Matlab images to Milena images. * fabien/igr/mat2mln/mat2mln.cc: Convert matlab ascii format - to mln format. + to mln format. * fabien/igr/mat2mln/raw2mlndata.cc: Deprecated. * fabien/igr/seg_fixed.cc: Update. 2009-04-27 Frederic Bour <bour(a)lrde.epita.fr> Add functions working on components, add proxy support for new. - * fred/mln/core/image/thrubin_morpher.hh: New. - * fred/mln/fun/component/blue.hh: New. - * fred/mln/fun/component/comp.hh: New. - * fred/mln/fun/component/green.hh: New. - * fred/mln/fun/component/red.hh: New. - * fred/mln/fun/component/rgb.hh: New. - * fred/mln/fun/component: New. - * fred/mln/fun/spe/unary.hh: Debug parameter handling. - * fred/mln/trait/fun.hh: Debug parameter handling. - * fred/mln/trait/next/solve.hh: Add proxy support. - * fred/mln/trait/next/solve_proxy.hh: New. - * fred/tests/cos.cc: Add/remove tests. - * fred/tests/fun.cc: Add/remove tests. + * fred/mln/core/image/thrubin_morpher.hh: New. + * fred/mln/fun/component/blue.hh: New. + * fred/mln/fun/component/comp.hh: New. + * fred/mln/fun/component/green.hh: New. + * fred/mln/fun/component/red.hh: New. + * fred/mln/fun/component/rgb.hh: New. + * fred/mln/fun/component: New. + * fred/mln/fun/spe/unary.hh: Debug parameter handling. + * fred/mln/trait/fun.hh: Debug parameter handling. + * fred/mln/trait/next/solve.hh: Add proxy support. + * fred/mln/trait/next/solve_proxy.hh: New. + * fred/tests/cos.cc: Add/remove tests. + * fred/tests/fun.cc: Add/remove tests. 2009-04-27 Guillaume Lazzara <lazzara(a)lrde.epita.fr> @@ -388,63 +389,65 @@ 2009-04-25 Alex Hamelin <hamelin(a)lrde.epita.fr> End of vector method, proved to be useless. - * Makefile: g++ path changed. - * cuttor.hh, - * cuttor.hxx: Debug ended and finished. - * vect_it.hh - * vect_it.hxx: Adding primitives, changing loading behavior. - * vect_it_OLD.hxx: New. - * vector.hh, - * vector.hxx: Modify the way some values are computed. + * inim/2010/blur/Makefile: g++ path changed. + * inim/2010/blur/cuttor.hh, + * inim/2010/blur/cuttor.hxx: Debug ended and finished. + * inim/2010/blur/vect_it.hh + * inim/2010/blur/vect_it.hxx: Adding primitives, changing loading + behavior. + * inim/2010/blur/vect_it_OLD.hxx: New. + * inim/2010/blur/vector.hh, + * inim/2010/blur/vector.hxx: Modify the way some values are computed. 2009-04-25 Alex Hamelin <hamelin(a)lrde.epita.fr> First version of vector cutting. - * cuttor.hh, - * cuttor.hxx: First version without debug. - * vect_it.hh, - * vect_it.hxx, - * vector.hh, - * vector.hxx: Fixes needed by the algorithm. + * inim/2010/blur/cuttor.hh, + * inim/2010/blur/cuttor.hxx: First version without debug. + * inim/2010/blur/vect_it.hh, + * inim/2010/blur/vect_it.hxx, + * inim/2010/blur/vector.hh, + * inim/2010/blur/vector.hxx: Fixes needed by the algorithm. 2009-04-24 Fabien Freling <fabien.freling(a)lrde.epita.fr> Change data type, conversion to mln dump not yet effective. * fabien/igr/mat2mln/raw2mlndata.cc: Change data type - (double -> int). + (double -> int). 2009-04-24 Fabien Freling <fabien.freling(a)lrde.epita.fr> Add binary tools for parsing of .mat files. * fabien/igr/mat2mln/mat2raw.cc: Uncompress .mat data. * fabien/igr/mat2mln/raw2mlndata.cc: Convert uncompressed .mat data - to Milena dump format. + to Milena dump format. * fabien/igr/seg_fixed.cc: Creation of edges between pixels. 2009-04-24 Alex Hamelin <hamelin(a)lrde.epita.fr> Add possibilities to Vector class. - * Makefile: Add dependancies. - * cuttor.hh, - * cuttor.hxx: Reordering and addind a function for vector search method. - * vect_it.hh: Fix typo. - * vect_it.hxx: Add comments. - * vector.hh, - * vector.hxx: Add norm, scalar and angle methods. + * inim/2010/blur/Makefile: Add dependancies. + * inim/2010/blur/cuttor.hh, + * inim/2010/blur/cuttor.hxx: Reordering and addind a function for + vector search method. + * inim/2010/blur/vect_it.hh: Fix typo. + * inim/2010/blur/vect_it.hxx: Add comments. + * inim/2010/blur/vector.hh, + * inim/2010/blur/vector.hxx: Add norm, scalar and angle methods. 2009-04-23 Alex Hamelin <hamelin(a)lrde.epita.fr> Added meta code for vector search. - * Makefile: Small fixes. - * advance_iterator.cc: Remove. - * advance_iterator.hh: Small fixes. - * advance_iterator.hxx: New. - * cuttor.hh: Small fixes. - * cuttor.hxx: Small fixes. - * vect_it.hh: New. - * vect_it.hxx: New. - * vector.hh: New. - * vector.hxx: New. + * inim/2010/blur/Makefile: Small fixes. + * inim/2010/blur/advance_iterator.cc: Remove. + * inim/2010/blur/advance_iterator.hh: Small fixes. + * inim/2010/blur/advance_iterator.hxx: New. + * inim/2010/blur/cuttor.hh: Small fixes. + * inim/2010/blur/cuttor.hxx: Small fixes. + * inim/2010/blur/vect_it.hh: New. + * inim/2010/blur/vect_it.hxx: New. + * inim/2010/blur/vector.hh: New. + * inim/2010/blur/vector.hxx: New. 2009-04-22 Edwin Carlinet <carlinet(a)lrde.epita.fr> @@ -462,16 +465,16 @@ 2009-04-21 Warren Seine <soow(a)lrde.epita.fr> inim: Implement line detection with boxes. - Does not actually output the image. - * boxes.cc: Add debug code and ugly implementation. + Does not actually output the image. + * inim/2010/boxes/boxes.cc: Add debug code and ugly implementation. 2009-04-21 Alex Hamelin <hamelin(a)lrde.epita.fr> Finder for entry point in an watersheded image. - * Makefile: Compile directly from the directory. - * cuttor.hh: Add needed include for point2d. - * cuttor.hxx: Add function to retrieve an entry for - main algorithm. + * inim/2010/blur/Makefile: Compile directly from the directory. + * inim/2010/blur/cuttor.hh: Add needed include for point2d. + * inim/2010/blur/cuttor.hxx: Add function to retrieve an entry for + main algorithm. 2009-04-21 Fabien Freling <fabien.freling(a)lrde.epita.fr> @@ -500,13 +503,12 @@ 2009-04-21 Alex Hamelin <hamelin(a)lrde.epita.fr> Start of Blur method for INIM. - * .: New. - * AUTHORS: New. - * Makefile: New. - * README: New. - * cuttor.hh: New. - * cuttor.hxx: New. - * main.cc: New. + * inim/2010/blur/AUTHORS: New. + * inim/2010/blur/Makefile: New. + * inim/2010/blur/README: New. + * inim/2010/blur/cuttor.hh: New. + * inim/2010/blur/cuttor.hxx: New. + * inim/2010/blur/main.cc: New. 2009-04-20 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -522,14 +524,14 @@ 2009-04-20 Vincent Ordy <ordy(a)lrde.epita.fr> Fix configure. - * configure: + * inim/2010/boxes/configure: Add rules to Makefile.rules without erasing the old file. 2009-04-20 Warren Seine <soow(a)lrde.epita.fr> inim: Fix configure. - * boxes/Makefile: Fix bad include. - * boxes/configure: Add test. + * inim/2010/boxes/Makefile: Fix bad include. + * inim/2010/boxes/configure: Add test. 2009-04-19 Edwin Carlinet <carlinet(a)lrde.epita.fr> @@ -547,9 +549,9 @@ * edwin/rush/exo2: New. * edwin/rush/exo2/color_internal_gradient.hh: Routine that - computes internal gradient from color image. + computes internal gradient from color image. * edwin/rush/exo2/color_labeling_mean.hh: Routine that - replaces a basin label by its mean color. + replaces a basin label by its mean color. * edwin/rush/exo2/wst_from_closing.cc: Process line. 2009-04-19 Edwin Carlinet <carlinet(a)lrde.epita.fr> @@ -695,7 +697,6 @@ 2009-04-15 Warren Seine <soow(a)lrde.epita.fr> inim: Initial commit for "boxes". - * .: New. * Makefile: New. Stolen from Edwin. * boxes.cc: New. Stolen from Theo. * configure: New. Stolen from Edwin. @@ -703,8 +704,8 @@ 2009-04-15 Warren Seine <soow(a)lrde.epita.fr> inim: Add "2010" directory. - Please add your INIM projects in subdirectories of 2010. - * inim/2010: New. + Please add your INIM projects in subdirectories of 2010. + * inim/2010/: New. 2009-04-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> @@ -722,11 +723,11 @@ Compute histograms on 3d and generic images. Still not fully working. * folio/mln/histo/compute_histo.hh: New algorithm that - computes an histogram on a generic image + computes an histogram on a generic image * folio/mln/histo/compute_histo_3d.hh: New algorithm that - computes an histogram on a 3d image. + computes an histogram on a 3d image. * folio/test/histo/compute_histo_3d.cc: New test file for the - compute_histo_3d.hh algorithm. + compute_histo_3d.hh algorithm. 2009-04-14 Edwin Carlinet <carlinet(a)lrde.epita.fr> @@ -933,7 +934,7 @@ 2009-04-05 Frederic Bour <bour(a)lrde.epita.fr> Update to our line recognition using component trees.. - * edwin/tree/test.cc: Now use weighted distance front. + * edwin/tree/test.cc: Now use weighted distance front. 2009-04-03 Fabien Freling <fabien.freling(a)lrde.epita.fr> @@ -1188,57 +1189,57 @@ Update Scribo's code. - * scribo/Makefile: add new targets. + * scribo/Makefile: Add new targets. * scribo/debug/save_linked_textbboxes_image.hh, * scribo/debug/save_table_image.hh, - * scribo/debug/save_textbboxes_image.hh: improve outputs. + * scribo/debug/save_textbboxes_image.hh: Improve outputs. - * scribo/draw/bounding_box_links.hh: draw mass centers. + * scribo/draw/bounding_box_links.hh: Draw mass centers. - * scribo/filter/small_components.hh: add an assertion. + * scribo/filter/small_components.hh: Add an assertion. * scribo/src/extract_text_double_link.cc, * scribo/src/extract_text_double_several_links.cc, * scribo/src/extract_text_multiple_links.cc, - * scribo/src/extract_text_single_link.cc: cleanup small components. + * scribo/src/extract_text_single_link.cc: Cleanup small components. * scribo/src/extract_text_several_left_links.cc, * scribo/src/extract_text_several_multiple_links, * scribo/src/rectangularity.cc, * scribo/src/table_erase.cc, * scribo/src/table_rebuild_opening.cc, - * scribo/src/table_rebuild_rank.cc: new sample code. + * scribo/src/table_rebuild_rank.cc: New sample code. * scribo/table/align_lines_horizontaly.hh, - * scribo/table/align_lines_verticaly.hh: fix compilation issues. + * scribo/table/align_lines_verticaly.hh: Fix compilation issues. - * scribo/table/erase.hh: fix traces. + * scribo/table/erase.hh: Fix traces. * scribo/table/extract.hh, * scribo/table/extract_lines_with_opening.hh, - * scribo/table/extract_lines_with_rank.hh: update prototypes. + * scribo/table/extract_lines_with_rank.hh: Update prototypes. - * scribo/table/rebuild.hh: use for_all_elements instead of + * scribo/table/rebuild.hh: Use for_all_elements instead of for_all_components. - * scribo/text/grouping/group_from_double_link.hh: fix wrong + * scribo/text/grouping/group_from_double_link.hh: Fix wrong link validation. * scribo/text/grouping/group_with_multiple_links.hh, * scribo/text/grouping/group_with_single_left_link.hh, - * scribo/text/grouping/group_with_single_right_link.hh: refactor code... + * scribo/text/grouping/group_with_single_right_link.hh: Refactor code... * scribo/text/grouping/internal/find_left_graph_link.hh, * scribo/text/grouping/internal/find_left_link.hh, - * scribo/text/grouping/internal/find_right_link.hh: ... here. + * scribo/text/grouping/internal/find_right_link.hh: ...here. - * scribo/text/grouping/internal/update_link_array.hh: fix wrong + * scribo/text/grouping/internal/update_link_array.hh: Fix wrong conditions. * scribo/text/grouping/group_with_several_left_links.hh, * scribo/text/grouping/group_with_several_multiple_links.hh, - * scribo/text/grouping/group_with_several_right_links.hh: new variants + * scribo/text/grouping/group_with_several_right_links.hh: New variants using three anchors instead of one to find the left/right neighbors. 2009-03-24 Frederic Bour <bour(a)lrde.epita.fr> @@ -1342,49 +1343,49 @@ * scribo/src/morpho.cc, * scribo/src/table_extract.cc, * scribo/src/table_rebuild.cc, - * scribo/src/thin_bboxes.cc: new sample code. + * scribo/src/thin_bboxes.cc: New sample code. - * scribo/src/table.cc: fix include. + * scribo/src/table.cc: Fix include. * scribo/table/internal/align_lines.hh, * scribo/table/align_lines_horizontaly.hh, * scribo/table/align_lines_verticaly.hh, * scribo/table/connect_horizontal_lines.hh, - * scribo/table/connect_vertical_lines.hh: add more parameters. + * scribo/table/connect_vertical_lines.hh: Add more parameters. - * scribo/table/extract.hh: new routine to extract document tables. + * scribo/table/extract.hh: New routine to extract document tables. - * scribo/table/extract_lines_with_opening.hh: new routine to extract + * scribo/table/extract_lines_with_opening.hh: New routine to extract document tables. - * scribo/table/extract_lines_with_rank.hh: fix missing bbox.enlarge. + * scribo/table/extract_lines_with_rank.hh: Fix missing bbox.enlarge. - * scribo/table/internal/connect_lines.hh: make it compile. + * scribo/table/internal/connect_lines.hh: Make it compile. - * scribo/table/internal/repair_lines.hh: make it work. + * scribo/table/internal/repair_lines.hh: Make it work. - * scribo/table/rebuild.hh: new routine to rebuild document tables. + * scribo/table/rebuild.hh: New routine to rebuild document tables. * scribo/core/erase_bboxes.hh, - * scribo/table/repair_horizontal_lines.hh: revamp. + * scribo/table/repair_horizontal_lines.hh: Revamp. * scribo/tests/filter/small_and_large_bboxes.cc, * scribo/tests/table/extract_lines_with_rank.cc, - * scribo/tests/table/repair_lines.cc: new tests. + * scribo/tests/table/repair_lines.cc: New tests. - * scribo/text/extract_lines.hh: new routine to extract text + * scribo/text/extract_lines.hh: New routine to extract text automatically. * scribo/text/grouping/internal/update_link_array.hh, - * scribo/text/grouping/internal/update_link_graph.hh: fix conditions. + * scribo/text/grouping/internal/update_link_graph.hh: Fix conditions. - * scribo/util/text.hh: new object to represent text components. + * scribo/util/text.hh: New object to represent text components. 2009-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> Add a buggy sample case. - * bugs/concept_and_assignment.cc: sample code of what should not + * bugs/concept_and_assignment.cc: Sample code of what should not be done while assigning an image to another. 2009-03-19 Fabien Freling <fabien.freling(a)lrde.epita.fr> @@ -1419,15 +1420,15 @@ 2009-03-13 Etienne FOLIO <folio(a)lrde.epita.fr> Classification of 2D images with their respective RGB histograms. - * sandbox/folio/mln/histo/classify_with_histo_rgb.hh: New + * folio/mln/histo/classify_with_histo_rgb.hh: New algorithm that classifies an image 2d with its rgb histogram. - * sandbox/folio/mln/histo/compute_histo_rgb.hh: Use component of + * folio/mln/histo/compute_histo_rgb.hh: Use component of value's trait. - * sandbox/folio/test/histo/classify_with_histo_rgb.cc: New test + * folio/test/histo/classify_with_histo_rgb.cc: New test for the classification of 2d images with their respective RGB histograms. - * sandbox/folio/test/histo/compute_histo_rgb.cc: Correct an include. - * sandbox/folio/test/histo/compute_histo_rgb_from_ppm.cc: New test + * folio/test/histo/compute_histo_rgb.cc: Correct an include. + * folio/test/histo/compute_histo_rgb_from_ppm.cc: New test for building an histogram with a ppm image. 2009-03-13 Fabien Freling <fabien.freling(a)lrde.epita.fr> @@ -1536,6 +1537,32 @@ * folio/histo/compute_histo_rgb.hh: Computes now the right dimensions of the histogram. +2009-03-13 Frederic Bour <bour(a)lrde.epita.fr> + + fun update: add unary & binary composition. + + * fred/fun/cos.hh, + * fred/fun/abs.hh: + WIP, switching from solve to nsolve. + * fred/fun/assignability.hh: New. + Traits to check function properties using sfinae (should be renamed). + * fred/fun/binary.hh: New. Binary function + * fred/fun/compose.hh: New. Compose function. + * fred/fun/composition.hh: New. + Composition result objects definition. + * fred/fun/cos.cc: New. Test for composition. + * fred/fun/fun.cc: WIP. + * fred/fun/meta_function.hh: + Added Meta_Function_v2v and Meta_Function_vv2v categories. + * fred/fun/nsolve.hh, + * fred/fun/nsolve_binary.hh, + * fred/fun/nsolve_unary.hh: New. + Original trait solver modification now based + on typename flag instead of template <class> class + * fred/fun/thru_morpher.hh: WIP. + * fred/fun/unary.hh: Update & redesign, + especially for composition. + 2009-03-12 Edwin Carlinet <carlinet(a)lrde.epita.fr> Clean and fix bugs on component trees propagation. @@ -1664,6 +1691,12 @@ * fabien/igr/watershed2d.cc: Implement 2D watershed. * fabien/igr/watershed3d.cc: Implement 3D watershed. +2009-03-09 Frederic Bour <bour(a)lrde.epita.fr> + + Add missing trait for thru_morpher. + * fred/fun/unary.hh: Add is_assignable trait, just + a workaround. + 2009-03-09 Fabien Freling <fabien.freling(a)lrde.epita.fr> Fix dicom_mask binary. @@ -1741,14 +1774,14 @@ * fabien/bin/Makefile: Makefile to compile dicom binaries. * fabien/bin/dicom2dump.cc: Binary to convert dicom to dump. * fabien/bin/dicom_mask.cc: Binary to extract simple mask - from dicom images. + from dicom images. * fabien/igr/Makefile: Update. * fabien/igr/launch2d.sh: Update. * fabien/igr/launch3d.sh: Update. * fabien/igr/seg2d.cc: Update. * fabien/igr/seg3d.cc: Update. * fabien/igr/seg_vol_irm.hh: Implement different threshold - techniques: double and deviation. + techniques: double and deviation. 2009-03-05 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -1994,14 +2027,14 @@ Update DICOM support to n dimensions. * fabien/gdcm/gdcm.cc: Update. * fabien/gdcm/load.hh: Update load support for - multidimensional DICOM. + multidimensional DICOM. 2009-02-20 Fabien Freling <fabien.freling(a)lrde.epita.fr> Update DICOM loader. * fabien/gdcm/Makefile: Update. * fabien/gdcm/dump2pgm.cc: New tool to convert dump volume - to a pgm flat image. + to a pgm flat image. * fabien/gdcm/gdcm.cc: Update. * fabien/gdcm/load.hh: Update. @@ -2097,7 +2130,7 @@ Call the n_max() function.. * fabien/igr/igr.cc: Call the n_max() function - instead of doing the computation. + instead of doing the computation. 2009-02-13 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -2116,7 +2149,7 @@ Call the fill_holes() function. * fabien/igr/igr.cc: Call the fill_holes() function - instead of doing the computation. + instead of doing the computation. 2009-02-12 Frederic Bour <bour(a)lrde.epita.fr> @@ -2147,6 +2180,14 @@ * lazzara/irm/wst_rag_hsl.cc: new. Similar code to wst_rag.cc but the graph values are computed thanks to the HSL image. +2009-02-12 Frederic Bour <bour(a)lrde.epita.fr> + + Add connected filters dispatcher (not tested).. + * fred/Makefile: . + * fred/connected_filter.hh: New. + * fred/leveling_filter.hh: . + * fred/mean.hh: . + 2009-02-11 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Cleanup pseudo-tree computation. @@ -2161,6 +2202,13 @@ Fix IGR test file for segmentation (2D & 3D). * fabien/igr/igr.cc: Fix segmentation bugs. +2009-02-11 Frederic Bour <bour(a)lrde.epita.fr> + + Wip of mean attribute set_value. + * fred/Makefile: . + * fred/mean.hh: set_value WIP. + * fred/meantest.cc: New. + 2009-02-09 Guillaume Lazzara <z(a)lrde.epita.fr> Add code to merge components thanks to a graph. @@ -2206,12 +2254,12 @@ 2009-02-10 Frederic Bour <bour(a)lrde.epita.fr> Working algebraic, wip leveling. - * milena/sandbox/fred/Makefile: . - * milena/sandbox/fred/accu_trait.hh: New. - * milena/sandbox/fred/algebraic.cc: . - * milena/sandbox/fred/closing_area.cc: New. - * milena/sandbox/fred/leveling.cc: New. - * milena/sandbox/fred/mean.hh: New. + * fred/Makefile: . + * fred/accu_trait.hh: New. + * fred/algebraic.cc: . + * fred/closing_area.cc: New. + * fred/leveling.cc: New. + * fred/mean.hh: New. 2009-02-09 Edwin Carlinet <carlinet(a)lrde.epita.fr> @@ -2235,8 +2283,8 @@ 2009-02-09 Frederic Bour <bour(a)epita.lrde.epita.fr> Added Makefile to sandbox/edwin for algebraic/lvl. - * milena/sandbox/edwin/Makefile: New. - * milena/sandbox/edwin/leveling.hh: . + * edwin/Makefile: New. + * edwin/leveling.hh: . 2009-02-09 Frederic Bour <bour(a)epita.lrde.epita.fr> @@ -2405,7 +2453,7 @@ * theo/esiee/laurent/ismm09/main.cc: Copy to... * theo/esiee/laurent/ismm09/topo_wst.cc: ...this new file. - Update. + Update. * theo/esiee/laurent/ismm09/main.cc (T, E): Remove useless typedefs. @@ -2752,7 +2800,7 @@ Work on reconstruction. * garrigues/union_find/canvas/reconstruction_on_function.hh: Remove - useless escape value. + useless escape value. * garrigues/union_find/canvas/reconstruction_on_set.hh: Optimizations. * garrigues/union_find/canvas/self_dual_reconstruction.hh: . * garrigues/union_find/images/marker_to_dilate.pbm: Fix it. @@ -2822,7 +2870,7 @@ * abraham/tests/fun/meta/red.cc: Updated. * abraham/mln/morpho/vector_median.hh: Add 2009 year. * abraham/mln/morpho/topo_wst.hh: Extract watershed method - from the big structure. + from the big structure. 2009-01-14 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -3279,7 +3327,7 @@ * abraham/mln/morpho/autarkical_leveling.hh: Update. * abraham/mln/morpho/vmt.hh: New - For test purpose. + For test purpose. * abraham/mln/morpho/vector_median.hh: Update. * abraham/mln/core/concept/meta_fun.hh: Move to trunk. * abraham/mln/math/cos.hh: Move to trunk. @@ -3312,11 +3360,11 @@ Add Autarkical Leveling, move files ot trunk. * abraham/tests/morpho/levelings.cc: New - Test for autorkical leveling. + Test for autorkical leveling. * abraham/tests/morpho/red_erosion.cc: New - Make red erosion with fun_image (not working yet). + Make red erosion with fun_image (not working yet). * abraham/tests/morpho/red_erosion3.cc: New - Make red erosion with mixin. + Make red erosion with mixin. * abraham/tests/fun/meta/red.cc: Update. * abraham/tests/core/image/fun_image_const.cc: New. * abraham/tests/core/image/fun_image_norm.cc: New. @@ -3324,12 +3372,12 @@ * abraham/tests/core/image/fun_image_v2w2v.cc: New. * abraham/tests/value/mixin.cc: Update. * abraham/mln/morpho/autarkical_leveling.hh: New - Autarkical leveling (see Golima). + Autarkical leveling (see Golima). * abraham/mln/morpho/topo_wst.hh: Update. * abraham/mln/morpho/vector_median.hh: New - Morphological operator needed for autarkical leveliing. + Morphological operator needed for autarkical leveliing. * abraham/mln/core/image/thru.hh: Move to trunk under the - name fun_image.hh. + name fun_image.hh. * abraham/mln/core/image/violent_cast_image.hh: Move to trunk. * abraham/mln/core/concept/function.hh: Move to trunk. * abraham/mln/fun/v2w2v: Move to trunk. @@ -3493,10 +3541,10 @@ [Scribo] Make use of depth first search canvas. - * sandbox/scribo/demat.hh: use depth first search canvas. + * scribo/demat.hh: use depth first search canvas. - * sandbox/scribo/photo.cc, - * sandbox/scribo/table.cc: Use a dedicated routine. + * scribo/photo.cc, + * scribo/table.cc: Use a dedicated routine. 2008-12-10 Matthieu Garrigues <garrigues(a)lrde.epita.fr> @@ -3690,9 +3738,9 @@ [Scribo] Cleanup and improve removal of unwanted components. * scribo/demat.hh: - - cleanup and refactor. - - Remove too large/small components. - - use a graph to store the text bboxes relationship. + Cleanup and refactor. + Remove too large/small components. + Use a graph to store the text bboxes relationship. 2008-11-24 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> @@ -3852,11 +3900,11 @@ Make topological watershed work. * abraham/tests/core/image/thru_v2w2v.cc: - make::image2d -> make::image. + make::image2d -> make::image. * abraham/mln/morpho/topo_wst.hh: - fix reversion of tree . + fix reversion of tree . * abraham/mln/value/shell.hh: - add traits. + add traits. 2008-11-11 Alexandre Abraham <abraham(a)lrde.epita.fr> @@ -3951,19 +3999,19 @@ Update some files and add test suite for nature. * abraham/tests/core/image/thru_v2v.cc, - abraham/tests/core/image/thru_const.cc: - make::image2d to make::image . + * abraham/tests/core/image/thru_const.cc: + make::image2d to make::image . * abraham/mln/level/transform.hh: Remove. * abraham/mln/core/image/shell.hh: Remove. * abraham/mln/fun/meta/to_enc.hh: New - Make this functor meta. + Make this functor meta. * abraham/mln/fun/v2v/rgb_to_hsi.hh: - Corrected version of rgb to hsi conversion. + Corrected version of rgb to hsi conversion. * abraham/mln/binarization/binarization.hh: Remove. * abraham/mln/transform: New. * abraham/mln/transform/fft.hh: New. * abraham/mln/value/shell.hh: - Support Function_v2v. + Support Function_v2v. * nature/histo_hsi.cc: . * nature/hom.cc: . * nature/mco.cc: . @@ -3991,7 +4039,7 @@ * garrigues/ocr/ocr_with_preprocess.cc: Cleanup. * garrigues/ocr/skeleton.hh, - garrigues/ocr/tesseract_wrap.hh: Fix typos. + garrigues/ocr/tesseract_wrap.hh: Fix typos. 2008-11-03 Guillaume Lazzara <z(a)lrde.epita.fr> @@ -4015,10 +4063,12 @@ 2008-11-03 Antoine Leblanc <leblanc(a)lrde.epita.fr> INIM binarization proof-of-concept update - * inim/binarization/proof-of-concept/configure.in: -I directive updated. - * inim/binarization/proof-of-concept/src/gradient.cc: binarization added. - * inim/binarization/proof-of-concept/src/util.hxx: colors inverted in - order to respect object/background usual values. + * inim/binarization/proof-of-concept/configure.in: -I directive + updated. + * inim/binarization/proof-of-concept/src/gradient.cc: binarization + added. + * inim/binarization/proof-of-concept/src/util.hxx: colors inverted + in order to respect object/background usual values. 2008-11-03 Nicolas Ballas <ballas(a)lrde.epita.fr> @@ -4095,13 +4145,13 @@ Cleanup OCR preprocessing. * garrigues/ocr/ocr_with_preprocess.cc, - garrigues/ocr/ocr_without_preprocess.cc: Cleanup the call to - tesseract. + * garrigues/ocr/ocr_without_preprocess.cc: Cleanup the call to + tesseract. * garrigues/ocr/tesseract_wrap.hh: New. - Provide a Tesseract wrapper which is also able to compute an - approximate confidence value of the recognition based on tesseract - internal data. + Provide a Tesseract wrapper which is also able to compute an + approximate confidence value of the recognition based on tesseract + internal data. 2008-11-01 Maxime van Noppen <yabo(a)lrde.epita.fr> @@ -4175,8 +4225,8 @@ Add snake_2d. * inim/binarization/snake_2d.hh: New, The snake_2d function takes an - accumulator, an image and a window and return the ouput image of - the accumulator applies on the input image. + accumulator, an image and a window and return the ouput image of + the accumulator applies on the input image. * inim/binarization: New. * inim: New. @@ -4192,9 +4242,9 @@ Add co-occurence matrix computing. * nature/co_occurence.hh: New - (mln::co_occurence) : compute co-occurence matrix. + (mln::co_occurence) : compute co-occurence matrix. * nature/mco.cc: New - Dummy test. + Dummy test. 2008-10-30 Jimmy Ma <jimmy.ma(a)lrde.epita.fr> @@ -4222,7 +4272,7 @@ Make shell a value. * abraham/mln/value/shell.hh: New - mln::value::shell is now a value. + mln::value::shell is now a value. * abraham/mln/core/image/thru.hh: change namespace of shell. 2008-10-30 Guillaume Lazzara <z(a)lrde.epita.fr> @@ -4285,43 +4335,43 @@ * abraham/mln/trait: New. * abraham/mln/trait/images.hh: New - (mln::trait::default_image_morpher) : Adjust quant according - to new value quant.. + (mln::trait::default_image_morpher) : Adjust quant according + to new value quant.. * abraham/mln/morpho/hit_or_miss.hh: New - (mln::morpho::hit_or_miss) : First implementation of hit or - miss algorithm. + (mln::morpho::hit_or_miss) : First implementation of hit or + miss algorithm. * abraham/mln/level/transform.hh: New - (mln::level::transform) : Add procedure. + (mln::level::transform) : Add procedure. * abraham/mln/core/image/thru.hh: - Temporary trait modification. + Temporary trait modification. * abraham/mln/core/image/shell.hh: - Add include of function.hh. + Add include of function.hh. * abraham/mln/fun/meta/hue.hh: New - Allow direct access to hue. + Allow direct access to hue. * abraham/mln/fun/meta/inty.hh: New - Allow direct access to intensity.. + Allow direct access to intensity.. * abraham/mln/fun/meta/sat.hh: New - Allow direct access to saturation.. + Allow direct access to saturation.. * abraham/mln/fun/v2v: New. * abraham/mln/fun/v2v/rgb_to_hsi.hh: New - Fix wrong conversion formula. + Fix wrong conversion formula. * abraham/mln/binarization: New. * abraham/mln/binarization/binarization.hh: New - Fix call to level::transform procedure (output must be empty). + Fix call to level::transform procedure (output must be empty). * abraham/mln/value: New. * abraham/mln/value/builtin: New. * abraham/mln/value/builtin/symbolics.hh: New - Add min and max for bool traits. + Add min and max for bool traits. * nature/erosion.cc: New - Test of erosion filter. + Test of erosion filter. * nature/gradient.cc: New - Test of gradient filter. + Test of gradient filter. * nature/histo_hsi.cc: New - Decompose image in hsi format. + Decompose image in hsi format. * nature/hom.cc: New - First hit or miss test. + First hit or miss test. * nature/opening.cc: New - Test of opening filter. + Test of opening filter. * nature/Makefile: New. 2008-10-29 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -4334,7 +4384,7 @@ Update OCR preprocessing. * garrigues/ocr/ocr_with_preprocess.cc: Apply gaussian blur and - naive thresholding. + naive thresholding. 2008-10-28 Maxime van Noppen <yabo(a)lrde.epita.fr> @@ -4391,9 +4441,9 @@ Use more routines provided by Olena. * scribo/demat.hh: Use more routines provided by Olena: - - not_inplace - - level::convert - - box::center() + - not_inplace + - level::convert + - box::center() * scribo/main.cc: Update usage. @@ -4402,7 +4452,7 @@ Update classification. * classif/iccvg04.cc: Swap filtering and reverting so that - lambda is more intuitive. + lambda is more intuitive. 2008-10-27 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> @@ -4419,8 +4469,8 @@ * abraham/mln/core/image/thru.hh: . * abraham/mln/core/image/shell.hh: Fix result value. * abraham/mln/core/concept/meta_fun.hh: - (mln::meta::impl) : now templated by return type - (necessary to typedef result). + (mln::meta::impl) : now templated by return type (necessary to + typedef result). * abraham/mln/fun/meta/red.hh: . 2008-10-27 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> @@ -4473,44 +4523,44 @@ Add bijective functors, 2-way functors and meta-fun. * abraham/tests/morpho/test_component_tree.cc: Remove - This test was outdated. + This test was outdated. * abraham/tests/morpho/test_watershed.cc: - Clean. + Clean. * abraham/tests/morpho/test_watershed_topo.cc: - Clean. + Clean. * abraham/tests/fun/meta: New. * abraham/tests/fun/meta/red.cc: New - (mln::meta::red) : meta function to access red in rgb. + (mln::meta::red) : meta function to access red in rgb. * abraham/tests/core/image/thru_norm.cc: New - test for norm functor. + test for norm functor. * abraham/tests/core/image/thru_v2v.cc: New - test for abs functor. + test for abs functor. * abraham/tests/core/image/thru.cc: Remove. * abraham/tests/core/image/thru_const.cc: New - test of writing in a const image. + test of writing in a const image. * abraham/tests/core/image/thru_v2w2v.cc: New - test for cosinus functor. + test for cosinus functor. * abraham/tests/core/concept: New. * abraham/tests/core/concept/test.cc: New. * abraham/mln/morpho/najman_wst.hh: New - M-W watershed. + M-W watershed. * abraham/mln/morpho/basic_najman.hh: - Obsolete, will eventually be removed. + Obsolete, will eventually be removed. * abraham/mln/morpho/topo_wst.hh: New - 1 pass topological watershed. + 1 pass topological watershed. * abraham/mln/core/image/thru.hh: - (mln::thru): see an image throught a function. + (mln::thru): see an image throught a function. * abraham/mln/core/image/shell.hh: New - (mln::shell): value shell. + (mln::shell): value shell. * abraham/mln/core/concept/function.hh: - Add bijective and 2-way function. + Add bijective and 2-way function. * abraham/mln/core/concept/meta_fun.hh: New - Add concept for meta function. + Add concept for meta function. * abraham/mln/fun/meta: New. * abraham/mln/fun/meta/red.hh: New - red fun object. + red fun object. * abraham/mln/fun/v2w_w2v/norm.hh: - 2-way functor. + 2-way functor. * vigouroux/tests.cc: Rename image_if_value > image_if. * vigouroux/color/rgb_to_cmy.hh: Rename image_if_value > image_if. * vigouroux/color/rgb_to_xyz.hh: Rename image_if_value > image_if. @@ -4527,18 +4577,18 @@ Fix the skeleton algorithm introduced by aroumougame. * garrigues/ocr/skeleton.cc, - garrigues/ocr/skeleton.hh: New. - The code has been updated to work with the current version of - milena. However, the code itself has to be cleaned and improved. + * garrigues/ocr/skeleton.hh: New. + The code has been updated to work with the current version of + milena. However, the code itself has to be cleaned and improved. 2008-10-24 Jimmy Ma <jimmy.ma(a)lrde.epita.fr> Update OCR using tesseract. * garrigues/ocr/enlarge.hh: New. - New enlargement algorithm better than the naive resize. + New enlargement algorithm better than the naive resize. * garrigues/ocr/ocr.cc: Provide sample code to link milena against - tesseract. + tesseract. 2008-10-23 Guillaume Lazzara <z(a)lrde.epita.fr> @@ -4603,8 +4653,8 @@ Fix bad deletion of small components. * scribo/demat.hh: - - Correctly relabel. - - Correctly erase components. + Correctly relabel. + Correctly erase components. 2008-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> @@ -4613,9 +4663,9 @@ * scribo/main.cc: Change usage message. * scribo/demat.hh: - - Cleanup. - - Remove too small components using level::transform. - - Support text bboxes extraction. + Cleanup. + Remove too small components using level::transform. + Support text bboxes extraction. 2008-10-21 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> @@ -4646,14 +4696,14 @@ Get and display character bboxes. - * sandbox/scribo/demat.hh: update. + * scribo/demat.hh: update. Does not create text bboxes yet. 2008-10-15 Guillaume Lazzara <z(a)lrde.epita.fr> Update the prototype of labeling::compute(). - * sandbox/scribo/demat.hh: update according the new + * scribo/demat.hh: update according the new prototype. 2008-10-15 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> @@ -4704,33 +4754,33 @@ Add different types of function and tests. - + abraham/tests/fun: New. - + abraham/tests/fun/v2w2v: New - Bijective function. - + abraham/tests/fun/v2w2v/cos.cc: New - Bijective functor cosinus. - + abraham/tests/fun/v2w_w2v: New - Two way function. - + abraham/tests/fun/v2w_w2v/norm.cc: New - Two way functor norm. - + abraham/tests/core: New. - + abraham/tests/core/image: New. - + abraham/tests/core/image/violent_cast_image.cc: New - Dummy test. - + abraham/tests/core/image/thru.cc: New - Dummy test. - + abraham/mln/level: New. - + abraham/mln/level/thru.hh: New. - + abraham/mln/core/site_set: New. - + abraham/mln/core/site_set/p_priority_queue.hh: New - Useful for Watershed. - + abraham/mln/core/image: New. - + abraham/mln/core/image/violent_cast_image.hh: New - Allow to cast an image violently. + * abraham/tests/fun: New. + * abraham/tests/fun/v2w2v: New + Bijective function. + * abraham/tests/fun/v2w2v/cos.cc: New + Bijective functor cosinus. + * abraham/tests/fun/v2w_w2v: New + Two way function. + * abraham/tests/fun/v2w_w2v/norm.cc: New + Two way functor norm. + * abraham/tests/core: New. + * abraham/tests/core/image: New. + * abraham/tests/core/image/violent_cast_image.cc: New + Dummy test. + * abraham/tests/core/image/thru.cc: New + Dummy test. + * abraham/mln/level: New. + * abraham/mln/level/thru.hh: New. + * abraham/mln/core/site_set: New. + * abraham/mln/core/site_set/p_priority_queue.hh: New + Useful for Watershed. + * abraham/mln/core/image: New. + * abraham/mln/core/image/violent_cast_image.hh: New + Allow to cast an image violently. * abraham/mln/core/concept/function.hh: - Add bijective and two ways function concepts. + Add bijective and two ways function concepts. * abraham/mln/fun/v2w_w2v/norm.hh: - Add invert functions. + Add invert functions. 2008-10-09 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -4762,29 +4812,29 @@ * abraham/mln/fun: New. * abraham/mln/fun/v2w2v: New. * abraham/mln/fun/v2w2v/cos.hh: New - Example of bijective function using cosinus. + Example of bijective function using cosinus. * abraham/mln/fun/v2w_w2v: New. * abraham/mln/fun/v2w_w2v/norm.hh: New - Example of 2 way function using norm. + Example of 2 way function using norm. * abraham/mln/core: New. * abraham/mln/core/concept: New. * abraham/mln/core/concept/function.hh: New - Definition of bijective and 2 way function concepts - (Function_v2w2v and Function_v2w_w2v). + Definition of bijective and 2 way function concepts + (Function_v2w2v and Function_v2w_w2v). * abraham/mln/math: New. * abraham/mln/math/cos.hh: New - templated mln::math::cos function. + templated mln::math::cos function. * abraham/mln/math/acos.hh: New - templated mln::math::acos function. + templated mln::math::acos function. 2008-10-06 Alexandre Abraham <abraham(a)lrde.epita.fr> Huge cleanup, remove useless code and improve genericity. * abraham/mln/morpho/basic_najman.hh: - Remove useless code, - Remove useless incrementations, - Introduce sites. + Remove useless code, + Remove useless incrementations, + Introduce sites. 2008-10-01 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> @@ -5744,7 +5794,7 @@ * jardonnet/test/icp.cc: clean up. * jardonnet/test/Makefile: Update. * jardonnet/registration/final_qk.hh: Put final_qk functions in a - dedicated file. + dedicated file. * jardonnet/registration/tools.hh: Add buffer and shuffle. * jardonnet/registration/icp.hh: Minor fix. @@ -5860,10 +5910,10 @@ Add values of literals. * literal/brown.hh, literal/lime.hh, - literal/magenta.hh, literal/orange.hh, - literal/pink.hh, literal/purple.hh, - literal/teal.hh, literal/violet.hh, - literal/yellow.hh: Add values. + literal/magenta.hh, literal/orange.hh, + literal/pink.hh, literal/purple.hh, + literal/teal.hh, literal/violet.hh, + literal/yellow.hh: Add values. 2008-05-07 Caroline Vigouroux <vigour_c(a)epita.fr> @@ -6226,7 +6276,7 @@ * jardonnet/test/Makefile: Add rules. * jardonnet/TODO: Update. * jardonnet/registration/interpolation.hh: give coef of the - interpolated polynome. + interpolated polynome. * jardonnet/registration/quat7.hh: Update interface */-+. * jardonnet/registration/cloud.hh: Update center. * jardonnet/registration/icp.hh: Add Optimization on qk. @@ -6300,14 +6350,14 @@ Sandbox: ICP: Add multi-scale registration. * jardonnet/test/icp.cc: Add nb_it as argument for a - registration. + registration. * jardonnet/test/Makefile: Remove icp_lazy test. Add parameter for multi-scale icp: * jardonnet/registration/tools.hh: Update. * jardonnet/registration/quat7.hh: Use virtual length (c_length) - for p_array. + for p_array. * jardonnet/registration/cloud.hh: Use virtual length. * jardonnet/registration/icp.hh: Use virtual length. @@ -6338,19 +6388,19 @@ * jardonnet/test/icp.cc: Fix regression (output registred.pbm). * jardonnet/registration/tools.hh: - Add multiple 2d to 3d and 3d to 2d conversion . + Add multiple 2d to 3d and 3d to 2d conversion . * jardonnet/registration/quat7.hh: Rewrite Covariance matrix computation. * jardonnet/registration/frankel_young.hh: - New, resolve linear equation Ax = b. Useless for icp. + New, resolve linear equation Ax = b. Useless for icp. * jardonnet/registration/power_it.hh: Find greatest eigen value, should be more efficient than jacobi ?. * jardonnet/registration/icp.hh: - Add intermediate image outputs. + Add intermediate image outputs. 2008-04-07 Etienne FOLIO <folio(a)lrde.epita.fr> @@ -6381,14 +6431,14 @@ * jardonnet/test/Makefile: Add rules for the lazy version. * jardonnet/registration/icp_map.hh: - New dedicated version to map. + New dedicated version to map. * jardonnet/registration/icp_lazy.hh: - Rename lazy_map as lazy_image. Improve implementation. + Rename lazy_map as lazy_image. Improve implementation. * jardonnet/registration/icp.hh (icp_): Refactoring. * jardonnet/registration/projection.hh (memo): - Make a projection using the new lazy_image interface. + Make a projection using the new lazy_image interface. * jardonnet/registration/tools.hh (c_point): Add functor. @@ -6636,7 +6686,7 @@ * pellegrin/set/core/p_runs.hh, * pellegrin/set/core/p_set.hh, * pellegrin/set/core/pset_if.hh: Modify an #include and add a - semi-colon after the trait struct. + semi-colon after the trait struct. * pellegrin/set/multi_set.hh: Remove. * pellegrin/set/test: New folder containing tests. * pellegrin/set/test/Makefile, @@ -6692,7 +6742,7 @@ * pellegrin/set/core/p_queue_fast.hh, * pellegrin/set/core/p_set.hh, * pellegrin/set/core/pset_if.hh: traits are up-to-date - (or not, i have to check it with theo) and add the fwd decls. + (or not, i have to check it with theo) and add the fwd decls. * pellegrin/set/core/p_run.hh: New. * pellegrin/set/core/p_runs.hh: New. * pellegrin/set/core/runs_psite.hh: Remove (not a point_set). @@ -7083,7 +7133,7 @@ * pellegrin/cond_inheritance/internal/point_set_base.hh: New. * pellegrin/cond_inheritance/internal/uni_set.hh: New. * pellegrin/cond_inheritance/p_array.hh: Definition of a - p_array. + p_array. * pellegrin/cond_inheritance/p_set.hh: Definition of a p_set. * pellegrin/cond_inheritance/test_cond_inherit.cc: Test file. @@ -7334,11 +7384,11 @@ * garrigues/fllt_optimized.hh: Update. * garrigues/fllt_types.hh: New, types used in FLLT. * garrigues/level_set.hh: New, compute lower/upper level set - algorithm + algorithm * garrigues/lower.hh: New, informations about how to compute - the lower level set. + the lower level set. * garrigues/upper.hh: New, informations about how to compute - the lower level set. + the lower level set. * garrigues/test_fllt12.cc: Cleaning, (fllt2.hh) replaced by... (fllt_optimized.hh) ...this. @@ -7465,12 +7515,12 @@ Choice a good root of the merged tree in FLLT. * garrigues/fllt2.hh: (merge_trees) Choose a good root between - the upper tree's one and the lower tree's one in order to keep the - good values of the input image. - (fllt) add a second call to merge_trees to test the contrast - invariant of the algorithm. FIXME : In some test, we get a segv when - calling merge_trees swapping the upper_tree and lower_tree - arguments. Add some debug too. + the upper tree's one and the lower tree's one in order to keep the + good values of the input image. + (fllt) add a second call to merge_trees to test the contrast + invariant of the algorithm. FIXME : In some test, we get a segv when + calling merge_trees swapping the upper_tree and lower_tree + arguments. Add some debug too. Update include of test_fllt4 @@ -7485,14 +7535,14 @@ * garrigues/test_fllt2.cc, * garrigues/test_fllt3.cc, * garrigues/test_fllt_tiny.cc: likewise, Update include to - test fllt2.hh. + test fllt2.hh. 2007-11-05 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Start a second version of merging trees in FLLT. * garrigues/fllt2.hh: New, looks like fllt.hh but differs in - merge trees. We keep the old file fllt.hh to avoid regression. + merge trees. We keep the old file fllt.hh to avoid regression. 2007-11-05 Matthieu Garrigues <garrigues(a)lrde.epita.fr> @@ -7504,7 +7554,7 @@ * garrigues/test_fllt9.cc: New, * garrigues/test_fllt_lena.cc: New, * garrigues/test_fllt_lena_tiles.cc: New, test FLLT with - differents 2d images. + differents 2d images. 2007-11-05 Simon Nivault <simon.nivault(a)lrde.epita.fr> @@ -7608,7 +7658,7 @@ * garrigues/test_fllt4.cc, * garrigues/test_fllt5.cc, * garrigues/test_fllt_tiny.cc: New, differents cases of tests - for fllt. + for fllt. 2007-10-26 Matthieu Garrigues <garrigues(a)lrde.epita.fr> @@ -7636,8 +7686,8 @@ Update fllt. * garrigues/fllt.hh: (border_neighb and region_neighb) Rename - as... - (border_neighb and region_neighb) ...this. + as... + (border_neighb and region_neighb) ...this. 2007-10-24 Matthieu Garrigues <garrigues(a)lrde.epita.fr> diff --git a/swilena/ChangeLog b/swilena/ChangeLog index a3db9bc..87a4b3f 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -251,15 +251,15 @@ Revive Swilena. - * swilena/image2d.i: New SWIG wrapper. - * swilena/run.in: New helper, imported from TC. - * swilena/Makefile.am: New. - * swilena/run.mk: New, imported from TC and adjusted. - - * swilena/python/: New directory. - * swilena/python/ltihooks.py: New, imported. - * swilena/python/test.py: New test. - * swilena/python/Makefile.am: New. + * image2d.i: New SWIG wrapper. + * run.in: New helper, imported from TC. + * Makefile.am: New. + * run.mk: New, imported from TC and adjusted. + + * python/: New directory. + * python/ltihooks.py: New, imported. + * python/test.py: New test. + * python/Makefile.am: New. $Rev$ -- 1.6.1.2

1 0

r3800: Move inim project to sandbox/inim
by Edwin Carlinet 15 May '09

15 May '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-05-15 Edwin Carlinet <carlinet(a)lrde.epita.fr> Move inim project to sandbox/inim. * edwin/inim/Makefile: Remove. * edwin/inim/inim.cc: Remove. * inim/2011/fredwin/Makefile: New. * inim/2011/fredwin/configure: New. * inim/2011/fredwin/inim.cc: New. --- trunk/milena/sandbox/inim/2011/fredwin/Makefile | 37 +++ trunk/milena/sandbox/inim/2011/fredwin/configure | 21 + trunk/milena/sandbox/inim/2011/fredwin/inim.cc | 273 +++++++++++++++++++++++ 3 files changed, 331 insertions(+) Index: trunk/milena/sandbox/inim/2011/fredwin/inim.cc =================================================================== --- trunk/milena/sandbox/inim/2011/fredwin/inim.cc (revision 0) +++ trunk/milena/sandbox/inim/2011/fredwin/inim.cc (revision 3800) @@ -0,0 +1,273 @@ +/* mln core */ +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image_if.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/w_window2d_int.hh> +#include <mln/core/routine/duplicate.hh> +#include <mln/core/var.hh> + +/* mln value */ +#include <mln/value/int_u8.hh> +#include <mln/value/int_u16.hh> + +/* Site set */ +#include <mln/core/site_set/p_array.hh> +#include <mln/level/sort_psites.hh> + +/* Component trees */ +#include <mln/morpho/tree/data.hh> +#include <mln/morpho/tree/compute_attribute_image.hh> +#include <mln/morpho/tree/propagate.hh> +#include <mln/morpho/tree/components.hh> +#include <mln/morpho/tree/filter.hh> + +/* Attributes */ +#include <mln/transform/distance_front.hh> +#include <mln/morpho/attribute/bbox.hh> +#include <mln/morpho/attribute/card.hh> +#include <mln/morpho/attribute/height.hh> +#include <mln/make/w_window2d_int.hh> + +/* io */ +#include <mln/io/pbm/load.hh> +#include <mln/io/pgm/save.hh> +#include <mln/io/ppm/save.hh> + +/* data & pw */ +#include <mln/core/concept/function.hh> +#include <mln/fun/p2v/ternary.hh> +#include <mln/data/fill.hh> +#include <mln/data/paste.hh> +#include <mln/pw/all.hh> + +/* labeling */ +#include <mln/level/stretch.hh> +#include <mln/value/label_8.hh> +#include <mln/labeling/blobs.hh> +#include <mln/labeling/colorize.hh> + +/* Draw debug */ +#include <mln/draw/box.hh> +#include <mln/literal/colors.hh> +#include <mln/level/convert.hh> + +/* std */ +#include <string> +#include <iostream> +#include <cmath> + +bool mydebug = false; + +void usage(char** argv) +{ + std::cerr << "usage: " << argv[0] << " input [--debug] [-n nbr_components | -t treshold] [-h height]" << std::endl; + abort(); +} + +void dsp(const std::string& str) +{ + std::cout << std::endl + << "*********************" << std::endl + << "** " << str << std::endl + << "*********************" << std::endl; +} + +template <typename P2V, typename G> +struct ratio_ : public mln::Function_p2v< ratio_<P2V, G> > +{ + typedef double result; + + ratio_(const P2V& f, const G& g) : + f_ (f), g_ (g) + { + } + + template <typename P> + double operator() (const P& p) const + { + mln_VAR(box, f_(p)); + double a = (double) (box.len(1)) / (double)(box.len(0)); + return a * std::log(g_(p)); + } + +protected: + const P2V& f_; + const G& g_; +}; + +template <typename P2V, typename G> +ratio_<P2V, G> ratio(const mln::Function_p2v<P2V>& f, const mln::Function_p2v<G>& g) +{ + return ratio_<P2V, G>(exact(f), exact(g)); +} + + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + using value::int_u16; + + std::string arg; + unsigned nb_components = 0; + unsigned height = 15; + double treshold = 0; + + if (argc < 2) + usage(argv); + + for (int i = 2; i < argc; i++) + { + arg = std::string(argv[i]); + if (arg == "--debug") + mydebug = true; + else if (arg == "-n" && i != argc) + nb_components = atoi(argv[++i]); + else if (arg == "-t" && i != argc) + treshold = atof(argv[++i]); + else if (arg == "-h" && i != argc) + height = atoi(argv[++i]); + else if (arg == "--trace") + trace::quiet = false; + else + usage (argv); + } + + + /* Image loadin' */ + typedef image2d<int_u8> I; + + image2d<bool> input_; + io::pbm::load(input_, argv[1]); + + if (mydebug) { + dsp("Distance geodesic"); + } + + /* Work on geodesic distance image */ + I input; + { + const int weights[9] = + { 10, 9, 10, + 1, 0, 1, + 10, 9, 10 }; + + w_window2d_int win; + mln::convert::from_to(weights, win); + input = transform::distance_front(input_, c8(), win, mln_max(int_u8)); + } + + if (mydebug) { + dsp("Component tree computation"); + } + + /* Component tree creation */ + typedef p_array< mln_site_(I) > S; + typedef morpho::tree::data<I,S> tree_t; + + S sorted_sites = level::sort_psites_decreasing(input); + tree_t tree(input, sorted_sites, c4()); + + + if (mydebug) { + dsp("Attribute image computation"); + } + + /* Compute Attribute On Image */ + typedef morpho::attribute::bbox bbox_t; + typedef morpho::attribute::card card_t; + typedef morpho::attribute::height height_t; + typedef mln_ch_value_(I, double) A; + + mln_VAR(attr_image, morpho::tree::compute_attribute_image(bbox_t (), tree)); + mln_VAR(card_image, morpho::tree::compute_attribute_image(card_t (), tree)); + mln_VAR(height_image, morpho::tree::compute_attribute_image(height_t (), tree)); + + A a = duplicate(ratio(pw::value(attr_image), pw::value(card_image)) | attr_image.domain()); + + if (height) + morpho::tree::filter::filter(tree, a, pw::value(height_image) > pw::cst(height), 0.0); + + /* Run max accumulator */ + p_array< mln_psite_(A) > obj_array; // Array of object components. + + if (mydebug) { + std::stringstream s("Run max accumulator, look for ", + std::stringstream::out|std::stringstream::in| + std::stringstream::ate); + if (nb_components) + s << nb_components << " components."; + else if (treshold) + s << "components whose treshold > " << treshold; + else + s << "components util leaves are glutted"; + dsp(s.str()); + } + + if (nb_components) { + obj_array = morpho::tree::get_components(tree, a, nb_components); + } else if (treshold > 0) { + mln_VAR(predicate, pw::value(a) > pw::cst(treshold)); + obj_array = morpho::tree::get_components(tree, a, predicate); + } else { + obj_array = morpho::tree::get_components(tree, a); + } + + /* Print them */ + if (mydebug) { + dsp("Image Filtered Components"); + mln_fwd_piter_(p_array< mln_psite_(I) >) c(obj_array); + for_all(c) + std::cout << c; + } + + + if (mydebug) { + dsp("Create mask and propagate"); + } + + /* Now Back Propagate to component */ + typedef mln_ch_value_(I, bool) M; + M mask = morpho::tree::set_value_to_components(tree, obj_array, true, false); + + a = morpho::tree::propagate_components(a, tree, obj_array, 0); + + /* Labeling */ + typedef mln_ch_value_(I, value::label<8>) L; + typedef mln_ch_value_(I, value::rgb<8>) O; + value::label_8 nlabel; + L label = labeling::blobs(mask, c4(), nlabel); + O output = labeling::colorize(value::rgb8(), label, nlabel); + if (mydebug) + io::ppm::save(output, "label.pgm"); + + /* Now store output image image */ + O out, distance; + initialize(out, input); + distance = level::convert(value::rgb8 (), input); + data::fill(out, literal::black_t()); + data::paste(output | pw::value(input_), out); + + { + mln_piter_(p_array<mln_psite_(I)>) it(obj_array); + for_all(it) + { + std::cout << it << " :: " << attr_image(it).pmin() << " -> " << a(it) + << " (h: " << height_image(it) << ")" + << std::endl; + + draw::box(out, attr_image(it), literal::red_t ()); + draw::box(distance, attr_image(it), literal::red_t ()); + } + } + + if (mydebug) { + dsp("Mask input"); + } + + io::ppm::save(distance, "distance.pgm"); + io::ppm::save(out, "output.pgm"); +} Property changes on: trunk/milena/sandbox/inim/2011/fredwin/inim.cc ___________________________________________________________________ Added: svn:mergeinfo Index: trunk/milena/sandbox/inim/2011/fredwin/configure =================================================================== --- trunk/milena/sandbox/inim/2011/fredwin/configure (revision 0) +++ trunk/milena/sandbox/inim/2011/fredwin/configure (revision 3800) @@ -0,0 +1,21 @@ +#! /bin/bash + +for arg in "$@"; do + if [ "$arg" == "--debug" ]; then + debug=1; + elif [ "$arg" == "--release" ]; then + release=1; + elif [ "${arg#--mln_dir=}" ]; then + MLN_DIR=${arg#--mln_dir=} + fi +done + +rm -f makefile.rules +touch makefile.rules +if [ "$debug" ]; then + echo 'DEBUG = 1' >> makefile.rules +fi +if [ "$release" ]; then + echo 'RELEASE = 1' >> makefile.rules +fi +echo "MLN_DIR = $MLN_DIR" >> makefile.rules \ No newline at end of file Property changes on: trunk/milena/sandbox/inim/2011/fredwin/configure ___________________________________________________________________ Added: svn:executable + * Index: trunk/milena/sandbox/inim/2011/fredwin/Makefile =================================================================== --- trunk/milena/sandbox/inim/2011/fredwin/Makefile (revision 0) +++ trunk/milena/sandbox/inim/2011/fredwin/Makefile (revision 3800) @@ -0,0 +1,37 @@ +include makefile.rules +TARGET=inim + +inim_SRC=inim.cc +inim_OBJS=${inim_SRC:.cc=.o} + +OLENADIR=$(MLN_DIR)/.. +MILENADIR=$(OLENADIR)/milena + +CXXFLAGS=-I$(MILENADIR) -I$(MILENADIR)/sandbox/edwin -W -Wall + + +CXXFLAGS += $(if $(DEBUG), -g -ggdb, -DNDEBUG\ + $(if $(RELEASE), -O3, -O1)) + +CXX=g++ +LD=g++ +LDFLAGS= + +all: $(TARGET) + + +$(TARGET): $($(TARGET)_OBJS) $($(TARGET)_SRC) + $(LD) $(LDFLAGS) -o $@ $($(TARGET)_OBJS) + +%.o: %.cc + $(CXX) $(CXXFLAGS) -c $< + + +depend: + makedepend -- $(CXXFLAGS) -- -v $($(TARGET)_SRC) + +clean: + rm -f *.o $(TARGET) + #rm -f *.pbm + #find -name "*.pgm" \! -regex ".*/affiche2?.pgm" -delete +# DO NOT DELETE Property changes on: trunk/milena/sandbox/inim/2011/fredwin/Makefile ___________________________________________________________________ Added: svn:mergeinfo Index: trunk/milena/sandbox/edwin/inim/inim.cc (deleted) =================================================================== Index: trunk/milena/sandbox/edwin/inim/Makefile (deleted) ===================================================================

1 0

r3799: Inim fix bugs related to word croping
by Edwin Carlinet 15 May '09

15 May '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-05-15 Edwin Carlinet <carlinet(a)lrde.epita.fr> Inim fix bugs related to word croping. * edwin/inim/inim.cc: Add height closing to avoid word to be cropped. * edwin/mln/morpho/tree/filter.hh: Add generic filter to replace filtered components by a user value instead of predefined values. * edwin/rush/exo2/test.cc: Minor fixes. * edwin/rush/exo2/wst_from_tree.cc: Test corrected sharpness with wst. * inim/2011/fredwin: New. --- inim/inim.cc | 62 +++++++++++++++++++++------------------------ mln/morpho/tree/filter.hh | 33 +++++++++++++++++++++++ rush/exo2/test.cc | 29 ++++++++++----------- rush/exo2/wst_from_tree.cc | 42 +++++++++++++++++++++++------- 4 files changed, 109 insertions(+), 57 deletions(-) Index: trunk/milena/sandbox/edwin/rush/exo2/Makefile (deleted) =================================================================== Index: trunk/milena/sandbox/edwin/rush/exo2/test.cc =================================================================== --- trunk/milena/sandbox/edwin/rush/exo2/test.cc (revision 3798) +++ trunk/milena/sandbox/edwin/rush/exo2/test.cc (revision 3799) @@ -1,6 +1,7 @@ #include <mln/morpho/attribute/volume.hh> #include <mln/morpho/attribute/height.hh> -#include <mln/morpho/attribute/sharpness.hh> +#include <mln/morpho/attribute/mysharpness.hh> + #include <mln/morpho/tree/data.hh> #include <mln/morpho/tree/compute_attribute_image.hh> #include <mln/level/sort_psites.hh> @@ -12,8 +13,8 @@ #include <mln/core/alias/neighb1d.hh> #include <mln/value/int_u8.hh> -#include "../../tree/components.hh" -#include "../../tree/propagate.hh" +#include <mln/morpho/tree/components.hh> +#include <mln/morpho/tree/propagate.hh> #include <mln/fun/p2v/ternary.hh> #include <mln/pw/all.hh> @@ -104,28 +105,28 @@ { typedef mln_ch_value_(I, double) A; - typedef morpho::attribute::sharpness attribute_t; A a, component_img; // Attribute Pruning - a = morpho::tree::compute_attribute_image(attribute_t (), t); + a = morpho::attribute::mysharpness(t); + morpho::tree::propagate_representative(t, a); debug::println("sharpness", a); // Component filtering - a = duplicate((fun::p2v::ternary(pw::value(height) > pw::cst(2), - pw::value(a), - pw::cst(0.0))) | a.domain()); + // a = duplicate((fun::p2v::ternary(pw::value(height) > pw::cst(2), +// pw::value(a), +// pw::cst(0.0))) | a.domain()); - debug::println("sharpness", a); + //debug::println("sharpness", a); - p_array< mln_psite_(A) > obj_array; - obj_array = morpho::tree::get_components(t, a); - std::cout << obj_array.nsites() << std::endl; +// p_array< mln_psite_(A) > obj_array; +// obj_array = morpho::tree::get_components(t, a); +// std::cout << obj_array.nsites() << std::endl; - component_img = morpho::tree::propagate_components(a, t, obj_array, 0); +// component_img = morpho::tree::propagate_components(a, t, obj_array, 0); - debug::println("sharpness", component_img); +// debug::println("sharpness", component_img); } Index: trunk/milena/sandbox/edwin/rush/exo2/wst_from_tree.cc =================================================================== --- trunk/milena/sandbox/edwin/rush/exo2/wst_from_tree.cc (revision 3798) +++ trunk/milena/sandbox/edwin/rush/exo2/wst_from_tree.cc (revision 3799) @@ -53,11 +53,12 @@ /* Tree computation */ #include <mln/level/sort_psites.hh> #include <mln/morpho/tree/data.hh> -#include "../../tree/propagate.hh" -#include "../../tree/components.hh" +#include <mln/morpho/tree/propagate.hh> +#include <mln/morpho/tree/propagate_if.hh> +#include <mln/morpho/tree/components.hh> #include <mln/morpho/tree/compute_attribute_image.hh> -#include <mln/morpho/attribute/sharpness.hh> +#include <mln/morpho/attribute/mysharpness.hh> /* pw */ #include <mln/core/concept/function.hh> @@ -103,6 +104,27 @@ { return height_wrapper_<P2V>(f); } + + template <typename T, typename F, typename P2B> + inline + void + mymin(const T& tree, Image<F>& f_, const Function_p2b<P2B>& pred_) + { + F& f = exact(f_); + const P2B& pred = exact(pred_); + + mln_ch_value(F, bool) mark; + initialize(mark, f); + mln::data::fill(mark, false); + + mln_dn_node_piter(T) n(tree); + for_all(n) + if (mark(tree.parent(n)) || !pred(tree.parent(n))) + { + f(n) = 0.0; + mark(n) = true; + } + } } @@ -176,17 +198,17 @@ typedef mln_ch_value_(I, double) A; A a; { - typedef morpho::attribute::sharpness sharp_t; - typedef mln_ch_value_(I, sharp_t) B; + typedef mln_ch_value_(I, unsigned) H; // Attribute Pruning - B a_img; - a = morpho::tree::compute_attribute_image(sharp_t (), t, &a_img); + H h_img; + a = morpho::attribute::mysharpness(t, &h_img); // Component filtering - a = duplicate((fun::p2v::ternary(height_wrapper(pw::value(a_img)) > pw::cst(lambda_h), - pw::value(a), - pw::cst(0.0))) | a.domain()); + + // this should use a filter from morpho/tree/filter with the predicate on the height of the parent + // so use function composition but ... + mymin(t, a, pw::value(h_img) > pw::cst(lambda_h)); } /************************************************/ Index: trunk/milena/sandbox/edwin/mln/morpho/tree/filter.hh =================================================================== --- trunk/milena/sandbox/edwin/mln/morpho/tree/filter.hh (revision 3798) +++ trunk/milena/sandbox/edwin/mln/morpho/tree/filter.hh (revision 3799) @@ -37,7 +37,7 @@ ** predicate as well. In this case, all strategies have the same ** result but min filter or direct filter should be used in term ** of performance. If a predicate test is not enough fast, then -** prefer the min filter that minimizes call to predicate. +** prefer the min filter that minimizes calls to predicate. */ # include <mln/core/concept/function.hh> @@ -49,11 +49,19 @@ namespace tree { namespace filter { + + template <typename T, typename F, typename P2B> + inline + void + filter(const T& tree, Image<F>& f_, const Function_p2b<P2B>& pred_, const mln_value(F)& v); + + template <typename T, typename F, typename P2B> inline void min(const T& tree, Image<F>& f_, const Function_p2b<P2B>& pred_); + template <typename T, typename F, typename P2B> inline void @@ -102,6 +110,29 @@ } + template <typename T, typename F, typename P2B> + inline + void + filter(const T& tree, Image<F>& f_, const Function_p2b<P2B>& pred_, const mln_value(F)& v) + { + F& f = exact(f_); + const P2B& pred = exact(pred_); + + //FIXME precondition + mln_ch_value(F, bool) mark; + initialize(mark, f); + mln::data::fill(mark, false); + + mln_dn_node_piter(T) n(tree); + for_all(n) + if (mark(tree.parent(n)) || !pred(n)) + { + f(n) = v; + mark(n) = true; + } + //FIXME postcondition + } + template <typename T, typename F, typename P2B> inline Index: trunk/milena/sandbox/edwin/inim/inim.cc =================================================================== --- trunk/milena/sandbox/edwin/inim/inim.cc (revision 3798) +++ trunk/milena/sandbox/edwin/inim/inim.cc (revision 3799) @@ -20,12 +20,13 @@ #include <mln/morpho/tree/compute_attribute_image.hh> #include <mln/morpho/tree/propagate.hh> #include <mln/morpho/tree/components.hh> +#include <mln/morpho/tree/filter.hh> /* Attributes */ #include <mln/transform/distance_front.hh> #include <mln/morpho/attribute/bbox.hh> #include <mln/morpho/attribute/card.hh> -#include <mln/morpho/attribute/volume.hh> +#include <mln/morpho/attribute/height.hh> #include <mln/make/w_window2d_int.hh> /* io */ @@ -60,7 +61,7 @@ void usage(char** argv) { - std::cerr << "usage: " << argv[0] << " input [--debug] [-n nbr_components | -t treshold] [-c card]" << std::endl; + std::cerr << "usage: " << argv[0] << " input [--debug] [-n nbr_components | -t treshold] [-h height]" << std::endl; abort(); } @@ -112,7 +113,7 @@ std::string arg; unsigned nb_components = 0; - unsigned card = 0; + unsigned height = 15; double treshold = 0; if (argc < 2) @@ -127,8 +128,8 @@ nb_components = atoi(argv[++i]); else if (arg == "-t" && i != argc) treshold = atof(argv[++i]); - else if (arg == "-c" && i != argc) - card = atoi(argv[++i]); + else if (arg == "-h" && i != argc) + height = atoi(argv[++i]); else if (arg == "--trace") trace::quiet = false; else @@ -142,6 +143,10 @@ image2d<bool> input_; io::pbm::load(input_, argv[1]); + if (mydebug) { + dsp("Distance geodesic"); + } + /* Work on geodesic distance image */ I input; { @@ -156,8 +161,7 @@ } if (mydebug) { - dsp("Distance geodesic"); - + dsp("Component tree computation"); } /* Component tree creation */ @@ -167,36 +171,32 @@ S sorted_sites = level::sort_psites_decreasing(input); tree_t tree(input, sorted_sites, c4()); + + if (mydebug) { + dsp("Attribute image computation"); + } + /* Compute Attribute On Image */ typedef morpho::attribute::bbox bbox_t; - typedef morpho::attribute::volume card_t; + typedef morpho::attribute::card card_t; + typedef morpho::attribute::height height_t; typedef mln_ch_value_(I, double) A; mln_VAR(attr_image, morpho::tree::compute_attribute_image(bbox_t (), tree)); mln_VAR(card_image, morpho::tree::compute_attribute_image(card_t (), tree)); - A a = duplicate(ratio(pw::value(attr_image), pw::value(card_image)) | attr_image.domain()); - - if (card) - { - if (mydebug) - dsp("Image card attribute"); - - a = duplicate((fun::p2v::ternary(pw::value(card_image) > pw::cst(card), - pw::value(a), - pw::cst(0.0))) | a.domain()); - } - - if (mydebug) { - dsp("Image sharp attribute"); - } + mln_VAR(height_image, morpho::tree::compute_attribute_image(height_t (), tree)); + A a = duplicate(ratio(pw::value(attr_image), pw::value(card_image)) | attr_image.domain()); + if (height) + morpho::tree::filter::filter(tree, a, pw::value(height_image) > pw::cst(height), 0.0); /* Run max accumulator */ p_array< mln_psite_(A) > obj_array; // Array of object components. if (mydebug) { - std::stringstream s("Run max accumulator, look for ", std::stringstream::out|std::stringstream::in| + std::stringstream s("Run max accumulator, look for ", + std::stringstream::out|std::stringstream::in| std::stringstream::ate); if (nb_components) s << nb_components << " components."; @@ -224,20 +224,16 @@ std::cout << c; } - /* Now Back Propagate to component */ - typedef mln_ch_value_(I, bool) M; - M mask = morpho::tree::set_value_to_components(tree, obj_array, true, false); - - // mask now contains all nodes related to objects if (mydebug) { dsp("Create mask and propagate"); } - a = morpho::tree::propagate_components(a, tree, obj_array, 0); - mln_VAR(output_, level::stretch(int_u8(), a)); //adapt to 0-255 - io::pgm::save(output_, "components.pgm"); + /* Now Back Propagate to component */ + typedef mln_ch_value_(I, bool) M; + M mask = morpho::tree::set_value_to_components(tree, obj_array, true, false); + a = morpho::tree::propagate_components(a, tree, obj_array, 0); /* Labeling */ typedef mln_ch_value_(I, value::label<8>) L; @@ -245,6 +241,7 @@ value::label_8 nlabel; L label = labeling::blobs(mask, c4(), nlabel); O output = labeling::colorize(value::rgb8(), label, nlabel); + if (mydebug) io::ppm::save(output, "label.pgm"); /* Now store output image image */ @@ -259,6 +256,7 @@ for_all(it) { std::cout << it << " :: " << attr_image(it).pmin() << " -> " << a(it) + << " (h: " << height_image(it) << ")" << std::endl; draw::box(out, attr_image(it), literal::red_t ());

1 0

3798: Update Laurent's stuff and new code for Fabien.
by Thierry Geraud 15 May '09

15 May '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Update Laurent's stuff and new code for Fabien. * theo/igr/segment_2d_t.cc: New. * theo/esiee/laurent/ismm09/extinct_attributes.hh (back_propagate_attributes): New. (extinct_attributes): New argument 'f'. augment echo. * theo/esiee/laurent/ismm09/main.cc: Update. esiee/laurent/ismm09/extinct_attributes.hh | 67 +++++++++++---- esiee/laurent/ismm09/main.cc | 68 +++++++++++---- igr/segment_2d_t.cc | 128 +++++++++++++++++++++++++++++ 3 files changed, 226 insertions(+), 37 deletions(-) Index: theo/igr/segment_2d_t.cc --- theo/igr/segment_2d_t.cc (revision 0) +++ theo/igr/segment_2d_t.cc (revision 0) @@ -0,0 +1,128 @@ +#include <string> + +#include <mln/core/var.hh> +#include <mln/core/image/image2d.hh> +#include <mln/io/dump/load.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/world/inter_pixel/is_separator.hh> +#include <mln/world/inter_pixel/neighb2d.hh> +#include <mln/world/inter_pixel/display_edge.hh> + +#include <mln/debug/println.hh> +#include <mln/estim/min_max.hh> +#include <mln/value/int_u8.hh> +#include <mln/value/int_u12.hh> +#include <mln/value/label.hh> +#include <mln/level/transform.hh> + +#include <mln/morpho/closing/area.hh> +#include <mln/morpho/watershed/flooding.hh> +#include <mln/accu/mean.hh> +#include <mln/labeling/compute.hh> +#include <mln/arith/div.hh> + + +const float saturation = 0.5; + + +namespace mln +{ + + struct int_u12_from_float : Function_v2v< int_u12_from_float > + { + typedef value::int_u12 result; + result operator()(float f) const + { + mln_precondition(f >= 0.f && f <= 1.f); + unsigned i = f / saturation * 4095; + return i > 4095 ? 4095 : i; + } + }; + + template <typename I> + void debug_println(const std::string& name, const I& input) + { + box2d crop( point2d(100, 180), + point2d(109, 189) ); + debug::println(name, + (input.unmorph_() | crop) + | world::inter_pixel::is_separator()); + } + + template <typename I> + void io_save_edges_int_u12(const I& input, + value::int_u8 bg, + const std::string& filename) + { + mlc_equal(mln_value(I), value::int_u12)::check(); + mln_ch_value(I, value::int_u8) output; + initialize(output, input); + arith::div_cst(input, 16, output); + io::pgm::save(world::inter_pixel::display_edge(output.unmorph_(), + bg, + 3), + filename); + } + +} // mln + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using namespace world::inter_pixel; + using value::int_u12; + using value::int_u8; + + if (argc != 3) + std::abort(); + + unsigned lambda = atoi(argv[2]); + + image2d<float> df_; + io::dump::load(df_, argv[1]); + mln_VAR(df, df_ | is_separator()); + + { + std::cout << df_.domain() << std::endl; + float min, max; + estim::min_max(df, min, max); + std::cout << "min = " << min << " max = " << max << std::endl; + } + + mln_VAR(d, level::transform(df, int_u12_from_float())); + // debug_println("d", d); + io_save_edges_int_u12(d, 0, "d.pgm"); + + mln_VAR(d_clo, morpho::closing::area(d, e2e(), lambda)); + // debug_println("d_clo", d_clo); + io_save_edges_int_u12(d_clo, 0, "d_clo.pgm"); + + typedef value::label<12> L; + L n_basins; + mln_VAR(w, morpho::watershed::flooding(d_clo, e2e(), n_basins)); + std::cout << "n basins = " << n_basins << std::endl; + // debug_println("w", w); + // io_save_edges_int_u12(w, 0, "w.pgm"); + + typedef accu::mean<int_u12,float,int_u12> A; + util::array<int_u12> m = labeling::compute(A(), d, w, n_basins); + + { + util::array<int_u8> m_(n_basins.next()); + m_[0] = 1; // watershed line <=> 1 + for (unsigned l = 1; l <= n_basins; ++l) + { + m_[l] = m[l] / 16; + if (m_[l] < 2) m_[l] == 2; + // basin <=> 2..255 + } + mln_VAR(d_m, level::transform(w, m_)); + mln_VAR(out, world::inter_pixel::display_edge(d_m.unmorph_(), + 0, // background <=> 0 + 3)); + io::pgm::save(out, "d_m.pgm"); + } +} Index: theo/esiee/laurent/ismm09/extinct_attributes.hh --- theo/esiee/laurent/ismm09/extinct_attributes.hh (revision 3797) +++ theo/esiee/laurent/ismm09/extinct_attributes.hh (working copy) @@ -36,8 +36,30 @@ } - // Attribute Extinction. - // --------------------- + // Back Propagation. + // ----------------- + + template <typename T, typename I> + void + back_propagate_attributes(const T& t, // Tree. + I& a) // Attribute image. + { + // Back-propagate attribute from a node to sites of its + // component. Below, p is a non-node component site and + // parent(p) is a node, that is, the site representative of + // the component p belongs to. + mln_up_site_piter(T) p(t); + for_all(p) + if (! t.is_a_node(p)) + { + mln_assertion(t.is_a_node(t.parent(p))); + a(p) = a(t.parent(p)); + } + } + + + // Attribute Extinction (Vachier's version). + // ----------------------------------------- namespace internal { @@ -56,9 +78,6 @@ const T* t; }; - - // Vachier's version. - template <typename T, typename I, typename M> inline mln_value(I) @@ -78,17 +97,17 @@ } // end of internal - // Vachier's version. - - template <typename T, typename I> + template <typename T, typename I, typename J> void extinct_attributes(const T& t, // Tree. I& a, // Attribute image. + const J& f, // Original image to sort pixels. bool echo = false) { if (echo) { - std::cout << "before:" << std::endl; + std::cout << "extinction input:" << std::endl; + debug::println(a); display_tree_attributes(t, a); } @@ -103,15 +122,15 @@ node_only.t = &t; typedef p_array S; - S s = level::sort_psites_increasing(a | node_only); + S s = level::sort_psites_increasing(f | node_only); -// { -// mln_fwd_piter(S) p(s); -// for_all(p) -// std::cout << p << ' ' << a(p) << " - "; -// std::cout << std::endl -// << std::endl; -// } + if (echo) + { + mln_fwd_piter(S) p(s); + for_all(p) + std::cout << f(p) << ":a" << p << '=' << a(p) << " "; + std::cout << std::endl << std::endl; + } mln_invariant(geom::nsites(a | t.nodes()) == s.nsites()); @@ -127,10 +146,22 @@ if (echo) { - std::cout << "after:" << std::endl; + std::cout << "after extinction on nodes and before back-propagation:" + << std::endl; + debug::println(a); + display_tree_attributes(t, a); + } + + back_propagate_attributes(t, a); + + if (echo) + { + std::cout << "extinction output:" << std::endl; + debug::println(a); display_tree_attributes(t, a); } } + } // mln Index: theo/esiee/laurent/ismm09/main.cc --- theo/esiee/laurent/ismm09/main.cc (revision 3797) +++ theo/esiee/laurent/ismm09/main.cc (working copy) @@ -7,12 +7,15 @@ #include <mln/io/pgm/save.hh> #include <mln/debug/println.hh> -#include <mln/morpho/meyer_wst.hh> +#include <mln/morpho/watershed/flooding.hh> +#include <mln/morpho/tree/compute_attribute_image.hh> +#include <mln/morpho/attribute/height.hh> #include <mln/labeling/compute.hh> #include <mln/accu/count.hh> #include "pseudo_tree.hh" #include "cplx2d.hh" +#include "extinct_attributes.hh" @@ -47,21 +50,23 @@ mln_VAR(g, cplx2d::f_to_g(f) ); debug::println("g:", g); + typedef label_16 L; // <--- Type of labels. + L l_max; // w: watershed labeling on edges. - typedef label_16 L; // <--- Type of labels. - L l_max; - mln_VAR( w, morpho::meyer_wst(g, cplx2d::e2e(), l_max) ); + mln_VAR( w, morpho::watershed::flooding(g, cplx2d::e2e(), l_max) ); + std::cout << "l_max = " << l_max << std::endl; debug::println("w:", w); - mln_VAR( is_w_line, pw::value(w) == pw::cst(0) ); - mln_VAR( g_line, g | is_w_line ); - debug::println("g | line:", g_line); +// mln_VAR( is_w_line, pw::value(w) == pw::cst(0) ); +// mln_VAR( g_line, g | is_w_line ); +// debug::println("g | line:", g_line); + mln_VAR(w_ext, cplx2d::extend_w_edges_to_all_faces(w)); - debug::println("w_ext:", w_ext); +// debug::println("w_ext:", w_ext); // e -> (l1, l2) @@ -85,26 +90,51 @@ // a: array "label -> attribute". typedef unsigned A; // <--- Type of attributes. + util::array<A> a(l_max.next(), 0); - util::array<A> a = labeling::compute(accu::meta::count(), - g, // image of values - w, // image of labels - l_max); + { + typedef p_array<point2d> s_t; + s_t s = level::sort_psites_decreasing(g); // min-tree - util::array<L> l_ = sort_by_increasing_attributes(a, l_max); + typedef morpho::tree::data<g_t,s_t> tree_t; + tree_t t(g, s, cplx2d::e2e()); - { - std::cout << "l_:" << std::endl; + morpho::attribute::height<g_t> a_; + mln_VAR(h, morpho::tree::compute_attribute_image(a_, t)); + debug::println("h | nodes:", h | t.nodes()); + + extinct_attributes(t, h, g); + debug::println("he:", h); + debug::println("he | basins:", h | (pw::value(w) != pw::cst(0))); + + mln_invariant(t.leaves().nsites() == l_max); + + mln_leaf_piter_(tree_t) p(t); + for_all(p) + a[w(p)] = h(p); + + std::cout << "a = " << std::endl; for (unsigned i = 1; i <= l_max; ++i) - std::cout << l_[i] << "(" << a[l_[i]] << ") "; - std::cout << std::endl - << std::endl; + std::cout < l_ = sort_by_increasing_attributes(a, l_max); + +// { +// std::cout << "l_:" << std::endl; +// for (unsigned i = 1; i <= l_max; ++i) +// std::cout << l_[i] << "(" << a[l_[i]] << ") "; +// std::cout << std::endl +// << std::endl; +// } + + // -> pseudo-tree - compute_pseudo_tree(w_ext, g, l_, a, e_to_l1_l2); +// compute_pseudo_tree(w_ext, g, l_, a, e_to_l1_l2); }

1 0

r3797: Create mean and deviation images
by Fabien Freling 15 May '09

15 May '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-05-15 Fabien Freling <fabien.freling(a)lrde.epita.fr> Create mean and deviation images. * fabien/igr/fixed_seg/Makefile: New target for building fixed segmentation. * fabien/igr/fixed_seg/main.cc: Create mean image. * fabien/igr/smooth_fixed_seg/main.cc: Small update, on hold. --- fixed_seg/Makefile | 9 + fixed_seg/main.cc | 271 +++++++++++++++++++++++++++++++++++++++++++++++ smooth_fixed_seg/main.cc | 59 +++++++++- 3 files changed, 332 insertions(+), 7 deletions(-) Index: trunk/milena/sandbox/fabien/igr/smooth_fixed_seg/main.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/smooth_fixed_seg/main.cc (revision 3796) +++ trunk/milena/sandbox/fabien/igr/smooth_fixed_seg/main.cc (revision 3797) @@ -34,8 +34,8 @@ #include <mln/morpho/dilation.hh> #include <mln/morpho/erosion.hh> #include <mln/morpho/closing/structural.hh> +#include <mln/morpho/closing/volume.hh> #include <mln/morpho/opening/structural.hh> -#include <mln/morpho/elementary/gradient.hh> #include <mln/morpho/watershed/flooding.hh> #include <mln/pw/all.hh> #include <mln/util/array.hh> @@ -46,9 +46,7 @@ #include <mln/world/inter_pixel/neighb2d.hh> #include <mln/world/inter_pixel/all.hh> -#include <mln/labeling/colorize.hh> -#include <mln/debug/println.hh> -#include <mln/trace/quiet.hh> +#include "../plot_label.hh" using namespace mln; @@ -133,13 +131,13 @@ int usage(const char* bin) { - std::cout << "Usage: " << bin << " input.dump" << std::endl; + std::cout << "Usage: " << bin << " input.dump closing_lambda" << std::endl; return 1; } int main(int argc, char* argv[]) { - if (argc != 2) + if (argc != 3) return usage(argv[0]); @@ -159,7 +157,6 @@ // Edges image creation. - //image2d<float> edges = dist_on_edges(ima_arr); typedef image_if<I, world::inter_pixel::is_pixel> Ix; Ix imax = world::inter_pixel::immerse(ima_arr); @@ -172,6 +169,54 @@ io::pgm::save(level::stretch(int_u8(), display_ima), "edges.pgm"); } + // Type change. + mln_VAR(e, level::stretch(int_u8(), edges)); + + + // Closing. + mln_VAR(clo, morpho::closing::volume(e, world::inter_pixel::e2e(), atoi(argv[2]))); + + { + // Display. + mln_VAR(display_clo, world::inter_pixel::display_edge(clo.unmorph_(), 0.0, 3)); + io::pgm::save(level::stretch(int_u8(), display_clo), "closing.pgm"); + } + + + // Watershed. + typedef label_16 L; + L nbasins; + mln_VAR(wst, morpho::watershed::flooding(clo, world::inter_pixel::e2e(), nbasins)); + + std::cout << "nbasins: " << nbasins << std::endl; + + mln_VAR(w_all, wst.unmorph_()); + //data::fill((w | (!world::inter_pixel::is_separator())).rw(), nbasins.next()); + mln_VAR(w_pixels, w_all | world::inter_pixel::is_pixel()); + data::paste(morpho::dilation(extend(w_pixels, pw::value(w_all)), c4().win()), w_all); + // edges -> dots + mln_VAR(w_dots, w_all | world::inter_pixel::dim2::is_dot()); + data::paste(morpho::erosion(extend(w_dots, pw::value(w_all)), c4().win()), w_all); + + //io::ppm::save(labeling::colorize(value::rgb8(), w, nbasins.next()), "result.ppm"); + io::pgm::save(labeling::wrap(int_u8(), w_all), "watershed.pgm"); + + + // Plots. + image2d<L> w_simple = world::inter_pixel::full2image(w_all); + plot_label(input, w_simple, 248u); + plot_label(input, w_simple, 241u); + plot_label(input, w_simple, 238u); + plot_label(input, w_simple, 251u); + plot_label(input, w_simple, 250u); + plot_label(input, w_simple, 249u); + plot_label(input, w_simple, 247u); + plot_label(input, w_simple, 232u); + plot_label(input, w_simple, 252u); + plot_label(input, w_simple, 246u); + plot_label(input, w_simple, 240u); + plot_label(input, w_simple, 237u); + return 0; } Index: trunk/milena/sandbox/fabien/igr/fixed_seg/main.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/fixed_seg/main.cc (revision 0) +++ trunk/milena/sandbox/fabien/igr/fixed_seg/main.cc (revision 3797) @@ -0,0 +1,271 @@ +#include <algorithm> + +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/slice_image.hh> +#include <mln/core/image/image_if.hh> +#include <mln/core/routine/duplicate.hh> +#include <mln/core/routine/extend.hh> +#include <mln/core/var.hh> + +#include <mln/io/dump/all.hh> +#include <mln/io/pgm/save.hh> +#include <mln/io/ppm/save.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/int_u12.hh> +#include <mln/value/label_16.hh> +#include <mln/value/rgb8.hh> +#include <mln/value/float01_8.hh> + +#include <mln/accu/sum.hh> +#include <mln/accu/mean.hh> +#include <mln/accu/stat/deviation.hh> +#include <mln/data/fill.hh> +#include <mln/data/paste.hh> +#include <mln/debug/quiet.hh> +#include <mln/convert/from_to.hh> +#include <mln/fun/v2v/fit.hh> +#include <mln/labeling/compute.hh> +#include <mln/labeling/wrap.hh> +#include <mln/level/compute.hh> +#include <mln/level/convert.hh> +#include <mln/level/stretch.hh> +#include <mln/make/image2d.hh> +#include <mln/math/diff_abs.hh> +#include <mln/morpho/dilation.hh> +#include <mln/morpho/erosion.hh> +#include <mln/morpho/closing/area.hh> +#include <mln/morpho/elementary/gradient.hh> +#include <mln/morpho/watershed/flooding.hh> +#include <mln/pw/all.hh> +#include <mln/util/array.hh> + +#include <mln/world/inter_pixel/display_edge.hh> +#include <mln/world/inter_pixel/compute.hh> +#include <mln/world/inter_pixel/immerse.hh> +#include <mln/world/inter_pixel/neighb2d.hh> +#include <mln/world/inter_pixel/all.hh> + +#include <mln/labeling/colorize.hh> +#include <mln/debug/println.hh> +#include <mln/trace/quiet.hh> + +#include "../plot_label.hh" + +using namespace mln; +using value::int_u8; +using value::int_u12; +using value::label_16; +using value::float01_8; + +#define SATURATION 0.6 + + + + + +// Distance function. +//------------------- + +struct dist_t : Function_vv2v<dist_t> +{ + typedef float result; + + template <typename V> + float operator()(util::array<V> v1, util::array<V> v2) const + { + float res = 0.f; + + for (unsigned i = 0; i < v1.nelements(); ++i) + res += std::min(v1[i], v2[i]); + + image1d<V> tmp_ima; + image1d<V> tmp_ima2; + accu::sum<V> accu_sum; + + convert::from_to(v1, tmp_ima); + float sum_v1 = level::compute(accu_sum, tmp_ima); + + convert::from_to(v2, tmp_ima2); + float sum_v2 = level::compute(accu_sum, tmp_ima2); + + res /= std::max(sum_v1, sum_v2); + + return 1 - res; + } +} dist; + + + + + + + + +int usage(const char* bin) +{ + std::cout << "Usage: " << bin << " input.dump closing" << std::endl; + return 1; +} + +int main(int argc, char* argv[]) +{ + if (argc != 3) + return usage(argv[0]); + + + // Initialization. + image3d<int_u12> input; + io::dump::load(input, argv[1]); + typedef image2d<util::array<int_u12> > I; + I ima_arr; + initialize(ima_arr, slice(input, 0)); + for (unsigned int i = 0; i < input.nslices(); ++i) + { + image2d<int_u12> tmp_slice = duplicate(slice(input, i)); + mln_piter_(image2d<int_u12>) p(tmp_slice.domain()); + for_all(p) + ima_arr(p).append(tmp_slice(p)); + } + + + // Edges image creation. + typedef image_if<I, world::inter_pixel::is_pixel> Ix; + Ix imax = world::inter_pixel::immerse(ima_arr); + + // Edges distance computation. + mln_VAR(edges, world::inter_pixel::compute(imax, dist)); + mln_VAR(e, level::transform(edges, fun::v2v::fit<float>(SATURATION))); + typedef int_u12 E_TYPE; + + { + // Display. + mln_VAR(display_ima, world::inter_pixel::display_edge(e.unmorph_(), 0.0, 3)); + io::pgm::save(level::stretch(int_u8(), display_ima), "01_edges.pgm"); + } + + + + // Closing. + mln_VAR(clo, morpho::closing::area(e, world::inter_pixel::e2e(), atoi(argv[2]))); + + { + // Display. + mln_VAR(display_clo, world::inter_pixel::display_edge(clo.unmorph_(), 0.0, 3)); + io::pgm::save(level::stretch(int_u8(), display_clo), "03_closing.pgm"); + } + + + // Watershed. + typedef label_16 L; + L nbasins; + mln_VAR(wst, morpho::watershed::flooding(clo, world::inter_pixel::e2e(), nbasins)); + + std::cout << "nbasins: " << nbasins << std::endl; + + + mln_VAR(w_all, wst.unmorph_()); + //data::fill((w | (!world::inter_pixel::is_separator())).rw(), nbasins.next()); + mln_VAR(w_pixels, w_all | world::inter_pixel::is_pixel()); + data::paste(morpho::dilation(extend(w_pixels, pw::value(w_all)), c4().win()), w_all); + // edges -> dots + mln_VAR(w_dots, w_all | world::inter_pixel::dim2::is_dot()); + data::paste(morpho::erosion(extend(w_dots, pw::value(w_all)), c4().win()), w_all); + + //io::ppm::save(labeling::colorize(value::rgb8(), w, nbasins.next()), "result.ppm"); + io::pgm::save(labeling::wrap(int_u8(), w_all), "watershed.pgm"); + + + + // Mean distance. + accu::mean<E_TYPE> accu_mean; + util::array<float> means = labeling::compute(accu_mean, e, wst, nbasins); + + // Display. + { + typedef image_if<image2d<float>, world::inter_pixel::is_separator> Fsx; + Fsx ima_means; + initialize(ima_means, wst); + data::paste(wst, ima_means); + for (unsigned i = 1; i < means.nelements(); ++i) + data::fill((ima_means | pw::value(ima_means) == pw::cst(i)).rw(), means[i]); + mln_VAR(display_means, world::inter_pixel::display_edge(ima_means.unmorph_(), 0.0, 3)); + io::pgm::save(level::stretch(int_u8(), display_means), "04_means.pgm"); + } + + + + // Deviation. + util::array<accu::stat::deviation<float> > arr_dev; + for (unsigned i = 0; i < means.nelements(); ++i) + arr_dev.append(accu::stat::deviation<float> (means[i])); + util::array<float> deviations = labeling::compute(arr_dev, e, wst, nbasins); + + // Display. + { + typedef image_if<image2d<float>, world::inter_pixel::is_separator> Fsx; + Fsx ima_dev; + initialize(ima_dev, wst); + data::paste(wst, ima_dev); + for (unsigned i = 1; i < deviations.nelements(); ++i) + data::fill((ima_dev | pw::value(ima_dev) == pw::cst(i)).rw(), deviations[i]); + mln_VAR(display_dev, world::inter_pixel::display_edge(ima_dev.unmorph_(), 0.0, 3)); + io::pgm::save(level::stretch(int_u8(), display_dev), "05_dev.pgm"); + } + + + + // Plots labels. + image2d<L> w_simple = world::inter_pixel::full2image(w_all); + plot_label(input, w_simple, 191u); + plot_label(input, w_simple, 171u); + plot_label(input, w_simple, 188u); + + plot_label(input, w_simple, 16u); + + plot_label(input, w_simple, 187u); + + + + + + + + + + /*mln_VAR(clo, morpho::closing::volume(edges | world::inter_pixel::dim2::is_edge(), world::inter_pixel::e2e(), atoi(argv[2]))); + + // Debug. + //debug::println("clo", clo); + + // Display. + image2d<float> display_ima2 = world::inter_pixel::display_edge(clo.unmorph_(), 0.0, 3); + io::pgm::save(level::stretch(int_u8(), display_ima2), "edges2.pgm"); + + // Watershed. + typedef label_16 L; + L nbasins; + mln_VAR(wst, morpho::watershed::flooding(clo, world::inter_pixel::e2e(), nbasins)); + + // Debug. + //debug::println("wst", wst); + + // Extension. + image2d<L> w_all = wst.unmorph_(); + // edges -> pixel + mln_VAR(w_pixels, w_all | world::inter_pixel::dim2::is_pixel()); + data::paste(morpho::dilation(extend(w_pixels, pw::value(w_all)), c4().win()), w_all); + // edges -> dots + mln_VAR(w_dots, w_all | world::inter_pixel::dim2::is_dot()); + data::paste(morpho::erosion(extend(w_dots, pw::value(w_all)), c4().win()), w_all); + + + // Save labels map. + std::cout << "nbasins: " << nbasins << std::endl; + io::dump::save(wst.unmorph_(), "watershed_fixed.dump");*/ + + return 0; +} Index: trunk/milena/sandbox/fabien/igr/fixed_seg/Makefile =================================================================== --- trunk/milena/sandbox/fabien/igr/fixed_seg/Makefile (revision 0) +++ trunk/milena/sandbox/fabien/igr/fixed_seg/Makefile (revision 3797) @@ -0,0 +1,9 @@ +include ../Makefile.rules + +all: main.cc + ${CXX} -I../../../../ ${CXXFLAGS} $^ -o fixed_seg + + +clean: + rm -rf *.dump *.p?m *.plot *.log *.csv *.dSYM + rm seg_fixed

1 0

3796: window2d.i: restore the previous version of this file.
by Guillaume Lazzara 15 May '09

15 May '09

--- swilena/ChangeLog | 4 ++++ swilena/window2d.i | 49 +++++++++++++++++++++++-------------------------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 6dbc317..a3db9bc 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,7 @@ +2009-05-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + window2d.i: restore the previous version of this file. + 2008-08-13 Roland Levillain <roland(a)lrde.epita.fr> Fix the use of int_u8 in image2d_int_u8.i. diff --git a/swilena/window2d.i b/swilena/window2d.i index d6145fc..182f6bb 100644 --- a/swilena/window2d.i +++ b/swilena/window2d.i @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// -*- C++ -*- +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -21,40 +22,36 @@ // 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 +// License. // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/io/magick/magick.cc -/// -/// Test on mln::io::magick::*. +/// \file window2d.i +/// \brief A wrapper of mln::window2d. -#include <mln/core/image/image2d.hh> -#include <mln/io/magick/load.hh> -#include <mln/io/ppm/save.hh> +%module window2d -#include <mln/level/compare.hh> +%import "dpoint2d.i" -#include <mln/value/int_u8.hh> -#include <mln/value/rgb8.hh> +%{ +#include "mln/core/window2d.hh" +%} -#include "tests/data.hh" +%include "mln/core/macros.hh" -#include <mln/debug/println.hh> +%include "mln/core/concept/window.hh" +%include "mln/core/window.hh" -int main() -{ - using namespace mln; +%include "mln/core/window2d.hh" - { - image2d<value::rgb8> lena_im; - io::magick::load(lena_im, "lena.png"); +// Swig tries to wrap everything by default; prevent it from wrapping +// invalid methods (1D and 3D insertions for a window2d). +%ignore mln::window< mln::dpoint_<mln::grid::square, int > >:: +insert(const typename mln::dpoint_<mln::grid::square, int>::coord&); +%ignore mln::window< mln::dpoint_<mln::grid::square, int > >:: +insert(const typename mln::dpoint_<mln::grid::square, int>::coord&, + const typename mln::dpoint_<mln::grid::square, int>::coord&, + const typename mln::dpoint_<mln::grid::square, int>::coord&); - image2d<value::rgb8> lena_mln; - io::ppm::load(lena_mln, "lena.ppm"); - - mln_assertion(lena_im.domain() == lena_mln.domain()); - mln_assertion(lena_im == lena_mln); - } -} +%template(window2d) mln::window< mln::dpoint_<mln::grid::square, int > >; -- 1.5.6.5

1 0

Jump to page: