[Olena-patches] olena-2.0-27-g63675c3 Add Moravec corner detection.

* mln/detection/corner/moravec.hh: New. * mln/detection/corner/moravec_criterion.hh: New. --- milena/ChangeLog | 7 + milena/mln/detection/corner/moravec.hh | 147 ++++++++++++++++++++++ milena/mln/detection/corner/moravec_criterion.hh | 114 +++++++++++++++++ 3 files changed, 268 insertions(+), 0 deletions(-) create mode 100644 milena/mln/detection/corner/moravec.hh create mode 100644 milena/mln/detection/corner/moravec_criterion.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 9306422..4468140 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2012-10-03 Jonathan Fabrizio &lt;jonathan(a)lrde.epita.fr&gt; + + Add Moravec corner detection. + + * mln/detection/corner/moravec.hh: New. + * mln/detection/corner/moravec_criterion.hh: New. + 2012-10-02 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; * mln/core/internal/site_relative_iterator_base.hh: Fix a diff --git a/milena/mln/detection/corner/moravec.hh b/milena/mln/detection/corner/moravec.hh new file mode 100644 index 0000000..b9af479 --- /dev/null +++ b/milena/mln/detection/corner/moravec.hh @@ -0,0 +1,147 @@ +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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_DETECTION_CORNER_MORAVEC_HH +# define MLN_DETECTION_CORNER_MORAVEC_HH + +#include <mln/core/site_set/p_array.hh> +#include <mln/extension/adjust_duplicate.hh> +#include <mln/metal/is.hh> +#include <mln/win/rectangle2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/detection/corner/moravec_criterion.hh> + +/// \file +/// +/// \brief Implementation of Moravec corner detection. + + +namespace mln +{ + namespace detection + { + namespace corner + { + /** + Computes Moravec corner detection on \p in_image + + \param image_in_ The input image + \param win The window of moravec algorithm + \param nbh All possible positions of the window + \return The list of points detected as corner + + \author J. Fabrizio + */ + template<typename I, typename W, typename N> + p_array<mln_site(I)> + moravec(const Image<I>& in_image_, const Window<W>& win, const Neighborhood<N>& nbh); + + /** + Computes Moravec corner detection on \p in_image + with a default 3x3 window and a defaut 3x3 neighborhood. + + \param image_in_ The input image + \return The list of points detected as corner + + \author J. Fabrizio + */ + template<typename I> + p_array<mln_site(I)> + moravec(const Image<I>& in_image_); + + + +# ifndef MLN_INCLUDE_ONLY + + + namespace internal + { + /** + \iternal Computes local min to find corner in an image + + \param image_in_ The result of moravec_criterion + \return The list of local min + + \author J. Fabrizio + */ + template<typename I> + p_array<mln_site(I)> + moravec_local_min(const Image<I>& in_image_) + { + trace::entering("detection::corner::moravec_local_min"); + + const I& in_image = exact(in_image_); + p_array<mln_site(I)> result; + mln_piter(I) p(in_image.domain()); + for_all(p) + { + bool max = true; + mln_niter(neighb2d) n(c8(), p); + for_all(n) { + if (in_image(p)<=in_image(n)) + { + max = false; + break; + } + } + if (max) { + result.append(p); + } + } + trace::exiting("detection::corner::moravec_local_min"); + return result; + } + + } // end of namespace mln::detection::corner::internal + + template<typename I, typename W, typename N> + p_array<mln_site(I)> + moravec(const Image<I>& in_image_, const Window<W>& win, const Neighborhood<N>& nbh) { + trace::entering("detection::corner::moravec"); + mln_ch_value(I, unsigned short) criterion_image; + criterion_image = moravec_criterion(in_image_, win, nbh); + trace::exiting("detection::corner::moravec"); + return internal::moravec_local_min(criterion_image); + } + + template<typename I> + p_array<mln_site(I)> + moravec(const Image<I>& in_image_) { + return moravec(in_image_, win_c8p(), c8()); + } + + + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::detection::corner + } // end of namespace mln::detection + + +} // end of namespace mln + +#endif // ! MLN_DETECTION_CORNER_MORAVEC_HH diff --git a/milena/mln/detection/corner/moravec_criterion.hh b/milena/mln/detection/corner/moravec_criterion.hh new file mode 100644 index 0000000..86c834f --- /dev/null +++ b/milena/mln/detection/corner/moravec_criterion.hh @@ -0,0 +1,114 @@ +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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_DETECTION_CORNER_MORAVEC_CRITERION_HH +# define MLN_DETECTION_CORNER_MORAVEC_CRITERION_HH + +#include <mln/extension/adjust_duplicate.hh> +//#include <mln/metal/is.hh> +#include <mln/win/rectangle2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/alias/window2d.hh> + +/// \file +/// +/// \brief Implementation of Moravec corner detection. + + +namespace mln +{ + namespace detection + { + namespace corner + { + /** + Computes the criterion necessary to Moravec corner detection. + + \param in_image_ the orginal image + + \param win_ The window + + \param nbh_ All possible positions of the window + + \return Scores computed by Moravec criterion + + \author J. Fabrizio + */ + template<typename I, typename W, typename N> + mln_ch_value(I, unsigned short) + moravec_criterion(const Image<I>& in_image_, const Window<W>& win_, const Neighborhood<N>& nbh_); + +# ifndef MLN_INCLUDE_ONLY + + template<typename I, typename W, typename N> + mln_ch_value(I, unsigned short) + moravec_criterion(const Image<I>& in_image_, const Window<W>& win_, const Neighborhood<N>& nbh_) + { + trace::entering("detection::corner::moravec_criterion"); + + //mlc_is(W, mln::win::rectangle2d)::check(); + //mlc_is(nbh, win::rectangle2d)::check(); + + const I& in_image = exact(in_image_); + const W& win = exact(win_); + const N& nbh = exact(nbh_); + + mln_precondition(in_image.is_valid()); + // ... + + mln_ch_value(I, unsigned short) out_image(in_image.domain()); + + extension::adjust_duplicate(in_image, mln::geom::delta(win)+mln::geom::delta(nbh)); + + mln_piter(I) p(in_image.domain()); + mln_qiter(W) q(win, p); + mln_niter(N) n(nbh, p); + mln_qiter(W) q2(win, n); + for_all(p) + { + unsigned short result=mln_max( unsigned short ); + for_all(n) + { + unsigned short r=0; + for_all_2(q, q2) + r+=(in_image(q)-in_image(q2))*(in_image(q)-in_image(q2)); + if (r<result) result = r; + } + out_image(p) = result; + } + + trace::exiting("detection::corner::moravec_criterion"); + return out_image; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::detection::corner + } // end of namespace mln::detetection + + +} // end of namespace mln + +#endif // ! MLN_DETECTION_CORNER_MORAVEC_CRITERION_HH -- 1.7.2.5