- Olena-patches

[PATCH 09/27] Improve conditional support for CFITSIO.
by Roland Levillain 03 Jun '09

03 Jun '09

* mln/io/all.hh [HAVE_CFITSIO]: Include mln/io/fits/all.hh. * tests/io/Makefile.am (SUBDIRS) [HAVE_CFITSIO]: Add fits. * tests/io/fits/Makefile.am: Remove CFITSIO conditional. (fits_CPPFLAGS, fits_LDFLAGS): Remove. (AM_CPPFLAGS): Add $(CFITSIO_CPPFLAGS). (AM_LDFLAGS): New. Add $(CFITSIO_LDFLAGS). --- milena/ChangeLog | 11 +++++++++++ milena/mln/io/all.hh | 9 ++++++++- milena/tests/io/Makefile.am | 13 ++++++++++++- milena/tests/io/fits/Makefile.am | 14 ++++++-------- 4 files changed, 37 insertions(+), 10 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6a0eb69..fccc066 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2009-06-01 Roland Levillain <roland(a)lrde.epita.fr> + Improve conditional support for CFITSIO. + + * mln/io/all.hh [HAVE_CFITSIO]: Include mln/io/fits/all.hh. + * tests/io/Makefile.am (SUBDIRS) [HAVE_CFITSIO]: Add fits. + * tests/io/fits/Makefile.am: Remove CFITSIO conditional. + (fits_CPPFLAGS, fits_LDFLAGS): Remove. + (AM_CPPFLAGS): Add $(CFITSIO_CPPFLAGS). + (AM_LDFLAGS): New. Add $(CFITSIO_LDFLAGS). + +2009-06-01 Roland Levillain <roland(a)lrde.epita.fr> + * mln/io/all.hh: Reenable support for OFF I/O routines. 2009-06-03 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/mln/io/all.hh b/milena/mln/io/all.hh index 409c4aa..0e081b5 100644 --- a/milena/mln/io/all.hh +++ b/milena/mln/io/all.hh @@ -63,6 +63,13 @@ namespace mln # include <mln/io/tiff/all.hh> # include <mln/io/txt/all.hh> # include <mln/io/off/all.hh> -//# include <mln/io/fits/all.hh> + +/*--------------------------------------------------. +| I/O routines depending on a third-party library. | +`--------------------------------------------------*/ + +# ifdef HAVE_CFITSIO +# include <mln/io/fits/all.hh> +# endif // ! HAVE_CFITSIO #endif // ! MLN_IO_ALL_HH diff --git a/milena/tests/io/Makefile.am b/milena/tests/io/Makefile.am index 52b6750..6ebcd67 100644 --- a/milena/tests/io/Makefile.am +++ b/milena/tests/io/Makefile.am @@ -2,10 +2,13 @@ include $(top_srcdir)/milena/tests/tests.mk +## ---------------------- ## +## Built-in I/O support. ## +## ---------------------- ## + SUBDIRS = \ dicom \ dump \ - fits \ magick \ off \ pbm \ @@ -14,3 +17,11 @@ SUBDIRS = \ pnm \ ppm \ tiff + +## ------------------------------------------------- ## +## I/O routines depending on a third-party library. ## +## ------------------------------------------------- ## + +if HAVE_CFITSIO + SUBDIRS += fits +endif HAVE_CFITSIO diff --git a/milena/tests/io/fits/Makefile.am b/milena/tests/io/fits/Makefile.am index b463de4..9e72389 100644 --- a/milena/tests/io/fits/Makefile.am +++ b/milena/tests/io/fits/Makefile.am @@ -2,13 +2,11 @@ include $(top_srcdir)/milena/tests/tests.mk -check_PROGRAMS = - -if CFITSIO - check_PROGRAMS += fits - fits_SOURCES = fits.cc - fits_CPPFLAGS = $(AM_CPPFLAGS) $(CFITSIO_CPPFLAGS) - fits_LDFLAGS = $(AM_LDFLAGS) $(CFITSIO_LDFLAGS) -endif CFITSIO +AM_CPPFLAGS += $(CFITSIO_CPPFLAGS) +AM_LDFLAGS = $(CFITSIO_LDFLAGS) + +check_PROGRAMS = fits + +fits_SOURCES = fits.cc TESTS = $(check_PROGRAMS) -- 1.6.1.2

1 0

[PATCH 08/27] Rename CFITSIO conditional.
by Roland Levillain 03 Jun '09

03 Jun '09

* configure.ac (CFITSIO): Rename conditional as... (HAVE_CFITSIO): ...this. --- ChangeLog | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b3e697..5c57d30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2009-06-03 Roland Levillain <roland(a)lrde.epita.fr> + Rename CFITSIO conditional. + + * configure.ac (CFITSIO): Rename conditional as... + (HAVE_CFITSIO): ...this. + +2009-06-03 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac: Fix help string for option `--enable-trimesh'. 2009-06-03 Fabien Freling <fabien.freling(a)lrde.epita.fr> diff --git a/configure.ac b/configure.ac index c2125a6..e4ad13a 100644 --- a/configure.ac +++ b/configure.ac @@ -136,7 +136,7 @@ AM_CONDITIONAL([FREEIMAGEPLUS], [test x$oln_have_freeimageplus = xyes]) # CFITSIO library. OLN_WITH_CFITSIO -AM_CONDITIONAL([CFITSIO], [test x$oln_have_cfitsio = xyes]) +AM_CONDITIONAL([HAVE_CFITSIO], [test x$oln_have_cfitsio = xyes]) ## ---------------------------- ## -- 1.6.1.2

1 0

[PATCH 07/27] mln/io/all.hh: Reenable support for OFF I/O routines.
by Roland Levillain 03 Jun '09

03 Jun '09

--- milena/ChangeLog | 4 ++++ milena/mln/io/all.hh | 6 +++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f40a943..6a0eb69 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2009-06-01 Roland Levillain <roland(a)lrde.epita.fr> + + * mln/io/all.hh: Reenable support for OFF I/O routines. + 2009-06-03 Roland Levillain <roland(a)lrde.epita.fr> Fix some copyright headers. diff --git a/milena/mln/io/all.hh b/milena/mln/io/all.hh index bf21c89..409c4aa 100644 --- a/milena/mln/io/all.hh +++ b/milena/mln/io/all.hh @@ -46,6 +46,10 @@ namespace mln } +/*-----------------------. +| Built-in I/O support. | +`-----------------------*/ + # include <mln/io/cloud/all.hh> # include <mln/io/dump/all.hh> # include <mln/io/dicom/load.hh> @@ -58,7 +62,7 @@ namespace mln # include <mln/io/ppm/all.hh> # include <mln/io/tiff/all.hh> # include <mln/io/txt/all.hh> +# include <mln/io/off/all.hh> //# include <mln/io/fits/all.hh> -//# include <mln/io/off/all.hh> #endif // ! MLN_IO_ALL_HH -- 1.6.1.2

1 0

[PATCH 06/27] Factor box2d.i using box.ixx.
by Roland Levillain 03 Jun '09

03 Jun '09

* box2d.i: Include box.ixx. Use macro instantiate_box and remove redundant Swig directives. --- swilena/ChangeLog | 7 +++++++ swilena/box2d.i | 43 +++++++------------------------------------ 2 files changed, 14 insertions(+), 36 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 07f35a2..866e2dc 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,10 @@ +2009-06-02 Roland Levillain <roland(a)lrde.epita.fr> + + Factor box2d.i using box.ixx. + + * box2d.i: Include box.ixx. + Use macro instantiate_box and remove redundant Swig directives. + 2009-06-01 Roland Levillain <roland(a)lrde.epita.fr> Wrap mln::box as box.ixx to factor dependent types. diff --git a/swilena/box2d.i b/swilena/box2d.i index 7a25565..e36ad03 100644 --- a/swilena/box2d.i +++ b/swilena/box2d.i @@ -34,34 +34,12 @@ %import box2d_piter.i %{ -#include "mln/core/site_set/box.hh" #include "mln/core/alias/box2d.hh" %} -%include "mln/core/macros.hh"; -%include "mln/metal/is_unqualif.hh"; +%include "mln/core/alias/box2d.hh" -%include "mln/core/site_set/box.hh"; -%include "mln/core/alias/box2d.hh"; - -/* Swig tries to wrap everything by default; prevent it from wrapping - invalid methods (1D and 3D ctors for an mln::box2d). Moreover, as - Python does not automatically convert `int's to `short's, we cannot - use the ctor taking two `mln::def::coord's (i.e. `short's) - either. */ -/* FIXME: Can't we simplify these directives, i.e. use `point2d' - directly? Maybe we could use mln_coord()? */ -%ignore mln::box< mln::point<mln::grid::square, mln::def::coord> > -::box(typename mln::point<mln::grid::square, mln::def::coord>::coord); - -%ignore mln::box< mln::point<mln::grid::square, mln::def::coord> > -::box(typename mln::point<mln::grid::square, mln::def::coord>::coord, - typename mln::point<mln::grid::square, mln::def::coord>::coord); - -%ignore mln::box< mln::point<mln::grid::square, mln::def::coord> > -::box(typename mln::point<mln::grid::square, mln::def::coord>::coord, - typename mln::point<mln::grid::square, mln::def::coord>::coord, - typename mln::point<mln::grid::square, mln::def::coord>::coord); +%include "box.ixx" %extend mln::box< mln::point<mln::grid::square, mln::def::coord> > { @@ -72,26 +50,19 @@ return new mln::box<mln::point2d>(nrows, ncols); } - // FIXME: Shorten using macros... - mln::box_fwd_piter_< mln::point<mln::grid::square, mln::def::coord> > - __iter__() const - { - mln::box_fwd_piter_<mln::point2d> p(*$self); - p.start(); - return p; - } - unsigned nrows() const { - // FIXME: This is the exact content of box_impl_<2, C, E>::nrows. + /* FIXME: This is the exact content of box_impl_<2, C, E>::nrows. + Wrapping box_impl_<2, C, E> might save us this extension. */ return mln::internal::force_exact<mln::box2d>(*$self).bbox().len(0); } unsigned ncols() const { - // FIXME: This is the exact content of box_impl_<2, C, E>::ncols. + /* FIXME: This is the exact content of box_impl_<2, C, E>::ncols. + Wrapping box_impl_<2, C, E> might save us this extension. */ return mln::internal::force_exact<mln::box2d>(*$self).bbox().len(1); } } -%template(box2d) mln::box< mln::point<mln::grid::square, mln::def::coord> >; +instantiate_box(box2d, mln::point<mln::grid::square, mln::def::coord>) -- 1.6.1.2

1 0

[PATCH 05/27] Wrap mln::box as box.ixx to factor dependent types.
by Roland Levillain 03 Jun '09

03 Jun '09

* box.ixx: New. * Makefile.am (meta_wrappers): Add box.ixx. --- swilena/ChangeLog | 7 +++++ swilena/Makefile.am | 1 + swilena/box.ixx | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 0 deletions(-) create mode 100644 swilena/box.ixx diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 6de45fa..07f35a2 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,12 @@ 2009-06-01 Roland Levillain <roland(a)lrde.epita.fr> + Wrap mln::box as box.ixx to factor dependent types. + + * box.ixx: New. + * Makefile.am (meta_wrappers): Add box.ixx. + +2009-06-01 Roland Levillain <roland(a)lrde.epita.fr> + Introduce a variadic version of mln_coord in Swilena. * coord.ixx: New. diff --git a/swilena/Makefile.am b/swilena/Makefile.am index 2922542..69dc4cf 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -5,6 +5,7 @@ SUBDIRS = python # Meta-wrappers (templates), not generating a module, but factoring # common parts. meta_wrappers = \ + box.ixx \ box_piter.ixx \ ch_value.ixx \ concat.ixx \ diff --git a/swilena/box.ixx b/swilena/box.ixx new file mode 100644 index 0000000..98cb9fc --- /dev/null +++ b/swilena/box.ixx @@ -0,0 +1,73 @@ +// -*- C++ -*- +// Copyright (C) 2008, 2009 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// \file box.ixx +/// \brief A wrapper of mln::box. + +%{ +#include "mln/core/site_set/box.hh" +%} + +%include "mln/core/macros.hh"; +%include "mln/metal/is_unqualif.hh"; + +%include "mln/core/site_set/box.hh"; + +%include "coord.ixx" + +/** Instantiate an mln::box type. + + The variadic argument ``P...'' is used to allow template type + names having commas (e.g. mln::point<grid::square, def::coord) as + argument. */ +%define instantiate_box(Name, P...) +/* Swig tries to wrap everything by default; prevent it from wrapping + methods that may be invalid (1D and 3D ctors for an mln::box2d). + Anyway, as Python does not automatically convert `int's to + `short's, these these ctors taking `mln::def::coord's are not + really useful. */ +%ignore mln::box::box(swl_coord(P)); +%ignore mln::box::box(swl_coord(P), swl_coord(P)); +%ignore mln::box::box(swl_coord(P), swl_coord(P), swl_coord(P)); + +// Python interface. +#if SWIGPYTHON +%extend mln::box +{ + mln::box_fwd_piter_ + __iter__() const + { + mln::box_fwd_piter_ p(*$self); + p.start(); + return p; + } +} +#endif // !SWIGPYTHON + +%template(Name) mln::box; +%enddef // !instantiate_box -- 1.6.1.2

1 0

[PATCH 04/27] Introduce a variadic version of mln_coord in Swilena.
by Roland Levillain 03 Jun '09

03 Jun '09

* coord.ixx: New. * Makefile.am (meta_wrappers): Add coord.ixx. --- swilena/ChangeLog | 7 +++++++ swilena/Makefile.am | 1 + swilena/coord.ixx | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 0 deletions(-) create mode 100644 swilena/coord.ixx diff --git a/swilena/ChangeLog b/swilena/ChangeLog index ec4467c..6de45fa 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,12 @@ 2009-06-01 Roland Levillain <roland(a)lrde.epita.fr> + Introduce a variadic version of mln_coord in Swilena. + + * coord.ixx: New. + * Makefile.am (meta_wrappers): Add coord.ixx. + +2009-06-01 Roland Levillain <roland(a)lrde.epita.fr> + * Makefile.am (meta_wrappers, wrappers): Unwrap. 2009-05-29 Guillaume Lazzara <lazzara(a)lrde.epita.fr> diff --git a/swilena/Makefile.am b/swilena/Makefile.am index b264147..2922542 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -9,6 +9,7 @@ meta_wrappers = \ ch_value.ixx \ concat.ixx \ concrete.ixx \ + coord.ixx \ fill.ixx \ image2d.ixx \ int_u.ixx \ diff --git a/swilena/coord.ixx b/swilena/coord.ixx new file mode 100644 index 0000000..7d45792 --- /dev/null +++ b/swilena/coord.ixx @@ -0,0 +1,36 @@ +// -*- C++ -*- +// Copyright (C) 2009 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// \file coord.ixx +/// \brief A variadic alternative to the macro mln_coord. + +/* An equivalent of mln_coord. However, since ``P...'' is a variadic + argument, it may include commas, wheras mln_comma may not. */ +%define swl_coord(P...) +typename P::coord +%enddef -- 1.6.1.2

1 0

[PATCH 03/27] Makefile.am (meta_wrappers, wrappers): Unwrap.
by Roland Levillain 03 Jun '09

03 Jun '09

--- swilena/ChangeLog | 4 ++++ swilena/Makefile.am | 32 ++++++++++++++++++++++++-------- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 1de5c61..ec4467c 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,7 @@ +2009-06-01 Roland Levillain <roland(a)lrde.epita.fr> + + * Makefile.am (meta_wrappers, wrappers): Unwrap. + 2009-05-29 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Fix swilena distributed file list. diff --git a/swilena/Makefile.am b/swilena/Makefile.am index b0dfffb..b264147 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -4,17 +4,33 @@ SUBDIRS = python # Meta-wrappers (templates), not generating a module, but factoring # common parts. -meta_wrappers = \ - box_piter.ixx ch_value.ixx concat.ixx concrete.ixx fill.ixx \ - image2d.ixx intp.ixx int_u.ixx morpho.ixx pgm.ixx println.ixx \ +meta_wrappers = \ + box_piter.ixx \ + ch_value.ixx \ + concat.ixx \ + concrete.ixx \ + fill.ixx \ + image2d.ixx \ + int_u.ixx \ + intp.ixx \ + morpho.ixx \ + pgm.ixx \ + println.ixx \ python-utils.ixx # Wrappers (generating actual modules). -wrappers = \ - box2d.i box2d_piter.i dpoint2d.i image2d_int.i \ - image2d_int_u8.i int_u8.i int_u32.i neighb2d.i point2d.i \ - window2d.i \ - \ +wrappers = \ + box2d.i \ + box2d_piter.i \ + dpoint2d.i \ + image2d_int.i \ + image2d_int_u8.i \ + int_u32.i \ + int_u8.i \ + neighb2d.i \ + point2d.i \ + window2d.i \ + \ dynamic_image2d.i EXTRA_DIST = $(meta_wrappers) $(wrappers) -- 1.6.1.2

1 0

[PATCH 02/27] configure.ac: Fix help string for option `--enable-trimesh'.
by Roland Levillain 03 Jun '09

03 Jun '09

--- ChangeLog | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f154e32..2b3e697 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-06-03 Roland Levillain <roland(a)lrde.epita.fr> + + * configure.ac: Fix help string for option `--enable-trimesh'. + 2009-06-03 Fabien Freling <fabien.freling(a)lrde.epita.fr> Add script shell for tests/ hierarchy checking. diff --git a/configure.ac b/configure.ac index e231a75..c2125a6 100644 --- a/configure.ac +++ b/configure.ac @@ -144,7 +144,7 @@ AM_CONDITIONAL([CFITSIO], [test x$oln_have_cfitsio = xyes]) ## ---------------------------- ## AC_ARG_ENABLE([trimesh], - [AS_HELP_STRING([--with-trimesh], + [AS_HELP_STRING([--enable-trimesh], [build the (bundled) trimesh2 library])]) AM_CONDITIONAL([ENABLE_TRIMESH], [test x$enable_trimesh = xyes]) AC_CONFIG_SUBDIRS([external/trimesh]) -- 1.6.1.2

1 0

[PATCH 01/27] Fix some copyright headers.
by Roland Levillain 03 Jun '09

03 Jun '09

* mln/io/abort.hh, * mln/io/fits/load.hh, * tests/core/image/edge_image.cc, * tests/core/image/vertex_image.cc: Restore wiped out years. * mln/io/pbm/all.hh, * mln/io/pfm/load.hh, * mln/io/pfm/save.hh: Fix years. * mln/metal/converts_to.hh, * tests/util/line_graph.cc: Missing whitespace. * mln/io/fits/all.hh, * mln/io/magick/all.hh, * mln/io/off/all.hh, * mln/io/pfm/all.hh, * mln/io/pgm/all.hh, * mln/io/pnm/all.hh, * mln/io/ppm/all.hh, * mln/io/tiff/all.hh, * mln/io/txt/all.hh, Add ``(LRDE)''. * mln/io/txt/save.hh: Aesthetic change. --- milena/ChangeLog | 28 ++++++++++++++++++++++++++++ milena/mln/io/abort.hh | 3 +-- milena/mln/io/fits/all.hh | 2 +- milena/mln/io/fits/load.hh | 3 +-- milena/mln/io/magick/all.hh | 2 +- milena/mln/io/off/all.hh | 2 +- milena/mln/io/pbm/all.hh | 4 ++-- milena/mln/io/pfm/all.hh | 2 +- milena/mln/io/pfm/load.hh | 3 +-- milena/mln/io/pfm/save.hh | 3 +-- milena/mln/io/pgm/all.hh | 2 +- milena/mln/io/pnm/all.hh | 2 +- milena/mln/io/ppm/all.hh | 2 +- milena/mln/io/tiff/all.hh | 2 +- milena/mln/io/txt/all.hh | 2 +- milena/mln/io/txt/save.hh | 3 +-- milena/mln/metal/converts_to.hh | 2 +- milena/tests/core/image/edge_image.cc | 3 ++- milena/tests/core/image/vertex_image.cc | 3 ++- milena/tests/util/line_graph.cc | 2 +- 20 files changed, 50 insertions(+), 25 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3c3f4b2..f40a943 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,31 @@ +2009-06-03 Roland Levillain <roland(a)lrde.epita.fr> + + Fix some copyright headers. + + * mln/io/abort.hh, + * mln/io/fits/load.hh, + * tests/core/image/edge_image.cc, + * tests/core/image/vertex_image.cc: + Restore wiped out years. + * mln/io/pbm/all.hh, + * mln/io/pfm/load.hh, + * mln/io/pfm/save.hh: + Fix years. + * mln/metal/converts_to.hh, + * tests/util/line_graph.cc: + Missing whitespace. + * mln/io/fits/all.hh, + * mln/io/magick/all.hh, + * mln/io/off/all.hh, + * mln/io/pfm/all.hh, + * mln/io/pgm/all.hh, + * mln/io/pnm/all.hh, + * mln/io/ppm/all.hh, + * mln/io/tiff/all.hh, + * mln/io/txt/all.hh, + Add ``(LRDE)''. + * mln/io/txt/save.hh: Aesthetic change. + 2009-06-03 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Help g++-2.95. diff --git a/milena/mln/io/abort.hh b/milena/mln/io/abort.hh index f41d7b3..629ea79 100644 --- a/milena/mln/io/abort.hh +++ b/milena/mln/io/abort.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 EPITA -// Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 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 diff --git a/milena/mln/io/fits/all.hh b/milena/mln/io/fits/all.hh index 42c3739..27aee26 100644 --- a/milena/mln/io/fits/all.hh +++ b/milena/mln/io/fits/all.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007 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 diff --git a/milena/mln/io/fits/load.hh b/milena/mln/io/fits/load.hh index df2a978..11949f7 100644 --- a/milena/mln/io/fits/load.hh +++ b/milena/mln/io/fits/load.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 EPITA -// Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 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 diff --git a/milena/mln/io/magick/all.hh b/milena/mln/io/magick/all.hh index a4c1ca5..545a9fd 100644 --- a/milena/mln/io/magick/all.hh +++ b/milena/mln/io/magick/all.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory +// Copyright (C) 2009 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 diff --git a/milena/mln/io/off/all.hh b/milena/mln/io/off/all.hh index bfcc080..d49081b 100644 --- a/milena/mln/io/off/all.hh +++ b/milena/mln/io/off/all.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory +// Copyright (C) 2008, 2009 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 diff --git a/milena/mln/io/pbm/all.hh b/milena/mln/io/pbm/all.hh index afd7922..17bd044 100644 --- a/milena/mln/io/pbm/all.hh +++ b/milena/mln/io/pbm/all.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 2009 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 diff --git a/milena/mln/io/pfm/all.hh b/milena/mln/io/pfm/all.hh index 9b918c0..0ca3dce 100644 --- a/milena/mln/io/pfm/all.hh +++ b/milena/mln/io/pfm/all.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007 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 diff --git a/milena/mln/io/pfm/load.hh b/milena/mln/io/pfm/load.hh index ebf2f97..aba7497 100644 --- a/milena/mln/io/pfm/load.hh +++ b/milena/mln/io/pfm/load.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 EPITA -// Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 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 diff --git a/milena/mln/io/pfm/save.hh b/milena/mln/io/pfm/save.hh index f9db876..7c94799 100644 --- a/milena/mln/io/pfm/save.hh +++ b/milena/mln/io/pfm/save.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 EPITA -// Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 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 diff --git a/milena/mln/io/pgm/all.hh b/milena/mln/io/pgm/all.hh index c10fa1a..df1fa4b 100644 --- a/milena/mln/io/pgm/all.hh +++ b/milena/mln/io/pgm/all.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007 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 diff --git a/milena/mln/io/pnm/all.hh b/milena/mln/io/pnm/all.hh index 3b258af..08f190a 100644 --- a/milena/mln/io/pnm/all.hh +++ b/milena/mln/io/pnm/all.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007 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 diff --git a/milena/mln/io/ppm/all.hh b/milena/mln/io/ppm/all.hh index a4318a0..64cda0f 100644 --- a/milena/mln/io/ppm/all.hh +++ b/milena/mln/io/ppm/all.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007 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 diff --git a/milena/mln/io/tiff/all.hh b/milena/mln/io/tiff/all.hh index d46dbdb..1fbf8fe 100644 --- a/milena/mln/io/tiff/all.hh +++ b/milena/mln/io/tiff/all.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory +// Copyright (C) 2009 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 diff --git a/milena/mln/io/txt/all.hh b/milena/mln/io/txt/all.hh index ce00758..eac9c2f 100644 --- a/milena/mln/io/txt/all.hh +++ b/milena/mln/io/txt/all.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory +// 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 diff --git a/milena/mln/io/txt/save.hh b/milena/mln/io/txt/save.hh index db0d423..f8d0511 100644 --- a/milena/mln/io/txt/save.hh +++ b/milena/mln/io/txt/save.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2008, 2009 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 diff --git a/milena/mln/metal/converts_to.hh b/milena/mln/metal/converts_to.hh index 99a1c8b..575b392 100644 --- a/milena/mln/metal/converts_to.hh +++ b/milena/mln/metal/converts_to.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009a EPITA Research and Development +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development // Laboratory (LRDE) // // This file is part of the Olena Library. This library is free diff --git a/milena/tests/core/image/edge_image.cc b/milena/tests/core/image/edge_image.cc index aab4712..c6b3478 100644 --- a/milena/tests/core/image/edge_image.cc +++ b/milena/tests/core/image/edge_image.cc @@ -1,4 +1,5 @@ -// Copyright(C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright(C) 2007, 2008, 2009 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 diff --git a/milena/tests/core/image/vertex_image.cc b/milena/tests/core/image/vertex_image.cc index e4c2425..3d39dec 100644 --- a/milena/tests/core/image/vertex_image.cc +++ b/milena/tests/core/image/vertex_image.cc @@ -1,4 +1,5 @@ -// Copyright(C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright(C) 2007, 2008, 2009 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 diff --git a/milena/tests/util/line_graph.cc b/milena/tests/util/line_graph.cc index 3370a5c..359459c 100644 --- a/milena/tests/util/line_graph.cc +++ b/milena/tests/util/line_graph.cc @@ -1,4 +1,4 @@ -// Copyright(C) 2008 EPITA Research and Development Laboratory(LRDE) +// 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 -- 1.6.1.2

1 0

r3954: Add script shell for tests/ hierarchy checking
by Fabien Freling 03 Jun '09

03 Jun '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk ChangeLog: 2009-06-03 Fabien Freling <fabien.freling(a)lrde.epita.fr> Add script shell for tests/ hierarchy checking. * build-aux/check_test_hierarchy.sh: New test for checking tests/ hierarchy. * milena/mln/labeling/compute.hh: Remove warning of unused variable. --- build-aux/check_test_hierarchy.sh | 57 ++++++++++++++++++++++++++++++++++++++ milena/mln/labeling/compute.hh | 1 2 files changed, 58 insertions(+) Index: trunk/build-aux/check_test_hierarchy.sh =================================================================== --- trunk/build-aux/check_test_hierarchy.sh (revision 0) +++ trunk/build-aux/check_test_hierarchy.sh (revision 3954) @@ -0,0 +1,57 @@ +#! /bin/sh + +failed_tests=0 +all_tests=0 + +check_directory () +{ + echo "Current directories: $1 $2" + for file in `ls $1`; do + + source_file=${file%.cc}.hh + if [ -f ${1}/$file ]; then + all_tests=$(($all_tests + 1)) + if [ -f ${2}/$source_file ]; then + echo "\t\e[0;32mOK\e[m $file <-> $source_file" + else +# FIXME: Manage exceptions. + if [ "$file" != "Makefile.am" ]; then + echo "\t\e[0;31mFAIL\e[m $source_file source does not exist." + failed_tests=$(($failed_tests + 1)) + fi + fi + fi + + if [ -d ${1}/$file ]; then + if [ -d ${2}/$file ]; then + echo "" + check_directory ${1}/$file ${2}/$file + else +# FIXME: Manage exceptions. + echo "\e[0;31mFAIL\e[m ${1}/$file source directory does not exist." + fi + fi + + done +} + +if [ $# -ne 2 ]; then + echo "Usage: ./check_test_hierarchy tests/ mln/" + exit 1 +fi + +echo "Test directory: $1" +echo "Source directory: $2" +echo "---" + +if [ -d ${1} ]; then + if [ -d ${2} ]; then + check_directory ${1} ${2} + else + echo "\e[0;31mFAIL\e[m ${1} source directory does not exist." + fi +fi + +echo "\n=====" +echo "Uncorrect tests: $failed_tests" + Property changes on: trunk/build-aux/check_test_hierarchy.sh ___________________________________________________________________ Name: svn:executable + * Index: trunk/milena/mln/labeling/compute.hh =================================================================== --- trunk/milena/mln/labeling/compute.hh (revision 3953) +++ trunk/milena/mln/labeling/compute.hh (revision 3954) @@ -258,6 +258,7 @@ //const A& a = exact(a_); const I& input = exact(input_); const L& label = exact(label_); + (void) nlabels; // FIXME: Check accus size with nlabels. //util::array<A> accus(static_cast<unsigned>(nlabels) + 1, a);

1 0