Commit 961c2975 authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

Move morphers in core/image subdirectories.


	Special headers:

	* mln/core/image/essential.hh,
	* mln/core/image/all.hh: update.

	* mln/core/image/dmorph/all.hh,
	* mln/core/image/imorph/all.hh,
	* mln/core/image/morph/all.hh,
	* mln/core/image/vmorph/all.hh: new.


	Makefiles:

	* tests/core/image/Makefile.am: add new subdirs.

	* tests/core/image/dmorph/Makefile.am,
	* tests/core/image/imorph/Makefile.am,
	* tests/core/image/morph/Makefile.am,
	* tests/core/image/vmorph/Makefile.am: new.


	Domain morphers:

	* mln/core/image/extended.hh
	* mln/core/image/extension_fun.hh
	* mln/core/image/extension_ima.hh
	* mln/core/image/extension_val.hh
	* mln/core/image/hexa.hh
	* mln/core/image/hexa_piter.hh
	* mln/core/image/image2d_h.hh
	* mln/core/image/image_if.hh
	* mln/core/image/p2p_image.hh
	* mln/core/image/slice_image.hh
	* mln/core/image/sub_image.hh
	* mln/core/image/sub_image_if.hh
	* mln/core/image/unproject_image.hh: move...

	* mln/core/image/dmorph/extended.hh
	* mln/core/image/dmorph/extension_fun.hh
	* mln/core/image/dmorph/extension_ima.hh
	* mln/core/image/dmorph/extension_val.hh
	* mln/core/image/dmorph/hexa.hh
	* mln/core/image/dmorph/hexa_piter.hh
	* mln/core/image/dmorph/image2d_h.hh
	* mln/core/image/dmorph/image_if.hh
	* mln/core/image/dmorph/p2p_image.hh
	* mln/core/image/dmorph/slice_image.hh
	* mln/core/image/dmorph/sub_image.hh
	* mln/core/image/dmorph/sub_image_if.hh
	* mln/core/image/dmorph/unproject_image.hh: ... here.


	Identity morphers:

	* mln/core/image/decorated_image.hh
	* mln/core/image/interpolated.hh
	* mln/core/image/lazy_image.hh
	* mln/core/image/plain.hh
	* mln/core/image/safe.hh
	* mln/core/image/tr_image.hh: Move...

	* mln/core/image/imorph/decorated_image.hh
	* mln/core/image/imorph/interpolated.hh
	* mln/core/image/imorph/lazy_image.hh
	* mln/core/image/imorph/plain.hh
	* mln/core/image/imorph/safe.hh
	* mln/core/image/imorph/tr_image.hh: ... here.


	Image morpher:

	* mln/core/image/t_image.hh: Move...
	* mln/core/image/morph/t_image.hh: ... here.


	Value morphers:

	* mln/core/image/cast_image.hh
	* mln/core/image/fun_image.hh
	* mln/core/image/thru_morpher.hh
	* mln/core/image/thrubin_morpher.hh
	* mln/core/image/violent_cast_image.hh: Move...

	* mln/core/image/vmorph/cast_image.hh
	* mln/core/image/vmorph/fun_image.hh
	* mln/core/image/vmorph/thru_image.hh
	* mln/core/image/vmorph/thrubin_image.hh
	* mln/core/image/vmorph/violent_cast_image.h: ... here.


	Tests:

	* tests/core/image/hexa.cc ,
	* tests/core/image/image2d_h.cc ,
	* tests/core/image/image_if.cc ,
	* tests/core/image/p2p_image.cc ,
	* tests/core/image/slice_image.cc ,
	* tests/core/image/sub_image.cc,
	* tests/core/image/unproject_image.cc,
	* tests/core/image/decorated_image.cc,
	* tests/core/image/interpolated.cc ,
	* tests/core/image/safe_image.cc ,
	* tests/core/image/tr_image.cc,
	* tests/core/image/t_image.cc,
	* tests/core/image/cast_image.cc: Move...


	* tests/core/image/dmorph/hexa.cc,
	* tests/core/image/dmorph/image2d_h.cc,
	* tests/core/image/dmorph/image_if.cc,
	* tests/core/image/dmorph/p2p_image.cc,
	* tests/core/image/dmorph/slice_image.cc,
	* tests/core/image/dmorph/sub_image.cc,
	* tests/core/image/dmorph/unproject_image.cc,
	* tests/core/image/imorph/decorated_image.cc,
	* tests/core/image/imorph/interpolated.cc,
	* tests/core/image/imorph/safe_image.cc,
	* tests/core/image/imorph/tr_image.cc,
	* tests/core/image/morph/t_image.cc,
	* tests/core/image/vmorph/cast_image.cc: ... here.


	Includes.

	* tests/core/image/plain.cc,
	* tests/core/image/image_if_interval.cc,
	* mln/convert/impl/from_site_set_to_image.hh,
	* mln/core/routine/extend.hh,
	* mln/debug/slices_2d.hh,
	* mln/draw/line.hh,
	* mln/extract/blue.hh,
	* mln/extract/green.hh,
	* mln/extract/hue.hh,
	* mln/extract/lum.hh,
	* mln/extract/red.hh,
	* mln/extract/sat.hh,
	* mln/labeling/fill_holes.hh,
	* mln/level/replace.hh,
	* mln/make/image3d.hh,
	* mln/registration/icp.hh,
	* mln/transformation/rotate.hh,
	* mln/world/inter_pixel/dim2/make_edge_image.hh,
	* mln/world/inter_pixel/display_edge.hh,
	* mln/world/inter_pixel/is_pixel.hh,
	* mln/world/inter_pixel/is_separator.hh,
	* tests/arith/minus_full.cc,
	* tests/arith/plus_full.cc,
	* tests/arith/revert_full.cc,
	* tests/arith/times_full.cc,
	* tests/border/find.cc,
	* tests/border/find_full.cc,
	* tests/border/get.cc,
	* tests/border/get_full.cc,
	* tests/border/resize_image_if.cc,
	* tests/border/resize_sub_image.cc,
	* tests/canvas/chamfer.cc,
	* tests/convert/to_p_set.cc,
	* tests/convert/to_window.cc,
	* tests/labeling/level.cc,
	* tests/level/abs_full.cc,
	* tests/level/compare_full.cc,
	* tests/level/compute.cc,
	* tests/level/compute_full.cc,
	* tests/level/transform.cc,
	* tests/level/transform_full.cc,
	* tests/level/transform_inplace.cc,
	* tests/morpho/elementary/gradient.cc,
	* tests/morpho/elementary/gradient_external.cc,
	* tests/morpho/elementary/gradient_internal.cc,
	* tests/morpho/laplacian.cc,
	* tests/morpho/meyer_wst_long.cc,
	* tests/morpho/skeleton_constrained.cc,
	* tests/morpho/tree/compute_parent.cc,
	* tests/opt/at.cc,
	* tests/trait/image/images.cc,
	* tests/core/routine/duplicate.cc,
	* tests/core/routine/extend.cc,
	* tests/core/routine/initialize.cc,
	* tests/core/routine/primary.cc,
	* tests/data/fill_full.cc,
	* tests/data/fill_with_image.cc,
	* tests/data/fill_with_value.cc,
	* tests/data/paste.cc,
	* tests/data/paste_full.cc,
	* tests/draw/line.cc,
	* tests/extension/fill.cc,
	* tools/seed2tiling.cc: update includes.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3900 4aad255d-cdde-0310-9447-f3009e2ae8c0
parent e51e68d7
2009-05-28 Guillaume Lazzara <lazzara@lrde.epita.fr>
Move morphers in core/image subdirectories.
Special headers:
* mln/core/image/essential.hh,
* mln/core/image/all.hh: update.
* mln/core/image/dmorph/all.hh,
* mln/core/image/imorph/all.hh,
* mln/core/image/morph/all.hh,
* mln/core/image/vmorph/all.hh: new.
Makefiles:
* tests/core/image/Makefile.am: add new subdirs.
* tests/core/image/dmorph/Makefile.am,
* tests/core/image/imorph/Makefile.am,
* tests/core/image/morph/Makefile.am,
* tests/core/image/vmorph/Makefile.am: new.
Domain morphers:
* mln/core/image/extended.hh
* mln/core/image/extension_fun.hh
* mln/core/image/extension_ima.hh
* mln/core/image/extension_val.hh
* mln/core/image/hexa.hh
* mln/core/image/hexa_piter.hh
* mln/core/image/image2d_h.hh
* mln/core/image/image_if.hh
* mln/core/image/p2p_image.hh
* mln/core/image/slice_image.hh
* mln/core/image/sub_image.hh
* mln/core/image/sub_image_if.hh
* mln/core/image/unproject_image.hh: move...
* mln/core/image/dmorph/extended.hh
* mln/core/image/dmorph/extension_fun.hh
* mln/core/image/dmorph/extension_ima.hh
* mln/core/image/dmorph/extension_val.hh
* mln/core/image/dmorph/hexa.hh
* mln/core/image/dmorph/hexa_piter.hh
* mln/core/image/dmorph/image2d_h.hh
* mln/core/image/dmorph/image_if.hh
* mln/core/image/dmorph/p2p_image.hh
* mln/core/image/dmorph/slice_image.hh
* mln/core/image/dmorph/sub_image.hh
* mln/core/image/dmorph/sub_image_if.hh
* mln/core/image/dmorph/unproject_image.hh: ... here.
Identity morphers:
* mln/core/image/decorated_image.hh
* mln/core/image/interpolated.hh
* mln/core/image/lazy_image.hh
* mln/core/image/plain.hh
* mln/core/image/safe.hh
* mln/core/image/tr_image.hh: Move...
* mln/core/image/imorph/decorated_image.hh
* mln/core/image/imorph/interpolated.hh
* mln/core/image/imorph/lazy_image.hh
* mln/core/image/imorph/plain.hh
* mln/core/image/imorph/safe.hh
* mln/core/image/imorph/tr_image.hh: ... here.
Image morpher:
* mln/core/image/t_image.hh: Move...
* mln/core/image/morph/t_image.hh: ... here.
Value morphers:
* mln/core/image/cast_image.hh
* mln/core/image/fun_image.hh
* mln/core/image/thru_morpher.hh
* mln/core/image/thrubin_morpher.hh
* mln/core/image/violent_cast_image.hh: Move...
* mln/core/image/vmorph/cast_image.hh
* mln/core/image/vmorph/fun_image.hh
* mln/core/image/vmorph/thru_image.hh
* mln/core/image/vmorph/thrubin_image.hh
* mln/core/image/vmorph/violent_cast_image.h: ... here.
Tests:
* tests/core/image/hexa.cc ,
* tests/core/image/image2d_h.cc ,
* tests/core/image/image_if.cc ,
* tests/core/image/p2p_image.cc ,
* tests/core/image/slice_image.cc ,
* tests/core/image/sub_image.cc,
* tests/core/image/unproject_image.cc,
* tests/core/image/decorated_image.cc,
* tests/core/image/interpolated.cc ,
* tests/core/image/safe_image.cc ,
* tests/core/image/tr_image.cc,
* tests/core/image/t_image.cc,
* tests/core/image/cast_image.cc: Move...
* tests/core/image/dmorph/hexa.cc,
* tests/core/image/dmorph/image2d_h.cc,
* tests/core/image/dmorph/image_if.cc,
* tests/core/image/dmorph/p2p_image.cc,
* tests/core/image/dmorph/slice_image.cc,
* tests/core/image/dmorph/sub_image.cc,
* tests/core/image/dmorph/unproject_image.cc,
* tests/core/image/imorph/decorated_image.cc,
* tests/core/image/imorph/interpolated.cc,
* tests/core/image/imorph/safe_image.cc,
* tests/core/image/imorph/tr_image.cc,
* tests/core/image/morph/t_image.cc,
* tests/core/image/vmorph/cast_image.cc: ... here.
Includes.
* tests/core/image/plain.cc,
* tests/core/image/image_if_interval.cc,
* mln/convert/impl/from_site_set_to_image.hh,
* mln/core/routine/extend.hh,
* mln/debug/slices_2d.hh,
* mln/draw/line.hh,
* mln/extract/blue.hh,
* mln/extract/green.hh,
* mln/extract/hue.hh,
* mln/extract/lum.hh,
* mln/extract/red.hh,
* mln/extract/sat.hh,
* mln/labeling/fill_holes.hh,
* mln/level/replace.hh,
* mln/make/image3d.hh,
* mln/registration/icp.hh,
* mln/transformation/rotate.hh,
* mln/world/inter_pixel/dim2/make_edge_image.hh,
* mln/world/inter_pixel/display_edge.hh,
* mln/world/inter_pixel/is_pixel.hh,
* mln/world/inter_pixel/is_separator.hh,
* tests/arith/minus_full.cc,
* tests/arith/plus_full.cc,
* tests/arith/revert_full.cc,
* tests/arith/times_full.cc,
* tests/border/find.cc,
* tests/border/find_full.cc,
* tests/border/get.cc,
* tests/border/get_full.cc,
* tests/border/resize_image_if.cc,
* tests/border/resize_sub_image.cc,
* tests/canvas/chamfer.cc,
* tests/convert/to_p_set.cc,
* tests/convert/to_window.cc,
* tests/labeling/level.cc,
* tests/level/abs_full.cc,
* tests/level/compare_full.cc,
* tests/level/compute.cc,
* tests/level/compute_full.cc,
* tests/level/transform.cc,
* tests/level/transform_full.cc,
* tests/level/transform_inplace.cc,
* tests/morpho/elementary/gradient.cc,
* tests/morpho/elementary/gradient_external.cc,
* tests/morpho/elementary/gradient_internal.cc,
* tests/morpho/laplacian.cc,
* tests/morpho/meyer_wst_long.cc,
* tests/morpho/skeleton_constrained.cc,
* tests/morpho/tree/compute_parent.cc,
* mln/morpho/watershed/superpose.hh,
* tests/opt/at.cc,
* tests/trait/image/images.cc,
* tests/core/routine/duplicate.cc,
* tests/core/routine/extend.cc,
* tests/core/routine/initialize.cc,
* tests/core/routine/primary.cc,
* tests/data/fill_full.cc,
* tests/data/fill_with_image.cc,
* tests/data/fill_with_value.cc,
* tests/data/paste.cc,
* tests/data/paste_full.cc,
* tests/draw/line.cc,
* tests/extension/fill.cc,
* tools/seed2tiling.cc: update includes.
2009-05-28 Edwin Carlinet <carlinet@lrde.epita.fr>
 
Move tests for component tree filtering.
......@@ -32,7 +32,7 @@
///
/// General conversion procedure from a site_set to an image.
# include <mln/core/image/sub_image.hh>
# include <mln/core/image/dmorph/sub_image.hh>
# include <mln/geom/bbox.hh>
# include <mln/trait/image_from_grid.hh>
# include <mln/data/fill.hh>
......
......@@ -36,12 +36,14 @@
// Sub-directories.
# include <mln/core/image/morph/all.hh>
# include <mln/core/image/dmorph/all.hh>
# include <mln/core/image/imorph/all.hh>
# include <mln/core/image/vmorph/all.hh>
// Files.
# include <mln/core/image/cast_image.hh>
# include <mln/core/image/ch_piter.hh>
# include <mln/core/image/complex_image.hh>
# include <mln/core/image/complex_neighborhood_piter.hh>
......@@ -49,60 +51,21 @@
# include <mln/core/image/complex_window_piter.hh>
# include <mln/core/image/complex_windows.hh>
# include <mln/core/image/edge_image.hh>
# include <mln/core/image/image2d.hh>
# include <mln/core/image/flat_image.hh>
# include <mln/core/image/image_if.hh>
# include <mln/core/image/sub_image.hh>
# include <mln/core/image/image1d.hh>
# include <mln/core/image/decorated_image.hh>
# include <mln/core/image/extended.hh>
# include <mln/core/image/extension_fun.hh>
# include <mln/core/image/extension_ima.hh>
# include <mln/core/image/extension_val.hh>
# include <mln/core/image/flat_image.hh>
# include <mln/core/image/graph_elt_neighborhood.hh>
# include <mln/core/image/graph_elt_neighborhood_if.hh>
# include <mln/core/image/graph_elt_window.hh>
# include <mln/core/image/graph_elt_window_if.hh>
# include <mln/core/image/graph_window_piter.hh>
# include <mln/core/image/graph_window_if_piter.hh>
# include <mln/core/image/graph_window_piter.hh>
# include <mln/core/image/image1d.hh>
# include <mln/core/image/image2d.hh>
# include <mln/core/image/image3d.hh>
# include <mln/core/image/image_if.hh>
# include <mln/core/image/interpolated.hh>
# include <mln/core/image/lazy_image.hh>
# include <mln/core/image/p2p_image.hh>
# include <mln/core/image/plain.hh>
# include <mln/core/image/safe.hh>
# include <mln/core/image/slice_image.hh>
# include <mln/core/image/sparse_encode.hh>
# include <mln/core/image/sparse_image.hh>
# include <mln/core/image/sub_image.hh>
# include <mln/core/image/sub_image_if.hh>
# include <mln/core/image/t_image.hh>
# include <mln/core/image/tr_image.hh>
# include <mln/core/image/tr_mesh.hh>
# include <mln/core/image/unproject_image.hh>
# include <mln/core/image/vertex_image.hh>
//# include <mln/core/image/bgraph_image.hh>
//# include <mln/core/image/bgraph_psite.hh>
//# include <mln/core/image/fi_adaptor.hh>
//# include <mln/core/image/graph_image.hh>
//# include <mln/core/image/hexa.hh>
//# include <mln/core/image/hexa_piter.hh>
//# include <mln/core/image/image2d_h.hh>
//# include <mln/core/image/mono_obased_rle_encode.hh>
//# include <mln/core/image/mono_obased_rle_image.hh>
//# include <mln/core/image/mono_rle_encode.hh>
//# include <mln/core/image/mono_rle_image.hh>
//# include <mln/core/image/obased_rle_encode.hh>
//# include <mln/core/image/obased_rle_image.hh>
//# include <mln/core/image/rle_encode.hh>
//# include <mln/core/image/rle_image.hh>
//# include <mln/core/image/value_enc_image.hh>
//# include <mln/core/image/value_encode.hh>
#endif // ! MLN_CORE_IMAGE_ALL_HH
......@@ -34,6 +34,18 @@
# include <mln/core/image/dmorph/transformed_image.hh>
# include <mln/core/image/dmorph/extended.hh>
# include <mln/core/image/dmorph/extension_fun.hh>
# include <mln/core/image/dmorph/extension_ima.hh>
# include <mln/core/image/dmorph/extension_val.hh>
# include <mln/core/image/dmorph/hexa.hh>
# include <mln/core/image/dmorph/image_if.hh>
# include <mln/core/image/dmorph/image2d_h.hh>
# include <mln/core/image/dmorph/p2p_image.hh>
# include <mln/core/image/dmorph/slice_image.hh>
# include <mln/core/image/dmorph/sub_image.hh>
# include <mln/core/image/dmorph/sub_image_if.hh>
# include <mln/core/image/dmorph/unproject_image.hh>
#endif // ! MLN_CORE_IMAGE_DMORPH_ALL_HH
// Copyright (C) 2008 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
......@@ -25,10 +26,10 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
#ifndef MLN_CORE_IMAGE_EXTENDED_HH
# define MLN_CORE_IMAGE_EXTENDED_HH
#ifndef MLN_CORE_IMAGE_DMORPH_EXTENDED_HH
# define MLN_CORE_IMAGE_DMORPH_EXTENDED_HH
/// \file mln/core/image/extended.hh
/// \file mln/core/image/dmorph/extended.hh
///
/// Definition of morpher that makes an image become restricted
/// given by a point set.
......@@ -86,7 +87,7 @@ namespace mln
/// \brief Makes an image become restricted by a point set.
/// Makes an image become restricted by a point set.
///
/// \ingroup modimagedomainmorpher
//
......@@ -223,4 +224,4 @@ namespace mln
} // end of namespace mln
#endif // ! MLN_CORE_IMAGE_EXTENDED_HH
#endif // ! MLN_CORE_IMAGE_DMORPH_EXTENDED_HH
......@@ -26,10 +26,10 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
#ifndef MLN_CORE_IMAGE_EXTENSION_FUN_HH
# define MLN_CORE_IMAGE_EXTENSION_FUN_HH
#ifndef MLN_CORE_IMAGE_DMORPH_EXTENSION_FUN_HH
# define MLN_CORE_IMAGE_DMORPH_EXTENSION_FUN_HH
/// \file mln/core/image/extension_fun.hh
/// \file mln/core/image/dmorph/extension_fun.hh
///
/// definition of a morpher that extends the domain of an image
/// with a function.
......@@ -94,7 +94,7 @@ namespace mln
/// \brief Extends the domain of an image with a function.
/// Extends the domain of an image with a function.
///
/// \ingroup modimagedomainmorpher
//
......@@ -271,4 +271,4 @@ namespace mln
} // end of namespace mln
#endif // ! MLN_CORE_IMAGE_EXTENSION_FUN_HH
#endif // ! MLN_CORE_IMAGE_DMORPH_EXTENSION_FUN_HH
// Copyright (C) 2008 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
......@@ -25,10 +26,10 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
#ifndef MLN_CORE_IMAGE_EXTENSION_IMA_HH
# define MLN_CORE_IMAGE_EXTENSION_IMA_HH
#ifndef MLN_CORE_IMAGE_DMORPH_EXTENSION_IMA_HH
# define MLN_CORE_IMAGE_DMORPH_EXTENSION_IMA_HH
/// \file mln/core/image/extension_ima.hh
/// \file mln/core/image/dmorph/extension_ima.hh
///
/// Definition of a morpher that extends the domain of an image
/// with an image.
......@@ -90,7 +91,7 @@ namespace mln
/// \brief Extends the domain of an image with an image.
/// Extends the domain of an image with an image.
///
/// \ingroup modimagedomainmorpher
//
......@@ -275,4 +276,4 @@ namespace mln
} // end of namespace mln
#endif // ! MLN_CORE_IMAGE_EXTENSION_IMA_HH
#endif // ! MLN_CORE_IMAGE_DMORPH_EXTENSION_IMA_HH
// Copyright (C) 2008 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
......@@ -25,10 +26,10 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
#ifndef MLN_CORE_IMAGE_EXTENSION_VAL_HH
# define MLN_CORE_IMAGE_EXTENSION_VAL_HH
#ifndef MLN_CORE_IMAGE_DMORPH_EXTENSION_VAL_HH
# define MLN_CORE_IMAGE_DMORPH_EXTENSION_VAL_HH
/// \file mln/core/image/extension_val.hh
/// \file mln/core/image/dmorph/extension_val.hh
///
/// \brief Definition of a morpher that extends the domain of an image.
///
......@@ -92,7 +93,7 @@ namespace mln
/// \brief Extends the domain of an image with a value.
/// Extends the domain of an image with a value.
///
/// \ingroup modimagedomainmorpher
//
......@@ -275,4 +276,4 @@ namespace mln
} // end of namespace mln
#endif // ! MLN_CORE_IMAGE_EXTENSION_VAL_HH
#endif // ! MLN_CORE_IMAGE_DMORPH_EXTENSION_VAL_HH
......@@ -27,11 +27,11 @@
// Public License.
#ifndef MLN_CORE_IMAGE_HEXA_HH
# define MLN_CORE_IMAGE_HEXA_HH
#ifndef MLN_CORE_IMAGE_DMORPH_HEXA_HH
# define MLN_CORE_IMAGE_DMORPH_HEXA_HH
/// \file mln/core/image/hexa.hh
/// \file mln/core/image/dmorph/hexa.hh
///
/// Definition of a morpher that makes hexagonal the mesh of an
/// image.
......@@ -39,7 +39,7 @@
# include <mln/core/internal/image_domain_morpher.hh>
# include <mln/core/alias/point2d_h.hh>
# include <mln/core/alias/box2d_h.hh>
# include <mln/core/image/hexa_piter.hh>
# include <mln/core/image/dmorph/hexa_piter.hh>
namespace mln
......@@ -272,4 +272,4 @@ namespace mln
} // end of namespace mln
#endif // ! MLN_CORE_IMAGE_HEXA_HH
#endif // ! MLN_CORE_IMAGE_DMORPH_HEXA_HH
......@@ -26,10 +26,10 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
#ifndef MLN_CORE_IMAGE_HEXA_PITER_HH
# define MLN_CORE_IMAGE_HEXA_PITER_HH
#ifndef MLN_CORE_IMAGE_DMORPH_HEXA_PITER_HH
# define MLN_CORE_IMAGE_DMORPH_HEXA_PITER_HH
/// \file mln/core/image/hexa_piter.hh
/// \file mln/core/image/dmorph/hexa_piter.hh
///
/// Definition of iterators on hexagonal points.
......@@ -141,4 +141,4 @@ namespace mln
} // end of namespace mln
#endif // ! MLN_CORE_IMAGE_HEXA_PITER_HH
#endif // ! MLN_CORE_IMAGE_DMORPH_HEXA_PITER_HH
// Copyright (C) 2007, 2008 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
......@@ -26,16 +26,16 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
#ifndef MLN_CORE_IMAGE_IMAGE2D_H_HH
# define MLN_CORE_IMAGE_IMAGE2D_H_HH
#ifndef MLN_CORE_IMAGE_DMORPH_IMAGE2D_H_HH
# define MLN_CORE_IMAGE_DMORPH_IMAGE2D_H_HH
/// \file mln/core/image/image2d_h.hh
/// \file mln/core/image/dmorph/image2d_h.hh
///
/// Definition of an alias for a 2d image based on an hexagonal
/// mesh.
# include <mln/core/image/image2d.hh>
# include <mln/core/image/hexa.hh>
# include <mln/core/image/dmorph/hexa.hh>
# include <mln/border/thickness.hh>
......@@ -45,9 +45,10 @@
namespace mln
{
/// \brief 2d image based on an hexagonal mesh.
/// 2d image based on an hexagonal mesh.
///
/// \ingroup modimageconcrete
//
template <typename V>
struct image2d_h
: public hexa< image2d<V> >
......@@ -98,4 +99,4 @@ namespace mln
} // end of namespace mln
#endif // ! MLN_CORE_IMAGE_IMAGE2D_H_HH
#endif // ! MLN_CORE_IMAGE_DMORPH_IMAGE2D_H_HH
......@@ -26,10 +26,10 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
#ifndef MLN_CORE_IMAGE_IMAGE_IF_HH
# define MLN_CORE_IMAGE_IMAGE_IF_HH
#ifndef MLN_CORE_IMAGE_DMORPH_IMAGE_IF_HH
# define MLN_CORE_IMAGE_DMORPH_IMAGE_IF_HH
/// \file mln/core/image/image_if.hh
/// \file mln/core/image/dmorph/image_if.hh
///
/// Definition of a image which domain is restricted by a
/// function.
......@@ -89,7 +89,7 @@ namespace mln
/// \brief Image which domain is restricted by a function.
/// Image which domain is restricted by a function.
///
/// \ingroup modimagedomainmorpher
//
......@@ -270,4 +270,4 @@ namespace mln
} // end of namespace mln
#endif // ! MLN_CORE_IMAGE_IMAGE_IF_HH
#endif // ! MLN_CORE_IMAGE_DMORPH_IMAGE_IF_HH
......@@ -25,10 +25,10 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
#ifndef MLN_CORE_IMAGE_P2P_IMAGE_HH
# define MLN_CORE_IMAGE_P2P_IMAGE_HH
#ifndef MLN_CORE_IMAGE_DMORPH_P2P_IMAGE_HH
# define MLN_CORE_IMAGE_DMORPH_P2P_IMAGE_HH
/// \file mln/core/image/p2p_image.hh
/// \file mln/core/image/dmorph/p2p_image.hh
///
/// Definition of a image FIXME: Doc!
......@@ -86,6 +86,8 @@ namespace mln
/// FIXME: Doc!
///
/// \ingroup modimagedomainmorpher
template <typename I, typename F>
struct p2p_image : public internal::image_domain_morpher< I,
mln_domain(I),
......@@ -271,4 +273,4 @@ namespace mln
#endif // ! MLN_CORE_IMAGE_P2P_IMAGE_HH
#endif // ! MLN_CORE_IMAGE_DMORPH_P2P_IMAGE_HH
......@@ -26,10 +26,10 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
#ifndef MLN_CORE_IMAGE_SLICE_IMAGE_HH
# define MLN_CORE_IMAGE_SLICE_IMAGE_HH
#ifndef MLN_CORE_IMAGE_DMORPH_SLICE_IMAGE_HH
# define MLN_CORE_IMAGE_DMORPH_SLICE_IMAGE_HH
/// \file mln/core/image/slice_image.hh
/// \file mln/core/image/dmorph/slice_image.hh
///
/// Definition of a 2D image extracted from a slice of a 3D image.
///
......@@ -90,7 +90,7 @@ namespace mln
/// \brief 2D image extracted from a slice of a 3D image.
/// 2D image extracted from a slice of a 3D image.
///
/// \ingroup modimagedomainmorpher
//
......@@ -305,4 +305,4 @@ namespace mln
#endif // ! MLN_CORE_IMAGE_SLICE_IMAGE_HH
#endif // ! MLN_CORE_IMAGE_DMORPH_SLICE_IMAGE_HH
......@@ -26,10 +26,10 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
#ifndef MLN_CORE_IMAGE_SUB_IMAGE_HH
# define MLN_CORE_IMAGE_SUB_IMAGE_HH
#ifndef MLN_CORE_IMAGE_DMORPH_SUB_IMAGE_HH
# define MLN_CORE_IMAGE_DMORPH_SUB_IMAGE_HH
/// \file mln/core/image/sub_image.hh
/// \file mln/core/image/dmorph/sub_image.hh
///
/// Definition of morpher that makes an image become restricted
/// given by a point set.
......@@ -45,7 +45,7 @@ namespace mln
{
// Fwd decl.
// Forward declaration.
template <typename I, typename S> class sub_image;
......@@ -96,7 +96,7 @@ namespace mln