* mln/transform/all.hh: include new file. * mln/transform/distance_and_influence_zone_geodesic.hh: new routine. --- milena/ChangeLog | 8 ++ milena/mln/transform/all.hh | 4 +- .../distance_and_influence_zone_geodesic.hh | 96 ++++++++++++++++++++ 3 files changed, 107 insertions(+), 1 deletions(-) create mode 100644 milena/mln/transform/distance_and_influence_zone_geodesic.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 2d33b38..5944d9b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2009-03-18 Guillaume Lazzara <lazzara@lrde.epita.fr> + + Add transform::distance_and_influence_zone_geodesic. + + * mln/transform/all.hh: include new file. + + * mln/transform/distance_and_influence_zone_geodesic.hh: new routine. + 2009-03-19 Thierry Geraud <thierry.geraud@lrde.epita.fr> Add meta-code to access component types of value types. diff --git a/milena/mln/transform/all.hh b/milena/mln/transform/all.hh index 4967197..7d6ef27 100644 --- a/milena/mln/transform/all.hh +++ b/milena/mln/transform/all.hh @@ -1,4 +1,5 @@ -// 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 @@ -43,6 +44,7 @@ namespace mln # include <mln/transform/distance_and_closest_point_geodesic.hh> +# include <mln/transform/distance_and_influence_zone_geodesic.hh> # include <mln/transform/distance_front.hh> # include <mln/transform/distance_geodesic.hh> # include <mln/transform/influence_zone_front.hh> diff --git a/milena/mln/transform/distance_and_influence_zone_geodesic.hh b/milena/mln/transform/distance_and_influence_zone_geodesic.hh new file mode 100644 index 0000000..f461d30 --- /dev/null +++ b/milena/mln/transform/distance_and_influence_zone_geodesic.hh @@ -0,0 +1,96 @@ +// 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. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_TRANSFORM_DISTANCE_AND_INFLUENCE_ZONE_GEODESIC_HH +# define MLN_TRANSFORM_DISTANCE_AND_INFLUENCE_ZONE_GEODESIC_HH + +/// \file mln/transform/distance_and_influence_zone_geodesic.hh +/// +/// Distance and geodesic closest point transform. + +# include <mln/canvas/distance_geodesic.hh> +# include <mln/transform/internal/influence_zone_functor.hh> + +# include <mln/data/fill.hh> +# include <mln/util/couple.hh> + + +namespace mln +{ + + namespace transform + { + + /// Discrete geodesic distance transform + /// + /// \param[in] input Image from which the geodesic distance is computed. + /// \param[in] nbh Neighborhood + /// \param[in] max Max distance of propagation. + /// + /// \return a couple of images. The first one is the distance map and the + /// second one is the closest point image. The closest point image + /// contains sites. + /// + /// \post The returned images have the same domain as \p input. + template <typename I, typename N, typename D> + util::couple<mln_ch_value(I,D), I> + distance_and_influence_zone_geodesic(const Image<I>& input, + const Neighborhood<N>& nbh, + D max); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename I, typename N, typename D> + inline + util::couple<mln_ch_value(I,D), I> + distance_and_influence_zone_geodesic(const Image<I>& input, + const Neighborhood<N>& nbh, + D max) + { + trace::entering("transform::distance_influence_zone_geodesic"); + + mln_precondition(exact(input).is_valid()); + mln_precondition(exact(nbh).is_valid()); + + internal::influence_zone_functor<I> f; + mln_ch_value(I,D) dmap = mln::canvas::distance_geodesic(input, nbh, + max, f); + + trace::exiting("transform::distance_and_influence_zone_geodesic"); + return make::couple(dmap, f.output); + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::transform + +} // end of namespace mln + + +#endif // ! MLN_TRANSFORM_DISTANCE_AND_INFLUENCE_ZONE_GEODESIC_HH -- 1.5.6.5