Commit 7c82d9a9 authored by Roland Levillain's avatar Roland Levillain
Browse files

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.
parent d0cba60a
2010-04-20 Roland Levillain <roland@lrde.epita.fr>
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 <roland@lrde.epita.fr> 2010-04-20 Roland Levillain <roland@lrde.epita.fr>
   
Install meshes in $(pkgdatadir)/meshes. Install meshes in $(pkgdatadir)/meshes.
// 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. // This file is part of Olena.
// //
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
# include <mln/accu/shape/bbox.hh> # include <mln/accu/shape/bbox.hh>
# include <mln/accu/stat/max.hh> # include <mln/accu/stat/max.hh>
# include <mln/data/compute.hh>
# include <mln/labeling/compute.hh> # include <mln/labeling/compute.hh>
namespace mln namespace mln
......
// 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. // This file is part of Olena.
// //
...@@ -25,11 +26,14 @@ ...@@ -25,11 +26,14 @@
#ifndef MLN_IO_FLD_SAVE_HH #ifndef MLN_IO_FLD_SAVE_HH
# define MLN_IO_FLD_SAVE_HH # define MLN_IO_FLD_SAVE_HH
/// \file /// \file
/// \brief Save an image to AVS field file format. /// \brief Save an image to AVS field file format.
/// ///
/// \todo Handle not high speed images. /// \todo Handle not high speed images.
# include <fstream>
# include <mln/core/concept/image.hh> # include <mln/core/concept/image.hh>
# include <mln/core/concept/gpoint.hh> # include <mln/core/concept/gpoint.hh>
# include <mln/io/fld/header.hh> # include <mln/io/fld/header.hh>
...@@ -38,9 +42,7 @@ ...@@ -38,9 +42,7 @@
# include <mln/algebra/vec.hh> # include <mln/algebra/vec.hh>
# include <mln/geom/nsites.hh> # include <mln/geom/bbox.hh>
# include <fstream>
# include <iostream>
namespace mln namespace mln
{ {
......
// 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. // This file is part of Olena.
// //
...@@ -26,16 +27,15 @@ ...@@ -26,16 +27,15 @@
#ifndef MLN_IO_FLD_WRITE_HEADER_HH #ifndef MLN_IO_FLD_WRITE_HEADER_HH
# define MLN_IO_FLD_WRITE_HEADER_HH # define MLN_IO_FLD_WRITE_HEADER_HH
/// /// \file
/// \brief Write AVS headers in a file. /// \brief Write AVS headers in a file.
///
///
///
# include <cstdlib>
# include <mln/io/fld/header.hh>
# include <iostream> # include <iostream>
# include <mln/io/fld/header.hh>
namespace mln namespace mln
{ {
...@@ -86,7 +86,7 @@ namespace mln ...@@ -86,7 +86,7 @@ namespace mln
break; break;
default: default:
std::cerr << "Data type not supported: abort()."; std::cerr << "Data type not supported: abort().";
abort(); std::abort();
} }
switch (h.field) switch (h.field)
...@@ -102,7 +102,7 @@ namespace mln ...@@ -102,7 +102,7 @@ namespace mln
break; break;
default: default:
std::cerr << "Field type not suported: abort()."; std::cerr << "Field type not suported: abort().";
abort(); std::abort();
} }
file << "min_ext="; file << "min_ext=";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment