[Olena-patches] last-svn-commit-130-g7c82d9a Fix more tests.

* mln/core/image/imorph/labeled_image.hh: Include mln/data/compute.hh. * mln/io/fld/save.hh: Fix headers' inclusions. * mln/io/fld/write_header.hh: Likewise. Add missing namespace qualifiers. --- milena/ChangeLog | 10 ++++++++++ milena/mln/core/image/imorph/labeled_image.hh | 4 +++- milena/mln/io/fld/save.hh | 10 ++++++---- milena/mln/io/fld/write_header.hh | 16 ++++++++-------- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f8e7e2f..543b179 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-04-20 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Fix more tests. + + * mln/core/image/imorph/labeled_image.hh: Include + mln/data/compute.hh. + * mln/io/fld/save.hh: Fix headers' inclusions. + * mln/io/fld/write_header.hh: Likewise. + Add missing namespace qualifiers. + +2010-04-20 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Install meshes in $(pkgdatadir)/meshes. * mesh/Makefile.am (meshdir): Here. diff --git a/milena/mln/core/image/imorph/labeled_image.hh b/milena/mln/core/image/imorph/labeled_image.hh index 438f6ae..e53da02 100644 --- a/milena/mln/core/image/imorph/labeled_image.hh +++ b/milena/mln/core/image/imorph/labeled_image.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -40,6 +40,8 @@ # include <mln/accu/shape/bbox.hh> # include <mln/accu/stat/max.hh> +# include <mln/data/compute.hh> + # include <mln/labeling/compute.hh> namespace mln diff --git a/milena/mln/io/fld/save.hh b/milena/mln/io/fld/save.hh index bc9afdd..a834dcd 100644 --- a/milena/mln/io/fld/save.hh +++ b/milena/mln/io/fld/save.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -25,11 +26,14 @@ #ifndef MLN_IO_FLD_SAVE_HH # define MLN_IO_FLD_SAVE_HH + /// \file /// \brief Save an image to AVS field file format. /// /// \todo Handle not high speed images. +# include <fstream> + # include <mln/core/concept/image.hh> # include <mln/core/concept/gpoint.hh> # include <mln/io/fld/header.hh> @@ -38,9 +42,7 @@ # include <mln/algebra/vec.hh> -# include <mln/geom/nsites.hh> -# include <fstream> -# include <iostream> +# include <mln/geom/bbox.hh> namespace mln { diff --git a/milena/mln/io/fld/write_header.hh b/milena/mln/io/fld/write_header.hh index 326c68b..c803528 100644 --- a/milena/mln/io/fld/write_header.hh +++ b/milena/mln/io/fld/write_header.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -26,16 +27,15 @@ #ifndef MLN_IO_FLD_WRITE_HEADER_HH # define MLN_IO_FLD_WRITE_HEADER_HH -/// +/// \file /// \brief Write AVS headers in a file. -/// -/// -/// +# include <cstdlib> -# include <mln/io/fld/header.hh> # include <iostream> +# include <mln/io/fld/header.hh> + namespace mln { @@ -86,7 +86,7 @@ namespace mln break; default: std::cerr << "Data type not supported: abort()."; - abort(); + std::abort(); } switch (h.field) @@ -102,7 +102,7 @@ namespace mln break; default: std::cerr << "Field type not suported: abort()."; - abort(); + std::abort(); } file << "min_ext="; -- 1.5.6.5