* mln/io/off/load.hh, * tests/io/off/load_bin.cc: Here. --- milena/ChangeLog | 8 ++++++++ milena/mln/io/off/load.hh | 13 +++---------- milena/tests/io/off/load_bin.cc | 4 +--- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3c2e65d..37cd5d2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2008-10-22 Roland Levillain <roland@lrde.epita.fr> + Use alias mln::bin_2complex_image3df. + + * mln/io/off/load.hh, + * tests/io/off/load_bin.cc: + Here. + +2008-10-22 Roland Levillain <roland@lrde.epita.fr> + Provide an alias for binary 2-complex-based 3-dimensional images. * mln/core/alias/bin_2complex_image3df.hh: New. diff --git a/milena/mln/io/off/load.hh b/milena/mln/io/off/load.hh index ff8d106..1a00f3d 100644 --- a/milena/mln/io/off/load.hh +++ b/milena/mln/io/off/load.hh @@ -40,12 +40,7 @@ # include <string> -# include <mln/core/image/complex_image.hh> -# include <mln/geom/complex_geometry.hh> -# include <mln/core/alias/point3df.hh> - -// // FIXME: Really needed? -// # include <mln/topo/n_faces_set.hh> +# include <mln/core/alias/bin_2complex_image3df.hh> namespace mln @@ -64,8 +59,7 @@ namespace mln The image is said boolean since data only represent the existence of vertices and faces. */ - void load(complex_image<2, geom::complex_geometry<2,point3df>, bool>& ima, - const std::string& filename); + void load(bin_2complex_image3df& ima, const std::string& filename); namespace internal { @@ -77,8 +71,7 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - void load(complex_image<2 ,geom::complex_geometry<2,point3df>, bool>& ima, - const std::string& filename) + void load(bin_2complex_image3df& ima, const std::string& filename) { const std::string me = "mln::io::load::off"; diff --git a/milena/tests/io/off/load_bin.cc b/milena/tests/io/off/load_bin.cc index e171704..341c874 100644 --- a/milena/tests/io/off/load_bin.cc +++ b/milena/tests/io/off/load_bin.cc @@ -42,9 +42,7 @@ int main() { using namespace mln; - /* FIXME: Create an alias in milena/mln/core/alias/ for this - particular image type? */ - typedef mln::complex_image<2, geom::complex_geometry<2,point3df>, bool> ima_t; + typedef bin_2complex_image3df ima_t; ima_t ima; io::off::load(ima, MLN_MESH_DIR "/tetrahedron.off"); -- 1.6.0.1